From patchwork Thu Feb 28 21:36:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10833753 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 F182E1390 for ; Thu, 28 Feb 2019 21:36:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E41E82FBC3 for ; Thu, 28 Feb 2019 21:36:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E277B2FBE7; Thu, 28 Feb 2019 21:36:49 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 845722FBC3 for ; Thu, 28 Feb 2019 21:36:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730072AbfB1Vgs (ORCPT ); Thu, 28 Feb 2019 16:36:48 -0500 Received: from mail-io1-f67.google.com ([209.85.166.67]:38585 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727775AbfB1Vgs (ORCPT ); Thu, 28 Feb 2019 16:36:48 -0500 Received: by mail-io1-f67.google.com with SMTP id p18so17893130ioh.5 for ; Thu, 28 Feb 2019 13:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s4r3IKeU2bKeb+yed6nB7uqZH66NYELE7D70Un3HupY=; b=STqJ3kBHRxEAk8qedva5PRItvR1R+NQDSADuYDHancWggYhYWDguaLEU5DLUtM11Nf iCu5GUZYsQsxSc5K+qZP8+A5YoHihMk4Gg16NLB5tjtJkkBMhMsNXFu1ZWTgLBu7Y6Wc 56cc4osrPR9KV5PW5g/ZcqtGuMbnfOQpE2ZmsELh0U1JisIicRTA11lYpUD0b1dN1t+L 1nsZiSz9+F9XckQg1F1m5eAJicaRCMzOfNdX5JoFoKTZ+/N47IAODY8T/bjRKrIHdMX3 Y5sfeRtg069r9BVeDPwyXIjFAAZ7F6c8u5O+UKXShh2pDdcalMSTK/Jm+AZYox2yO3D7 vI4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s4r3IKeU2bKeb+yed6nB7uqZH66NYELE7D70Un3HupY=; b=Ifec8KSf15rUbJcJn03SeLAery7JT+7FxBfPDt6D0HoUt0bs4MWGruRMelYNGftKAb 0HrggPagusWDI9g8m16eXXNKcjNqu++Zxe/azy8Ws2Stp2nCwYJC+H94EsIBdsi5hSNC 4K5ya1dtrvMlviuOMhQ2zCLHn/nJ4UIPOT/hB0eSsiVWpLVGv89Agyz6HzaIR/AwdyeJ IjIV6EeJdcX3MY3GHVmjT/JEYwJNwC/B+/HdRhfpETO79NOKJ3dCjyy7jL2iflwRknqI DIqTcoJfYj6NP/hsH813N8VepljtdDXY4SYg2XiDC8a64NFTu+PJZycL67df2KbQ/Zgx fmtg== X-Gm-Message-State: APjAAAVx8gI9fxSCo+xsUiC+2ERMtPm0FYboo9cTG1hFr8l8HLkOw3Un I/JQ0NG5qCosRxElAbtZvs4XJw== X-Google-Smtp-Source: APXvYqw/5hYeaYZke66pd7zSDw4jxeTOXXbaJK5YZdJIvpINHTK+O0OhBguWyH4RBX0O48U34+rodQ== X-Received: by 2002:a6b:b5c7:: with SMTP id e190mr943982iof.26.1551389807582; Thu, 28 Feb 2019 13:36:47 -0800 (PST) Received: from x1.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id m79sm1376311itm.25.2019.02.28.13.36.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 13:36:46 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: hch@lst.de, viro@ZenIV.linux.org.uk, Jens Axboe Subject: [PATCH 1/2] iov_iter: add ITER_BVEC_FLAG_NO_REF flag Date: Thu, 28 Feb 2019 14:36:41 -0700 Message-Id: <20190228213642.306-2-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228213642.306-1-axboe@kernel.dk> References: <20190228213642.306-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For ITER_BVEC, if we're holding on to kernel pages, the caller doesn't need to grab a reference to the bvec pages, and drop that same reference on IO completion. This is essentially safe for any ITER_BVEC, but some use cases end up reusing pages and uncondtionally dropping a page reference on completion. And example of that is sendfile(2), that ends up being a splice_in + splice_out on the pipe pages. Add a flag that tells us it's fine to not grab a page reference to the bvec pages, since that caller knows not to drop a reference when it's done with the pages. Signed-off-by: Jens Axboe --- fs/io_uring.c | 3 +++ include/linux/uio.h | 24 +++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index f2df45bd61c3..6bdf280a7fb9 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -869,6 +869,9 @@ static int io_import_fixed(struct io_ring_ctx *ctx, int rw, iov_iter_bvec(iter, rw, imu->bvec, imu->nr_bvecs, offset + len); if (offset) iov_iter_advance(iter, offset); + + /* don't drop a reference to these pages */ + iter->type |= ITER_BVEC_FLAG_NO_REF; return 0; } diff --git a/include/linux/uio.h b/include/linux/uio.h index ecf584f6b82d..4e926641fa80 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -23,14 +23,23 @@ struct kvec { }; enum iter_type { - ITER_IOVEC = 0, - ITER_KVEC = 2, - ITER_BVEC = 4, - ITER_PIPE = 8, - ITER_DISCARD = 16, + /* set if ITER_BVEC doesn't hold a bv_page ref */ + ITER_BVEC_FLAG_NO_REF = 2, + + /* iter types */ + ITER_IOVEC = 4, + ITER_KVEC = 8, + ITER_BVEC = 16, + ITER_PIPE = 32, + ITER_DISCARD = 64, }; struct iov_iter { + /* + * Bit 0 is the read/write bit, set if we're writing. + * Bit 1 is the BVEC_FLAG_NO_REF bit, set if type is a bvec and + * the caller isn't expecting to drop a page reference when done. + */ unsigned int type; size_t iov_offset; size_t count; @@ -84,6 +93,11 @@ static inline unsigned char iov_iter_rw(const struct iov_iter *i) return i->type & (READ | WRITE); } +static inline bool iov_iter_bvec_no_ref(const struct iov_iter *i) +{ + return (i->type & ITER_BVEC_FLAG_NO_REF) != 0; +} + /* * Total number of bytes covered by an iovec. * From patchwork Thu Feb 28 21:36:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10833757 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 2FFDB1390 for ; Thu, 28 Feb 2019 21:36:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 232732FBA3 for ; Thu, 28 Feb 2019 21:36:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 218E22FBE6; Thu, 28 Feb 2019 21:36:52 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77FA02FBA3 for ; Thu, 28 Feb 2019 21:36:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730884AbfB1Vgu (ORCPT ); Thu, 28 Feb 2019 16:36:50 -0500 Received: from mail-io1-f65.google.com ([209.85.166.65]:40013 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729954AbfB1Vgu (ORCPT ); Thu, 28 Feb 2019 16:36:50 -0500 Received: by mail-io1-f65.google.com with SMTP id p17so17862750iol.7 for ; Thu, 28 Feb 2019 13:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gN840LcjsGueYPKzT8V5G3GCmhFsVue5RDrc94TYwF8=; b=EW/2bSFBEJnJMzckHYpibMwmN00iW6WFdT61U7JN3JjNFRcZ3KQqOeNKueLmj4VOfM 7suPlt6D3GDSbT9nVaNt7w7aVUv6EfVXlPzD7faP0VLnIacg5ewbGaJI090awhHswUBE mJ2k4bUBagfv7+tCQS1siUl2njOVoEPjyZh1kLnj3xiSFbm+hETLl4oz/W13bI4b05GQ BBtcLMctwi945Ek0pxvRscj7Ih++4S+oeQokMEdW+V0cwETP7c2RHV3JqXxgVJnu+UxN E/Hj4K0nEtwZ0zIZZtLt82TRujuxeweRgTVpkbDmaHSrlW8kutfQxp3dlcdXQbjBV2FN nhDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gN840LcjsGueYPKzT8V5G3GCmhFsVue5RDrc94TYwF8=; b=RKU48hdyF+L3tTfoNpYf45TXMnMQS0dwyGDdSF1RuVZMzxEepPkJxOwmol3lqtO0by ynfWFf4JamVdeulrh94y0Bqt+ldIscZFHxJV5GB4VkoLUND8Dy+hPSa1rF2IDh88kMF7 UBPbZBCh1n4vWRrLqfJzYpJVRPzeOe7afXlvXA31albF14q/puYQVYUj1YDpku2QiQev cBSGrdUyLs3aKxrDcwg9hIKa2L+EXhp5iohXqPkTTaHhxmAdEL3xR9nkpXSqGvOAqnAm KHX9b/fj90Fehqz0VzBmv4L9ReUc9V7nqbDrv76zif4zurhXwa1SkYJUoNdiB+Kx55l8 LA6A== X-Gm-Message-State: APjAAAUa+vL+TPQ2BEpMdASWy3VVw0jFufb8p9YHwqUBAOs4IRPnzRux +x86pPMyuKPS20xyhaZZZaWhzFw2JysRIw== X-Google-Smtp-Source: APXvYqz6GsXVEflLhiAWOi7n1NHPWeBZN+EQAAGXtnCBdN0Du/Y73GywbCLGqCY34Ucw+/TbzbdB7Q== X-Received: by 2002:a5e:840c:: with SMTP id h12mr918368ioj.284.1551389809027; Thu, 28 Feb 2019 13:36:49 -0800 (PST) Received: from x1.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id m79sm1376311itm.25.2019.02.28.13.36.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 13:36:48 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: hch@lst.de, viro@ZenIV.linux.org.uk, Jens Axboe Subject: [PATCH 2/2] block: add BIO_NO_PAGE_REF flag Date: Thu, 28 Feb 2019 14:36:42 -0700 Message-Id: <20190228213642.306-3-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228213642.306-1-axboe@kernel.dk> References: <20190228213642.306-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If bio_iov_iter_get_pages() is called on an iov_iter that is flagged with NO_REF, then we don't need to add a page reference for the pages that we add. Add BIO_NO_PAGE_REF to track this in the bio, so IO completion knows not to drop a reference to these pages. Signed-off-by: Jens Axboe --- block/bio.c | 43 ++++++++++++++++++++++----------------- fs/block_dev.c | 12 ++++++----- fs/iomap.c | 12 ++++++----- include/linux/blk_types.h | 1 + 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/block/bio.c b/block/bio.c index 71a78d9fb8b7..b64cedc7f87c 100644 --- a/block/bio.c +++ b/block/bio.c @@ -849,20 +849,14 @@ static int __bio_iov_bvec_add_pages(struct bio *bio, struct iov_iter *iter) size = bio_add_page(bio, bv->bv_page, len, bv->bv_offset + iter->iov_offset); if (size == len) { - struct page *page; - int i; + if (!bio_flagged(bio, BIO_NO_PAGE_REF)) { + struct page *page; + int i; + + mp_bvec_for_each_page(page, bv, i) + get_page(page); + } - /* - * For the normal O_DIRECT case, we could skip grabbing this - * reference and then not have to put them again when IO - * completes. But this breaks some in-kernel users, like - * splicing to/from a loop device, where we release the pipe - * pages unconditionally. If we can fix that case, we can - * get rid of the get here and the need to call - * bio_release_pages() at IO completion time. - */ - mp_bvec_for_each_page(page, bv, i) - get_page(page); iov_iter_advance(iter, size); return 0; } @@ -925,10 +919,12 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) * This takes either an iterator pointing to user memory, or one pointing to * kernel pages (BVEC iterator). If we're adding user pages, we pin them and * map them into the kernel. On IO completion, the caller should put those - * pages. For now, when adding kernel pages, we still grab a reference to the - * page. This isn't strictly needed for the common case, but some call paths - * end up releasing pages from eg a pipe and we can't easily control these. - * See comment in __bio_iov_bvec_add_pages(). + * pages. If we're adding kernel pages, and the caller told us it's safe to + * do so, we just have to add the pages to the bio directly. We don't grab an + * extra reference to those pages (the user should already have that), and we + * don't put the page on IO completion. The caller needs to check if the bio is + * flagged BIO_NO_PAGE_REF on IO completion. If it isn't, then pages should be + * released. * * The function tries, but does not guarantee, to pin as many pages as * fit into the bio, or are requested in *iter, whatever is smaller. If @@ -940,6 +936,13 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) const bool is_bvec = iov_iter_is_bvec(iter); unsigned short orig_vcnt = bio->bi_vcnt; + /* + * If this is a BVEC iter, then the pages are kernel pages. Don't + * release them on IO completion, if the caller asked us to. + */ + if (is_bvec && iov_iter_bvec_no_ref(iter)) + bio_set_flag(bio, BIO_NO_PAGE_REF); + do { int ret; @@ -1696,7 +1699,8 @@ static void bio_dirty_fn(struct work_struct *work) next = bio->bi_private; bio_set_pages_dirty(bio); - bio_release_pages(bio); + if (!bio_flagged(bio, BIO_NO_PAGE_REF)) + bio_release_pages(bio); bio_put(bio); } } @@ -1713,7 +1717,8 @@ void bio_check_pages_dirty(struct bio *bio) goto defer; } - bio_release_pages(bio); + if (!bio_flagged(bio, BIO_NO_PAGE_REF)) + bio_release_pages(bio); bio_put(bio); return; defer: diff --git a/fs/block_dev.c b/fs/block_dev.c index e9faa52bb489..78d3257435c0 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -336,12 +336,14 @@ static void blkdev_bio_end_io(struct bio *bio) if (should_dirty) { bio_check_pages_dirty(bio); } else { - struct bio_vec *bvec; - int i; - struct bvec_iter_all iter_all; + if (!bio_flagged(bio, BIO_NO_PAGE_REF)) { + struct bvec_iter_all iter_all; + struct bio_vec *bvec; + int i; - bio_for_each_segment_all(bvec, bio, i, iter_all) - put_page(bvec->bv_page); + bio_for_each_segment_all(bvec, bio, i, iter_all) + put_page(bvec->bv_page); + } bio_put(bio); } } diff --git a/fs/iomap.c b/fs/iomap.c index 97cb9d486a7d..abdd18e404f8 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -1589,12 +1589,14 @@ static void iomap_dio_bio_end_io(struct bio *bio) if (should_dirty) { bio_check_pages_dirty(bio); } else { - struct bio_vec *bvec; - int i; - struct bvec_iter_all iter_all; + if (!bio_flagged(bio, BIO_NO_PAGE_REF)) { + struct bvec_iter_all iter_all; + struct bio_vec *bvec; + int i; - bio_for_each_segment_all(bvec, bio, i, iter_all) - put_page(bvec->bv_page); + bio_for_each_segment_all(bvec, bio, i, iter_all) + put_page(bvec->bv_page); + } bio_put(bio); } } diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index d66bf5f32610..791fee35df88 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -215,6 +215,7 @@ struct bio { /* * bio flags */ +#define BIO_NO_PAGE_REF 0 /* don't put release vec pages */ #define BIO_SEG_VALID 1 /* bi_phys_segments valid */ #define BIO_CLONED 2 /* doesn't own data */ #define BIO_BOUNCED 3 /* bio is a bounce bio */