From patchwork Thu Apr 11 21:08:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 10896831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F17F11708 for ; Thu, 11 Apr 2019 21:09:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9FF328DF5 for ; Thu, 11 Apr 2019 21:09:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE31228DF8; Thu, 11 Apr 2019 21:09:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F8FC28DF5 for ; Thu, 11 Apr 2019 21:09:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0BE96B0271; Thu, 11 Apr 2019 17:09:04 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8F3806B0272; Thu, 11 Apr 2019 17:09:04 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BAE76B0273; Thu, 11 Apr 2019 17:09:04 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by kanga.kvack.org (Postfix) with ESMTP id 569506B0271 for ; Thu, 11 Apr 2019 17:09:04 -0400 (EDT) Received: by mail-qk1-f200.google.com with SMTP id a15so6181412qkl.23 for ; Thu, 11 Apr 2019 14:09:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yYsvkgH/Ju0XGVOMTK6dddAzfBQAu+oRTUE8KAbC2wU=; b=WuoFWeGa1aN+VXeHAJCirkk/ZxRCq9rSmyeIaq+N/rbqwQ0CvH/TrDW02cQiUXU5FS Gk82MNduDPjkBjh7hcwAYJFFOKzWWWsKi0OHPOIjh+VmzKW6SMywsPDyBkFYSJ62qOqu 5HS+P+AIJRePuExcHLf9bN2VHJrFonLKBsIWj/m0ekSVsVolxpPWjLFZI6avrmZpHqUY DpLSMfj96I0BaIAvg9CzCfewqrzxzTWa+nYaU87gLpsK1QWvPKb4HVsCiCoYbzo7T1yf cSDnVJxOr6+bu+DkzaWEUEDb3zs47aX/kHOekL0+fs6dGGyZT42LGxQCim3XRHmR4D5w z6Eg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=jglisse@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAVCVrs+z/IaS4jsTJkeKLkz9k3ntoRcQ/ytTTI8BnoWwA/jB9H5 z5rHjOcXC9iHfX6yxwIBnukhHca46Vsm1sY0evNOgT+qLMcBb8qQ9J2LRxq+EzMWogdYJGLCg3Y +lFteAogwlDaYbGEz2am84MZ4Wcgd1QZPQGOtj0u8bHsf0FSk+gsJhM6ouqloEZczog== X-Received: by 2002:ac8:3739:: with SMTP id o54mr44064809qtb.291.1555016943194; Thu, 11 Apr 2019 14:09:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7N551SaFQT/wGP6vu0M/e80YNK8LItNDrlQTifmIjxyVVeF3ujO9v60igNcKbWvmG+bBe X-Received: by 2002:ac8:3739:: with SMTP id o54mr44064715qtb.291.1555016942101; Thu, 11 Apr 2019 14:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555016942; cv=none; d=google.com; s=arc-20160816; b=xNbSXFyFqWXVuMev7a0EJojvKrDqfW7Li17+AecJCZ7Pn957DvCtsigiIaFAtcikq3 BqrV2razKtMBRqxM1NyPGQwVFu4yKnEPH9tMA9AY1IQeLQ7o+OVlzyLjgSgZ0P23yviv NO/qU2ZDlXE7rtYEvmpKoTP1RgA7Fdxc7kx/8PPxnUuTA/6rnO5qVkm/Icvr/oo3UJ/R i5chAA7atQAUCd1aNZb0pugB483veQwYK1VPS6JIiNCba6UY1ZiXxOkzJWQv51Gk82kD oZ9PV0/733XvXU0pvA/L7DNp2hc/lyncF9vdIzKVm85L7l6BMX9a0DCSP7v+z8fSRLID 4okA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=yYsvkgH/Ju0XGVOMTK6dddAzfBQAu+oRTUE8KAbC2wU=; b=rckhCRls9+6JD9limTIe4TgLfxwekrRhbQ+mv3nm3e5gcWWnyKCCq10bLekESjGwts oMTPhjKw+PY50IzrxFWKVeHPvCPDEOVsbh7671rIM0a2VB8YPNEZU+1rEujRGbWQ1jiJ 3lfquY3HcB4JVYYw9NY8oWkb3OcL24Eqf6qK0Hm/lf0e2cURyEIJ+Cd4GST3yiW+c6s5 9HRdYLn+Cjmrz16uBMve3tClZ8dqSQR6eRrHneTt3t2TsvWmEOTQLO4EIfawTcmW/l4j c2Tni4QrkzJjvZSuYoiY8xlwqH/ZSysSdME79WZT4IezQ3aQ/WaArdlKtLwkdOwhkfA0 6BdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=jglisse@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id 142si720437qkj.17.2019.04.11.14.09.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 14:09:02 -0700 (PDT) Received-SPF: pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jglisse@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=jglisse@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20C2A3086210; Thu, 11 Apr 2019 21:09:01 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.20.6.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F0C35C223; Thu, 11 Apr 2019 21:08:59 +0000 (UTC) From: jglisse@redhat.com To: linux-kernel@vger.kernel.org Cc: =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, John Hubbard , Jan Kara , Dan Williams , Alexander Viro , Johannes Thumshirn , Christoph Hellwig , Jens Axboe , Ming Lei , Dave Chinner , Jason Gunthorpe , Matthew Wilcox Subject: [PATCH v1 08/15] block: use bvec_put_page() instead of put_page(bvec_page()) Date: Thu, 11 Apr 2019 17:08:27 -0400 Message-Id: <20190411210834.4105-9-jglisse@redhat.com> In-Reply-To: <20190411210834.4105-1-jglisse@redhat.com> References: <20190411210834.4105-1-jglisse@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 11 Apr 2019 21:09:01 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Jérôme Glisse Replace all put_page(bvec_page()) with bvec_put_page() so that we can use proper put_page (ie either put_page() or put_user_page()). This is done using a coccinelle patch and running it with: spatch --sp-file spfile --in-place --dir . with spfile: %<--------------------------------------------------------------------- @exists@ expression E1; @@ -put_page(bvec_page(E1)); +bvec_put_page(E1); --------------------------------------------------------------------->% Signed-off-by: Jérôme Glisse Cc: linux-fsdevel@vger.kernel.org Cc: linux-block@vger.kernel.org Cc: linux-mm@kvack.org Cc: John Hubbard Cc: Jan Kara Cc: Dan Williams Cc: Alexander Viro Cc: Johannes Thumshirn Cc: Christoph Hellwig Cc: Jens Axboe Cc: Ming Lei Cc: Dave Chinner Cc: Jason Gunthorpe Cc: Matthew Wilcox --- block/bio.c | 6 +++--- fs/afs/rxrpc.c | 2 +- fs/block_dev.c | 4 ++-- fs/ceph/file.c | 2 +- fs/cifs/misc.c | 2 +- fs/io_uring.c | 2 +- fs/iomap.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/block/bio.c b/block/bio.c index c73ac2120ca0..b74b81085f3a 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1433,7 +1433,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, out_unmap: bio_for_each_segment_all(bvec, bio, j, iter_all) { - put_page(bvec_page(bvec)); + bvec_put_page(bvec); } bio_put(bio); return ERR_PTR(ret); @@ -1452,7 +1452,7 @@ static void __bio_unmap_user(struct bio *bio) if (bio_data_dir(bio) == READ) set_page_dirty_lock(bvec_page(bvec)); - put_page(bvec_page(bvec)); + bvec_put_page(bvec); } bio_put(bio); @@ -1666,7 +1666,7 @@ static void bio_release_pages(struct bio *bio) struct bvec_iter_all iter_all; bio_for_each_segment_all(bvec, bio, i, iter_all) - put_page(bvec_page(bvec)); + bvec_put_page(bvec); } /* diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index 85caafeb9131..08386ddf7185 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -349,7 +349,7 @@ static int afs_send_pages(struct afs_call *call, struct msghdr *msg) ret = rxrpc_kernel_send_data(call->net->socket, call->rxcall, msg, bytes, afs_notify_end_request_tx); for (loop = 0; loop < nr; loop++) - put_page(bvec_page(&bv[loop])); + bvec_put_page(&bv[loop]); if (ret < 0) break; diff --git a/fs/block_dev.c b/fs/block_dev.c index 7304fc309326..9761f7943774 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -264,7 +264,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, bio_for_each_segment_all(bvec, &bio, i, iter_all) { if (should_dirty && !PageCompound(bvec_page(bvec))) set_page_dirty_lock(bvec_page(bvec)); - put_page(bvec_page(bvec)); + bvec_put_page(bvec); } if (unlikely(bio.bi_status)) @@ -342,7 +342,7 @@ static void blkdev_bio_end_io(struct bio *bio) int i; bio_for_each_segment_all(bvec, bio, i, iter_all) - put_page(bvec_page(bvec)); + bvec_put_page(bvec); } bio_put(bio); } diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 5183f545b90a..6a39347f4956 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -163,7 +163,7 @@ static void put_bvecs(struct bio_vec *bvecs, int num_bvecs, bool should_dirty) if (bvec_page(&bvecs[i])) { if (should_dirty) set_page_dirty_lock(bvec_page(&bvecs[i])); - put_page(bvec_page(&bvecs[i])); + bvec_put_page(&bvecs[i]); } } kvfree(bvecs); diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 4b6a6317f125..86d78f297526 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -803,7 +803,7 @@ cifs_aio_ctx_release(struct kref *refcount) for (i = 0; i < ctx->npages; i++) { if (ctx->should_dirty) set_page_dirty(bvec_page(&ctx->bv[i])); - put_page(bvec_page(&ctx->bv[i])); + bvec_put_page(&ctx->bv[i]); } kvfree(ctx->bv); } diff --git a/fs/io_uring.c b/fs/io_uring.c index 32f4b4ddd20b..349f0e58ee5c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2346,7 +2346,7 @@ static int io_sqe_buffer_unregister(struct io_ring_ctx *ctx) struct io_mapped_ubuf *imu = &ctx->user_bufs[i]; for (j = 0; j < imu->nr_bvecs; j++) - put_page(bvec_page(&imu->bvec[j])); + bvec_put_page(&imu->bvec[j]); if (ctx->account_mem) io_unaccount_mem(ctx->user, imu->nr_bvecs); diff --git a/fs/iomap.c b/fs/iomap.c index ed5f249cf0d4..ab578054ebe9 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -1595,7 +1595,7 @@ static void iomap_dio_bio_end_io(struct bio *bio) int i; bio_for_each_segment_all(bvec, bio, i, iter_all) - put_page(bvec_page(bvec)); + bvec_put_page(bvec); } bio_put(bio); }