Commit b46bebaf authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-5.18/drivers' into for-5.18/write-streams 

* for-5.18/drivers: (51 commits)
  bcache: fixup multiple threads crash
  bcache: fixup bcache_dev_sectors_dirty_add() multithreaded CPU false sharing
  floppy: use memcpy_{to,from}_bvec
  drbd: use bvec_kmap_local in recv_dless_read
  drbd: use bvec_kmap_local in drbd_csum_bio
  bcache: use bvec_kmap_local in bio_csum
  nvdimm-btt: use bvec_kmap_local in btt_rw_integrity
  nvdimm-blk: use bvec_kmap_local in nd_blk_rw_integrity
  zram: use memcpy_from_bvec in zram_bvec_write
  zram: use memcpy_to_bvec in zram_bvec_read
  aoe: use bvec_kmap_local in bvcpy
  iss-simdisk: use bvec_kmap_local in simdisk_submit_bio
  nvme: check that EUI/GUID/UUID are globally unique
  nvme: check for duplicate identifiers earlier
  nvme: fix the check for duplicate unique identifiers
  nvme: cleanup __nvme_check_ids
  nvme: remove nssa from struct nvme_ctrl
  nvme: explicitly set non-error for directives
  nvme: expose cntrltype and dctype through sysfs
  nvme: send uevent on connection up
  ...
parents 13400b14 a7637069

arch/xtensa/platforms/iss/simdisk.c

+2 −2
Original line number Diff line number Diff line
@@ -108,13 +108,13 @@ static void simdisk_submit_bio(struct bio *bio) 
	sector_t sector = bio->bi_iter.bi_sector;



	bio_for_each_segment(bvec, bio, iter) {

		char *buffer = kmap_atomic(bvec.bv_page) + bvec.bv_offset;

		char *buffer = bvec_kmap_local(&bvec);

		unsigned len = bvec.bv_len >> SECTOR_SHIFT;



		simdisk_transfer(dev, sector, len, buffer,

				bio_data_dir(bio) == WRITE);

		sector += len;

		kunmap_atomic(buffer);

		kunmap_local(buffer);

	}



	bio_endio(bio);

drivers/block/aoe/aoecmd.c

+2 −2
Original line number Diff line number Diff line
@@ -1018,9 +1018,9 @@ bvcpy(struct sk_buff *skb, struct bio *bio, struct bvec_iter iter, long cnt) 
	iter.bi_size = cnt;



	__bio_for_each_segment(bv, bio, iter, iter) {

		char *p = kmap_atomic(bv.bv_page) + bv.bv_offset;

		char *p = bvec_kmap_local(&bv);

		skb_copy_bits(skb, soff, p, bv.bv_len);

		kunmap_atomic(p);

		kunmap_local(p);

		soff += bv.bv_len;

	}

}

drivers/block/drbd/drbd_receiver.c

+2 −2
Original line number Diff line number Diff line
@@ -2017,10 +2017,10 @@ static int recv_dless_read(struct drbd_peer_device *peer_device, struct drbd_req 
	D_ASSERT(peer_device->device, sector == bio->bi_iter.bi_sector);



	bio_for_each_segment(bvec, bio, iter) {

		void *mapped = kmap(bvec.bv_page) + bvec.bv_offset;

		void *mapped = bvec_kmap_local(&bvec);

		expect = min_t(int, data_size, bvec.bv_len);

		err = drbd_recv_all_warn(peer_device->connection, mapped, expect);

		kunmap(bvec.bv_page);

		kunmap_local(mapped);

		if (err)

			return err;

		data_size -= expect;

drivers/block/drbd/drbd_worker.c

+3 −3
Original line number Diff line number Diff line
@@ -326,9 +326,9 @@ void drbd_csum_bio(struct crypto_shash *tfm, struct bio *bio, void *digest) 
	bio_for_each_segment(bvec, bio, iter) {

		u8 *src;



		src = kmap_atomic(bvec.bv_page);

		crypto_shash_update(desc, src + bvec.bv_offset, bvec.bv_len);

		kunmap_atomic(src);

		src = bvec_kmap_local(&bvec);

		crypto_shash_update(desc, src, bvec.bv_len);

		kunmap_local(src);



		/* REQ_OP_WRITE_SAME has only one segment,

		 * checksum the payload only once. */

drivers/block/floppy.c

+2 −4
Original line number Diff line number Diff line
@@ -2485,11 +2485,9 @@ static void copy_buffer(int ssize, int max_sector, int max_sector_2) 
		}



		if (CT(raw_cmd->cmd[COMMAND]) == FD_READ)

			memcpy_to_page(bv.bv_page, bv.bv_offset, dma_buffer,

				       size);

			memcpy_to_bvec(&bv, dma_buffer);

		else

			memcpy_from_page(dma_buffer, bv.bv_page, bv.bv_offset,

					 size);

			memcpy_from_bvec(dma_buffer, &bv);



		remaining -= size;

		dma_buffer += size;