From patchwork Thu Feb 9 10:29:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13134346 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 AD2C5C05027 for ; Thu, 9 Feb 2023 10:30:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D31D6B0081; Thu, 9 Feb 2023 05:30:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 01EC86B0080; Thu, 9 Feb 2023 05:30:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C79066B0082; Thu, 9 Feb 2023 05:30:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id AFCEE6B0080 for ; Thu, 9 Feb 2023 05:30:30 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9072FC0506 for ; Thu, 9 Feb 2023 10:30:30 +0000 (UTC) X-FDA: 80447384220.11.02C9F08 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id B51B9180022 for ; Thu, 9 Feb 2023 10:30:28 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="KIA/LSzn"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1675938628; 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=Q5bJAUy0Yf/xIkHbL0gYjIax658ix+8tiANnbR9foj4=; b=A1BcG3CRaDvm1qu+RgA6lHYDEbHCMwfJ/yz1CBQ/+GKhGZIphmsT1gzLjCd6k8PPOH8RR3 FfLLPMkah41HCqk1uH+6C1RJSs3mUDDxEIg6JzwlSg5Fm44OMsc5W+v/BoN4PfboprT+97 wzU9UrrwGirb8VXAb7bX3K4xC2xNv/U= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="KIA/LSzn"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675938628; a=rsa-sha256; cv=none; b=lT+CaUoiXwmL1FH3KDV+3o3aRbU9vmkXVw1t2ow/SvtBioj0PREEw9Y8szNn/1CYATkRFx LM08z1yPHBtlg2V3DifvbIlTqflzjDo88Rdt9JBBtDGorYPCw3yl028X7/tfZZlLN4cUSd Y5puKPMoNgoyeX274jH0QLmORq9+UI0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675938628; 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=Q5bJAUy0Yf/xIkHbL0gYjIax658ix+8tiANnbR9foj4=; b=KIA/LSzn6NsaDu50B6MaGbvZnkb8LFUq4nm5Hef2Vb2CrKl6eTn3ojo6xvXWh8m0Kaz26M 60bCj5lDhwkQRhoWuBajNVmY1RJ1ISmip509uUPM96MKAePBMMs/h55PvzKbSFgAr4ZS0H MoSZg3374rSmRM5saZ3cCDtVvK8GguY= 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-644-HKGEz01pP0Wfszk7FqXLoA-1; Thu, 09 Feb 2023 05:30:22 -0500 X-MC-Unique: HKGEz01pP0Wfszk7FqXLoA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 312BA3C16E94; Thu, 9 Feb 2023 10:30:12 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3ED8F1415127; Thu, 9 Feb 2023 10:30:10 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard Subject: [PATCH v13 05/12] iov_iter: Define flags to qualify page extraction. Date: Thu, 9 Feb 2023 10:29:47 +0000 Message-Id: <20230209102954.528942-6-dhowells@redhat.com> In-Reply-To: <20230209102954.528942-1-dhowells@redhat.com> References: <20230209102954.528942-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Rspamd-Queue-Id: B51B9180022 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: iyhxi8xozuktytobxdi78nd6bbi6actd X-HE-Tag: 1675938628-92314 X-HE-Meta: U2FsdGVkX1+565obyMfIWL7rxPZ4k2B0XFT49UOCAa45CkUXPqPwSrIIO2cBuZgCL/dDjhWd+QK9dc4iPn0sfqgZ5J+3Zo9KX+eWnhP6DiUYUMKxgxbymD7acruP6sxaYi/F6fPW1CAOpNZ3M8kweIqF62ki8ggqvNB0dzTEN5rKayyVEYDr59afbUNJh6UllzX/FlNcUyOCHYQKm8jcfI+bT9hmjpk3yY6azci8qXnV3X8y3V0fXFCDaK3F51rD3mjDQhP+LRlghNu1c1Uw0Ar5Bz0JS1CdVRAeT0VmShE2rwxnpkNRbT10Acxfqc91dwXQVkywNFuKNZm4IRmjvswEjFR9LPGjlwlLWP61AThZDElLKvy6Y2qSuGrnRSEAxzfxd1M/i9vMKdhlTVEoAUfms+36iER8pKFbrxdw4SwRtb8wMsoYMXQrnfFWxM6D2ouLBhF1lPiOa4sPa6E/GGlOEZVaUVtvyUnmf2wdGAtc90C2QPl4xSP3E072ZnGPrXqM88J0OvOfujt1aRYVdkbpxOFCL4hfizg5CJ4ELzminI4d9JQWzkWDFQMl0dWxqmrlfA13leAXGLtaNIKJsa4RUuA0dnTuW1YIVs3kh2H22/WHUFjW8qilwl3KyRTlwn0vPrUXma54Qoe30w1N8CZoN9HTI/xkD5QXkD2PVKBi7FOAf7Apz2cnmhheChm84kaHiGG2WihvqYNsxio6xydghTMZg8XdBMUxnC/+mpKV/Cso0CFZvSIpn90ZinGxq+9LVN/15sAlgEve691t6BSEfyUEH7jpw4j6rqSLViLOr38fZxK1A5O98DwdfOGXmhcTIzZNV0kGQ1aUQEHycB12gVv3KrsxP9wbUpqXi6S9oW2gBgKuXmn2Bt/5stAsl95eaoJ3OA90M79ca5qOKBGn6aPpUsuhqf2y8dYv7UQrEn2izge4CAy7augbyc/QPXoD/OTQTdz30pTaUOn 4FHEHy0O wAoBmgqDxd4yLjsdjQXyhg/lezMdvda18qVJPpzacVF3e1UboSEpY4dI4wcjzxH0usWmJuVrHDYwSwmxSn5s+PJK/qaPPDiuU+wCCWggniuQiZsgZqRMhAIqT2qL8NSRKOCUR3F3zcauIFYlChvNF+JV9K3L4thSEo3uTd4lyRnUHoYeZMVpIfwY10sdGdOIQwDn9ErHjvESzERS/Hde7LMco3fZHKrB/qa9IF8p8gamvswwAoKoVqUDCvT5JamYVy/do2vNR0L+ou9cLfjQv0nQFN/smyUngQGbxyhGyFalNVx8YtZpmzLtu1gPo2CChyHYf+D9sLiI58cCkIMQOdZeXeCxz8GZZvg3yKJdwc20At9GWoXVc3FVabapHdkki+26XdjNsG/h/enYW7ZBCImp0NI5FhuUGEstFopFoDFRh1t8xb5jrTO4eTb8/HLFY0YiX 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: Define flags to qualify page extraction to pass into iov_iter_*_pages*() rather than passing in FOLL_* flags. For now only a flag to allow peer-to-peer DMA is supported. Signed-off-by: David Howells Reviewed-by: Christoph Hellwig Reviewed-by: John Hubbard cc: Al Viro cc: Jens Axboe cc: Logan Gunthorpe cc: linux-fsdevel@vger.kernel.org cc: linux-block@vger.kernel.org --- Notes: ver #12) - Use __bitwise for the extraction flags typedef. ver #11) - Use __bitwise for the extraction flags. ver #9) - Change extract_flags to extraction_flags. ver #7) - Don't use FOLL_* as a parameter, but rather define constants specifically to use with iov_iter_*_pages*(). - Drop the I/O direction constants for now. block/bio.c | 6 +++--- block/blk-map.c | 8 ++++---- include/linux/uio.h | 10 ++++++++-- lib/iov_iter.c | 14 ++++++++------ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/block/bio.c b/block/bio.c index ab59a491a883..b97f3991c904 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1245,11 +1245,11 @@ static int bio_iov_add_zone_append_page(struct bio *bio, struct page *page, */ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) { + iov_iter_extraction_t extraction_flags = 0; unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt; unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt; struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt; struct page **pages = (struct page **)bv; - unsigned int gup_flags = 0; ssize_t size, left; unsigned len, i = 0; size_t offset, trim; @@ -1264,7 +1264,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) pages += entries_left * (PAGE_PTRS_PER_BVEC - 1); if (bio->bi_bdev && blk_queue_pci_p2pdma(bio->bi_bdev->bd_disk->queue)) - gup_flags |= FOLL_PCI_P2PDMA; + extraction_flags |= ITER_ALLOW_P2PDMA; /* * Each segment in the iov is required to be a block size multiple. @@ -1275,7 +1275,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) */ size = iov_iter_get_pages(iter, pages, UINT_MAX - bio->bi_iter.bi_size, - nr_pages, &offset, gup_flags); + nr_pages, &offset, extraction_flags); if (unlikely(size <= 0)) return size ? size : -EFAULT; diff --git a/block/blk-map.c b/block/blk-map.c index 19940c978c73..080dd60485be 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -265,9 +265,9 @@ static struct bio *blk_rq_map_bio_alloc(struct request *rq, static int bio_map_user_iov(struct request *rq, struct iov_iter *iter, gfp_t gfp_mask) { + iov_iter_extraction_t extraction_flags = 0; unsigned int max_sectors = queue_max_hw_sectors(rq->q); unsigned int nr_vecs = iov_iter_npages(iter, BIO_MAX_VECS); - unsigned int gup_flags = 0; struct bio *bio; int ret; int j; @@ -280,7 +280,7 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter, return -ENOMEM; if (blk_queue_pci_p2pdma(rq->q)) - gup_flags |= FOLL_PCI_P2PDMA; + extraction_flags |= ITER_ALLOW_P2PDMA; while (iov_iter_count(iter)) { struct page **pages, *stack_pages[UIO_FASTIOV]; @@ -291,10 +291,10 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter, if (nr_vecs <= ARRAY_SIZE(stack_pages)) { pages = stack_pages; bytes = iov_iter_get_pages(iter, pages, LONG_MAX, - nr_vecs, &offs, gup_flags); + nr_vecs, &offs, extraction_flags); } else { bytes = iov_iter_get_pages_alloc(iter, &pages, - LONG_MAX, &offs, gup_flags); + LONG_MAX, &offs, extraction_flags); } if (unlikely(bytes <= 0)) { ret = bytes ? bytes : -EFAULT; diff --git a/include/linux/uio.h b/include/linux/uio.h index dcc0ca5ef491..af70e4c9ea27 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -12,6 +12,8 @@ struct page; +typedef unsigned int __bitwise iov_iter_extraction_t; + struct kvec { void *iov_base; /* and that should *never* hold a userland pointer */ size_t iov_len; @@ -238,12 +240,12 @@ void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray * loff_t start, size_t count); ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages, size_t maxsize, unsigned maxpages, size_t *start, - unsigned gup_flags); + iov_iter_extraction_t extraction_flags); ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages, size_t maxsize, unsigned maxpages, size_t *start); ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages, size_t maxsize, size_t *start, - unsigned gup_flags); + iov_iter_extraction_t extraction_flags); ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, struct page ***pages, size_t maxsize, size_t *start); int iov_iter_npages(const struct iov_iter *i, int maxpages); @@ -346,4 +348,8 @@ static inline void iov_iter_ubuf(struct iov_iter *i, unsigned int direction, }; } +/* Flags for iov_iter_get/extract_pages*() */ +/* Allow P2PDMA on the extracted pages */ +#define ITER_ALLOW_P2PDMA ((__force iov_iter_extraction_t)0x01) + #endif diff --git a/lib/iov_iter.c b/lib/iov_iter.c index adc5e8aa8ae8..34ee3764d0fa 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1020,9 +1020,9 @@ static struct page *first_bvec_segment(const struct iov_iter *i, static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages, size_t maxsize, unsigned int maxpages, size_t *start, - unsigned int gup_flags) + iov_iter_extraction_t extraction_flags) { - unsigned int n; + unsigned int n, gup_flags = 0; if (maxsize > i->count) maxsize = i->count; @@ -1030,6 +1030,8 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i, return 0; if (maxsize > MAX_RW_COUNT) maxsize = MAX_RW_COUNT; + if (extraction_flags & ITER_ALLOW_P2PDMA) + gup_flags |= FOLL_PCI_P2PDMA; if (likely(user_backed_iter(i))) { unsigned long addr; @@ -1081,14 +1083,14 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_iter *i, ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages, size_t maxsize, unsigned maxpages, - size_t *start, unsigned gup_flags) + size_t *start, iov_iter_extraction_t extraction_flags) { if (!maxpages) return 0; BUG_ON(!pages); return __iov_iter_get_pages_alloc(i, &pages, maxsize, maxpages, - start, gup_flags); + start, extraction_flags); } EXPORT_SYMBOL_GPL(iov_iter_get_pages); @@ -1101,14 +1103,14 @@ EXPORT_SYMBOL(iov_iter_get_pages2); ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages, size_t maxsize, - size_t *start, unsigned gup_flags) + size_t *start, iov_iter_extraction_t extraction_flags) { ssize_t len; *pages = NULL; len = __iov_iter_get_pages_alloc(i, pages, maxsize, ~0U, start, - gup_flags); + extraction_flags); if (len <= 0) { kvfree(*pages); *pages = NULL;