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 4EDCFC83030 for ; Fri, 4 Jul 2025 08:47:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B47A56B8018; Fri, 4 Jul 2025 04:47:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AA4AB6B800A; Fri, 4 Jul 2025 04:47:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F71C6B8018; Fri, 4 Jul 2025 04:47:10 -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 70A486B800A for ; Fri, 4 Jul 2025 04:47:10 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1B28D1DB581 for ; Fri, 4 Jul 2025 08:47:10 +0000 (UTC) X-FDA: 83625952620.08.6C67C67 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id C169D120002 for ; Fri, 4 Jul 2025 08:47:06 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=V4GYMBaR; spf=pass (imf29.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1751618826; 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=LbMrib8JvYyiXcynM5A1QVLEBjssYP8T6GYqmTfTDCI=; b=1F/CxY6fbpB0kOkViU19fCoZA+Af8SP0Z5JbbkUhO8PAltckDlUK0c0yeNXR7BjSaWvbd2 0fvlp65fIAtnVsWlC0ph31Ij0ZPAePcuvZo1mGFYoHDpJLWkOUco7f2qd1kKR2IEcAQZyh P5UiqeQQoCWQIaoUDMoUSuLCI6UPBJk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=V4GYMBaR; spf=pass (imf29.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1751618826; a=rsa-sha256; cv=none; b=Fdpf/L3zwTLVSsCOhS0Rp5w0sUs8Ij8NiKzwnph8OPj9nozIr647zBByIdvpZWXCzZKJyt Gv7YblrJBDMQ1ZaerEbqddcUrUxmXulTg/vjVgpjAyKikN00moG8hSYQwhLkSMCzekOF65 u156ilpbTkPBSquiAp3D8+NCssLFuLM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751618826; 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=LbMrib8JvYyiXcynM5A1QVLEBjssYP8T6GYqmTfTDCI=; b=V4GYMBaRhrIg6y5B9smCCMuJOFbdRkzWEFYsTK3JLqkjUDWtn+vE1T2dk1u7p4uHoOHqHJ z4nZ1qS1KLDZySYfzTbcsf8SpW2LbL2ctARSVzlH2O+WFa3m4TBS8nA8mJk4AB1IMq5uIZ Ia+KNOB8nJ5MXTU9DzwwfZNxUaays+k= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-6lvBuoB4OiGZyOVjCfrs5w-1; Fri, 04 Jul 2025 04:47:04 -0400 X-MC-Unique: 6lvBuoB4OiGZyOVjCfrs5w-1 X-Mimecast-MFC-AGG-ID: 6lvBuoB4OiGZyOVjCfrs5w_1751618823 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-450eaae2934so5718115e9.2 for ; Fri, 04 Jul 2025 01:47:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751618823; x=1752223623; 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=LbMrib8JvYyiXcynM5A1QVLEBjssYP8T6GYqmTfTDCI=; b=AX2avpj9DtFfy3zIY6N52Yj+SKetEwl5AsedSfWtthNtNh2sCRYguvP3BbFDXzN9Nd pbfB+ikLStKzuJkc+rVcKUE0vytgXRFxcmxbte66itrmhxb7504H2PNjlu/FmpEHdqlo SnW3KTJUnwQMR0fa6ZXEpxDfZyUBcXAT9v7e2zEO4kBiCjZCdknVH7RI1VVzJQAtSs+T /ZxBp6Bl2vkHwBqHDC2XZFhUrs7jlwx8QGaKGmf8PBwMurTF1fXh3q0BQoLZWn/dwBtN +g8vLgR+WSHkGU9I2PdU4SJIS6wE0zzzyZ7Gq0Rqllt6rUWzPcurNB3fDRsszjntuB68 Lm9A== X-Forwarded-Encrypted: i=1; AJvYcCUt7f4G3tQ2yejCHinssXt0l1v43EVmMpDrJVXKK3++FeJ9spTuUmWUYClfqjzpx5PgZw2uZ4RQ3w==@kvack.org X-Gm-Message-State: AOJu0Yx6qK/30Yn7uq7BLMZxUX7g6wlUQfVFxBW3DlLzNWRA+Gb6iOMr QJyolndW38NQIMlXMiRsuy7/33/Sex3aVznT12z9INSPxBw4au4oqGuTPsxIx4Oxixd+MHciFjK cf8GMhJuPR9yuwia5IAwaxO/NDZBih6NqCk/KmVopNYPsc4DcGIK+ X-Gm-Gg: ASbGncvysldY80EjcriAYrYaUloS0p0yxi1vvfv9westaQcS0k4akMEeN3/63QkPYg7 4Q5ZUIeeWG7u3ncWau33UKuQ3SSM3hOh6DYso+9pJnuIorPK3OZ9eAYzf1orfgP0/ex4DOiPXsu woDevGkLIq/nw0bflHiX7+t34GhdLPtJ9h2cUVtvdYkwTgi//BZD4N5ut/QOfNuEfzhhIqm7Eds jK0KvsQ3GmG0vI/IxW6DfyGerD1caZkuqBznJyHdeg3ukufnbfSQUf5v8RUwKW/S+0kyO4Cx+bx W9Q/9vWCwJ6bbyILfDK02vhYc5eKZkRc/ZYjk8AxpPOLfMaqW3hFA8s7+p3LOsEptIuTpGeXkhG HMUsEW74s0Q3HQrdDcpnDzir39sVn4dq9J8vfDhd71R33ukM= X-Received: by 2002:adf:a382:0:b0:3a4:dc42:a0ac with SMTP id ffacd0b85a97d-3b4966273ffmr891510f8f.49.1751618823184; Fri, 04 Jul 2025 01:47:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsRw575uw5CU78q39R0CUYNm5iiO5mve3sqDMWqmFqXrOdrE69CcShRjEvR2Lebt4eraqamQ== X-Received: by 2002:adf:a382:0:b0:3a4:dc42:a0ac with SMTP id ffacd0b85a97d-3b4966273ffmr891481f8f.49.1751618822420; Fri, 04 Jul 2025 01:47:02 -0700 (PDT) Received: from ?IPV6:2003:d8:2f2c:5500:988:23f9:faa0:7232? (p200300d82f2c5500098823f9faa07232.dip0.t-ipconnect.de. [2003:d8:2f2c:5500:988:23f9:faa0:7232]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b4708d0af7sm1973309f8f.35.2025.07.04.01.47.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 01:47:01 -0700 (PDT) Message-ID: <77d99da0-10eb-4a4d-8ad9-c6ec83cb4540@redhat.com> Date: Fri, 4 Jul 2025 10:47:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 5/5] vfio/type1: optimize vfio_unpin_pages_remote() To: lizhe.67@bytedance.com, alex.williamson@redhat.com, akpm@linux-foundation.org, peterx@redhat.com, jgg@ziepe.ca Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20250704062602.33500-1-lizhe.67@bytedance.com> <20250704062602.33500-6-lizhe.67@bytedance.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250704062602.33500-6-lizhe.67@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 49H5jYQYonksjWRvoYvciV14FvfYzQhYqn5cTQZYWj8_1751618823 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: rspam10 X-Rspamd-Queue-Id: C169D120002 X-Rspam-User: X-Stat-Signature: 3nj5qg94wn5qa5ijzykdtau3o8dacuam X-HE-Tag: 1751618826-275656 X-HE-Meta: U2FsdGVkX19EmPNBxTDneDQ/LAe3I7wiigHOuPP1Zt0tfYzcEKWMcyH81uiBSifnOc+wHaRS3BW7/3V8NRuN22Iku/XCOm3TpUQAqYc7p3w5wzajZaYpje11lHCfKjN52XQElJRZgfP85FOIEDiOhebG+uH8TolPnt0c6xt5G7NFPRFkEihTpIj/Kt/4Uc7MGJi4jOghDTCLZmVB8qJ2NAjjNqSAqNcbkIPAl2Urr5Wdsoot2PgE4UXWFOG2gMS8Iu9V0ieJv/5n+sCYOcAckWSqo3t1e1geMbGF4ShQe6N5ynsgzOZ02u+fYtE05VU/+A8sz1EsuoZZp9JKq4vlO14MD8/YHi8IotentZP/U/2nWl23tMTLE3pBLeXdvf22M63CyBD5Sheruo+QqWzEeEtB/zdmoPdCgrsxan7UU+D/ecvDo3kYpXK4vA2FpLj2PHiqzlZlaista7iOBdvG7CeJgaXbtopXfy5zfm2rJx2MmXlCYrRRYi1zfVigY/346EUGNY6UMSKix5wmEaa/L+WyRmCdiOVRL8/9C63sYK9Sq4FEOxr/fYyprAMxYH8IG+VKavHpvtxBzBXojTBuCu5gSRIEJNpZI+azR1pA81pMsLZP5r+Vum8rgyXUJ2MGFh/GVZIwedaM3RqfF30Md3eRSmihDUWtNcvwWGl7T7PnKyhOsWzeKSDzZBgjaZray0uklmHtJma3D2HFrjyvFB+pT8Vo0gNzG4Rfns642tNjlHuMObyG+e9xTT/gQJR3xPa1zkDzydoNaFAYxmVCN+8ZMFXZRNCL/ug7t6/ha6DNhAbyoUk2cl9FMCqBdgD0Zu7h58hg0S5xJdpxQMz/83HwZcOzLnZLpSId13A0sp1NToyoFEijUrG0RBDvKcK3PGOzricCwfUck2FVBxyVzBnEJNUS0unzrNsRcD7wzyeEeWwMNCqwpzyNfTeMCh/Wfittqy5aeGH8N2eltW5 6pRkY6X7 Oc4MLl4mrFEn/WbIK4pmsMGEuVTKMVm7AVNqGxhAzvzI5pRC88qwO146KEslC+jjLS0W9k7yB2N23ue2EQDG+8g6aFeyGaRIc8Ijl2xrd7b6c5YIquXLqXoPvv5RMhFNRa7UwZwn6NPukhYAZQHUAJ+ZP4dEZ+zYhoJDkFmLlSO1oWHUCzuSoqYYkHzlTc8ArOe5aOoQCqzXvsFHEzQpIC0g5jtkn5YWwB+poz3H96u/Ca/HqPMT/j/B9XEmoGE0PkyL1fDxAU7LcQsEA0L8cGJ2P2sbga7XtLFLCrBqPrn/bQu7UdTViC0ju+Q0WezScB/8psO9zIRWmfk+rL2g9Da5kUJKmpX08RIFko2ps2tETBEPaCtbKWZw505HiIZCTKD6kEkO85j8GsepXaHcwFJX75KDKzqIJwMnKmNMAQh8ZDleNLq9EH0/C0k4Rg83HybeJ8iqSmOk80bsLQsTJq9Av3ivjx1D0kUm13Od/HQ+Ora2U50IGGsqIO5kdbL6d+fVsu+cQS5xtRkFerVsbWzBcqUUE0XVV9NZ4izyzbFxVP16Clh2A2WqETvIitVxRGAvXhdpbv/Fd6x6lNmPcvhOAi03FMCs31/6Bjcm2yEG1Y/M= 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 04.07.25 08:26, 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. > > It would be very rare for reserved PFNs and non reserved will to be mixed > within the same range. So this patch utilizes the has_rsvd variable > introduced in the previous patch to determine whether batch put_pfn() > operations can be performed. Moreover, compared to put_pfn(), > unpin_user_page_range_dirty_lock() is capable of handling large folio > scenarios more efficiently. > > The performance test results for completing the 16G VFIO IOMMU DMA > unmapping are as follows. > > Base(v6.16-rc4): > ./vfio-pci-mem-dma-map 0000:03:00.0 16 > ------- AVERAGE (MADV_HUGEPAGE) -------- > VFIO UNMAP DMA in 0.135 s (118.6 GB/s) > ------- AVERAGE (MAP_POPULATE) -------- > VFIO UNMAP DMA in 0.312 s (51.3 GB/s) > ------- AVERAGE (HUGETLBFS) -------- > VFIO UNMAP DMA in 0.136 s (117.3 GB/s) > > With this patchset: > ------- AVERAGE (MADV_HUGEPAGE) -------- > VFIO UNMAP DMA in 0.045 s (357.0 GB/s) > ------- AVERAGE (MAP_POPULATE) -------- > VFIO UNMAP DMA in 0.288 s (55.6 GB/s) > ------- AVERAGE (HUGETLBFS) -------- > VFIO UNMAP DMA in 0.045 s (353.9 GB/s) > > For large folio, we achieve an over 66% performance improvement in > the VFIO UNMAP DMA item. For small folios, the performance test > results appear to show a slight improvement. > > Suggested-by: Jason Gunthorpe > Signed-off-by: Li Zhe > --- > drivers/vfio/vfio_iommu_type1.c | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index 13c5667d431c..3971539b0d67 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -792,17 +792,29 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr, > return pinned; > } > > +static inline void put_valid_unreserved_pfns(unsigned long start_pfn, > + unsigned long npage, int prot) > +{ > + unpin_user_page_range_dirty_lock(pfn_to_page(start_pfn), npage, > + prot & IOMMU_WRITE); > +} > + > static long vfio_unpin_pages_remote(struct vfio_dma *dma, dma_addr_t iova, > unsigned long pfn, unsigned long npage, > 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++; > + if (dma->has_rsvd) { > + long i; No need to move "long i" here, but also doesn't really matter. > > + for (i = 0; i < npage; i++) > + if (put_pfn(pfn++, dma->prot)) > + unlocked++; > + } else { > + put_valid_unreserved_pfns(pfn, npage, dma->prot); > + unlocked = npage; > + } > if (do_accounting) > vfio_lock_acct(dma, locked - unlocked, true); > Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb