From mboxrd@z Thu Jan 1 00:00:00 1970 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-Type: text/plain; charset="UTF-8" Track the number of pinned pages in nfs_page to handle unpinning correctly, ensuring that only primary requests perform the final unpinning operation, preventing subrequests from incorrectly performing unpinning on behalf of their parent requests. Add wb_nr_pinned to struct nfs_page to store the count of pinned pages owned by the request. Update request creation and cleanup helpers to initialize and use wb_nr_pinned for primary requests. Use the nfs_page_array_len() helper to calculate the number of pages spanned by a request's offset and length. Signed-off-by: Pranjal Shrivastava --- fs/nfs/pagelist.c | 9 +++++++-- include/linux/nfs_page.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 606b518fa204..c307daf5f68d 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -457,6 +457,8 @@ struct nfs_page *nfs_page_create_from_page(struct nfs_open_context *ctx, offset_in_page(offset), count); if (!IS_ERR(ret)) { nfs_page_assign_page(ret, page, pinned); + if (pinned) + ret->wb_nr_pinned = 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 = 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 = 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) if (folio != 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 = NULL; clear_bit(PG_FOLIO, &req->wb_flags); } else if (page != 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 = 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 */ }; struct nfs_pgio_mirror; -- 2.55.0.229.g6434b31f56-goog