Commit 8a61cb6e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.14-20250221' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith:
      - FC controller state check fixes (Daniel)
      - PCI Endpoint fixes (Damien)
      - TCP connection failure fixe (Caleb)
      - TCP handling C2HTermReq PDU (Maurizio)
      - RDMA queue state check (Ruozhu)
      - Apple controller fixes (Hector)
      - Target crash on disbaled namespace (Hannes)

 - MD pull request via Yu:
      - Fix queue limits error handling for raid0, raid1 and raid10

 - Fix for a NULL pointer deref in request data mapping

 - Code cleanup for request merging

* tag 'block-6.14-20250221' of git://git.kernel.dk/linux:
  nvme: only allow entering LIVE from CONNECTING state
  nvme-fc: rely on state transitions to handle connectivity loss
  apple-nvme: Support coprocessors left idle
  apple-nvme: Release power domains when probe fails
  nvmet: Use enum definitions instead of hardcoded values
  nvme: Cleanup the definition of the controller config register fields
  nvme/ioctl: add missing space in err message
  nvme-tcp: fix connect failure on receiving partial ICResp PDU
  nvme: tcp: Fix compilation warning with W=1
  nvmet: pci-epf: Avoid RCU stalls under heavy workload
  nvmet: pci-epf: Do not uselessly write the CSTS register
  nvmet: pci-epf: Correctly initialize CSTS when enabling the controller
  nvmet-rdma: recheck queue state is LIVE in state lock in recv done
  nvmet: Fix crash when a namespace is disabled
  nvme-tcp: add basic support for the C2HTermReq PDU
  nvme-pci: quirk Acer FA100 for non-uniqueue identifiers
  block: fix NULL pointer dereferenced within __blk_rq_map_sg
  block/merge: remove unnecessary min() with UINT_MAX
  md/raid*: Fix the set_queue_limits implementations
parents f679ebf6 70550442

block/blk-merge.c

+5 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static bool bvec_split_segs(const struct queue_limits *lim, 
		const struct bio_vec *bv, unsigned *nsegs, unsigned *bytes,

		unsigned max_segs, unsigned max_bytes)

{

	unsigned max_len = min(max_bytes, UINT_MAX) - *bytes;

	unsigned max_len = max_bytes - *bytes;

	unsigned len = min(bv->bv_len, max_len);

	unsigned total_len = 0;

	unsigned seg_size = 0;
@@ -556,11 +556,14 @@ int __blk_rq_map_sg(struct request_queue *q, struct request *rq, 
{

	struct req_iterator iter = {

		.bio	= rq->bio,

		.iter	= rq->bio->bi_iter,

	};

	struct phys_vec vec;

	int nsegs = 0;



	/* the internal flush request may not have bio attached */

	if (iter.bio)

		iter.iter = iter.bio->bi_iter;



	while (blk_map_iter_next(rq, &iter, &vec)) {

		*last_sg = blk_next_sg(last_sg, sglist);

		sg_set_page(*last_sg, phys_to_page(vec.paddr), vec.len,

drivers/md/raid0.c

+1 −3
Original line number Diff line number Diff line
@@ -386,10 +386,8 @@ static int raid0_set_limits(struct mddev *mddev) 
	lim.io_opt = lim.io_min * mddev->raid_disks;

	lim.features |= BLK_FEAT_ATOMIC_WRITES;

	err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);

	if (err) {

		queue_limits_cancel_update(mddev->gendisk->queue);

	if (err)

		return err;

	}

	return queue_limits_set(mddev->gendisk->queue, &lim);

}

drivers/md/raid1.c

+1 −3
Original line number Diff line number Diff line
@@ -3219,10 +3219,8 @@ static int raid1_set_limits(struct mddev *mddev) 
	lim.max_write_zeroes_sectors = 0;

	lim.features |= BLK_FEAT_ATOMIC_WRITES;

	err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);

	if (err) {

		queue_limits_cancel_update(mddev->gendisk->queue);

	if (err)

		return err;

	}

	return queue_limits_set(mddev->gendisk->queue, &lim);

}

drivers/md/raid10.c

+1 −3
Original line number Diff line number Diff line
@@ -4020,10 +4020,8 @@ static int raid10_set_queue_limits(struct mddev *mddev) 
	lim.io_opt = lim.io_min * raid10_nr_stripes(conf);

	lim.features |= BLK_FEAT_ATOMIC_WRITES;

	err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);

	if (err) {

		queue_limits_cancel_update(mddev->gendisk->queue);

	if (err)

		return err;

	}

	return queue_limits_set(mddev->gendisk->queue, &lim);

}

drivers/nvme/host/apple.c

+38 −17
Original line number Diff line number Diff line
@@ -1011,9 +1011,16 @@ static void apple_nvme_reset_work(struct work_struct *work) 
		ret = apple_rtkit_shutdown(anv->rtk);

		if (ret)

			goto out;

	}



		writel(0, anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL);

	}



	/*

	 * Only do the soft-reset if the CPU is not running, which means either we

	 * or the previous stage shut it down cleanly.

	 */

	if (!(readl(anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL) &

		APPLE_ANS_COPROC_CPU_CONTROL_RUN)) {



		ret = reset_control_assert(anv->reset);

		if (ret)
@@ -1029,7 +1036,12 @@ static void apple_nvme_reset_work(struct work_struct *work) 


		writel(APPLE_ANS_COPROC_CPU_CONTROL_RUN,

		       anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL);



		ret = apple_rtkit_boot(anv->rtk);

	} else {

		ret = apple_rtkit_wake(anv->rtk);

	}



	if (ret) {

		dev_err(anv->dev, "ANS did not boot");

		goto out;
@@ -1516,6 +1528,7 @@ static struct apple_nvme *apple_nvme_alloc(struct platform_device *pdev) 


	return anv;

put_dev:

	apple_nvme_detach_genpd(anv);

	put_device(anv->dev);

	return ERR_PTR(ret);

}
@@ -1549,6 +1562,7 @@ static int apple_nvme_probe(struct platform_device *pdev) 
	nvme_uninit_ctrl(&anv->ctrl);

out_put_ctrl:

	nvme_put_ctrl(&anv->ctrl);

	apple_nvme_detach_genpd(anv);

	return ret;

}
@@ -1563,9 +1577,12 @@ static void apple_nvme_remove(struct platform_device *pdev) 
	apple_nvme_disable(anv, true);

	nvme_uninit_ctrl(&anv->ctrl);



	if (apple_rtkit_is_running(anv->rtk))

	if (apple_rtkit_is_running(anv->rtk)) {

		apple_rtkit_shutdown(anv->rtk);



		writel(0, anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL);

	}



	apple_nvme_detach_genpd(anv);

}
@@ -1574,8 +1591,11 @@ static void apple_nvme_shutdown(struct platform_device *pdev) 
	struct apple_nvme *anv = platform_get_drvdata(pdev);



	apple_nvme_disable(anv, true);

	if (apple_rtkit_is_running(anv->rtk))

	if (apple_rtkit_is_running(anv->rtk)) {

		apple_rtkit_shutdown(anv->rtk);



		writel(0, anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL);

	}

}



static int apple_nvme_resume(struct device *dev)
@@ -1592,10 +1612,11 @@ static int apple_nvme_suspend(struct device *dev) 


	apple_nvme_disable(anv, true);



	if (apple_rtkit_is_running(anv->rtk))

	if (apple_rtkit_is_running(anv->rtk)) {

		ret = apple_rtkit_shutdown(anv->rtk);



		writel(0, anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL);

	}



	return ret;

}