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 8A371C83F07 for ; Mon, 7 Jul 2025 07:29:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D0A66B0322; Mon, 7 Jul 2025 03:29:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A88B6B0323; Mon, 7 Jul 2025 03:29:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BE0E6B0324; Mon, 7 Jul 2025 03:29:39 -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 0B1836B0322 for ; Mon, 7 Jul 2025 03:29:39 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 845EC140405 for ; Mon, 7 Jul 2025 07:29:38 +0000 (UTC) X-FDA: 83636643636.17.A9D6A18 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 13CB54000D for ; Mon, 7 Jul 2025 07:29:35 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=E3hcciIW; spf=pass (imf27.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=1751873376; 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=UniRdOeAILwBv1NP0bui+CugXDW/jLDR72O3UtptutA=; b=rLyQntXoHVPeMFZs/y9YKLpZzFaqWc6p2mhC2gXX7GyU9bKhQASci3xcRCwtTC6g2qazv3 kNvSb+upzARIaUVGyb1etu5hxUfGQ8jAaKlFX1Qq7OzI1LaS1CZQZWMO3EujskXdv/Cgql cEbXyymWwOuY67qQWehatBmDAIgDK2E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751873376; a=rsa-sha256; cv=none; b=UOvwe8Uuz1n9L5mNKGp1JxXVwh57ejm05eZz9KyzrJsoz3SWo/uN1R8NgjlF+vx+ALypcl ta6mb9KTzDbAyh6viJmMeBy/0tFUwjBy1Ddijra7cT2wxkm6C6yuqQTKoWksvZ7nYM+3NT DEBrVEY2lPIbHYt7gI2rE5NteE4XNY0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=E3hcciIW; spf=pass (imf27.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751873375; 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=UniRdOeAILwBv1NP0bui+CugXDW/jLDR72O3UtptutA=; b=E3hcciIWJ6g2IjtkDwIYBZS62SXxq329VTeTeB4bEUpNsjrhQDD2B9LtRthsrrcIBQQk61 u6dfoOk4Jnk/XQOhsINQl4UbiG7TnivtcIDjStbvw0Xf6jDHWFBhd16blC0SRgDq86WNxr CY3gXLOXZd3q6xX4MaFWt74clNtRkgs= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-481-jGOv8YyCPiqjUSFz4k-tng-1; Mon, 07 Jul 2025 03:29:34 -0400 X-MC-Unique: jGOv8YyCPiqjUSFz4k-tng-1 X-Mimecast-MFC-AGG-ID: jGOv8YyCPiqjUSFz4k-tng_1751873373 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a4ff581df3so1156436f8f.1 for ; Mon, 07 Jul 2025 00:29:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751873373; x=1752478173; 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=UniRdOeAILwBv1NP0bui+CugXDW/jLDR72O3UtptutA=; b=li1MyXjGrDPlnsB4fYnGUOHSPMaNpjdzBDWlq7rxpPzo40bgmEICLY6wzsLGZ9Bjvv WxHB1wW7SbIaBoqYNZKAlh1l3zCULMlLX55zBdpgZnT5lQsynG6szaSWtE6/9gFTGUyn YmJjZbO2bMbiiMNtNScpqwQMVpPp4y6qyfBGFChLr6PzRv4z/mmWn/USJjkEA+Yf6MGY jRL42PAt/SwJn3CHqzOdK/hz+XAwWr36NpUq0oSJ6HhCs9Gj5pb60U2e5oXZtgbfXxFl IbBsSA5QQGC/HJL7G7+qA/3+yE7y5a3V44fB89WNqQNb5/n1aI4c8VGIasEG7Mfjn5Ff pMEw== X-Forwarded-Encrypted: i=1; AJvYcCWyUBr5ErXHyGAp/hQ4oD6aFjWIVnsphP98e8gp31MJC8L3wpqo+c0RcntvQ22OiGhNz2LJJryUCQ==@kvack.org X-Gm-Message-State: AOJu0YxTnIkUE+vf1+HkQEliZ4iu08V+OqYoZAfXhBefk9NGDUnL9tPT f/6fTnZerEdRbE38nNWTFJEUaOHyFZJbFTf36kIXMrmP4JKJrDeAjQEirxoGyCtbpOC8VezFGrW 52e3QuXpdqczh58h1TTX5FM/nxj/1xsO+QCtbE60tn6trS6g4ILIz X-Gm-Gg: ASbGnctGsInIOxIwKns/3ojmBTcfMeL/eoqs5KTc0qpcPqAeNCLO5M7eVgSsoWQGnbQ T+HiJlc+u9lO3J7v/0fayBem3o2VCfJB6iIPymZaDRqIsjFTtXFeia2+sPuRaEXCBRuYEKMtdEk yjvUwOzz9rQK4QZPkqQ2SVk9iJCPXlgwLmW46py6JvX4oKCmavIvTUBa0/NIlM4kJu0SqBFfKer zKdC0Ylk9yQVXAQfmqhFjhKTaZ4+kzMpGsIp4BaYzMwNQnuiRAKbxPHfvquhJ0n9kvJY197SUoy feR8gDQvbOghYWUgg1dMNLywvJ2ZqX9s7o69C/VYu+IkwM7O2LiuOw0lKpVYzhTebXA6/X46i+Q i/EB+mZtWBJ1jGJuGJzJqa/VpWpiCsPp3N1M0jxXitIO7sktrPQ== X-Received: by 2002:a05:6000:1885:b0:3a5:271e:c684 with SMTP id ffacd0b85a97d-3b49558ac68mr10619514f8f.24.1751873372653; Mon, 07 Jul 2025 00:29:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwPSb5edQLRTwGOfVpOm0bfilvCQbmAoa4KXrkeUF5ArI8SkxYDqX8rGSHXn0rf+nVk0uRfg== X-Received: by 2002:a05:6000:1885:b0:3a5:271e:c684 with SMTP id ffacd0b85a97d-3b49558ac68mr10619487f8f.24.1751873372170; Mon, 07 Jul 2025 00:29:32 -0700 (PDT) Received: from ?IPV6:2003:d8:2f38:1d00:657c:2aac:ecf5:5df8? (p200300d82f381d00657c2aacecf55df8.dip0.t-ipconnect.de. [2003:d8:2f38:1d00:657c:2aac:ecf5:5df8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454b161fb78sm103469475e9.1.2025.07.07.00.29.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Jul 2025 00:29:31 -0700 (PDT) Message-ID: <9d74e93d-5a5f-4ffa-91fa-eb2061080f94@redhat.com> Date: Mon, 7 Jul 2025 09:29:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 2/5] vfio/type1: optimize vfio_pin_pages_remote() To: lizhe.67@bytedance.com, alex.williamson@redhat.com, akpm@linux-foundation.org, jgg@ziepe.ca, peterx@redhat.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20250707064950.72048-1-lizhe.67@bytedance.com> <20250707064950.72048-3-lizhe.67@bytedance.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250707064950.72048-3-lizhe.67@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6vbLu3iSYwmbaWoZVA_JQ2d_ElMGXhJhrQFvGkzD-uU_1751873373 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 13CB54000D X-Stat-Signature: d6cx94uamd6pwiez486rzwsd9ngo8y9i X-HE-Tag: 1751873375-772894 X-HE-Meta: U2FsdGVkX19zH4BJVx0Cdg4jWw2qSMj/IX0bQcc/7qxDtRgQkn7Up9ESRvk1tdblfuuWtkf7E5tiYidFSwhezN9Vc3RUVChSctE+0hvCkn2wKLQlVaTWBTRMXtIvV/8X1LX443odiB4CB4UI5x93GbNbwQcokAPtt7OZWEoZQrTAwKbQkHGXj6pajhNWvPOPNKr/l3drc/s3bprd98KAkKg9xdzis1lfo95hhYrMnb1DZrHeYoGzvKZa8Suf9hiAHVBXF8gV3W+hWfNidVhemhPk3ArtT3vCVRcWrg00FQr7yTEe4ZUrRrZHq90INIBif0EfYPHf9vZggV0y8Bnb8AqNePCYb29rhFOzPFlOcz4jjunTQBeLlDlD8tJ9MlM2UaMUzHW4+LHkn5RLZ+EVIWD7pvXoWlmwkwYa/6Y/n57x0qBdR3KQw2ERlCdYRNLWn52R5lggfo3VTNd0xqpiyHxs9dDOy3XZGxEdjvMUGPf41d/scgDWQTkDMDDM2vL8/MfSu8JkK+Ok6Mkdoz5/12wan7xXy0QdgVRHujg8Y9GE/Hq4tRgr56+oK4ujnbI6qYET+1wZAvsp/Dttljz/7QIjZ/GSyvUyi41Aa4IIcnJIiZ4onz7RrRP/xdVEOCegP5jUwDhP4t78nXeV0UyAbRKarSUE83zSUTrW76JJLkxCzBpR2gfAoFb+SUUvo/fASXKzT8NvyEb7x/NTWFzlTdwTPh+1lOnwdC/7dx26/cRPebItaGt0jsoeWiIiEQQlefu1UKs8iMNiSoR3YXWU+Y8lL7hma91FuGvZjmiljsVPopLote9Y4toxbprSbmI5zjHlwSJpORnir7GAqhZXQ0JuiLRElxtTB0jZIjwacEmwTOFWXSwpNekmKvO3mLc20SpXvHmGrboZ6WHZAldDj+yrbbSjG5vn+NbB9WcJB1FIjni9h+mM2yY4/voJ/LQh7t8eKh1zwvgiMOwgtyD sDrUugVp oG93AKjyx3n9qSy4xW5XtItEndC138K/oIK5hwCK3fD4m2ab526D//XHn7UgTtrn/GYXFZSVT4jNwkBo4O+GuIGa44w3AnZFMap/wQQ9eNimkTl891o8WFmCuvL/BELM46cckQfYcmIUQzu28oLDazOmIwmQOMfh7yJKTcJk3EbgSpTezzeFh4IgsxZwcBez0DeoF0aCr56NmLa8sJtMZIZW4YMKNr+3UDl2kVLmH+IDlpUA5/54in42TgL3OUwSSU4yI7R1eD8zFCzrOL5gN9J/5ZyakwCmMXmT3FqgX2WCGklsE40/UJs7cU9iPl+DVujZ7UQz3WVIq406Hgpl7TsVO/OYXOxeZ2L4DpGMev7+1gk9HqW2805R/ARJj8Tt2bzuMcw2ggnUsSVy9MdntMcUAoSxcN599xjypT6y0hc73d2P2QCsVkUiOOpwdYrQ5FVEEt2Te+wxSKh5C3fKYFUDEhEFP/w7iuIRe0EU7Kb1jt4iSGpjHAhP4Tf9kFDVL4E8aqQWNRxHTeUc= 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 07.07.25 08:49, lizhe.67@bytedance.com wrote: > From: Li Zhe > > When vfio_pin_pages_remote() is called with a range of addresses that > includes large folios, the function currently performs individual > statistics counting operations for each page. This can lead to significant > performance overheads, especially when dealing with large ranges of pages. > Batch processing of statistical counting operations can effectively enhance > performance. > > In addition, the pages obtained through longterm GUP are neither invalid > nor reserved. Therefore, we can reduce the overhead associated with some > calls to function is_invalid_reserved_pfn(). > > The performance test results for completing the 16G VFIO IOMMU DMA mapping > are as follows. > > Base(v6.16-rc4): > ------- AVERAGE (MADV_HUGEPAGE) -------- > VFIO MAP DMA in 0.047 s (340.2 GB/s) > ------- AVERAGE (MAP_POPULATE) -------- > VFIO MAP DMA in 0.280 s (57.2 GB/s) > ------- AVERAGE (HUGETLBFS) -------- > VFIO MAP DMA in 0.052 s (310.5 GB/s) > > With this patch: > ------- AVERAGE (MADV_HUGEPAGE) -------- > VFIO MAP DMA in 0.027 s (602.1 GB/s) > ------- AVERAGE (MAP_POPULATE) -------- > VFIO MAP DMA in 0.257 s (62.4 GB/s) > ------- AVERAGE (HUGETLBFS) -------- > VFIO MAP DMA in 0.031 s (517.4 GB/s) > > For large folio, we achieve an over 40% performance improvement. > For small folios, the performance test results indicate a > slight improvement. > > Signed-off-by: Li Zhe > Co-developed-by: Alex Williamson > Signed-off-by: Alex Williamson > --- > drivers/vfio/vfio_iommu_type1.c | 83 ++++++++++++++++++++++++++++----- > 1 file changed, 71 insertions(+), 12 deletions(-) > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index 1136d7ac6b59..03fce54e1372 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -318,7 +318,13 @@ static void vfio_dma_bitmap_free_all(struct vfio_iommu *iommu) > /* > * Helper Functions for host iova-pfn list > */ > -static struct vfio_pfn *vfio_find_vpfn(struct vfio_dma *dma, dma_addr_t iova) > + > +/* > + * Find the highest vfio_pfn that overlapping the range > + * [iova_start, iova_end) in rb tree. > + */ > +static struct vfio_pfn *vfio_find_vpfn_range(struct vfio_dma *dma, > + dma_addr_t iova_start, dma_addr_t iova_end) > { > struct vfio_pfn *vpfn; > struct rb_node *node = dma->pfn_list.rb_node; > @@ -326,9 +332,9 @@ static struct vfio_pfn *vfio_find_vpfn(struct vfio_dma *dma, dma_addr_t iova) > while (node) { > vpfn = rb_entry(node, struct vfio_pfn, node); > > - if (iova < vpfn->iova) > + if (iova_end <= vpfn->iova) > node = node->rb_left; > - else if (iova > vpfn->iova) > + else if (iova_start > vpfn->iova) > node = node->rb_right; > else > return vpfn; > @@ -336,6 +342,11 @@ static struct vfio_pfn *vfio_find_vpfn(struct vfio_dma *dma, dma_addr_t iova) > return NULL; > } > > +static inline struct vfio_pfn *vfio_find_vpfn(struct vfio_dma *dma, dma_addr_t iova) > +{ > + return vfio_find_vpfn_range(dma, iova, iova + PAGE_SIZE); > +} > + > static void vfio_link_pfn(struct vfio_dma *dma, > struct vfio_pfn *new) > { > @@ -614,6 +625,39 @@ static long vaddr_get_pfns(struct mm_struct *mm, unsigned long vaddr, > return ret; > } > > + > +static long vpfn_pages(struct vfio_dma *dma, > + dma_addr_t iova_start, long nr_pages) > +{ > + dma_addr_t iova_end = iova_start + (nr_pages << PAGE_SHIFT); > + struct vfio_pfn *top = vfio_find_vpfn_range(dma, iova_start, iova_end); > + long ret = 1; > + struct vfio_pfn *vpfn; > + struct rb_node *prev; > + struct rb_node *next; > + > + if (likely(!top)) > + return 0; > + > + prev = next = &top->node; > + > + while ((prev = rb_prev(prev))) { > + vpfn = rb_entry(prev, struct vfio_pfn, node); > + if (vpfn->iova < iova_start) > + break; > + ret++; > + } > + > + while ((next = rb_next(next))) { > + vpfn = rb_entry(next, struct vfio_pfn, node); > + if (vpfn->iova >= iova_end) > + break; > + ret++; > + } > + > + return ret; > +} > + > /* > * Attempt to pin pages. We really don't want to track all the pfns and > * the iommu can only map chunks of consecutive pfns anyway, so get the > @@ -680,32 +724,47 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr, > * and rsvd here, and therefore continues to use the batch. > */ > while (true) { > + long nr_pages, acct_pages = 0; > + > if (pfn != *pfn_base + pinned || > rsvd != is_invalid_reserved_pfn(pfn)) > goto out; > > + /* > + * Using GUP with the FOLL_LONGTERM in > + * vaddr_get_pfns() will not return invalid > + * or reserved pages. > + */ > + nr_pages = num_pages_contiguous( > + &batch->pages[batch->offset], > + batch->size); > + if (!rsvd) { > + acct_pages = nr_pages; > + acct_pages -= vpfn_pages(dma, iova, nr_pages); > + } > + > /* > * Reserved pages aren't counted against the user, > * externally pinned pages are already counted against > * the user. > */ > - if (!rsvd && !vfio_find_vpfn(dma, iova)) { > + if (acct_pages) { > if (!dma->lock_cap && > - mm->locked_vm + lock_acct + 1 > limit) { > + mm->locked_vm + lock_acct + acct_pages > limit) { Weird indentation change. It should be if (!dma->lock_cap && mm->locked_vm + lock_acct + acct_pages > limit) { ^ aligned here Please don't drop acks/rbs already given in previous submissions. Acked-by: David Hildenbrand -- Cheers, David / dhildenb