Commit 3c80ebb7 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'md-6.11-20240712' of... 

Merge tag 'md-6.11-20240712' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-6.11/block

Pull MD fixes from Song:

"Changes in this set are:

 1. md-cluster fixes by Heming Zhao;
 2. raid1 fix by Mateusz Jończyk."

* tag 'md-6.11-20240712' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid1: set max_sectors during early return from choose_slow_rdev()
  md-cluster: fix no recovery job when adding/re-adding a disk
  md-cluster: fix hanging issue while a new disk adding
parents 3c1743a6 36a5c03f

drivers/md/md-cluster.c

+39 −10
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#define LVB_SIZE	64

#define NEW_DEV_TIMEOUT 5000

#define WAIT_DLM_LOCK_TIMEOUT (30 * HZ)



struct dlm_lock_resource {

	dlm_lockspace_t *ls;
@@ -56,6 +57,7 @@ struct resync_info { 
#define		MD_CLUSTER_ALREADY_IN_CLUSTER		6

#define		MD_CLUSTER_PENDING_RECV_EVENT		7

#define 	MD_CLUSTER_HOLDING_MUTEX_FOR_RECVD		8

#define		MD_CLUSTER_WAITING_FOR_SYNC		9



struct md_cluster_info {

	struct mddev *mddev; /* the md device which md_cluster_info belongs to */
@@ -91,6 +93,7 @@ struct md_cluster_info { 
	sector_t sync_hi;

};



/* For compatibility, add the new msg_type at the end. */

enum msg_type {

	METADATA_UPDATED = 0,

	RESYNCING,
@@ -100,6 +103,7 @@ enum msg_type { 
	BITMAP_NEEDS_SYNC,

	CHANGE_CAPACITY,

	BITMAP_RESIZE,

	RESYNCING_START,

};



struct cluster_msg {
@@ -130,8 +134,13 @@ static int dlm_lock_sync(struct dlm_lock_resource *res, int mode) 
			0, sync_ast, res, res->bast);

	if (ret)

		return ret;

	wait_event(res->sync_locking, res->sync_locking_done);

	ret = wait_event_timeout(res->sync_locking, res->sync_locking_done,

				WAIT_DLM_LOCK_TIMEOUT);

	res->sync_locking_done = false;

	if (!ret) {

		pr_err("locking DLM '%s' timeout!\n", res->name);

		return -EBUSY;

	}

	if (res->lksb.sb_status == 0)

		res->mode = mode;

	return res->lksb.sb_status;
@@ -455,6 +464,7 @@ static void process_suspend_info(struct mddev *mddev, 
		clear_bit(MD_RESYNCING_REMOTE, &mddev->recovery);

		remove_suspend_info(mddev, slot);

		set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

		clear_bit(MD_CLUSTER_WAITING_FOR_SYNC, &cinfo->state);

		md_wakeup_thread(mddev->thread);

		return;

	}
@@ -525,6 +535,7 @@ static int process_add_new_disk(struct mddev *mddev, struct cluster_msg *cmsg) 
		res = -1;

	}

	clear_bit(MD_CLUSTER_WAITING_FOR_NEWDISK, &cinfo->state);

	set_bit(MD_CLUSTER_WAITING_FOR_SYNC, &cinfo->state);

	return res;

}
@@ -593,6 +604,9 @@ static int process_recvd_msg(struct mddev *mddev, struct cluster_msg *msg) 
	case CHANGE_CAPACITY:

		set_capacity_and_notify(mddev->gendisk, mddev->array_sectors);

		break;

	case RESYNCING_START:

		clear_bit(MD_CLUSTER_WAITING_FOR_SYNC, &mddev->cluster_info->state);

		break;

	case RESYNCING:

		set_bit(MD_RESYNCING_REMOTE, &mddev->recovery);

		process_suspend_info(mddev, le32_to_cpu(msg->slot),
@@ -743,7 +757,7 @@ static void unlock_comm(struct md_cluster_info *cinfo) 
 */

static int __sendmsg(struct md_cluster_info *cinfo, struct cluster_msg *cmsg)

{

	int error;

	int error, unlock_error;

	int slot = cinfo->slot_number - 1;



	cmsg->slot = cpu_to_le32(slot);
@@ -751,7 +765,7 @@ static int __sendmsg(struct md_cluster_info *cinfo, struct cluster_msg *cmsg) 
	error = dlm_lock_sync(cinfo->message_lockres, DLM_LOCK_EX);

	if (error) {

		pr_err("md-cluster: failed to get EX on MESSAGE (%d)\n", error);

		goto failed_message;

		return error;

	}



	memcpy(cinfo->message_lockres->lksb.sb_lvbptr, (void *)cmsg,
@@ -781,14 +795,10 @@ static int __sendmsg(struct md_cluster_info *cinfo, struct cluster_msg *cmsg) 
	}



failed_ack:

	error = dlm_unlock_sync(cinfo->message_lockres);

	if (unlikely(error != 0)) {

	while ((unlock_error = dlm_unlock_sync(cinfo->message_lockres)))

		pr_err("md-cluster: failed convert to NL on MESSAGE(%d)\n",

			error);

		/* in case the message can't be released due to some reason */

		goto failed_ack;

	}

failed_message:

			unlock_error);



	return error;

}
@@ -1343,6 +1353,23 @@ static void resync_info_get(struct mddev *mddev, sector_t *lo, sector_t *hi) 
	spin_unlock_irq(&cinfo->suspend_lock);

}



static int resync_status_get(struct mddev *mddev)

{

	struct md_cluster_info *cinfo = mddev->cluster_info;



	return test_bit(MD_CLUSTER_WAITING_FOR_SYNC, &cinfo->state);

}



static int resync_start_notify(struct mddev *mddev)

{

	struct md_cluster_info *cinfo = mddev->cluster_info;

	struct cluster_msg cmsg = {0};



	cmsg.type = cpu_to_le32(RESYNCING_START);



	return sendmsg(cinfo, &cmsg, 0);

}



static int resync_info_update(struct mddev *mddev, sector_t lo, sector_t hi)

{

	struct md_cluster_info *cinfo = mddev->cluster_info;
@@ -1577,6 +1604,8 @@ static const struct md_cluster_operations cluster_ops = { 
	.resync_start = resync_start,

	.resync_finish = resync_finish,

	.resync_info_update = resync_info_update,

	.resync_start_notify = resync_start_notify,

	.resync_status_get = resync_status_get,

	.resync_info_get = resync_info_get,

	.metadata_update_start = metadata_update_start,

	.metadata_update_finish = metadata_update_finish,

drivers/md/md-cluster.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ struct md_cluster_operations { 
	int (*leave)(struct mddev *mddev);

	int (*slot_number)(struct mddev *mddev);

	int (*resync_info_update)(struct mddev *mddev, sector_t lo, sector_t hi);

	int (*resync_start_notify)(struct mddev *mddev);

	int (*resync_status_get)(struct mddev *mddev);

	void (*resync_info_get)(struct mddev *mddev, sector_t *lo, sector_t *hi);

	int (*metadata_update_start)(struct mddev *mddev);

	int (*metadata_update_finish)(struct mddev *mddev);

drivers/md/md.c

+14 −3
Original line number Diff line number Diff line
@@ -8978,7 +8978,8 @@ void md_do_sync(struct md_thread *thread) 
	 * This will mean we have to start checking from the beginning again.

	 *

	 */



	if (mddev_is_clustered(mddev))

		md_cluster_ops->resync_start_notify(mddev);

	do {

		int mddev2_minor = -1;

		mddev->curr_resync = MD_RESYNC_DELAYED;
@@ -9992,7 +9993,17 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev) 
			 */

			if (rdev2->raid_disk == -1 && role != MD_DISK_ROLE_SPARE &&

			    !(le32_to_cpu(sb->feature_map) &

			      MD_FEATURE_RESHAPE_ACTIVE)) {

			      MD_FEATURE_RESHAPE_ACTIVE) &&

			    !md_cluster_ops->resync_status_get(mddev)) {

				/*

				 * -1 to make raid1_add_disk() set conf->fullsync

				 * to 1. This could avoid skipping sync when the

				 * remote node is down during resyncing.

				 */

				if ((le32_to_cpu(sb->feature_map)

				    & MD_FEATURE_RECOVERY_OFFSET))

					rdev2->saved_raid_disk = -1;

				else

					rdev2->saved_raid_disk = role;

				ret = remove_and_add_spares(mddev, rdev2);

				pr_info("Activated spare: %pg\n",

drivers/md/raid1.c

+1 −0
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ static int choose_slow_rdev(struct r1conf *conf, struct r1bio *r1_bio, 
		len = r1_bio->sectors;

		read_len = raid1_check_read_range(rdev, this_sector, &len);

		if (read_len == r1_bio->sectors) {

			*max_sectors = read_len;

			update_read_sectors(conf, disk, this_sector, read_len);

			return disk;

		}