Commit 70926390 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

blk-mq: remove REQ_P2PDMA flag 



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: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20250813153153.3260897-5-kbusch@meta.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 92fb75fd

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ void __bio_add_page(struct bio *bio, struct page *page, 
	WARN_ON_ONCE(bio_full(bio, len));



	if (is_pci_p2pdma_page(page))

		bio->bi_opf |= REQ_P2PDMA | REQ_NOMERGE;

		bio->bi_opf |= REQ_NOMERGE;



	bvec_set_page(&bio->bi_io_vec[bio->bi_vcnt], page, len, off);

	bio->bi_iter.bi_size += len;

block/blk-mq-dma.c

+14 −16
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ 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;



	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:
@@ -190,13 +189,12 @@ bool blk_rq_dma_map_iter_start(struct request *req, struct device *dma_dev, 
		 * P2P transfers through the host bridge are treated the

		 * same as non-P2P transfers below and during unmap.

		 */

			req->cmd_flags &= ~REQ_P2PDMA;

	case PCI_P2PDMA_MAP_NONE:

		break;

	default:

		iter->status = BLK_STS_INVAL;

		return false;

	}

	}



	if (blk_can_dma_map_iova(req, dma_dev) &&

	    dma_iova_try_alloc(dma_dev, state, vec.paddr, total_len))

include/linux/blk_types.h

+0 −2
Original line number Diff line number Diff line
@@ -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)



#define REQ_NOUNMAP	(__force blk_opf_t)(1ULL << __REQ_NOUNMAP)