- Kernel - mailweb.openeuler.org

[PATCH openEuler-1.0-LTS] compiler.h: fix barrier_data() on clang
by Yang Yingliang 09 Nov '21

09 Nov '21

From: Arvind Sankar <nivedita(a)alum.mit.edu> stable inclusion from linux-4.19.164 commit b207caff4176e3a6ba273243da2db2e595e4aad2 CVE: CVE-2021-0938 -------------------------------- commit 3347acc6fcd4ee71ad18a9ff9d9dac176b517329 upstream. Commit 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") neglected to copy barrier_data() from compiler-gcc.h into compiler-clang.h. The definition in compiler-gcc.h was really to work around clang's more aggressive optimization, so this broke barrier_data() on clang, and consequently memzero_explicit() as well. For example, this results in at least the memzero_explicit() call in lib/crypto/sha256.c:sha256_transform() being optimized away by clang. Fix this by moving the definition of barrier_data() into compiler.h. Also move the gcc/clang definition of barrier() into compiler.h, __memory_barrier() is icc-specific (and barrier() is already defined using it in compiler-intel.h) and doesn't belong in compiler.h. [rdunlap(a)infradead.org: fix ALPHA builds when SMP is not enabled] Link: https://lkml.kernel.org/r/20201101231835.4589-1-rdunlap@infradead.org Fixes: 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") Signed-off-by: Arvind Sankar <nivedita(a)alum.mit.edu> Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Tested-by: Nick Desaulniers <ndesaulniers(a)google.com> Reviewed-by: Nick Desaulniers <ndesaulniers(a)google.com> Reviewed-by: Kees Cook <keescook(a)chromium.org> Cc: <stable(a)vger.kernel.org> Link: https://lkml.kernel.org/r/20201014212631.207844-1-nivedita@alum.mit.edu Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> [nd: backport to account for missing commit e506ea451254a ("compiler.h: Split {READ,WRITE}_ONCE definitions out into rwonce.h") commit d08b9f0ca6605 ("scs: Add support for Clang's Shadow Call Stack (SCS)") commit a3f8a30f3f00 ("Compiler Attributes: use feature checks instead of version checks")] Signed-off-by: Nick Desaulniers <ndesaulniers(a)google.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Cheng Jian <cj.chengjian(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/linux/compiler-clang.h | 1 - include/linux/compiler-gcc.h | 19 ------------------- include/linux/compiler.h | 18 ++++++++++++++++-- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h index d756f2318efe0..2d6e5e4bb5d93 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -39,7 +39,6 @@ * and may be redefined here because they should not be shared with other * compilers, like ICC. */ -#define barrier() __asm__ __volatile__("" : : : "memory") #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) #define __assume_aligned(a, ...) \ __attribute__((__assume_aligned__(a, ## __VA_ARGS__))) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 3ebee1ce6f982..14be095371093 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -14,25 +14,6 @@ # error Sorry, your compiler is too old - please upgrade it. #endif -/* Optimization barrier */ - -/* The "volatile" is due to gcc bugs */ -#define barrier() __asm__ __volatile__("": : :"memory") -/* - * This version is i.e. to prevent dead stores elimination on @ptr - * where gcc and llvm may behave differently when otherwise using - * normal barrier(): while gcc behavior gets along with a normal - * barrier(), llvm needs an explicit input variable to be assumed - * clobbered. The issue is as follows: while the inline asm might - * access any memory it wants, the compiler could have fit all of - * @ptr into memory registers instead, and since @ptr never escaped - * from that, it proved that the inline asm wasn't touching any of - * it. This version works well with both compilers, i.e. we're telling - * the compiler that the inline asm absolutely may see the contents - * of @ptr. See also: https://llvm.org/bugs/show_bug.cgi?id=15495 - */ -#define barrier_data(ptr) __asm__ __volatile__("": :"r"(ptr) :"memory") - /* * This macro obfuscates arithmetic on a variable address so that gcc * shouldn't recognize the original var, and make assumptions about it. diff --git a/include/linux/compiler.h b/include/linux/compiler.h index bb22908c79e83..0e769548e14f8 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -79,11 +79,25 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, /* Optimization barrier */ #ifndef barrier -# define barrier() __memory_barrier() +/* The "volatile" is due to gcc bugs */ +# define barrier() __asm__ __volatile__("": : :"memory") #endif #ifndef barrier_data -# define barrier_data(ptr) barrier() +/* + * This version is i.e. to prevent dead stores elimination on @ptr + * where gcc and llvm may behave differently when otherwise using + * normal barrier(): while gcc behavior gets along with a normal + * barrier(), llvm needs an explicit input variable to be assumed + * clobbered. The issue is as follows: while the inline asm might + * access any memory it wants, the compiler could have fit all of + * @ptr into memory registers instead, and since @ptr never escaped + * from that, it proved that the inline asm wasn't touching any of + * it. This version works well with both compilers, i.e. we're telling + * the compiler that the inline asm absolutely may see the contents + * of @ptr. See also: https://llvm.org/bugs/show_bug.cgi?id=15495 + */ +# define barrier_data(ptr) __asm__ __volatile__("": :"r"(ptr) :"memory") #endif /* workaround for GCC PR82365 if needed */ -- 2.25.1

1 0

[PATCH openEuler-5.10] spfc: Fix compile errors when O=xxx is specified
by Zheng Zengkai 09 Nov '21

09 Nov '21

From: Yanling Song <songyl(a)ramaxel.com> Ramaxel inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4DBD7 CVE: NA ----------------------------------------- Fix two compile errors: 1. Compile failed when O=xxx is specified; 2. Compile conflicted when spfc and spnic are compiled in parallel by -j option because they share some .c files. make O=tmp -j200 > build.log In file included from ../drivers/scsi/spfc/hw/spfc_utils.c:4:0: ../drivers/scsi/spfc/hw/spfc_utils.h:7:10: fatal error: unf_type.h: No such file or directory #include "unf_type.h" ^~~~~~~~~~~~ compilation terminated. make[4]: *** [drivers/scsi/spfc/hw/spfc_utils.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [drivers/scsi/spfc] Error 2 make[3]: *** Waiting for unfinished jobs.... ../drivers/net/ethernet/ramaxel/spnic/spnic_sriov.c:9:10: fatal error: sphw_common.h: No such file or directory #include "sphw_common.h" ^~~~~~~~~~~~~~~ compilation terminated. Signed-off-by: Yanling Song <songyl(a)ramaxel.com> Reviewed-by: Zhang Lei<zhanglei48(a)huawei.com> [zzk: Adjusted commit message] Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/net/ethernet/ramaxel/spnic/Makefile | 2 +- drivers/scsi/spfc/Makefile | 30 ++++++++++----------- drivers/scsi/spfc/sphw_api_cmd.c | 1 + drivers/scsi/spfc/sphw_cmdq.c | 1 + drivers/scsi/spfc/sphw_common.c | 1 + drivers/scsi/spfc/sphw_eqs.c | 1 + drivers/scsi/spfc/sphw_hw_cfg.c | 1 + drivers/scsi/spfc/sphw_hw_comm.c | 1 + drivers/scsi/spfc/sphw_hwdev.c | 1 + drivers/scsi/spfc/sphw_hwif.c | 1 + drivers/scsi/spfc/sphw_mbox.c | 1 + drivers/scsi/spfc/sphw_mgmt.c | 1 + drivers/scsi/spfc/sphw_prof_adap.c | 1 + drivers/scsi/spfc/sphw_wq.c | 1 + 14 files changed, 28 insertions(+), 16 deletions(-) create mode 120000 drivers/scsi/spfc/sphw_api_cmd.c create mode 120000 drivers/scsi/spfc/sphw_cmdq.c create mode 120000 drivers/scsi/spfc/sphw_common.c create mode 120000 drivers/scsi/spfc/sphw_eqs.c create mode 120000 drivers/scsi/spfc/sphw_hw_cfg.c create mode 120000 drivers/scsi/spfc/sphw_hw_comm.c create mode 120000 drivers/scsi/spfc/sphw_hwdev.c create mode 120000 drivers/scsi/spfc/sphw_hwif.c create mode 120000 drivers/scsi/spfc/sphw_mbox.c create mode 120000 drivers/scsi/spfc/sphw_mgmt.c create mode 120000 drivers/scsi/spfc/sphw_prof_adap.c create mode 120000 drivers/scsi/spfc/sphw_wq.c diff --git a/drivers/net/ethernet/ramaxel/spnic/Makefile b/drivers/net/ethernet/ramaxel/spnic/Makefile index f86ccff374f6..207e1d9c431a 100644 --- a/drivers/net/ethernet/ramaxel/spnic/Makefile +++ b/drivers/net/ethernet/ramaxel/spnic/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SPNIC) += spnic.o -subdir-ccflags-y += -I$(src)/hw +subdir-ccflags-y += -I$(srctree)/$(src)/hw spnic-objs := hw/sphw_common.o \ hw/sphw_hwif.o \ diff --git a/drivers/scsi/spfc/Makefile b/drivers/scsi/spfc/Makefile index 02fe0213e048..849b730ac733 100644 --- a/drivers/scsi/spfc/Makefile +++ b/drivers/scsi/spfc/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SPFC) += spfc.o -subdir-ccflags-y += -I$(src)/../../net/ethernet/ramaxel/spnic/hw -subdir-ccflags-y += -I$(src)/hw -subdir-ccflags-y += -I$(src)/common +subdir-ccflags-y += -I$(srctree)/$(src)/../../net/ethernet/ramaxel/spnic/hw +subdir-ccflags-y += -I$(srctree)/$(src)/hw +subdir-ccflags-y += -I$(srctree)/$(src)/common spfc-objs := common/unf_init.o \ common/unf_event.o \ @@ -33,15 +33,15 @@ spfc-objs := common/unf_init.o \ hw/spfc_cqm_bitmap_table.o \ hw/spfc_cqm_main.o \ hw/spfc_cqm_object.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hwdev.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hw_comm.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_prof_adap.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_common.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hwif.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_wq.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_eqs.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_mbox.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_api_cmd.o + sphw_hwdev.o \ + sphw_hw_cfg.o \ + sphw_hw_comm.o \ + sphw_prof_adap.o \ + sphw_common.o \ + sphw_hwif.o \ + sphw_wq.o \ + sphw_cmdq.o \ + sphw_eqs.o \ + sphw_mbox.o \ + sphw_mgmt.o \ + sphw_api_cmd.o diff --git a/drivers/scsi/spfc/sphw_api_cmd.c b/drivers/scsi/spfc/sphw_api_cmd.c new file mode 120000 index 000000000000..27c7c0770fa3 --- /dev/null +++ b/drivers/scsi/spfc/sphw_api_cmd.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_api_cmd.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_cmdq.c b/drivers/scsi/spfc/sphw_cmdq.c new file mode 120000 index 000000000000..5ac779ba274b --- /dev/null +++ b/drivers/scsi/spfc/sphw_cmdq.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_common.c b/drivers/scsi/spfc/sphw_common.c new file mode 120000 index 000000000000..a1a30a4840e1 --- /dev/null +++ b/drivers/scsi/spfc/sphw_common.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_common.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_eqs.c b/drivers/scsi/spfc/sphw_eqs.c new file mode 120000 index 000000000000..74430dcb9dc5 --- /dev/null +++ b/drivers/scsi/spfc/sphw_eqs.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_eqs.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hw_cfg.c b/drivers/scsi/spfc/sphw_hw_cfg.c new file mode 120000 index 000000000000..4f43d68624c1 --- /dev/null +++ b/drivers/scsi/spfc/sphw_hw_cfg.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hw_comm.c b/drivers/scsi/spfc/sphw_hw_comm.c new file mode 120000 index 000000000000..c943b3b2933a --- /dev/null +++ b/drivers/scsi/spfc/sphw_hw_comm.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hw_comm.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hwdev.c b/drivers/scsi/spfc/sphw_hwdev.c new file mode 120000 index 000000000000..b7279f17eaa2 --- /dev/null +++ b/drivers/scsi/spfc/sphw_hwdev.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hwdev.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hwif.c b/drivers/scsi/spfc/sphw_hwif.c new file mode 120000 index 000000000000..d40ef71f9033 --- /dev/null +++ b/drivers/scsi/spfc/sphw_hwif.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hwif.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_mbox.c b/drivers/scsi/spfc/sphw_mbox.c new file mode 120000 index 000000000000..1b00fe7289cc --- /dev/null +++ b/drivers/scsi/spfc/sphw_mbox.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_mbox.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_mgmt.c b/drivers/scsi/spfc/sphw_mgmt.c new file mode 120000 index 000000000000..fd18a73e9d3a --- /dev/null +++ b/drivers/scsi/spfc/sphw_mgmt.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_prof_adap.c b/drivers/scsi/spfc/sphw_prof_adap.c new file mode 120000 index 000000000000..fbc7db05dd27 --- /dev/null +++ b/drivers/scsi/spfc/sphw_prof_adap.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_prof_adap.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_wq.c b/drivers/scsi/spfc/sphw_wq.c new file mode 120000 index 000000000000..cdfcb3a610c0 --- /dev/null +++ b/drivers/scsi/spfc/sphw_wq.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_wq.c \ No newline at end of file -- 2.20.1

1 0

[PATCH OLK-5.10] SCSI:SPFC, NET:Ethernet:SPNIC: fix compile error
by Yanling Song 09 Nov '21

09 Nov '21

Ramaxel inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4DBD7 CVE: NA Fix two compile errors: 1. Compile failed when O=xxx is specified; 2. Compile confliction when spfc and spnic are compiled in parallel by -j option because they share some .c files Signed-off-by: Yanling Song <songyl(a)ramaxel.com> --- drivers/net/ethernet/ramaxel/spnic/Makefile | 2 +- drivers/scsi/spfc/Makefile | 30 ++++++++++----------- drivers/scsi/spfc/sphw_api_cmd.c | 1 + drivers/scsi/spfc/sphw_cmdq.c | 1 + drivers/scsi/spfc/sphw_common.c | 1 + drivers/scsi/spfc/sphw_eqs.c | 1 + drivers/scsi/spfc/sphw_hw_cfg.c | 1 + drivers/scsi/spfc/sphw_hw_comm.c | 1 + drivers/scsi/spfc/sphw_hwdev.c | 1 + drivers/scsi/spfc/sphw_hwif.c | 1 + drivers/scsi/spfc/sphw_mbox.c | 1 + drivers/scsi/spfc/sphw_mgmt.c | 1 + drivers/scsi/spfc/sphw_prof_adap.c | 1 + drivers/scsi/spfc/sphw_wq.c | 1 + 14 files changed, 28 insertions(+), 16 deletions(-) create mode 120000 drivers/scsi/spfc/sphw_api_cmd.c create mode 120000 drivers/scsi/spfc/sphw_cmdq.c create mode 120000 drivers/scsi/spfc/sphw_common.c create mode 120000 drivers/scsi/spfc/sphw_eqs.c create mode 120000 drivers/scsi/spfc/sphw_hw_cfg.c create mode 120000 drivers/scsi/spfc/sphw_hw_comm.c create mode 120000 drivers/scsi/spfc/sphw_hwdev.c create mode 120000 drivers/scsi/spfc/sphw_hwif.c create mode 120000 drivers/scsi/spfc/sphw_mbox.c create mode 120000 drivers/scsi/spfc/sphw_mgmt.c create mode 120000 drivers/scsi/spfc/sphw_prof_adap.c create mode 120000 drivers/scsi/spfc/sphw_wq.c diff --git a/drivers/net/ethernet/ramaxel/spnic/Makefile b/drivers/net/ethernet/ramaxel/spnic/Makefile index f86ccff374f6..207e1d9c431a 100644 --- a/drivers/net/ethernet/ramaxel/spnic/Makefile +++ b/drivers/net/ethernet/ramaxel/spnic/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SPNIC) += spnic.o -subdir-ccflags-y += -I$(src)/hw +subdir-ccflags-y += -I$(srctree)/$(src)/hw spnic-objs := hw/sphw_common.o \ hw/sphw_hwif.o \ diff --git a/drivers/scsi/spfc/Makefile b/drivers/scsi/spfc/Makefile index 02fe0213e048..849b730ac733 100644 --- a/drivers/scsi/spfc/Makefile +++ b/drivers/scsi/spfc/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SPFC) += spfc.o -subdir-ccflags-y += -I$(src)/../../net/ethernet/ramaxel/spnic/hw -subdir-ccflags-y += -I$(src)/hw -subdir-ccflags-y += -I$(src)/common +subdir-ccflags-y += -I$(srctree)/$(src)/../../net/ethernet/ramaxel/spnic/hw +subdir-ccflags-y += -I$(srctree)/$(src)/hw +subdir-ccflags-y += -I$(srctree)/$(src)/common spfc-objs := common/unf_init.o \ common/unf_event.o \ @@ -33,15 +33,15 @@ spfc-objs := common/unf_init.o \ hw/spfc_cqm_bitmap_table.o \ hw/spfc_cqm_main.o \ hw/spfc_cqm_object.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hwdev.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hw_comm.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_prof_adap.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_common.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_hwif.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_wq.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_eqs.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_mbox.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.o \ - ../../net/ethernet/ramaxel/spnic/hw/sphw_api_cmd.o + sphw_hwdev.o \ + sphw_hw_cfg.o \ + sphw_hw_comm.o \ + sphw_prof_adap.o \ + sphw_common.o \ + sphw_hwif.o \ + sphw_wq.o \ + sphw_cmdq.o \ + sphw_eqs.o \ + sphw_mbox.o \ + sphw_mgmt.o \ + sphw_api_cmd.o diff --git a/drivers/scsi/spfc/sphw_api_cmd.c b/drivers/scsi/spfc/sphw_api_cmd.c new file mode 120000 index 000000000000..27c7c0770fa3 --- /dev/null +++ b/drivers/scsi/spfc/sphw_api_cmd.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_api_cmd.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_cmdq.c b/drivers/scsi/spfc/sphw_cmdq.c new file mode 120000 index 000000000000..5ac779ba274b --- /dev/null +++ b/drivers/scsi/spfc/sphw_cmdq.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_common.c b/drivers/scsi/spfc/sphw_common.c new file mode 120000 index 000000000000..a1a30a4840e1 --- /dev/null +++ b/drivers/scsi/spfc/sphw_common.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_common.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_eqs.c b/drivers/scsi/spfc/sphw_eqs.c new file mode 120000 index 000000000000..74430dcb9dc5 --- /dev/null +++ b/drivers/scsi/spfc/sphw_eqs.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_eqs.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hw_cfg.c b/drivers/scsi/spfc/sphw_hw_cfg.c new file mode 120000 index 000000000000..4f43d68624c1 --- /dev/null +++ b/drivers/scsi/spfc/sphw_hw_cfg.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hw_comm.c b/drivers/scsi/spfc/sphw_hw_comm.c new file mode 120000 index 000000000000..c943b3b2933a --- /dev/null +++ b/drivers/scsi/spfc/sphw_hw_comm.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hw_comm.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hwdev.c b/drivers/scsi/spfc/sphw_hwdev.c new file mode 120000 index 000000000000..b7279f17eaa2 --- /dev/null +++ b/drivers/scsi/spfc/sphw_hwdev.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hwdev.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_hwif.c b/drivers/scsi/spfc/sphw_hwif.c new file mode 120000 index 000000000000..d40ef71f9033 --- /dev/null +++ b/drivers/scsi/spfc/sphw_hwif.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_hwif.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_mbox.c b/drivers/scsi/spfc/sphw_mbox.c new file mode 120000 index 000000000000..1b00fe7289cc --- /dev/null +++ b/drivers/scsi/spfc/sphw_mbox.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_mbox.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_mgmt.c b/drivers/scsi/spfc/sphw_mgmt.c new file mode 120000 index 000000000000..fd18a73e9d3a --- /dev/null +++ b/drivers/scsi/spfc/sphw_mgmt.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_prof_adap.c b/drivers/scsi/spfc/sphw_prof_adap.c new file mode 120000 index 000000000000..fbc7db05dd27 --- /dev/null +++ b/drivers/scsi/spfc/sphw_prof_adap.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_prof_adap.c \ No newline at end of file diff --git a/drivers/scsi/spfc/sphw_wq.c b/drivers/scsi/spfc/sphw_wq.c new file mode 120000 index 000000000000..cdfcb3a610c0 --- /dev/null +++ b/drivers/scsi/spfc/sphw_wq.c @@ -0,0 +1 @@ +../../net/ethernet/ramaxel/spnic/hw/sphw_wq.c \ No newline at end of file -- 2.27.0

2 1

【议题申报】主线特性DAMON（Data Access Monitor）回合
by zouyue (A) 09 Nov '21

09 Nov '21

DAMON(Data Access Monitor)特性议题申报 DAMON特性是一个能轻量级在线监控特定用户空间进程的内存访问情况的内核特性模块。通过基于region采样和自适应调整region大小两种核心机制，允许用户态和内核态两种策略定义模式，进行data access访问监控和内存优化管理。应用场景： 1．监控当前内存过负载或者过高的访问频率 2．内存管理优化： 1) 高访问频率的内存区域放到LRU列表头部 2) 低访问频率的内存区域调整到LRU列表尾部或者换出 3) 大内存消耗且高访问频率的区域可以使用较大页 3．监控一些低效率的进程间通信 DAMON总体框架如下： [cid:image003.png@01D7D54E.EA5ABEE0] 特性补丁链接: http://patchwork.huawei.com/project/olk5.10/list/?series=20179

1 0

[PATCH openEuler-1.0-LTS 1/7] ath: Use safer key clearing with key cache entries
by Yang Yingliang 08 Nov '21

08 Nov '21

From: Jouni Malinen <jouni(a)codeaurora.org> stable inclusion from linux-4.19.205 commit dd5815f023b89c9a28325d8a2a5f0779b57b7190 CVE: CVE-2020-3702 -------------------------------- commit 56c5485c9e444c2e85e11694b6c44f1338fc20fd upstream. It is possible for there to be pending frames in TXQs with a reference to the key cache entry that is being deleted. If such a key cache entry is cleared, those pending frame in TXQ might get transmitted without proper encryption. It is safer to leave the previously used key into the key cache in such cases. Instead, only clear the MAC address to prevent RX processing from using this key cache entry. This is needed in particularly in AP mode where the TXQs cannot be flushed on station disconnection. This change alone may not be able to address all cases where the key cache entry might get reused for other purposes immediately (the key cache entry should be released for reuse only once the TXQs do not have any remaining references to them), but this makes it less likely to get unprotected frames and the more complete changes may end up being significantly more complex. Signed-off-by: Jouni Malinen <jouni(a)codeaurora.org> Signed-off-by: Kalle Valo <kvalo(a)codeaurora.org> Link: https://lore.kernel.org/r/20201214172118.18100-2-jouni@codeaurora.org Cc: Pali Rohár <pali(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/wireless/ath/key.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c index 1816b4e7dc264..59618bb41f6c5 100644 --- a/drivers/net/wireless/ath/key.c +++ b/drivers/net/wireless/ath/key.c @@ -583,7 +583,16 @@ EXPORT_SYMBOL(ath_key_config); */ void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key) { - ath_hw_keyreset(common, key->hw_key_idx); + /* Leave CCMP and TKIP (main key) configured to avoid disabling + * encryption for potentially pending frames already in a TXQ with the + * keyix pointing to this key entry. Instead, only clear the MAC address + * to prevent RX processing from using this key cache entry. + */ + if (test_bit(key->hw_key_idx, common->ccmp_keymap) || + test_bit(key->hw_key_idx, common->tkip_keymap)) + ath_hw_keysetmac(common, key->hw_key_idx, NULL); + else + ath_hw_keyreset(common, key->hw_key_idx); if (key->hw_key_idx < IEEE80211_WEP_NKID) return; -- 2.25.1

1 6

[PATCH kernel-4.19] vfs: move cap_convert_nscap() call into vfs_setxattr()
by zhangyue 08 Nov '21

08 Nov '21

mainline inclusion category: feature bugzilla:https://gitee.com/openeuler/kernel/issues/I4GVH3?from=project-issue CVE: NA cap_convert_nscap() does permission checking as well as conversion of the xattr value conditionally based on fs's user-ns. This is needed by overlayfs and probably other layered fs (ecryptfs) and is what vfs_foo() is supposed to do anyway. Signed-off-by: Miklos Szeredi <mszeredi(a)redhat.com> Acked-by: James Morris <jamorris(a)linux.microsoft.com> Signed-off-by: zhangyue <zhangyue1(a)kylinos.cn> --- fs/xattr.c | 18 ++++++++++++------ include/linux/capability.h | 2 +- security/commoncap.c | 3 +-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/fs/xattr.c b/fs/xattr.c index adb11cb82be5..653e12d6060f 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -263,8 +263,16 @@ vfs_setxattr(struct dentry *dentry, const char *name, const void *value, { struct inode *inode = dentry->d_inode; struct inode *delegated_inode = NULL; + const void *orig_value = value; int error; + if (size && strcmp(name, XATTR_NAME_CAPS) == 0) { + error = cap_convert_nscap(dentry, &value, size); + if (error < 0) + return error; + size = error; + } + retry_deleg: inode_lock(inode); error = __vfs_setxattr_locked(dentry, name, value, size, flags, @@ -276,6 +284,10 @@ vfs_setxattr(struct dentry *dentry, const char *name, const void *value, if (!error) goto retry_deleg; } + + if (value != orig_value) + kfree(value); + return error; } EXPORT_SYMBOL_GPL(vfs_setxattr); @@ -530,12 +542,6 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value, if ((strcmp(kname, XATTR_NAME_POSIX_ACL_ACCESS) == 0) || (strcmp(kname, XATTR_NAME_POSIX_ACL_DEFAULT) == 0)) posix_acl_fix_xattr_from_user(kvalue, size); - else if (strcmp(kname, XATTR_NAME_CAPS) == 0) { - error = cap_convert_nscap(d, &kvalue, size); - if (error < 0) - goto out; - size = error; - } } error = vfs_setxattr(d, kname, kvalue, size, flags); diff --git a/include/linux/capability.h b/include/linux/capability.h index f640dcbc880c..9fee9a86505c 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -249,6 +249,6 @@ extern bool ptracer_capable(struct task_struct *tsk, struct user_namespace *ns); /* audit system wants to get cap info from files as well */ extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps); -extern int cap_convert_nscap(struct dentry *dentry, void **ivalue, size_t size); +extern int cap_convert_nscap(struct dentry *dentry, const void **ivalue, size_t size); #endif /* !_LINUX_CAPABILITY_H */ diff --git a/security/commoncap.c b/security/commoncap.c index 876cfe01d939..83546a782796 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -498,7 +498,7 @@ static bool validheader(size_t size, const struct vfs_cap_data *cap) * * If all is ok, we return the new size, on error return < 0. */ -int cap_convert_nscap(struct dentry *dentry, void **ivalue, size_t size) +int cap_convert_nscap(struct dentry *dentry, const void **ivalue, size_t size) { struct vfs_ns_cap_data *nscap; uid_t nsrootid; @@ -541,7 +541,6 @@ int cap_convert_nscap(struct dentry *dentry, void **ivalue, size_t size) nscap->magic_etc = cpu_to_le32(nsmagic); memcpy(&nscap->data, &cap->data, sizeof(__le32) * 2 * VFS_CAP_U32); - kvfree(*ivalue); *ivalue = nscap; return newsize; } -- 2.30.0

1 0

[PATCH openEuler-1.0-LTS] ext4: if zeroout fails fall back to splitting the extent node
by Yang Yingliang 08 Nov '21

08 Nov '21

From: Theodore Ts'o <tytso(a)mit.edu> mainline inclusion from mainline-5.15-rc1 commit 308c57ccf4318236be75dfa251c84713e694457b category: bugfix bugzilla: 109297 CVE: NA --------------------------- If the underlying storage device is using thin-provisioning, it's possible for a zeroout operation to return ENOSPC. Commit df22291ff0fd ("ext4: Retry block allocation if we have free blocks left") added logic to retry block allocation since we might get free block after we commit a transaction. But the ENOSPC from thin-provisioning will confuse ext4, and lead to an infinite loop. Since using zeroout instead of splitting the extent node is an optimization, if it fails, we might as well fall back to splitting the extent node. Reported-by: yangerkun <yangerkun(a)huawei.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Signed-off-by: yangerkun <yangerkun(a)huawei.com> Reviewed-by: Zhang Yi <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/ext4/extents.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index fc00a78163117..10298c13a67d7 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3696,7 +3696,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, split_map.m_len - ee_block); err = ext4_ext_zeroout(inode, &zero_ex1); if (err) - goto out; + goto fallback; split_map.m_len = allocated; } if (split_map.m_lblk - ee_block + split_map.m_len < @@ -3710,7 +3710,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, ext4_ext_pblock(ex)); err = ext4_ext_zeroout(inode, &zero_ex2); if (err) - goto out; + goto fallback; } split_map.m_len += split_map.m_lblk - ee_block; @@ -3719,6 +3719,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, } } +fallback: err = ext4_split_extent(handle, inode, ppath, &split_map, split_flag, flags); if (err > 0) -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS] dccp: don't duplicate ccid when cloning dccp sock
by Yang Yingliang 08 Nov '21

08 Nov '21

From: "Lin, Zhenpeng" <zplin(a)psu.edu> mainline inclusion from mainline-v5.15-rc2 commit d9ea761fdd197351890418acd462c51f241014a7 category: bugfix bugzilla: 85666 CVE: CVE-2020-16119 ------------------------------------------------- Commit 2677d2067731 ("dccp: don't free ccid2_hc_tx_sock ...") fixed a UAF but reintroduced CVE-2017-6074. When the sock is cloned, two dccps_hc_tx_ccid will reference to the same ccid. So one can free the ccid object twice from two socks after cloning. This issue was found by "Hadar Manor" as well and assigned with CVE-2020-16119, which was fixed in Ubuntu's kernel. So here I port the patch from Ubuntu to fix it. The patch prevents cloned socks from referencing the same ccid. Fixes: 2677d2067731410 ("dccp: don't free ccid2_hc_tx_sock ...") Signed-off-by: Zhenpeng Lin <zplin(a)psu.edu> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Lu Wei <luwei32(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/dccp/minisocks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index ba6fc3c1186b9..e91838a7b8497 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c @@ -98,6 +98,8 @@ struct sock *dccp_create_openreq_child(const struct sock *sk, newdp->dccps_role = DCCP_ROLE_SERVER; newdp->dccps_hc_rx_ackvec = NULL; newdp->dccps_service_list = NULL; + newdp->dccps_hc_rx_ccid = NULL; + newdp->dccps_hc_tx_ccid = NULL; newdp->dccps_service = dreq->dreq_service; newdp->dccps_timestamp_echo = dreq->dreq_timestamp_echo; newdp->dccps_timestamp_time = dreq->dreq_timestamp_time; -- 2.25.1

1 0

[PATCH openEuler-1.0-LTS 01/14] Revert "selftests/bpf: add test_spec_readahead_xfs_file to support specail async readahead"
by Yang Yingliang 05 Nov '21

05 Nov '21

From: Hou Tao <houtao1(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4H3JT CVE: NA --------------------------- There are two issues with the current solution: 1) tracepoint xfs_read_file is visible in tracefs It forms an ABI for userspace. It is bad because new field may be added into xfs_writable_file to export more information to userspace. 2) tracepoint xfs_read_file is specific to xfs HDFS can be stacked on ext4. A new solution is proposed which uses vfs bare tracepoint, so reverts commit 69513cfbe62d267c4a5e6025f31741b1f2cb946c. Signed-off-by: Hou Tao <houtao1(a)huawei.com> Reviewed-by: Kuohai Xu <xukuohai(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- tools/include/uapi/linux/xfs.h | 1 - tools/testing/selftests/bpf/Makefile | 3 +- .../bpf/test_spec_readahead_xfs_file.c | 39 ------------------- tools/testing/selftests/bpf/test_xfs_file.c | 9 +---- 4 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 tools/testing/selftests/bpf/test_spec_readahead_xfs_file.c diff --git a/tools/include/uapi/linux/xfs.h b/tools/include/uapi/linux/xfs.h index 1409b45affd34..a0d37e411ee18 100644 --- a/tools/include/uapi/linux/xfs.h +++ b/tools/include/uapi/linux/xfs.h @@ -6,7 +6,6 @@ #define FMODE_RANDOM (0x1000) #define FMODE_WILLNEED (0x400000) -#define FMODE_SPC_READAHEAD (0x800000) struct xfs_writable_file { const unsigned char *name; diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 46b1d5b864f5a..8d2737285f185 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -36,8 +36,7 @@ TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test test_get_stack_rawtp.o test_sockmap_kern.o test_sockhash_kern.o \ test_lwt_seg6local.o sendmsg4_prog.o sendmsg6_prog.o test_lirc_mode2_kern.o \ get_cgroup_id_kern.o socket_cookie_prog.o test_select_reuseport_kern.o \ - test_skb_cgroup_id_kern.o test_set_xfs_file.o test_clear_xfs_file.o \ - test_spec_readahead_xfs_file.o + test_skb_cgroup_id_kern.o test_set_xfs_file.o test_clear_xfs_file.o # Order correspond to 'make run_tests' order TEST_PROGS := test_kmod.sh \ diff --git a/tools/testing/selftests/bpf/test_spec_readahead_xfs_file.c b/tools/testing/selftests/bpf/test_spec_readahead_xfs_file.c deleted file mode 100644 index ff8794a14cdcd..0000000000000 --- a/tools/testing/selftests/bpf/test_spec_readahead_xfs_file.c +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include <linux/bpf.h> -#include "bpf_helpers.h" -#include <string.h> -#include <linux/xfs.h> - -/* from /sys/kernel/debug/tracing/events/xfs/xfs_read_file */ -struct xfs_read_buffer_args { - struct xfs_writable_file *file; -}; - -SEC("tracepoint/xfs/xfs_file_read") -int bpf_prog1(struct xfs_read_buffer_args *ctx) -{ - char fmt[] = "name: %s, set f_mode: %u\n"; - struct xfs_writable_file *file = ctx->file; - char name[64] = {}; - char *tmp; - unsigned long i_size; - int len; - - bpf_probe_read(&tmp, 8, &(file->name)); - len = bpf_probe_read_str(name, 64, tmp); - bpf_probe_read(&i_size, 8, &(file->i_size)); - - if (!strncmp("blk_", name, 4)) { - /* blk_xxx.meta or blk_xxx with size < 2M */ - if (len == 27 || (len == 15 && i_size <= 2 * 1024 * 1024)) - file->f_mode |= FMODE_WILLNEED; - else if (len == 15) /* blk_xxx */ - file->f_mode |= FMODE_SPC_READAHEAD; - bpf_trace_printk(fmt, sizeof(fmt), name, file->f_mode); - } - return 0; -} - -char _license[] SEC("license") = "GPL"; -__u32 _version SEC("version") = 1; diff --git a/tools/testing/selftests/bpf/test_xfs_file.c b/tools/testing/selftests/bpf/test_xfs_file.c index 89e79d959677c..247c42be029b2 100644 --- a/tools/testing/selftests/bpf/test_xfs_file.c +++ b/tools/testing/selftests/bpf/test_xfs_file.c @@ -20,7 +20,6 @@ int main(int argc, char *argv[]) { const char *set_file = "./test_set_xfs_file.o"; const char *clear_file = "./test_clear_xfs_file.o"; - const char *spec_readahead_file = "./test_spec_readahead_xfs_file.o"; const char *file = set_file; struct bpf_object *obj; int efd, err, prog_fd; @@ -32,12 +31,8 @@ int main(int argc, char *argv[]) delay = strtol(str, &endptr, 10); } - if (argc >= 2) { - if (!strcmp("clear", argv[1])) - file = clear_file; - if (!strcmp("spec_readahead", argv[1])) - file = spec_readahead_file; - } + if (argc >= 2 && !strcmp("clear", argv[1])) + file = clear_file; err = bpf_prog_load(file, BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE, &obj, &prog_fd); -- 2.25.1

1 13

[PATCH OLK-5.10 v3] Net:NIC:SPNIC:Fix compile error when O= is specififed
by Yanling Song 05 Nov '21

05 Nov '21

Ramaxel inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4CBDP CVE: NA Net:NIC:SPNIC:Fix compile error when O= is specififed Signed-off-by: Yanling Song <songyl(a)ramaxel.com> --- Changes from V2: Move the location of "Changes from" Changes from V1: 1. Change category from feature to bugfix; 2. Add description --- drivers/net/ethernet/ramaxel/spnic/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ramaxel/spnic/Makefile b/drivers/net/ethernet/ramaxel/spnic/Makefile index f86ccff374f6..207e1d9c431a 100644 --- a/drivers/net/ethernet/ramaxel/spnic/Makefile +++ b/drivers/net/ethernet/ramaxel/spnic/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SPNIC) += spnic.o -subdir-ccflags-y += -I$(src)/hw +subdir-ccflags-y += -I$(srctree)/$(src)/hw spnic-objs := hw/sphw_common.o \ hw/sphw_hwif.o \ -- 2.27.0

1 0