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 E821CC71157 for ; Tue, 17 Jun 2025 13:47:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88A096B0089; Tue, 17 Jun 2025 09:47:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 83B656B008A; Tue, 17 Jun 2025 09:47:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7515E6B0095; Tue, 17 Jun 2025 09:47:18 -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 6385B6B0089 for ; Tue, 17 Jun 2025 09:47:18 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1C15614029D for ; Tue, 17 Jun 2025 13:47:18 +0000 (UTC) X-FDA: 83565019356.03.1DD7345 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 298CE10000B for ; Tue, 17 Jun 2025 13:47:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T8bmQm4c; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750168035; a=rsa-sha256; cv=none; b=zVYg9aw6KwLGwYJdmvW5acXGFZwyWVHVrC5cBb4A7AU4+poU3M3D2IV0HAmImUrP/NrKYh MEXlfwZ5aVMgx5oFylwYL9YndNiUP4jwQpIMUinqtFmzicc+jKVQsdGT42Rv2cFlUWrQ4M 3Pq1tYzIew/AQdi+BjcM+kLCf04N4K8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T8bmQm4c; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750168035; 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=bp6ENcV0aA4vnCPH9W0BnZj/GXwwIDGb2kBXy/7zwAc=; b=IyFtlEiQtnyGn6YMGAcQUvEqEIxz8FM9VgZ4vb98fjxOuU+GQsZq3qEJTO2lcazivLRRWx 1iAoYBTR5iIeANLiHJ2BGSPA5ClhQkI9zzqXmuMTvR4cj/KeTrV/X9rMaLYVC8T/aoFoGl C1Q3xI0R0sgAJe3ogZKANnODNANlkIM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750168033; 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=bp6ENcV0aA4vnCPH9W0BnZj/GXwwIDGb2kBXy/7zwAc=; b=T8bmQm4cSeiRRn9DLAUuB+Ro4RGQL0YFvUtSYOgYEt0DiexDNp8kGEfw386ZHkybmwdtrY 4DluxA0xaYKDE/a/+lkZtz4vKC2rNiewFxMlsankT7PATch1BjtrUPUcOiSfX/fXUIc5W5 tIk9y+f2JiFOug5EhPW5hvY3gbhfPCA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-402-RXlraZa9N-Kuvhf0kfvQkA-1; Tue, 17 Jun 2025 09:47:12 -0400 X-MC-Unique: RXlraZa9N-Kuvhf0kfvQkA-1 X-Mimecast-MFC-AGG-ID: RXlraZa9N-Kuvhf0kfvQkA_1750168031 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-45334219311so21901565e9.2 for ; Tue, 17 Jun 2025 06:47:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750168031; x=1750772831; 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=bp6ENcV0aA4vnCPH9W0BnZj/GXwwIDGb2kBXy/7zwAc=; b=QmJHo1T7WIIyD4pHkF5CQ+GUHrJALN+t30us11ZQfy+Fbm1ooEyiz7PAIFTjxLf1IR XjgKovF17XPSfpHdv/M0iQRF2ay+s9GvaZCjQ2T+0/p8wrT7Nd0mpI3mqAK82nF2lKSH V6WayNji5LmLMtbFCXZnTrv/cikaTAnxOoJqO2DMe903vBvqc94/1BTmPyIDX4zdY/AL V28X7Clmh3KS06yCN690gKGcpzflpS84/5/P30YMXeaOKQVw/WmzyXFr5iMQZYbkREl1 O+u3SyLCHUpA3iOMIUhd862/9KLA3tR6BvbslnNjR8v2tYSVg3xDDLFy7e3WlDEXQoMY w8AA== X-Forwarded-Encrypted: i=1; AJvYcCVtBRq3JgpYxyY8iFLosqC6fn0opOZF7/ALXPOT9UGDGRc111k/GggfXHkPwaSAMvKt/HMfqp+hQg==@kvack.org X-Gm-Message-State: AOJu0YzFvCUeSDFfmLPvk/830w3aSBUT0SiNqoTx9df+r3mwTg/BzQ0M 2Jcilp0Fp6hn9oSrLf9XxFTYbXXXA+G3A3iY5XY0nBBOrBajss+kF2YfT/s1gJZ7Y6uQRSoV/Z6 T2FF6vaXSusCf6ch7Yo4vkiAfCWdGnJh59lxfoJge2FDkG2dtuekU X-Gm-Gg: ASbGncsI1ED7z3zp0S5dw0usiXYkncUUKdcqW/eCVCnMwWufEVnDmEMoletBNFslVSw qKRZerlBcApr2YSaziDBNzFlqgPwKk4syYxtwtXt0ZxY2Csmf8AN7H/oJIUhtKEWXmA2Hanhe6O GTXuVx/bSpolok58b969RtMlji0NnoVy1EVxfLZHNDWtAvdp2QKibc91EYUyVYPnWM1bM7D2J3X pmd3nRVHLJk7jtwRCS4epuMidNEO2sGRmlrnO5Py2J3c4k0HsvcIHeSnxkrHr7IjZCNMZW7tN8s WTNti1iIaPFjAja+ENDAbGcNdqmIUBrFsP+bK53tlHPKLpGlGjVGjpYkJyCxQM1+NiRYBiNDcRg wBOWGHcW91CgFcX0Uaia6WPmYcV+K54zy6l6IDJsqv1cqROI= X-Received: by 2002:a05:6000:26c9:b0:3a5:3b03:3bc6 with SMTP id ffacd0b85a97d-3a5723a3b1bmr11136832f8f.28.1750168031151; Tue, 17 Jun 2025 06:47:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVmSmymoptVLD56Q0F0aGhFd2deYP5b/9WMJydaeD500eQ6DyIM+aFL3Ip+nyZDxwm/Dcb8A== X-Received: by 2002:a05:6000:26c9:b0:3a5:3b03:3bc6 with SMTP id ffacd0b85a97d-3a5723a3b1bmr11136812f8f.28.1750168030779; Tue, 17 Jun 2025 06:47:10 -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-4532e2522b1sm174366915e9.25.2025.06.17.06.47.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 06:47:10 -0700 (PDT) Message-ID: Date: Tue, 17 Jun 2025 15:47:09 +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 Cc: akpm@linux-foundation.org, alex.williamson@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, peterx@redhat.com References: <20250617124218.25727-1-lizhe.67@bytedance.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250617124218.25727-1-lizhe.67@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: W2a0uuyrkURYrEY08ittSBEK2sDLqxq_ufXKLZKQaUw_1750168031 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: rspam08 X-Rspamd-Queue-Id: 298CE10000B X-Stat-Signature: bddycumpx7qukmmkz1hts56f6st8iadn X-Rspam-User: X-HE-Tag: 1750168033-427694 X-HE-Meta: U2FsdGVkX1+XpTFkvpJqYwL/uZbZlr7TCaExM3s1lyu2GiN1JU03zdlN6yMTG/P/N28AU0JlSkjgWK4B1XmY50nJtgP3J1ErI8/U2jFrrotnj0XBwyPNfX4UDx8+2xPxFTOO5EjwfY0MpbowDkH9pk/aB02OS/8jpnBItKJy3Tlf3JauMpue0EcPr68CRQiSmGVPAgKbad0hcssbIfiOyq0HE/q0u4+GT2T7rLmaJeFyDAc/ZPExQlhqSzZPDaaGogWt6FujKUBxKCQbwFa6ZCq67J33WW59MHPmtnv9sYHyjCHiSSX684GTmTOdoC3iFs8LDKXL7fLeKya1t3L75GxgCfK2Io8YAJZIgicopHlohwljg502ljHD6w23byBhJ+tZY2Q9kmP6AJbBeDwIImCXyg0PbGkYJs17gGves/hILQBwRc7yof4fgKdXKWv78Ne0D9yCD9rHfiIOBzdor9PLhGV9ZvovO/nYsaCSxLri/vL7/ib/aS37WzSfOPr9lCWAi8TfHDsAWOkknC/VPxken09U9QOzKSJ7ySP70YhJeZL77JLkuTlcflz6s6pba0R3z0vxaaZ5ysINiArNiR+GH0QjRR7Ul8rIFQijsWffpW3R30qVobKEQFDHsTzZ8GxyUih2/2y01ZndLrJRN5qzDiQPwKRvGbqKQJv7sD3Nt464j+7r+rHNfMfMZt0t8ZzfI5tQU5Noicx9w+KhNrrb3Lvnp+OVdWfOSBZS0p03+b9KCzVcf7p6ztPfM5Ojt/J0XcFh/S3HmEGamoVj8KO7bRZ47nb1y6hg3cjkibNmoSGJDQuMyZmCdF+RyudslrKbinb90XgCufHNbmyznbNP9oy+J5X+zptZ/luC+RNvAb1u45tlIgM7lNo7avkWpG2ii8kfT7eXIuNd8WB678TLbacoOtCPg22xyQZ7Q4ovqdTivMPc8e6WdWc73rtZw52vcmWOAs+ce1G2A/H i410/ijh 0A0XpaSxJJYRprg2EcN5yOgyjvOLVo4IB2MOLFBbHvSaBc4ek5n9ZoKcP0BalH5lnvczgUz1pNrxt/3YsDWStCGd0eXOKWVw2ha83XArf64hQAegIDESrLvhaJ7AGIsqOcWOX6g7X0972S8XiOwg2NaWq2wwYkteLDySRFnriwa4wPSH2nc8xPXogWGHx/AHRE0eqHqTkRrte8tynyk5TkBSVgPffFIOMtawLR6WVaHZHmfAPEMM6V0KbdoHmFhtMTHHujb6lmLHY8SY/6dQygRSe0I2AdHETtOInbEBCMcBRyJjf2f0ezMBz1yECzmk7DWgUWiSpc1Vhl0yOZvklLbn2KAM50+J3wS2RrYD3Lkc+brYu25oMRzrmGmC79uqOq7sCH1/8Bh3issymP0OnprFyGv5HAyrks3gNLdAecWoDFhc5LAeWBK5hK115UqrGWVN6i+27OiSqGeh/URuIVXE7oSO/3GEnz6Q+xmQwyqtNMt2yND4Y5bbSGw== 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 14:42, lizhe.67@bytedance.com wrote: > On Tue, 17 Jun 2025 11:49:43 +0200, david@redhat.com wrote: > >> On 17.06.25 11:47, lizhe.67@bytedance.com wrote: >>> On Tue, 17 Jun 2025 09:43:56 +0200, david@redhat.com wrote: >>> >>>>> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c >>>>> index e952bf8bdfab..d7653f4c10d5 100644 >>>>> --- a/drivers/vfio/vfio_iommu_type1.c >>>>> +++ b/drivers/vfio/vfio_iommu_type1.c >>>>> @@ -801,16 +801,43 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr, >>>>> return pinned; >>>>> } >>>>> >>>>> +/* Returned number includes the provided current page. */ >>>>> +static inline unsigned long folio_remaining_pages(struct folio *folio, >>>>> + struct page *page, 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)); >>>>> +} >>>> >>>> Note that I think that should go somewhere into mm.h, and also get used >>>> by GUP. So factoring it out from GUP and then using it here. >>> >>> I think I need to separate this out into a distinct patch within the >>> patchset. Is that correct? >> >> Yes, that's what I would do. > > How do you think of this implementation? > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 242b05671502..eb91f99ea973 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2165,6 +2165,23 @@ static inline long folio_nr_pages(const struct folio *folio) > return folio_large_nr_pages(folio); > } > > +/* > + * folio_remaining_pages - Counts the number of pages from a given > + * start page to the end of the folio. > + * > + * @folio: Pointer to folio > + * @start_page: The starting page from which to begin counting. > + * > + * Returned number includes the provided start page. > + * > + * The caller must ensure that @start_page belongs to @folio. > + */ > +static inline unsigned long folio_remaining_pages(struct folio *folio, > + struct page *start_page) > +{ > + return folio_nr_pages(folio) - folio_page_idx(folio, start_page); > +} > + > /* Only hugetlbfs can allocate folios larger than MAX_ORDER */ > #ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE > #define MAX_FOLIO_NR_PAGES (1UL << PUD_ORDER) > diff --git a/mm/gup.c b/mm/gup.c > index 15debead5f5b..14ae2e3088b4 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -242,7 +242,7 @@ static inline struct folio *gup_folio_range_next(struct page *start, > > if (folio_test_large(folio)) > nr = min_t(unsigned int, npages - i, > - folio_nr_pages(folio) - folio_page_idx(folio, next)); > + folio_remaining_pages(folio, next)); > > *ntails = nr; > return folio; > diff --git a/mm/page_isolation.c b/mm/page_isolation.c > index b2fc5266e3d2..34e85258060c 100644 > --- a/mm/page_isolation.c > +++ b/mm/page_isolation.c > @@ -96,7 +96,7 @@ static struct page *has_unmovable_pages(unsigned long start_pfn, unsigned long e > return page; > } > > - skip_pages = folio_nr_pages(folio) - folio_page_idx(folio, page); > + skip_pages = folio_remaining_pages(folio, page); > pfn += skip_pages - 1; > continue; > } > --- Guess I would have pulled the "min" in there, but passing something like ULONG_MAX for the page_isolation case also looks rather ugly. -- Cheers, David / dhildenb