From mboxrd@z Thu Jan 1 00:00:00 1970 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-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); while (iov_iter_count(iter)) { - struct page **pagevec; + struct page **pagevec = NULL; size_t bytes; size_t pgbase; unsigned npages, i; + bool pinned = iov_iter_extract_will_pin(iter); - result = iov_iter_get_pages_alloc2(iter, &pagevec, - rsize, &pgbase); + result = iov_iter_extract_pages(iter, &pagevec, + rsize, ~0U, 0, &pgbase); if (result < 0) break; - + bytes = result; npages = (result + pgbase + PAGE_SIZE - 1) / PAGE_SIZE; for (i = 0; i < npages; i++) { @@ -371,7 +372,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); /* XXX do we need to do the eof zeroing found in async_filler? */ req = nfs_page_create_from_page(dreq->ctx, pagevec[i], - false, pgbase, pos, + pinned, pgbase, pos, req_len); if (IS_ERR(req)) { result = PTR_ERR(req); @@ -387,7 +388,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, requested_bytes += req_len; pos += 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, NFS_I(inode)->write_io += iov_iter_count(iter); while (iov_iter_count(iter)) { - struct page **pagevec; + struct page **pagevec = NULL; size_t bytes; size_t pgbase; unsigned npages, i; + bool pinned = iov_iter_extract_will_pin(iter); - result = iov_iter_get_pages_alloc2(iter, &pagevec, - wsize, &pgbase); + result = iov_iter_extract_pages(iter, &pagevec, + wsize, ~0U, 0, &pgbase); if (result < 0) break; @@ -900,7 +903,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); req = nfs_page_create_from_page(dreq->ctx, pagevec[i], - false, pgbase, pos, + pinned, pgbase, pos, req_len); if (IS_ERR(req)) { result = PTR_ERR(req); @@ -944,7 +947,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, desc.pg_error = 0; defer = 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; -- 2.54.0.1013.g208068f2d8-goog