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 3E07DC71136 for ; Tue, 17 Jun 2025 07:44:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C8A36B007B; Tue, 17 Jun 2025 03:44:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 679D26B0088; Tue, 17 Jun 2025 03:44:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 540DA6B0089; Tue, 17 Jun 2025 03:44:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 43B2D6B007B for ; Tue, 17 Jun 2025 03:44:05 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 53EB31D8667 for ; Tue, 17 Jun 2025 07:44:04 +0000 (UTC) X-FDA: 83564104008.21.894217C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id E7957140008 for ; Tue, 17 Jun 2025 07:44:01 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NBPD1NqV; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750146242; 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=fQE5kmoAVVBp5PE3yEpqJAK0vmDk7/V02D4PYM6CncQ=; b=QKQLMgKf+0q7PMDjWcEgXILw8vXontFZU95pKelLPhraVE71VtdFHaBJjWOhe/vuAbT0na hoyOrGAOmzcryze/rP1KPDUWCo8jQZ0KCu/OIrAcm3ltaOm1TFPlpljkhr67mquF3/pY6K vsqsx+tz9odEy4ZwqkUzWTdnb15ygx4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NBPD1NqV; spf=pass (imf23.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750146242; a=rsa-sha256; cv=none; b=MbG5jpZ/Zgn525wh8qIZZUb2f8fntfl20SrEQwRr+zOYU91XCkJecHwBwqZXykkb0ZF6Q+ incEuWhY8A18TuH5fr/YhgsTZA+7GeOYs6FForagC28DHhOAC/4kV/+CIkAfAZQHxEHqXZ lCQFDgGP/sP+yrb1wI7E7DI3CZ7vM10= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750146241; h=from:from: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:autocrypt:autocrypt; bh=fQE5kmoAVVBp5PE3yEpqJAK0vmDk7/V02D4PYM6CncQ=; b=NBPD1NqVEg56T4UpA5znqGngIl7/h6OjDidl8CgcVOMRXt+pjE7tlX+2JPTmVUILtkw5hW YfgSYZrMzWxV1iV6M+vVyTI1R8ZMqM+VU4e2vybLbgCwbIARdHo1wCTMpuyOp3Ka0vnA3Q 5+VgwgN+KeLGXj32RhgVTRdfhKiUSzA= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-5-EfpIFQGGOeScdmyLiE07XQ-1; Tue, 17 Jun 2025 03:43:59 -0400 X-MC-Unique: EfpIFQGGOeScdmyLiE07XQ-1 X-Mimecast-MFC-AGG-ID: EfpIFQGGOeScdmyLiE07XQ_1750146239 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-450787c8626so39779315e9.1 for ; Tue, 17 Jun 2025 00:43:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750146238; x=1750751038; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=fQE5kmoAVVBp5PE3yEpqJAK0vmDk7/V02D4PYM6CncQ=; b=uiUhzi6UIRMDrvVFXlgzl34Mo499vTkX2b3yxYCDxPLLgqXgpy/FI04D4Gv5oe8H7c zpJ61CW+MH3gvacXjLIKmT3ZtJ7CoYFr9TSZvN3sJzcfYAXExJt7Sqton8mgXCmgK1TW 81Pu3698DLAZNIlN9JBYjUiv47VG6sgrkwPyx+N7HlId62zACqv+LhgXc3Q/iXAyPn9w vz30+uAT1vOGMJcYUJdTVICCtxoWKmuFZmZ80HUYC/btBwe1pQ0K4dzIiM+V+NYSmvhE sOmen+aizQOJXDefOLlTpqWw0p6fbQCBs5cXXfU9/edmwi5hJDGLZNzFw1GrBm20i3Vm JjCw== X-Forwarded-Encrypted: i=1; AJvYcCXcajDvtz2+uqs5mK5qlsDG8mHB5G1h60oMOpH6SEOAk4/IA0jkqOAsHl7LJ4MgSje/XO+QMw7bqw==@kvack.org X-Gm-Message-State: AOJu0YzI0EFLpfbS2LIY5E3njQp+Cs3qO6+V6q5ZtZoW4dxF/8RQCsE3 huL+P9uHWaTnHZpIUsOb+c/kNW+AsYITGG/2Tx4WvbLwg722KlT1kDbfDgQSsjjeAvhRfP39EcM 7wR42GIaVUevLaQYOig3rDCtsH6B1d4LdFK7Lmps/NGM7F+daXZLh X-Gm-Gg: ASbGncsybcuvMEQbi7GASS8I2T1db5xWSsp81gN6OakwHuS1h681NPllNHTMeOTG7SM E4W74A8s4sRLSYQcu1oXZnqbNnnaL/V4wlruqWtn4iu2VhC76gjKYzFHOezCZN73iqP+QuNn5kA 1ytwvn0sfwaQau4zre2uIDzAsNgjZxDq1q94M7FtDnrhBKCNeAMA6F8MnyV+CBpqSo5cJu+QkL2 WnV1UUIbXk7JzPHnKTNFsIHjJu76T3kkDa8/jJwF9N+E7iK+W6iKruOQDnG7Bj+wOtevZ3Zu32Y 3kwcbzMMQ6rXeC52r26eIW69EFyTOIqkJewfhPtzZwMIq2HISHMuYrX5glqEvBnCfWN8lb7bmau wZjQplqDN544/BhDMjIj4N331WMIGKdbYZuR2ww6S4f8vcXw= X-Received: by 2002:a05:600c:82c3:b0:442:f4a3:8c5c with SMTP id 5b1f17b1804b1-4533caf5922mr132749165e9.10.1750146238571; Tue, 17 Jun 2025 00:43:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVJqsb5x8WIO+53bIeG1hU7iYijv8uZm//ZPYLkKqsSMIyHju2/xGa5dLTk4XbYbpJwr4Lyw== X-Received: by 2002:a05:600c:82c3:b0:442:f4a3:8c5c with SMTP id 5b1f17b1804b1-4533caf5922mr132748845e9.10.1750146238101; Tue, 17 Jun 2025 00:43:58 -0700 (PDT) Received: from ?IPV6:2003:d8:2f31:700:3851:c66a:b6b9:3490? (p200300d82f3107003851c66ab6b93490.dip0.t-ipconnect.de. [2003:d8:2f31:700:3851:c66a:b6b9:3490]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4534394c90fsm89474035e9.3.2025.06.17.00.43.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 00:43:57 -0700 (PDT) Message-ID: <34560ae6-c598-4474-a094-a657c973156b@redhat.com> Date: Tue, 17 Jun 2025 09:43:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 3/3] vfio/type1: optimize vfio_unpin_pages_remote() for large folio To: lizhe.67@bytedance.com, alex.williamson@redhat.com, akpm@linux-foundation.org, peterx@redhat.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20250617041821.85555-1-lizhe.67@bytedance.com> <20250617041821.85555-4-lizhe.67@bytedance.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250617041821.85555-4-lizhe.67@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ucsu_Z8FnUIKrOei2IjO3TLe2guVv93cpVzciIPn45Q_1750146239 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: E7957140008 X-Stat-Signature: yusrwxptfq7gfjka8x71ttwm9ekoir19 X-Rspam-User: X-HE-Tag: 1750146241-906045 X-HE-Meta: U2FsdGVkX18La2C+X+eTeYB22UoIw7Q33jBPSMaKogmkH3GU90NdBYGtnYcm+gKM+i7+2y6durQ/Jx2MD9kRY4mfQGZ/gciImi4s7/JsWEVnfhl+VUv8IPKE+3dS0sKX0nfgw25NH18vD3u++b7LcFUDYVRcrvelykav7q+jkNSS8pPK3mH1Kb/3wK9VOSGdS/NTnhnRLjmzFKz0WQbVDyMZF9rZ2hNXFRz+B+xduJmZc+6aXwBjn5/HAt0AkrC6hk5O6f6Wq410M2E/b9bcZmA3KExzDwT1Q63ObTCwoC17OnalXdFFUA3j/zcTmkbTqiaTYxmaDuKuUO/HDqZiwJvhn/NsJTuMewM+uGPYkA39EQtDBA7RPFnGwKOAfcGe9AyUF6NtWCAkBqtTRd+Bl7fD8mNqtzehKYIonHuD0hvR+SJ3Z4+YSG7O6RUQeS0mB8R6gkh8eZadpNSVAXObjpDwoeP/9lSHen56SvuJYCPzq+MvVNmEfKmyr6JyG8R38JF3erR3fI9OqIlmJ5ZPMfjwSL0NKKu+kb5yqd5IeNvLb6Xa/xJ/5RH4DE7XwrwwH4ephszyPYVNBSqr+F/gsOXUpNgiAJkdM33FoRFzU9DY+ab6/sfVOhsPsgifqLjx9aWG43aNKxwSc0mrMkqwoNCfek2AM4Kn1SPGUQ7+OKKD2FxigFf2py2FuA/xRaTY1KuSMEtmdSIVpbZxuyG8oQ4KokIoEf75RH2qGNY2Ld42VquPiSKblGz2C2W6pBzC63hIl9fDPvQunUh70EXHjqpi71F6o+B5JWE+fdUeF0WrTlHlkucEI2L54q524lUROD970yhQ7P3JJKJtvXI9iXpRYsnjiGWrVRXjkRZzkM1mufndwdDmTJk9kCW7GrOMpieUyveIdFTjJTseNr5nOi1IjTS1HS8OfSc7endmIvFdR5JaVkved2VlAuVPTGCQ+jz6EdYtdX5tTqpmXsq +OjOmIpt e4BEYvndD3TvoxRfrHtxB81qQIkQYbSlQgYYFVsoaMqN9xotXLa013hBBJwfRNasw14LESKrRFi5X1oDwBDxS1pxFkkHQO23pb6cwvbVRqBGCC1/1lkxC5zhCRGbpZa9Zbenzj72nviZpB/lD4Ksy9LaT/ouqvnDUQbWiBjh4HKp+GJ7J2crBqZdF3Z/7TYqwUdGwl3RZGrTIwz6vpEEnErUUbtPceRlziDZRMvlQPmKlKV/iUjOng+3yM4hHadRykMgzDOOdQY98+eAAomsumSR4gFDz9ergCUXw+gvbP9QXCaFzGZTaxts5y5TBmIaHEVO7tVS48xFcQSbojh883+JWrEvDQ36HpGv0lT0a6S3334aJJ5YlGQbDZzW7nnUu7r21Ev8s/bNZYnv/S2gzqbYWdaSi+LKiEgX35pUN0M1T9YXbhp4LQNh0EhRnxhj+mniki0PjL1grj7gp8ccsBfTm0VtrDu1q/2mXjOvJhRXupWCH0sMSGq6pOyuU1+pmQ/9GnH1Dhkyom2s= 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 17.06.25 06:18, lizhe.67@bytedance.com wrote: > From: Li Zhe > > When vfio_unpin_pages_remote() is called with a range of addresses that > includes large folios, the function currently performs individual > put_pfn() operations for each page. This can lead to significant > performance overheads, especially when dealing with large ranges of pages. > > This patch optimize this process by batching the put_pfn() operations. > > The performance test results, based on v6.15, for completing the 16G VFIO > IOMMU DMA unmapping, obtained through unit test[1] with slight > modifications[2], are as follows. > > Base(v6.15): > ./vfio-pci-mem-dma-map 0000:03:00.0 16 > ------- AVERAGE (MADV_HUGEPAGE) -------- > VFIO MAP DMA in 0.047 s (338.6 GB/s) > VFIO UNMAP DMA in 0.138 s (116.2 GB/s) > ------- AVERAGE (MAP_POPULATE) -------- > VFIO MAP DMA in 0.280 s (57.2 GB/s) > VFIO UNMAP DMA in 0.312 s (51.3 GB/s) > ------- AVERAGE (HUGETLBFS) -------- > VFIO MAP DMA in 0.052 s (308.3 GB/s) > VFIO UNMAP DMA in 0.139 s (115.1 GB/s) > > Map[3] + This patchset: > ------- AVERAGE (MADV_HUGEPAGE) -------- > VFIO MAP DMA in 0.028 s (563.9 GB/s) > VFIO UNMAP DMA in 0.049 s (325.1 GB/s) > ------- AVERAGE (MAP_POPULATE) -------- > VFIO MAP DMA in 0.294 s (54.4 GB/s) > VFIO UNMAP DMA in 0.296 s (54.1 GB/s) > ------- AVERAGE (HUGETLBFS) -------- > VFIO MAP DMA in 0.033 s (485.1 GB/s) > VFIO UNMAP DMA in 0.049 s (324.4 GB/s) > > For large folio, we achieve an approximate 64% performance improvement > in the VFIO UNMAP DMA item. For small folios, the performance test > results appear to show no significant changes. > > [1]: https://github.com/awilliam/tests/blob/vfio-pci-mem-dma-map/vfio-pci-mem-dma-map.c > [2]: https://lore.kernel.org/all/20250610031013.98556-1-lizhe.67@bytedance.com/ > [3]: https://lore.kernel.org/all/20250529064947.38433-1-lizhe.67@bytedance.com/ > > Signed-off-by: Li Zhe > --- > drivers/vfio/vfio_iommu_type1.c | 35 +++++++++++++++++++++++++++++---- > 1 file changed, 31 insertions(+), 4 deletions(-) > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index e952bf8bdfab..159ba80082a8 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -806,11 +806,38 @@ static long vfio_unpin_pages_remote(struct vfio_dma *dma, dma_addr_t iova, > bool do_accounting) > { > long unlocked = 0, locked = vpfn_pages(dma, iova, npage); > - long i; > > - for (i = 0; i < npage; i++) > - if (put_pfn(pfn++, dma->prot)) > - unlocked++; > + while (npage) { > + long nr_pages = 1; > + > + if (!is_invalid_reserved_pfn(pfn)) { > + struct page *page = pfn_to_page(pfn); > + struct folio *folio = page_folio(page); > + long folio_pages_num = folio_nr_pages(folio); > + > + /* > + * For a folio, it represents a physically > + * contiguous set of bytes, and all of its pages > + * share the same invalid/reserved state. > + * > + * Here, our PFNs are contiguous. Therefore, if we > + * detect that the current PFN belongs to a large > + * folio, we can batch the operations for the next > + * nr_pages PFNs. > + */ > + if (folio_pages_num > 1) > + nr_pages = min_t(long, npage, > + folio_pages_num - > + folio_page_idx(folio, page)); > + (I know I can be a pain :) ) But the long comment indicates that this is confusing. That is essentially the logic in gup_folio_range_next(). What about factoring that out into a helper like /* * TODO, returned number includes the provided current page. */ unsigned long folio_remaining_pages(struct folio *folio, struct pages *pages, unsigned long max_pages) { if (!folio_test_large(folio)) return 1; return min_t(unsigned long, max_pages, folio_nr_pages(folio) - folio_page_idx(folio, page)); } Then here you would do if (!is_invalid_reserved_pfn(pfn)) { struct page *page = pfn_to_page(pfn); struct folio *folio = page_folio(page); /* We can batch-process pages belonging to the same folio. */ nr_pages = folio_remaining_pages(folio, page, npage); unpin_user_folio_dirty_locked(folio, nr_pages, dma->prot & IOMMU_WRITE); unlocked += nr_pages; } -- Cheers, David / dhildenb