Commit 7d080fa8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.11/block-20240722' of git://git.kernel.dk/linux 

Pull more block updates from Jens Axboe:

 - MD fixes via Song:
     - md-cluster fixes (Heming Zhao)
     - raid1 fix (Mateusz Jończyk)

 - s390/dasd module description (Jeff)

 - Series cleaning up and hardening the blk-mq debugfs flag handling
   (John, Christoph)

 - blk-cgroup cleanup (Xiu)

 - Error polled IO attempts if backend doesn't support it (hexue)

 - Fix for an sbitmap hang (Yang)

* tag 'for-6.11/block-20240722' of git://git.kernel.dk/linux: (23 commits)
  blk-cgroup: move congestion_count to struct blkcg
  sbitmap: fix io hung due to race on sbitmap_word::cleared
  block: avoid polling configuration errors
  block: Catch possible entries missing from rqf_name[]
  block: Simplify definition of RQF_NAME()
  block: Use enum to define RQF_x bit indexes
  block: Catch possible entries missing from cmd_flag_name[]
  block: Catch possible entries missing from alloc_policy_name[]
  block: Catch possible entries missing from hctx_flag_name[]
  block: Catch possible entries missing from hctx_state_name[]
  block: Catch possible entries missing from blk_queue_flag_name[]
  block: Make QUEUE_FLAG_x as an enum
  block: Relocate BLK_MQ_MAX_DEPTH
  block: Relocate BLK_MQ_CPU_WORK_BATCH
  block: remove QUEUE_FLAG_STOPPED
  block: Add missing entry to hctx_flag_name[]
  block: Add zone write plugging entry to rqf_name[]
  block: Add missing entries from cmd_flag_name[]
  s390/dasd: fix error checks in dasd_copy_pair_store()
  s390/dasd: add missing MODULE_DESCRIPTION() macros
  ...
parents 02569948 89ed6c9a

block/blk-cgroup.c

+4 −3
Original line number Diff line number Diff line
@@ -2182,12 +2182,13 @@ void blk_cgroup_bio_start(struct bio *bio) 


bool blk_cgroup_congested(void)

{

	struct cgroup_subsys_state *css;

	struct blkcg *blkcg;

	bool ret = false;



	rcu_read_lock();

	for (css = blkcg_css(); css; css = css->parent) {

		if (atomic_read(&css->cgroup->congestion_count)) {

	for (blkcg = css_to_blkcg(blkcg_css()); blkcg;

	     blkcg = blkcg_parent(blkcg)) {

		if (atomic_read(&blkcg->congestion_count)) {

			ret = true;

			break;

		}

block/blk-cgroup.h

+6 −4
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ struct blkcg { 
	struct cgroup_subsys_state	css;

	spinlock_t			lock;

	refcount_t			online_pin;

	/* If there is block congestion on this cgroup. */

	atomic_t			congestion_count;



	struct radix_tree_root		blkg_tree;

	struct blkcg_gq	__rcu		*blkg_hint;
@@ -374,7 +376,7 @@ static inline void blkcg_use_delay(struct blkcg_gq *blkg) 
	if (WARN_ON_ONCE(atomic_read(&blkg->use_delay) < 0))

		return;

	if (atomic_add_return(1, &blkg->use_delay) == 1)

		atomic_inc(&blkg->blkcg->css.cgroup->congestion_count);

		atomic_inc(&blkg->blkcg->congestion_count);

}



static inline int blkcg_unuse_delay(struct blkcg_gq *blkg)
@@ -399,7 +401,7 @@ static inline int blkcg_unuse_delay(struct blkcg_gq *blkg) 
	if (old == 0)

		return 0;

	if (old == 1)

		atomic_dec(&blkg->blkcg->css.cgroup->congestion_count);

		atomic_dec(&blkg->blkcg->congestion_count);

	return 1;

}
@@ -418,7 +420,7 @@ static inline void blkcg_set_delay(struct blkcg_gq *blkg, u64 delay) 


	/* We only want 1 person setting the congestion count for this blkg. */

	if (!old && atomic_try_cmpxchg(&blkg->use_delay, &old, -1))

		atomic_inc(&blkg->blkcg->css.cgroup->congestion_count);

		atomic_inc(&blkg->blkcg->congestion_count);



	atomic64_set(&blkg->delay_nsec, delay);

}
@@ -435,7 +437,7 @@ static inline void blkcg_clear_delay(struct blkcg_gq *blkg) 


	/* We only want 1 person clearing the congestion count for this blkg. */

	if (old && atomic_try_cmpxchg(&blkg->use_delay, &old, 0))

		atomic_dec(&blkg->blkcg->css.cgroup->congestion_count);

		atomic_dec(&blkg->blkcg->congestion_count);

}



/**

block/blk-core.c

+4 −1
Original line number Diff line number Diff line
@@ -791,8 +791,11 @@ void submit_bio_noacct(struct bio *bio) 
		}

	}



	if (!(q->limits.features & BLK_FEAT_POLL))

	if (!(q->limits.features & BLK_FEAT_POLL) &&

			(bio->bi_opf & REQ_POLLED)) {

		bio_clear_polled(bio);

		goto not_supported;

	}



	switch (bio_op(bio)) {

	case REQ_OP_READ:

block/blk-mq-debugfs.c

+21 −5
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/kernel.h>

#include <linux/blkdev.h>

#include <linux/build_bug.h>

#include <linux/debugfs.h>



#include "blk.h"
@@ -79,7 +80,6 @@ static int queue_pm_only_show(void *data, struct seq_file *m) 


#define QUEUE_FLAG_NAME(name) [QUEUE_FLAG_##name] = #name

static const char *const blk_queue_flag_name[] = {

	QUEUE_FLAG_NAME(STOPPED),

	QUEUE_FLAG_NAME(DYING),

	QUEUE_FLAG_NAME(NOMERGES),

	QUEUE_FLAG_NAME(SAME_COMP),
@@ -100,6 +100,7 @@ static int queue_state_show(void *data, struct seq_file *m) 
{

	struct request_queue *q = data;



	BUILD_BUG_ON(ARRAY_SIZE(blk_queue_flag_name) != QUEUE_FLAG_MAX);

	blk_flags_show(m, q->queue_flags, blk_queue_flag_name,

		       ARRAY_SIZE(blk_queue_flag_name));

	seq_puts(m, "\n");
@@ -164,6 +165,7 @@ static int hctx_state_show(void *data, struct seq_file *m) 
{

	struct blk_mq_hw_ctx *hctx = data;



	BUILD_BUG_ON(ARRAY_SIZE(hctx_state_name) != BLK_MQ_S_MAX);

	blk_flags_show(m, hctx->state, hctx_state_name,

		       ARRAY_SIZE(hctx_state_name));

	seq_puts(m, "\n");
@@ -181,10 +183,11 @@ static const char *const alloc_policy_name[] = { 
static const char *const hctx_flag_name[] = {

	HCTX_FLAG_NAME(SHOULD_MERGE),

	HCTX_FLAG_NAME(TAG_QUEUE_SHARED),

	HCTX_FLAG_NAME(BLOCKING),

	HCTX_FLAG_NAME(NO_SCHED),

	HCTX_FLAG_NAME(STACKING),

	HCTX_FLAG_NAME(TAG_HCTX_SHARED),

	HCTX_FLAG_NAME(BLOCKING),

	HCTX_FLAG_NAME(NO_SCHED),

	HCTX_FLAG_NAME(NO_SCHED_BY_DEFAULT),

};

#undef HCTX_FLAG_NAME
@@ -193,6 +196,10 @@ static int hctx_flags_show(void *data, struct seq_file *m) 
	struct blk_mq_hw_ctx *hctx = data;

	const int alloc_policy = BLK_MQ_FLAG_TO_ALLOC_POLICY(hctx->flags);



	BUILD_BUG_ON(ARRAY_SIZE(hctx_flag_name) !=

			BLK_MQ_F_ALLOC_POLICY_START_BIT);

	BUILD_BUG_ON(ARRAY_SIZE(alloc_policy_name) != BLK_TAG_ALLOC_MAX);



	seq_puts(m, "alloc_policy=");

	if (alloc_policy < ARRAY_SIZE(alloc_policy_name) &&

	    alloc_policy_name[alloc_policy])
@@ -223,12 +230,17 @@ static const char *const cmd_flag_name[] = { 
	CMD_FLAG_NAME(RAHEAD),

	CMD_FLAG_NAME(BACKGROUND),

	CMD_FLAG_NAME(NOWAIT),

	CMD_FLAG_NAME(NOUNMAP),

	CMD_FLAG_NAME(POLLED),

	CMD_FLAG_NAME(ALLOC_CACHE),

	CMD_FLAG_NAME(SWAP),

	CMD_FLAG_NAME(DRV),

	CMD_FLAG_NAME(FS_PRIVATE),

	CMD_FLAG_NAME(ATOMIC),

	CMD_FLAG_NAME(NOUNMAP),

};

#undef CMD_FLAG_NAME



#define RQF_NAME(name) [ilog2((__force u32)RQF_##name)] = #name

#define RQF_NAME(name) [__RQF_##name] = #name

static const char *const rqf_name[] = {

	RQF_NAME(STARTED),

	RQF_NAME(FLUSH_SEQ),
@@ -243,6 +255,7 @@ static const char *const rqf_name[] = { 
	RQF_NAME(HASHED),

	RQF_NAME(STATS),

	RQF_NAME(SPECIAL_PAYLOAD),

	RQF_NAME(ZONE_WRITE_PLUGGING),

	RQF_NAME(TIMED_OUT),

	RQF_NAME(RESV),

};
@@ -268,6 +281,9 @@ int __blk_mq_debugfs_rq_show(struct seq_file *m, struct request *rq) 
	const enum req_op op = req_op(rq);

	const char *op_str = blk_op_str(op);



	BUILD_BUG_ON(ARRAY_SIZE(cmd_flag_name) != __REQ_NR_BITS);

	BUILD_BUG_ON(ARRAY_SIZE(rqf_name) != __RQF_BITS);



	seq_printf(m, "%p {.op=", rq);

	if (strcmp(op_str, "UNKNOWN") == 0)

		seq_printf(m, "%u", op);

block/blk-mq.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ enum { 
	BLK_MQ_TAG_MAX		= BLK_MQ_NO_TAG - 1,

};



#define BLK_MQ_CPU_WORK_BATCH	(8)



typedef unsigned int __bitwise blk_insert_t;

#define BLK_MQ_INSERT_AT_HEAD		((__force blk_insert_t)0x01)