From patchwork Fri Apr 18 06:47:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 14056894 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70022292922; Fri, 18 Apr 2025 06:49:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744958950; cv=none; b=BoIKRSj+lAYfrqtFxgz/JVIabZK5dib0oYHE5R13ySeZiKdqW70L9PnHnZRsReUGdAM5MwQ7rdCrCuic41AaSdbz8jNZvBi6AStO+wscou1pm7X+ZXz0TobxfovVHShuBtX0qGWC6Yvt1JEF8aZk5bUYyhfZjwUv2ZA3Q5lSn8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744958950; c=relaxed/simple; bh=N1HUOLU+ttnzf/3ybaKHIW9+rXGpeuXFWkN+tCZjvtw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WeCqPn6oYO2hTgMpwCUdBemSGNCI0RhTVxIQxVI/bLZ2TeAQICYE800SQHtORVB9JoK3/Lp/4hl7p+S/DzytzQD3iFnacuV4+lhxNzyGS4G8IyHS/ZA0WrUZzf6T2pVpHU4qvXruhAqnz8YQYR7Ixo9dQ+RbVRxG6tcods3PJkU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I08Kler6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I08Kler6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A08B7C4CEE7; Fri, 18 Apr 2025 06:49:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744958950; bh=N1HUOLU+ttnzf/3ybaKHIW9+rXGpeuXFWkN+tCZjvtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I08Kler6wqRQQ7rbxaeetMugZS71jb8mapQi4fv2gWhXk/IeOFGZmKMgxApIo+xGm nSLozzo5Zai3u2EhSsELCh0+qGAZrW76S8NMrMelt01UOopvpDNwnYLFMsnmfxoK8H 86RZZH1DShfd4p+U0S4kTAjAOYFjydCu5JXAvay+Rto6dWZTszj5HvAaUE1JGV0yx9 /4RWXKGAYOamM0IlRj+p1hwvUN+g9SSKUexLrvcSk3pNhm6IpiE9F6gwUBGCKJ8U7h fv4CyLkbiEz6/2E2EKiwFgg1uIpWFSbc7VNH5uZ9OgB1+Xxky2jubkzAPfD7vtyPus /X7pF9RzfrbUA== 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?b?SsOpcsO0bWUgR2xp?= =?utf-8?b?c3Nl?= , 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 v8 19/24] block: don't merge different kinds of P2P transfers in a single bio Date: Fri, 18 Apr 2025 09:47:49 +0300 Message-ID: <6b7a99e4bd1b541a342bfb0c7c0fbbfd815d77dc.1744825142.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Signed-off-by: Chaitanya Kulkarni Reviewed-by: Logan Gunthorpe 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)