kbuild: enable some -Wextra warnings by default
Subsystems (27)
cover kbuild: enable some -Wextra warnings by default
From: Arnd Bergmann <[email protected]>
This is a follow-up on a couple of patch series I sent in the past, enabling -Wextra (aside from stuff that is explicitly disabled), -Wcast-function-pointer-strict and -Wrestrict.
I have tested these on 'defconfig' and 'allmodconfig' builds across all architectures, as well as many 'randconfig' builds on x86, arm and arm64. It would be nice to have all the Makefile.extrawarn changes in v6.10, hopefully with the driver fixes going in before that through the respective subsystem trees.
Arnd
Arnd Bergmann (12):
kbuild: make -Woverride-init warnings more consistent [v3] parport: mfc3: avoid empty-body warning
kbuild: turn on -Wextra by default
kbuild: remove redundant extra warning flags
firmware: dmi-id: add a release callback function
nouveau: fix function cast warning
cxlflash: fix function pointer cast warnings
x86: math-emu: fix function cast warnings
kbuild: enable -Wcast-function-type-strict unconditionally
sata: sx4: fix pdc20621_get_from_dimm() on 64-bit [v4] kallsyms: rework symbol lookup return codes
kbuild: turn on -Wrestrict by default
arch/x86/math-emu/fpu_etc.c | 9 +++-- arch/x86/math-emu/fpu_trig.c | 6 ++-- arch/x86/math-emu/reg_constant.c | 7 +++- drivers/ata/sata_sx4.c | 6 ++-- drivers/firmware/dmi-id.c | 7 +++- .../gpu/drm/amd/display/dc/dce110/Makefile | 2 +- .../gpu/drm/amd/display/dc/dce112/Makefile | 2 +- .../gpu/drm/amd/display/dc/dce120/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 +- drivers/gpu/drm/i915/Makefile | 6 ++-- .../drm/nouveau/nvkm/subdev/bios/shadowof.c | 7 +++- drivers/gpu/drm/xe/Makefile | 4 +-- drivers/net/ethernet/renesas/sh_eth.c | 2 +- drivers/parport/parport_mfc3.c | 3 +- drivers/pinctrl/aspeed/Makefile | 2 +- drivers/scsi/cxlflash/lunmgt.c | 4 +-- drivers/scsi/cxlflash/main.c | 14 ++++---- drivers/scsi/cxlflash/superpipe.c | 34 +++++++++---------- drivers/scsi/cxlflash/superpipe.h | 11 +++--- drivers/scsi/cxlflash/vlun.c | 7 ++-- fs/proc/Makefile | 2 +- include/linux/filter.h | 14 ++++---- include/linux/ftrace.h | 6 ++-- include/linux/module.h | 14 ++++---- kernel/bpf/Makefile | 2 +- kernel/bpf/core.c | 7 ++-- kernel/kallsyms.c | 23 +++++++------ kernel/module/kallsyms.c | 26 +++++++------- kernel/trace/ftrace.c | 13 +++---- mm/Makefile | 3 +- scripts/Makefile.extrawarn | 33 ++++-------------- 32 files changed, 134 insertions(+), 148 deletions(-)
Signature · 40 lines
2.39.2 Cc: Bill Metzenthen <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: Damien Le Moal <[email protected]> Cc: Jean Delvare <[email protected]> Cc: Harry Wentland <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Sergey Shtylyov <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: Sudip Mukherjee <[email protected]> Cc: Andrew Jeffery <[email protected]> Cc: "Manoj N. Kumar" <[email protected]> Cc: "Martin K. Petersen" <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Luis Chamberlain <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Nathan Chancellor <[email protected]> Cc: Nicolas Schier <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected]
PATCH 1/12 kbuild: make -Woverride-init warnings more consistent
From: Arnd Bergmann <[email protected]>
The -Woverride-init warn about code that may be intentional or not, but the inintentional ones tend to be real bugs, so there is a bit of disagreement on whether this warning option should be enabled by default and we have multiple settings in scripts/Makefile.extrawarn as well as individual subsystems.
Older versions of clang only supported -Wno-initializer-overrides with the same meaning as gcc's -Woverride-init, though all supported versions now work with both. Because of this difference, an earlier cleanup of mine accidentally turned the clang warning off for W=1 builds and only left it on for W=2, while it's still enabled for gcc with W=1.
There is also one driver that only turns the warning off for newer versions of gcc but not other compilers, and some but not all the Makefiles still use a cc-disable-warning conditional that is no longer needed with supported compilers here.
Address all of the above by removing the special cases for clang and always turning the warning off unconditionally where it got in the way, using the syntax that is supported by both compilers.
--- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 +- drivers/gpu/drm/i915/Makefile | 6 +++--- drivers/gpu/drm/xe/Makefile | 4 ++-- drivers/net/ethernet/renesas/sh_eth.c | 2 +- drivers/pinctrl/aspeed/Makefile | 2 +- fs/proc/Makefile | 2 +- kernel/bpf/Makefile | 2 +- mm/Makefile | 3 +-- scripts/Makefile.extrawarn | 10 +++------- 13 files changed, 18 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/display/dc/dce110/Makefile +1 -1
@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce110/dce110_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce110/dce110_resource.o = -Wno-override-init DCE110 = dce110_timing_generator.o \ dce110_compressor.o dce110_opp_regamma_v.o \
drivers/gpu/drm/amd/display/dc/dce112/Makefile +1 -1
@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce112/dce112_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce112/dce112_resource.o = -Wno-override-init DCE112 = dce112_compressor.o
drivers/gpu/drm/amd/display/dc/dce120/Makefile +1 -1
@@ -24,7 +24,7 @@ # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce120/dce120_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce120/dce120_resource.o = -Wno-override-init DCE120 = dce120_timing_generator.o
drivers/gpu/drm/amd/display/dc/dce60/Makefile +1 -1
@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce60/dce60_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce60/dce60_resource.o = -Wno-override-init DCE60 = dce60_timing_generator.o dce60_hw_sequencer.o \ dce60_resource.o
drivers/gpu/drm/amd/display/dc/dce80/Makefile +1 -1
@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce80/dce80_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce80/dce80_resource.o = -Wno-override-init DCE80 = dce80_timing_generator.o
drivers/gpu/drm/i915/Makefile +3 -3
@@ -33,9 +33,9 @@ endif subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror # Fine grained warnings disable -CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init) +CFLAGS_i915_pci.o = -Wno-override-init +CFLAGS_display/intel_display_device.o = -Wno-override-init +CFLAGS_display/intel_fbdev.o = -Wno-override-init # Support compiling the display code separately for both i915 and xe # drivers. Define I915 when building i915.
drivers/gpu/drm/xe/Makefile +2 -2
@@ -172,8 +172,8 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ -Ddrm_i915_gem_object=xe_bo \ -Ddrm_i915_private=xe_device -CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init) -CFLAGS_i915-display/intel_display_device.o = $(call cc-disable-warning, override-init) +CFLAGS_i915-display/intel_fbdev.o = -Wno-override-init +CFLAGS_i915-display/intel_display_device.o = -Wno-override-init # Rule to build SOC code shared with i915 $(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCE
drivers/net/ethernet/renesas/sh_eth.c +1 -1
@@ -50,7 +50,7 @@* the macros available to do this only define GCC 8. */ __diag_push (); -__diag_ignore (GCC ,8 ,"-Woverride-init" , +__diag_ignore_all ("-Woverride-init" ,"logic to initialize all and then override some is OK" );static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET ] = {SH_ETH_OFFSET_DEFAULTS ,
drivers/pinctrl/aspeed/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only # Aspeed pinctrl support -ccflags-y += $(call cc-option,-Woverride-init) +ccflags-y += -Woverride-init obj-$(CONFIG_PINCTRL_ASPEED) += pinctrl-aspeed.o pinmux-aspeed.o obj-$(CONFIG_PINCTRL_ASPEED_G4) += pinctrl-aspeed-g4.o obj-$(CONFIG_PINCTRL_ASPEED_G5) += pinctrl-aspeed-g5.o
fs/proc/Makefile +1 -1
@@ -5,7 +5,7 @@ obj-y += proc.o -CFLAGS_task_mmu.o += $(call cc-option,-Wno-override-init,) +CFLAGS_task_mmu.o += -Wno-override-init proc-y := nommu.o task_nommu.o proc-$(CONFIG_MMU) := task_mmu.o
kernel/bpf/Makefile +1 -1
@@ -4,7 +4,7 @@ ifneq ($(CONFIG_BPF_JIT_ALWAYS_ON),y) # ___bpf_prog_run() needs GCSE disabled on x86; see 3193c0836f203 for details cflags-nogcse-$(CONFIG_X86)$(CONFIG_CC_IS_GCC) := -fno-gcse endif -CFLAGS_core.o += $(call cc-disable-warning, override-init) $(cflags-nogcse-yy) +CFLAGS_core.o += -Wno-override-init $(cflags-nogcse-yy) obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o log.o token.o obj-$(CONFIG_BPF_SYSCALL) += bpf_iter.o map_iter.o task_iter.o prog_iter.o link_iter.o
mm/Makefile +1 -2
@@ -29,8 +29,7 @@ KCOV_INSTRUMENT_mmzone.o := n KCOV_INSTRUMENT_vmstat.o := n KCOV_INSTRUMENT_failslab.o := n -CFLAGS_init-mm.o += $(call cc-disable-warning, override-init) -CFLAGS_init-mm.o += $(call cc-disable-warning, initializer-overrides) +CFLAGS_init-mm.o += -Wno-override-init mmu-y := nommu.o mmu-$(CONFIG_MMU) := highmem.o memory.o mincore.o \
scripts/Makefile.extrawarn +3 -7
@@ -114,6 +114,8 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation) +KBUILD_CFLAGS += -Wno-override-init # alias for -Wno-initializer-overrides in clang + ifdef CONFIG_CC_IS_CLANG # Clang before clang-16 would warn on default argument promotions. ifneq ($(call clang-min-version, 160000),y)
@@ -151,10 +153,6 @@ KBUILD_CFLAGS += -Wtype-limits KBUILD_CFLAGS += $(call cc-option, -Wmaybe-uninitialized) KBUILD_CFLAGS += $(call cc-option, -Wunused-macros) -ifdef CONFIG_CC_IS_CLANG -KBUILD_CFLAGS += -Winitializer-overrides -endif - KBUILD_CPPFLAGS += -DKBUILD_EXTRA_WARN2 else
@@ -164,9 +162,7 @@ KBUILD_CFLAGS += -Wno-missing-field-initializers KBUILD_CFLAGS += -Wno-type-limits KBUILD_CFLAGS += -Wno-shift-negative-value -ifdef CONFIG_CC_IS_CLANG -KBUILD_CFLAGS += -Wno-initializer-overrides -else +ifdef CONFIG_CC_IS_GCC KBUILD_CFLAGS += -Wno-maybe-uninitialized endif
Signature · 1 line
2.39.2
Re: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
Quoted 19 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The -Woverride-init warn about code that may be intentional or not, but the inintentional ones tend to be real bugs, so there is a bit of disagreement on whether this warning option should be enabled by default and we have multiple settings in
scripts/Makefile.extrawarnas well as individual subsystems.Older versions of clang only supported -Wno-initializer-overrides with the same meaning as gcc's -Woverride-init, though all supported versions now work with both. Because of this difference, an earlier cleanup of mine accidentally turned the clang warning off for W=1 builds and only left it on for W=2, while it's still enabled for gcc with W=1.
There is also one driver that only turns the warning off for newer versions of gcc but not other compilers, and some but not all the Makefiles still use a cc-disable-warning conditional that is no longer needed with supported compilers here.
Quoted 6 lines
Address all of the above by removing the special cases for clang and always turning the warning off unconditionally where it got in the way, using the syntax that is supported by both compilers.
Fixes 2cd3271b7a31 ("kbuild: avoid duplicate warning options")Signed-off-by Arnd Bergmann <[email protected]>
For the amdgpu changes.
Quoted 214 lines
--- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 +- drivers/gpu/drm/i915/Makefile | 6 +++--- drivers/gpu/drm/xe/Makefile | 4 ++-- drivers/net/ethernet/renesas/sh_eth.c | 2 +- drivers/pinctrl/aspeed/Makefile | 2 +- fs/proc/Makefile | 2 +- kernel/bpf/Makefile | 2 +- mm/Makefile | 3 +-- scripts/Makefile.extrawarn | 10 +++------- 13 files changed, 18 insertions(+), 23 deletions(-)drivers/gpu/drm/amd/display/dc/dce110/Makefile +1
-1@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce110/dce110_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce110/dce110_resource.o = -Wno-override-init DCE110 = dce110_timing_generator.o \ dce110_compressor.o dce110_opp_regamma_v.o \drivers/gpu/drm/amd/display/dc/dce112/Makefile +1
-1@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce112/dce112_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce112/dce112_resource.o = -Wno-override-init DCE112 = dce112_compressor.odrivers/gpu/drm/amd/display/dc/dce120/Makefile +1
-1@@ -24,7 +24,7 @@ # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce120/dce120_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce120/dce120_resource.o = -Wno-override-init DCE120 = dce120_timing_generator.odrivers/gpu/drm/amd/display/dc/dce60/Makefile +1
-1@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce60/dce60_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce60/dce60_resource.o = -Wno-override-init DCE60 = dce60_timing_generator.o dce60_hw_sequencer.o \ dce60_resource.odrivers/gpu/drm/amd/display/dc/dce80/Makefile +1
-1@@ -23,7 +23,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -CFLAGS_$(AMDDALPATH)/dc/dce80/dce80_resource.o = $(call cc-disable-warning, override-init) +CFLAGS_$(AMDDALPATH)/dc/dce80/dce80_resource.o = -Wno-override-init DCE80 = dce80_timing_generator.odrivers/gpu/drm/i915/Makefile +3
-3@@ -33,9 +33,9 @@ endif subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror # Fine grained warnings disable -CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init) +CFLAGS_i915_pci.o = -Wno-override-init +CFLAGS_display/intel_display_device.o = -Wno-override-init +CFLAGS_display/intel_fbdev.o = -Wno-override-init # Support compiling the display code separately for both i915 and xe # drivers. Define I915 when building i915.drivers/gpu/drm/xe/Makefile +2
-2@@ -172,8 +172,8 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ -Ddrm_i915_gem_object=xe_bo \ -Ddrm_i915_private=xe_device -CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init) -CFLAGS_i915-display/intel_display_device.o = $(call cc-disable-warning, override-init) +CFLAGS_i915-display/intel_fbdev.o = -Wno-override-init +CFLAGS_i915-display/intel_display_device.o = -Wno-override-init # Rule to build SOC code shared with i915 $(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCEdrivers/net/ethernet/renesas/sh_eth.c +1
-1@@ -50,7 +50,7 @@* the macros available to do this only define GCC 8. */ __diag_push (); -__diag_ignore (GCC ,8 ,"-Woverride-init" , +__diag_ignore_all ("-Woverride-init" ,"logic to initialize all and then override some is OK" );static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET ] = {SH_ETH_OFFSET_DEFAULTS ,drivers/pinctrl/aspeed/Makefile +1
-1@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only # Aspeed pinctrl support -ccflags-y += $(call cc-option,-Woverride-init) +ccflags-y += -Woverride-init obj-$(CONFIG_PINCTRL_ASPEED) += pinctrl-aspeed.o pinmux-aspeed.o obj-$(CONFIG_PINCTRL_ASPEED_G4) += pinctrl-aspeed-g4.o obj-$(CONFIG_PINCTRL_ASPEED_G5) += pinctrl-aspeed-g5.ofs/proc/Makefile +1
-1@@ -5,7 +5,7 @@ obj-y += proc.o -CFLAGS_task_mmu.o += $(call cc-option,-Wno-override-init,) +CFLAGS_task_mmu.o += -Wno-override-init proc-y := nommu.o task_nommu.o proc-$(CONFIG_MMU) := task_mmu.okernel/bpf/Makefile +1
-1@@ -4,7 +4,7 @@ ifneq ($(CONFIG_BPF_JIT_ALWAYS_ON),y) # ___bpf_prog_run() needs GCSE disabled on x86; see 3193c0836f203 for details cflags-nogcse-$(CONFIG_X86)$(CONFIG_CC_IS_GCC) := -fno-gcse endif -CFLAGS_core.o += $(call cc-disable-warning, override-init) $(cflags-nogcse-yy) +CFLAGS_core.o += -Wno-override-init $(cflags-nogcse-yy) obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o log.o token.o obj-$(CONFIG_BPF_SYSCALL) += bpf_iter.o map_iter.o task_iter.o prog_iter.o link_iter.omm/Makefile +1
-2@@ -29,8 +29,7 @@ KCOV_INSTRUMENT_mmzone.o := n KCOV_INSTRUMENT_vmstat.o := n KCOV_INSTRUMENT_failslab.o := n -CFLAGS_init-mm.o += $(call cc-disable-warning, override-init) -CFLAGS_init-mm.o += $(call cc-disable-warning, initializer-overrides) +CFLAGS_init-mm.o += -Wno-override-init mmu-y := nommu.o mmu-$(CONFIG_MMU) := highmem.o memory.o mincore.o \scripts/Makefile.extrawarn +3
-7@@ -114,6 +114,8 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation) +KBUILD_CFLAGS += -Wno-override-init # alias for -Wno-initializer-overrides in clang + ifdef CONFIG_CC_IS_CLANG # Clang before clang-16 would warn on default argument promotions. ifneq ($(call clang-min-version, 160000),y)@@ -151,10 +153,6 @@ KBUILD_CFLAGS += -Wtype-limits KBUILD_CFLAGS += $(call cc-option, -Wmaybe-uninitialized) KBUILD_CFLAGS += $(call cc-option, -Wunused-macros) -ifdef CONFIG_CC_IS_CLANG -KBUILD_CFLAGS += -Winitializer-overrides -endif - KBUILD_CPPFLAGS += -DKBUILD_EXTRA_WARN2 else@@ -164,9 +162,7 @@ KBUILD_CFLAGS += -Wno-missing-field-initializers KBUILD_CFLAGS += -Wno-type-limits KBUILD_CFLAGS += -Wno-shift-negative-value -ifdef CONFIG_CC_IS_CLANG -KBUILD_CFLAGS += -Wno-initializer-overrides -else +ifdef CONFIG_CC_IS_GCC KBUILD_CFLAGS += -Wno-maybe-uninitialized endif
Signature · 1 line
Hamza
Re: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
In reply to Arnd BergmannQuoted 41 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The -Woverride-init warn about code that may be intentional or not, but the inintentional ones tend to be real bugs, so there is a bit of disagreement on whether this warning option should be enabled by default and we have multiple settings in
scripts/Makefile.extrawarnas well as individual subsystems.Older versions of clang only supported -Wno-initializer-overrides with the same meaning as gcc's -Woverride-init, though all supported versions now work with both. Because of this difference, an earlier cleanup of mine accidentally turned the clang warning off for W=1 builds and only left it on for W=2, while it's still enabled for gcc with W=1.
There is also one driver that only turns the warning off for newer versions of gcc but not other compilers, and some but not all the Makefiles still use a cc-disable-warning conditional that is no longer needed with supported compilers here.
Address all of the above by removing the special cases for clang and always turning the warning off unconditionally where it got in the way, using the syntax that is supported by both compilers.
Fixes 2cd3271b7a31 ("kbuild: avoid duplicate warning options")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 +- drivers/gpu/drm/i915/Makefile | 6 +++--- drivers/gpu/drm/xe/Makefile | 4 ++-- drivers/net/ethernet/renesas/sh_eth.c | 2 +- drivers/pinctrl/aspeed/Makefile | 2 +- fs/proc/Makefile | 2 +- kernel/bpf/Makefile | 2 +- mm/Makefile | 3 +-- scripts/Makefile.extrawarn | 10 +++------- 13 files changed, 18 insertions(+), 23 deletions(-)
[snip]
Quoted 22 lines
drivers/gpu/drm/i915/Makefile +3
-3@@ -33,9 +33,9 @@ endif subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror # Fine grained warnings disable -CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init) +CFLAGS_i915_pci.o = -Wno-override-init +CFLAGS_display/intel_display_device.o = -Wno-override-init +CFLAGS_display/intel_fbdev.o = -Wno-override-init # Support compiling the display code separately for both i915 and xe # drivers. Define I915 when building i915.drivers/gpu/drm/xe/Makefile +0
-0
drivers/gpu/drm/xe/Makefile subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ · line 176
Quoted 7 lines
drivers/gpu/drm/xe/Makefile +2
-2@@ -172,8 +172,8 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ -Ddrm_i915_gem_object=xe_bo \ -Ddrm_i915_private=xe_device -CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init) -CFLAGS_i915-display/intel_display_device.o = $(call cc-disable-warning, override-init) +CFLAGS_i915-display/intel_fbdev.o = -Wno-override-init +CFLAGS_i915-display/intel_display_device.o = -Wno-override-init
For i915 and xe parts,
drivers/net/ethernet/renesas/sh_eth.c line 54
Quoted 13 lines
drivers/gpu/drm/xe/Makefile +0
-0# Rule to build SOC code shared with i915 $(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCEdrivers/net/ethernet/renesas/sh_eth.c +1
-1@@ -50,7 +50,7 @@* the macros available to do this only define GCC 8. */ __diag_push (); -__diag_ignore (GCC ,8 ,"-Woverride-init" , +__diag_ignore_all ("-Woverride-init" ,"logic to initialize all and then override some is OK" );
This is nice because it's more localized than the per-file disable. However, we tried to do this in i915, but this doesn't work for GCC versions < 8, and some defconfigs enabling -Werror forced us to revert. See commit 290d16104575 ("Revert "drm/i915: use localized __diag_ignore_all() instead of per file"").
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel
Re: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
Quoted 10 lines · Jani Nikula
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
index475e1e8c1d35..0786eb0da391100644drivers/net/ethernet/renesas/sh_eth.c +0
-1@@ -50,7 +50,7 @@* the macros available to do this only define GCC 8. */ __diag_push (); -__diag_ignore(GCC, 8, "-Woverride-init",
Quoted 8 lines
drivers/net/ethernet/renesas/sh_eth.c line 54
Quoted 2 lines
drivers/net/ethernet/renesas/sh_eth.c +1
-0+__diag_ignore_all ("-Woverride-init" ,"logic to initialize all and then override some is OK" );This is nice because it's more localized than the per-file disable. However, we tried to do this in i915, but this doesn't work for GCC versions < 8, and some defconfigs enabling -Werror forced us to revert. See commit
290d16104575("Revert "drm/i915: use localized__diag_ignore_all()instead of per file"").
It works now.
The original __diag_ignore_all() only did it for gcc-8 and above because that was initially needed to suppress warnings that got added in that version, but this was always a mistake.
689b097a06ba ("compiler-gcc: Suppress -Wmissing-prototypes warning for all supported GCC") made it work correctly.
Arnd
Jani Nikula
maintainerRe: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
Quoted 20 lines · Arnd Bergmann
Quoted 10 lines · Jani Nikula
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
index475e1e8c1d35..0786eb0da391100644drivers/net/ethernet/renesas/sh_eth.c +0
-1@@ -50,7 +50,7 @@* the macros available to do this only define GCC 8. */ __diag_push (); -__diag_ignore(GCC, 8, "-Woverride-init",Quoted 8 lines
drivers/net/ethernet/renesas/sh_eth.c line 54
Quoted 2 lines
drivers/net/ethernet/renesas/sh_eth.c +1
-0+__diag_ignore_all ("-Woverride-init" ,"logic to initialize all and then override some is OK" );This is nice because it's more localized than the per-file disable. However, we tried to do this in i915, but this doesn't work for GCC versions < 8, and some defconfigs enabling -Werror forced us to revert. See commit
290d16104575("Revert "drm/i915: use localized__diag_ignore_all()instead of per file"").
Quoted 8 lines
It works now.
The original
__diag_ignore_all()only did it for gcc-8 and above because that was initially needed to suppress warnings that got added in that version, but this was always a mistake.
689b097a06ba("compiler-gcc: Suppress -Wmissing-prototypes warning for all supported GCC") made it work correctly.
Oh, nice! Then I think we'd like to go back to __diag_ignore_all() in i915 and xe.
The diff is below. I'm fine with you squashing it to your patch, or if you want me to turn it into a proper patch for you to pick up in your series, that's fine too. Just let me know.
BR,
Jani.
drivers/gpu/drm/i915/Makefile +0 -5
@@ -32,11 +32,6 @@ endif # Enable -Werror in CI and development subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror -# Fine grained warnings disable -CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init) -CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init) - # Support compiling the display code separately for both i915 and xe # drivers. Define I915 when building i915. subdir-ccflags-y += -DI915
drivers/gpu/drm/i915/display/intel_display_device.c +5 -0
@@ -17,6 +17,9 @@#include "intel_display_reg_defs.h" #include "intel_fbc.h" +__diag_push (); +__diag_ignore_all ("-Woverride-init" ,"Allow field initialization overrides for display info" ); +static const struct intel_display_device_info no_display = {};#define PIPE_A_OFFSET 0x70000
@@ -768,6 +771,8 @@ static const struct intel_display_device_info xe2_lpd_display = {BIT (INTEL_FBC_C ) |BIT (INTEL_FBC_D ), }; +__diag_pop (); +/* * Separate detection for no display cases to keep the display id array simple. *
drivers/gpu/drm/i915/display/intel_fbdev.c +5 -0
@@ -135,6 +135,9 @@ static int intel_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)return i915_gem_fb_mmap (obj, vma); } +__diag_push (); +__diag_ignore_all ("-Woverride-init" ,"Allow field initialization overrides for fb ops" ); +static const struct fb_ops intelfb_ops = { .owner =THIS_MODULE ,__FB_DEFAULT_DEFERRED_OPS_RDWR (intel_fbdev),
@@ -146,6 +149,8 @@ static const struct fb_ops intelfb_ops = { .fb_mmap = intel_fbdev_mmap, }; +__diag_pop (); +static int intelfb_create (struct drm_fb_helper *helper,struct drm_fb_helper_surface_size *sizes) {
drivers/gpu/drm/i915/i915_pci.c +5 -0
@@ -38,6 +38,9 @@#include "i915_reg.h" #include "intel_pci_config.h" +__diag_push (); +__diag_ignore_all ("-Woverride-init" ,"Allow field initialization overrides for device info" ); +#define PLATFORM (x) .platform = (x)#define GEN (x) \ .__runtime.graphics.ip.ver = (x), \
@@ -785,6 +788,8 @@ static const struct intel_device_info mtl_info = {#undef PLATFORM +__diag_pop (); +/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem
drivers/gpu/drm/xe/Makefile +0 -3
@@ -172,9 +172,6 @@ subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ -Ddrm_i915_gem_object=xe_bo \ -Ddrm_i915_private=xe_device -CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init) -CFLAGS_i915-display/intel_display_device.o = $(call cc-disable-warning, override-init) - # Rule to build SOC code shared with i915 $(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCE $(call cmd,force_checksrc)
Signature · 1 line
Jani Nikula, Intel
Re: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
Quoted 13 lines · Jani Nikula
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Jani Nikula
On Tue, 26 Mar 2024, Arnd Bergmann <[email protected]> wrote:
It works now.
The original
__diag_ignore_all()only did it for gcc-8 and above because that was initially needed to suppress warnings that got added in that version, but this was always a mistake.
689b097a06ba("compiler-gcc: Suppress -Wmissing-prototypes warning for all supported GCC") made it work correctly.
Quoted 6 lines
Oh, nice! Then I think we'd like to go back to
__diag_ignore_all()in i915 and xe.The diff is below. I'm fine with you squashing it to your patch, or if you want me to turn it into a proper patch for you to pick up in your series, that's fine too. Just let me know.
I think I'd prefer to keep my patch simpler for the moment and get that merged through the kbuild tree, it already touches too many places at once.
It may be better for me to just drop the drivers/gpu/ part of my patch so you can just just take your patch through the drm tree. I actually have a similar patch for the amdgpu driver that I can send if you like this option better.
Arnd
Re: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
Quoted 26 lines · Arnd Bergmann
Quoted 13 lines · Jani Nikula
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Jani Nikula
On Tue, 26 Mar 2024, Arnd Bergmann <[email protected]> wrote:
It works now.
The original
__diag_ignore_all()only did it for gcc-8 and above because that was initially needed to suppress warnings that got added in that version, but this was always a mistake.
689b097a06ba("compiler-gcc: Suppress -Wmissing-prototypes warning for all supported GCC") made it work correctly.Quoted 6 lines
Oh, nice! Then I think we'd like to go back to
__diag_ignore_all()in i915 and xe.The diff is below. I'm fine with you squashing it to your patch, or if you want me to turn it into a proper patch for you to pick up in your series, that's fine too. Just let me know.
I think I'd prefer to keep my patch simpler for the moment and get that merged through the kbuild tree, it already touches too many places at once.
Quoted 7 lines
It may be better for me to just drop the
drivers/gpu/part of my patch so you can just just take your patch through the drm tree. I actually have a similar patch for the amdgpu driver that I can send if you like this option better.Arnd
Applied to linux-kbuild/fixes.
Thanks.
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
In reply to Arnd BergmannQuoted 25 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The -Woverride-init warn about code that may be intentional or not, but the inintentional ones tend to be real bugs, so there is a bit of disagreement on whether this warning option should be enabled by default and we have multiple settings in
scripts/Makefile.extrawarnas well as individual subsystems.Older versions of clang only supported -Wno-initializer-overrides with the same meaning as gcc's -Woverride-init, though all supported versions now work with both. Because of this difference, an earlier cleanup of mine accidentally turned the clang warning off for W=1 builds and only left it on for W=2, while it's still enabled for gcc with W=1.
There is also one driver that only turns the warning off for newer versions of gcc but not other compilers, and some but not all the Makefiles still use a cc-disable-warning conditional that is no longer needed with supported compilers here.
Address all of the above by removing the special cases for clang and always turning the warning off unconditionally where it got in the way, using the syntax that is supported by both compilers.
Fixes 2cd3271b7a31 ("kbuild: avoid duplicate warning options")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 10 lines
--- drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce120/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 +- drivers/gpu/drm/i915/Makefile | 6 +++--- drivers/gpu/drm/xe/Makefile | 4 ++-- drivers/net/ethernet/renesas/sh_eth.c | 2 +- drivers/pinctrl/aspeed/Makefile | 2 +-
For the Aspeed change:
Thanks!
Re: [PATCH 01/12] kbuild: make -Woverride-init warnings more consistent
In reply to Arnd BergmannQuoted 19 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The -Woverride-init warn about code that may be intentional or not, but the inintentional ones tend to be real bugs, so there is a bit of disagreement on whether this warning option should be enabled by default and we have multiple settings in
scripts/Makefile.extrawarnas well as individual subsystems.Older versions of clang only supported -Wno-initializer-overrides with the same meaning as gcc's -Woverride-init, though all supported versions now work with both. Because of this difference, an earlier cleanup of mine accidentally turned the clang warning off for W=1 builds and only left it on for W=2, while it's still enabled for gcc with W=1.
There is also one driver that only turns the warning off for newer versions of gcc but not other compilers, and some but not all the Makefiles still use a cc-disable-warning conditional that is no longer needed with supported compilers here.
Quoted 6 lines
Address all of the above by removing the special cases for clang and always turning the warning off unconditionally where it got in the way, using the syntax that is supported by both compilers.
Fixes 2cd3271b7a31 ("kbuild: avoid duplicate warning options")Signed-off-by Arnd Bergmann <[email protected]>
Neat!
Yours,
Linus Walleij
PATCH v3 2/12 parport: mfc3: avoid empty-body warning
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
on m68k builds, the mfc3 driver causes a warning about an empty if() block:
drivers/parport/parport_mfc3.c: In function 'control_pc_to_mfc3':drivers/parport/parport_mfc3.c:106:37: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
Remove it in favor of a simpler comment.
---
v3: no changes, resending
v2: fix typo
--- drivers/parport/parport_mfc3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/parport/parport_mfc3.c +1 -2
@@ -102,8 +102,7 @@ static unsigned char control_pc_to_mfc3(unsigned char control) ret |=128 ;if (control &PARPORT_CONTROL_AUTOFD )/* AUTOLF */ ret &= ~64 ; -if (control &PARPORT_CONTROL_STROBE )/* Strobe */ -/* Handled directly by hardware */ ; +/* PARPORT_CONTROL_STROBE handled directly by hardware */ return ret; }
Signature · 1 line
2.39.2
PATCH 3/12 kbuild: turn on -Wextra by default
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The -Wextra option controls a number of different warnings that differ slightly by compiler version. Some are useful in general, others are better left at W=1 or higher. Based on earlier work, the ones that should be disabled by default are left for the higher warning levels already, and a lot of the useful ones have no remaining output when enabled.
Move the -Wextra option up into the set of default-enabled warnings and just rely on the individual ones getting disabled as needed.
The -Wunused warning was always grouped with this, so turn it on by default as well, except for the -Wunused-parameter warning that really has no value at all for the kernel since many interfaces have intentionally unused arguments.
--- scripts/Makefile.extrawarn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
scripts/Makefile.extrawarn +4 -1
@@ -82,12 +82,14 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init) # Warn if there is an enum types mismatch KBUILD_CFLAGS += $(call cc-option,-Wenum-conversion) +KBUILD_CFLAGS += -Wextra +KBUILD_CFLAGS += -Wunused + # # W=1 - warnings which may be relevant and do not occur too often # ifneq ($(findstring 1, $(KBUILD_EXTRA_WARN)),) -KBUILD_CFLAGS += -Wextra -Wunused -Wno-unused-parameter KBUILD_CFLAGS += $(call cc-option, -Wrestrict) KBUILD_CFLAGS += -Wmissing-format-attribute KBUILD_CFLAGS += -Wold-style-definition
@@ -190,6 +192,7 @@ else # The following turn off the warnings enabled by -Wextra KBUILD_CFLAGS += -Wno-sign-compare +KBUILD_CFLAGS += -Wno-unused-parameter endif
Signature · 1 line
2.39.2
PATCH 4/12 kbuild: remove redundant extra warning flags
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
There is no point in turning individual options off and then on again, or vice versa, as the last one always wins. Now that -Wextra always gets passed first, remove all the redundant lines about warnings that are implied by either -Wall or -Wextra, and keep only the last one that disables it in some configurations.
This should not have any effect but keep the Makefile more readable and the command line shorter.
--- scripts/Makefile.extrawarn | 16 ---------------- 1 file changed, 16 deletions(-)
scripts/Makefile.extrawarn +0 -16
@@ -37,11 +37,6 @@ else KBUILD_CFLAGS += -Wno-main endif -# These warnings generated too much noise in a regular build. -# Use make W=1 to enable them (see scripts/Makefile.extrawarn) -KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable) -KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable) - # These result in bogus false positives KBUILD_CFLAGS += $(call cc-disable-warning, dangling-pointer)
@@ -90,16 +85,8 @@ KBUILD_CFLAGS += -Wunused # ifneq ($(findstring 1, $(KBUILD_EXTRA_WARN)),) -KBUILD_CFLAGS += $(call cc-option, -Wrestrict) KBUILD_CFLAGS += -Wmissing-format-attribute -KBUILD_CFLAGS += -Wold-style-definition KBUILD_CFLAGS += -Wmissing-include-dirs -KBUILD_CFLAGS += $(call cc-option, -Wunused-but-set-variable) -KBUILD_CFLAGS += $(call cc-option, -Wunused-const-variable) -KBUILD_CFLAGS += $(call cc-option, -Wpacked-not-aligned) -KBUILD_CFLAGS += $(call cc-option, -Wformat-overflow) -KBUILD_CFLAGS += $(call cc-option, -Wformat-truncation) -KBUILD_CFLAGS += $(call cc-option, -Wstringop-truncation) KBUILD_CPPFLAGS += -Wundef KBUILD_CPPFLAGS += -DKBUILD_EXTRA_WARN1
@@ -150,9 +137,6 @@ ifneq ($(findstring 2, $(KBUILD_EXTRA_WARN)),) KBUILD_CFLAGS += -Wdisabled-optimization KBUILD_CFLAGS += -Wshadow KBUILD_CFLAGS += $(call cc-option, -Wlogical-op) -KBUILD_CFLAGS += -Wmissing-field-initializers -KBUILD_CFLAGS += -Wtype-limits -KBUILD_CFLAGS += $(call cc-option, -Wmaybe-uninitialized) KBUILD_CFLAGS += $(call cc-option, -Wunused-macros) KBUILD_CPPFLAGS += -DKBUILD_EXTRA_WARN2
Signature · 1 line
2.39.2
PATCH 5/12 firmware: dmi-id: add a release callback function
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
dmi_class uses kfree() as the .release function, but that now causes a warning with clang-16 as it violates control flow integrity (KCFI) rules:
drivers/firmware/dmi-id.c:174:17: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
174 | .dev_release = (void(*)(struct device *)) kfree,
Add an explicit function to call kfree() instead.
---
I sent this before but got no comments for it
--- drivers/firmware/dmi-id.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/firmware/dmi-id.c +6 -1
@@ -169,9 +169,14 @@ static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env)return 0 ; } +static void dmi_dev_release (struct device *dev) +{ +kfree (dev); +} +static struct class dmi_class = { .name ="dmi" , - .dev_release = (void (*)(struct device *)) kfree, + .dev_release = dmi_dev_release, .dev_uevent = dmi_dev_uevent, };
Signature · 1 line
2.39.2
Re: [PATCH 05/12] firmware: dmi-id: add a release callback function
Hi Arnd,
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
dmi_classuseskfree()as the .release function, but that now causes a warning with clang-16 as it violates control flow integrity (KCFI) rules:
Quoted 6 lines
drivers/firmware/dmi-id.c:174:17: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
174 | .dev_release = (void(*)(struct device *)) kfree,Add an explicit function to call
kfree()instead.Fixes 4f5c791a850e ("DMI-based module autoloading")
Not sure if this fixes tag is really warranted. As I understand it, your change only removes a warning but there was no actual bug, right?
Quoted 4 lines
Signed-off-by Arnd Bergmann <[email protected]>---
I sent this before but got no comments for it
I indeed overlooked your initial submission, my bad.
Quoted 14 lines
--- drivers/firmware/dmi-id.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/firmware/dmi-id.c +2
-0@@ -169,9 +169,14 @@ static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env)return 0 ; } +static void dmi_dev_release (struct device *dev) +{
drivers/firmware/dmi-id.c static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) · line 182
Quoted 10 lines
drivers/firmware/dmi-id.c +4
-1+kfree (dev); +} +static struct class dmi_class = { .name ="dmi" , - .dev_release = (void (*)(struct device *)) kfree, + .dev_release = dmi_dev_release, .dev_uevent = dmi_dev_uevent, };
Looks good to me, thanks for doing that.
Will you get this upstream, or do you expect me to take it in my dmi/for-next branch?
Signature · 2 lines
Jean Delvare SUSE L3 Support
Nathan Chancellor
maintainerRe: [PATCH 05/12] firmware: dmi-id: add a release callback function
Quoted 12 lines · Jean Delvare
Hi Arnd,
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
dmi_classuseskfree()as the .release function, but that now causes a warning with clang-16 as it violates control flow integrity (KCFI) rules:
drivers/firmware/dmi-id.c:174:17: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
174 | .dev_release = (void(*)(struct device *)) kfree,
Quoted 6 lines
Quoted 3 lines
Add an explicit function to call
kfree()instead.Fixes 4f5c791a850e ("DMI-based module autoloading")Not sure if this fixes tag is really warranted. As I understand it, your change only removes a warning but there was no actual bug, right?
Sort of, the warning is really pointing out that calling this callback will result in a crash at runtime when the kernel is built with kCFI enabled, which I would consider a bug.
Cheers,
Nathan
Re: [PATCH 05/12] firmware: dmi-id: add a release callback function
In reply to Jean DelvareQuoted 10 lines · Jean Delvare
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
dmi_classuseskfree()as the .release function, but that now causes a warning with clang-16 as it violates control flow integrity (KCFI) rules:
drivers/firmware/dmi-id.c:174:17: error: cast from 'void (*)(const void *)' to 'void (*)(struct device *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
174 | .dev_release = (void(*)(struct device *)) kfree,
Quoted 6 lines
Quoted 3 lines
Add an explicit function to call
kfree()instead.Fixes 4f5c791a850e ("DMI-based module autoloading")Not sure if this fixes tag is really warranted. As I understand it, your change only removes a warning but there was no actual bug, right?
As Nathan already commented, it's a real bug. I also add 'Fixes' tags for false-positives just to document what introduced a warning. The Fixes tag doesn't automatically mean something gets backported, though the stable maintainers often end up backporting warning fixes as well, and it helps identify which kernels need it.
Quoted 6 lines
Looks good to me, thanks for doing that.
Signed-off-by Jean Delvare <[email protected]>Will you get this upstream, or do you expect me to take it in my dmi/for-next branch?
It would help me if you can apply it to your tree directly.
Arnd
Re: [PATCH 05/12] firmware: dmi-id: add a release callback function
Hi Arnd,
Quoted 5 lines · Arnd Bergmann
Quoted 2 lines · Jean Delvare
Will you get this upstream, or do you expect me to take it in my dmi/for-next branch?
It would help me if you can apply it to your tree directly.
OK, it's in my dmi-for-next branch now:
https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git/log/?h=dmi-for-next
Thanks,
Signature · 2 lines
Jean Delvare SUSE L3 Support
Re: [PATCH 05/12] firmware: dmi-id: add a release callback function
Quoted 10 lines · Jean Delvare
Quoted 5 lines · Arnd Bergmann
Quoted 2 lines · Jean Delvare
Will you get this upstream, or do you expect me to take it in my dmi/for-next branch?
It would help me if you can apply it to your tree directly.
OK, it's in my dmi-for-next branch now:
https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git/log/?h=dmi-for-next
Hi Jean,
I see it's in your tree, but I don't see your tree in linux-next.
As all the other fixes from my series got merged, I would like to merge the patches that turn the warnings on, but that still causes a build-time regression.
Is there a reason for the dmi-next tree not being part of linux-next, or should we ask Stephen (added to Cc) to add it?
Arnd
Re: [PATCH 05/12] firmware: dmi-id: add a release callback function
Quoted 12 lines · Arnd Bergmann
Quoted 10 lines · Jean Delvare
Quoted 5 lines · Arnd Bergmann
Quoted 2 lines · Jean Delvare
Will you get this upstream, or do you expect me to take it in my dmi/for-next branch?
It would help me if you can apply it to your tree directly.
OK, it's in my dmi-for-next branch now:
https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git/log/?h=dmi-for-next
Quoted 8 lines
I see it's in your tree, but I don't see your tree in linux-next.
As all the other fixes from my series got merged, I would like to merge the patches that turn the warnings on, but that still causes a build-time regression.
Is there a reason for the dmi-next tree not being part of linux-next, or should we ask Stephen (added to Cc) to add it?
Hmm, Stephen cleaned up the list of trees he pulls from 2 months ago. Back then, I objected that I may use my tree again in the future, and I thought he had added it back to the list, but maybe I misunderstood.
Stephen, can you check if you still pull from tree above, and if not, add it back to the list? Thanks in advance.
Signature · 2 lines
Jean Delvare SUSE L3 Support
Re: [PATCH 05/12] firmware: dmi-id: add a release callback function
Hi Jean,
Quoted 7 lines · On Sat, 13 Apr 2024 22:38:57 +0200 Jean Delvare <[email protected]> wrote:
Hmm, Stephen cleaned up the list of trees he pulls from 2 months ago. Back then, I objected that I may use my tree again in the future, and I thought he had added it back to the list, but maybe I misunderstood.
Stephen, can you check if you still pull from tree above, and if not, add it back to the list? Thanks in advance.
I also misunderstood your position at the time. I have now restored the dmi tree to linux-next.
Signature · 2 lines
Cheers, Stephen Rothwell
PATCH 6/12 nouveau: fix function cast warning
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Calling a function through an incompatible pointer type causes breaks kcfi, so clang warns about the assignment:
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c:73:10: error: cast from 'void (*)(const void *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
73 | .fini = (void(*)(void *))kfree,
Avoid this with a trivial wrapper.
--- drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c +6 -1
@@ -66,11 +66,16 @@ of_init(struct nvkm_bios *bios, const char *name)return ERR_PTR (-EINVAL ); } +static void of_fini (void *p) +{ +return kfree (p); +} +const struct nvbios_source nvbios_of = { .name ="OpenFirmware" , .init = of_init, - .fini = (void (*)(void *))kfree, + .fini = of_fini, .read = of_read, .size = of_size, .rw = false,
Signature · 1 line
2.39.2
Re: [PATCH 06/12] nouveau: fix function cast warning
Quoted 3 lines · Arnd Bergmann
Calling a function through an incompatible pointer type causes breaks kcfi, so clang warns about the assignment:
...
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c of_init(struct nvkm_bios *bios, const char *name) · line 73
Quoted 5 lines
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c +5
-0+static void of_fini (void *p) +{ + return kfree(p); +} +
I don't know anything about kfci, but shouldn't this just be "kfree(p)", without the "return"?
Re: [PATCH 06/12] nouveau: fix function cast warning
Quoted 7 lines · Timur Tabi
Quoted 3 lines · Arnd Bergmann
Calling a function through an incompatible pointer type causes breaks kcfi, so clang warns about the assignment:
...
Quoted 8 lines
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c of_init(struct nvkm_bios *bios, const char *name) · line 73
Quoted 5 lines
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c +5
-0+static void of_fini (void *p) +{ + return kfree(p); +} +I don't know anything about kfci, but shouldn't this just be "kfree(p)", without the "return"?
You are right, fixed this up locally now, waiting for more comments before I resend patches from my series.
I think it works because of a gcc extension, but isn't valid C otherwise, and I did not mean to rely on this.
Arnd
PATCH 7/12 cxlflash: fix function pointer cast warnings
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Calling a function through an incompatible pointer type causes breaks kcfi, so clang warns about the assignments:
drivers/scsi/cxlflash/main.c:3498:3: error: cast from 'int (*)(struct cxlflash_cfg *, struct ht_cxlflash_lun_provision *)' to 'hioctl' (aka 'int (*)(struct cxlflash_cfg *, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
3498 | (hioctl)cxlflash_lun_provision },
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/scsi/cxlflash/main.c:3500:3: error: cast from 'int (*)(struct cxlflash_cfg *, struct ht_cxlflash_afu_debug *)' to 'hioctl' (aka 'int (*)(struct cxlflash_cfg *, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
3500 | (hioctl)cxlflash_afu_debug },
| ^~~~~~~~~~~~~~~~~~~~~~~~~~Address these by changing the functions to have the correct type and replace the function pointer cast with a cast of its argument.
--- drivers/scsi/cxlflash/lunmgt.c | 4 ++-- drivers/scsi/cxlflash/main.c | 14 ++++++------- drivers/scsi/cxlflash/superpipe.c | 34 +++++++++++++++---------------- drivers/scsi/cxlflash/superpipe.h | 11 ++++------ drivers/scsi/cxlflash/vlun.c | 7 +++---- 5 files changed, 31 insertions(+), 39 deletions(-)
drivers/scsi/cxlflash/lunmgt.c +2 -2
@@ -224,9 +224,9 @@ void cxlflash_term_global_luns(void)* * Return: 0 on success, -errno on failure */ -int cxlflash_manage_lun (struct scsi_device *sdev, -struct dk_cxlflash_manage_lun *manage) +int cxlflash_manage_lun (struct scsi_device *sdev,void *arg) { +struct dk_cxlflash_manage_lun *manage = arg;struct cxlflash_cfg *cfg =shost_priv (sdev->host);struct device *dev = &cfg->dev->dev;struct llun_info *lli =NULL ;
drivers/scsi/cxlflash/main.c +6 -8
@@ -3279,9 +3279,9 @@ static char *decode_hioctl(unsigned int cmd)* * Return: 0 on success, -errno on failure */ -static int cxlflash_lun_provision (struct cxlflash_cfg *cfg, -struct ht_cxlflash_lun_provision *lunprov) +static int cxlflash_lun_provision (struct cxlflash_cfg *cfg,void *arg) { +struct ht_cxlflash_lun_provision *lunprov = arg;struct afu *afu = cfg->afu;struct device *dev = &cfg->dev->dev;struct sisl_ioarcb rcb;
@@ -3373,9 +3373,9 @@ static int cxlflash_lun_provision(struct cxlflash_cfg *cfg,* * Return: 0 on success, -errno on failure */ -static int cxlflash_afu_debug (struct cxlflash_cfg *cfg, -struct ht_cxlflash_afu_debug *afu_dbg) +static int cxlflash_afu_debug (struct cxlflash_cfg *cfg,void *arg) { +struct ht_cxlflash_afu_debug *afu_dbg = arg;struct afu *afu = cfg->afu;struct device *dev = &cfg->dev->dev;struct sisl_ioarcb rcb;
@@ -3489,10 +3489,8 @@ static long cxlflash_chr_ioctl(struct file *file, unsigned int cmd,size_t size;hioctl ioctl; } ioctl_tbl[] = { /* NOTE: order matters here */ - { sizeof(struct ht_cxlflash_lun_provision), - (hioctl)cxlflash_lun_provision }, - { sizeof(struct ht_cxlflash_afu_debug), - (hioctl)cxlflash_afu_debug }, + { sizeof(struct ht_cxlflash_lun_provision), cxlflash_lun_provision }, + { sizeof(struct ht_cxlflash_afu_debug), cxlflash_afu_debug }, }; /* Hold read semaphore so we can drain if needed */
drivers/scsi/cxlflash/superpipe.c +16 -18
@@ -729,8 +729,7 @@ int _cxlflash_disk_release(struct scsi_device *sdev,return rc; } -int cxlflash_disk_release (struct scsi_device *sdev, -struct dk_cxlflash_release *release) +int cxlflash_disk_release (struct scsi_device *sdev,void *release) {return _cxlflash_disk_release (sdev,NULL , release); }
@@ -955,8 +954,7 @@ static int _cxlflash_disk_detach(struct scsi_device *sdev,return rc; } -static int cxlflash_disk_detach (struct scsi_device *sdev, -struct dk_cxlflash_detach *detach) +static int cxlflash_disk_detach (struct scsi_device *sdev,void *detach) {return _cxlflash_disk_detach (sdev,NULL , detach); }
@@ -1314,9 +1312,9 @@ int check_state(struct cxlflash_cfg *cfg)* * Return: 0 on success, -errno on failure */ -static int cxlflash_disk_attach (struct scsi_device *sdev, -struct dk_cxlflash_attach *attach) +static int cxlflash_disk_attach (struct scsi_device *sdev,void *arg) { +struct dk_cxlflash_attach *attach = arg;struct cxlflash_cfg *cfg =shost_priv (sdev->host);struct device *dev = &cfg->dev->dev;struct afu *afu = cfg->afu;
@@ -1648,9 +1646,9 @@ static int recover_context(struct cxlflash_cfg *cfg,* * Return: 0 on success, -errno on failure */ -static int cxlflash_afu_recover (struct scsi_device *sdev, -struct dk_cxlflash_recover_afu *recover) +static int cxlflash_afu_recover (struct scsi_device *sdev,void *arg) { +struct dk_cxlflash_recover_afu *recover = arg;struct cxlflash_cfg *cfg =shost_priv (sdev->host);struct device *dev = &cfg->dev->dev;struct llun_info *lli = sdev->hostdata;
@@ -1833,9 +1831,9 @@ static int process_sense(struct scsi_device *sdev,* * Return: 0 on success, -errno on failure */ -static int cxlflash_disk_verify (struct scsi_device *sdev, -struct dk_cxlflash_verify *verify) +static int cxlflash_disk_verify (struct scsi_device *sdev,void *arg) { +struct dk_cxlflash_verify *verify = arg;int rc =0 ;struct ctx_info *ctxi =NULL ;struct cxlflash_cfg *cfg =shost_priv (sdev->host);
@@ -2111,16 +2109,16 @@ int cxlflash_ioctl(struct scsi_device *sdev, unsigned int cmd, void __user *arg)size_t size;sioctl ioctl; } ioctl_tbl[] = { /* NOTE: order matters here */ - {sizeof(struct dk_cxlflash_attach), (sioctl)cxlflash_disk_attach}, + {sizeof(struct dk_cxlflash_attach), cxlflash_disk_attach}, {sizeof(struct dk_cxlflash_udirect), cxlflash_disk_direct_open}, - {sizeof(struct dk_cxlflash_release), (sioctl)cxlflash_disk_release}, - {sizeof(struct dk_cxlflash_detach), (sioctl)cxlflash_disk_detach}, - {sizeof(struct dk_cxlflash_verify), (sioctl)cxlflash_disk_verify}, - {sizeof(struct dk_cxlflash_recover_afu), (sioctl)cxlflash_afu_recover}, - {sizeof(struct dk_cxlflash_manage_lun), (sioctl)cxlflash_manage_lun}, + {sizeof(struct dk_cxlflash_release), cxlflash_disk_release}, + {sizeof(struct dk_cxlflash_detach), cxlflash_disk_detach}, + {sizeof(struct dk_cxlflash_verify), cxlflash_disk_verify}, + {sizeof(struct dk_cxlflash_recover_afu), cxlflash_afu_recover}, + {sizeof(struct dk_cxlflash_manage_lun), cxlflash_manage_lun}, {sizeof(struct dk_cxlflash_uvirtual), cxlflash_disk_virtual_open}, - {sizeof(struct dk_cxlflash_resize), (sioctl)cxlflash_vlun_resize}, - {sizeof(struct dk_cxlflash_clone), (sioctl)cxlflash_disk_clone}, + {sizeof(struct dk_cxlflash_resize), cxlflash_vlun_resize}, + {sizeof(struct dk_cxlflash_clone), cxlflash_disk_clone}, }; /* Hold read semaphore so we can drain if needed */
drivers/scsi/cxlflash/superpipe.h +4 -7
@@ -114,18 +114,16 @@ struct cxlflash_global {struct page *err_page;/* One page of all 0xF for error notification */ }; -int cxlflash_vlun_resize (struct scsi_device *sdev, -struct dk_cxlflash_resize *resize); +int cxlflash_vlun_resize (struct scsi_device *sdev,void *resize);int _cxlflash_vlun_resize (struct scsi_device *sdev,struct ctx_info *ctxi,struct dk_cxlflash_resize *resize);int cxlflash_disk_release (struct scsi_device *sdev, -struct dk_cxlflash_release *release); +void *release);int _cxlflash_disk_release (struct scsi_device *sdev,struct ctx_info *ctxi,struct dk_cxlflash_release *release); -int cxlflash_disk_clone (struct scsi_device *sdev, -struct dk_cxlflash_clone *clone); +int cxlflash_disk_clone (struct scsi_device *sdev,void *arg);int cxlflash_disk_virtual_open (struct scsi_device *sdev,void *arg);
@@ -145,8 +143,7 @@ void rhte_checkin(struct ctx_info *ctxi, struct sisl_rht_entry *rhte);void cxlflash_ba_terminate (struct ba_lun *ba_lun); -int cxlflash_manage_lun (struct scsi_device *sdev, -struct dk_cxlflash_manage_lun *manage); +int cxlflash_manage_lun (struct scsi_device *sdev,void *manage);int check_state (struct cxlflash_cfg *cfg);
drivers/scsi/cxlflash/vlun.c +3 -4
@@ -819,8 +819,7 @@ int _cxlflash_vlun_resize(struct scsi_device *sdev,return rc; } -int cxlflash_vlun_resize (struct scsi_device *sdev, -struct dk_cxlflash_resize *resize) +int cxlflash_vlun_resize (struct scsi_device *sdev,void *resize) {return _cxlflash_vlun_resize (sdev,NULL , resize); }
@@ -1187,9 +1186,9 @@ static int clone_lxt(struct afu *afu,* * Return: 0 on success, -errno on failure */ -int cxlflash_disk_clone (struct scsi_device *sdev, -struct dk_cxlflash_clone *clone) +int cxlflash_disk_clone (struct scsi_device *sdev,void *arg) { +struct dk_cxlflash_clone *clone = arg;struct cxlflash_cfg *cfg =shost_priv (sdev->host);struct device *dev = &cfg->dev->dev;struct llun_info *lli = sdev->hostdata;
Signature · 1 line
2.39.2
PATCH 8/12 x86: math-emu: fix function cast warnings
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
clang-16 warns about casting function pointers with incompatible prototypes. The x86 math-emu code does this in a number of places to call some trivial functions that need no arguments:
arch/x86/math-emu/fpu_etc.c:124:14: error: cast from 'void (*)(void)' to 'FUNC_ST0' (aka 'void (*)(struct fpu__reg *, unsigned char)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
124 | fchs, fabs, (FUNC_ST0) FPU_illegal, (FUNC_ST0) FPU_illegal,
| ^~~~~~~~~~~~~~~~~~~~~~
arch/x86/math-emu/fpu_trig.c:1634:19: error: cast from 'void (*)(void)' to 'FUNC_ST0' (aka 'void (*)(struct fpu__reg *, unsigned char)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
1634 | fxtract, fprem1, (FUNC_ST0) fdecstp, (FUNC_ST0) fincstp
| ^~~~~~~~~~~~~~~~~~arch/x86/math-emu/reg_constant.c:112:53: error: cast from 'void (*)(void)' to 'FUNC_RC' (aka 'void (*)(int)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
112 | fld1, fldl2t, fldl2e, fldpi, fldlg2, fldln2, fldz, (FUNC_RC) FPU_illegal
Change the fdecstp() and fincstp() functions to actually have the correct prototypes based on the caller, and add wrappers around FPU_illegal() for adapting those.
---
Resending the version from Feb 13, no changes
--- arch/x86/math-emu/fpu_etc.c | 9 +++++++-- arch/x86/math-emu/fpu_trig.c | 6 +++--- arch/x86/math-emu/reg_constant.c | 7 ++++++- 3 files changed, 16 insertions(+), 6 deletions(-)
arch/x86/math-emu/fpu_etc.c +7 -2
@@ -120,9 +120,14 @@ static void fxam(FPU_REG *st0_ptr, u_char st0tag)setcc (c); } +static void FPU_ST0_illegal (FPU_REG *st0_ptr,u_char st0_tag) +{ +FPU_illegal (); +} +static FUNC_ST0 const fp_etc_table[] = { - fchs, fabs, (FUNC_ST0 ) FPU_illegal, (FUNC_ST0 ) FPU_illegal, - ftst_, fxam, (FUNC_ST0 ) FPU_illegal, (FUNC_ST0 ) FPU_illegal + fchs, fabs, FPU_ST0_illegal, FPU_ST0_illegal, + ftst_, fxam, FPU_ST0_illegal, FPU_ST0_illegal, };void FPU_etc (void )
arch/x86/math-emu/fpu_trig.c +3 -3
@@ -433,13 +433,13 @@ static void fxtract(FPU_REG *st0_ptr, u_char st0_tag)#endif /* PARANOID */ } -static void fdecstp (void ) +static void fdecstp (FPU_REG *st0_ptr,u_char st0_tag) {clear_C1 (); top--; } -static void fincstp (void ) +static void fincstp (FPU_REG *st0_ptr,u_char st0_tag) {clear_C1 (); top++;
@@ -1631,7 +1631,7 @@ static void fscale(FPU_REG *st0_ptr, u_char st0_tag)static FUNC_ST0 const trig_table_a[] = { f2xm1, fyl2x, fptan, fpatan, - fxtract, fprem1, (FUNC_ST0 ) fdecstp, (FUNC_ST0 ) fincstp + fxtract, fprem1, fdecstp, fincstp, };void FPU_triga (void )
arch/x86/math-emu/reg_constant.c +6 -1
@@ -108,8 +108,13 @@ static void fldz(int rc)typedef void (*FUNC_RC ) (int ); +static void FPU_RC_illegal (int unused) +{ +FPU_illegal (); +} +static FUNC_RC constants_table[] = { - fld1, fldl2t, fldl2e, fldpi, fldlg2, fldln2, fldz, (FUNC_RC ) FPU_illegal + fld1, fldl2t, fldl2e, fldpi, fldlg2, fldln2, fldz, FPU_RC_illegal };void fconst (void )
Signature · 1 line
2.39.2
PATCH 9/12 kbuild: enable -Wcast-function-type-strict unconditionally
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
All known function cast warnings are now addressed, so the warning can be enabled globally to catch new ones more quickly.
--- scripts/Makefile.extrawarn | 1 - 1 file changed, 1 deletion(-)
scripts/Makefile.extrawarn +0 -1
@@ -122,7 +122,6 @@ endif KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access) -KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict) KBUILD_CFLAGS += -Wno-enum-compare-conditional KBUILD_CFLAGS += -Wno-enum-enum-conversion endif
Signature · 1 line
2.39.2
PATCH 10/12 sata: sx4: fix pdc20621_get_from_dimm() on 64-bit
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
gcc warns about a memcpy() with overlapping pointers because of an incorrect size calculation:
In file included from include/linux/string.h:369,
from drivers/ata/sata_sx4.c:66:
In function 'memcpy_fromio',
inlined from 'pdc20621_get_from_dimm.constprop' at drivers/ata/sata_sx4.c:962:2:
include/linux/fortify-string.h:97:33: error: '__builtin_memcpy' accessing 4294934464 bytes at offsets 0 and [16, 16400] overlaps 6442385281 bytes at offset -2147450817 [-Werror=restrict]
97 | #define __underlying_memcpy __builtin_memcpy
| ^
include/linux/fortify-string.h:620:9: note: in expansion of macro '__underlying_memcpy'
620 | __underlying_##op(p, q, __fortify_size); \
| ^~~~~~~~~~~~~
include/linux/fortify-string.h:665:26: note: in expansion of macro '__fortify_memcpy_chk'
665 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \
| ^~~~~~~~~~~~~~~~~~~~
include/asm-generic/io.h:1184:9: note: in expansion of macro 'memcpy'
1184 | memcpy(buffer, __io_virt(addr), size);
| ^~~~~~The problem here is the overflow of an unsigned 32-bit number to a negative that gets converted into a signed 'long', keeping a large positive number.
Replace the complex calculation with a more readable min() variant that avoids the warning.
--- drivers/ata/sata_sx4.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/ata/sata_sx4.c +2 -4
@@ -957,8 +957,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource, offset -= (idx * window_size); idx++; - dist = ((long ) (window_size - (offset + size))) >=0 ? size : - (long ) (window_size - offset); + dist =min (size, window_size - offset);memcpy_fromio (psource, dimm_mmio + offset /4 , dist); psource += dist;
@@ -1005,8 +1004,7 @@ static void pdc20621_put_to_dimm(struct ata_host *host, void *psource,readl (mmio +PDC_DIMM_WINDOW_CTLR ); offset -= (idx * window_size); idx++; - dist = ((long )(s32)(window_size - (offset + size))) >=0 ? size : - (long ) (window_size - offset); + dist =min (size, window_size - offset);memcpy_toio (dimm_mmio + offset /4 , psource, dist);writel (0x01 , mmio +PDC_GENERAL_CTLR );readl (mmio +PDC_GENERAL_CTLR );
Signature · 1 line
2.39.2
Re: [PATCH 10/12] sata: sx4: fix pdc20621_get_from_dimm() on 64-bit
Quoted 22 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
gcc warns about a
memcpy()with overlapping pointers because of an incorrect size calculation:In file included from
include/linux/string.h:369,from drivers/ata/sata_sx4.c:66: In function 'memcpy_fromio', inlined from 'pdc20621_get_from_dimm.constprop' at drivers/ata/sata_sx4.c:962:2: include/linux/fortify-string.h:97:33: error: '__builtin_memcpy' accessing 4294934464 bytes at offsets 0 and [16, 16400] overlaps 6442385281 bytes at offset -2147450817 [-Werror=restrict] 97 | #define __underlying_memcpy __builtin_memcpy | ^ include/linux/fortify-string.h:620:9: note: in expansion of macro '__underlying_memcpy' 620 | __underlying_##op(p, q, __fortify_size); \ | ^~~~~~~~~~~~~ include/linux/fortify-string.h:665:26: note: in expansion of macro '__fortify_memcpy_chk' 665 | #define memcpy(p, q, s) __fortify_memcpy_chk(p, q, s, \ | ^~~~~~~~~~~~~~~~~~~~ include/asm-generic/io.h:1184:9: note: in expansion of macro 'memcpy' 1184 | memcpy(buffer, __io_virt(addr), size); | ^~~~~~
Quoted 8 lines
The problem here is the overflow of an unsigned 32-bit number to a negative that gets converted into a signed 'long', keeping a large positive number.
Replace the complex calculation with a more readable
min()variant that avoids the warning.Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
That is old :)
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
Looks good to me. I can take the patch through libata tree, unless you prefer taking the whole series ?
In case it is the latter:
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 10/12] sata: sx4: fix pdc20621_get_from_dimm() on 64-bit
Quoted 6 lines · Damien Le Moal
Quoted 1 line · Arnd Bergmann
Signed-off-by Arnd Bergmann <[email protected]>Looks good to me. I can take the patch through libata tree, unless you prefer taking the whole series ?
Please merge it through your tree.
Quoted 4 lines
In case it is the latter:
Acked-by Damien Le Moal <[email protected]>
Thanks,
Arnd
Re: [PATCH 10/12] sata: sx4: fix pdc20621_get_from_dimm() on 64-bit
Quoted 9 lines · Arnd Bergmann
Quoted 6 lines · Damien Le Moal
Quoted 1 line · Arnd Bergmann
Signed-off-by Arnd Bergmann <[email protected]>Looks good to me. I can take the patch through libata tree, unless you prefer taking the whole series ?
Please merge it through your tree.
Applied to for-6.9-fixes with a fixed up patch title prefix ("ata: sata_sx4:
..."). Thanks !
Quoted 9 lines
Quoted 5 lines
In case it is the latter:
Acked-by Damien Le Moal <[email protected]>Thanks,
Arnd
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v4 11/12 kallsyms: rework symbol lookup return codes
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Building with W=1 in some configurations produces a false positive warning for kallsyms:
kernel/kallsyms.c: In function '__sprint_symbol.isra':kernel/kallsyms.c:503:17: error: 'strcpy' source argument is the same as destination [-Werror=restrict]
503 | strcpy(buffer, name);
| ^~~~~~~~~~~~~~~~~~~~This originally showed up while building with -O3, but later started happening in other configurations as well, depending on inlining decisions. The underlying issue is that the local 'name' variable is always initialized to the be the same as 'buffer' in the called functions that fill the buffer, which gcc notices while inlining, though it could see that the address check always skips the copy.
The calling conventions here are rather unusual, as all of the internal lookup functions (bpf_address_lookup, ftrace_mod_address_lookup, ftrace_func_address_lookup, module_address_lookup and kallsyms_lookup_buildid) already use the provided buffer and either return the address of that buffer to indicate success, or NULL for failure, but the callers are written to also expect an arbitrary other buffer to be returned.
Rework the calling conventions to return the length of the filled buffer instead of its address, which is simpler and easier to follow as well as avoiding the warning. Leave only the kallsyms_lookup() calling conventions unchanged, since that is called from 16 different functions and adapting this would be a much bigger change.
---
v4: fix string length
v3: use strscpy() instead of strlcpy()
v2: complete rewrite after the first patch was rejected (in 2020). This
is now one of only two warnings that are in the way of enabling -Wextra/-Wrestrict by default.
--- include/linux/filter.h | 14 +++++++------- include/linux/ftrace.h | 6 +++--- include/linux/module.h | 14 +++++++------- kernel/bpf/core.c | 7 +++---- kernel/kallsyms.c | 23 ++++++++++++----------- kernel/module/kallsyms.c | 26 +++++++++++++------------- kernel/trace/ftrace.c | 13 +++++-------- 7 files changed, 50 insertions(+), 53 deletions(-)
include/linux/filter.h +7 -7
@@ -1168,18 +1168,18 @@ static inline bool bpf_jit_kallsyms_enabled(void)return false; } -const char *__bpf_address_lookup (unsigned long addr,unsigned long *size, +int __bpf_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char *sym);bool is_bpf_text_address (unsigned long addr);int bpf_get_kallsym (unsigned int symnum,unsigned long *value,char *type,char *sym);struct bpf_prog *bpf_prog_ksym_find (unsigned long addr); -static inline const char * +static inline int bpf_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char **modname,char *sym) { -const char *ret =__bpf_address_lookup (addr, size, off, sym); +int ret =__bpf_address_lookup (addr, size, off, sym);if (ret && modname) *modname =NULL ;
@@ -1223,11 +1223,11 @@ static inline bool bpf_jit_kallsyms_enabled(void)return false; } -static inline const char * +static inline int __bpf_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char *sym) { -return NULL ; +return 0 ; }static inline bool is_bpf_text_address (unsigned long addr)
@@ -1246,11 +1246,11 @@ static inline struct bpf_prog *bpf_prog_ksym_find(unsigned long addr)return NULL ; } -static inline const char * +static inline int bpf_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char **modname,char *sym) { -return NULL ; +return 0 ; }static inline void bpf_prog_kallsyms_add (struct bpf_prog *fp)
include/linux/ftrace.h +3 -3
@@ -87,15 +87,15 @@ struct ftrace_direct_func;#if defined(CONFIG_FUNCTION_TRACER ) && defined(CONFIG_MODULES ) && \ defined(CONFIG_DYNAMIC_FTRACE ) -const char * +int ftrace_mod_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char **modname,char *sym);#else -static inline const char * +static inline int ftrace_mod_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char **modname,char *sym) { -return NULL ; +return 0 ; }#endif
include/linux/module.h +7 -7
@@ -922,11 +922,11 @@ int module_kallsyms_on_each_symbol(const char *modname,* least KSYM_NAME_LEN long: a pointer to namebuf is returned if * found, otherwise NULL. */ -const char *module_address_lookup (unsigned long addr, -unsigned long *symbolsize, -unsigned long *offset, -char **modname,const unsigned char **modbuildid, -char *namebuf); +int module_address_lookup (unsigned long addr, +unsigned long *symbolsize, +unsigned long *offset, +char **modname,const unsigned char **modbuildid, +char *namebuf);int lookup_module_symbol_name (unsigned long addr,char *symname); int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size,
@@ -955,14 +955,14 @@ static inline int module_kallsyms_on_each_symbol(const char *modname, }/* For kallsyms to ask for address resolution. NULL means not found. */ -static inline const char *module_address_lookup (unsigned long addr, +static inline int module_address_lookup (unsigned long addr,unsigned long *symbolsize,unsigned long *offset,char **modname,const unsigned char **modbuildid,char *namebuf) { -return NULL ; +return 0 ; }static inline int lookup_module_symbol_name (unsigned long addr,char *symname)
kernel/bpf/core.c +3 -4
@@ -735,11 +735,11 @@ static struct bpf_ksym *bpf_ksym_find(unsigned long addr) return n ? container_of(n, struct bpf_ksym, tnode) : NULL; } -const char *__bpf_address_lookup (unsigned long addr,unsigned long *size, +int __bpf_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char *sym) {struct bpf_ksym *ksym; -char *ret =NULL ; +int ret =0 ;rcu_read_lock (); ksym =bpf_ksym_find (addr);
@@ -747,9 +747,8 @@ const char *__bpf_address_lookup(unsigned long addr, unsigned long *size,unsigned long symbol_start = ksym->start;unsigned long symbol_end = ksym->end; -strncpy (sym, ksym->name,KSYM_NAME_LEN ); + ret =strscpy (sym, ksym->name,KSYM_NAME_LEN ); - ret = sym;if (size) *size = symbol_end - symbol_start;if (off)
kernel/kallsyms.c +12 -11
@@ -394,12 +394,12 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize, !!__bpf_address_lookup (addr, symbolsize, offset, namebuf); } -static const char *kallsyms_lookup_buildid (unsigned long addr, +static int kallsyms_lookup_buildid (unsigned long addr,unsigned long *symbolsize,unsigned long *offset,char **modname,const unsigned char **modbuildid,char *namebuf) { -const char *ret; +int ret; namebuf[KSYM_NAME_LEN -1 ] =0 ; namebuf[0 ] =0 ;
@@ -416,7 +416,7 @@ static const char *kallsyms_lookup_buildid(unsigned long addr,if (modbuildid) *modbuildid =NULL ; - ret = namebuf; + ret =strlen (namebuf); goto found; }
@@ -448,8 +448,13 @@ const char *kallsyms_lookup(unsigned long addr,unsigned long *offset, char **modname, char *namebuf) { - return kallsyms_lookup_buildid(addr, symbolsize, offset, modname, -NULL ,namebuf ); + int ret = kallsyms_lookup_buildid(addr, symbolsize, offset, modname, +NULL , namebuf); + +if (!ret) +return NULL ; + +return namebuf; }int lookup_symbol_name (unsigned long addr,char *symname)
@@ -484,19 +489,15 @@ static int __sprint_symbol(char *buffer, unsigned long address, {char *modname;const unsigned char *buildid; -const char *name;unsigned long offset, size;int len; address += symbol_offset; - name =kallsyms_lookup_buildid (address, &size, &offset, &modname, &buildid, + len =kallsyms_lookup_buildid (address, &size, &offset, &modname, &buildid, buffer); -if (!name) +if (!len)return sprintf (buffer,"0x%lx" , address - symbol_offset); -if (name != buffer) -strcpy (buffer, name); - len =strlen (buffer); offset -= symbol_offset;if (add_offset)
kernel/module/kallsyms.c +13 -13
@@ -321,14 +321,15 @@ void * __weak dereference_module_function_descriptor(struct module *mod,* For kallsyms to ask for address resolution. NULL means not found. Careful * not to lock to avoid deadlock on oopses, simply disable preemption. */ -const char *module_address_lookup (unsigned long addr, -unsigned long *size, -unsigned long *offset, -char **modname, -const unsigned char **modbuildid, -char *namebuf) +int module_address_lookup (unsigned long addr, +unsigned long *size, +unsigned long *offset, +char **modname, +const unsigned char **modbuildid, +char *namebuf) { -const char *ret =NULL ; +const char *sym; +int ret =0 ;struct module *mod;preempt_disable ();
@@ -344,13 +345,12 @@ const char *module_address_lookup(unsigned long addr,#endif } - ret =find_kallsyms_symbol (mod, addr, size, offset); - } -/* Make a copy in here where it's safe */ -if (ret) { -strncpy (namebuf, ret,KSYM_NAME_LEN -1 ); - ret = namebuf; + sym =find_kallsyms_symbol (mod, addr, size, offset); + +if (sym) + ret =strscpy (namebuf, sym,KSYM_NAME_LEN ); } +preempt_enable ();return ret;
kernel/trace/ftrace.c +5 -8
@@ -6970,7 +6970,7 @@ allocate_ftrace_mod_map(struct module *mod,return mod_map; } -static const char * +static int ftrace_func_address_lookup (struct ftrace_mod_map *mod_map,unsigned long addr,unsigned long *size,unsigned long *off,char *sym)
@@ -6991,21 +6991,18 @@ ftrace_func_address_lookup(struct ftrace_mod_map *mod_map, *size = found_func->size;if (off) *off = addr - found_func->ip; -if (sym) -strscpy (sym, found_func->name,KSYM_NAME_LEN ); - -return found_func->name; +return strscpy (sym, found_func->name,KSYM_NAME_LEN ); } -return NULL ; +return 0 ; } -const char * +int ftrace_mod_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char **modname,char *sym) {struct ftrace_mod_map *mod_map; -const char *ret =NULL ; +int ret;/* mod_map is freed via call_rcu() */ preempt_disable ();
Signature · 1 line
2.39.2
Steven Rostedt
maintainerRe: [PATCH 11/12] [v4] kallsyms: rework symbol lookup return codes
kernel/trace/ftrace.c ftrace_func_address_lookup(struct ftrace_mod_map *mod_map, · line 7005
Quoted 8 lines · On Tue, 26 Mar 2024 15:53:38 +0100 Arnd Bergmann <[email protected]> wrote:
kernel/trace/ftrace.c +2
-2-const char * +int ftrace_mod_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char **modname,char *sym) {struct ftrace_mod_map *mod_map; -const char *ret =NULL ; +int ret;
This needs to be ret = 0;
kernel/trace/ftrace.c ftrace_func_address_lookup(struct ftrace_mod_map *mod_map, · line 7008
Quoted 3 lines
kernel/trace/ftrace.c +0
-0/* mod_map is freed via call_rcu() */ preempt_disable ();
As here we have:
list_for_each_entry_rcu(mod_map, &ftrace_mod_maps, list) {
ret = ftrace_func_address_lookup(mod_map, addr, size, off, sym);
if (ret) {
if (modname)
*modname = mod_map->mod->name;
break;
}
}
preempt_enable();
return ret;
}Where it is possible for the loop never to be executed.
-- Steve
Re: [PATCH 11/12] [v4] kallsyms: rework symbol lookup return codes
Quoted 13 lines · Steven Rostedt
kernel/trace/ftrace.c ftrace_func_address_lookup(struct ftrace_mod_map *mod_map, · line 7005
Quoted 8 lines · On Tue, 26 Mar 2024 15:53:38 +0100 Arnd Bergmann <[email protected]> wrote:
kernel/trace/ftrace.c +2
-2-const char * +int ftrace_mod_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char **modname,char *sym) {struct ftrace_mod_map *mod_map; -const char *ret =NULL ; +int ret;This needs to be ret = 0;
Fixed now, thanks!
I'll send a v5 in a few days
Arnd
PATCH 12/12 kbuild: turn on -Wrestrict by default
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
All known -Wrestrict warnings are addressed now, so don't disable the warning any more.
--- scripts/Makefile.extrawarn | 1 - 1 file changed, 1 deletion(-)
scripts/Makefile.extrawarn +0 -1
@@ -97,7 +97,6 @@ else # Suppress them by using -Wno... except for W=1. KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable) KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable) -KBUILD_CFLAGS += $(call cc-disable-warning, restrict) KBUILD_CFLAGS += $(call cc-disable-warning, packed-not-aligned) KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
Signature · 1 line
2.39.2