Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) (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 9DA5325C70F for ; Wed, 13 Aug 2025 15:32:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.145.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755099143; cv=none; b=oWOpsX01C6zdnUCpl4CPZJeK4yq50+lQ6UGxolQgtUXjF0w7LnGaGxh8r0twbekBPsNJd950NohL3O5d2XxewWW2dvZU2EXnjKpAdTxqpq+sO3CSD0W+qAOWVD8P4Ur+PBzKloyy1DCay1dA2Eq3Fy6Eeup6xeT1rRqpxju4n4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755099143; c=relaxed/simple; bh=J86tGkm2/vgUWOIAaNMTpu7kCoDemxo45Z7cnLItGKY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZxoadNaaTLYVzQspbhNCkmpaS4T0H/aiwA4emVdXCO8e2TPoI/N9ESgxDCIyd5sRXlGeUtTjtBfLI8TKlqC9sAEla32DY7QclEIVtsxO33HZ2kx9tgD1mc6e17peP2ZIOkg6Aw/7M1abAYQylFiMvig0uGIYVdl8BCPnY9uTbFQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b=EcjqUTS9; arc=none smtp.client-ip=67.231.145.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.b="EcjqUTS9" Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57DFB97D031008 for ; Wed, 13 Aug 2025 08:32:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=s2048-2025-q2; bh=mgnoOARiNTC7jutPr3dcY658KZdCotdvQFnm+wB+bU4=; b=EcjqUTS9r+79 kiSLGlyf5An2KyT9RZWPpHNcZFeTT2kJyJmCXr4zhJ14OHkMTmHl/eyx9h6Ev1Hs eZSaJDVZB3LI4iueNpW6316HisopkEQsLhQG3LUbY22BW5qYdCHGZDXbGaVSALvQ TpW2fzJ1ZI5mQmXgPI6nrKoZ3REzqMomGIG/FJ1RtNUxZ5IWODfwCveRrIdT2g1L YDzpAYdUd7sXhowqIyDQVZJET8FJcifysYC1+W8bkONLPDj+jBhDApumlD1zblzU yRw6V91vz9oWYtWdsdciMKRDtplWLk9FclBd9zXgJMpujPRxCbvkWyDisvWn0P18 gpc2j17ceA== Received: from mail.thefacebook.com ([163.114.134.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 48gpru2kss-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 13 Aug 2025 08:32:20 -0700 (PDT) Received: from twshared42488.16.frc2.facebook.com (2620:10d:c085:208::7cb7) by mail.thefacebook.com (2620:10d:c08b:78::2ac9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Wed, 13 Aug 2025 15:32:09 +0000 Received: by devbig197.nha3.facebook.com (Postfix, from userid 544533) id 7C6D197CD82; Wed, 13 Aug 2025 08:32:00 -0700 (PDT) From: Keith Busch To: , CC: , , , Keith Busch Subject: [PATCHv7 4/9] blk-mq: remove REQ_P2PDMA flag Date: Wed, 13 Aug 2025 08:31:48 -0700 Message-ID: <20250813153153.3260897-5-kbusch@meta.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250813153153.3260897-1-kbusch@meta.com> References: <20250813153153.3260897-1-kbusch@meta.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: TYVjgvd5rDlBteWl_W9AqXwFA8j1W_Ap X-Authority-Analysis: v=2.4 cv=JKM7s9Kb c=1 sm=1 tr=0 ts=689cb004 cx=c_pps a=CB4LiSf2rd0gKozIdrpkBw==:117 a=CB4LiSf2rd0gKozIdrpkBw==:17 a=2OwXVqhp2XgA:10 a=VwQbUJbxAAAA:8 a=O3ANi3fbfI-XDrvcMKkA:9 X-Proofpoint-GUID: TYVjgvd5rDlBteWl_W9AqXwFA8j1W_Ap X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODEzMDE0NiBTYWx0ZWRfX27KTaV9u9n5S K1PaRL5k0+bY0+zzQ/s/xRE2VasVanXqQFCKeKL14z0xaJKcbs6XW3D+lj2HkLNJYHheD4Uxnye UvTG+H1Jx4CuG2wIxRmSFciW7TWJupzaxO8hrGgayTP6708GrQvRvJXrRusZ+yj/T8xkLZzI7Up RCPCqMRzHO57kwiwtpbGN/7eNJDTe29+NAQnKERC4sTvLjKlhtW/JYj2WG1vOnDDwCP2ruyCVBB CIq/jVz81VSYOWFfGAkus4ldZWRQ+etMKv3OujDWyIF1bc9nnmharznwSEEzPYa9Kl9F0S2VzuP y65vYOBDVqByaXOmBaSRCnhKxZdky/ObhfqisTc3ErJdANFysFXVlM7z3OSW1n/ihjbePDOXgyW 2Q3fxMlVY3e2CFCpKd4rXmovZp/sRURiErBjpjd2XQWL6FQgOmLdbp3Telh7H37qirYFaEDr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-13_01,2025-08-11_01,2025-03-28_01 From: Keith Busch It's not serving any particular purpose. pci_p2pdma_state() already has all the appropriate checks, so the config and flag checks are not guarding anything. Signed-off-by: Keith Busch --- block/bio.c | 2 +- block/blk-mq-dma.c | 30 ++++++++++++++---------------- include/linux/blk_types.h | 2 -- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/block/bio.c b/block/bio.c index 3b371a5da159e..44c43b9703875 100644 --- a/block/bio.c +++ b/block/bio.c @@ -981,7 +981,7 @@ void __bio_add_page(struct bio *bio, struct page *pag= e, WARN_ON_ONCE(bio_full(bio, len)); =20 if (is_pci_p2pdma_page(page)) - bio->bi_opf |=3D REQ_P2PDMA | REQ_NOMERGE; + bio->bi_opf |=3D REQ_NOMERGE; =20 bvec_set_page(&bio->bi_io_vec[bio->bi_vcnt], page, len, off); bio->bi_iter.bi_size +=3D len; diff --git a/block/blk-mq-dma.c b/block/blk-mq-dma.c index 8f41fe740b465..58defab218823 100644 --- a/block/blk-mq-dma.c +++ b/block/blk-mq-dma.c @@ -180,22 +180,20 @@ bool blk_rq_dma_map_iter_start(struct request *req,= struct device *dma_dev, if (!blk_map_iter_next(req, &iter->iter, &vec)) return false; =20 - if (IS_ENABLED(CONFIG_PCI_P2PDMA) && (req->cmd_flags & REQ_P2PDMA)) { - switch (pci_p2pdma_state(&iter->p2pdma, dma_dev, - phys_to_page(vec.paddr))) { - case PCI_P2PDMA_MAP_BUS_ADDR: - return blk_dma_map_bus(iter, &vec); - case PCI_P2PDMA_MAP_THRU_HOST_BRIDGE: - /* - * P2P transfers through the host bridge are treated the - * same as non-P2P transfers below and during unmap. - */ - req->cmd_flags &=3D ~REQ_P2PDMA; - break; - default: - iter->status =3D BLK_STS_INVAL; - return false; - } + switch (pci_p2pdma_state(&iter->p2pdma, dma_dev, + phys_to_page(vec.paddr))) { + case PCI_P2PDMA_MAP_BUS_ADDR: + return blk_dma_map_bus(iter, &vec); + case PCI_P2PDMA_MAP_THRU_HOST_BRIDGE: + /* + * P2P transfers through the host bridge are treated the + * same as non-P2P transfers below and during unmap. + */ + case PCI_P2PDMA_MAP_NONE: + break; + default: + iter->status =3D BLK_STS_INVAL; + return false; } =20 if (blk_can_dma_map_iova(req, dma_dev) && diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 09b99d52fd365..930daff207df2 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -386,7 +386,6 @@ 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: */ @@ -419,7 +418,6 @@ 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) =20 #define REQ_NOUNMAP (__force blk_opf_t)(1ULL << __REQ_NOUNMAP) =20 --=20 2.47.3