From nobody Sat Jul 25 02:11:16 2026 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (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 E2E95432E63 for ; Mon, 20 Jul 2026 15:06:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784559984; cv=none; b=tSHC1sJZc5NrUX+w3/shtyOXO/xBVXtTS/PmudPt3IxxixJaxIXnsAYkyZ71gFHoHPcHNWd87QTQjfwLB4GNBLkqo4co82w9SEcoAa0P7eMhJe6l/mUTHlV76auYKIdjW8hVhy3KDPWkLphrGv86UE2ExgnpIN1LEvQcF54bZKU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784559984; c=relaxed/simple; bh=rN8ZeAOD3iV4q2ZsscdmQWM+P3gd+DLW6a5Z9hGR9ZY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LZ9bO/7Nc38qNOb8IAV0xQLzuKUIEU0EVv85xL/oKyqt5tvEB65XEFLkFlxpkH64ynfLecBe7c9uN7pfe/5KQsmArwEQNjICwoFiCNRcAQrq0eVNQBXs1IrL4LbEMvjaqxCbeKX1/Ba/ffHNjxFy07d0eVDHTWiUohEjUQ/3+H8= 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=ZauAqCrm; arc=none smtp.client-ip=209.85.215.198 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="ZauAqCrm" Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-ca7c1e22995so15496228a12.3 for ; Mon, 20 Jul 2026 08:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784559980; x=1785164780; 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=SElWhs1HXhhTA/0qZRPqck5kLRpflzqDz4YDN+8eL6I=; b=ZauAqCrm4JQR1uOI7HQgMbvS7Ck6ydj5ApEYqAl68kkIIIDxFXhNti4APKdLxcel9c GbU1JiSw5qYyo5k1xrMDVLrBVJD7ICq19OxS11xUFOjKFGMwQwOi+AH6VMHJ/6kfanMR B77nak+x4tX5pAdg8u7fvFsIDEQNqRsbAAc8/vhsMw+tp4MITVbLx7UvMpf5HgQUDIMK 3zKTSJMrBTwCDTU76jnh0llNFrctBm5pG1uSYtcRzXbogBJ3o2vk4PE+U10WZEXlONDL btxjJfMxzN2G6oHZXc/GEbRWgWjVEiCux/+5QzKKkJmTaQHmKFtsiVAWscug2wGK295M gO4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784559980; x=1785164780; 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=SElWhs1HXhhTA/0qZRPqck5kLRpflzqDz4YDN+8eL6I=; b=lj0RvY6NBiiqj9/lfYHln79u3d9btiLkj0k9RVZxoWHTdGaZA7kF3+eK6BX56SA3gu K990C95vdPMvScsMZ5Bio1It4CnJw7xBN5RiwbOIYK3SgAF8nQ2iAECOX1Poaehf3gWw fpu5635epOVmZA5mgItZuyPvpi+v2hkF1O1jYVT6XoYtviIhNIxmD1YnJCs5lcLVqrQz 2UTxmpN8CdNeO4vcPlrbfvd7doXPuwmv44V4tnNhH4Wd5OUaw7oCKs88zyTGzhab3OOy ZQRIkYN7v10VnK/JZ7ao0XIwRb3tVwLGw8ZDfoGC7DPm+U3OlI0MNjnTcvJL8BPvAIJC Jp8A== X-Forwarded-Encrypted: i=1; AHgh+RrwUbLxGXuSEsv6dD/ZEplNN9J3OIZvf/aCqOiVNB1umlM6Hk5xhqmvHJJWYSYLpFVKhLcQO4sLeHmT2f4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxrh0vOk5mUVRZ1IwTCOj82IJgTigFBthsrlmTXGFo26ZIGDmrh FetKslvHzpe9S0RgzzH7Af/rkJwIUcUZ9eNvKejwV11Bd1E08nuqkQ8WMVJWpk0wNRNPp3tEap9 NvQ== X-Received: from pgax10.prod.google.com ([2002:a05:6a02:2e4a:b0:c9e:3c0b:5818]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6110:b0:3c3:a140:938a with SMTP id adf61e73a8af0-3c3ad947db0mr16533384637.45.1784559980051; Mon, 20 Jul 2026 08:06:20 -0700 (PDT) Date: Mon, 20 Jul 2026 15:05:57 +0000 In-Reply-To: <20260720150601.2702700-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: <20260720150601.2702700-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260720150601.2702700-2-praan@google.com> Subject: [PATCH v4 1/5] nfs: make nfs_page pin-aware From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Modernizing the NFS Direct I/O path to use iov_iter_extract_pages() introduces page pinning (GUP) instead of standard page referencing. To handle this correctly, nfs_page must track whether it holds a pin or a standard reference. Introduce a new flag, PG_PINNED, to struct nfs_page. Update the creation path (nfs_page_create_from_page and nfs_page_create_from_folio) to accept a pinned bool and set the flag accordingly. If the page is pinned, we skip the existing reference increment (get_page/folio_get) as the pin itself acts as a reference. Update nfs_clear_request() & nfs_direct_release_pages() to use unpin_user_page() or unpin_user_folio() instead of only refcount decrement (put_page) when PG_PINNED flag is set. Finally, ensure subrequests inherit the pinning status from their parent request. Signed-off-by: Pranjal Shrivastava Reviewed-by: Christoph Hellwig --- fs/nfs/direct.c | 22 +++++++++++++++------- fs/nfs/pagelist.c | 40 ++++++++++++++++++++++++++++++---------- fs/nfs/read.c | 2 +- fs/nfs/write.c | 2 +- include/linux/nfs_page.h | 3 +++ 5 files changed, 50 insertions(+), 19 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index e626c72495e6..19792a38c924 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -165,11 +165,17 @@ int nfs_swap_rw(struct kiocb *iocb, struct iov_iter *= iter) return 0; } =20 -static void nfs_direct_release_pages(struct page **pages, unsigned int npa= ges) +static void nfs_direct_release_pages(struct page **pages, unsigned int npa= ges, + bool pinned) { unsigned int i; - for (i =3D 0; i < npages; i++) - put_page(pages[i]); + + if (pinned) { + unpin_user_pages(pages, npages); + } else { + for (i =3D 0; i < npages; i++) + put_page(pages[i]); + } } =20 void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, @@ -371,7 +377,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nf= s_direct_req *dreq, unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); /* XXX do we need to do the eof zeroing found in async_filler? */ req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - pgbase, pos, req_len); + false, pgbase, pos, + req_len); if (IS_ERR(req)) { result =3D PTR_ERR(req); break; @@ -386,7 +393,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nf= s_direct_req *dreq, requested_bytes +=3D req_len; pos +=3D req_len; } - nfs_direct_release_pages(pagevec, npages); + nfs_direct_release_pages(pagevec, npages, false); kvfree(pagevec); if (result < 0) break; @@ -907,7 +914,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, unsigned int req_len =3D min_t(size_t, bytes, PAGE_SIZE - pgbase); =20 req =3D nfs_page_create_from_page(dreq->ctx, pagevec[i], - pgbase, pos, req_len); + false, pgbase, pos, + req_len); if (IS_ERR(req)) { result =3D PTR_ERR(req); break; @@ -950,7 +958,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct n= fs_direct_req *dreq, desc.pg_error =3D 0; defer =3D true; } - nfs_direct_release_pages(pagevec, npages); + nfs_direct_release_pages(pagevec, npages, false); kvfree(pagevec); if (result < 0) break; diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 7dd478ffc2fa..606b518fa204 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -404,20 +404,28 @@ static struct nfs_page *nfs_page_create(struct nfs_lo= ck_context *l_ctx, return req; } =20 -static void nfs_page_assign_folio(struct nfs_page *req, struct folio *foli= o) +static void nfs_page_assign_folio(struct nfs_page *req, struct folio *foli= o, + bool pinned) { if (folio !=3D NULL) { req->wb_folio =3D folio; - folio_get(folio); + if (pinned) + set_bit(PG_PINNED, &req->wb_flags); + else + folio_get(folio); set_bit(PG_FOLIO, &req->wb_flags); } } =20 -static void nfs_page_assign_page(struct nfs_page *req, struct page *page) +static void nfs_page_assign_page(struct nfs_page *req, struct page *page, + bool pinned) { if (page !=3D NULL) { req->wb_page =3D page; - get_page(page); + if (pinned) + set_bit(PG_PINNED, &req->wb_flags); + else + get_page(page); } } =20 @@ -425,6 +433,7 @@ static void nfs_page_assign_page(struct nfs_page *req, = struct page *page) * nfs_page_create_from_page - Create an NFS read/write request. * @ctx: open context to use * @page: page to write + * @pinned: true if page is pinned * @pgbase: starting offset within the page for the write * @offset: file offset for the write * @count: number of bytes to read/write @@ -435,6 +444,7 @@ static void nfs_page_assign_page(struct nfs_page *req, = struct page *page) */ struct nfs_page *nfs_page_create_from_page(struct nfs_open_context *ctx, struct page *page, + bool pinned, unsigned int pgbase, loff_t offset, unsigned int count) { @@ -446,7 +456,7 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, ret =3D nfs_page_create(l_ctx, pgbase, offset >> PAGE_SHIFT, offset_in_page(offset), count); if (!IS_ERR(ret)) { - nfs_page_assign_page(ret, page); + nfs_page_assign_page(ret, page, pinned); nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -457,6 +467,7 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, * nfs_page_create_from_folio - Create an NFS read/write request. * @ctx: open context to use * @folio: folio to write + * @pinned: true if folio is pinned * @offset: starting offset within the folio for the write * @count: number of bytes to read/write * @@ -466,6 +477,7 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, */ struct nfs_page *nfs_page_create_from_folio(struct nfs_open_context *ctx, struct folio *folio, + bool pinned, unsigned int offset, unsigned int count) { @@ -476,7 +488,7 @@ struct nfs_page *nfs_page_create_from_folio(struct nfs_= open_context *ctx, return ERR_CAST(l_ctx); ret =3D nfs_page_create(l_ctx, offset, folio->index, offset, count); if (!IS_ERR(ret)) { - nfs_page_assign_folio(ret, folio); + nfs_page_assign_folio(ret, folio, pinned); nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -498,9 +510,11 @@ nfs_create_subreq(struct nfs_page *req, offset, count); if (!IS_ERR(ret)) { if (folio) - nfs_page_assign_folio(ret, folio); + nfs_page_assign_folio(ret, folio, + test_bit(PG_PINNED, &req->wb_flags)); else - nfs_page_assign_page(ret, page); + nfs_page_assign_page(ret, page, + test_bit(PG_PINNED, &req->wb_flags)); /* find the last request */ for (last =3D req->wb_head; last->wb_this_page !=3D req->wb_head; @@ -552,11 +566,17 @@ static void nfs_clear_request(struct nfs_page *req) struct nfs_open_context *ctx; =20 if (folio !=3D NULL) { - folio_put(folio); + if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) + unpin_user_folio(folio, 1); + else + folio_put(folio); req->wb_folio =3D NULL; clear_bit(PG_FOLIO, &req->wb_flags); } else if (page !=3D NULL) { - put_page(page); + if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) + unpin_user_page(page); + else + put_page(page); req->wb_page =3D NULL; } if (l_ctx !=3D NULL) { diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 2b70bd2b934b..e7497b029d6c 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -324,7 +324,7 @@ int nfs_read_add_folio(struct nfs_pageio_descriptor *pg= io, =20 aligned_len =3D min_t(unsigned int, ALIGN(len, rsize), fsize); =20 - new =3D nfs_page_create_from_folio(ctx, folio, 0, aligned_len); + new =3D nfs_page_create_from_folio(ctx, folio, false, 0, aligned_len); if (IS_ERR(new)) { error =3D PTR_ERR(new); if (nfs_netfs_folio_unlock(folio)) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index d2b03ceaeb4f..e565b811d8b7 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1088,7 +1088,7 @@ static struct nfs_page *nfs_setup_write_request(struc= t nfs_open_context *ctx, req =3D nfs_try_to_update_request(folio, offset, bytes); if (req !=3D NULL) goto out; - req =3D nfs_page_create_from_folio(ctx, folio, offset, bytes); + req =3D nfs_page_create_from_folio(ctx, folio, false, offset, bytes); if (IS_ERR(req)) goto out; nfs_inode_add_request(req); diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 4b9a35dbc062..fd7aafe7cb54 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -38,6 +38,7 @@ enum { PG_REMOVE, /* page group sync bit in write path */ PG_CONTENDED1, /* Is someone waiting for a lock? */ PG_CONTENDED2, /* Is someone waiting for a lock? */ + PG_PINNED, /* page is pinned by GUP */ }; =20 struct nfs_inode; @@ -125,11 +126,13 @@ struct nfs_pageio_descriptor { =20 extern struct nfs_page *nfs_page_create_from_page(struct nfs_open_context = *ctx, struct page *page, + bool pinned, unsigned int pgbase, loff_t offset, unsigned int count); extern struct nfs_page *nfs_page_create_from_folio(struct nfs_open_context= *ctx, struct folio *folio, + bool pinned, unsigned int offset, unsigned int count); extern void nfs_release_request(struct nfs_page *); --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 02:11:16 2026 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95D62432E82 for ; Mon, 20 Jul 2026 15:06:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784559990; cv=none; b=E8vQSfBVlkdu1a/ju5AiN68uTIX1oeZqiV5qJlsDBsSySadX5f0zQJVY8PrI3nt1iTv+ojXDv25WdpS08JFWKOaetO6ZC1SVo01+xSK93xwP6rJ/O+k8txqC8ljiOQdXhrWnfe634+TR3EgN7oVv110Vl1ee0qorz2+PlcuvoRU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784559990; c=relaxed/simple; bh=F1hdAv1BVXhW0ib5eW8/6E+coJBZg/4PK1kV/+S8BiY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ewjHPmHBNw9365EwH/mBb2+DDdPiSrfiIQSv4z8jOs9K8Lha3rmuRBLyt/L+X/3h+DNgZeismkFP22WkSLpfACcklNRA0iBAPEP8B63AyLzuwY2hRhC0llvXHStviDlDzl0K/vwSeubC4YHOlDgYJGG2ynmxkpROL+jzhoU/gZA= 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=V1spRhOk; arc=none smtp.client-ip=209.85.210.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="V1spRhOk" Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8423f1fe39eso12998328b3a.1 for ; Mon, 20 Jul 2026 08:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784559988; x=1785164788; 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=d1yAJMK6cD/e1kuyT9ZxFpud0sasrBE5xVp8jVQmGx4=; b=V1spRhOkVNnPITHCk5k6qtQ5NkYYcU/YPdLXvuZyDE0JqBoewWzm3DK9CCaZhCWu4e iLKlaLGjLbYOV4fRwoX5qhkHYbe7yDnQVli00l62Cz98i327LiQw6mvzHl90TazyUdtn g6Stnbe/kcvEdomRK+4q2vA4r3Ev9w0MepqGXbYclo6mu+7W8Uyr6/Phs1yBjAxN9sMN IyFaPQPJzpbO+KiuF67pYhZg5Uhqe9Vpkz1DuyKrBwQcHdVM5HvjomPT4Mc4EfTUYlNd 2oHUGZvQilqZD2lMqf9xJYPrhgdTiKe3rg7DM602SU9wiJyBbtW9N4nnFgwGA1zyBc+P DhBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784559988; x=1785164788; 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=d1yAJMK6cD/e1kuyT9ZxFpud0sasrBE5xVp8jVQmGx4=; b=AdrsCtRDFA+1J5EhmmFwskVrIfb91qz/floCKuQHSa8QnYvhhJHqK546EXzP4fW6nV JETbUMw8ERdMUaI0ejaZixoDGaxKOb63u6GxcBT5ubSy7msH+a77t0Lbpn8lJXZFOP2U CfN4t2ASUM6+iENBjrrRi4tovIP2BSGIEKbE2HyXdPx+rhniZ9Rff13KwTcbJjQ80wDL 4nKjirdQGLfbwJ/p1dbJHTyPAJAChB48WW4teyjY01LdnF/W9d8csxLJkaSldk8EKgP1 PGBo4xkR6EXpEeeiAvpjt9d3a25G3Sy3fQ70+zTjyDEeFZibBOTRBFIGWMQ3gH+7Lrsk XRHg== X-Forwarded-Encrypted: i=1; AHgh+Ro03gp/9cUuw47Z5QJ0ysAzGKes16wjgz/FQ1kWpIq+5Jphl9R6cXh7mGKoREke4+uGyfk4r34Vv6v1P0Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yyp7AkJgnZg/9WVSiOobpHKJMIiuTd5qaLYv/HhqThCvBywUQFQ Y67QH3LcPuxFI40gbVqWdWhE4kYzLeiU+qKMGUNcKNYEII0Gyn4fQvKsQpn6zLgqEI8vvXSbtN3 PSQ== X-Received: from pgfu18.prod.google.com ([2002:a65:6712:0:b0:c9b:f0c9:631a]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:c88:b0:848:2f77:e2d9 with SMTP id d2e1a72fcca58-84c29528adfmr14649468b3a.66.1784559987318; Mon, 20 Jul 2026 08:06:27 -0700 (PDT) Date: Mon, 20 Jul 2026 15:05:58 +0000 In-Reply-To: <20260720150601.2702700-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: <20260720150601.2702700-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260720150601.2702700-3-praan@google.com> Subject: [PATCH v4 2/5] nfs: track number of pinned pages in nfs_page From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Track the number of pinned pages in nfs_page to handle unpinning correctly, ensuring that only primary requests perform the final unpinning operation, preventing subrequests from incorrectly performing unpinning on behalf of their parent requests. Add wb_nr_pinned to struct nfs_page to store the count of pinned pages owned by the request. Update request creation and cleanup helpers to initialize and use wb_nr_pinned for primary requests. Use the nfs_page_array_len() helper to calculate the number of pages spanned by a request's offset and length. Signed-off-by: Pranjal Shrivastava Reviewed-by: Christoph Hellwig --- fs/nfs/pagelist.c | 9 +++++++-- include/linux/nfs_page.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 606b518fa204..c307daf5f68d 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -457,6 +457,8 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_o= pen_context *ctx, offset_in_page(offset), count); if (!IS_ERR(ret)) { nfs_page_assign_page(ret, page, pinned); + if (pinned) + ret->wb_nr_pinned =3D 1; nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -489,6 +491,9 @@ struct nfs_page *nfs_page_create_from_folio(struct nfs_= open_context *ctx, ret =3D nfs_page_create(l_ctx, offset, folio->index, offset, count); if (!IS_ERR(ret)) { nfs_page_assign_folio(ret, folio, pinned); + if (pinned) + ret->wb_nr_pinned =3D nfs_page_array_len(offset_in_page(offset), + count); nfs_page_group_init(ret, NULL); } nfs_put_lock_context(l_ctx); @@ -567,14 +572,14 @@ static void nfs_clear_request(struct nfs_page *req) =20 if (folio !=3D NULL) { if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) - unpin_user_folio(folio, 1); + unpin_user_folio(folio, req->wb_nr_pinned); else folio_put(folio); req->wb_folio =3D NULL; clear_bit(PG_FOLIO, &req->wb_flags); } else if (page !=3D NULL) { if (test_and_clear_bit(PG_PINNED, &req->wb_flags)) - unpin_user_page(page); + unpin_user_pages(&page, req->wb_nr_pinned); else put_page(page); req->wb_page =3D NULL; diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index fd7aafe7cb54..080fa3e23580 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -59,6 +59,7 @@ struct nfs_page { struct nfs_page *wb_this_page; /* list of reqs for this page */ struct nfs_page *wb_head; /* head pointer for req list */ unsigned short wb_nio; /* Number of I/O attempts */ + unsigned int wb_nr_pinned; /* Number of pinned pages */ }; =20 struct nfs_pgio_mirror; --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 02:11:16 2026 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 E9424432E90 for ; Mon, 20 Jul 2026 15:06:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784559997; cv=none; b=eJRMb0sB1jYN87cZ5vkHS12/NVWzVYSW8ZXoHOVrQN1YDeY6yxrdgmps+La77maD/9OY8PLRYX1fcBlvt60Amn0s2+zJUk8LbllNUEDX1i9IDvUwrL2rDFuJAbtHBODj6sMsN/tFHX9w58jGjeSxRM4+W8tO3yhdmOWR4+hQPG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784559997; c=relaxed/simple; bh=uHl1U9uqrn0K6pJWxrCywcw/LqoTgBI8N0t/dHCfA0w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YwWHc5j8aIEKCxJnf1d/UWbUWf2zPe8EQGP6U1V2DkLz7NWe3iUdBZ2dklnHcS316pkMbDdg0dN0LzMxQl/6J1Zx3VYY9W9A5en1w3RKZbyI3b1u6KJYui08N5qFVVq1J6OJ5WOkGuT+QwLD5Vf8zEphHnbthBLG9nNp6CfoEdY= 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=IOxUjVPo; arc=none smtp.client-ip=209.85.214.198 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="IOxUjVPo" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2ccb687f82eso147096785ad.3 for ; Mon, 20 Jul 2026 08:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784559994; x=1785164794; 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=iEr3VNvmBkqEprXTi3pXlF49HoF9BORq25oSTaK+MZQ=; b=IOxUjVPoR4z3ZzWeLtENBcF3FDNb21BqoZg/JjOW32uWsKIC4avYISG1sRgvhDN5BB QaGinyrmzOUg3oc2/1kzkEbzNWn4q2RYlnz7A2b62tYXURn5/Xb+3VGVY0QdZYtM0574 QuybZtx+9t57FCGCVjwRWKELNS8nsf2D5LxyFPJdRZ7zWkK4Yxf1ZcYsXVVe5KX5TYg8 XQ2AyIUosZKeD6HT7LOTdVSfQru+5Dmdk9v9aX87DfBECtyRA4eCR7YDcKhZOhpHBh8f cZWc9ujpPMXzHua2iwx1q5mOmFAkuUz2aux2DlT1SNMwbU8YnS8+AQ1KU5hvfauIEWE4 TGpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784559994; x=1785164794; 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=iEr3VNvmBkqEprXTi3pXlF49HoF9BORq25oSTaK+MZQ=; b=ZSAANfHM1Mg9XzjvnK+QG/wGXB0usoazb9SK2Z3Xhx258f1oL+6I90hUVLVe3ADXJI QtJI1kPmUn2BREn0OqKO6f8BQvvySd4yWP+5gdb1rzA6bw45bHgJw/6W0pEs71x935qL RG9HiJzF0JNfOKOK0cXyjbP0ZzP/lgqQAJbzWa9X8AKA9xo20W4kFl7/BEErMxp0AsVU 6iTG/fAzoDlcP2uLxFphSWGbVr19h8xmXWr7v7G7u4QQpawLMK5/g8FZ5cPFaBQuSTJk McoYE7yYwftMPg4b5pxijFIoM5H4F/UaUPgF+wzKHpfkF2IKo9muRaOJCqlFOtLgrZGQ hEVw== X-Forwarded-Encrypted: i=1; AHgh+RoLrjDLElc+En2z1PQYxW/42g1rxbbCyVBcWm9gS1XbnbkxKUesKJ575GYknGFykj/ttHHdnVIwNiAqdXM=@vger.kernel.org X-Gm-Message-State: AOJu0YyRGetUCP/odXZvyfyz0A9SZo7tgnI+bHxjZd7NKmO+7ijrFxfN WtRa3ar/nkWHDyltGjVHw64YImQl1VNkxfqSZveKrxrWrP40qLm0HweN9fvsoJEgp9n7wip89CA 4kA== X-Received: from plot12.prod.google.com ([2002:a17:902:8c8c:b0:2ce:9c0d:171f]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:dad0:b0:2c9:97a8:afe5 with SMTP id d9443c01a7336-2cf349eee08mr154630795ad.40.1784559993879; Mon, 20 Jul 2026 08:06:33 -0700 (PDT) Date: Mon, 20 Jul 2026 15:05:59 +0000 In-Reply-To: <20260720150601.2702700-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: <20260720150601.2702700-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260720150601.2702700-4-praan@google.com> Subject: [PATCH v4 3/5] nfs: introduce nfs_release_request_list helper From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a centralized helper, nfs_release_request_list, to handle the bulk release of nfs_page requests from a list. This serves as a preparatory step for two upcoming improvements: 1. Pin-Aware Cleanup: As we migrate to iov_iter_extract_* API, requests will hold pins (GUP) instead of standard references. The helper ensures that the correct unpinning logic gets applied consistently across all requests in a list. 2. Folio Support: In subsequent patches where nfs_page structures will cover multi-page folios, this helper provides a clean infrastructure to unlock these larger units of I/O in bulk during completion, similar to the pattern in bio_release_pages. Additionally, refactor nfs_read_sync_pgio_error() to utilize this new helper. Signed-off-by: Pranjal Shrivastava Reviewed-by: Shivaji Kant Reviewed-by: Christoph Hellwig --- fs/nfs/direct.c | 8 +------- fs/nfs/pagelist.c | 17 +++++++++++++++++ include/linux/nfs_page.h | 4 ++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 19792a38c924..96995736fac2 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -314,13 +314,7 @@ static void nfs_direct_read_completion(struct nfs_pgio= _header *hdr) =20 static void nfs_read_sync_pgio_error(struct list_head *head, int error) { - struct nfs_page *req; - - while (!list_empty(head)) { - req =3D nfs_list_entry(head->next); - nfs_list_remove_request(req); - nfs_release_request(req); - } + nfs_release_request_list(head); } =20 static void nfs_direct_pgio_init(struct nfs_pgio_header *hdr) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index c307daf5f68d..80fb553528d9 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -624,6 +624,23 @@ void nfs_release_request(struct nfs_page *req) } EXPORT_SYMBOL_GPL(nfs_release_request); =20 +/* + * nfs_release_request_list - Release a list of NFS read/write requests + * @head: list of requests to release + * + * Removes each request from the list and drops it's refcount. + */ +void nfs_release_request_list(struct list_head *head) +{ + while (!list_empty(head)) { + struct nfs_page *req =3D nfs_list_entry(head->next); + + nfs_list_remove_request(req); + nfs_release_request(req); + } +} +EXPORT_SYMBOL_GPL(nfs_release_request_list); + /* * nfs_generic_pg_test - determine if requests can be coalesced * @desc: pointer to descriptor diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 080fa3e23580..c38e4b380be5 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -136,8 +136,8 @@ extern struct nfs_page *nfs_page_create_from_folio(stru= ct nfs_open_context *ctx, bool pinned, unsigned int offset, unsigned int count); -extern void nfs_release_request(struct nfs_page *); - +void nfs_release_request(struct nfs_page *req); +void nfs_release_request_list(struct list_head *head); =20 extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc, struct inode *inode, --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 02:11:16 2026 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 D61733B42C9 for ; Mon, 20 Jul 2026 15:06:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784560008; cv=none; b=ChcZVW129vwz2LKJYE/+xElPO6TZEJj3OzEVr1JUEDrxzAGrW8QzVX9TY/hEOtr6zjEOui0GeP6ZOsPLDgFkdlzqlZblhhl/de7JJjzIppZ7Q3MYhEeUgmL05kP62aVP/kMhkMQmlnbufdzVIAwz/q2EbgHIqMNRvECtz8Qbqss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784560008; c=relaxed/simple; bh=lvGGPxUg6qqnndxGA/aNFDaANt0aJQwgdyiaT7mGbqM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dldjZzn5aRvgAmjmrBxDDXhVn7DcNopHbCnbWkXVmHPT0K09s9vP1f9p+kgDCmTXD6ID5e3N2immKH3w3+67gLwjBoVF4rdBWVGvvXHjvpu0tNSLhSi5sVK8AUN1gRyGZgK1TYh58HORLV+ybNw/8ySGbYAJqnk+exOEVGkDZFY= 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=lgP7VNqt; arc=none smtp.client-ip=209.85.214.199 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="lgP7VNqt" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2cacf17c7e0so99307545ad.0 for ; Mon, 20 Jul 2026 08:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784560002; x=1785164802; 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=05o7VYUkCdAGSR73b2hzUktgrPZs5fUnpb2oWqFgEQo=; b=lgP7VNqtSYl9op/wKrWO6h2JAjjgXjNenX2D1nwhA86ObF3NQKd5fie/VKxTFiUsq6 kyd44Z9GhstHi771VC2cXK3ysHfnog788heITgUuH+N8rsurmtcgku2epJtDYAgYh6w2 Jdk9a2S7LuuxZaTB3D12o+AeWEK3lcWPt2bQDHE7quLvDWXSoe0TPqe+GtjCVIMXPOxF wxKQSjcd1VkKD07Qn/F2zCZMEiJ7ORsO7EnVHyReG5Bl0CxqhcVc8rNPo/nJQS8OBMSK UomPQGtx3DAxIKim0RyFN2SeGYSs62/e+4gwoJ7WCcUy5qM3y97Y6y0LheO3+7wvEy6q GJCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784560002; x=1785164802; 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=05o7VYUkCdAGSR73b2hzUktgrPZs5fUnpb2oWqFgEQo=; b=o8xVTIsCSu/2MOSGvHJh37Dh5woqWt4q21X/tJZJabJC7dnxiTBX+lv3wObK2LSiMe ZAxOjKktpLUSHT7rzpb6pS7R5FddWzQUYVq5eHFbBw2uUIJBg0L7g181mHM48TLMDnKO U3qGu7Xs/AhVcxcJPI7BlOTv0om7IczK6u3DlWuLJ2IWXTg1xhzRBBs+0RQhQUOPaqHG qB8MBXABgaM5uSnALTMbqPiQ2wA7gCnKJ4MeZc/C2fNvW8DebH3sPMIKqINs99zTDNI2 lLMMiGNLX6gHgryMbfkxl2gkWOhSfU8vLZmUTi8TkXx7At+gGRBOjSM96PEpA/n6zA2S Geeg== X-Forwarded-Encrypted: i=1; AHgh+RqkpwC25SVS0rkWYH6kU2BV9Xav4r1TR0PbwHVMCojDzEH6pz8xFkvJiquIaMmn0Cf0GngrTl0M7H3m0+w=@vger.kernel.org X-Gm-Message-State: AOJu0YySxU1UJBK7wX9D3PAcruQTUjpjod7eJ8IcGikp5DmO/N3a0OMv fj1HFyfqwnQr2bvQRsyuGyHTG0WekF351PjEgbL9a2YC1GpVYzY8Ln7A/EgyoIShXEOwhh0cq6Q HGQ== X-Received: from plgn10.prod.google.com ([2002:a17:902:f60a:b0:2cc:cfa0:3117]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2441:b0:2c2:cf20:213 with SMTP id d9443c01a7336-2cf3499c666mr166695255ad.29.1784560001928; Mon, 20 Jul 2026 08:06:41 -0700 (PDT) Date: Mon, 20 Jul 2026 15:06:00 +0000 In-Reply-To: <20260720150601.2702700-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: <20260720150601.2702700-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260720150601.2702700-5-praan@google.com> Subject: [PATCH v4 4/5] nfs: migrate direct I/O to iov_iter_extract_pages From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Migrate the NFS Direct I/O path away from the legacy iov_iter_get_pages_alloc2() API to the modern iov_iter_extract_pages API. The transition aligns NFS with the modern VFS extraction model and serves as a preparatory step for supporting requirements such as page pinning via GUP for DMA. The migration fixes a bug in the Direct I/O loop where pages were being unpinned immediately after request creation. With the new extraction model, pins are held until the I/O is complete. Manual release in the loop is correspondingly updated to only clean up failed pages. Signed-off-by: Pranjal Shrivastava Reviewed-by: Shivaji Kant Reviewed-by: Christoph Hellwig --- fs/nfs/direct.c | 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 02:11:16 2026 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 C4094434E39 for ; Mon, 20 Jul 2026 15:06:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784560011; cv=none; b=UB4g+zxqPX/UCTzSrfVdgL/eligGx92CYyS1AbH7VY0zL47TlU9lWsIK6rd3960oKmcgvC7E3D0cxAKdHK6NYbf5Iv6Wo+QGe24vvjxDgARKAWcQitIEqMWd93NgdtHFrMQTtzvYfiWaaEPuY4B9ssA/1q4Skz039GbHyHdfVH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784560011; c=relaxed/simple; bh=cE1N3bryysgtK03efhJdxm+fcOXxenlTYhZMIyr54Dk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QFVKzbBGmeKUnRSMmNrjDMDkvr1QF8hkwbqgHV2qP2cnFy10318QBP4VlB4juvPlTyYJNsUWtPjqvd7BiWQNQ2snWxLVnHOVEUDsmjtwhPOqYyEDZGJ4tEkc1T0pSSOXPr0iqxsOTs2RCgoorWBbMYVHuNrggcjqAfEl+ZejzoY= 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=Uve1xiiD; arc=none smtp.client-ip=209.85.214.199 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="Uve1xiiD" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2cacf17c7e0so99309145ad.0 for ; Mon, 20 Jul 2026 08:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784560009; x=1785164809; 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=HitDsJbfPqYQGRXR79WqQVN0Cxm+fM5TpLS0CnFvhac=; b=Uve1xiiDBQ0/NtDEbd4Wi1CaexiBB+UlfIMrwI9pXUG9K+9ZBqh7Vil2miIuu+NyvZ KKzVCmdRSmgLiOAP2dvyTTesA8EDy7CZ0CScFuWvJfZHW4UpNH31UIQcoXh1bpBkVReL rPAtt92Wepw2VOfFR/GVNtAYE0igx526ZFX9vMRA1o9UX5mCax/1GZeRgQHA51TWhKPT OZy20TBBWndH6WTMLsKRMnkCsCa98MEzhP8HeJbuHL/QVe/G2ZkVJ9dSMJMa3RFkBYzJ m+4TFJkP4dvf2jgcQNiFfrXzZe0pDX22K1LGvXf/LyRX42nEjmY9lu4riCQI4fqPWpfH 8Jmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784560009; x=1785164809; 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=HitDsJbfPqYQGRXR79WqQVN0Cxm+fM5TpLS0CnFvhac=; b=q3ufxYMO49EW+pxwOuHBxMV2ympCzU3jffbNPVPoekkU24FNlnqOXun9N009F+ykcU 3jyiGgUCv3c8jIwuLPTchDGyFS3vk/+2rvOsQCpEvZAHQRBU7lEqubn6uWgG55smd+Ti bd+R4VxF/5KzHkycEBlY9jzp0VlGnqXB3ExVtW3hwqvNKg9uaXihVpQX/lj09Dwdjf1C KB8Jqjwg/JCCT5YIwTmohiVdQvYD94DjPh9RDWSCZbKYIsKrd+LvMuPu7vpMBOPabrE7 hNYIDFe9i15mts7e6fJJctkmwi+XaT0vSWQrkuGMLdaKe06osU39SsrOxxNoKCfwPo7x 1wtg== X-Forwarded-Encrypted: i=1; AHgh+Rqau+ueD2poy0FYQZd4OGIVvLTiwLe4J4zB87o69okmsUrZXEM6XNSqFcUDHKt2DWi+WtnJ1Is1yWQ3zFY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1SZgHkeGUQyNIDS2/Dzz33xC0WVQbMZ3ZwD/IKmisUHPmKpaq xtcrzIg6u8SwoYbIQkTl0AJueGWQvQ3VO1HfbwqiM6sGDhtlFIWuUaLQj0m72TEqs/5Jn/QlMvV zkA== X-Received: from plbbh1.prod.google.com ([2002:a17:902:a981:b0:2ce:fa1a:2684]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2383:b0:2c9:97a7:f544 with SMTP id d9443c01a7336-2cf34a18cefmr161701915ad.42.1784560008838; Mon, 20 Jul 2026 08:06:48 -0700 (PDT) Date: Mon, 20 Jul 2026 15:06:01 +0000 In-Reply-To: <20260720150601.2702700-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: <20260720150601.2702700-1-praan@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260720150601.2702700-6-praan@google.com> Subject: [PATCH v4 5/5] nfs: introduce nfs_direct_extract_pages helper From: Pranjal Shrivastava To: linux-nfs@vger.kernel.org, Trond Myklebust , Anna Schumaker Cc: Chuck Lever , Jeff Layton , linux-kernel@vger.kernel.org, Christoph Hellwig , Logan Gunthorpe , Jason Gunthorpe , linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org, Shivaji Kant , Pranjal Shrivastava Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce nfs_direct_extract_pages() in direct.c to centralize page extraction and request creation for the Direct I/O path. The helper manages extraction from the iters and builds a list of nfs_page requests Refactor nfs_direct_read_schedule_iovec() and nfs_direct_write_schedule_iovec() to utilize the new helper, unifying the extraction logic on both paths. Signed-off-by: Pranjal Shrivastava Reviewed-by: Shivaji Kant Reviewed-by: Christoph Hellwig --- fs/nfs/direct.c | 127 ++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 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