From mboxrd@z Thu Jan 1 00:00:00 1970 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 043B3C369D3 for ; Wed, 23 Apr 2025 08:15:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0E8B6B0007; Wed, 23 Apr 2025 04:15:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BE8A6B009C; Wed, 23 Apr 2025 04:15:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8384A6B009D; Wed, 23 Apr 2025 04:15:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 62ECC6B0007 for ; Wed, 23 Apr 2025 04:15:24 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DEDC181792 for ; Wed, 23 Apr 2025 08:15:24 +0000 (UTC) X-FDA: 83364598968.16.31067D2 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf13.hostedemail.com (Postfix) with ESMTP id 2E9E420003 for ; Wed, 23 Apr 2025 08:15:23 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZwAGDANF; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745396123; a=rsa-sha256; cv=none; b=hrZqqWVZnMHixbBQ3P/AHKx1wzW8EDlsuNYY/EkQ9/hvywlWnJ/ODlraRQ3L4rmrgT73He VlvcGHo5VndyVGz+FHhpIq1CuJQqzhPzZxfo60G8EYcGt9sebQ0ZItq5Svra31YXsFSkCE dXYcG058EHDl9lbIaPhxSC+yDJEDK+k= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZwAGDANF; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745396123; 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=P3z0T+ZgkMIUWqLcWm2tKeR9BajP2OyD9df/TDQ/JBM=; b=DqLJDyo7ih+6eU4Fa8/v7Q+4oZLtecf5RKV4ydKc9hwj29uPPZPgPBA5kqIr+roQOSI/LS IL0x2kTX11SZEEPIoamIxBtK/bZJcVVaZSEPuYo826/FbPfXRYsfvtwtSo2xsZfGV0BHob JcaBunfuLQS+Fa64FgIsu+4WifyT5+E= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 9AE65A4C26D; Wed, 23 Apr 2025 08:09:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D29EC4CEE2; Wed, 23 Apr 2025 08:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396122; bh=cn4ZAo5vXix5AGqKt4IWuh2vUXjY6lms9OP/AMjOBBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZwAGDANFggif/hHltTNo8DS7CSr4dJ00Q3R5ZRUxc8p6YRcxW2Lj6kWmBx7/8c9H5 wmgLi7E2a+XY5LiJhP/LXoYgUKAVzP/ZwN9ZbtltMq0H2j+AaS9vTpeLltvOHxxZd9 LAYummtSsqYqrS/KPLAK9W81c7AHdR5yPznv1Dj/FWGoRDi5PXKtpEGeP32BPmjmr+ 0DUEf0vS1i4dlH62ffr2h5zPpj4Wk3O87mudPGw+9SKBWNHKijyJW/JJP49Ottbcx8 negOOECUXtCMloS2LE0IiNlcf09HlES8p5G+10r0swXnI90B/uaeAfr8qqFaRD+LQD Hxx5CHvagu3pQ== From: Leon Romanovsky To: Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni , Leon Romanovsky Subject: [PATCH v9 19/24] block: don't merge different kinds of P2P transfers in a single bio Date: Wed, 23 Apr 2025 11:13:10 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2E9E420003 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: 4f8tyz9agf7i9zk14h37scf1u81fsd1c X-HE-Tag: 1745396123-724782 X-HE-Meta: U2FsdGVkX18NZl5ouN2znTCMVx+ZHoyKWZpNgDBcpEc5GuZ1aDe+fWNAgqzXKlMWm8g+EpCS+1s+NzI5nG1lekTZpEVHSaM3BfMOLhqt+nQ8vGtENtTuPoxmIVcTSFPq0kjCvlx/qa4yRrm6jHzjwzFv+yidfr4CvrMshETpcKlm454NyoOOFss28r6m8bcszObQs5kiYh+MF4UVjvrqsn9PDqet9KxCjfPQ/ydsgI1x1oMr0cJFZzcK3Fx5D8Rqt7c0krrErEXPYdkxMVi9JZ6gP3K8AGVq0W/mmEKdPwUz1SVDaSQEq5AamQoYWYlyjc5NIrXth7rzuYBWL53RYR49S8efAU5n1PYvDfweoKZnk6Gs0jc88mnuCPQ/dfaWvFzMkpgXlpeQPYkTs9uBGI+PLZYW34k7na3x8aIfsuGzKge/AdUBhCC6wGvuGao1d+3Ph4Hiu/p34Nlv5ls8uKj8Cpa6/4pN8/KD+eYrHbtlQJOWU3C36wouCcImVhpXckTThFEpi1QVGBhmmdzEFWF1Goa1cBQWfJlWEnD+2B4v1sMmJpZ70g6UO95CAteuJxa1hK3SXP/JoPAVdXr07YD1FDQI76JMtKbDc/Sq8H81hyyJyMo/0N2ztt9077/tJICSf8JqJqL2vhfxGP78vcUv/xHCEDmrQXmrmlJ2RTxoHCbZzunp2EeFE3unD9fE7jZwQ1QqDopP9xsX+rq5hyWbW2X+KeK4kAeU4jDtVQpiRtoTzRoiRWFPmBs/gzrJ46q8IA5PMv0HmkW2XT+efiLRnQX3nIur+EozrWMfiksXq1gwNK0SBMsaJ9OOotT3uNlb/q59sy8pigWVGEpllfCjB4Ul/1s1EHpc2qHC5QDhPGvpg3HVPZdVl9fFTta0cwXBXPcPrVToz28C6XdvXKiLPRUbuUW17zF9kOg/JOlVFDZCUidd41d7gH3MohFL5Z34NV72HhhGqZIJkIS bca8EIjO +qbRdA9v10qPKCYNmM++sJ/yiytIWjiNzAT9Q8SVufHHe1PASUia4khFjBHGIyrNo5F6UrD/vxulm4yzM2RmKvbkfSLM0qChoEdN28/V1PhNe1SWrQauBm2TSclwIin8UvR+Ki9pR7ascOvcjj6xNH/e7nCNGFbKDg0cfb3J6DbYqVwyq1uQpcYEXalrDQbAvx4i4I5OUERIp6eUgXD9XxjncJytI8r9pkAZtuf4MtWDdT0h0m0QeeFAZErHJoqGFENBKTJecGnwTkKz3jtyA3jBSy2B1KdnPvj2t 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: List-Subscribe: List-Unsubscribe: From: Christoph Hellwig To get out of the dma mapping helpers having to check every segment for it's P2P status, ensure that bios either contain P2P transfers or non-P2P transfers, and that a P2P bio only contains ranges from a single device. This means we do the page zone access in the bio add path where it should be still page hot, and will only have do the fairly expensive P2P topology lookup once per bio down in the dma mapping path, and only for already marked bios. Signed-off-by: Christoph Hellwig Reviewed-by: Logan Gunthorpe Tested-by: Jens Axboe Signed-off-by: Leon Romanovsky --- block/bio.c | 17 ++++++++++------- block/blk-merge.c | 17 +++++++++++------ include/linux/blk_types.h | 2 ++ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/block/bio.c b/block/bio.c index 3047fa3f4b32..279eac2396bf 100644 --- a/block/bio.c +++ b/block/bio.c @@ -928,8 +928,6 @@ static bool bvec_try_merge_page(struct bio_vec *bv, struct page *page, return false; if (xen_domain() && !xen_biovec_phys_mergeable(bv, page)) return false; - if (!zone_device_pages_have_same_pgmap(bv->bv_page, page)) - return false; *same_page = ((vec_end_addr & PAGE_MASK) == ((page_addr + off) & PAGE_MASK)); @@ -998,11 +996,16 @@ static int bio_add_page_int(struct bio *bio, struct page *page, if (bio->bi_iter.bi_size > UINT_MAX - len) return 0; - if (bio->bi_vcnt > 0 && - bvec_try_merge_page(&bio->bi_io_vec[bio->bi_vcnt - 1], - page, len, offset, same_page)) { - bio->bi_iter.bi_size += len; - return len; + if (bio->bi_vcnt > 0) { + struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1]; + + if (bvec_try_merge_page(bv, page, len, offset, same_page)) { + bio->bi_iter.bi_size += len; + return len; + } + } else { + if (is_pci_p2pdma_page(page)) + bio->bi_opf |= REQ_P2PDMA | REQ_NOMERGE; } if (bio->bi_vcnt >= bio->bi_max_vecs) diff --git a/block/blk-merge.c b/block/blk-merge.c index fdd4efb54c6c..d9691e900cc6 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -320,12 +320,17 @@ int bio_split_rw_at(struct bio *bio, const struct queue_limits *lim, unsigned nsegs = 0, bytes = 0; bio_for_each_bvec(bv, bio, iter) { - /* - * If the queue doesn't support SG gaps and adding this - * offset would create a gap, disallow it. - */ - if (bvprvp && bvec_gap_to_prev(lim, bvprvp, bv.bv_offset)) - goto split; + if (bvprvp) { + /* + * If the queue doesn't support SG gaps and adding this + * offset would create a gap, disallow it. + */ + if (bvec_gap_to_prev(lim, bvprvp, bv.bv_offset)) + goto split; + } else { + if (is_pci_p2pdma_page(bv.bv_page)) + bio->bi_opf |= REQ_P2PDMA | REQ_NOMERGE; + } if (nsegs < lim->max_segments && bytes + bv.bv_len <= max_bytes && diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index dce7615c35e7..94cf146e8ce6 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -378,6 +378,7 @@ enum req_flag_bits { __REQ_DRV, /* for driver use */ __REQ_FS_PRIVATE, /* for file system (submitter) use */ __REQ_ATOMIC, /* for atomic write operations */ + __REQ_P2PDMA, /* contains P2P DMA pages */ /* * Command specific flags, keep last: */ @@ -410,6 +411,7 @@ enum req_flag_bits { #define REQ_DRV (__force blk_opf_t)(1ULL << __REQ_DRV) #define REQ_FS_PRIVATE (__force blk_opf_t)(1ULL << __REQ_FS_PRIVATE) #define REQ_ATOMIC (__force blk_opf_t)(1ULL << __REQ_ATOMIC) +#define REQ_P2PDMA (__force blk_opf_t)(1ULL << __REQ_P2PDMA) #define REQ_NOUNMAP (__force blk_opf_t)(1ULL << __REQ_NOUNMAP) -- 2.49.0