Merge branch 'Open-CAS:master' into mtab-check-optional

.gitignore

@@ -8,6 +8,7 @@
 *.ko.*
 *.obj
 *.a
+tags
 Module.symvers
 Module.markers
 *.mod.c

Makefile

@@ -1,5 +1,6 @@
 #
 # Copyright(c) 2012-2022 Intel Corporation
+# Copyright(c) 2024 Huawei Technologies
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -20,6 +21,8 @@ ifneq ($(MAKECMDGOALS),srpm)
 ifneq ($(MAKECMDGOALS),deb)
 ifneq ($(MAKECMDGOALS),dsc)
 	cd $@ && $(MAKE) $(MAKECMDGOALS)
+casadm: modules
+	cd $@ && $(MAKE) $(MAKECMDGOALS)
 endif
 endif
 endif

casadm/Makefile

@@ -152,7 +152,9 @@ $(OBJDIR)%.o: %.c
 ifeq ($(strip $(CAS_VERSION_MAIN)),)
 	$(error "No version file")
 endif
-	@$(CC) -c $(CFLAGS) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	@$(CC) -c $(CFLAGS) -MMD -o "$@" "$<"
+
+-include $(addprefix $(OBJDIR),$(OBJS:.o=.d))
 
 clean:
 	@echo "  CLEAN "

casadm/argp.c

@@ -623,8 +623,8 @@ int args_parse(app *app_values, cli_command *commands, int argc, const char **ar
 	}
 
 	if (is_command_blocked(commands, i)) {
-		cas_printf(LOG_ERR, "The command is not supported\n");
-		return FAILURE;
+		cas_printf(LOG_INFO, "The command is not supported\n");
+		return SUCCESS;
 	}
 
 	configure_cli_commands(commands);

casadm/cas_main.c

@@ -2237,7 +2237,7 @@ static cli_command cas_commands[] = {
 			.options = attach_cache_options,
 			.command_handle_opts = start_cache_command_handle_option,
 			.handle = handle_cache_attach,
-			.flags = CLI_SU_REQUIRED,
+			.flags = (CLI_SU_REQUIRED | CLI_COMMAND_BLOCKED),
 			.help = NULL,
 		},
 		{
@@ -2247,7 +2247,7 @@ static cli_command cas_commands[] = {
 			.options = detach_options,
 			.command_handle_opts = command_handle_option,
 			.handle = handle_cache_detach,
-			.flags = CLI_SU_REQUIRED,
+			.flags = (CLI_SU_REQUIRED | CLI_COMMAND_BLOCKED),
 			.help = NULL,
 		},
 		{

casadm/casadm.8

@@ -88,7 +88,7 @@ Stop cache instance.
 Set runtime parameter for cache/core instance.
 
 .TP
-.B -G, --set-param
+.B -G, --get-param
 Get runtime parameter for cache/core instance.
 
 .TP

configure.d/1_bio_iter.conf

@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright(c) 2012-2022 Intel Corporation
+# Copyright(c) 2024 Huawei Technologies
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -25,15 +26,11 @@ apply() {
     "1")
 		add_define "CAS_BIO_BISIZE(bio) \\
 			bio->bi_iter.bi_size"
-		add_define "CAS_BIO_BIIDX(bio) \\
-			bio->bi_iter.bi_idx"
 		add_define "CAS_BIO_BISECTOR(bio) \\
 			bio->bi_iter.bi_sector" ;;
     "2")
 		add_define "CAS_BIO_BISIZE(bio) \\
 			bio->bi_size"
-		add_define "CAS_BIO_BIIDX(bio) \\
-			bio->bi_idx"
 		add_define "CAS_BIO_BISECTOR(bio) \\
 			bio->bi_sector" ;;
     *)

configure.d/1_queue_limits.conf

@@ -49,6 +49,14 @@ apply() {
 		exp_q->limits.max_write_same_sectors = 0;
 	}"
 
+	 # A workaround for RHEL/CentOS 7.3 bug in kernel.
+	 # Merging implementation on blk-mq does not respect virt boundary
+	 # restriction and front merges bios with non-zero offsets.
+	 # This leads to request with gaps between bios and in consequence
+	 # triggers BUG_ON() in nvme driver or silently corrupts data.
+	 # To prevent this, disable merging on cache queue if there are
+	 # requirements regarding virt boundary (marking bios with REQ_NOMERGE
+	 # does not solve this problem).
 		add_function "
 	static inline void cas_cache_set_no_merges_flag(struct request_queue *cache_q)
 	{

modules/cas_cache/context.c

@@ -82,7 +82,7 @@ static int _cas_page_get_cpu(struct page *page)
 /*
  *
  */
-static ctx_data_t *__cas_ctx_data_alloc(uint32_t pages, bool zalloc)
+static ctx_data_t *__cas_ctx_data_alloc(uint32_t pages)
 {
 	struct blk_data *data;
 	uint32_t i;
@@ -116,14 +116,6 @@ static ctx_data_t *__cas_ctx_data_alloc(uint32_t pages, bool zalloc)
 		if (!data->vec[i].bv_page)
 			break;
 
-		if (zalloc) {
-			if (!page_addr) {
-				page_addr = page_address(
-						data->vec[i].bv_page);
-			}
-			memset(page_addr, 0, PAGE_SIZE);
-		}
-
 		data->vec[i].bv_len = PAGE_SIZE;
 		data->vec[i].bv_offset = 0;
 	}
@@ -153,12 +145,7 @@ static ctx_data_t *__cas_ctx_data_alloc(uint32_t pages, bool zalloc)
 
 ctx_data_t *cas_ctx_data_alloc(uint32_t pages)
 {
-	return __cas_ctx_data_alloc(pages, false);
-}
-
-ctx_data_t *cas_ctx_data_zalloc(uint32_t pages)
-{
-	return __cas_ctx_data_alloc(pages, true);
+	return __cas_ctx_data_alloc(pages);
 }
 
 /*

modules/cas_cache/context.h

@@ -1,5 +1,6 @@
 /*
 * Copyright(c) 2012-2022 Intel Corporation
+* Copyright(c) 2024 Huawei Technologies
 * SPDX-License-Identifier: BSD-3-Clause
 */
 
@@ -37,7 +38,7 @@ struct blk_data {
 	/**
 	 * @brief CAS IO with which data is associated
 	 */
-	struct ocf_io *io;
+	ocf_io_t io;
 
 	/**
 	 * @brief Timestamp of start processing request
@@ -69,7 +70,6 @@ struct blk_data *cas_alloc_blk_data(uint32_t size, gfp_t flags);
 void cas_free_blk_data(struct blk_data *data);
 
 ctx_data_t *cas_ctx_data_alloc(uint32_t pages);
-ctx_data_t *cas_ctx_data_zalloc(uint32_t pages);
 void cas_ctx_data_free(ctx_data_t *ctx_data);
 void cas_ctx_data_secure_erase(ctx_data_t *ctx_data);
 

modules/cas_cache/debug.h

@@ -1,5 +1,6 @@
 /*
 * Copyright(c) 2012-2022 Intel Corporation
+* Copyright(c) 2024 Huawei Technologies
 * SPDX-License-Identifier: BSD-3-Clause
 */
 #ifndef __CASDISK_DEBUG_H__
@@ -12,7 +13,7 @@
 	printk(KERN_INFO "%s\n", __func__)
 
 #define CAS_DEBUG_DISK_TRACE(dsk)					\
-	printk(KERN_INFO "[%u] %s\n", dsk->id,  __func__)
+	printk(KERN_INFO "[%s] %s\n", dsk->path,  __func__)
 
 #define CAS_DEBUG_MSG(msg)						\
 	printk(KERN_INFO "%s - %s\n", __func__, msg)
@@ -22,8 +23,8 @@
 	       __func__, ##__VA_ARGS__)
 
 #define CAS_DEBUG_DISK(dsk, format, ...)				\
-	printk(KERN_INFO "[%u] %s - "format"\n",			\
-	       dsk->id,							\
+	printk(KERN_INFO "[%s] %s - "format"\n",			\
+	       dsk->path,						\
 	       __func__, ##__VA_ARGS__)
 
 #define CAS_DEBUG_ERROR(error, ...)					\

modules/cas_cache/exp_obj.c

@@ -37,12 +37,9 @@ static inline void bd_release_from_disk(struct block_device *bdev,
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
        #define KRETURN(x)      ({ return (x); })
        #define MAKE_RQ_RET_TYPE blk_qc_t
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+#else
        #define KRETURN(x)      return
        #define MAKE_RQ_RET_TYPE void
-#else
-       #define KRETURN(x)      ({ return (x); })
-       #define MAKE_RQ_RET_TYPE int
 #endif
 
 /* For RHEL 9.x we assume backport from kernel 5.18+ */