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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A2ACC369CB for ; Tue, 29 Apr 2025 05:02:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1F006B0006; Tue, 29 Apr 2025 01:02:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCE706B0007; Tue, 29 Apr 2025 01:02:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ABC966B0008; Tue, 29 Apr 2025 01:02:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8BDD66B0006 for ; Tue, 29 Apr 2025 01:02:41 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 57B26120BBE for ; Tue, 29 Apr 2025 05:02:43 +0000 (UTC) X-FDA: 83385886206.16.1D2FE0B Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by imf30.hostedemail.com (Postfix) with ESMTP id 903BB8000B for ; Tue, 29 Apr 2025 05:02:40 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=V2aLB3wq; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf30.hostedemail.com: domain of baolu.lu@linux.intel.com has no SPF policy when checking 192.198.163.16) smtp.mailfrom=baolu.lu@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745902961; a=rsa-sha256; cv=none; b=Q++clXnYvNcUZb/3QwhK3eHxx1w6YpayisysTB/NjNjQcAweY2RVoCDDsgwn5AS60b68bc Apuy0JjV38vmpy0/YCDYJgi+zAaOVTF/LhmEoAvnXtII6t78AYs3wUNX8BASC93u1VBR3F 8f/vpaz5i677YCES0iALZrZS9xOEtUU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=V2aLB3wq; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf30.hostedemail.com: domain of baolu.lu@linux.intel.com has no SPF policy when checking 192.198.163.16) smtp.mailfrom=baolu.lu@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745902961; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BHPiN8dLKLCnD4pFx6tkd4ehR3fDU1kbq+ObibkBhpc=; b=xnYaG4j7n2xx1Im3rgXm8ZoUWMs+Yf3SJElOAGPNUqGi6OReYi36i8+dGJUoOBKrFEIRl5 KGdRzlm0ApPyKmXk1Ml1sSoBMdpwt9LgxluF/zfoEFxIWP4gR8en2IPgKtbFsUZmchUt/z h+ydmxq3sXSqza3i+Yt848ORESCzMvs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745902961; x=1777438961; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=yJHygitItCE7AjT4PE9hDK5eTwShgF8pqCV5bUS99tg=; b=V2aLB3wqgTs0V9szZVU9E3uNMpdhFAvNrINuA1ugjBIi/gR6XgFNI9AG UrfFvaywOG6uzYkaDGmUQwYUfBY0pH2nMn2Cbkqlb1HshVJc39dLrt+J0 ZOYo3OZfD7+3Ld/9qscGHimoqbMPKHRL1a97be1NHl0UQmm/KvbPrJDya bmI/Jkm49t4JfQzwAWe9pewSMR+poP1YYRbpeovsDnGgPhyZIMrTFTh4I ci7vRNs453HN9BMvpzb+nbFtcjboMmfpsdD8t6QTZrVzo3JTrp9fpkjth qT4K+GbK7x10qN5nJASSQP3aphM7midJQ+znQVuhu5L5Toq8r53ZkqLEz w==; X-CSE-ConnectionGUID: i/e2KvoTT56LN9NisXdsjg== X-CSE-MsgGUID: rEq0NjehQA2iMOgnCkdHwg== X-IronPort-AV: E=McAfee;i="6700,10204,11417"; a="35121402" X-IronPort-AV: E=Sophos;i="6.15,248,1739865600"; d="scan'208";a="35121402" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 22:02:39 -0700 X-CSE-ConnectionGUID: a5E3m5JXQF+Vct9TFcNxPw== X-CSE-MsgGUID: WNPv/oL5TCup2x/mZ3mf+A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,248,1739865600"; d="scan'208";a="138896368" Received: from allen-sbox.sh.intel.com (HELO [10.239.159.30]) ([10.239.159.30]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 22:02:30 -0700 Message-ID: <8416e94f-171e-4956-b8fe-246ed12a2314@linux.intel.com> Date: Tue, 29 Apr 2025 12:58:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v10 06/24] iommu/dma: Factor out a iommu_dma_map_swiotlb helper To: Leon Romanovsky , Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni , Leon Romanovsky References: Content-Language: en-US From: Baolu Lu In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 903BB8000B X-Stat-Signature: ahgcjmfeb31k6qdrszxhg1b19rb67ag9 X-Rspam-User: X-HE-Tag: 1745902960-276982 X-HE-Meta: U2FsdGVkX1/AeDCp3Mc/7blPXlZXVKOd73crl7nerToTDHIhU+21rPHDG2BXc4uvtIEMxFgeovkxxUO3CaYk99e+heC79Ynl3/WQTPSLiYV44enQXrdCmtHgc4c12MguX9GBXHVIjWVJr2qmh+Hq+SFRwwRj+vtAlmxGVJpQYg6yrZFm53KrwJ2DW7DtqD5HBnB+zSPINXQlpl71/vBz2OjZ8Xh9mOuGeEEsSIXzsD3BovZ/qhCQ9zmMdZ0plPoFi6c//NIg08kB0MiTQ8Wd/akoDk6PaS+Oqk3ChtH84MFwDLfK++Ecu8gojEYrWd67AoBim0ovb1zgGpaXcMwkeXz69WPQ5MtfMcCU0C6LYk/oFuIydv5q+i+6/nB1TvAlbf6yTO1s/o36ptec8TQr6BAOHZPp5740MtJREvA1SjNgy5+urP1JqdmrLqlOuHN6km7dqHm84eFrBGCtM9+EL1eeCexIFdi2GFzEASeHESZ/Gsltk2spRSD4ppNtwi0CZp8MVRFy21wvLGKC2L2q8bT9e7eHpZJSy8kx1fHKGWGsa1H7qr1TYoY8wqj/3R7bBavrC8iXs/d4+O+Hyc9VK3Y1wP0QCo+5AEx8zM58W9ogu46P/xr70Ir0MmN+meb0gS6RZgvcBJGsyJtN4wKCJzAaBD6wYDV2bVZf+yUejcfCZ1QwO34eTZeSB6JecWfVRdGDebnSFIQ2x2g6CdkUL2cyVgiJaZIXy5Be7knbk//WxcoiZzm8p27T6n12baJdPaelBTKULJQmbhGaWpU3ZLVcyl7sGSxsuaaiN6Uhj5FjAEXzgkPJ+Vt0Nho4HndSmOFXRqnxgvelY8l+VzRP78xyw2PjjOzAl2l9omRSyuMB7j5zZYiIG6bnX35f1uGZ3Iu65xUDvS2697ufaj5C1z11YGhlOL50Vn6kf1kLZYGH2BmptDQfZOiaBW5eJ6OgIoy4lCQE9kmjrxG6eZD nXNKqPo7 N0hJgi3CRHLct3yGHu7kIbsoJUyi3xFqjBkx4vtOMBe5gMkQ3p9tlQwxLog39iMHRmHtZw3yGxINCXWOengCHco7fseYeDkAMLoIjUpW4viBQghOD7SgB9843tsFLFafq8vejAElu0F5gXYc+HZAJO/okixkcJPYKYdLk9YrocXCJgnWOpm19Jrbsw8inB7bSzs6Zce1L1ePylA8jtTumCM9wou5JWMohwp7qh8aasdkCb1AfFdRXyP7Syl2lc3uA7RyGVuGfqkwkjnVwvsndVRzXup9eBLGwsNn+M63gQSU76GWY/M1yHmtf1A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 4/28/25 17:22, Leon Romanovsky wrote: > From: Christoph Hellwig > > Split the iommu logic from iommu_dma_map_page into a separate helper. > This not only keeps the code neatly separated, but will also allow for > reuse in another caller. > > Signed-off-by: Christoph Hellwig > Tested-by: Jens Axboe > Reviewed-by: Luis Chamberlain > Signed-off-by: Leon Romanovsky Reviewed-by: Lu Baolu with a nit below ... > --- > drivers/iommu/dma-iommu.c | 73 ++++++++++++++++++++++----------------- > 1 file changed, 41 insertions(+), 32 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index d3211a8d755e..d7684024c439 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1138,6 +1138,43 @@ void iommu_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sgl, > arch_sync_dma_for_device(sg_phys(sg), sg->length, dir); > } > > +static phys_addr_t iommu_dma_map_swiotlb(struct device *dev, phys_addr_t phys, > + size_t size, enum dma_data_direction dir, unsigned long attrs) > +{ > + struct iommu_domain *domain = iommu_get_dma_domain(dev); > + struct iova_domain *iovad = &domain->iova_cookie->iovad; > + > + if (!is_swiotlb_active(dev)) { > + dev_warn_once(dev, "DMA bounce buffers are inactive, unable to map unaligned transaction.\n"); > + return (phys_addr_t)DMA_MAPPING_ERROR; > + } > + > + trace_swiotlb_bounced(dev, phys, size); > + > + phys = swiotlb_tbl_map_single(dev, phys, size, iova_mask(iovad), dir, > + attrs); > + > + /* > + * Untrusted devices should not see padding areas with random leftover > + * kernel data, so zero the pre- and post-padding. > + * swiotlb_tbl_map_single() has initialized the bounce buffer proper to > + * the contents of the original memory buffer. > + */ > + if (phys != (phys_addr_t)DMA_MAPPING_ERROR && dev_is_untrusted(dev)) { > + size_t start, virt = (size_t)phys_to_virt(phys); > + > + /* Pre-padding */ > + start = iova_align_down(iovad, virt); > + memset((void *)start, 0, virt - start); > + > + /* Post-padding */ > + start = virt + size; > + memset((void *)start, 0, iova_align(iovad, start) - start); > + } > + > + return phys; > +} > + > dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, > unsigned long offset, size_t size, enum dma_data_direction dir, > unsigned long attrs) > @@ -1151,42 +1188,14 @@ dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, > dma_addr_t iova, dma_mask = dma_get_mask(dev); > > /* > - * If both the physical buffer start address and size are > - * page aligned, we don't need to use a bounce page. > + * If both the physical buffer start address and size are page aligned, > + * we don't need to use a bounce page. > */ > if (dev_use_swiotlb(dev, size, dir) && > iova_offset(iovad, phys | size)) { > - if (!is_swiotlb_active(dev)) { ... Is it better to move this check into the helper? Simply no-op if a bounce page is not needed: if (!dev_use_swiotlb(dev, size, dir) || !iova_offset(iovad, phys | size)) return phys; Thanks, baolu