+5 -6

block/blk-mq-dma.c

reviewed

··· 6 6 #include <linux/blk-mq-dma.h> 7 7 #include "blk.h" 8 8 9 9 - struct phys_vec { 10 10 - phys_addr_t paddr; 11 11 - u32 len; 12 12 - }; 13 13 - 14 9 static bool __blk_map_iter_next(struct blk_map_iter *iter) 15 10 { 16 11 if (iter->iter.bi_size) ··· 107 112 struct phys_vec *vec) 108 113 { 109 114 enum dma_data_direction dir = rq_dma_dir(req); 110 110 - unsigned int mapped = 0; 111 115 unsigned int attrs = 0; 116 116 + size_t mapped = 0; 112 117 int error; 113 118 114 119 iter->addr = state->addr; ··· 291 296 blk_rq_map_iter_init(rq, &iter); 292 297 while (blk_map_iter_next(rq, &iter, &vec)) { 293 298 *last_sg = blk_next_sg(last_sg, sglist); 299 299 + 300 300 + WARN_ON_ONCE(overflows_type(vec.len, unsigned int)); 294 301 sg_set_page(*last_sg, phys_to_page(vec.paddr), vec.len, 295 302 offset_in_page(vec.paddr)); 296 303 nsegs++; ··· 413 416 414 417 while (blk_map_iter_next(rq, &iter, &vec)) { 415 418 sg = blk_next_sg(&sg, sglist); 419 419 + 420 420 + WARN_ON_ONCE(overflows_type(vec.len, unsigned int)); 416 421 sg_set_page(sg, phys_to_page(vec.paddr), vec.len, 417 422 offset_in_page(vec.paddr)); 418 423 segments++;

+2 -2

drivers/nvme/host/pci.c

reviewed

··· 290 290 u8 flags; 291 291 u8 nr_descriptors; 292 292 293 293 - unsigned int total_len; 293 293 + size_t total_len; 294 294 struct dma_iova_state dma_state; 295 295 void *descriptors[NVME_MAX_NR_DESCRIPTORS]; 296 296 struct nvme_dma_vec *dma_vecs; 297 297 unsigned int nr_dma_vecs; 298 298 299 299 dma_addr_t meta_dma; 300 300 - unsigned int meta_total_len; 300 300 + size_t meta_total_len; 301 301 struct dma_iova_state meta_dma_state; 302 302 struct nvme_sgl_desc *meta_descriptor; 303 303 };

+5

include/linux/types.h

reviewed

··· 171 171 typedef u32 phys_addr_t; 172 172 #endif 173 173 174 174 + struct phys_vec { 175 175 + phys_addr_t paddr; 176 176 + size_t len; 177 177 + }; 178 178 + 174 179 typedef phys_addr_t resource_size_t; 175 180 176 181 /*