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

Merge tag 'block-6.1-2022-11-18' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Christoph:
      - Two more bogus nid quirks (Bean Huo, Tiago Dias Ferreira)
      - Memory leak fix in nvmet (Sagi Grimberg)

 - Regression fix for block cgroups pinning the wrong blkcg, causing
   leaks of cgroups and blkcgs (Chris)

 - UAF fix for drbd setup error handling (Dan)

 - Fix DMA alignment propagation in DM (Keith)

* tag 'block-6.1-2022-11-18' of git://git.kernel.dk/linux:
  dm-log-writes: set dma_alignment limit in io_hints
  dm-integrity: set dma_alignment limit in io_hints
  block: make blk_set_default_limits() private
  dm-crypt: provide dma_alignment limit in io_hints
  block: make dma_alignment a stacking queue_limit
  nvmet: fix a memory leak in nvmet_auth_set_key
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV7000
  drbd: use after free in drbd_create_device()
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Micron Nitro
  blk-cgroup: properly pin the parent in blkcg_css_online
parents b5bf1d8a 5c59789c

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ static int blkcg_css_online(struct cgroup_subsys_state *css) 
	 * parent so that offline always happens towards the root.

	 */

	if (parent)

		blkcg_pin_online(css);

		blkcg_pin_online(&parent->css);

	return 0;

}

block/blk-core.c

+0 −1
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ struct request_queue *blk_alloc_queue(int node_id, bool alloc_srcu) 
				PERCPU_REF_INIT_ATOMIC, GFP_KERNEL))

		goto fail_stats;



	blk_queue_dma_alignment(q, 511);

	blk_set_default_limits(&q->limits);

	q->nr_requests = BLKDEV_DEFAULT_RQ;

block/blk-settings.c

+5 −4
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ void blk_set_default_limits(struct queue_limits *lim) 
	lim->misaligned = 0;

	lim->zoned = BLK_ZONED_NONE;

	lim->zone_write_granularity = 0;

	lim->dma_alignment = 511;

}

EXPORT_SYMBOL(blk_set_default_limits);



/**

 * blk_set_stacking_limits - set default limits for stacking devices
@@ -600,6 +600,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 


	t->io_min = max(t->io_min, b->io_min);

	t->io_opt = lcm_not_zero(t->io_opt, b->io_opt);

	t->dma_alignment = max(t->dma_alignment, b->dma_alignment);



	/* Set non-power-of-2 compatible chunk_sectors boundary */

	if (b->chunk_sectors)
@@ -773,7 +774,7 @@ EXPORT_SYMBOL(blk_queue_virt_boundary); 
 **/

void blk_queue_dma_alignment(struct request_queue *q, int mask)

{

	q->dma_alignment = mask;

	q->limits.dma_alignment = mask;

}

EXPORT_SYMBOL(blk_queue_dma_alignment);
@@ -795,8 +796,8 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask) 
{

	BUG_ON(mask > PAGE_SIZE);



	if (mask > q->dma_alignment)

		q->dma_alignment = mask;

	if (mask > q->limits.dma_alignment)

		q->limits.dma_alignment = mask;

}

EXPORT_SYMBOL(blk_queue_update_dma_alignment);

block/blk.h

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ void blk_rq_set_mixed_merge(struct request *rq); 
bool blk_rq_merge_ok(struct request *rq, struct bio *bio);

enum elv_merge blk_try_merge(struct request *rq, struct bio *bio);



void blk_set_default_limits(struct queue_limits *lim);

int blk_dev_init(void);



/*

drivers/block/drbd/drbd_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2672,7 +2672,7 @@ static int init_submitter(struct drbd_device *device) 
enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsigned int minor)

{

	struct drbd_resource *resource = adm_ctx->resource;

	struct drbd_connection *connection;

	struct drbd_connection *connection, *n;

	struct drbd_device *device;

	struct drbd_peer_device *peer_device, *tmp_peer_device;

	struct gendisk *disk;
@@ -2789,7 +2789,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig 
	return NO_ERROR;



out_idr_remove_from_resource:

	for_each_connection(connection, resource) {

	for_each_connection_safe(connection, n, resource) {

		peer_device = idr_remove(&connection->peer_devices, vnr);

		if (peer_device)

			kref_put(&connection->kref, drbd_destroy_connection);