From nobody Sat Jul 25 16:45:13 2026 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 049D739934A for ; Wed, 15 Jul 2026 14:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126147; cv=none; b=eNZHD/+/IAtrmPEJYSbgQ1b6RfQJf2L2tzWsQK1rpV0rGak+zYQJl83ZOBfU9urNvaWGh94SmNDMGyl8zyInTxvHFKKqz/iD+p6IGcuCfxW72tcg/1orW49LqkV3Qq0Tci2zRo3jeYBFcrh1lgQzaZOe2csvZOgk3RB5Uu9qnzs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126147; c=relaxed/simple; bh=l4XGtm3sO0V2v0lCEoKhQG/tCtAAedrAcsw+qJsqHes=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OQu6d68kxE15QrGcG9fIiYo6uCbHhzizMb1qwy8YBEMf9WJTibhHx9DrJov7UMgqC6HSZ9TdfdWw2MYc+Iop8wrs5nOAu9Ay9VDiDeAaOf63St5c2xFZ4MO8KBmcz4jIyTQBSl8fWvJEPZLLsqbgvn6z9kgOktHdkJhN2x0cJiM= 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=J0vBnbcY; arc=none smtp.client-ip=209.85.215.201 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="J0vBnbcY" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c894391f000so4865886a12.1 for ; Wed, 15 Jul 2026 07:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784126145; x=1784730945; 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=8tfUyk6Z0T2pecuznR1vX6/r4MCXD0HXFkirQr6U57M=; b=J0vBnbcYYslEKbU7D8VZjrsuAQ4RR6wFMMx5sGr8lzgfMYEhZTxGQBSoMRdias8buP 5iFYURo2pd6hYkjMgXYZ66OM/cRQ/bjM4R8avaDIemLHrTjqIKY8WpKZZNjtU1XCD5qN BGAoVuZQpTPXuo3qfTJ3hR+ooqi1LmDuVJ3tNleTzfqNeGD/TAY4JGmGWP/79snXY1Sy qy/S+xjOixe3hPXFgOJmA/eIGF448FUMrRsMZVgHBXo0zKmFz++UAC1gGLEozOSDN7yw 9aqtwRmPyudabK+xEmlkRJmZIiAXYfjZKJagW13hDpbu03Y+73ni1sYd/1oytikzOrc5 IP2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784126145; x=1784730945; 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=8tfUyk6Z0T2pecuznR1vX6/r4MCXD0HXFkirQr6U57M=; b=p4YA3KI96IlxAKTnxeMTfEbhVXupTMdSkvhr7AIEt2aiaQhw9dKuz6RsXwNBal7ZNd Fy1XH3Dr8N8MLdyX+DubSud7JsK0APDAfeN/p3VAnzZkYvHQZkrZqF51g8+tUqk0vhxe 0XX6abm+wfhLeqwANP7Ix6vx55cLe++5qD+ijeu01z8xBpD25VuF1A/bC//0iRZF3H5+ Z9biXnnji+VFOh6Mn2pNx/KURB9hikkP5PLvTukSkgjaK48exazzgWtqWwdT4roUX+Il LQ4/C4Hp4fACJbBLbNKTOOpvIvmh6B8F/3vIt5lwOFRckj5NQoQ03kPe5QXGgJi+K/EY JUcQ== X-Forwarded-Encrypted: i=1; AHgh+RoNoe7cHB9Ws7GvkRIyYj+2ssqfcCrG1V0MtJ5cUvWtug5SRlxrURDW3f0igYA8+4q5igvKRwtLP0mk1nQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxpLuTz4TdqhLOF7/f+qHWX8pzTrHPqye63fb3jR9WTgkubD6Go w60o43dmCBCkkGVhYjOz0M0i03bBC9lKPb4B3sfOnVVriwJ7CQBpdJVin3FxOxJFg0NujLxTP91 7EA== X-Received: from pggr6.prod.google.com ([2002:a63:d906:0:b0:c9f:3143:b204]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:21d2:b0:848:48e9:2ecb with SMTP id d2e1a72fcca58-84889600e32mr15737708b3a.10.1784126145074; Wed, 15 Jul 2026 07:35:45 -0700 (PDT) Date: Wed, 15 Jul 2026 14:35:36 +0000 In-Reply-To: <20260715143540.3597616-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: <20260715143540.3597616-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260715143540.3597616-2-praan@google.com> Subject: [PATCH v3 1/5] nfs: make nfs_page pin-aware From: Pranjal Shrivastava To: Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org 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 | 38 ++++++++++++++++++++++++++++---------- fs/nfs/read.c | 2 +- fs/nfs/write.c | 2 +- include/linux/nfs_page.h | 3 +++ 5 files changed, 48 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..faa8bc1c6526 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -404,20 +404,26 @@ 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 +431,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 +442,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 +454,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 +465,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 +475,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 +486,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 +508,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 +564,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.229.g6434b31f56-goog From nobody Sat Jul 25 16:45:13 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 06CA2399D02 for ; Wed, 15 Jul 2026 14:35:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126149; cv=none; b=GnIA/v1eZB4wx6ioScZ90UhZDnBK6+KxG5DvUM2aW11FqBhssEX89S5rks2gYMLQI12d4BiDcC4T67E3gZ5p5+A8hQ9oFQ74GdL263wY16OLCo46G9evhgu2NoMH7Tn5Ic8If+FqL4BfKWV/CBsUpQoH7/FjVYinsyD6FWe0vjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126149; c=relaxed/simple; bh=Y54nOIx9mMVxcTwhAtaUtY293lG/py/OCs16JGVD36U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CUrFo2S6URVLOdXUQwxldP0nu98DPHfyR/0ceyj011JVgoXOBwcNUeXmo05gSEqANaG3LrTfFpFENnaFui6XAyZg+eWzzu/WOgmAvaSH3tGpHvyiCdthQq1bIiKzYZE4PNTKK1pZ0uglpiELSN1nQasQ1d/F8MCmrKWWnkICe/8= 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=BaIETx6a; arc=none smtp.client-ip=209.85.210.202 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="BaIETx6a" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-8484739a9cbso869224b3a.0 for ; Wed, 15 Jul 2026 07:35:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784126147; x=1784730947; 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=du9357juXhGcu9dn4Att57AwyAuxnwB17QWxTnC6+90=; b=BaIETx6aGygg4xeUY0oC1Ghf1vjeompR967szGpsOqlpvd2LVfOFr6p1nfVH0TTB9F 7bOu5K4Pum9Ge0t5dm0lQh6DndhVcEDLBRHW+YKPANdzHg1OQCp9XcdI4A0Dsn7bdv3v QnNg93V6R8Q64zo4USFMOXtN5vwE6b9h7NP1pSGZj+o+lVMoH6f1qiv7NdxJDAS0Wc6n QtIXNVEeeKpObXmwc6IwMJBM1d9NnmAzTJNfGG3N05192StvCyXtujQ6Ho4WtcDDLnMm maCpExbdXuduNgsUSIDKkfZfw76E3w8pLr/m+EwRqkW49FsA6CM3frjwvUPtTnuosCiz l7dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784126147; x=1784730947; 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=du9357juXhGcu9dn4Att57AwyAuxnwB17QWxTnC6+90=; b=UkqbSHh8Pc/H1AM0EBypQhbpVlO0F8uQ01dm3av7uvZjZ6XoUkMYBOmmgsRvQn0kQd bnillRIcLHNggJTF0lMkscxYCdTlPrVF3Nco5Z3zynSRl8ky/O4rolgYGQo7kyVnYtwj yrJNmQWMBQr2xwttKaGg8Odz9/gUiXecXIqG5cySNeOuOgcMU8ByiO8YsrIs9PRWw1DN iOQi6WhWMI1L1J5vhl0Qq87Y2nUlPRv0KnNKWeNPrKosyuA9yvp+6VNv88/rl875Rwjq K9p2EwfE2CT5uTNQDOBpLE/DFQRTygvkvLzuIwJxFLegO8BEy+2Nevogitob1xV6hQ6R qIbQ== X-Forwarded-Encrypted: i=1; AHgh+Rr3K1TVIdhk2tnP24V8ll+kPCjymHwM2yqx4y3thX5stMGJVltlokupCjCuKCZ9mri4qec4B4XNxnITvuQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwPjbBn3O/r3Iw38nxSsjB/fAImhUHOQWiWFLWEySIk9yrO/G05 8NB6eJb/EFFdbui3yYmlp532GMgp2Kqf0dIZqM0UzL6PEgxDcdVZY24pUo0pEmQjxLDpVlc41JC CVg== X-Received: from pfwz12.prod.google.com ([2002:a05:6a00:1d8c:b0:847:ac08:fdf6]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:aa7:88c9:0:b0:847:b45b:fef3 with SMTP id d2e1a72fcca58-8488acd4d8amr16851338b3a.27.1784126147105; Wed, 15 Jul 2026 07:35:47 -0700 (PDT) Date: Wed, 15 Jul 2026 14:35:37 +0000 In-Reply-To: <20260715143540.3597616-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: <20260715143540.3597616-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260715143540.3597616-3-praan@google.com> Subject: [PATCH v3 2/5] nfs: Track number of pinned pages in nfs_page From: Pranjal Shrivastava To: Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org 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 faa8bc1c6526..7d51e10fe97a 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -455,6 +455,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); @@ -487,6 +489,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); @@ -565,14 +570,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.229.g6434b31f56-goog From nobody Sat Jul 25 16:45:13 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 F0B6C39DBDB for ; Wed, 15 Jul 2026 14:35:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126151; cv=none; b=A/5YMJot7nJijBGlJ6oCzYV6agkL3wkIeENmaVIOPCUJ7+VEjvx8NqV0Gmy6Ca4IgDlW94wm54j3lLJl2c2NLCptsYreSoO6ixQvlbMphXI7Bh8auknu15X9RUCpIesAfmqMQkiNRiFyRrf20aQbANxSXJdLFdT7smYJc4im3Wk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126151; c=relaxed/simple; bh=EiK/0BOy13dfaHv1/1gIcOGTD4TXhwUWjevKgoWSbpI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YqsfEqSjwI5CxBoAW3lBxnMxQohrl699TrC9tSfEjZn0eju1IZJiIdQ3by689/Zu7OoAYEBj2joBaRLYLH2xkm4Bvxe3/qkSZ2H0YdjPokIEAH6GY3QkqFIzjjSShnI01F2CKlGBz5DHaTzbLoPAc/DWd57RNQdKru2rQe8Fusw= 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=Iez82V+J; arc=none smtp.client-ip=209.85.216.74 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="Iez82V+J" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-38dbf293831so4921358a91.3 for ; Wed, 15 Jul 2026 07:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784126149; x=1784730949; 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=XhqenuXfmVALy/78xc7WpS0H1qGGlp44q39c/xt3Pa0=; b=Iez82V+JVk+cW8uDA+ieAFq8j4OksRZ497y5JrIKfNiC4zUovZqYufZMwZQVUTR50a 1yaIzbSXVufX+FnhiBL9q9ATNKM/KRKvIN7pG82B9ZStBs2Pzgq8KMXhw2WOwEUsERZN 5GC5WwCpHZtxsvFDjmP40aAtGl7BJKKzxH0YkqSR5FFXm6LJXnSZHBY6CMk/tlWIf2DF G5GIFkIJwKNPJFm3DjO5skIlnK1X2Ta3V5eOgUHOYaVl/o4Cro1czt6HCUD1ZhPHQCoz TmaVQQo7lizjTDls9Kd+4/JNxUJ8Sd66UHoMGAGBzt9GLWEWOUa0/8aPirmV8YdQjvuA 1gGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784126149; x=1784730949; 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=XhqenuXfmVALy/78xc7WpS0H1qGGlp44q39c/xt3Pa0=; b=HtZiEuZB+6exgLc4bo4Zh/4bITzYxL8JK3Wd2YdiZKbvq+DRNA0cmtQoSrA6eKQ+TE iWyfl4o9SCvPkR/4W6B66VSoEbA2EC79MTCzwdvAnoPHWMymR9NIvbcibufyg3SXKFxo NF/SlLIl7igfGt7MXtHXjXo+hSkxTQX//y3JxiBKzOOXaFrGkh8XzvfDyfIURKb+0eCT 0SHhLMK5EypQF28ZP9j/CU6lcx3KqB6Dmz/EC/Jkfd9nZFtUkz49jnMR8EPjtYJoUg9i s9SFRg6KiT781c7Muhpzfx3MCB10JN6xSvToDrpFlaYpJVsTQai2vCdRVn9CK3l9H4iz ln5w== X-Forwarded-Encrypted: i=1; AHgh+RoR+DQRsYKJgdRoDIl0qNKa2yFO3gV3qeesjnie8a1c95/IEJILAjNl3rQHgOTIketqCjBQT8YyT4BzpRE=@vger.kernel.org X-Gm-Message-State: AOJu0YwFbRLulCnSnlrapAYk4CB0LXXEXyGl3cIvjD4bQpHiyIPX3/fb w2JAQVOdIBYuYUYQiio7PVjnjf/g5omETKIzVxKHHOJljKPIARsFlEoKEhdgALTa2xzK5RBPceF SEQ== X-Received: from pjqq12.prod.google.com ([2002:a17:90b:584c:b0:381:71cf:62c]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4c89:b0:387:e0db:3fb2 with SMTP id 98e67ed59e1d1-38dc779ac27mr16439182a91.43.1784126149280; Wed, 15 Jul 2026 07:35:49 -0700 (PDT) Date: Wed, 15 Jul 2026 14:35:38 +0000 In-Reply-To: <20260715143540.3597616-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: <20260715143540.3597616-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260715143540.3597616-4-praan@google.com> Subject: [PATCH v3 3/5] nfs: Introduce nfs_release_request_list helper From: Pranjal Shrivastava To: Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org 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, similat 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 | 18 ++++++++++++++++++ include/linux/nfs_page.h | 4 ++-- 3 files changed, 21 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 7d51e10fe97a..569bac4faff7 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -622,6 +622,24 @@ 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) +{ + struct nfs_page *req; + + while (!list_empty(head)) { + 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..d23208ed3a33 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 *); - +extern void nfs_release_request(struct nfs_page *req); +extern 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.229.g6434b31f56-goog From nobody Sat Jul 25 16:45:13 2026 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 3C83F39E9C8 for ; Wed, 15 Jul 2026 14:35:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126153; cv=none; b=XkemndO63cWX+RizsvhpfZr+mAL699NqaqvIykhtjygntK4PpUlxHOazYzY3KY8P4qmcYVGveh6XYmzbSJRTLoKuwvxS+kxnngaejOU9kT36AIl3fEH1Ag6hGnvsTrTuX/oN24bpQ8FuRNM5m7m+YR63Fly826YFQZ7aEZjbuNE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126153; c=relaxed/simple; bh=COkPzhT7ognhZry22mNipCk3Qu0eXEqVO7cIW/zUKi0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Nc39KoZFrvQtUw9xiVCU2GEkLPAQkxJGrTqcmhftX3FgPhdvyKAqvPR/b+1tbhHTCFE10fFpeSyzUTvmcjBTmU91td31ViGr4xxqAkJHbtbLmZIXPUtQTiYhC5axBa7WpggPWG5rwdiI+emIX1VQn9SZyTtWXRT11STYpT3PPWE= 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=BS288xGo; arc=none smtp.client-ip=209.85.215.201 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="BS288xGo" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c96b4f58ddcso2149192a12.3 for ; Wed, 15 Jul 2026 07:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784126151; x=1784730951; 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=BcDK7Hr5wj1i7phI0FRZS+QdZSWw//OEKovKt+QGpf8=; b=BS288xGo6hqizCsOGR+HI4tn2QPaXwTxlJqjGkAXYkA419Ctus2pC4mrpwGwK0Izo6 h6eHxFqKeNPz+zxU4F2NBXvy43TCwVOtnMMjuSRQuep4Ar7/tLcdG+cC0ciQmrI5zSMf GHsbRAw/SXrCXtCFt2OYJ5xAEDQ87Yg6x9X57lZ0O+a3eAEk4y9LJK+gpWH3ubCTFgmp OF+Eke+r9lkviH2SJ8N+rspGmP8CxUO1So+YbHsTugv6MSVQHmyWFZE1PnHDDvAFsUOi pCoBNp5viTwWkhrNdV2NCkzSoMGKPuL4iJhGSyO+xMcJdMf8xNA5MaTLhw7SC7C9x6IO BAPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784126151; x=1784730951; 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=BcDK7Hr5wj1i7phI0FRZS+QdZSWw//OEKovKt+QGpf8=; b=a8AtF+taJf7yqv3cca62laj9V3SuwZe5MSGxQrtleInB3bZkpyRzxbAapJ2WR5Zako 2ebhB11zAkrHA1lIeNWwobp05r83rzIk7H1xdMTgZ3bB1k4PVPEhhIuAbr8N301yTVy1 Dm7e3UkJoFVNetqsHPRywOIFXWzor6nZy1WBwHS9QqxWVEseTqyn60raQpI14gb6Ri/p t34jE+TDMn+GL2KXZooYBsLbbb5BWzEJxnhxkMCLhNnRI9QvD2HTZJzCcydWKurm1WI1 s0Wm+jKbMYImYLLM42tIHeEJFrM8Z69nnz9dAfLJB5wMwkepHdtRdWsSHU0VHzBlnuci oaug== X-Forwarded-Encrypted: i=1; AHgh+RpcAVFmNeBzZRYxthR+53x5FI1X4u+XS5k375RtKKeux+bnQjNLCOlIZn273tLIV/DlKPFrYsAsBwHVVRo=@vger.kernel.org X-Gm-Message-State: AOJu0YyPQxoRJm2zmTQlJRY6RO/XpS74Cu3vWzdPJHJv6CRdCeLA2PTi +Tj0HbJx5YSl7HnQZOrZZ+UwiQoMtPuwuryp8Pi7XVwAAUTs+Cvu+805QjPtFZejnY/ohj6I6gA hgA== X-Received: from pgmj33.prod.google.com ([2002:a63:5961:0:b0:c98:2639:852e]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d0c:b0:3c0:c9ee:3746 with SMTP id adf61e73a8af0-3c11078513dmr20467727637.34.1784126151354; Wed, 15 Jul 2026 07:35:51 -0700 (PDT) Date: Wed, 15 Jul 2026 14:35:39 +0000 In-Reply-To: <20260715143540.3597616-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: <20260715143540.3597616-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260715143540.3597616-5-praan@google.com> Subject: [PATCH v3 4/5] nfs: migrate direct I/O to iov_iter_extract_pages From: Pranjal Shrivastava To: Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org 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: Christoph Hellwig --- fs/nfs/direct.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 96995736fac2..b9ac0a67693c 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -354,16 +354,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 +372,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 +388,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 +893,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 +911,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 +955,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.229.g6434b31f56-goog From nobody Sat Jul 25 16:45:13 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 44BC93C9EE5 for ; Wed, 15 Jul 2026 14:35:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126156; cv=none; b=qmVKW3Vo2/BL/dEBZJCdvcKU5OV+OuKqq9Bk4c4fBn9cT4Z88zt7/pxo2hC/nr85Aj4gjw5oqnZR/G7UqGLrqqV0Y9NxIB+s/dKvnUz3j2vXS8kkYi6u1VWA02wLiIqMfPI9SN2zUdJMdRTPwgI6upxojlD579KOcVcPIlMWWN4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784126156; c=relaxed/simple; bh=aq/dqivTylEYUypjlV4BF+bTiDzXZi2U/ysC7mi1ILE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UNb/MrAlXXmwf5Yb785Eha9zrxoaC4lE5PE91xxC2CBEZR2+j19dfZx/6mg3Q0M/PNNERdhPbLUlhH56Hnk0RqJzhKPTIcM45f7jpBrH56a4zpYpJKd586e4a1QWQNqBBrywMw4lH80Wn4lute0GOUGhE7IcZObgqwajEUbmzJE= 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=HbaOJl3P; arc=none smtp.client-ip=209.85.214.201 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="HbaOJl3P" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2cea6a46766so69714525ad.0 for ; Wed, 15 Jul 2026 07:35:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784126154; x=1784730954; 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=LvDbt+8SzF/ZiDvgKGOK70E+TOXcsILzu2Lzhah2Cr4=; b=HbaOJl3Pd742gvMcI1Tmja05FMgBFGVWkf8gG/deBR939O8j3kyyZkaTGPbvP+a4Yv epHmBBpNxEOvuhr5sY1RV1TxUvOBKNklQ4bM2WQdket9jiUQMIfiK3HwW+g0OUHNcSLB DcKYW2syXAAHEvqNSAb1EOfl6ycL/FHJP3kaElqe47JV+3ZhRrkt5zY+MCQAu7+UC1SN U4mu7KJrVULbKn/MHNzRhdEnB8Ft1zi3KXA+9KeuzPgcZSj4sXfbPadVXDJtgOR/DTuQ 1Ow81dUoytDj98YnW7QxRmdBeccitcUN7aoREXHyvlHGIoRkOgRxjQXyMfmZw5U2lkqb TCyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784126154; x=1784730954; 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=LvDbt+8SzF/ZiDvgKGOK70E+TOXcsILzu2Lzhah2Cr4=; b=LL7+S1At9u26YqkZH+EoZ1ekdNys9WsXDnuzHnA1Ovyx2uJRgDtgZ89IlraMvSwpxb u4ctha7028FOmxDb1VH9WsBPigSfsWvnkIS1GCTaRB06noiplzC1W+ML5g6WUKNg40gF 7x2KRLD4xi5k2KURAbPXxnH2PaFLuHrCrDK8csVztUkswoDgYkzHQv77S5CSq3lOlUOT AWzFggVDS1J/k/+5nR+Lg3gHaQe34GBN3rnBixprOn5fn7LhpTiAVt5vbs06qQXEgpc+ B+g5/80TcofNbWbnMVcAi07glM++jI0iOF0Fgg0kTlgctr+NiSum2B+bcZDdCo83tCFn 9MRw== X-Forwarded-Encrypted: i=1; AHgh+RpeNLDTMr8WzMtL2XtC/py4WC1Eq+ryBvemf7Td6r3gfkicbhstn8wLK/dWGNCOGWKENUgJyRRY9qwWcco=@vger.kernel.org X-Gm-Message-State: AOJu0YxYlCqt29MQdvutGyc4Rf8ZMxX6GEhO9+krhDJpG6J3qRqebkpK olutBCBkpwsJ40NOcfYcfzCMRitHVNc1f00be4k5X3DGxwhdIL95ISWsmeYRzjmgZR0pUsfu1l3 z7Q== X-Received: from pjbpd7.prod.google.com ([2002:a17:90b:1dc7:b0:381:1980:b2c8]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2ec7:b0:37c:774c:77ba with SMTP id 98e67ed59e1d1-38e1afbf5abmr6518324a91.21.1784126153426; Wed, 15 Jul 2026 07:35:53 -0700 (PDT) Date: Wed, 15 Jul 2026 14:35:40 +0000 In-Reply-To: <20260715143540.3597616-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: <20260715143540.3597616-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260715143540.3597616-6-praan@google.com> Subject: [PATCH v3 5/5] nfs: introduce nfs_direct_extract_pages helper From: Pranjal Shrivastava To: Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org 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: Christoph Hellwig Reviewed-by: Shivaji Kant --- 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 b9ac0a67693c..d31e4720ffff 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -178,6 +178,50 @@ static void nfs_direct_release_pages(struct page **pag= es, unsigned int 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; + 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)) { + if (!bytes) + bytes =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; +} + void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, struct nfs_direct_req *dreq) { @@ -346,6 +390,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); @@ -354,43 +399,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; } @@ -881,6 +906,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); @@ -893,55 +919,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 @@ -952,12 +955,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.229.g6434b31f56-goog