From nobody Tue Sep 29 07:39:18 2026 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDA1C43E9F6 for ; Mon, 10 Aug 2026 19:50:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391448; cv=none; b=C5aoC4XQ4V/vIBfPJpI8RnzmhjLu1CIBbyjxKPluPTaVLeRbXOBf2eEjYBlMW+00voRJ58z4pibddTz5knRGAbQO9R8YLP9/1Q/ecLEfmMOL+N4cRn1wiQVF487luF0Aegy47/pUsP8E0n96Z8tiV6oHIlLk+6hzeKAP1Hdzzho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391448; c=relaxed/simple; bh=CnTgnM+jFyhTuBY2TTtNYI/alIsooOib1uqYptBoal4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QgszoJw+iInewoQeFwRc99FcZc8JnvtWJb0dXAqo0EWQxJPXRyACTO9UU+KtHkXZtcoGBwIk9YeJEux416RcebSRwYt1QJE/coAiqeK9MVXi15daoE2lGJXCPXfJ/pMhX17izUR54VyGESLjiDfT+FzZeoiUjuY1gLxNF8ggb8M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LEpU4zk7; arc=none smtp.client-ip=209.85.215.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LEpU4zk7" Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c88cfe287e1so2005287a12.1 for ; Mon, 10 Aug 2026 12:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786391445; x=1786996245; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Yau5OO7TfkhRT7K4kYE2vJH8+jBLr1w6qdTgmitcoQQ=; b=LEpU4zk7QECehpM2WgbHsuyqStbJzf5544jcLo4x7YkuvnEgHHg0/hBfu8bi4KVtLd 5Bfb5RwzFyhMzm84Hg/F/LJcK1ZGI5QZVrcREp1p2OAFtRu6gc1M48yzS4Mh/1pGj1mG 6bDIzkrZrQ8GUfFsjVyk6Ee4EwfxmELmi3Vym4vJVCt6Y4P5CvHyOLHdD9/rCiLQ1ZJT dSmrZx1fZWwoaoSiT9GTzd/w03qYBsIJ87KxiVCr7t+KesaBNSKxkc6csJnbuzqLTzhs HSkyddSLJOG8B/7A0pcSqvIw8FGsB7IF7Ihvtq30OzMwaxGvvzkhwQIdpsHdYeQi0xqE FkIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786391445; x=1786996245; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Yau5OO7TfkhRT7K4kYE2vJH8+jBLr1w6qdTgmitcoQQ=; b=GzNv3mxyYsyw1ZCtB24P5+1TYbVp2Q65ioxlgxWLCehx8vBcd0ZtNafso1OjuGAyuv 2dXrfbEjHdcIzAlvI2Liqp4ST/TNzHApDlPpKl9JjMpbxwhNZ4XIlepfLJKXChMFvXs7 EdT/FETGp/UwSC7Cf/S29pgs6hFbtafm+9JmsgtthigdZKNPoEnbQ48eVCALdr7PqMBR DEhhxlWb4c2EebaatvUQ5MFzKc5d6NV04raNFU4UjrBAzEHuzZWtRW6GLW6akHbF7Wb8 kFd54zA4pXUs+7h5yuu9BQ3udEbp8z2NtKpNIBuOru7VOMsqAMd0cl1mr823jFZ4VuUL E6Fg== X-Forwarded-Encrypted: i=1; AHgh+RqCSPwpBj0dqZQ00WYIRyoDJBadN+lYNzSm68I2OdVUPY/gNtzm5JVffHksHCYN79Jul7K2m7L7QcrgqhM=@vger.kernel.org X-Gm-Message-State: AOJu0Yyf2t6ebhQWaRb5sMBUYrwMWxNffONsiUxWflrBP341HOOQCHiv dtiGggbX55eL2EOScqcuNrCbxUrfeyigwxULMY5Jck3uFS3lgEjzu9z+kFFXAlLLJ0j2FO+UsAc BAw== X-Received: from pgq15.prod.google.com ([2002:a63:104f:0:b0:c85:6deb:ee45]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d8b:b0:3b4:7eb0:47aa with SMTP id adf61e73a8af0-3cbadc6f26cmr32631437637.25.1786391444782; Mon, 10 Aug 2026 12:50:44 -0700 (PDT) Date: Mon, 10 Aug 2026 19:50:35 +0000 In-Reply-To: <20260810195040.2877784-1-praan@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260810195040.2877784-1-praan@google.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog Message-ID: <20260810195040.2877784-2-praan@google.com> Subject: [PATCH v5 1/5] nfs: make nfs_page pin-aware From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Modernizing the NFS Direct I/O path to use iov_iter_extract_pages() introduces page pinning (GUP) instead of standard page referencing. To handle this correctly, nfs_page must track whether it holds a pin or a standard reference. Introduce a new flag, PG_PINNED, to struct nfs_page. Update the creation path (nfs_page_create_from_page and nfs_page_create_from_folio) to accept a pinned bool and set the flag accordingly. If the page is pinned, we skip the existing reference increment (get_page/folio_get) as the pin itself acts as a reference. Update nfs_clear_request() & nfs_direct_release_pages() to use unpin_user_page() or unpin_user_folio() instead of only refcount decrement (put_page) when PG_PINNED flag is set. Finally, ensure subrequests inherit the pinning status from their parent request. Signed-off-by: Pranjal Shrivastava --- fs/nfs/direct.c | 22 +++++++++++++++------- fs/nfs/pagelist.c | 40 ++++++++++++++++++++++++++++++---------- fs/nfs/read.c | 2 +- fs/nfs/write.c | 2 +- include/linux/nfs_page.h | 3 +++ 5 files changed, 50 insertions(+), 19 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index e626c72495e6..19792a38c924 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -165,11 +165,17 @@ int nfs_swap_rw(struct kiocb *iocb, struct iov_iter *= iter) return 0; } =20 -static void nfs_direct_release_pages(struct page **pages, unsigned int npa= ges) +static void nfs_direct_release_pages(struct page **pages, unsigned int npa= ges, + bool pinned) { unsigned int i; - for (i =3D 0; i < npages; i++) - put_page(pages[i]); + + if (pinned) { + unpin_user_pages(pages, npages); + } else { + for (i =3D 0; i < npages; i++) + put_page(pages[i]); + } } =20 void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, @@ -371,7 +377,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nf= s_direct_req *dreq, unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); /* XXX do we need to do the eof zeroing found in async_filler? */ req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - pgbase, pos, req_len); + false, pgbase, pos, + req_len); if (IS_ERR(req)) { result =3D PTR_ERR(req); break; @@ -386,7 +393,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nf= s_direct_req *dreq, requested_bytes +=3D req_len; pos +=3D req_len; } - nfs_direct_release_pages(pagevec, npages); + nfs_direct_release_pages(pagevec, npages, false); kvfree(pagevec); if (result < 0) break; @@ -907,7 +914,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); =20 req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - pgbase, pos, req_len); + false, pgbase, pos, + req_len); if (IS_ERR(req)) { result =3D PTR_ERR(req); break; @@ -950,7 +958,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, desc.pg_error =3D 0; defer =3D true; } - nfs_direct_release_pages(pagevec, npages); + nfs_direct_release_pages(pagevec, npages, false); kvfree(pagevec); if (result < 0) break; diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 7dd478ffc2fa..606b518fa204 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -404,20 +404,28 @@ static struct nfs_page *nfs_page_create(struct nfs_lo= ck_context *l_ctx, return req; } =20 -static void nfs_page_assign_folio(struct nfs_page *req, struct folio *foli= o) +static void nfs_page_assign_folio(struct nfs_page *req, struct folio *foli= o, + bool pinned) { if (folio !=3D NULL) { req->wb_folio =3D folio; - folio_get(folio); + if (pinned) + set_bit(PG_PINNED, &req->wb_flags); + else + folio_get(folio); set_bit(PG_FOLIO, &req->wb_flags); } } =20 -static void nfs_page_assign_page(struct nfs_page *req, struct page *page) +static void nfs_page_assign_page(struct nfs_page *req, struct page *page, + bool pinned) { if (page !=3D NULL) { req->wb_page =3D page; - get_page(page); + if (pinned) + set_bit(PG_PINNED, &req->wb_flags); + else + get_page(page); } } =20 @@ -425,6 +433,7 @@ static void nfs_page_assign_page(struct nfs_page *req, = struct page *page) * nfs_page_create_from_page - Create an NFS read/write request. * @ctx: open context to use * @page: page to write + * @pinned: true if page is pinned * @pgbase: starting offset within the page for the write * @offset: file offset for the write * @count: number of bytes to read/write @@ -435,6 +444,7 @@ static void nfs_page_assign_page(struct nfs_page *req, = struct page *page) */ struct nfs_page *nfs_page_create_from_page(struct nfs_open_context *ctx, struct page *page, + bool pinned, unsigned int pgbase, loff_t offset, unsigned int count) { @@ -446,7 +456,7 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, ret =3D nfs_page_create(l_ctx, pgbase, offset >> PAGE_SHIFT, offset_in_page(offset), count); if (!IS_ERR(ret)) { - nfs_page_assign_page(ret, page); + nfs_page_assign_page(ret, page, pinned); nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -457,6 +467,7 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, * nfs_page_create_from_folio - Create an NFS read/write request. * @ctx: open context to use * @folio: folio to write + * @pinned: true if folio is pinned * @offset: starting offset within the folio for the write * @count: number of bytes to read/write * @@ -466,6 +477,7 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, */ struct nfs_page *nfs_page_create_from_folio(struct nfs_open_context *ctx, struct folio *folio, + bool pinned, unsigned int offset, unsigned int count) { @@ -476,7 +488,7 @@ struct nfs_page *nfs_page_create_from_folio(struct nfs_= open_context *ctx, return ERR_CAST(l_ctx); ret =3D nfs_page_create(l_ctx, offset, folio->index, offset, count); if (!IS_ERR(ret)) { - nfs_page_assign_folio(ret, folio); + nfs_page_assign_folio(ret, folio, pinned); nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -498,9 +510,11 @@ nfs_create_subreq(struct nfs_page *req, offset, count); if (!IS_ERR(ret)) { if (folio) - nfs_page_assign_folio(ret, folio); + nfs_page_assign_folio(ret, folio, + test_bit(PG_PINNED, &req->wb_flags)); else - nfs_page_assign_page(ret, page); + nfs_page_assign_page(ret, page, + test_bit(PG_PINNED, &req->wb_flags)); /* find the last request */ for (last =3D req->wb_head; last->wb_this_page !=3D req->wb_head; @@ -552,11 +566,17 @@ static void nfs_clear_request(struct nfs_page *req) struct nfs_open_context *ctx; =20 if (folio !=3D NULL) { - folio_put(folio); + if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) + unpin_user_folio(folio, 1); + else + folio_put(folio); req->wb_folio =3D NULL; clear_bit(PG_FOLIO, &req->wb_flags); } else if (page !=3D NULL) { - put_page(page); + if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) + unpin_user_page(page); + else + put_page(page); req->wb_page =3D NULL; } if (l_ctx !=3D NULL) { diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 2b70bd2b934b..e7497b029d6c 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -324,7 +324,7 @@ int nfs_read_add_folio(struct nfs_pageio_descriptor *pg= io, =20 aligned_len =3D min_t(unsigned int, ALIGN(len, rsize), fsize); =20 - new =3D nfs_page_create_from_folio(ctx, folio, 0, aligned_len); + new =3D nfs_page_create_from_folio(ctx, folio, false, 0, aligned_len); if (IS_ERR(new)) { error =3D PTR_ERR(new); if (nfs_netfs_folio_unlock(folio)) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index d2b03ceaeb4f..e565b811d8b7 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1088,7 +1088,7 @@ static struct nfs_page *nfs_setup_write_request(struc= t nfs_open_context *ctx, req =3D nfs_try_to_update_request(folio, offset, bytes); if (req !=3D NULL) goto out; - req =3D nfs_page_create_from_folio(ctx, folio, offset, bytes); + req =3D nfs_page_create_from_folio(ctx, folio, false, offset, bytes); if (IS_ERR(req)) goto out; nfs_inode_add_request(req); diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 4b9a35dbc062..fd7aafe7cb54 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -38,6 +38,7 @@ enum { PG_REMOVE, /* page group sync bit in write path */ PG_CONTENDED1, /* Is someone waiting for a lock? */ PG_CONTENDED2, /* Is someone waiting for a lock? */ + PG_PINNED, /* page is pinned by GUP */ }; =20 struct nfs_inode; @@ -125,11 +126,13 @@ struct nfs_pageio_descriptor { =20 extern struct nfs_page *nfs_page_create_from_page(struct nfs_open_context = *ctx, struct page *page, + bool pinned, unsigned int pgbase, loff_t offset, unsigned int count); extern struct nfs_page *nfs_page_create_from_folio(struct nfs_open_context= *ctx, struct folio *folio, + bool pinned, unsigned int offset, unsigned int count); extern void nfs_release_request(struct nfs_page *); --=20 2.55.0.679.g6767b8d81c-goog From nobody Tue Sep 29 07:39:18 2026 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29C3744239D for ; Mon, 10 Aug 2026 19:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391449; cv=none; b=sA1PNGOtD3MS6t/8Xk3aB2Jhx12Nmr0eA1DL3QvMJq+qo2LIzzId9D6GxKFZxQfBTKsfxz6SXIqUTb/88enOpn+cottEI/XItpAcAyqm6xU299K/KRz3Fo+ngm9PtlNJc3McmmnTRZn3dhN+HLWjDKrxWlNMSX1W0HFDWk964V4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391449; c=relaxed/simple; bh=9RX6Aq76qJMqf8LtuacV4nuPpbTB3rALE9qg6WfOqT4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=e8ApS3hWO01iCe0+ttX8yXLxWSHlw0iKaszy6+BjMw4pfUWMIvLyOq5Y1jCclo/8FG0DaH93SbD7bfQ6VRP59c8JANo7l0IGUtAMNKz/u+z8aclvogiT6+4cPegUPrIUlhN7dxeahMqvJLgPmOE8UQ46ZgcHD/KBDFqZJd5MRjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=t1eLhBsi; arc=none smtp.client-ip=209.85.214.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="t1eLhBsi" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cacd6d37edso36466525ad.0 for ; Mon, 10 Aug 2026 12:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786391447; x=1786996247; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=C2ERQlktAlPM+wEaWp5zzj9NSzqVJxPOg25/iwvVmrE=; b=t1eLhBsice/7Rq2BEYzwD/hzwue7gAKa/9gc7ggUeTr++cHbmPf4gYkyanoxjM9ggs trgscCxV+UvS7Pjv/Rfg/Lx8ljTz91gIiQjX1mm5WxRyKOY3oasRTZ4hD5gyWMG0kqIA 5Yukfq17QTRupSNfZJ4X0r0QH3tt/fS4z4y5TffEVz9vDwBZNOPvunEnTqM83oWkhJT5 v+SdDzzsBtxr2ZeDYVjz4x2tTh53aKGaqqHxhBQSrn1huogOtaH5dpv0yEFLeL+laBk1 gTxiRiCE2Z1nCEFDikUPjgSKq8hVl21tIJubRencliRm0uyNaVCk/2JsxLBIIxr62ZUI 16Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786391447; x=1786996247; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C2ERQlktAlPM+wEaWp5zzj9NSzqVJxPOg25/iwvVmrE=; b=YVNKGUTTlgQ9/KYrLXoIw0lZpSr9lkS46OQIA5+GVdJKofeeMI4L2iun15YLKmRuyR oGczcyg4AXm6rAdqsZNlA2S3HadiXv5ADtAcuQjHT5p1Tpg9L7LmPRno2H0rnZHgBoDF fZBIc2f3Qhur42T0tQAMBJtPSpbdAYH4xuJs8Mnqg+7uCa33hz8WfUX1+qgWA/hUo86+ KP9gOHpxs7aw9zrY6W6Rt190GC3W1yCmwzLjJYVlNvlN3SEBzx0Z3gz0XG4jJg4+5+Va Sd/hj8Wa8ipSS5dXi6Mf+tfWZFuxdIN6fodLdno/opteZi2b2PDvJvSXQNU2zTXjYR1P /iBw== X-Forwarded-Encrypted: i=1; AHgh+RrSzpQIQw9oq8KLTqZZQDS1V0UWSUA/hYYgCZGVvKvS8FphiFz65ACcnExvXKh6+FlNjQt9p9g1e/TY2LE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0qnUqbff9Kczy6w1FKXXIBx/GWa4KXH9NsaR90ltH5ltxP7rE l51O+um82yJy5zCUCaZTOa7TgzTtr0f8ds6sqqxkqwiFNH61c++eRki2FwITLQ1fR7ne/jUziL3 Kpw== X-Received: from plhw6.prod.google.com ([2002:a17:903:2f46:b0:2ca:bb31:40b9]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:13c7:b0:2ce:9c48:22d3 with SMTP id d9443c01a7336-2d30033718fmr51730635ad.11.1786391447250; Mon, 10 Aug 2026 12:50:47 -0700 (PDT) Date: Mon, 10 Aug 2026 19:50:36 +0000 In-Reply-To: <20260810195040.2877784-1-praan@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260810195040.2877784-1-praan@google.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog Message-ID: <20260810195040.2877784-3-praan@google.com> Subject: [PATCH v5 2/5] nfs: track number of pinned pages in nfs_page From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Track the number of pinned pages in nfs_page to handle unpinning correctly, ensuring that only primary requests perform the final unpinning operation, preventing subrequests from incorrectly performing unpinning on behalf of their parent requests. Add wb_nr_pinned to struct nfs_page to store the count of pinned pages owned by the request. Update request creation and cleanup helpers to initialize and use wb_nr_pinned for primary requests. Use the nfs_page_array_len() helper to calculate the number of pages spanned by a request's offset and length. Signed-off-by: Pranjal Shrivastava --- fs/nfs/pagelist.c | 9 +++++++-- include/linux/nfs_page.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 606b518fa204..c307daf5f68d 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -457,6 +457,8 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, offset_in_page(offset), count); if (!IS_ERR(ret)) { nfs_page_assign_page(ret, page, pinned); + if (pinned) + ret->wb_nr_pinned =3D 1; nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -489,6 +491,9 @@ struct nfs_page *nfs_page_create_from_folio(struct nfs_= open_context *ctx, ret =3D nfs_page_create(l_ctx, offset, folio->index, offset, count); if (!IS_ERR(ret)) { nfs_page_assign_folio(ret, folio, pinned); + if (pinned) + ret->wb_nr_pinned =3D nfs_page_array_len(offset_in_page(offset), + count); nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -567,14 +572,14 @@ static void nfs_clear_request(struct nfs_page *req) =20 if (folio !=3D NULL) { if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) - unpin_user_folio(folio, 1); + unpin_user_folio(folio, req->wb_nr_pinned); else folio_put(folio); req->wb_folio =3D NULL; clear_bit(PG_FOLIO, &req->wb_flags); } else if (page !=3D NULL) { if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) - unpin_user_page(page); + unpin_user_pages(&page, req->wb_nr_pinned); else put_page(page); req->wb_page =3D NULL; diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index fd7aafe7cb54..080fa3e23580 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -59,6 +59,7 @@ struct nfs_page { struct nfs_page *wb_this_page; /* list of reqs for this page */ struct nfs_page *wb_head; /* head pointer for req list */ unsigned short wb_nio; /* Number of I/O attempts */ + unsigned int wb_nr_pinned; /* Number of pinned pages */ }; =20 struct nfs_pgio_mirror; --=20 2.55.0.679.g6767b8d81c-goog From nobody Tue Sep 29 07:39:18 2026 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BFE5443A99 for ; Mon, 10 Aug 2026 19:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391451; cv=none; b=sJWgB52eaOzkDHRiu9DT1G/xyRzgWxfIEFlz87rIl8bE+hnkmLsX+ePVYlKmMsn3g2YdnruyrLGwJpNO3O7VHawS+yjBhbF8OV34AvZWJui6b96SlbCSM1JnX3rvPr77AfWd1yS20gRV9/4ON+xSzXTfnBdnNwjt3KjkodpjwFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391451; c=relaxed/simple; bh=aa9WD6lgPal6idqXiUZaEeGB+Cf9aILnOuahk+j6NVY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=W2XjHrKV3EillA5NjD1nvivIKKgxYCeuc+3uV1JmBmaHtVEFdmcy+df9GE03HKpY/gTHhcSYcV0mDSmB/NzhIhwSOnvKmBDz7AXXf3Xi2WujUawkBSebpgVK72BqjMwvOWYIv36WjWiKIN3z19okvqiByd/t7y+14mnI9s/od/Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RNbL7SEk; arc=none smtp.client-ip=209.85.214.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RNbL7SEk" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cceabd70f5so68698995ad.1 for ; Mon, 10 Aug 2026 12:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786391450; x=1786996250; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=tshq/1OvbP3AaGoI6iErjculqGFy2sLE6jnBbi5iEmw=; b=RNbL7SEkucCWzqFn236STPB3fM19DqTpiWA8jkG7VHfHbHJkFPiiFcD5U/Jv0a5SlT h/Pc8x0QD+ofM4m9jakQyeO7pDyYsCNlLwwO+maxcZDKPhucVEBRsz8a61wdkzCVcqy8 Kj6ObIi/UlESRrufKkbN058zICJq+fDmxqkh3HRy8WdWpIAHP6dDcmiZCug6HxKKrvh6 OhqhIpEM5U/v6C2aHz5sEUhuyMldIK6MPJXpYpSrz/jB/HVA4Zvybw/eFo0eHZYTu+97 1dSR1mcrcPiBOdeqmfZk9cXrizC5KE9L1oPhO6VJFbITj+VjlA294s6sNIqU9B72trfR QTqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786391450; x=1786996250; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=tshq/1OvbP3AaGoI6iErjculqGFy2sLE6jnBbi5iEmw=; b=FhEBCj7+CoeGNGNAD/BooiLpRj/1X937HofQWbgA31Zq08P82laU8oLdzJhcoKU6uD gk5c167gNbv0nk+j0GVZLaapLJI4ftZ5rUP5MwWpp9xtPvXAhUVwbqhkbY2kKGzRUiNR fPYT6UVK5Wlpp5qiQ2XCHd+gflr70ZoKyV+Mo8/Iw0/BcGX0XZFgoQkLbivVCLVhFbbb U5jIKq7G9yAu4V8qqEZqsJm5iBcV623SWwIO1VWgpgMlNZ420MAk1kPQpDn2OHYWVXMO +qjKHIJeOcKVZPHM+H+0a1be+lMN9gYs/VakllQrMxBbNMajd6cV+gAL1nceEGYOsyXv /VhQ== X-Forwarded-Encrypted: i=1; AHgh+RrTd8aOgh3mvU3TsglJP6ckH/9bWqdvXxc2D2h2N/d44g86zo1seaxrDnfR85PVLaW4Cp6HGlFebyl1SwQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyqSIIFyuDKWD1o1XlUvdG5ZY83AkRmc+Y20BgKWGc9jKzcZgzA aFasMOsVpz6gdlV9MaCOd+IbXY6dcU3mVt+zgXV9jpoBboUhFCfvggxc4AXMX2soaaDXm10bg2B 8Vw== X-Received: from dybun6.prod.google.com ([2002:a05:7300:f3c6:b0:313:c814:320f]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:da8c:b0:2cc:aa36:c046 with SMTP id d9443c01a7336-2d294c2289fmr274983385ad.14.1786391449383; Mon, 10 Aug 2026 12:50:49 -0700 (PDT) Date: Mon, 10 Aug 2026 19:50:37 +0000 In-Reply-To: <20260810195040.2877784-1-praan@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260810195040.2877784-1-praan@google.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog Message-ID: <20260810195040.2877784-4-praan@google.com> Subject: [PATCH v5 3/5] nfs: introduce nfs_release_request_list helper From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a centralized helper, nfs_release_request_list, to handle the bulk release of nfs_page requests from a list. This serves as a preparatory step for two upcoming improvements: 1. Pin-Aware Cleanup: As we migrate to iov_iter_extract_* API, requests will hold pins (GUP) instead of standard references. The helper ensures that the correct unpinning logic gets applied consistently across all requests in a list. 2. Folio Support: In subsequent patches where nfs_page structures will cover multi-page folios, this helper provides a clean infrastructure to unlock these larger units of I/O in bulk during completion, similar to the pattern in bio_release_pages. Additionally, refactor nfs_read_sync_pgio_error() to utilize this new helper. Signed-off-by: Pranjal Shrivastava Reviewed-by: Shivaji Kant --- fs/nfs/direct.c | 8 +------- fs/nfs/pagelist.c | 17 +++++++++++++++++ include/linux/nfs_page.h | 4 ++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 19792a38c924..96995736fac2 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -314,13 +314,7 @@ static void nfs_direct_read_completion(struct nfs_pgio= _header *hdr) =20 static void nfs_read_sync_pgio_error(struct list_head *head, int error) { - struct nfs_page *req; - - while (!list_empty(head)) { - req =3D nfs_list_entry(head->next); - nfs_list_remove_request(req); - nfs_release_request(req); - } + nfs_release_request_list(head); } =20 static void nfs_direct_pgio_init(struct nfs_pgio_header *hdr) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index c307daf5f68d..80fb553528d9 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -624,6 +624,23 @@ void nfs_release_request(struct nfs_page *req) } EXPORT_SYMBOL_GPL(nfs_release_request); =20 +/* + * nfs_release_request_list - Release a list of NFS read/write requests + * @head: list of requests to release + * + * Removes each request from the list and drops it's refcount. + */ +void nfs_release_request_list(struct list_head *head) +{ + while (!list_empty(head)) { + struct nfs_page *req =3D nfs_list_entry(head->next); + + nfs_list_remove_request(req); + nfs_release_request(req); + } +} +EXPORT_SYMBOL_GPL(nfs_release_request_list); + /* * nfs_generic_pg_test - determine if requests can be coalesced * @desc: pointer to descriptor diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 080fa3e23580..c38e4b380be5 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -136,8 +136,8 @@ extern struct nfs_page *nfs_page_create_from_folio(stru= ct nfs_open_context *ctx, bool pinned, unsigned int offset, unsigned int count); -extern void nfs_release_request(struct nfs_page *); - +void nfs_release_request(struct nfs_page *req); +void nfs_release_request_list(struct list_head *head); =20 extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc, struct inode *inode, --=20 2.55.0.679.g6767b8d81c-goog From nobody Tue Sep 29 07:39:18 2026 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 735BF4446E1 for ; Mon, 10 Aug 2026 19:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391454; cv=none; b=TeCfIlzZ2IGOvRaXFIOd0kktq31FrQR4X6oueExCobb9CYwAESE1Jtl99LWMNqQ46BnnI/rkAcQJij3DMsrwA3dH16BdepGTEKinieMNWTmrhzqn3q37YdDOdcS5RfuDFu40AXSUvYIHRk/9ZfKgbMY3bJVPtFznBK+VdeaDwLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391454; c=relaxed/simple; bh=DpoLih1PcP1k7ATY/YpwCBeYW+iX+D+/PGns6KtbHsg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XDNMELuSJ+aSDokTXRa5SLctRvd9YYej0OIyjOhAx3rr2HRFz5sTesSB36IbpZJBnD9VxHxrmN9z5mUScWOR98QrYeI3dJubtMi3wsiQMLoy7H5+MUVJn+WgzHJwnlN0vr9ps+hDchYAtoJdBecqMQxX6dqx1juOC5roBgblF00= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dbc59f1P; arc=none smtp.client-ip=209.85.216.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dbc59f1P" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-38e5a616d07so2661229a91.2 for ; Mon, 10 Aug 2026 12:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786391452; x=1786996252; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=VcYKmOJeHZ340ymkvpq1SUtt9jjLj7DE6k/D4ssp5QU=; b=dbc59f1P4KzBA4hLzz0lEZa6t6X47EK1J5yXcYG+NCVB5Y8oSdjjzShOEcz5QKk0Et kxrmSzCoPs9e6QJhoPIXgWF9T+7Gu34NFVoUiZJTpZClKbGlatN2vsxybtoeBGyAtEoE 2p3IKfnusvhvgkRnnjrHAr1zA94V+PE1sFpwiDNrD6ovLHEqtcnbgpq9gl5WYJK06zk3 Cpm1o2RYleWSq4mwzqnE9Eue91QGFeRNK/9S48vvCvRqItRhzMtvWfEjc7BrozEu95ni k9bcZXW6r9YHsHpK3gi0/vJrwZNM1yjoSY4teDfd6NaURy1v4Ja287fNAN74drGnsYjC RtOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786391452; x=1786996252; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=VcYKmOJeHZ340ymkvpq1SUtt9jjLj7DE6k/D4ssp5QU=; b=geyUUe2IIph7a9OoaSE/JwCJxbG431BWekmgm8GDyH5l9B+EHXertaV7yo7SEeFRoc fxdLJpJD3pvrX4cmrVlvGZfWihn9QGBj4S0SsM33RkyFlFkCrCVN5t/+h4qrSETJ2B0q oGcjh13X5q7gSYjKTtbTNLvneDgopjcCBD7crj5ROZ4vDA5vxdNxiuJRUDn/VINZbolh Sypgps9SuZtZSZ7MSOExiwJq03Iga0wbhfneHZevcpWkUtfNNtk07Zur8E2PDuxsJmJG q8oOPrrt0kK+dZQbvY0kXJCntZwYIyT37+uoDJRB6UpYnzsrDloxiEXUqdmRVRH0uLQI /eAQ== X-Forwarded-Encrypted: i=1; AHgh+RrYhUDXhP5l2YQw46XW1Y+9qwEv3CBvXitrMJbF7I1eNFVTlhqD4BYlJY4YP2aYZYlW4Lain+555OuFJf0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7RHLniWhxjdMyIOWKx+Ury08w/AhOybU3Zg2Rei1Qhoz9LzWv ZpDMIWC5fr5NZu8/Djkc+LVOeCFCE/MjyRwysEBAQWvcSlxsvIiH+/f1r/pkc1HdT91Cl/v0TDa b+g== X-Received: from dybrq15.prod.google.com ([2002:a05:7301:468f:b0:313:d984:da01]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5444:b0:381:1f51:1ff0 with SMTP id 98e67ed59e1d1-392821fc107mr22534242a91.2.1786391451507; Mon, 10 Aug 2026 12:50:51 -0700 (PDT) Date: Mon, 10 Aug 2026 19:50:38 +0000 In-Reply-To: <20260810195040.2877784-1-praan@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260810195040.2877784-1-praan@google.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog Message-ID: <20260810195040.2877784-5-praan@google.com> Subject: [PATCH v5 4/5] nfs: migrate direct I/O to iov_iter_extract_pages From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Migrate the NFS Direct I/O path away from the legacy iov_iter_get_pages_alloc2() API to the modern iov_iter_extract_pages API. The transition aligns NFS with the modern VFS extraction model and serves as a preparatory step for supporting requirements such as page pinning via GUP for DMA. The migration fixes a bug in the Direct I/O loop where pages were being unpinned immediately after request creation. With the new extraction model, pins are held until the I/O is complete. Manual release in the loop is correspondingly updated to only clean up failed pages. Signed-off-by: Pranjal Shrivastava Reviewed-by: Shivaji Kant Reviewed-by: Christoph Hellwig --- fs/nfs/direct.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 96995736fac2..a1caef90f2f1 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -168,14 +168,8 @@ int nfs_swap_rw(struct kiocb *iocb, struct iov_iter *i= ter) static void nfs_direct_release_pages(struct page **pages, unsigned int npa= ges, bool pinned) { - unsigned int i; - - if (pinned) { + if (pinned) unpin_user_pages(pages, npages); - } else { - for (i =3D 0; i < npages; i++) - put_page(pages[i]); - } } =20 void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, @@ -354,16 +348,17 @@ static ssize_t nfs_direct_read_schedule_iovec(struct = nfs_direct_req *dreq, inode_dio_begin(inode); =20 while (iov_iter_count(iter)) { - struct page **pagevec; + struct page **pagevec =3D NULL; size_t bytes; size_t pgbase; unsigned npages, i; + bool pinned =3D iov_iter_extract_will_pin(iter); =20 - result =3D iov_iter_get_pages_alloc2(iter, &pagevec, - rsize, &pgbase); + result =3D iov_iter_extract_pages(iter, &pagevec, + rsize, ~0U, 0, &pgbase); if (result < 0) break; -=09 + bytes =3D result; npages =3D (result + pgbase + PAGE_SIZE - 1) / PAGE_SIZE; for (i =3D 0; i < npages; i++) { @@ -371,7 +366,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nf= s_direct_req *dreq, unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); /* XXX do we need to do the eof zeroing found in async_filler? */ req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - false, pgbase, pos, + pinned, pgbase, pos, req_len); if (IS_ERR(req)) { result =3D PTR_ERR(req); @@ -387,7 +382,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nf= s_direct_req *dreq, requested_bytes +=3D req_len; pos +=3D req_len; } - nfs_direct_release_pages(pagevec, npages, false); + if (i < npages) + nfs_direct_release_pages(pagevec + i, npages - i, pinned); kvfree(pagevec); if (result < 0) break; @@ -891,13 +887,14 @@ static ssize_t nfs_direct_write_schedule_iovec(struct= nfs_direct_req *dreq, =20 NFS_I(inode)->write_io +=3D iov_iter_count(iter); while (iov_iter_count(iter)) { - struct page **pagevec; + struct page **pagevec =3D NULL; size_t bytes; size_t pgbase; unsigned npages, i; + bool pinned =3D iov_iter_extract_will_pin(iter); =20 - result =3D iov_iter_get_pages_alloc2(iter, &pagevec, - wsize, &pgbase); + result =3D iov_iter_extract_pages(iter, &pagevec, + wsize, ~0U, 0, &pgbase); if (result < 0) break; =20 @@ -908,7 +905,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); =20 req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - false, pgbase, pos, + pinned, pgbase, pos, req_len); if (IS_ERR(req)) { result =3D PTR_ERR(req); @@ -952,7 +949,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, desc.pg_error =3D 0; defer =3D true; } - nfs_direct_release_pages(pagevec, npages, false); + if (i < npages) + nfs_direct_release_pages(pagevec + i, npages - i, pinned); kvfree(pagevec); if (result < 0) break; --=20 2.55.0.679.g6767b8d81c-goog From nobody Tue Sep 29 07:39:18 2026 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04788445AD8 for ; Mon, 10 Aug 2026 19:50:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391456; cv=none; b=TaIsSVsYF9pItKdimyInCtck2TSeeOumOa88xgKNe2hf2CM2v/d7KLSdMwgrbALeF3SQHe7V50f6VSvg9GkNWmlNLIVZE2kZLSMn8BMvFwW5f8BJMHW+9hVUZ3xo88JLKnx6ed4a8eCBBnv3FjSilUi1iLdYyaJDNOJ5x4IYiRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786391456; c=relaxed/simple; bh=k5HYLfn7qvcSOiS2KtvDPUxzArlpHXJb6KaNHRam2To=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UHEQ4JB5ON/uezvL9TNa7iyAzVNtzbYPiZ4bbWIKi3+Kr+vwyW74CE3TbJWs8FolIuUCf/tHZJncPkb49sTCr6kznPNy2qB6BYlO82GR3mEkebQ2kNNhZ2EJxUAhEdVklxnIyVkG8o5ZNEtz0DULU/QgkHh+QpIQbIlXt9Q9+z8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=NayjnkZC; arc=none smtp.client-ip=209.85.216.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="NayjnkZC" Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38fcaa5f82cso2352812a91.3 for ; Mon, 10 Aug 2026 12:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786391454; x=1786996254; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=RLUQZXNomb5u4ksc353f7XPXIH8QzQWFAnuFKhSZZHE=; b=NayjnkZCo5/N2RTPtyfUaR2Puk6AWithbltLVEs8XtzLnNfXpaPwvcxLdocn6ibZfk vk+0J4TGAV3o7tx4jNLQ2rP9OMiuvXcafhXtjoSe/SdgbnMpeJqybxouHb9WkAIO2VGQ 2Yl3Yh8FmNtXPkZYit8g4AXm/Fzqsb5ZR5zvH9u6Qruq4gzPmeXkWxdO85FecAo+Rkem 32Wz7NMBmgEXswRrVHTMuNWK7EAi9NI7svgsxVgaSUfCVkyXyJ72MerP22iZaFDf38iR P1kwEkbCOgvNvxIXdRMEBDOXqLrPtB/rWWZ72ZyJZqIaG+QG8k15aEjHYGi6OWysFSzq b7Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786391454; x=1786996254; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RLUQZXNomb5u4ksc353f7XPXIH8QzQWFAnuFKhSZZHE=; b=bES3DybBM4EUNp1nfDqpDmNyog34vY1Pn6corWZMhXoyCxY5Z9vE70sahMHiZxhukQ Ug/KerzNn/roVzjvlFGGA4nuwtrexVoblHfkgYC0OTqugw31SBm8HbYvKqPzGS5lDjtq CNKZI7tUQL6BfRBjrFMmSURReEUZ4ZCRUBms/Stf6D1cg9lPDvCmrKKGjXsXXII1FB1N qcqOxDP/fCj0VjLlwG1nl6o09m9jJ4PA0tAg4tHUMssR9yegalnZbqk//+uQPm5OolSH Ig5d1SiUHE1RukuKdO4kyRIyDDDZXSGD5wVHtBEIBszLv+6J/M8bv9XyBD/4kM539k/Y S4tA== X-Forwarded-Encrypted: i=1; AHgh+RpANzISKmGqQZkn2jRfBQB+E0ld63XnxwvpI7nyWyKphPDp6ow+YDdAL6m54G9GFJAAP/VuLHg7zvsprXo=@vger.kernel.org X-Gm-Message-State: AOJu0YzqgQUr4M1LuGTF4rUcmdmFYrVtJWXPMWL2Xj8fI0mZHdLKKXJV X4ZmCzBRSCgxRctOP8ERj7djeLm/vGHV3nrt//4PwpimQYK0sCn2yrVvCBKgBl6Ze2Lzk2uczcP zuA== X-Received: from dli6-n2.prod.google.com ([2002:a05:7022:286:20b0:139:d9c7:3cf4]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:268f:b0:38d:c74d:29c5 with SMTP id 98e67ed59e1d1-392cca64db7mr4133794a91.19.1786391453658; Mon, 10 Aug 2026 12:50:53 -0700 (PDT) Date: Mon, 10 Aug 2026 19:50:39 +0000 In-Reply-To: <20260810195040.2877784-1-praan@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260810195040.2877784-1-praan@google.com> X-Mailer: git-send-email 2.55.0.679.g6767b8d81c-goog Message-ID: <20260810195040.2877784-6-praan@google.com> Subject: [PATCH v5 5/5] nfs: introduce nfs_direct_extract_pages helper From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce nfs_direct_extract_pages() in direct.c to centralize page extraction and request creation for the Direct I/O path. The helper manages extraction from the iters and builds a list of nfs_page requests Refactor nfs_direct_read_schedule_iovec() and nfs_direct_write_schedule_iovec() to utilize the new helper, unifying the extraction logic on both paths. Signed-off-by: Pranjal Shrivastava Reviewed-by: Shivaji Kant Reviewed-by: Christoph Hellwig --- fs/nfs/direct.c | 127 ++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index a1caef90f2f1..76c954bbc9af 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -172,6 +172,50 @@ static void nfs_direct_release_pages(struct page **pag= es, unsigned int npages, unpin_user_pages(pages, npages); } =20 +static ssize_t nfs_direct_extract_pages(struct nfs_direct_req *dreq, + struct iov_iter *iter, + size_t size, loff_t *pos, + struct list_head *list) +{ + bool pinned =3D iov_iter_extract_will_pin(iter); + struct page **pagevec =3D NULL; + ssize_t result, bytes =3D 0; + int err =3D 0; + unsigned int npages, i; + size_t pgbase; + + result =3D iov_iter_extract_pages(iter, &pagevec, size, ~0U, 0, &pgbase); + if (result <=3D 0) + return result; + + npages =3D (result + pgbase + PAGE_SIZE - 1) >> PAGE_SHIFT; + for (i =3D 0; i < npages; i++) { + struct nfs_page *req; + unsigned int req_len =3D min_t(size_t, result - bytes, PAGE_SIZE - pgbas= e); + + req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], + pinned, pgbase, *pos, + req_len); + if (IS_ERR(req)) { + err =3D PTR_ERR(req); + break; + } + + list_add_tail(&req->wb_list, list); + pgbase =3D 0; + bytes +=3D req_len; + *pos +=3D req_len; + } + + if (i < npages) { + iov_iter_revert(iter, result - bytes); + nfs_direct_release_pages(pagevec + i, npages - i, pinned); + } + + kvfree(pagevec); + return bytes ? bytes : err; +} + void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, struct nfs_direct_req *dreq) { @@ -340,6 +384,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nf= s_direct_req *dreq, ssize_t result =3D -EINVAL; size_t requested_bytes =3D 0; size_t rsize =3D max_t(size_t, NFS_SERVER(inode)->rsize, PAGE_SIZE); + LIST_HEAD(nfs_page_list); =20 nfs_pageio_init_read(&desc, dreq->inode, false, &nfs_direct_read_completion_ops); @@ -348,43 +393,23 @@ static ssize_t nfs_direct_read_schedule_iovec(struct = nfs_direct_req *dreq, inode_dio_begin(inode); =20 while (iov_iter_count(iter)) { - struct page **pagevec =3D NULL; - size_t bytes; - size_t pgbase; - unsigned npages, i; - bool pinned =3D iov_iter_extract_will_pin(iter); - - result =3D iov_iter_extract_pages(iter, &pagevec, - rsize, ~0U, 0, &pgbase); + result =3D nfs_direct_extract_pages(dreq, iter, rsize, &pos, &nfs_page_l= ist); if (result < 0) break; =20 - bytes =3D result; - npages =3D (result + pgbase + PAGE_SIZE - 1) / PAGE_SIZE; - for (i =3D 0; i < npages; i++) { - struct nfs_page *req; - unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); - /* XXX do we need to do the eof zeroing found in async_filler? */ - req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - pinned, pgbase, pos, - req_len); - if (IS_ERR(req)) { - result =3D PTR_ERR(req); - break; - } + while (!list_empty(&nfs_page_list)) { + struct nfs_page *req =3D nfs_list_entry(nfs_page_list.next); + size_t req_len =3D req->wb_bytes; + + nfs_list_remove_request(req); if (!nfs_pageio_add_request(&desc, req)) { result =3D desc.pg_error; nfs_release_request(req); + nfs_release_request_list(&nfs_page_list); break; } - pgbase =3D 0; - bytes -=3D req_len; requested_bytes +=3D req_len; - pos +=3D req_len; } - if (i < npages) - nfs_direct_release_pages(pagevec + i, npages - i, pinned); - kvfree(pagevec); if (result < 0) break; } @@ -875,6 +900,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, ssize_t result =3D 0; size_t requested_bytes =3D 0; size_t wsize =3D max_t(size_t, NFS_SERVER(inode)->wsize, PAGE_SIZE); + LIST_HEAD(nfs_page_list); bool defer =3D false; =20 trace_nfs_direct_write_schedule_iovec(dreq); @@ -887,55 +913,32 @@ static ssize_t nfs_direct_write_schedule_iovec(struct= nfs_direct_req *dreq, =20 NFS_I(inode)->write_io +=3D iov_iter_count(iter); while (iov_iter_count(iter)) { - struct page **pagevec =3D NULL; - size_t bytes; - size_t pgbase; - unsigned npages, i; - bool pinned =3D iov_iter_extract_will_pin(iter); - - result =3D iov_iter_extract_pages(iter, &pagevec, - wsize, ~0U, 0, &pgbase); + result =3D nfs_direct_extract_pages(dreq, iter, wsize, &pos, &nfs_page_l= ist); if (result < 0) break; =20 - bytes =3D result; - npages =3D (result + pgbase + PAGE_SIZE - 1) / PAGE_SIZE; - for (i =3D 0; i < npages; i++) { - struct nfs_page *req; - unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); - - req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - pinned, pgbase, pos, - req_len); - if (IS_ERR(req)) { - result =3D PTR_ERR(req); - break; - } - - if (desc.pg_error < 0) { - nfs_free_request(req); - result =3D desc.pg_error; - break; - } - - pgbase =3D 0; - bytes -=3D req_len; - requested_bytes +=3D req_len; - pos +=3D req_len; + while (!list_empty(&nfs_page_list)) { + struct nfs_page *req =3D nfs_list_entry(nfs_page_list.next); + size_t req_len =3D req->wb_bytes; =20 + nfs_list_remove_request(req); if (defer) { nfs_mark_request_commit(req, NULL, &cinfo, 0); + requested_bytes +=3D req_len; continue; } =20 nfs_lock_request(req); - if (nfs_pageio_add_request(&desc, req)) + if (nfs_pageio_add_request(&desc, req)) { + requested_bytes +=3D req_len; continue; + } =20 /* Exit on hard errors */ if (desc.pg_error < 0 && desc.pg_error !=3D -EAGAIN) { result =3D desc.pg_error; nfs_unlock_and_release_request(req); + nfs_release_request_list(&nfs_page_list); break; } =20 @@ -946,12 +949,10 @@ static ssize_t nfs_direct_write_schedule_iovec(struct= nfs_direct_req *dreq, spin_unlock(&dreq->lock); nfs_unlock_request(req); nfs_mark_request_commit(req, NULL, &cinfo, 0); + requested_bytes +=3D req_len; desc.pg_error =3D 0; defer =3D true; } - if (i < npages) - nfs_direct_release_pages(pagevec + i, npages - i, pinned); - kvfree(pagevec); if (result < 0) break; } --=20 2.55.0.679.g6767b8d81c-goog