From patchwork Mon Jan 16 23:10:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 44373 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1453098wrn; Mon, 16 Jan 2023 15:29:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXt4x/WtykkGodsp/hWXVBwPi2oq6w66Do3UGymmDxdpn4L7oZb/IR7lIVWPB8Wlnp7SF8Ag X-Received: by 2002:a17:902:b18f:b0:193:234:443a with SMTP id s15-20020a170902b18f00b001930234443amr1285689plr.45.1673911771434; Mon, 16 Jan 2023 15:29:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673911771; cv=none; d=google.com; s=arc-20160816; b=GNXNNteCSLpZ69CCtMZTgmuGEnu6sdEJFYxqPX5T28ZstTVjUQkynQob3y+7g1yfQj 0kofFRnF1A/JFd8rVXcjjUb2Y6WonwdBCN3KVI0QP8sRrKbPjIlljIwbFT+cY0MlLtqi Z4jgbgO4XM/+01IwRIRscDX54NITc2ZvQQrASlGUO8c+W0Z2XdGnDmUTyLi4S+kkXK7B +s9vbWeCppQZDhugbNe9zzalbcP6bxPpnq6H12G6NbdL4J8QXnd4GqILHQ1JQXUZAl8K l/m0MbChEP25caZCBtTuDwPNIqJS1ok0j4/YiEQwBaF/NdUXR1wiigdW4NdWFy/g4OM5 g8Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=21npy4d/0NS7rpte2Lw8y8mTFb/H6639N8dVp3qG+wk=; b=aWblH5C0NyUdCqeMWRoueCpNqto+K48iaH9tt3xBX6tplEJ0GuWdEd8TcPB/bJlDor 2X2GL5cRHeZvi5OC4FMkvQihqGrW+ZFCOFTUSTukqYNFGnmPkohG16U0cYr1MF+QzSp3 hA1Et9ExmhgVCGpe0smvilLK0fzGp/BWgBUxJtmHTk8GKvcjZFASfVwF/ONrkNb6BVje FSZml2S9mYkJOfKfCig7IKQO4UPghATKwrRirmN0ITNeKopJ+RjcGdL9hde7A3Vk1Nhg t+cv1QcbmTnw4eSX9oWvymfz892GKqyVbzLB1xHSaPU13mn43ihJasOBFwOU7SNUYbKd sx6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dmW4ujOx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h4-20020a170902f54400b001949482830esi4528315plf.414.2023.01.16.15.29.19; Mon, 16 Jan 2023 15:29:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dmW4ujOx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235421AbjAPXQ1 (ORCPT + 99 others); Mon, 16 Jan 2023 18:16:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235413AbjAPXPv (ORCPT ); Mon, 16 Jan 2023 18:15:51 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3806A302AA for ; Mon, 16 Jan 2023 15:10:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673910649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=21npy4d/0NS7rpte2Lw8y8mTFb/H6639N8dVp3qG+wk=; b=dmW4ujOxXSWx7zpxkGmueu3EUMiJWfIEccrectQZOTnrbmf9jY2nCs4EAKYs81JPUCgqaN N098Z8M+BgxkWPeGGAoA0F+cEnP8rB6qiTulUrRHGutErXpoHgGt52XcUdphQlZGAIuacs RRrJv6ejw9cA4x11Rp1HoFkb4iyxgeo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-480-asss4pKVPImrS-lvo5oIYA-1; Mon, 16 Jan 2023 18:10:42 -0500 X-MC-Unique: asss4pKVPImrS-lvo5oIYA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 096C83C0F42B; Mon, 16 Jan 2023 23:10:42 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D01339D6D; Mon, 16 Jan 2023 23:10:40 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH v6 22/34] nfs: Pin pages rather than ref'ing if appropriate From: David Howells To: Al Viro Cc: Trond Myklebust , Anna Schumaker , Jeff Layton , linux-nfs@vger.kernel.org, dhowells@redhat.com, Christoph Hellwig , Matthew Wilcox , Jens Axboe , Jan Kara , Jeff Layton , Logan Gunthorpe , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 16 Jan 2023 23:10:39 +0000 Message-ID: <167391063989.2311931.13252453380684759087.stgit@warthog.procyon.org.uk> In-Reply-To: <167391047703.2311931.8115712773222260073.stgit@warthog.procyon.org.uk> References: <167391047703.2311931.8115712773222260073.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755223709582795489?= X-GMAIL-MSGID: =?utf-8?q?1755223709582795489?= Convert the NFS direct I/O code to use iov_iter_extract_pages() instead of iov_iter_get_pages(). This will pin pages or leave them unaltered rather than getting a ref on them as appropriate to the iterator. The pages need to be pinned for DIO-read rather than having refs taken on them to prevent VM copy-on-write from malfunctioning during a concurrent fork() (the result of the I/O would otherwise end up only visible to the child process and not the parent). Signed-off-by: David Howells cc: Trond Myklebust cc: Anna Schumaker cc: Jeff Layton cc: linux-nfs@vger.kernel.org --- fs/nfs/direct.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 42af84685f20..4a3108db2cb6 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -142,11 +142,15 @@ int nfs_swap_rw(struct kiocb *iocb, struct iov_iter *iter) return 0; } -static void nfs_direct_release_pages(struct page **pages, unsigned int npages) +static void nfs_direct_release_pages(struct page **pages, unsigned int npages, + unsigned int cleanup_mode) { unsigned int i; - for (i = 0; i < npages; i++) - put_page(pages[i]); + + if (cleanup_mode) { + for (i = 0; i < npages; i++) + page_put_unpin(pages[i], cleanup_mode); + } } void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, @@ -327,17 +331,16 @@ 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; - result = iov_iter_get_pages_alloc(iter, &pagevec, - rsize, &pgbase, - FOLL_DEST_BUF); + result = iov_iter_extract_pages(iter, &pagevec, rsize, INT_MAX, + FOLL_DEST_BUF, &pgbase); if (result < 0) break; - + bytes = result; npages = (result + pgbase + PAGE_SIZE - 1) / PAGE_SIZE; for (i = 0; i < npages; i++) { @@ -363,7 +366,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, pos += req_len; dreq->bytes_left -= req_len; } - nfs_direct_release_pages(pagevec, npages); + nfs_direct_release_pages(pagevec, npages, + iov_iter_extract_mode(iter, FOLL_DEST_BUF)); kvfree(pagevec); if (result < 0) break; @@ -787,14 +791,13 @@ 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; - result = iov_iter_get_pages_alloc(iter, &pagevec, - wsize, &pgbase, - FOLL_SOURCE_BUF); + result = iov_iter_extract_pages(iter, &pagevec, wsize, INT_MAX, + FOLL_SOURCE_BUF, &pgbase); if (result < 0) break; @@ -831,7 +834,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, pos += req_len; dreq->bytes_left -= req_len; } - nfs_direct_release_pages(pagevec, npages); + nfs_direct_release_pages(pagevec, npages, + iov_iter_extract_mode(iter, FOLL_SOURCE_BUF)); kvfree(pagevec); if (result < 0) break;