Commit 15b73424 authored by Ming Lei's avatar Ming Lei Committed by Zheng Qixing
Browse files

scsi: sbitmap: Maintain allocation round_robin in sbitmap 

mainline inclusion
from mainline-v5.13-rc1
commit efe1f3a1
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB4C27

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=efe1f3a1d5833c0ddd61ee50dbef8908f65a0a5e

-------------------------------------------

Currently the allocation round_robin info is maintained by sbitmap_queue.

However, bit allocation really belongs to sbitmap. Move it there.

Link: https://lore.kernel.org/r/20210122023317.687987-3-ming.lei@redhat.com


Cc: Omar Sandoval <osandov@fb.com>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Sumanesh Samanta <sumanesh.samanta@broadcom.com>
Cc: Ewan D. Milne <emilne@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: virtualization@lists.linux-foundation.org
Tested-by: default avatarSumanesh Samanta <sumanesh.samanta@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent fc7bce32

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -2967,7 +2967,7 @@ blk_mq_alloc_hctx(struct request_queue *q, struct blk_mq_tag_set *set, 
		goto free_cpumask;



	if (sbitmap_init_node(&hctx->ctx_map, nr_cpu_ids, ilog2(8),

				gfp, node))

				gfp, node, false))

		goto free_ctxs;

	hctx->nr_ctx = 0;

block/kyber-iosched.c

+2 −1
Original line number Diff line number Diff line
@@ -476,7 +476,8 @@ static int kyber_init_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx) 


	for (i = 0; i < KYBER_NUM_DOMAINS; i++) {

		if (sbitmap_init_node(&khd->kcq_map[i], hctx->nr_ctx,

				      ilog2(8), GFP_KERNEL, hctx->numa_node)) {

				      ilog2(8), GFP_KERNEL, hctx->numa_node,

				      false)) {

			while (--i >= 0)

				sbitmap_free(&khd->kcq_map[i]);

			goto err_kcqs;

drivers/vhost/scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ vhost_scsi_get_cmd(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg, 
		return ERR_PTR(-EIO);

	}



	tag = sbitmap_get(&svq->scsi_tags, 0, false);

	tag = sbitmap_get(&svq->scsi_tags, 0);

	if (tag < 0) {

		pr_err("Unable to obtain tag for vhost_scsi_cmd\n");

		return ERR_PTR(-ENOMEM);
@@ -1512,7 +1512,7 @@ static int vhost_scsi_setup_vq_cmds(struct vhost_virtqueue *vq, int max_cmds) 
		return 0;



	if (sbitmap_init_node(&svq->scsi_tags, max_cmds, -1, GFP_KERNEL,

			      NUMA_NO_NODE))

			      NUMA_NO_NODE, false))

		return -ENOMEM;

	svq->max_cmds = max_cmds;

include/linux/sbitmap.h

+10 −10
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ struct sbitmap { 
	 */

	unsigned int map_nr;



	/**

	 * @round_robin: Allocate bits in strict round-robin order.

	 */

	bool round_robin;



	/**

	 * @map: Allocated bitmap.

	 */
@@ -132,11 +137,6 @@ struct sbitmap_queue { 
	 */

	atomic_t ws_active;



	/**

	 * @round_robin: Allocate bits in strict round-robin order.

	 */

	bool round_robin;



	/**

	 * @min_shallow_depth: The minimum shallow depth which may be passed to

	 * sbitmap_queue_get_shallow() or __sbitmap_queue_get_shallow().
@@ -152,11 +152,14 @@ struct sbitmap_queue { 
 *         given, a good default is chosen.

 * @flags: Allocation flags.

 * @node: Memory node to allocate on.

 * @round_robin: If true, be stricter about allocation order; always allocate

 *               starting from the last allocated bit. This is less efficient

 *               than the default behavior (false).

 *

 * Return: Zero on success or negative errno on failure.

 */

int sbitmap_init_node(struct sbitmap *sb, unsigned int depth, int shift,

		      gfp_t flags, int node);

		      gfp_t flags, int node, bool round_robin);



/**

 * sbitmap_free() - Free memory used by a &struct sbitmap.
@@ -182,15 +185,12 @@ void sbitmap_resize(struct sbitmap *sb, unsigned int depth); 
 * sbitmap_get() - Try to allocate a free bit from a &struct sbitmap.

 * @sb: Bitmap to allocate from.

 * @alloc_hint: Hint for where to start searching for a free bit.

 * @round_robin: If true, be stricter about allocation order; always allocate

 *               starting from the last allocated bit. This is less efficient

 *               than the default behavior (false).

 *

 * This operation provides acquire barrier semantics if it succeeds.

 *

 * Return: Non-negative allocated bit number if successful, -1 otherwise.

 */

int sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint, bool round_robin);

int sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint);



/**

 * sbitmap_get_shallow() - Try to allocate a free bit from a &struct sbitmap,

lib/sbitmap.c

+14 −14
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static inline bool sbitmap_deferred_clear(struct sbitmap_word *map) 
}



int sbitmap_init_node(struct sbitmap *sb, unsigned int depth, int shift,

		      gfp_t flags, int node)

		      gfp_t flags, int node, bool round_robin)

{

	unsigned int bits_per_word;

	unsigned int i;
@@ -67,6 +67,7 @@ int sbitmap_init_node(struct sbitmap *sb, unsigned int depth, int shift, 
	sb->shift = shift;

	sb->depth = depth;

	sb->map_nr = DIV_ROUND_UP(sb->depth, bits_per_word);

	sb->round_robin = round_robin;



	if (depth == 0) {

		sb->map = NULL;
@@ -137,14 +138,14 @@ static int __sbitmap_get_word(unsigned long *word, unsigned long depth, 
}



static int sbitmap_find_bit_in_index(struct sbitmap *sb, int index,

				     unsigned int alloc_hint, bool round_robin)

				     unsigned int alloc_hint)

{

	struct sbitmap_word *map = &sb->map[index];

	int nr;



	do {

		nr = __sbitmap_get_word(&map->word, map->depth, alloc_hint,

					!round_robin);

					!sb->round_robin);

		if (nr != -1)

			break;

		if (!sbitmap_deferred_clear(map))
@@ -154,7 +155,7 @@ static int sbitmap_find_bit_in_index(struct sbitmap *sb, int index, 
	return nr;

}



int sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint, bool round_robin)

int sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint)

{

	unsigned int i, index;

	int nr = -1;
@@ -166,14 +167,13 @@ int sbitmap_get(struct sbitmap *sb, unsigned int alloc_hint, bool round_robin) 
	 * alloc_hint to find the right word index. No point in looping

	 * twice in find_next_zero_bit() for that case.

	 */

	if (round_robin)

	if (sb->round_robin)

		alloc_hint = SB_NR_TO_BIT(sb, alloc_hint);

	else

		alloc_hint = 0;



	for (i = 0; i < sb->map_nr; i++) {

		nr = sbitmap_find_bit_in_index(sb, index, alloc_hint,

						round_robin);

		nr = sbitmap_find_bit_in_index(sb, index, alloc_hint);

		if (nr != -1) {

			nr += index << sb->shift;

			break;
@@ -358,7 +358,8 @@ int sbitmap_queue_init_node(struct sbitmap_queue *sbq, unsigned int depth, 
	int ret;

	int i;



	ret = sbitmap_init_node(&sbq->sb, depth, shift, flags, node);

	ret = sbitmap_init_node(&sbq->sb, depth, shift, flags, node,

				round_robin);

	if (ret)

		return ret;
@@ -390,7 +391,6 @@ int sbitmap_queue_init_node(struct sbitmap_queue *sbq, unsigned int depth, 
		atomic_set(&sbq->ws[i].wait_cnt, sbq->wake_batch);

	}



	sbq->round_robin = round_robin;

	return 0;

}

EXPORT_SYMBOL_GPL(sbitmap_queue_init_node);
@@ -452,12 +452,12 @@ int __sbitmap_queue_get(struct sbitmap_queue *sbq) 
		hint = depth ? prandom_u32() % depth : 0;

		this_cpu_write(*sbq->alloc_hint, hint);

	}

	nr = sbitmap_get(&sbq->sb, hint, sbq->round_robin);

	nr = sbitmap_get(&sbq->sb, hint);



	if (nr == -1) {

		/* If the map is full, a hint won't do us much good. */

		this_cpu_write(*sbq->alloc_hint, 0);

	} else if (nr == hint || unlikely(sbq->round_robin)) {

	} else if (nr == hint || unlikely(sbq->sb.round_robin)) {

		/* Only update the hint if we used it. */

		hint = nr + 1;

		if (hint >= depth - 1)
@@ -488,7 +488,7 @@ int __sbitmap_queue_get_shallow(struct sbitmap_queue *sbq, 
	if (nr == -1) {

		/* If the map is full, a hint won't do us much good. */

		this_cpu_write(*sbq->alloc_hint, 0);

	} else if (nr == hint || unlikely(sbq->round_robin)) {

	} else if (nr == hint || unlikely(sbq->sb.round_robin)) {

		/* Only update the hint if we used it. */

		hint = nr + 1;

		if (hint >= depth - 1)
@@ -627,7 +627,7 @@ void sbitmap_queue_clear(struct sbitmap_queue *sbq, unsigned int nr, 
	smp_mb__after_atomic();

	sbitmap_queue_wake_up(sbq);



	if (likely(!sbq->round_robin && nr < sbq->sb.depth))

	if (likely(!sbq->sb.round_robin && nr < sbq->sb.depth))

		*per_cpu_ptr(sbq->alloc_hint, cpu) = nr;

}

EXPORT_SYMBOL_GPL(sbitmap_queue_clear);
@@ -684,7 +684,7 @@ void sbitmap_queue_show(struct sbitmap_queue *sbq, struct seq_file *m) 
	}

	seq_puts(m, "}\n");



	seq_printf(m, "round_robin=%d\n", sbq->round_robin);

	seq_printf(m, "round_robin=%d\n", sbq->sb.round_robin);

	seq_printf(m, "min_shallow_depth=%u\n", sbq->min_shallow_depth);

}

EXPORT_SYMBOL_GPL(sbitmap_queue_show);