From patchwork Thu Jul 12 06:18:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 141784 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1131867ljj; Wed, 11 Jul 2018 23:19:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfqjS2MLA5KWEeQHxOUon5Xb4BfLG8ePzPlMIgGPxZfsU35WAoo75OTncE6oXgc9Nkpjq5K X-Received: by 2002:a65:630e:: with SMTP id g14-v6mr884589pgv.153.1531376357396; Wed, 11 Jul 2018 23:19:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531376357; cv=none; d=google.com; s=arc-20160816; b=A5jozX9e4CycXU/VTVJSPe9/pUrV2Huq+GU2Vh4jc+9GGOWwmaWnLDOLSNIPrPm3gT gFsYBKgrOSizMm8qG68f3ZyqvUkrTsYr0IvOn59Apq1IpZhTQX+hbgLVRHpV3F3oQSZr ctv97bWmV7n2aYudhNpccE+RcdgGFkQ7oFJAxWGHYXavkJx45jV7SkTlKg5EaE9XZTvp xi4VKthZrIE+MG0EtPJixNtfLErMzSjTVhzvnnAl6ABXOl2NRobNP15V/hQtCtYVtuUC rla/K2T1q6omd3sDKoCZS74l+guXpTgYV0qMp2cX3Mcgw5RPuJmoko0I8WW+NN8BC839 sX3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=EgczgummaNhPjXxM1mizWwsgShTS8qOJqqRBLaV5ZZI=; b=oQPw/waXcob9U9QM28KjYreqECMop+oMK6szKAtv32vJPFsM26QF4G4ULURqP+5STV wqWbDz7vo39O8B1s4gBHlareHYglg2//6O4qUM+L98TO3+Dzqnc5D+CHC2WuQJOt2m25 rkdf8Vpgsq4K5uGqknGoEgpE9vfNetpSbwmr07wV6b90Y7E/yW3Kj96BaYtt8/YBCHtM liGXSO9oPKBfAYvJNxuwH3ts1uEWUBZnJ7GVQeh7RQXq1UzCraThrYhtr75hbsHDmU8P SUSG0iK40WsCCghMW/w9zKVEfA8NukhsswNDCMj0l+RB7vXRgqko6g+udi1V7yBU5pRj cPzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z68-v6si4271391pfz.163.2018.07.11.23.19.17; Wed, 11 Jul 2018 23:19:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727063AbeGLG1S (ORCPT + 27 others); Thu, 12 Jul 2018 02:27:18 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:38874 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726584AbeGLG1R (ORCPT ); Thu, 12 Jul 2018 02:27:17 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 9006C525065D2; Thu, 12 Jul 2018 14:19:10 +0800 (CST) Received: from localhost (10.177.23.164) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.382.0; Thu, 12 Jul 2018 14:19:04 +0800 From: Zhen Lei To: Jean-Philippe Brucker , Robin Murphy , Will Deacon , Joerg Roedel , linux-arm-kernel , iommu , linux-kernel CC: Zhen Lei Subject: [PATCH v3 4/6] iommu/io-pgtable-arm: add support for non-strict mode Date: Thu, 12 Jul 2018 14:18:30 +0800 Message-ID: <1531376312-2192-5-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1531376312-2192-1-git-send-email-thunder.leizhen@huawei.com> References: <1531376312-2192-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To support the non-strict mode, now we only tlbi and sync for the strict mode. But for the non-leaf case, always follow strict mode. Use the lowest bit of the iova parameter to pass the strict mode: 0, IOMMU_STRICT; 1, IOMMU_NON_STRICT; Treat 0 as IOMMU_STRICT, so that the unmap operation can compatible with other IOMMUs which still use strict mode. Signed-off-by: Zhen Lei --- drivers/iommu/io-pgtable-arm.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) -- 1.8.3 diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 010a254..9234db3 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -292,7 +292,7 @@ static void __arm_lpae_set_pte(arm_lpae_iopte *ptep, arm_lpae_iopte pte, static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, unsigned long iova, size_t size, int lvl, - arm_lpae_iopte *ptep); + arm_lpae_iopte *ptep, int strict); static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, phys_addr_t paddr, arm_lpae_iopte prot, @@ -334,7 +334,7 @@ static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data, size_t sz = ARM_LPAE_BLOCK_SIZE(lvl, data); tblp = ptep - ARM_LPAE_LVL_IDX(iova, lvl, data); - if (WARN_ON(__arm_lpae_unmap(data, iova, sz, lvl, tblp) != sz)) + if (WARN_ON(__arm_lpae_unmap(data, iova, sz, lvl, tblp, IOMMU_STRICT) != sz)) return -EINVAL; } @@ -531,7 +531,7 @@ static void arm_lpae_free_pgtable(struct io_pgtable *iop) static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, unsigned long iova, size_t size, arm_lpae_iopte blk_pte, int lvl, - arm_lpae_iopte *ptep) + arm_lpae_iopte *ptep, int strict) { struct io_pgtable_cfg *cfg = &data->iop.cfg; arm_lpae_iopte pte, *tablep; @@ -576,15 +576,18 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data, } if (unmap_idx < 0) - return __arm_lpae_unmap(data, iova, size, lvl, tablep); + return __arm_lpae_unmap(data, iova, size, lvl, tablep, strict); io_pgtable_tlb_add_flush(&data->iop, iova, size, size, true); + if (!strict) + io_pgtable_tlb_sync(&data->iop); + return size; } static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, unsigned long iova, size_t size, int lvl, - arm_lpae_iopte *ptep) + arm_lpae_iopte *ptep, int strict) { arm_lpae_iopte pte; struct io_pgtable *iop = &data->iop; @@ -609,7 +612,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, io_pgtable_tlb_sync(iop); ptep = iopte_deref(pte, data); __arm_lpae_free_pgtable(data, lvl + 1, ptep); - } else { + } else if (strict) { io_pgtable_tlb_add_flush(iop, iova, size, size, true); } @@ -620,25 +623,27 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, * minus the part we want to unmap */ return arm_lpae_split_blk_unmap(data, iova, size, pte, - lvl + 1, ptep); + lvl + 1, ptep, strict); } /* Keep on walkin' */ ptep = iopte_deref(pte, data); - return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep); + return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep, strict); } static size_t arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova, size_t size) { + int strict = ((iova & IOMMU_STRICT_MODE_MASK) == IOMMU_STRICT); struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); arm_lpae_iopte *ptep = data->pgd; int lvl = ARM_LPAE_START_LVL(data); + iova &= ~IOMMU_STRICT_MODE_MASK; if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias))) return 0; - return __arm_lpae_unmap(data, iova, size, lvl, ptep); + return __arm_lpae_unmap(data, iova, size, lvl, ptep, strict); } static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,