From 2bdcfff694f1d416d9bf1ccca4dcc122622ae3c8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 Jul 2023 07:41:16 +0200 Subject: [PATCH] 6.3-stable patches added patches: blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch --- ...ce_remove-while-blktrace-is-disabled.patch | 40 +++++++++++++++++++ queue-6.3/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-6.3/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch diff --git a/queue-6.3/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch b/queue-6.3/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch new file mode 100644 index 00000000000..343824d8278 --- /dev/null +++ b/queue-6.3/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch @@ -0,0 +1,40 @@ +From cbe7cff4a76bc749dd70264ca5cf924e2adf9296 Mon Sep 17 00:00:00 2001 +From: Yu Kuai +Date: Sat, 10 Jun 2023 10:20:01 +0800 +Subject: blktrace: use inline function for blk_trace_remove() while blktrace is disabled + +From: Yu Kuai + +commit cbe7cff4a76bc749dd70264ca5cf924e2adf9296 upstream. + +If config is disabled, call blk_trace_remove() directly will trigger +build warning, hence use inline function instead, prepare to fix +blktrace debugfs entries leakage. + +Signed-off-by: Yu Kuai +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20230610022003.2557284-2-yukuai1@huaweicloud.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/blktrace_api.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/include/linux/blktrace_api.h ++++ b/include/linux/blktrace_api.h +@@ -85,10 +85,14 @@ extern int blk_trace_remove(struct reque + # define blk_add_driver_data(rq, data, len) do {} while (0) + # define blk_trace_setup(q, name, dev, bdev, arg) (-ENOTTY) + # define blk_trace_startstop(q, start) (-ENOTTY) +-# define blk_trace_remove(q) (-ENOTTY) + # define blk_add_trace_msg(q, fmt, ...) do { } while (0) + # define blk_add_cgroup_trace_msg(q, cg, fmt, ...) do { } while (0) + # define blk_trace_note_message_enabled(q) (false) ++ ++static inline int blk_trace_remove(struct request_queue *q) ++{ ++ return -ENOTTY; ++} + #endif /* CONFIG_BLK_DEV_IO_TRACE */ + + #ifdef CONFIG_COMPAT diff --git a/queue-6.3/series b/queue-6.3/series index fe2de3751db..356ffdd3ae2 100644 --- a/queue-6.3/series +++ b/queue-6.3/series @@ -423,3 +423,4 @@ ksmbd-avoid-field-overflow-warning.patch arm64-sme-use-str-p-to-clear-ffr-context-field-in-st.patch x86-efi-make-efi_set_virtual_address_map-ibt-safe.patch md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch +blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch -- 2.47.3