Fixed the rate limit delete issue.

Author: sangramsimplyblock

lib/bdev/bdev.c

@@ -9212,10 +9212,13 @@ static void remove_bdev_from_group(char *bdev_names) {
 	struct spdk_bdev_qos_group_id_mapping *qos_group_id_object = NULL;
 	struct qos_bdev_list_node *bdev_node = NULL;
 
+	if (TAILQ_EMPTY(&g_qos_bdev_group_list)) {
+            return ;
+    }
 	TAILQ_FOREACH(qos_group_id_object, &g_qos_bdev_group_list, link) {
 		TAILQ_FOREACH(bdev_node, &qos_group_id_object->bdev_list, link) {
         	if (strcmp(bdev_node->bdev_name, bdev_names) == 0) {
-				SPDK_NOTICELOG("Removing the bdev from list: %s\n", bdev_node->bdev_name);
+				SPDK_NOTICELOG("Removing the bdev from list: %s vs %s\n", bdev_node->bdev_name, bdev_names);
 				TAILQ_REMOVE(&qos_group_id_object->bdev_list, bdev_node, link);
 				if(bdev_node->bdev_name) {
 					free(bdev_node->bdev_name);
@@ -9228,13 +9231,13 @@ static void remove_bdev_from_group(char *bdev_names) {
 				--qos_group_id_object->bdev_list_size;
 
 				if(qos_group_id_object->bdev_list_size == 0) {
-					SPDK_NOTICELOG("Cleaning the group mapping\n");
-					if(qos_group_id_object->rate_limits) {
-						SPDK_NOTICELOG("Cleaning the rate limit\n");
-						free(qos_group_id_object->rate_limits);
-						qos_group_id_object->rate_limits = NULL;
-					}
-					free(qos_group_id_object->rate_limits);
+					SPDK_NOTICELOG("Cleaning the group mapping for group %"PRIu64"\n",qos_group_id_object->bdev_group_id);
+					// if(qos_group_id_object->rate_limits != NULL) {
+					// 	SPDK_NOTICELOG("Cleaning the rate limit\n");
+					// 	//free(qos_group_id_object->rate_limits);
+					// 	//qos_group_id_object->rate_limits = NULL;
+					// }
+					//free(qos_group_id_object->rate_limits);
 					TAILQ_REMOVE(&g_qos_bdev_group_list, qos_group_id_object, link);
 					if(qos_group_id_object) {
 						free(qos_group_id_object);
@@ -9425,7 +9428,6 @@ bdev_set_qos_limit_done(struct set_qos_limit_ctx *ctx, int status)
 				ctx->cb_fn(ctx->cb_arg, 0);
 				free(ctx);
 				ctx = NULL;
-				spdk_spin_unlock(&ctx->bdev->internal.spinlock);
 				return;
 			}
 			rc = spdk_bdev_open_ext(next_qos_bdev_node->bdev_name, false, dummy_bdev_event_cb, NULL, &desc);
@@ -9434,7 +9436,6 @@ bdev_set_qos_limit_done(struct set_qos_limit_ctx *ctx, int status)
 					ctx->cb_fn(ctx->cb_arg, -ENXIO);
 					free(ctx);
 					ctx = NULL;
-					spdk_spin_unlock(&ctx->bdev->internal.spinlock);
 					return;
 				}
 
@@ -9456,7 +9457,6 @@ bdev_set_qos_limit_done(struct set_qos_limit_ctx *ctx, int status)
 		} else {
 			// End of the the nodes
 			if(ctx->is_remove_requets) {
-
 				remove_bdev_from_group(ctx->qos_bdev_node->bdev_name);
 				for(uint64_t i = 0 ; i < ctx->total_bdev_to_process; i++) {
 					if(ctx->remove_bdev_names[i] != NULL) {
@@ -9487,6 +9487,7 @@ bdev_disable_qos_done(void *cb_arg)
 	struct set_qos_limit_ctx *ctx = cb_arg;
 	struct spdk_bdev *bdev = ctx->bdev;
 	struct spdk_bdev_qos *qos;
+	bool	deleted_common_rate_limit = false;
 
 	spdk_spin_lock(&bdev->internal.spinlock);
 	qos = bdev->internal.qos;
@@ -9504,9 +9505,13 @@ bdev_disable_qos_done(void *cb_arg)
 		if (ctx->total_bdev_to_process <= ctx->bdev_node_cout) {
 			free(ctx->qos_group_id_object->rate_limits);
 			ctx->qos_group_id_object->rate_limits = NULL;
+			deleted_common_rate_limit = true;
 		}
 		if (ctx->is_remove_requets == true) {
-			free(qos->rate_limits);	
+			if(deleted_common_rate_limit == false ){
+				free(qos->rate_limits);	
+			}
+			
 		}
 	} else {
 		free(qos->rate_limits);
@@ -9944,8 +9949,8 @@ spdk_bdev_set_qos_rate_limits_ex(struct spdk_bdev *bdev, uint64_t *limits, uint6
 		}
 	} else {
 		if (bdev->internal.qos != NULL) {
-			SPDK_NOTICELOG("DISABLING the limits for bdev %s\n", bdev->name);
-			if(is_remove_bdev_request == true) {
+			SPDK_NOTICELOG("DISABLING the limits for bdev %s vs %d\n", bdev->name, qos_group_id_object->bdev_list_size);
+			if(is_remove_bdev_request == true && qos_group_id_object->bdev_list_size != 1) {
 				// Replace the rate_limits with new memory to make sure the group limits are intact.
 				bdev->internal.qos->rate_limits = calloc(SPDK_BDEV_QOS_NUM_RATE_LIMIT_TYPES, sizeof(struct spdk_bdev_qos_limit));
 				if(remove_bdev_list != NULL) {