From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24C92C49EA3 for ; Thu, 17 Jun 2021 07:21:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF68E613BF for ; Thu, 17 Jun 2021 07:21:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF68E613BF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Cc:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Oo+NwZFJYx6hMiVwqf03DTa+8m4YV0b3LMEQOY/bhJY=; b=pzaWpXk5UBM7uq3qAgfGgp3j4T zu8fYCHfinE86ZLXa+5QVHJ9B0VxkJIZ1chxxnVMkf7P9NRWpdcgqEge/vuVaxZ6T2sn3DmDUiSWo wQKqTF5HUa69eRR790MF+lkB1yD4FkQk9fcj1kfYZkZHBusHXQQmyDJnxl4B87yvEJ6HZZC70xo6g Xo9GZ+b219hyd77tDxGjocwSLl8TIpmrlmyj7PjB9/bTOFsx/HANdNs6np7NEc3NEXq0uPN/s/Cjv SvcFqtHU64Z/a72ssOWaVUkHw0XcTlIK2gG5XeneMxrRLw8A9B8sIuwrQXBFcW0aNRj2gLEaIm5af IMna6Vow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltmJy-009FH5-MN; Thu, 17 Jun 2021 07:20:14 +0000 Received: from mga07.intel.com ([134.134.136.100]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltmJu-009FFe-Ep for linux-arm-kernel@lists.infradead.org; Thu, 17 Jun 2021 07:20:11 +0000 IronPort-SDR: OJRmfMcDgf5bS8nKkPV8gB93cE0Yi2TP+EAcHFCWpXqhju7sLJF4QERP1lSX1yoj9KXGm1BOxb IKDxLIccbhjg== X-IronPort-AV: E=McAfee;i="6200,9189,10017"; a="270167809" X-IronPort-AV: E=Sophos;i="5.83,278,1616482800"; d="scan'208";a="270167809" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2021 00:20:09 -0700 IronPort-SDR: f5uyLCePA4vQedp0tG3ISxCOvFjgXxQLmtIdc/4UlSvhvwSV1D1ygdcsL/yeyrAgdrl+LIWqsE s/z3BhsOKRXw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,278,1616482800"; d="scan'208";a="472326493" Received: from allen-box.sh.intel.com (HELO [10.239.159.118]) ([10.239.159.118]) by fmsmga004.fm.intel.com with ESMTP; 17 Jun 2021 00:20:06 -0700 Cc: baolu.lu@linux.intel.com, joro@8bytes.org, isaacm@codeaurora.org, pratikp@codeaurora.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, djakov@kernel.org Subject: Re: [PATCH v7 08/15] iommu: Add support for the map_pages() callback To: Georgi Djakov , will@kernel.org, robin.murphy@arm.com References: <1623850736-389584-1-git-send-email-quic_c_gdjako@quicinc.com> <1623850736-389584-9-git-send-email-quic_c_gdjako@quicinc.com> From: Lu Baolu Message-ID: Date: Thu, 17 Jun 2021 15:18:39 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <1623850736-389584-9-git-send-email-quic_c_gdjako@quicinc.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210617_002010_590304_863B6175 X-CRM114-Status: GOOD ( 25.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 6/16/21 9:38 PM, Georgi Djakov wrote: > From: "Isaac J. Manjarres" > > Since iommu_pgsize can calculate how many pages of the > same size can be mapped/unmapped before the next largest > page size boundary, add support for invoking an IOMMU > driver's map_pages() callback, if it provides one. > > Signed-off-by: Isaac J. Manjarres > Suggested-by: Will Deacon > Signed-off-by: Georgi Djakov > --- > drivers/iommu/iommu.c | 43 +++++++++++++++++++++++++++++++++++-------- > 1 file changed, 35 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index 725622c7e603..70a729ce88b1 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -2429,6 +2429,30 @@ static size_t iommu_pgsize(struct iommu_domain *domain, unsigned long iova, > return pgsize; > } > > +static int __iommu_map_pages(struct iommu_domain *domain, unsigned long iova, > + phys_addr_t paddr, size_t size, int prot, > + gfp_t gfp, size_t *mapped) > +{ > + const struct iommu_ops *ops = domain->ops; > + size_t pgsize, count; > + int ret; > + > + pgsize = iommu_pgsize(domain, iova, paddr, size, &count); > + > + pr_debug("mapping: iova 0x%lx pa %pa pgsize 0x%zx count %zu\n", > + iova, &paddr, pgsize, count); > + > + if (ops->map_pages) { > + ret = ops->map_pages(domain, iova, paddr, pgsize, count, prot, > + gfp, mapped); > + } else { > + ret = ops->map(domain, iova, paddr, pgsize, prot, gfp); > + *mapped = ret ? 0 : pgsize; > + } > + > + return ret; > +} > + > static int __iommu_map(struct iommu_domain *domain, unsigned long iova, > phys_addr_t paddr, size_t size, int prot, gfp_t gfp) > { > @@ -2439,7 +2463,7 @@ static int __iommu_map(struct iommu_domain *domain, unsigned long iova, > phys_addr_t orig_paddr = paddr; > int ret = 0; > > - if (unlikely(ops->map == NULL || > + if (unlikely(!(ops->map || ops->map_pages) || > domain->pgsize_bitmap == 0UL)) > return -ENODEV; > > @@ -2463,18 +2487,21 @@ static int __iommu_map(struct iommu_domain *domain, unsigned long iova, > pr_debug("map: iova 0x%lx pa %pa size 0x%zx\n", iova, &paddr, size); > > while (size) { > - size_t pgsize = iommu_pgsize(domain, iova, paddr, size, NULL); > + size_t mapped = 0; > > - pr_debug("mapping: iova 0x%lx pa %pa pgsize 0x%zx\n", > - iova, &paddr, pgsize); > - ret = ops->map(domain, iova, paddr, pgsize, prot, gfp); > + ret = __iommu_map_pages(domain, iova, paddr, size, prot, gfp, > + &mapped); > + /* > + * Some pages may have been mapped, even if an error occurred, > + * so we should account for those so they can be unmapped. > + */ > + size -= mapped; > > if (ret) > break; > > - iova += pgsize; > - paddr += pgsize; > - size -= pgsize; > + iova += mapped; > + paddr += mapped; > } > > /* unroll mapping in case something went wrong */ > Reviewed-by: Lu Baolu Best regards, baolu _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel