From patchwork Thu May 25 15:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13255405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50EFFC77B7E for ; Thu, 25 May 2023 15:51:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9E44280002; Thu, 25 May 2023 11:51:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B1A876B0078; Thu, 25 May 2023 11:51:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96F94280001; Thu, 25 May 2023 11:51:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 887316B0074 for ; Thu, 25 May 2023 11:51:22 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 60BA9AE5D4 for ; Thu, 25 May 2023 15:51:22 +0000 (UTC) X-FDA: 80829216804.09.0941FFB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 58FEA40013 for ; Thu, 25 May 2023 15:51:20 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R9Gr2oQA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685029880; a=rsa-sha256; cv=none; b=rAm5NPC6j1pd38l7kj3MZmXaQanotjlZqwhFbyDN/ZwQK7QgcSLEhzZwd9M4/81JtenAxL TXOwJ/lsyjUsRbpHYS395csRNAFN/emTjexO5NUicN92cSOdh448EXYSuT0yOIJIYhtPAE o+YcBFTLvHnifjqLNL/2t2s9r3xb8j4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R9Gr2oQA; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685029880; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pxFfFsuy6kbRVs0LWrBWAlBLaVA5rUY1NByIba8Y/08=; b=EZowuuZ5uDrTVnQ8synmkZSYF7G5tc5Z5ZdD5mp2qW2mtL59ygwfTIYLdmqObu8uNogAnC tfexoBtjmWBTrQ4A+5o1hjdUKGiAjPMd9K3NDdEyCDcw2meGqsvQAEoh1HhA67ud1iEMXH SaZa4uEfltISLSFm1TRbBLR7ceYY/+w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685029879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pxFfFsuy6kbRVs0LWrBWAlBLaVA5rUY1NByIba8Y/08=; b=R9Gr2oQALsW8UR9K3V1zdqIvn3jQ9oeABbYhxTcqiuk5SPnQMpXVCjekWrOPy6AZ+DRDnk tJGl+OxqGTvQXyI/iWYjKOKA80SEClKTZ/Nw58aEb5E+br08gY5LMtaPz+99x2V7LwLbwu 6HSMS52s7djNDgwZlxHDR59RcByBwgg= 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-601-yKzjrWDzM6Su1Tb4mISqqA-1; Thu, 25 May 2023 11:51:18 -0400 X-MC-Unique: yKzjrWDzM6Su1Tb4mISqqA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB73F3C17C65; Thu, 25 May 2023 15:51:16 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.192.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BE4C492B0A; Thu, 25 May 2023 15:51:14 +0000 (UTC) From: David Howells To: Christoph Hellwig , David Hildenbrand Cc: David Howells , Jens Axboe , Al Viro , Matthew Wilcox , Jan Kara , Jeff Layton , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton Subject: [RFC PATCH 3/3] block: Use iov_iter_extract_pages() and page pinning in direct-io.c Date: Thu, 25 May 2023 16:51:02 +0100 Message-Id: <20230525155102.87353-4-dhowells@redhat.com> In-Reply-To: <20230525155102.87353-1-dhowells@redhat.com> References: <20230525155102.87353-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 58FEA40013 X-Stat-Signature: znw35gqqa8ca1s8h8rcs4n8z8aytq6xz X-HE-Tag: 1685029880-315915 X-HE-Meta: U2FsdGVkX1/Z1Kzhy8VOGgLDZEdWTGc1mStVfupsVvZ29ttu+S935Pg92wgtvucQmJKzwvnqnyda7WVe1fZrfr7c+wDuA0ZnyZRgxDNgn27oG6kvY2cnikcAxSrdPWX+lZekvGYWfTECQKf7tHBQjRAl2ysV+RQCevx8XGQReG3lclvghgqBBTHlY1T9VW0SgjW396FtFFUgujUkbfG8I/u6ti4XDAZ/jGNl6DKqZrs8Cd0MPhw+GSn9HrE46kQnhbapnMkvJfIgFgUG8H2hdl8F1TfJrmEPhCAGDLX2nhyR4cnu+FiHec4F9YfbkuJXOpYvSGkLcW6joy5DLsriTujt4H4Wph7cFVn/YYk8ySq4qF1H4SjEXXRBaw5os1pAxjLFGBZkzXuCroZTIfFd73q0z5yzFiS+WWTotOUbi4XC2yHVtvbG12cxLm/vEQMVGsXg2YWXM9D6Qv5gpqMr+qMbKTpoAEW3xS35VcIEz/2bCIw9HPtECp9VbMlrTCt87f1gVD10JS/O6+tWImyQXaiUjIh4WQNVzxtmWbc5MjJBl2kM1eMRE2vu2vS5LxvjcXaHtwpaHKFbCX+aJFKZ3navlogGPLyrj17ChDRscx3M+mosxfxvLnX5V2D23Oo+Mmu1P5fHpUuars7knJ87wLKCIF0nkZJvjwFeo37X1dtRFCeoaF4Srn8klUueqlEQy0qzmazvXuiTm2J6TI1S+bDnq4jD77Ji4d0n50LHncfN9h1AWixotvmL2apdRtoJFwwVGeEfTQ9vWnhmcHvNjnnh6Fpri20/OMI+MMP11e37so6+PnNHCqdOiFNVu2N/m+QIbBYgGHGXArbofvH8SYbzqZ2Ia6ovWoex0v2gwGbnUEwR/Fieby01hnL21ws6g6MgTDfLOLqRhA4oVcjp68iJ6Aqcb/X7TpSA4g4tpjlC7uXno+QXPgBUktX/URwHFXZVc7WqRt2oV42MW9f f4WHQxNU 7buGT2lVkLrYhn9meUObjYZf74O7EgYsbPBHVqeD3IlE/eMsd17rDlcnDEj8xcTrQAyChhnsCFXiNDBgz2rEE+yBRT/M7EYRQkYn1uLuNPYxweMGef/hiCeQzvw4jJSxuTqjagI1aSUkQxnkhEiQKFcNX3vSfpCF5Azh+44c7hV0LeD3x5YNKM/EqWCpNTmGzw+TgPhWu4wYEO57PM287PrLbZThlcc8hVVEttKzze6JE5asJOSvFToQxsh3q4W6m2gotxjGb24VS8mcgmNZfSoc1/JJDT8RyAhvNA0r10idBKaEUtJ0dzgv+Q5lGcTPxOOtN9IqzGS/Jenrn7lc6l01UUpwX8L7aJzI6pkQYLtjEWGTnj5j4c4USYzoogXtYvLcpRnwALgKNDU2EDnNIZwcllN3dqagPJnomQQ4Xxa4ksFh/ew0OsgIgvryP50sGY9PjKMEaP6LvYNl8wd6gfKpZ9sf4W+rfC/eig8iqRGzzeuFo5otT5ISg48ZCwckuPyS1ef8F8wZs76di/0bVYvobnmkc6YBueG9hDfANUvBB2aewW29raX2w5Yocbhd+hzU24KJtYRav3YU7rbje0C43q3bSdwpIf5tfgLAN/fyiqiKpduFRaUkIpJEIFdVAnMKxj1LoLC1f+kxcQdJJZCUyTSSNeeBFORAa 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: Change the old block-based direct-I/O code to use iov_iter_extract_pages() to pin user pages or leave kernel pages unpinned rather than taking refs when submitting bios. This makes use of the preceding patches to not take pins on the zero page (thereby allowing insertion of zero pages in with pinned pages) and to get additional pins on pages, allowing an extracted page to be used in multiple bios without having to re-extract it. Signed-off-by: David Howells cc: Christoph Hellwig cc: David Hildenbrand cc: Andrew Morton cc: Jens Axboe cc: Al Viro cc: Matthew Wilcox cc: Jan Kara cc: Jeff Layton cc: Jason Gunthorpe cc: Logan Gunthorpe cc: Hillf Danton cc: Christian Brauner cc: Linus Torvalds cc: linux-fsdevel@vger.kernel.org cc: linux-block@vger.kernel.org cc: linux-kernel@vger.kernel.org cc: linux-mm@kvack.org --- fs/direct-io.c | 68 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/fs/direct-io.c b/fs/direct-io.c index ad20f3428bab..14049204cac8 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -42,8 +42,8 @@ #include "internal.h" /* - * How many user pages to map in one call to get_user_pages(). This determines - * the size of a structure in the slab cache + * How many user pages to map in one call to iov_iter_extract_pages(). This + * determines the size of a structure in the slab cache */ #define DIO_PAGES 64 @@ -121,12 +121,13 @@ struct dio { struct inode *inode; loff_t i_size; /* i_size when submitted */ dio_iodone_t *end_io; /* IO completion function */ + bool need_unpin; /* T if we need to unpin the pages */ void *private; /* copy from map_bh.b_private */ /* BIO completion state */ spinlock_t bio_lock; /* protects BIO fields below */ - int page_errors; /* errno from get_user_pages() */ + int page_errors; /* err from iov_iter_extract_pages() */ int is_async; /* is IO async ? */ bool defer_completion; /* defer AIO completion to workqueue? */ bool should_dirty; /* if pages should be dirtied */ @@ -165,14 +166,14 @@ static inline unsigned dio_pages_present(struct dio_submit *sdio) */ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio) { + struct page **pages = dio->pages; const enum req_op dio_op = dio->opf & REQ_OP_MASK; ssize_t ret; - ret = iov_iter_get_pages2(sdio->iter, dio->pages, LONG_MAX, DIO_PAGES, - &sdio->from); + ret = iov_iter_extract_pages(sdio->iter, &pages, LONG_MAX, + DIO_PAGES, 0, &sdio->from); if (ret < 0 && sdio->blocks_available && dio_op == REQ_OP_WRITE) { - struct page *page = ZERO_PAGE(0); /* * A memory fault, but the filesystem has some outstanding * mapped blocks. We need to use those blocks up to avoid @@ -180,8 +181,7 @@ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio) */ if (dio->page_errors == 0) dio->page_errors = ret; - get_page(page); - dio->pages[0] = page; + dio->pages[0] = ZERO_PAGE(0); sdio->head = 0; sdio->tail = 1; sdio->from = 0; @@ -201,9 +201,9 @@ static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio) /* * Get another userspace page. Returns an ERR_PTR on error. Pages are - * buffered inside the dio so that we can call get_user_pages() against a - * decent number of pages, less frequently. To provide nicer use of the - * L1 cache. + * buffered inside the dio so that we can call iov_iter_extract_pages() + * against a decent number of pages, less frequently. To provide nicer use of + * the L1 cache. */ static inline struct page *dio_get_page(struct dio *dio, struct dio_submit *sdio) @@ -219,6 +219,18 @@ static inline struct page *dio_get_page(struct dio *dio, return dio->pages[sdio->head]; } +static void dio_pin_page(struct dio *dio, struct page *page) +{ + if (dio->need_unpin) + page_get_additional_pin(page); +} + +static void dio_unpin_page(struct dio *dio, struct page *page) +{ + if (dio->need_unpin) + unpin_user_page(page); +} + /* * dio_complete() - called when all DIO BIO I/O has been completed * @@ -444,8 +456,9 @@ static inline void dio_bio_submit(struct dio *dio, struct dio_submit *sdio) */ static inline void dio_cleanup(struct dio *dio, struct dio_submit *sdio) { - while (sdio->head < sdio->tail) - put_page(dio->pages[sdio->head++]); + if (dio->need_unpin) + unpin_user_pages(dio->pages + sdio->head, + sdio->tail - sdio->head); } /* @@ -676,7 +689,7 @@ static inline int dio_new_bio(struct dio *dio, struct dio_submit *sdio, * * Return zero on success. Non-zero means the caller needs to start a new BIO. */ -static inline int dio_bio_add_page(struct dio_submit *sdio) +static inline int dio_bio_add_page(struct dio *dio, struct dio_submit *sdio) { int ret; @@ -688,7 +701,7 @@ static inline int dio_bio_add_page(struct dio_submit *sdio) */ if ((sdio->cur_page_len + sdio->cur_page_offset) == PAGE_SIZE) sdio->pages_in_io--; - get_page(sdio->cur_page); + dio_pin_page(dio, sdio->cur_page); sdio->final_block_in_bio = sdio->cur_page_block + (sdio->cur_page_len >> sdio->blkbits); ret = 0; @@ -743,11 +756,11 @@ static inline int dio_send_cur_page(struct dio *dio, struct dio_submit *sdio, goto out; } - if (dio_bio_add_page(sdio) != 0) { + if (dio_bio_add_page(dio, sdio) != 0) { dio_bio_submit(dio, sdio); ret = dio_new_bio(dio, sdio, sdio->cur_page_block, map_bh); if (ret == 0) { - ret = dio_bio_add_page(sdio); + ret = dio_bio_add_page(dio, sdio); BUG_ON(ret != 0); } } @@ -804,13 +817,13 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page, */ if (sdio->cur_page) { ret = dio_send_cur_page(dio, sdio, map_bh); - put_page(sdio->cur_page); + dio_unpin_page(dio, sdio->cur_page); sdio->cur_page = NULL; if (ret) return ret; } - get_page(page); /* It is in dio */ + dio_pin_page(dio, page); /* It is in dio */ sdio->cur_page = page; sdio->cur_page_offset = offset; sdio->cur_page_len = len; @@ -825,7 +838,7 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page, ret = dio_send_cur_page(dio, sdio, map_bh); if (sdio->bio) dio_bio_submit(dio, sdio); - put_page(sdio->cur_page); + dio_unpin_page(dio, sdio->cur_page); sdio->cur_page = NULL; } return ret; @@ -926,7 +939,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, ret = get_more_blocks(dio, sdio, map_bh); if (ret) { - put_page(page); + dio_unpin_page(dio, page); goto out; } if (!buffer_mapped(map_bh)) @@ -971,7 +984,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, /* AKPM: eargh, -ENOTBLK is a hack */ if (dio_op == REQ_OP_WRITE) { - put_page(page); + dio_unpin_page(dio, page); return -ENOTBLK; } @@ -984,7 +997,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, if (sdio->block_in_file >= i_size_aligned >> blkbits) { /* We hit eof */ - put_page(page); + dio_unpin_page(dio, page); goto out; } zero_user(page, from, 1 << blkbits); @@ -1024,7 +1037,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, sdio->next_block_for_io, map_bh); if (ret) { - put_page(page); + dio_unpin_page(dio, page); goto out; } sdio->next_block_for_io += this_chunk_blocks; @@ -1039,8 +1052,8 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, break; } - /* Drop the ref which was taken in get_user_pages() */ - put_page(page); + /* Drop the pin which was taken in get_user_pages() */ + dio_unpin_page(dio, page); } out: return ret; @@ -1135,6 +1148,7 @@ ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, /* will be released by direct_io_worker */ inode_lock(inode); } + dio->need_unpin = iov_iter_extract_will_pin(iter); /* Once we sampled i_size check for reads beyond EOF */ dio->i_size = i_size_read(inode); @@ -1259,7 +1273,7 @@ ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, ret2 = dio_send_cur_page(dio, &sdio, &map_bh); if (retval == 0) retval = ret2; - put_page(sdio.cur_page); + dio_unpin_page(dio, sdio.cur_page); sdio.cur_page = NULL; } if (sdio.bio)