Commit e9eaca6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.17-20250905' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith
     - Fix protection information ref tag for device side gen/strip
       (Christoph)

 - MD pull request via Yu
     - fix data loss for writemostly in raid1 (Yu Kuai)
     - fix potentional data loss by skipping recovery (Li Nan)

* tag 'block-6.17-20250905' of git://git.kernel.dk/linux:
  md: prevent incorrect update of resync/recovery offset
  md/raid1: fix data lost for writemostly rdev
  nvme: fix PI insert on write
parents c8ed9b5c 743bf030

drivers/md/md.c

+5 −0
Original line number Diff line number Diff line
@@ -9125,6 +9125,11 @@ void md_do_sync(struct md_thread *thread) 
	}



	action = md_sync_action(mddev);

	if (action == ACTION_FROZEN || action == ACTION_IDLE) {

		set_bit(MD_RECOVERY_INTR, &mddev->recovery);

		goto skip;

	}



	desc = md_sync_action_name(action);

	mddev->last_sync_action = action;

drivers/md/raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio, 
	int i = 0;

	struct bio *behind_bio = NULL;



	behind_bio = bio_alloc_bioset(NULL, vcnt, 0, GFP_NOIO,

	behind_bio = bio_alloc_bioset(NULL, vcnt, bio->bi_opf, GFP_NOIO,

				      &r1_bio->mddev->bio_set);



	/* discard op, we don't support writezero/writesame yet */

drivers/nvme/host/core.c

+11 −7
Original line number Diff line number Diff line
@@ -903,6 +903,15 @@ static void nvme_set_ref_tag(struct nvme_ns *ns, struct nvme_command *cmnd, 
	u32 upper, lower;

	u64 ref48;



	/* only type1 and type 2 PI formats have a reftag */

	switch (ns->head->pi_type) {

	case NVME_NS_DPS_PI_TYPE1:

	case NVME_NS_DPS_PI_TYPE2:

		break;

	default:

		return;

	}



	/* both rw and write zeroes share the same reftag format */

	switch (ns->head->guard_type) {

	case NVME_NVM_NS_16B_GUARD:
@@ -942,13 +951,7 @@ static inline blk_status_t nvme_setup_write_zeroes(struct nvme_ns *ns, 


	if (nvme_ns_has_pi(ns->head)) {

		cmnd->write_zeroes.control |= cpu_to_le16(NVME_RW_PRINFO_PRACT);



		switch (ns->head->pi_type) {

		case NVME_NS_DPS_PI_TYPE1:

		case NVME_NS_DPS_PI_TYPE2:

		nvme_set_ref_tag(ns, cmnd, req);

			break;

		}

	}



	return BLK_STS_OK;
@@ -1039,6 +1042,7 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns, 
			if (WARN_ON_ONCE(!nvme_ns_has_pi(ns->head)))

				return BLK_STS_NOTSUPP;

			control |= NVME_RW_PRINFO_PRACT;

			nvme_set_ref_tag(ns, cmnd, req);

		}



		if (bio_integrity_flagged(req->bio, BIP_CHECK_GUARD))