From nobody Mon Jun 8 06:36:22 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 CB46F18AFE for ; Wed, 3 Jun 2026 05:30:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464641; cv=none; b=LvDnr/dQ3i5yZ27GlZn/v0qh1WERf5le9rg6+AmI+KWvd85JX99hUqAlajh+kXJXlH1PwdHEYLQ03BBJKj3cFqdkFjWEZkvBvycIcatAcmPUnvq6D5H7avPNoijuDVX+z40ZtkW+qBnqgc+yrSFxGzcgdgTj4PIEFC2nwalxre0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464641; c=relaxed/simple; bh=fBiITvJRv/FQWchTFmQruKNCG+tl0l1yuRbe1I2Y7Uo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SCSymGXbe6srsdz0lZfXMMpO7fKZ7aTw44al5gK1CorA4vrBTlx3d1aEc5Xw/YT7Ask9F/I//bRW42A4Y6+8XQdaue/uglQsli4e6lJftrsHIH5UPi5j39zwu31L4l7eTQXy2FY8M0FCTtsrs9ae2oU9EUjQ7E0w9oHzsgSbX+s= 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=LFsXSr0k; arc=none smtp.client-ip=209.85.210.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="LFsXSr0k" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-84247fed609so1594592b3a.0 for ; Tue, 02 Jun 2026 22:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780464639; x=1781069439; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dQql6ug+CFHnq+Ip3lZefO3EhSenKSvgSb+Bx46fkv8=; b=LFsXSr0kr02OWSBkFUWUPZ7cw7rSFgMHZi0zAv49g9ZZTkYeTGi5+RI1LxOFJN3vHU i2Iv/J9xOmjBIFht6vYiTTBaeEdf117eFkDE2Ojaj6edZ4rR7HDGyFpMidfRQMgJlmov iVCi7jr5WB9bTwGOGannK/ThcqjnwYfP6PvMEbtUptklU9wWVPM2ubvaJXdc2pIM5piO vmtvq/zQjxRdNPNar2XpWvSCTqGKRj7hrursvIV6W4s/WLmn9CWlXoTKc+iOaHxlw+Dk Qs1mA62NTB0aFPg45KSqDtGu4owKkf07m47FAE9ctTfSOK9Ws1S7WOOxPgjoqF5HKqEP yIlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780464639; x=1781069439; h=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; bh=dQql6ug+CFHnq+Ip3lZefO3EhSenKSvgSb+Bx46fkv8=; b=h2bBhGLdrYk1tT6il7UShtWd/iQqV1wNy7QByBMFMW6unduSpJaSOgb9NqXGAtVmcs G8Bfyryj/frKn8J2I+LXdFhqziyD0n9UrnEtUfyufXhtUOHWWeTCxvJDs9G5EAVkqq7e rKLZk8FvtiH6niut00fONolVfmj0yudwFzvNtH32WH3r8Mb3AykSF0kBxlxfnI+1+9QF 9PQudrJi7APIMlWQ4/YrC0CgXK11sW5yObaRB2FkiiEn9GDU1qRTRnZ/eUBs8foV5C3Z UB2wauiuEnOED7Fp4GzXt1imf0IFLFA46F8qgBsjdhfvjkwcaJufW4xovaT39R21H04w Wlmg== X-Forwarded-Encrypted: i=1; AFNElJ+3YSzknIEyPyMQJ6bNauFG7/t0GBGR87bXWUx6Wr94dTJw3OS+hMS5k69qUhOigudKgDnzWp6YGmQEqFI=@vger.kernel.org X-Gm-Message-State: AOJu0YyCC4UDfgQfJPwOVyddVoPQfNzdL3OexNuqZgiGagavxVubNy3O 0vZF8gpVHQRAwNpjoNXHR1YhiBK9bLHZTGMZDQsET3IwBsxAJveSUcoTVqQZ6ENJ5zyiwANfW7T UMQ== X-Received: from pfuv1.prod.google.com ([2002:a05:6a00:1481:b0:82f:a959:4a7f]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1ca2:b0:842:5ea5:5ff8 with SMTP id d2e1a72fcca58-84284f3791dmr1573115b3a.42.1780464638645; Tue, 02 Jun 2026 22:30:38 -0700 (PDT) Date: Wed, 3 Jun 2026 05:30:27 +0000 In-Reply-To: <20260603053033.3300318-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: <20260603053033.3300318-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603053033.3300318-2-praan@google.com> Subject: [PATCH v1 1/7] nfs: make nfs_page pin-aware From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Christoph Hellwig , 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 | 36 ++++++++++++++++++++++++++---------- fs/nfs/read.c | 2 +- fs/nfs/write.c | 2 +- include/linux/nfs_page.h | 3 +++ 5 files changed, 46 insertions(+), 19 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 48d89716193a..80319c5eeed4 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; @@ -899,7 +906,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; @@ -942,7 +950,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 4a87b2fdb2e6..5c5601a27663 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 @@ -435,6 +441,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 +453,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); @@ -466,6 +473,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 +484,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 +506,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 +562,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 e1fe78d7b8d0..ebfebc47966d 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -301,7 +301,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 3134bb17f3e3..cf56c07ae2ee 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1086,7 +1086,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 afe1d8f09d89..9ece78f1b788 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -37,6 +37,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; @@ -124,11 +125,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 06:36:22 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 D385F37BE80 for ; Wed, 3 Jun 2026 05:30:41 +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=1780464643; cv=none; b=jg6Zhvf8qFKPFnW83iaNag7K7RnelEM9JLOHYXQwCAtHJDP60ARYELRJhw+ZQFta5KRdlC+dCBR2q69cRXnY+3gsD9+/A50tCGjC0zaJxIm1o3a+EFrxkQtDC5RYMbGrC3cpUGBBaUiTnxtWZtXbyfYKjJ0Fojstu1wxOCqQYPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464643; c=relaxed/simple; bh=n0mH3N7dN+6P/rXhifQricOYElYnonXD4V1GRu+wSQ8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LOLNtYuCRYtwztA+xxzASgSbY/6V74PIHhHUCBiZEcbpkZVoEwb90QwME4bU22yEHQiB7jkDQFBAYTsq1oV5sGmnY+pdTQxZCETCbIfAplwgmHGnnUH0vOx7mn0xE7i/4uB5DPhVWfYrbnQc4pPsMQG62XhiPD00j4DckDh0Slk= 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=r9IaPBOM; 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="r9IaPBOM" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c85a2bf5388so1971989a12.1 for ; Tue, 02 Jun 2026 22:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780464641; x=1781069441; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aUizU4Vsty2onsNNFrCgDH72BT/u0SfXPzmHgHi1tzY=; b=r9IaPBOMnm49cjBY8ijsGoglRei5LU2mtt3hUL/hvGKjkHgKLmHLr9rqCQz5gs8dHJ //eKIGL/BkxryXO2TJju1BqBgTFViJ7xAZ6wyZ4KyPg42PIWlUrC8M8RVjXZcGZZ/j+H EIoJj/zJcM0xvrFgigbbaMOvb+srDKnuq4GRq487sZFdVwCoQJRYL7RJlvZXRZNZOkqX BByRdj7iGttWON/B9wo4bu5FOCV5El/Kf+SAmeSG5WbaYp9tdEF7Vh/78d2dokADR9qr gIQJfwl4Qc7JfEJ5WSBiVJk4P5RpzuEtK+noPZ2owTEFrgxQHI9CAOCJvTfx0TpZOmA7 4FQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780464641; x=1781069441; h=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; bh=aUizU4Vsty2onsNNFrCgDH72BT/u0SfXPzmHgHi1tzY=; b=UwK+P4W/KhGySfmEEsGeZHg3ZpO1r2nSBtuCsICjZ65cPPtGzF0vwcUbamFa2Oat9Z diuWgq9FwsU3waX+1NvOOxoCZXgyyqHM0fNi4cI2hEgvdGuKt9ivv8ryX2s51QTJluI9 EXNklNJx5uG4KxW/BRsHb4BPrcCG7u6zjSz3A8r/gCPFuMm6HowzMKBfOOcuq0Id4Kwo fBzsH89kViU3/rrFk6gah+G1JzuWFKMaX6sO4+QW6c+oGoAkL9xf0mH5pJP93gG0D/sR ZZ2hq86VQ5AkyWfjhLygeLWtLFH6JMBpqxPUoj3hHWD0DzHqBN3Tn0Fed9E+quyI6rnW VjXA== X-Forwarded-Encrypted: i=1; AFNElJ9PH37AaR1vUbO0GBg8OlHCbKaLkcfvkYuKsy2lDEtFpj2AolR7iBPWry56cstaJTf6mcMm07fCYlcw/is=@vger.kernel.org X-Gm-Message-State: AOJu0YyXa1Ag4noXKFaITsWUtr1yt8yGMsFAG4G+NeEhvktnaDMM/TVp eK22/u89aT+9V5EKG54PzuENgZunVn7VkvNsLQ3lABXCgO9cqXtdZoOAGOrGePofSm/RN1XYCeq WJQ== X-Received: from pgbcp1.prod.google.com ([2002:a05:6a02:4001:b0:c73:8295:1401]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:549b:b0:3b4:7eb0:47a1 with SMTP id adf61e73a8af0-3b49742220emr2047732637.19.1780464640786; Tue, 02 Jun 2026 22:30:40 -0700 (PDT) Date: Wed, 3 Jun 2026 05:30:28 +0000 In-Reply-To: <20260603053033.3300318-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: <20260603053033.3300318-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603053033.3300318-3-praan@google.com> Subject: [PATCH v1 2/7] nfs: Track number of pinned pages in nfs_page From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Christoph Hellwig , 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 5c5601a27663..f59449918be7 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -454,6 +454,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); @@ -485,6 +487,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); @@ -563,14 +568,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 9ece78f1b788..295280fe9571 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -58,6 +58,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 06:36:22 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 18D7737CD59 for ; Wed, 3 Jun 2026 05:30:44 +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=1780464645; cv=none; b=LNLt4FB/D7/nSZ/BFcuzJGdLnDX/nUo1Pi/p5/taAHUNrkEMa9RZqN3ZWNiQymE6osJ4lQGYRpD2HzElgto6oDm72rayBOuWIGEJbmpQmFiljOU+GyVYVG7LZu2msJ7OWAyZl4eiwI5KQkKii2sHJaRv8bn2C3+lANsABH85vBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464645; c=relaxed/simple; bh=xlRKe2tV08/PB0El33PK0KOegIfZJWy1WXcRZqpSlyQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SPwVF7RqT9Q3aChOAyduZcKvJ4NBIknfQZjCyeHg+BDNYo0w3Fw/+yJWAtURNFxqeaL9Z3WCG72dyrCgUz7Uo+JQEZIGzhVirO5yal/wiqzjtxrfMv8Gw1u6FS1Vxp15chxs7ibgc21rnf5IRy1u4q6cxUndoAuSo8YrEonqE0s= 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=teRhLAjA; 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="teRhLAjA" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c85a2c0b56fso3551051a12.0 for ; Tue, 02 Jun 2026 22:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780464643; x=1781069443; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=2nehAld8TJlI8mrxna1q/NWiJX18b33YpMiePw0zAq0=; b=teRhLAjAKokOdx6KTZqvF8z3KoJgoEWcJTvY9nPgKQyDqiXhDbgN+UUF2Xo8Fx0hlS FSrUNp8NxIZCsWP1FytPiClIiRw5fAvY6DRoXj3d8wNJ/pxI7AMXhiYR4rq/Vr2Q1/dv hNL+PaDTauzDzRNppb4NCiH1MJB+w/mvNwqBb/xGaF+4aoPgYfZPWkYPVn/84GJPduL9 7N/SNMY3t4PO0vPhtxR4clNQnR2fuM5hUkZ3vWzR+moMB3wmnDkjuEmp9Z/o+0gNErFN hoNXR8642DIAqvwJmT0/3qAdhmP8yYoVfGbD17g28QgUaBrG0DeN712VQCxwwnI96jgP dBGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780464643; x=1781069443; h=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; bh=2nehAld8TJlI8mrxna1q/NWiJX18b33YpMiePw0zAq0=; b=YMFRImIINerKchTr9SYNRsbkx7xXAcehPdQMdh5BD+3JOdgWvgVnlWp3eGzr9q4POh vrN+U3iQEZ/QA4EyrAq64hQa8vDoJlTIOiBHTmOUrjjkyX8BPsC7ba5SxcACxFT5iMra urmVe2mMRFpLGpHC2rYE6MFXPI8KG4bQpLHWLtIi69cJLk8CW6mlhPHcOzjoCU9eBY9L zoaD8MmTB4MCc8IjelrnhA1uUBZUZzriM2pqQ+F2+XSVYY82URsebRb4PvHoWcgkjkdK o4sr9XsgQytBvM8npXx9wYPpE6ds4AOe+41QrO4aZOjOeuC46QTyq6ShidL1vWt5RNJW AoKQ== X-Forwarded-Encrypted: i=1; AFNElJ9QnRlG5KAdoE0QVD1d/0XjOao3QdiD3UdD+GmtM6g/LF8zNIHCwUwZqrot/z5OXBZ0rrQaVZXfWsYYC8Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxhFOH3xkSpSRs7kbCl0ruXULzR3BpaSbcmoJf4fBZXGBIVmxK3 VHuhcBjnnMzKok4kAA++KjJ2bGObzF5qP4ck0oREU8MrCH6q1zftrolNPvBX+xYF6Wu77X1PtiD FPA== X-Received: from pgal123.prod.google.com ([2002:a63:3e81:0:b0:c7c:4b52:febd]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:7314:b0:3a8:21e0:1ffa with SMTP id adf61e73a8af0-3b49782cd85mr2233044637.27.1780464642818; Tue, 02 Jun 2026 22:30:42 -0700 (PDT) Date: Wed, 3 Jun 2026 05:30:29 +0000 In-Reply-To: <20260603053033.3300318-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: <20260603053033.3300318-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603053033.3300318-4-praan@google.com> Subject: [PATCH v1 3/7] nfs: Introduce nfs_release_request_list helper From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Christoph Hellwig , 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 --- 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 80319c5eeed4..2691eeaaeb8c 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 f59449918be7..74ae91151f83 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -620,6 +620,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 295280fe9571..14eb5de64d2f 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -135,8 +135,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 06:36:22 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 C0FF437DAB3 for ; Wed, 3 Jun 2026 05:30:45 +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=1780464647; cv=none; b=V9CJZObKuMkS744cHVPRlIGOciej8HSWNERKjdZLYINMESVd+0HngVi+TDscCP5yyCfdz1IJHgTgk4lq8nMmSeEbZeIFmiXbQHF9fT7jHBsoCGGFKAcINELAoMdHOK/MNb/Dt/gBHBQ/wozQO1bR0Yk/uMxaF5QLlfix0IumGzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464647; c=relaxed/simple; bh=JUzn0Tl54v/LajHr6WA3u6ilMr7KtTSGf8HuMCerDVc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=T3vN8JkTSOtub38pluCIgfRgmy6xnxkwGVsyf1UEcC4/TGJ35PWcA7Efwg8J4z3stGb3xU94+Tf4AStsfoXzKIUZi1LeSwXX0WhshOawuce2E32PrD9x3uHfsuF939N+ws57T4Cn6WsdnE8QnBFG0qe4vMswPbMDov5EkE/UIj0= 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=cleFaQCO; 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="cleFaQCO" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2c0a81c1738so24042805ad.2 for ; Tue, 02 Jun 2026 22:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780464645; x=1781069445; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aceiKrGtkOAldA+lS+bg3KAJPMkEMywV7kdTVFchn4Q=; b=cleFaQCOtbo0g4Il5kiIdUW1HScihfeObuQIne+xm1QU5A28KJU+kFAi7PXQ1uL4hj AI5kzl2ufvmBQI0255LYavFE5ezJcJ31RtKBcwLQtAwfodJKW0tA2hoMdb3Vdu0xSfXK WfC/jvE05SyQfvo+aESka65inIrRTnBBSCkbciVnetMRd9I4uPF+2VyHO6osUCNhCh/f BLjZRKYdL69Omhj80Qhwh9LQTr2yFxg52lbqs3MLTSwpGJixtmuJ2y4BERkg29Z331ZO CLNmTRcdeLkbQeEXtlMtTpwyiJ6GkPYQ6MvEu5cHhm25Mi6haw9MhvQe5ezll6xMtwkd J1LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780464645; x=1781069445; h=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; bh=aceiKrGtkOAldA+lS+bg3KAJPMkEMywV7kdTVFchn4Q=; b=pXkqdCXNrAaVloBN9gCN0a36QUak6yQnRPVXId7bCPinsYbJy8C2xsor6W6m7YwaSY yeyblEd2sZ/G2zvGXOv3Tp3Rz5IYbC3AVx2y0kqx6BCprBswHKpNZJnw9wjP7Jz3dAoC vv1JaBvn7yN0Mmu89Q5ei2bk9DjOjvZA7VVBrYsr/EDCpDe27iSjEgBCx2gZJyU6Siw/ mSdnHRk+3dsINlZzp40txZFhJJZ6Wqa32FCbXdXuL4cjH8NyQItS34S7YZd73lWp+0sl VXKKgjSMd9lBQkL9P3323zaeg2deaRyMIrP1v3DK/j35T90jk7fypY3hFvgKtTLC4mlC p33g== X-Forwarded-Encrypted: i=1; AFNElJ97uG/kvSycu+hqUeE8kSzOvPydsTNiuZaZEKwfnk1NHiHcZ4iNm3ibGTaCfNaWNDgyGWu97rN4JEJtb4s=@vger.kernel.org X-Gm-Message-State: AOJu0YyYA9OmNHsmF8Xwmh5d/QvuONrqhF8mpMbjTiB7Hf1qA1u88tZP YXsJHTL2zZb5bzEXOhKkMMMRhLc7CieHCsUdSXSCjswb3DxjWL+Y/oLZll+8avCMsBKqLW8WnSP WTQ== X-Received: from pjff14.prod.google.com ([2002:a17:90b:562e:b0:365:eb99:afdb]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1642:b0:36b:bb66:fbd0 with SMTP id 98e67ed59e1d1-36e30742d00mr1848636a91.4.1780464644804; Tue, 02 Jun 2026 22:30:44 -0700 (PDT) Date: Wed, 3 Jun 2026 05:30:30 +0000 In-Reply-To: <20260603053033.3300318-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: <20260603053033.3300318-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603053033.3300318-5-praan@google.com> Subject: [PATCH v1 4/7] nfs: migrate direct I/O to iov_iter_extract_pages From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Christoph Hellwig , 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 --- 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 2691eeaaeb8c..b6aaa5f80241 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; @@ -883,13 +885,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 @@ -900,7 +903,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); @@ -944,7 +947,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 06:36:22 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 0E1FE37C0FE for ; Wed, 3 Jun 2026 05:30:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464649; cv=none; b=Zp9D4X+pD/4jXzQondhZWzFbV/cbP6iyJGNaH/jA5cdH8p7tMRzwyImEmeYNAj8dYCGLncP1vYo4+D/0MymI9ezwnvlvz8gcR9oQtTvC3D84bhicJVOJiAploaG/T+mMOKUQX2mzVxXmdo2ZedH2gFroM8oTb8DaSab+ytgUWmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464649; c=relaxed/simple; bh=F7Z5I+pyKFwDybP/t3Ww4dr8KAfYZlgIyokwfDtnetA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TZmWdSaY/PiyWbIg+rWqugiCZHhA1XWWbmhpS5mnXZgUz9tEc3BACMa8AyA3awmwxw+BpEQ7xkxOfasSSp+wr0oEyzoJZHOpFyqMbX8J/RSOg+OwZo6uvnpSXsiaXtisR5K6Cka3xUzLLyuMREGGIoSlfqN4iOS/SGK+EFoUZPw= 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=of6S7SSD; arc=none smtp.client-ip=209.85.210.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="of6S7SSD" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-84256bee9a9so1811219b3a.1 for ; Tue, 02 Jun 2026 22:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780464647; x=1781069447; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GUQHqwTSDbwIIIprX7FqQUC2KcYc7JrnlEpTv2eo5IY=; b=of6S7SSDZJfBv6njSe0sisqVcAKXUILLVBTVo9RXY1KfLLt3JYRnICx/8FimlwFRfa XbkdfDxC6Q0DNSqRBRfrdRw6He0TOgJd06kciSKGhmBAtj54GxErv32DWB2jQqrrvVdB SF/bJqlEBj4J5gxgvNwLD0Wxm7eabRFB/Ad3zER8xpIIQxdrb8lGj5Y2pYJa/cys4Bg3 uFhxkK1DJYziVOCbSyEQs30Py4hLq3fwetc9rkbtElY1sIiWleSbx85oICuq9sI2Z/gt vxHqZhdJZL5qgn9G75kCwctqh2p5PnhTYxNbLYZWbqYDlvGQOopKb5gR0J1QhyioOwn8 iBFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780464647; x=1781069447; h=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; bh=GUQHqwTSDbwIIIprX7FqQUC2KcYc7JrnlEpTv2eo5IY=; b=CHGYRd1jkNUH3SWtnSGuBbC0ArsYNz55yrRcLZzXbYZu8V53e+dd1Sr5BwLe8fDESR n/EEpKIXH0BBTxI2wZMuzoCp/vdYOrUzLb2ERM7cecWqo6t7pbm9jp5xfwGHWW6R//KK p26Qg3EIbetPbGgXsytdp8YY9YvPJCtOFdZYXKeJRTJPcQO4pXI2qdJKdTS2yU9khtM5 QUXFfl/ez50029gh5f3IeMn7mdfTHTiFq3n/Dra9u/keBL1XpPi+Cd54UkYvfEYvLGcr Uf6fd4RhWATne3MQxP3zVlcBUVk+tU6b5ymJR/ZvNbe23jYK308vQIiGPVPl9cpdNVqv qNQA== X-Forwarded-Encrypted: i=1; AFNElJ+gH+SmnbfPEdhyrNX1oz8Hry3kzZWL33qH7Ziy199dDXEFazxoFcpnfLK3Ukb4LPBf9lVC/+O2CE8Zsng=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4DJUkQ+F3UgFXSg/pqxh6GJ2C6iNWsDZ+tJJpUbmgwG7kE5I8 wPVCdM7Tz1frf1sH3c/jTZGnOyl4i1f4P6usi2rNBEZ3HspFGP1YjbTjX6t0rxJQwV6rG/r+BAz VFw== X-Received: from pfbfj21.prod.google.com ([2002:a05:6a00:3a15:b0:842:2abf:9656]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:887:b0:842:3d8d:bab5 with SMTP id d2e1a72fcca58-84284fbd413mr1961332b3a.37.1780464646850; Tue, 02 Jun 2026 22:30:46 -0700 (PDT) Date: Wed, 3 Jun 2026 05:30:31 +0000 In-Reply-To: <20260603053033.3300318-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: <20260603053033.3300318-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603053033.3300318-6-praan@google.com> Subject: [PATCH v1 5/7] nfs: introduce nfs_direct_extract_pages helper From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Christoph Hellwig , 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 --- fs/nfs/direct.c | 122 +++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 63 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index b6aaa5f80241..59002c150f23 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,22 @@ 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; - } + requested_bytes +=3D result; + while (!list_empty(&nfs_page_list)) { + struct nfs_page *req =3D nfs_list_entry(nfs_page_list.next); + + 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; } @@ -873,6 +897,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); @@ -885,42 +910,15 @@ 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; + requested_bytes +=3D result; + while (!list_empty(&nfs_page_list)) { + struct nfs_page *req =3D nfs_list_entry(nfs_page_list.next); =20 + nfs_list_remove_request(req); if (defer) { nfs_mark_request_commit(req, NULL, &cinfo, 0); continue; @@ -934,6 +932,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, 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 @@ -947,9 +946,6 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, 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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 06:36:22 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 050CE37F8A5 for ; Wed, 3 Jun 2026 05:30:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464651; cv=none; b=KhHpHl73b2xiCO8P9MKvxl+hExp4+ozTmx9lcM3ts7HBIZY2dOT8F9qm6TlK/mou/CTW745ZvBCo9SsDLXzb5342l0t123ASOenUu8sjLmN89n3p9moQ/vfQZKPTuihsbBfy6j5ICE1r0goNx1HYmyoJ93AWcbTwGvQ+FBSN4AY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464651; c=relaxed/simple; bh=3uJU8vtiz8KIhmPO16VbFFhKJTkeUhYQ78W5xGMY6PQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UYUr7UIb8Oz+BJGWlVts3XENVOZBVjNcm3UbIAce0AyS1PMIove+2wex8MofzB+nDWnLVLhjZDOqFeY/9cRd/9qcCqG4vRE0GATHkqOP3jb+SI3TBD2E+eRwaAGTn26Np092xfTG43vyNwz4w5ADw2qMZMSg7oxfmP1Q1ODkPQg= 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=Nu9hwOro; arc=none smtp.client-ip=209.85.210.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="Nu9hwOro" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-8423f24dcedso4139913b3a.1 for ; Tue, 02 Jun 2026 22:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780464649; x=1781069449; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=x6Uqa0WEXeSiOVPV/6N5if1ansZWBVyiMj0eE4epAYA=; b=Nu9hwOroBub1aPj9ZoSa/tnIhRnhbYBbMEAn5PUeSCrZor7S4RjQz5FqvVBoaW53bJ I7R5loPvjzbngFMGtdwGDeSfW8Zqj4vA3l+rGUlVcGRtfOMOWQkM+K9Hr53dN9vWr/F0 oW8StZAjPqOpG2WPzQcwhxCX2Q5nhfbrg4Sr4+0DTUq8sJEzKThlxtFQPx8v7IKR5JOB TGWZ1YbBeStqzVh8BjLj/UhO4mljDXzFCSzBCrmcxiBPVUySTv2G/e8pk+BIWC1mmP6M Htt1elhR5Axi0aFGRhFmh+Pueyn5AlPgW/FgmJDqnVrpwtHYoNtypIBpYhdNLDq7t2FO nmBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780464649; x=1781069449; h=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; bh=x6Uqa0WEXeSiOVPV/6N5if1ansZWBVyiMj0eE4epAYA=; b=VDw4aV7Zhiyu1Y5oUqxnmkLCoyKZE+rcTyL5Sgsq23zS0DOJfg5und+0KtQBnAjQZg zrcjw8Yl5zDY/9rlPqZoj2lpm7qXnmKylFVAVYPCcrOGH+yb1ZL58mHNiHL2lJiVXCcf icDwLrHJbjWz+csV2UXRFdnJQ/2xlGns//c2Z0IQJgMyZCSxxgXKLeosTqWx+uksd8k9 ojgs6c9F3Atuqxep9/45W0GUf6al5GajOUdUPj1j7SP3ggIjkxZY9YEM5FRZhU8dX3GO EolX2wpNLbX+S2Wcj0TkQdi8l2Vya0Mx7BxaNQR+2POARX81GK/4ctZsGk8RzV1zK61Q bbFA== X-Forwarded-Encrypted: i=1; AFNElJ+rK8ziSn6cpZf/Sbya6+u7U2zEatvIE8kU7RFjaXQZC/Bl9tpE5wLVBcrlmj9bFA5hCse9ufoYvKVlE3Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwI/OKOddGnTtZzqCh5CGprQ04N9L6nEh9SbtYYOOGicMwEUL0q nxpJguTPHLg85K0LrOVntxxayejBo9Ao5GurT2JBc+GEBK6DFBMFc1ZivHohVuVaD33Uehm6BWZ wSw== X-Received: from pgmh4.prod.google.com ([2002:a63:5744:0:b0:c82:73de:68e2]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c786:b0:3b4:cd6:891 with SMTP id adf61e73a8af0-3b49766e89dmr2274598637.20.1780464649190; Tue, 02 Jun 2026 22:30:49 -0700 (PDT) Date: Wed, 3 Jun 2026 05:30:32 +0000 In-Reply-To: <20260603053033.3300318-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: <20260603053033.3300318-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603053033.3300318-7-praan@google.com> Subject: [PATCH v1 6/7] nfs: Optimize direct I/O to use folios for requests From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Christoph Hellwig , Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Optimize nfs_direct_extract_pages() to group contiguous pages from the same folio into single nfs_page structures. This effectively migrates NFS Direct I/O from being page-based to being folio-based. Reduce the number of nfs_page allocations and subsequent iterations by utilizing nfs_page_create_from_folio() to create aggregated requests. Signed-off-by: Pranjal Shrivastava --- fs/nfs/direct.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 59002c150f23..93e1af9ec36b 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -194,23 +194,45 @@ static ssize_t nfs_direct_extract_pages(struct nfs_di= rect_req *dreq, return result; =20 npages =3D (result + pgbase + PAGE_SIZE - 1) >> PAGE_SHIFT; - for (i =3D 0; i < npages; i++) { + for (i =3D 0; i < npages; ) { + unsigned int chunk_len, folio_offset; + unsigned int nr_to_add =3D 1; struct nfs_page *req; - unsigned int req_len =3D min_t(size_t, result - bytes, PAGE_SIZE - pgbas= e); + struct folio *folio; =20 - req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - pinned, pgbase, *pos, - req_len); + folio =3D page_folio(pagevec[i]); + folio_offset =3D (folio_page_idx(folio, pagevec[i]) << PAGE_SHIFT) + pgb= ase; + chunk_len =3D min_t(size_t, result - bytes, PAGE_SIZE - pgbase); + + while (i + nr_to_add < npages) { + struct page *next_page =3D pagevec[i + nr_to_add]; + struct page *prev_page =3D pagevec[i + nr_to_add - 1]; + + if (page_folio(next_page) !=3D folio || + next_page !=3D prev_page + 1) + break; + + chunk_len +=3D min_t(size_t, result - bytes - chunk_len, PAGE_SIZE); + nr_to_add++; + } + + req =3D nfs_page_create_from_folio(dreq->ctx, folio, + pinned, folio_offset, + chunk_len); if (IS_ERR(req)) { if (!bytes) bytes =3D PTR_ERR(req); break; } =20 + req->wb_index =3D *pos >> PAGE_SHIFT; + req->wb_offset =3D *pos; + list_add_tail(&req->wb_list, list); pgbase =3D 0; - bytes +=3D req_len; - *pos +=3D req_len; + bytes +=3D chunk_len; + *pos +=3D chunk_len; + i +=3D nr_to_add; } =20 if (i < npages) { --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 06:36:22 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 275ED3655C0 for ; Wed, 3 Jun 2026 05:30:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464653; cv=none; b=WTej0Qct0ZUTBnX3t/7KNp57a/mGX0puDvlAxbjei7tewODZtfGfU9dPo8Mppe2j6tjQ+mHdVn9zmaQc6NtqLgVJ7XU7wBpKZzquXHWrIpZzCMZ3YlvsfSE15Ovr4xa8sbajlA1AcsLhimBGNBTexRtqwcvRAnya9FNUzWwk1IU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780464653; c=relaxed/simple; bh=tot9ZqSWBGLET6Y1NhxRj5tdJGhWtAUdv0XhxLmkMKI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ud1t8h9Kn3Zv+m/371C+pvbPfp6eDa5ydDWeo9gYhtDwuKCtLf5YM1ZtOoxT+wUx93FO7sInirLKZWuOgocbpdQW7VgcylniOukf3tNdOrmXjCNMCrXgJCq/fJaUv4AXgrkCg3UR3gIXPruYZ43QUxTejm6QGduL1Qk/OcCS240= 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=MfxTM1Iz; arc=none smtp.client-ip=209.85.210.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="MfxTM1Iz" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-842688fa7b8so281551b3a.0 for ; Tue, 02 Jun 2026 22:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780464651; x=1781069451; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=niRreLs/kA/7tR4N81wD/w0wwhdK/GuCLzmPNYHZL+U=; b=MfxTM1IzO63cUav3J1GpraTC1uFcvnhH3wbiTp6YMWARicqQ9H7YtbXlRdQ4huwOJB Z42/vo9J4eZO1MTzYZFyn7uOfyOfDzCKoYXk3t9kKPyxeHbhEwXBn+CY6k8zltvlITmV c6fnSF+riw9QXPxN5rmgUnrdoDqWWG23uxGDoSHASf1IMXj0pKwy9F6ThBcc74cI4587 fPiyTJU0fXGkGB99867W/xUE+TZwX61bgMlSD+w3q582jTcxrUUSYrzTXBXhjv3XEtGZ kybNRfTg+2SH/Y5a38hBcHm+YysVyP9SOk8Sz5en3Zt8d69F8tnbsHa4NVaBouELhoiS ymHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780464651; x=1781069451; h=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; bh=niRreLs/kA/7tR4N81wD/w0wwhdK/GuCLzmPNYHZL+U=; b=oYOW2OXWpOOXmc6AD4N9l7gWGkijBXGkntyQqYnz9yeqR/zLBtAI1TCUvbAR1/YF7i WUv6tQainglqpxmL4N/Nh89czP4NdpG0qVM2qSmj16BHzOmCS9aZYjt1T6a3wLGuYLnd zPE9gwLaJz92osNA5dZ7fRONuf6Vy1ubincLV5O6NBN9dA6E8T6Kp/AZDGX8BZl9oSG9 vuhAuMHP7nCSjte3Le3swjPyawsy9KeE9LVylF3f61XmR2jR0ULuVKU5Eo3F2ITZGsBI 6icWZbDbZWfUNc8u1YeH0N/hQNZKxcx/UUArhHpn+mz7gPLfxDAHZ+rSugewb3WGpKE6 7hvA== X-Forwarded-Encrypted: i=1; AFNElJ/qKd4PnM4otKljK3n77pqjfmYD+xufK4atwsgwAss5cPzojp28h8F+KG2l5FDZM19QrolNMFLeCl/2rD8=@vger.kernel.org X-Gm-Message-State: AOJu0YwJ3VivlyPpjdIaHy6NdWo0dlqKl88YTYMPcBkDNvvCrGSJAQc2 UUBHanN3sFx7YmG5roHW5BD6J+lWj69TVXnZ/lXAublMaG8ZHpXFEL7u/yHivNsp3ep6u0rjZ3j Wsw== X-Received: from pfbfx13.prod.google.com ([2002:a05:6a00:820d:b0:82c:90c5:5e0d]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:438c:b0:842:614b:50dc with SMTP id d2e1a72fcca58-842859e0fb5mr1398765b3a.13.1780464651185; Tue, 02 Jun 2026 22:30:51 -0700 (PDT) Date: Wed, 3 Jun 2026 05:30:33 +0000 In-Reply-To: <20260603053033.3300318-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: <20260603053033.3300318-1-praan@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260603053033.3300318-8-praan@google.com> Subject: [PATCH v1 7/7] nfs: Cleanup the nfs_page_create_from_page helper From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Trond Myklebust , Anna Schumaker , Christoph Hellwig , Christoph Hellwig , Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the nfs_page_create_from_page() helper and its public export. Following the migration of the Direct I/O path to folios, this function no longer has any callers in the NFS client. Signed-off-by: Pranjal Shrivastava --- fs/nfs/pagelist.c | 35 ----------------------------------- include/linux/nfs_page.h | 6 ------ 2 files changed, 41 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 74ae91151f83..be8e4ef998ac 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -427,41 +427,6 @@ static void nfs_page_assign_page(struct nfs_page *req,= struct page *page, bool p } } =20 -/** - * nfs_page_create_from_page - Create an NFS read/write request. - * @ctx: open context to use - * @page: page to write - * @pgbase: starting offset within the page for the write - * @offset: file offset for the write - * @count: number of bytes to read/write - * - * The page must be locked by the caller. This makes sure we never - * create two different requests for the same page. - * User should ensure it is safe to sleep in this function. - */ -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) -{ - struct nfs_lock_context *l_ctx =3D nfs_get_lock_context(ctx); - struct nfs_page *ret; - - if (IS_ERR(l_ctx)) - return ERR_CAST(l_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, pinned); - if (pinned) - ret->wb_nr_pinned =3D 1; - nfs_page_group_init(ret, NULL); - } - nfs_put_lock_context(l_ctx); - return ret; -} - /** * nfs_page_create_from_folio - Create an NFS read/write request. * @ctx: open context to use diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 14eb5de64d2f..2a3e066cbeb9 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -124,12 +124,6 @@ struct nfs_pageio_descriptor { /* arbitrarily selected limit to number of mirrors */ #define NFS_PAGEIO_DESCRIPTOR_MIRROR_MAX 16 =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, --=20 2.54.0.1013.g208068f2d8-goog