- Kernel - mailweb.openeuler.org

[PATCH] Revert "net: hns3: fix for ping failed when resume from s3 or s4"
by Yonglong Liu 08 Sep '20

08 Sep '20

This reverts commit 4c6d4e21ed9b2309f15ef9074e80c7fc1c09ccfc. Because commit: 412c29318f9b ("net: hns3: refactor the MAC address configure") removed the operation of HNAE3_RESTORE_CLIENT. --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 6ee6b4e..823f161 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3858,10 +3858,6 @@ static int hclge_resume(struct hnae3_ae_dev *ae_dev) if (ret) goto err_reset_lock; - ret = hclge_notify_client(hdev, HNAE3_RESTORE_CLIENT); - if (ret) - goto err_reset_lock; - rtnl_unlock(); ret = hclge_notify_roce_client(hdev, HNAE3_INIT_CLIENT); -- 2.8.1

1 0

[PATCH 1/3] config: set config BLK_CGROUP_IOCOST default value
by Yang Yingliang 02 Sep '20

02 Sep '20

hulk inclusion category: feature bugzilla: 38688 CVE: NA --------------------------- set config BLK_CGROUP_IOCOST default value. Reviewed-by: zhangyi (F) <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/euleros_defconfig b/arch/arm64/configs/euleros_defconfig index 673dcb491a5ac..c0ec409e48ac7 100644 --- a/arch/arm64/configs/euleros_defconfig +++ b/arch/arm64/configs/euleros_defconfig @@ -795,6 +795,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 02090f911f17a..809f808363616 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -809,6 +809,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 49fd2e5c20185..1f18ab6957849 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -803,6 +803,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEBUG_FS_ZONED=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 747c6bd5967f2..912933ebd9817 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -883,6 +883,7 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLK_WBT=y # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_WBT_SQ is not set +# CONFIG_BLK_CGROUP_IOCOST is not set CONFIG_BLK_WBT_MQ=y CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_SED_OPAL is not set -- 2.25.1

1 2

[PATCH 00/28] ARMv8.3 pointer authentication
by Yang Yingliang 02 Sep '20

02 Sep '20

Firstly, this series improves function return address protection for the arm64 kernel, by compiling the kernel with ARMv8.3 Pointer Authentication instructions (referred ptrauth hereafter). This should help protect the kernel against attacks using return-oriented programming. Secondly, Suzuki's patches optimize checking and enabling cpu capabilities. Thirdly, three patches on kernel config enable ptrauth compiling and fix compile warnings. Finally, two patches of Mark Rutland and one patch of Marc Zyngier are necessary simplifications and cleanups. Amit Daniel Kachhap (9): arm64: cpufeature: Fix meta-capability cpufeature check arm64: ptrauth: Add bootup/runtime flags for __cpu_setup arm64: cpufeature: Move cpu capability helpers inside C file arm64: initialize ptrauth keys for kernel booting task arm64: mask PAC bits of __builtin_return_address arm64: __show_regs: strip PAC from lr in printk arm64: suspend: restore the kernel ptrauth keys lkdtm: arm64: test kernel pointer authentication arm64: Kconfig: ptrauth: Add binutils version check to fix mismatch Catalin Marinas (1): kbuild: Add support for 'as-instr' to be used in Kconfig files Kristina Martsenko (7): arm64: cpufeature: add pointer auth meta-capabilities arm64: rename ptrauth key structures to be user-specific arm64: install user ptrauth keys at kernel exit time arm64: cpufeature: handle conflicts based on capability arm64: enable ptrauth earlier arm64: initialize and switch ptrauth kernel keys arm64: compile the kernel with ptrauth return address signing Marc Zyngier (1): arm64: Drop unnecessary include from asm/smp.h Mark Rutland (3): arm64: unwind: strip PAC from kernel addresses arm64: remove ptrauth_keys_install_kernel sync arg arm64: simplify ptrauth initialization Nick Desaulniers (1): arm64: Kconfig: verify binutils support for ARM64_PTR_AUTH Suzuki K Poulose (4): arm64: capabilities: Speed up capability lookup arm64: capabilities: Optimize this_cpu_has_cap arm64: capabilities: Use linear array for detection and verification arm64: capabilities: Batch cpu_enable callbacks Vincenzo Frascino (1): kconfig: Add support for 'as-option' Zheng Zengkai (1): config: enable ARM64 pointer authentication configs by default arch/arm64/Kconfig | 38 +++- arch/arm64/Makefile | 11 + arch/arm64/configs/hulk_defconfig | 7 + arch/arm64/configs/openeuler_defconfig | 7 + arch/arm64/include/asm/asm_pointer_auth.h | 98 ++++++++ arch/arm64/include/asm/compiler.h | 19 ++ arch/arm64/include/asm/cpucaps.h | 4 +- arch/arm64/include/asm/cpufeature.h | 42 ++-- arch/arm64/include/asm/pointer_auth.h | 50 ++--- arch/arm64/include/asm/processor.h | 3 +- arch/arm64/include/asm/stackprotector.h | 5 + arch/arm64/kernel/asm-offsets.c | 13 ++ arch/arm64/kernel/cpufeature.c | 258 ++++++++++++++-------- arch/arm64/kernel/entry.S | 6 + arch/arm64/kernel/head.S | 10 + arch/arm64/kernel/pointer_auth.c | 7 +- arch/arm64/kernel/process.c | 5 +- arch/arm64/kernel/ptrace.c | 16 +- arch/arm64/kernel/sleep.S | 1 + arch/arm64/kernel/stacktrace.c | 5 +- arch/arm64/mm/proc.S | 27 ++- drivers/misc/lkdtm/bugs.c | 36 +++ drivers/misc/lkdtm/core.c | 1 + drivers/misc/lkdtm/lkdtm.h | 1 + include/linux/stackprotector.h | 2 +- scripts/Kconfig.include | 10 + 26 files changed, 513 insertions(+), 169 deletions(-) create mode 100644 arch/arm64/include/asm/asm_pointer_auth.h -- 2.25.1

1 28

[PATCH 00/90] backport stable-4.19.141
by Yang Yingliang 02 Sep '20

02 Sep '20

Adrian Hunter (1): perf intel-pt: Fix FUP packet state Ahmad Fatoum (3): watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options watchdog: f71808e_wdt: remove use of wrong watchdog_info option watchdog: f71808e_wdt: clear watchdog timeout occurred flag Alexandru Ardelean (1): iio: dac: ad5592r: fix unbalanced mutex unlocks in ad5592r_read_raw() Anand Jain (1): btrfs: don't traverse into the seed devices in show_devname Andy Shevchenko (1): mfd: dln2: Run event handler loop under spinlock Aneesh Kumar K.V (3): selftests/powerpc: ptrace-pkey: Rename variables to make it easier to follow code selftests/powerpc: ptrace-pkey: Update the test to mark an invalid pkey correctly selftests/powerpc: ptrace-pkey: Don't update expected UAMOR value Ansuel Smith (2): PCI: qcom: Define some PARF params needed for ipq8064 SoC PCI: qcom: Add support for tx term offset for rev 2.1.0 Anton Blanchard (1): pseries: Fix 64 bit logical memory block panic ChangSyun Peng (1): md/raid5: Fix Force reconstruct-write io stuck in degraded raid5 Charles Keepax (1): mfd: arizona: Ensure 32k clock is put on driver unbind and error Chengming Zhou (1): ftrace: Setup correct FTRACE_FL_REGS flags for module Christian Eggers (1): dt-bindings: iio: io-channel-mux: Fix compatible string in example code Colin Ian King (3): iommu/omap: Check for failure of a call to omap_iommu_dump_ctx Input: sentelic - fix error return when fsp_reg_write fails fs/ufs: avoid potential u32 multiplication overflow Coly Li (2): bcache: allocate meta data pages as compound pages bcache: fix overflow in offset_to_stripe() Dan Carpenter (2): drm/vmwgfx: Use correct vmw_legacy_display_unit pointer drm/vmwgfx: Fix two list_for_each loop exit tests Daniel Díaz (1): tools build feature: Quote CC and CXX for their arguments David Sterba (1): btrfs: fix messages after changing compression level by remount Dinghao Liu (1): ALSA: echoaudio: Fix potential Oops in snd_echo_resume() Eric Biggers (3): fs/minix: set s_maxbytes correctly fs/minix: fix block limit check for V1 filesystems fs/minix: remove expected error message in block_to_path() Eugeniu Rosca (1): media: vsp1: dl: Fix NULL pointer dereference on unbind Ewan D. Milne (1): scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport Filipe Manana (1): btrfs: fix memory leaks after failure to lookup checksums during inode logging Geert Uytterhoeven (1): sh: landisk: Add missing initialization of sh_io_port_base Greg Kroah-Hartman (1): Linux 4.19.141 Huacai Chen (1): MIPS: CPU#0 is not hotpluggable Hugh Dickins (1): khugepaged: retract_page_tables() remember to test exit Jason Gunthorpe (1): RDMA/ipoib: Fix ABBA deadlock with ipoib_reap_ah() Jeffrey Mitchell (1): nfs: Fix getxattr kernel panic and memory overflow Johan Hovold (2): USB: serial: ftdi_sio: make process-packet buffer unsigned USB: serial: ftdi_sio: clean up receive processing Johannes Berg (1): mac80211: fix misplaced while instead of if Jonathan McDowell (2): net: ethernet: stmmac: Disable hardware multicast filter net: stmmac: dwmac1000: provide multicast filter fallback Josef Bacik (2): btrfs: open device without device_list_mutex btrfs: only search for left_info if there is no right_info in try_merge_free_space Junxiao Bi (1): ocfs2: change slot number type s16 to u16 Kai-Heng Feng (1): PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken Kamal Heib (1): RDMA/ipoib: Return void from ipoib_ib_dev_stop() Kees Cook (2): net/compat: Add missing sock updates for SCM_RIGHTS module: Correctly truncate sysfs sections output Kevin Hao (1): tracing/hwlat: Honor the tracing_cpumask Krzysztof Sobota (1): watchdog: initialize device before misc_register Liu Yi L (1): iommu/vt-d: Enforce PASID devTLB field mask Liu Ying (1): drm/imx: imx-ldb: Disable both channels for split mode in enc->disable() Lukas Wunner (1): driver core: Avoid binding drivers to dead devices Marius Iacob (1): drm: Added orientation quirk for ASUS tablet model T103HAF Max Filippov (1): xtensa: fix xtensa_pmu_setup prototype Michael Ellerman (2): powerpc: Allow 4224 bytes of stack expansion for the signal frame powerpc: Fix circular dependency between percpu.h and mmu.h Michal Koutný (1): mm/page_counter.c: fix protection usage propagation Mikulas Patocka (1): ext2: fix missing percpu_counter_inc Ming Lei (1): dm rq: don't call blk_mq_queue_stopped() in dm_stop_queue() Muchun Song (1): kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler Paul Aurich (1): cifs: Fix leak when handling lease break for cached root fid Paul Kocialkowski (2): media: rockchip: rga: Introduce color fmt macros and refactor CSC mode logic media: rockchip: rga: Only set output CSC mode for RGB input Pavel Machek (1): btrfs: fix return value mixup in btrfs_get_extent Qu Wenruo (2): btrfs: free anon block device right after subvolume deletion btrfs: don't allocate anonymous block device for user invisible roots Rafael J. Wysocki (1): PCI: hotplug: ACPI: Fix context refcounting in acpiphp_grab_context() Rajat Jain (1): PCI: Add device even if driver attach failed Rayagonda Kokatanur (1): pwm: bcm-iproc: handle clk_get_rate() return Sandeep Raghuraman (1): drm/amdgpu: Fix bug where DPM is not enabled after hibernate and resume Sibi Sankar (1): remoteproc: qcom: q6v5: Update running state before requesting stop Stafford Horne (1): openrisc: Fix oops caused when dumping stack Steve French (1): smb3: warn on confusing error scenario with sec=krb5 Steve Longerbeam (1): gpu: ipu-v3: image-convert: Combine rotate/no-rotate irq handlers Steven Rostedt (VMware) (1): tracing: Use trace_sched_process_free() instead of exit() for pid tracing Thomas Gleixner (1): genirq/affinity: Make affinity setting if activated opt-in Thomas Hebb (1): tools build feature: Use CC and CXX from parent Tiezhu Yang (1): test_kmod: avoid potential double free in trigger_config_run_type() Tom Rix (1): btrfs: ref-verify: fix memory leak in add_block_entry Tomasz Maciej Nowak (1): arm64: dts: marvell: espressobin: add ethernet alias Vincent Whitchurch (1): perf bench mem: Always memset source before memcpy Wang Hai (1): net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init Wolfram Sang (2): i2c: rcar: slave: only send STOP event when we have been addressed i2c: rcar: avoid race when unregistering slave Xu Wang (1): clk: clk-atlas6: fix return value check in atlas6_clk_init() Yoshihiro Shimoda (1): mmc: renesas_sdhi_internal_dmac: clean up the code for dma complete .../iio/multiplexer/io-channel-mux.txt | 2 +- Makefile | 2 +- .../dts/marvell/armada-3720-espressobin.dts | 6 ++ arch/mips/kernel/topology.c | 2 +- arch/openrisc/kernel/stacktrace.c | 18 ++++- arch/powerpc/include/asm/percpu.h | 4 +- arch/powerpc/mm/fault.c | 7 +- .../platforms/pseries/hotplug-memory.c | 2 +- arch/sh/boards/mach-landisk/setup.c | 3 + arch/x86/kernel/apic/vector.c | 4 + arch/xtensa/kernel/perf_event.c | 2 +- drivers/base/dd.c | 4 +- drivers/clk/sirf/clk-atlas6.c | 2 +- .../gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 +- .../gpu/drm/drm_panel_orientation_quirks.c | 6 ++ drivers/gpu/drm/imx/imx-ldb.c | 7 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- drivers/gpu/ipu-v3/ipu-image-convert.c | 58 +++++---------- drivers/i2c/busses/i2c-rcar.c | 15 ++-- drivers/iio/dac/ad5592r-base.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 67 ++++++++--------- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 + drivers/input/mouse/sentelic.c | 2 +- drivers/iommu/omap-iommu-debug.c | 3 + drivers/irqchip/irq-gic-v3-its.c | 5 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/bset.c | 2 +- drivers/md/bcache/btree.c | 2 +- drivers/md/bcache/journal.c | 4 +- drivers/md/bcache/super.c | 2 +- drivers/md/bcache/writeback.c | 14 ++-- drivers/md/bcache/writeback.h | 19 ++++- drivers/md/dm-rq.c | 3 - drivers/md/raid5.c | 3 +- drivers/media/platform/rockchip/rga/rga-hw.c | 29 ++++---- drivers/media/platform/rockchip/rga/rga-hw.h | 5 ++ drivers/media/platform/vsp1/vsp1_dl.c | 2 + drivers/mfd/arizona-core.c | 18 +++++ drivers/mfd/dln2.c | 4 + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 18 +++-- drivers/net/ethernet/qualcomm/emac/emac.c | 17 ++++- .../ethernet/stmicro/stmmac/dwmac-ipq806x.c | 1 + .../ethernet/stmicro/stmmac/dwmac1000_core.c | 3 + drivers/pci/bus.c | 6 +- drivers/pci/controller/dwc/pcie-qcom.c | 41 ++++++++++- drivers/pci/hotplug/acpiphp_glue.c | 14 +++- drivers/pci/quirks.c | 5 +- drivers/pwm/pwm-bcm-iproc.c | 9 ++- drivers/remoteproc/qcom_q6v5.c | 2 + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- drivers/usb/serial/ftdi_sio.c | 37 +++++----- drivers/watchdog/f71808e_wdt.c | 13 +++- drivers/watchdog/watchdog_dev.c | 18 ++--- fs/btrfs/disk-io.c | 13 +++- fs/btrfs/free-space-cache.c | 4 +- fs/btrfs/inode.c | 4 +- fs/btrfs/ref-verify.c | 2 + fs/btrfs/super.c | 35 ++++----- fs/btrfs/tree-log.c | 8 +- fs/btrfs/volumes.c | 21 +++++- fs/cifs/smb2misc.c | 73 +++++++++++++------ fs/cifs/smb2pdu.c | 2 + fs/ext2/ialloc.c | 3 +- fs/minix/inode.c | 12 +-- fs/minix/itree_v1.c | 12 +-- fs/minix/itree_v2.c | 13 ++-- fs/minix/minix.h | 1 - fs/nfs/nfs4proc.c | 2 - fs/nfs/nfs4xdr.c | 6 +- fs/ocfs2/ocfs2.h | 4 +- fs/ocfs2/suballoc.c | 4 +- fs/ocfs2/super.c | 4 +- fs/ufs/super.c | 2 +- include/linux/intel-iommu.h | 4 +- include/linux/irq.h | 13 ++++ include/net/sock.h | 4 + kernel/irq/manage.c | 6 +- kernel/kprobes.c | 7 ++ kernel/module.c | 22 +++++- kernel/trace/ftrace.c | 15 ++-- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_hwlat.c | 5 +- lib/test_kmod.c | 2 +- mm/khugepaged.c | 22 +++--- mm/page_counter.c | 6 +- net/compat.c | 1 + net/core/sock.c | 21 ++++++ net/mac80211/sta_info.c | 2 +- sound/pci/echoaudio/echoaudio.c | 2 - tools/build/Makefile.feature | 2 +- tools/build/feature/Makefile | 2 - tools/perf/bench/mem-functions.c | 21 +++--- .../util/intel-pt-decoder/intel-pt-decoder.c | 21 ++---- .../selftests/powerpc/ptrace/ptrace-pkey.c | 55 +++++++------- 96 files changed, 639 insertions(+), 365 deletions(-) -- 2.25.1

1 90

[PATCH] delete python2 dependency
by Zhipeng Xie 01 Sep '20

01 Sep '20

Python2 is no longer supported by the upstream community. The dependency on python2 should be removed from the kernel code. Signed-off-by: Zhipeng Xie <xiezhipeng1(a)huawei.com> --- tools/perf/scripts/python/call-graph-from-sql.py | 2 +- tools/perf/scripts/python/export-to-postgresql.py | 2 +- tools/power/pm-graph/bootgraph.py | 2 +- tools/power/pm-graph/sleepgraph.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/scripts/python/call-graph-from-sql.py b/tools/perf/scripts/python/call-graph-from-sql.py index b494a67a1c67..099b472df4a2 100644 --- a/tools/perf/scripts/python/call-graph-from-sql.py +++ b/tools/perf/scripts/python/call-graph-from-sql.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # call-graph-from-sql.py: create call-graph from sql database # Copyright (c) 2014-2017, Intel Corporation. # diff --git a/tools/perf/scripts/python/export-to-postgresql.py b/tools/perf/scripts/python/export-to-postgresql.py index e46f51b17513..e97a03697aa2 100644 --- a/tools/perf/scripts/python/export-to-postgresql.py +++ b/tools/perf/scripts/python/export-to-postgresql.py @@ -171,7 +171,7 @@ import datetime # SELECT * FROM samples_view WHERE event = 'transactions' AND branch_type_name = 'transaction abort'; # # To print a call stack requires walking the call_paths table. For example this python script: -# #!/usr/bin/python2 +# #!/usr/bin/python # # import sys # from PySide.QtSql import * diff --git a/tools/power/pm-graph/bootgraph.py b/tools/power/pm-graph/bootgraph.py index 8ee626c0f6a5..abb4c38f029b 100755 --- a/tools/power/pm-graph/bootgraph.py +++ b/tools/power/pm-graph/bootgraph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # # Tool for analyzing boot timing # Copyright (c) 2013, Intel Corporation. diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py index 0c760478f7d7..420102e2cd08 100755 --- a/tools/power/pm-graph/sleepgraph.py +++ b/tools/power/pm-graph/sleepgraph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # # Tool for analyzing suspend/resume timing # Copyright (c) 2013, Intel Corporation. -- 2.18.1

2 1

[PATCH] delete python2 dependency
by Zhipeng Xie 01 Sep '20

01 Sep '20

Python2 is no longer supported by the upstream community. The dependency on python2 should be removed from the kernel code. Signed-off-by: Zhipeng Xie <xiezhipeng1(a)huawei.com> --- tools/perf/scripts/python/call-graph-from-sql.py | 2 +- tools/perf/scripts/python/export-to-postgresql.py | 2 +- tools/power/pm-graph/bootgraph.py | 2 +- tools/power/pm-graph/sleepgraph.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/scripts/python/call-graph-from-sql.py b/tools/perf/scripts/python/call-graph-from-sql.py index b494a67a1c67..099b472df4a2 100644 --- a/tools/perf/scripts/python/call-graph-from-sql.py +++ b/tools/perf/scripts/python/call-graph-from-sql.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # call-graph-from-sql.py: create call-graph from sql database # Copyright (c) 2014-2017, Intel Corporation. # diff --git a/tools/perf/scripts/python/export-to-postgresql.py b/tools/perf/scripts/python/export-to-postgresql.py index e46f51b17513..e97a03697aa2 100644 --- a/tools/perf/scripts/python/export-to-postgresql.py +++ b/tools/perf/scripts/python/export-to-postgresql.py @@ -171,7 +171,7 @@ import datetime # SELECT * FROM samples_view WHERE event = 'transactions' AND branch_type_name = 'transaction abort'; # # To print a call stack requires walking the call_paths table. For example this python script: -# #!/usr/bin/python2 +# #!/usr/bin/python # # import sys # from PySide.QtSql import * diff --git a/tools/power/pm-graph/bootgraph.py b/tools/power/pm-graph/bootgraph.py index 8ee626c0f6a5..abb4c38f029b 100755 --- a/tools/power/pm-graph/bootgraph.py +++ b/tools/power/pm-graph/bootgraph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # # Tool for analyzing boot timing # Copyright (c) 2013, Intel Corporation. diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py index 0c760478f7d7..420102e2cd08 100755 --- a/tools/power/pm-graph/sleepgraph.py +++ b/tools/power/pm-graph/sleepgraph.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # # Tool for analyzing suspend/resume timing # Copyright (c) 2013, Intel Corporation. -- 2.18.1

1 0

[PATCH kernel-4.19, openEuler-1.0-LTS, openEuler-20.09] arm64/config: enable TIPC module for openEuler
by Xie XiuQi 31 Aug '20

31 Aug '20

hulk inclusion category: feature feature: TIPC bugzilla: NA CVE: NA Link: https://gitee.com/openeuler/kernel/issues/I1TDS3 The Transparent Inter Process Communication (TIPC) protocol is specially designed for intra cluster communication. This protocol originates from Ericsson where it has been used in carrier grade cluster applications for many years. Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 44a7d1661576..0ca7fd9cfeee 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1459,7 +1459,10 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y CONFIG_INET_SCTP_DIAG=m # CONFIG_RDS is not set -# CONFIG_TIPC is not set +CONFIG_TIPC=m +CONFIG_TIPC_MEDIA_IB=y +CONFIG_TIPC_MEDIA_UDP=y +CONFIG_TIPC_DIAG=m CONFIG_ATM=m CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set -- 2.20.1

1 0

[PATCH] kvm: fix compile error when including linux/kvm.h
by Yang Yingliang 29 Aug '20

29 Aug '20

From: Peng Liang <liangpeng10(a)huawei.com> hulk inclusion category: bugfix bugzilla: NA CVE: NA linux/kvm.h should be self-contained so uint64_t should be replaced with __u64. Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> Reviewed-by: zhanghailiang <zhang.zhanghailiang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/uapi/linux/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 4bd8e8bcc78e1..6b6eb5b00a385 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1201,13 +1201,13 @@ struct kvm_vfio_spapr_tce { #define ID_REG_MAX_NUMS 64 struct id_reg_info { - uint64_t sys_id; - uint64_t sys_val; + __u64 sys_id; + __u64 sys_val; }; struct id_registers { struct id_reg_info regs[ID_REG_MAX_NUMS]; - uint64_t num; + __u64 num; }; /* -- 2.25.1

1 0

[PATCH 1/8] Revert "block: rename 'q->debugfs_dir' and 'q->blk_trace->dir' in blk_unregister_queue()"
by Yang Yingliang 29 Aug '20

29 Aug '20

From: Yu Kuai <yukuai3(a)huawei.com> hulk inclusion category: bugfix bugzilla: 30213 CVE: CVE-2019-19770 --------------------------- The UAF in blktrace was fixed by a different approch from mainline, thus revert our solution and backport related patches. Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> Reviewed-by: Yufen Yu <yuyufen(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- block/blk-sysfs.c | 49 ----------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index ce84526ed51dd..2d905a8b14730 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -11,7 +11,6 @@ #include <linux/blktrace_api.h> #include <linux/blk-mq.h> #include <linux/blk-cgroup.h> -#include <linux/debugfs.h> #include <linux/atomic.h> #include "blk.h" @@ -960,53 +959,6 @@ int blk_register_queue(struct gendisk *disk) } EXPORT_SYMBOL_GPL(blk_register_queue); -#ifdef CONFIG_DEBUG_FS -void blk_rename_debugfs_dir(struct dentry **old) -{ - static atomic_t i = ATOMIC_INIT(0); - struct dentry *new; - char name[DNAME_INLINE_LEN]; - u32 index = atomic_fetch_inc(&i); - - snprintf(name, sizeof(name), "ready_to_remove_%u", index); - new = debugfs_lookup(name, blk_debugfs_root); - if (WARN_ON(new)) { - dput(new); - return; - } - new = debugfs_rename(blk_debugfs_root, *old, blk_debugfs_root, name); - if (WARN_ON(!new)) - return; - *old = new; -} - -/* - * blk_prepare_release_queue - rename q->debugfs_dir and q->blk_trace->dir - * @q: request_queue of which the dir to be renamed belong to. - * - * Because the final release of request_queue is in a workqueue, the - * cleanup might not been finished yet while the same device start to - * create. It's not correct if q->debugfs_dir still exist while trying - * to create a new one. - */ -static void blk_prepare_release_queue(struct request_queue *q) -{ -#ifdef CONFIG_BLK_DEBUG_FS - if (!IS_ERR_OR_NULL(q->debugfs_dir)) - blk_rename_debugfs_dir(&q->debugfs_dir); - -#endif -#ifdef CONFIG_BLK_DEV_IO_TRACE - mutex_lock(&q->blk_trace_mutex); - if (q->blk_trace && !IS_ERR_OR_NULL(q->blk_trace->dir)) - blk_rename_debugfs_dir(&q->blk_trace->dir); - mutex_unlock(&q->blk_trace_mutex); -#endif -} -#else -#define blk_prepare_release_queue(q) do { } while (0) -#endif - /** * blk_unregister_queue - counterpart of blk_register_queue() * @disk: Disk of which the request queue should be unregistered from sysfs. @@ -1031,7 +983,6 @@ void blk_unregister_queue(struct gendisk *disk) * concurrent elv_iosched_store() calls. */ mutex_lock(&q->sysfs_lock); - blk_prepare_release_queue(q); blk_queue_flag_clear(QUEUE_FLAG_REGISTERED, q); -- 2.25.1

1 7

[PATCH 00/16] ARMv8.3 pointer authentication userspace
by Yang Yingliang 29 Aug '20

29 Aug '20

This series adds support for the ARMv8.3 pointer authentication extension, enabling userspace return address protection with GCC 7 and above. Arnaldo Carvalho de Melo (2): tools beauty: Make the prctl option table generator catch all PR_ options tools headers uapi: Sync prctl.h with the kernel sources Kristina Martsenko (3): arm64: add comments about EC exception levels arm64: add prctl control for resetting ptrauth keys arm64: add ptrace regsets for ptrauth key management Mark Rutland (8): arm64: add pointer authentication register bits arm64/kvm: hide ptrauth from guests arm64/cpufeature: detect pointer authentication arm64: add basic pointer authentication support arm64: expose user PAC bit positions via ptrace arm64: perf: strip PAC when unwinding userspace arm64: enable pointer authentication arm64: docs: document pointer authentication Will Deacon (3): arm64: ptr auth: Move per-thread keys from thread_info to thread_struct arm64: cpufeature: Reduce number of pointer auth CPU caps from 6 to 4 arm64: cpufeature: Rework ptr auth hwcaps using multi_entry_cap_matches Documentation/arm64/booting.txt | 8 + Documentation/arm64/cpu-feature-registers.txt | 8 + Documentation/arm64/elf_hwcaps.txt | 12 ++ .../arm64/pointer-authentication.txt | 93 +++++++++ arch/arm64/Kconfig | 23 +++ arch/arm64/include/asm/cpucaps.h | 6 +- arch/arm64/include/asm/cpufeature.h | 73 +++++-- arch/arm64/include/asm/esr.h | 17 +- arch/arm64/include/asm/pointer_auth.h | 97 +++++++++ arch/arm64/include/asm/processor.h | 7 + arch/arm64/include/asm/sysreg.h | 30 +++ arch/arm64/include/uapi/asm/hwcap.h | 2 + arch/arm64/include/uapi/asm/ptrace.h | 20 ++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/cpu_errata.c | 32 --- arch/arm64/kernel/cpufeature.c | 138 +++++++++++-- arch/arm64/kernel/cpuinfo.c | 2 + arch/arm64/kernel/perf_callchain.c | 6 +- arch/arm64/kernel/pointer_auth.c | 47 +++++ arch/arm64/kernel/process.c | 4 + arch/arm64/kernel/ptrace.c | 185 ++++++++++++++++++ arch/arm64/kvm/handle_exit.c | 18 ++ arch/arm64/kvm/sys_regs.c | 8 + include/uapi/linux/elf.h | 3 + include/uapi/linux/prctl.h | 8 + kernel/sys.c | 8 + tools/include/uapi/linux/prctl.h | 8 + tools/perf/trace/beauty/prctl_option.sh | 2 +- 28 files changed, 789 insertions(+), 77 deletions(-) create mode 100644 Documentation/arm64/pointer-authentication.txt create mode 100644 arch/arm64/include/asm/pointer_auth.h create mode 100644 arch/arm64/kernel/pointer_auth.c -- 2.25.1

1 16

[PATCH kernel-5.5 0/4] Add RISC-V log dirty support
by Yifei Jiang 27 Aug '20

27 Aug '20

euleros inclusion category: feature bugzilla: NA CVE: NA This series supports log dirty for migration in RISC-V KVM. We have implemented the vm migration in Qemu, So these patches have been tested and are valid. Link: https://gitee.com/openeuler/kernel/issues/I1SWY2 Yifei Jiang (4): riscv/kvm: Fix use VSIP_VALID_MASK mask HIP register riscv/kvm: add kvm_arch_mmu_enable_log_dirty_pt_masked riscv/kvm: implement kvm_vm_ioctl_get_dirty_log riscv/kvm: Add kvm_vm_ioctl_clear_dirty_log arch/riscv/configs/defconfig | 1 + arch/riscv/kvm/Kconfig | 1 + arch/riscv/kvm/mmu.c | 37 +++++++++++++++++++++++++++ arch/riscv/kvm/vcpu.c | 2 +- arch/riscv/kvm/vm.c | 49 ++++++++++++++++++++++++++++++++++-- 5 files changed, 87 insertions(+), 3 deletions(-) -- 2.19.1

3 7

[PATCH] ACPI: GED: fix replace timer with delayed work
by huangjun 27 Aug '20

27 Aug '20

From: Jun Huang <huangjun63(a)huawei.com> The acpi_execute_simple_method function uses a mutex, so it cannot be called in the timer. We replace timer with delayed work. Signed-off-by: Jun Huang <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 60 ++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index 7354d8d..5bf65b1 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -34,7 +34,7 @@ * Method (_EVT, 1) { * if (Lequal(123, Arg0)) * { - * } + * }# * } * } * @@ -46,20 +46,23 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> -#include <linux/timer.h> #include <linux/jiffies.h> +#include <linux/workqueue.h> #define MODULE_NAME "acpi-ged" +static void gpp_enable_pwd(struct work_struct *private_); + +static DECLARE_DELAYED_WORK(gpp_work, gpp_enable_pwd); + struct acpi_ged_handle { - struct timer_list timer; /* For 4s anti-shake of power button */ acpi_handle gpp_handle; /* ACPI Handle: enable shutdown */ acpi_handle gpo_handle; /* ACPI Handle: set sleep flag */ }; struct acpi_ged_device { struct device *dev; - struct acpi_ged_handle *wakeup_handle; + struct acpi_ged_handle *ged_handle; struct list_head event_list; }; @@ -71,6 +74,8 @@ struct acpi_ged_event { acpi_handle handle; }; +static struct acpi_ged_handle *wakeup_handle; + static irqreturn_t acpi_ged_irq_handler(int irq, void *data) { struct acpi_ged_event *event = data; @@ -142,7 +147,6 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, #ifdef CONFIG_PM_SLEEP static void init_ged_handle(struct acpi_ged_device *geddev) { - struct acpi_ged_handle *wakeup_handle; acpi_handle gpo_handle = NULL; acpi_handle gpp_handle = NULL; acpi_status acpi_ret; @@ -151,10 +155,7 @@ static void init_ged_handle(struct acpi_ged_device *geddev) { if (!wakeup_handle) return; - geddev->wakeup_handle = wakeup_handle; - - /* Initialize wakeup_handle, prepare for ged suspend and resume */ - timer_setup(&wakeup_handle->timer, NULL, 0); + geddev->ged_handle = wakeup_handle; acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPO", &gpo_handle); if (ACPI_FAILURE(acpi_ret)) @@ -204,8 +205,6 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } - if (geddev->wakeup_handle) - del_timer(&geddev->wakeup_handle->timer); } static int ged_remove(struct platform_device *pdev) @@ -220,23 +219,10 @@ static const struct acpi_device_id ged_acpi_ids[] = { }; #ifdef CONFIG_PM_SLEEP -static void ged_timer_callback(struct timer_list *t) -{ - struct acpi_ged_handle *wakeup_handle = from_timer(wakeup_handle, t, timer); - acpi_status acpi_ret; - - /* _GPP method enable power button */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); - if (ACPI_FAILURE(acpi_ret)) - pr_warn("_GPP method execution failed\n"); - } -} - static int ged_suspend(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + //struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; acpi_status acpi_ret; @@ -255,18 +241,26 @@ static int ged_suspend(struct device *dev) return 0; } +static void gpp_enable_pwd(struct work_struct *private_) +{ + acpi_status acpi_ret; + + /* _GPP method enable power button */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) + pr_warn("_GPP method execution failed\n"); + } + +} + static int ged_resume(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; - - /* use timer to complete 4s anti-shake */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - wakeup_handle->timer.expires = jiffies + (4 * HZ); - wakeup_handle->timer.function = ged_timer_callback; - add_timer(&wakeup_handle->timer); - } + + /* use delayed_work to complete 4s anti-shake */ + schedule_delayed_work(&gpp_work, 4 * HZ); list_for_each_entry_safe(event, next, &geddev->event_list, node) disable_irq_wake(event->irq); -- 2.23.0.windows.1

1 0

[PATCH 0/2] Add risc-v vhost-net support
by Yifei Jiang 26 Aug '20

26 Aug '20

euleros inclusion category: feature bugzilla: NA CVE: NA These two patches enable the support for vhost-net on RISC-V architecture. The following two steps are performed to run a vm with vhost-net: 1. create virbr0 on riscv64 emulation $ brctl addbr virbr0 $ brctl stp virbr0 on $ ifconfig virbr0 up $ ifconfig virbr0 virbr0_ip netmask 255.255.255.0 2. boot a riscv64 guest OS on riscv64 emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guest \ -smp 2 \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk,drive=hd0 \ -netdev type=tap,vhost=on,script=./ifup.sh,downscript=./ifdown.sh,id=net0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" $ cat ifup.sh #!/bin/sh brctl addif virbr0 $1 ifconfig $1 up $ cat ifdown.sh #!/bin/sh ifconfig $1 down brctl delif virbr0 $1 This brenchmark netperf is used to test the performance of vhost-net and virtio-net. The results are as follow: $ ./netperf -H virbr0_ip -l 100 -t TCP_STREAM vhost-net: Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec 131072 16384 16384 100.06 521.62 virtio-net: Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec 131072 16384 16384 292.86 292.86 Link: https://gitee.com/openeuler/kernel/issues/I1SQJ2 Yifei Jiang (2): RISC-V: KVM: enable ioeventfd capability RISC-V: KVM: kernel mmio read/write support arch/riscv/kvm/Kconfig | 2 ++ arch/riscv/kvm/Makefile | 2 +- arch/riscv/kvm/vcpu_exit.c | 28 ++++++++++++++++++++++++++-- arch/riscv/kvm/vm.c | 1 + 4 files changed, 30 insertions(+), 3 deletions(-) -- 2.19.1

3 4

[PATCH 1/4] can: j1939: fix support for multipacket broadcast message
by Yang Yingliang 25 Aug '20

25 Aug '20

From: Zhang Changzhong <zhangchangzhong(a)huawei.com> mainline inclusion from mainline-v5.9-rc2 commit f4fd77fd87e9b214c26bb2ebd4f90055eaea5ade category: bugfix bugzilla: 39990 CVE: NA --------------------------- Currently j1939_tp_im_involved_anydir() in j1939_tp_recv() check the previously set flags J1939_ECU_LOCAL_DST and J1939_ECU_LOCAL_SRC of incoming skb, thus multipacket broadcast message was aborted by receive side because it may come from remote ECUs and have no exact dst address. Similarly, j1939_tp_cmd_recv() and j1939_xtp_rx_dat() didn't process broadcast message. So fix it by checking and process broadcast message in j1939_tp_recv(), j1939_tp_cmd_recv() and j1939_xtp_rx_dat(). Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Signed-off-by: Zhang Changzhong <zhangchangzhong(a)huawei.com> Link: https://lore.kernel.org/r/1596599425-5534-2-git-send-email-zhangchangzhong@… Acked-by: Oleksij Rempel <o.rempel(a)pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> Signed-off-by: Zhang Changzhong <zhangchangzhong(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/can/j1939/transport.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 9f99af5b0b11e..e5188acbb1db7 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1651,8 +1651,12 @@ static void j1939_xtp_rx_rts(struct j1939_priv *priv, struct sk_buff *skb, return; } session = j1939_xtp_rx_rts_session_new(priv, skb); - if (!session) + if (!session) { + if (cmd == J1939_TP_CMD_BAM && j1939_sk_recv_match(priv, skcb)) + netdev_info(priv->ndev, "%s: failed to create TP BAM session\n", + __func__); return; + } } else { if (j1939_xtp_rx_rts_session_active(session, skb)) { j1939_session_put(session); @@ -1829,6 +1833,13 @@ static void j1939_xtp_rx_dat(struct j1939_priv *priv, struct sk_buff *skb) else j1939_xtp_rx_dat_one(session, skb); } + + if (j1939_cb_is_broadcast(skcb)) { + session = j1939_session_get_by_addr(priv, &skcb->addr, false, + false); + if (session) + j1939_xtp_rx_dat_one(session, skb); + } } /* j1939 main intf */ @@ -1920,7 +1931,7 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb) if (j1939_tp_im_transmitter(skcb)) j1939_xtp_rx_rts(priv, skb, true); - if (j1939_tp_im_receiver(skcb)) + if (j1939_tp_im_receiver(skcb) || j1939_cb_is_broadcast(skcb)) j1939_xtp_rx_rts(priv, skb, false); break; @@ -1984,7 +1995,7 @@ int j1939_tp_recv(struct j1939_priv *priv, struct sk_buff *skb) { struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb); - if (!j1939_tp_im_involved_anydir(skcb)) + if (!j1939_tp_im_involved_anydir(skcb) && !j1939_cb_is_broadcast(skcb)) return 0; switch (skcb->addr.pgn) { -- 2.25.1

1 3

[RESEND,PATCH 0/7] Improvements and fixes
by Roberto Sassu 25 Aug '20

25 Aug '20

Resending due to conflicts with existing code. This patch set provides some improvements and fixes. The first three patches solve a permission problem caused by EVM. EVM denies xattr operations also for files that are not appraised by IMA. If only executables are appraised, xattr operations on the other files should be allowed, even if metadata verification fails (for example due to missing security.evm). At the moment, in openEuler we use EVM_ALLOW_METADATA_WRITES to avoid this problem (EVM does not check metadata integrity), but it would be useful to do the verification for example to prevent accidental changes on immutable metadata. The fourth patch enables the choice of the algorithm for the HMAC and ensures that the parameters passed to the functions which handle the HMAC are consistent with the algorithm chosen. The last three patches are simple bug fixes. Roberto Sassu (7): evm: Move hooks outside LSM infrastructure evm: Extend API of post hooks to pass the result of pre hooks evm: Return -EAGAIN to ignore verification failures evm: Propagate choice of HMAC algorithm in evm_crypto.c ima: Fix datalen check in ima_write_data() evm: Fix validation of fake xattr passed by IMA evm: Initialize saved_evm_status fs/attr.c | 7 ++- fs/xattr.c | 65 +++++++++++++++++--------- include/linux/evm.h | 18 +++++--- security/integrity/evm/Kconfig | 32 +++++++++++++ security/integrity/evm/evm.h | 1 + security/integrity/evm/evm_crypto.c | 15 ++++-- security/integrity/evm/evm_main.c | 71 +++++++++++++++++++++-------- security/integrity/ima/ima_fs.c | 2 +- security/integrity/integrity.h | 2 +- security/security.c | 18 ++------ 10 files changed, 159 insertions(+), 72 deletions(-) -- 2.27.GIT

2 8

[PATCH 00/35] patches for iocost
by Yang Yingliang 25 Aug '20

25 Aug '20

patches 1-31 are from mainline patch 32 add cgroup-V1 support patch 33 and 34 are from ali-cloud-kernel(https://github.com/alibaba/cloud-kernel.git), they fix bug when introduce iocost in lower kernel. patch 35 fix a bug when using iocost in sq Dan Carpenter (1): iocost: don't nest spin_lock_irq in ioc_weight_write() Jiufei Xue (3): iocost: check active_list of all the ancestors in iocg_activate() iocost: fix NULL pointer dereference in ioc_rqos_throttle iocost: fix a deadlock in ioc_rqos_throttle() Stephen Rothwell (1): blkcg: blk-iocost: predeclare used structs Tejun Heo (27): blk-mq: add optional request->alloc_time_ns block/rq_qos: add rq_qos_merge() block/rq_qos: implement rq_qos_ops->queue_depth_changed() blkcg: separate blkcg_conf_get_disk() out of blkg_conf_prep() cgroup: add cgroup_parse_float() cgroup: Move cgroup_parse_float() implementation out of CONFIG_SYSFS blkcg: pass @q and @blkcg into blkcg_pol_alloc_pd_fn() blkcg: make ->cpd_init_fn() optional blkcg: implement blk-iocost blkcg: add tools/cgroup/iocost_monitor.py blkcg: add tools/cgroup/iocost_coef_gen.py blkcg: fix missing free on error path of blk_iocost_init() blkcg: add missing NULL check in ioc_cpd_alloc() blk-iocost: Fix incorrect operation order during iocg free blk-iocost: Account force-charged overage in absolute vtime blk-iocost: Don't let merges push vtime into the future iocost_monitor: Always use strings for json values iocost_monitor: Report more info with higher accuracy iocost_monitor: Report debt iocost: better trace vrate changes iocost: improve nr_lagging handling iocost: bump up default latency targets for hard disks iocost: over-budget forced IOs should schedule async delay iocost: Fix iocost_monitor.py due to helper type mismatch blk-iocost: fix incorrect vtime comparison in iocg_is_idle() blkcg: blkcg_activate_policy() should initialize ancestors first blkcg: Fix multiple bugs in blkcg_activate_policy() Waiman Long (1): blk-iocost: Fix error on iocost_ioc_vrate_adj Yu Kuai (2): iocost: add cgroup V1 suport blk-iocost: fix spin_lock won't release in sq Documentation/admin-guide/cgroup-v2.rst | 103 + block/Kconfig | 13 + block/Makefile | 1 + block/bfq-cgroup.c | 5 +- block/blk-cgroup.c | 136 +- block/blk-core.c | 4 + block/blk-iocost.c | 2547 +++++++++++++++++++++++ block/blk-iolatency.c | 5 +- block/blk-mq.c | 13 +- block/blk-rq-qos.c | 21 + block/blk-rq-qos.h | 5 + block/blk-settings.c | 2 +- block/blk-throttle.c | 6 +- block/blk-wbt.c | 18 +- block/blk-wbt.h | 4 - block/cfq-iosched.c | 5 +- include/linux/blk-cgroup.h | 4 +- include/linux/blk_types.h | 3 + include/linux/blkdev.h | 14 +- include/linux/cgroup.h | 2 + include/trace/events/iocost.h | 178 ++ kernel/cgroup/cgroup.c | 43 + tools/cgroup/iocost_coef_gen.py | 178 ++ tools/cgroup/iocost_monitor.py | 277 +++ 24 files changed, 3522 insertions(+), 65 deletions(-) create mode 100644 block/blk-iocost.c create mode 100644 include/trace/events/iocost.h create mode 100644 tools/cgroup/iocost_coef_gen.py create mode 100644 tools/cgroup/iocost_monitor.py -- 2.25.1

1 35

[PATCH 0/5] Support idle-haltpoll in ARM
by Yang Yingliang 25 Aug '20

25 Aug '20

Idle-haltpoll has been supported in X86. Now, we will provide it in ARM. Xiangyou Xie (5): arm64: Optimize ttwu IPI cpuidle-haltpoll: Use arch_cpu_idle() to replace default_idle() arm64: Add some definitions of kvm_para* ARM: cpuidle: Add support for cpuidle-haltpoll driver for ARM config: set default value of haltpoll arch/arm64/Kconfig | 3 +++ arch/arm64/configs/euleros_defconfig | 2 ++ arch/arm64/configs/hulk_defconfig | 2 ++ arch/arm64/configs/openeuler_defconfig | 4 +++- arch/arm64/include/asm/kvm_para.h | 27 ++++++++++++++++++++++++++ arch/arm64/include/asm/thread_info.h | 3 +++ arch/arm64/kernel/process.c | 4 ++++ arch/x86/kernel/process.c | 1 + drivers/cpuidle/Kconfig | 4 ++-- drivers/cpuidle/cpuidle-haltpoll.c | 6 +++--- drivers/cpuidle/governors/haltpoll.c | 6 +++++- drivers/cpuidle/poll_state.c | 3 +++ 12 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 arch/arm64/include/asm/kvm_para.h -- 2.25.1

1 5

[PATCH 0/4] kvm: arm64: emulate ID registers
by Yang Yingliang 25 Aug '20

25 Aug '20

In AArch64, guest will read the same values of the ID regsiters with host. Both of them read the values from arm64_ftr_regs. This patch series add support to emulate and configure ID registers so that we can control the value of ID registers that guest read. Peng Liang (4): arm64: add a helper function to traverse arm64_ftr_regs kvm: arm64: emulate the ID registers kvm: arm64: make ID registers configurable kvm: arm64: add KVM_CAP_ARM_CPU_FEATURE extension arch/arm64/include/asm/cpufeature.h | 2 + arch/arm64/include/asm/kvm_host.h | 2 + arch/arm64/kernel/cpufeature.c | 13 ++++++ arch/arm64/kvm/sys_regs.c | 71 ++++++++++++++++++++++------- include/uapi/linux/kvm.h | 13 ++++++ virt/kvm/arm/arm.c | 23 ++++++++++ 6 files changed, 107 insertions(+), 17 deletions(-) -- 2.25.1

1 4

[PATCH 01/22] arm64: mm: define NET_IP_ALIGN to 0
by Yang Yingliang 25 Aug '20

25 Aug '20

From: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> mainline inclusion from mainline-v4.20-rc2 commit 26a4676faa1ad5d99317e0cd701e5d6f3e716b77 category: feature bugzilla: NA CVE: NA --------------------------- On arm64, there is no need to add 2 bytes of padding to the start of each network buffer just to make the IP header appear 32-bit aligned. Since this might actually adversely affect DMA performance some platforms, let's override NET_IP_ALIGN to 0 to get rid of this padding. Acked-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Tested-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Acked-by: Mark Rutland <mark.rutland(a)arm.com> Acked-by: Will Deacon <will.deacon(a)arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com> Signed-off-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/include/asm/processor.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 98529c8b5d313..7695a5117ff20 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -24,6 +24,14 @@ #define KERNEL_DS UL(-1) #define USER_DS (TASK_SIZE_64 - 1) +/* + * On arm64 systems, unaligned accesses by the CPU are cheap, and so there is + * no point in shifting all network buffers by 2 bytes just to make some IP + * header fields appear aligned in memory, potentially sacrificing some DMA + * performance on some platforms. + */ +#define NET_IP_ALIGN 0 + #ifndef __ASSEMBLY__ /* -- 2.25.1

1 21

[PATCH 00/25] ILP32 for ARM64
by Yang Yingliang 25 Aug '20

25 Aug '20

Andrew Pinski (3): arm64: rename COMPAT to AARCH32_EL0 arm64: uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 arm64:ilp32: add ARM64_ILP32 to Kconfig Dave Martin (1): arm64: signal: Make parse_user_sigframe() independent of rt_sigframe layout James Morse (1): ptrace: Add compat PTRACE_{G, S}ETSIGMASK handlers Philipp Tomsich (1): arm64:ilp32: add vdso-ilp32 and use for signal return Xiongfeng Wang (2): arm64: ilp32: fix compile warning cause by 'VA_BITS' config: add CONFIG_ARM64_ILP32 in defconfigs Yury Norov (17): compat ABI: use non-compat openat and open_by_handle_at variants 32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config option asm-generic: Drop getrlimit and setrlimit syscalls from default list thread: move thread bits accessors to separated file arm64: ilp32: add documentation on the ILP32 ABI for ARM64 arm64: rename functions that reference compat term arm64: introduce is_a32_compat_{task, thread} for AArch32 compat arm64: ilp32: add is_ilp32_compat_{task, thread} and TIF_32BIT_AARCH64 arm64: introduce binfmt_elf32.c arm64: change compat_elf_hwcap and compat_elf_hwcap2 prefix to a32 arm64: ilp32: introduce binfmt_ilp32.c arm64: ilp32: share aarch32 syscall handlers arm64: ilp32: introduce syscall table for ILP32 arm64: signal: share lp64 signal structures and routines to ilp32 arm64: signal32: move ilp32 and aarch32 common code to separated file arm64: ilp32: introduce ilp32-specific sigframe and ucontext arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Documentation/arm64/ilp32.txt | 52 +++ arch/Kconfig | 15 + arch/arc/Kconfig | 1 + arch/arc/include/uapi/asm/unistd.h | 1 + arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 17 +- arch/arm64/Makefile | 3 + arch/arm64/configs/euleros_defconfig | 2 + arch/arm64/configs/hulk_defconfig | 2 + arch/arm64/configs/openeuler_defconfig | 2 + arch/arm64/configs/storage_ci_defconfig | 2 + arch/arm64/configs/syzkaller_defconfig | 2 + arch/arm64/include/asm/compat.h | 19 +- arch/arm64/include/asm/elf.h | 36 +- arch/arm64/include/asm/fpsimd.h | 2 +- arch/arm64/include/asm/ftrace.h | 2 +- arch/arm64/include/asm/hwcap.h | 8 +- arch/arm64/include/asm/is_compat.h | 78 ++++ arch/arm64/include/asm/memory.h | 4 + arch/arm64/include/asm/processor.h | 13 +- arch/arm64/include/asm/ptrace.h | 12 +- arch/arm64/include/asm/seccomp.h | 2 +- arch/arm64/include/asm/signal32.h | 19 +- arch/arm64/include/asm/signal32_common.h | 13 + arch/arm64/include/asm/signal_common.h | 303 +++++++++++++++ arch/arm64/include/asm/signal_ilp32.h | 23 ++ arch/arm64/include/asm/syscall.h | 10 +- arch/arm64/include/asm/thread_info.h | 4 +- arch/arm64/include/asm/unistd.h | 6 +- arch/arm64/include/asm/vdso.h | 6 + arch/arm64/include/uapi/asm/bitsperlong.h | 9 +- arch/arm64/include/uapi/asm/unistd.h | 13 + arch/arm64/kernel/Makefile | 8 +- arch/arm64/kernel/armv8_deprecated.c | 6 +- arch/arm64/kernel/asm-offsets.c | 9 +- arch/arm64/kernel/binfmt_elf32.c | 35 ++ arch/arm64/kernel/binfmt_ilp32.c | 87 +++++ arch/arm64/kernel/cpufeature.c | 28 +- arch/arm64/kernel/cpuinfo.c | 18 +- arch/arm64/kernel/debug-monitors.c | 4 +- arch/arm64/kernel/entry.S | 6 +- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/hw_breakpoint.c | 8 +- arch/arm64/kernel/perf_callchain.c | 28 +- arch/arm64/kernel/perf_regs.c | 4 +- arch/arm64/kernel/process.c | 13 +- arch/arm64/kernel/ptrace.c | 38 +- arch/arm64/kernel/signal.c | 348 ++++-------------- arch/arm64/kernel/signal32.c | 111 +++--- arch/arm64/kernel/signal32_common.c | 37 ++ arch/arm64/kernel/signal_ilp32.c | 67 ++++ arch/arm64/kernel/sys32.c | 104 +----- arch/arm64/kernel/sys32_common.c | 106 ++++++ arch/arm64/kernel/sys_compat.c | 12 +- arch/arm64/kernel/sys_ilp32.c | 75 ++++ arch/arm64/kernel/syscall.c | 37 +- arch/arm64/kernel/traps.c | 3 +- arch/arm64/kernel/vdso-ilp32/.gitignore | 2 + arch/arm64/kernel/vdso-ilp32/Makefile | 89 +++++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S | 22 ++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S | 84 +++++ arch/arm64/kernel/vdso.c | 62 +++- arch/arm64/kernel/vdso/gettimeofday.c | 6 + arch/arm64/kernel/vdso/vdso.S | 6 +- arch/arm64/mm/mmap.c | 2 +- arch/c6x/include/uapi/asm/unistd.h | 1 + arch/h8300/Kconfig | 1 + arch/h8300/include/uapi/asm/unistd.h | 1 + arch/hexagon/Kconfig | 1 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/nds32/Kconfig | 1 + arch/nds32/include/uapi/asm/unistd.h | 1 + arch/nios2/Kconfig | 1 + arch/nios2/include/uapi/asm/unistd.h | 1 + arch/openrisc/Kconfig | 1 + arch/openrisc/include/uapi/asm/unistd.h | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/riscv/Kconfig | 1 + arch/riscv/include/asm/unistd.h | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/unicore32/Kconfig | 1 + arch/unicore32/include/uapi/asm/unistd.h | 1 + arch/x86/Kconfig | 1 + arch/x86/um/Kconfig | 1 + arch/xtensa/Kconfig | 1 + drivers/clocksource/arm_arch_timer.c | 4 +- include/linux/fcntl.h | 2 +- include/linux/sched.h | 1 + include/linux/thread_bits.h | 87 +++++ include/linux/thread_info.h | 75 +--- include/uapi/asm-generic/unistd.h | 10 +- kernel/ptrace.c | 47 ++- scripts/checksyscalls.sh | 5 + 98 files changed, 1679 insertions(+), 726 deletions(-) create mode 100644 Documentation/arm64/ilp32.txt create mode 100644 arch/arm64/include/asm/is_compat.h create mode 100644 arch/arm64/include/asm/signal32_common.h create mode 100644 arch/arm64/include/asm/signal_common.h create mode 100644 arch/arm64/include/asm/signal_ilp32.h create mode 100644 arch/arm64/kernel/binfmt_elf32.c create mode 100644 arch/arm64/kernel/binfmt_ilp32.c create mode 100644 arch/arm64/kernel/signal32_common.c create mode 100644 arch/arm64/kernel/signal_ilp32.c create mode 100644 arch/arm64/kernel/sys32_common.c create mode 100644 arch/arm64/kernel/sys_ilp32.c create mode 100644 arch/arm64/kernel/vdso-ilp32/.gitignore create mode 100644 arch/arm64/kernel/vdso-ilp32/Makefile create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S create mode 100644 include/linux/thread_bits.h -- 2.25.1

1 25

[PATCH 000/169] backport stable-4.19.140
by Yang Yingliang 25 Aug '20

25 Aug '20

Aditya Pakki (2): drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync drm/nouveau: fix multiple instances of reference count leaks Alim Akhtar (1): arm64: dts: exynos: Fix silent hang after boot on Espresso Andrii Nakryiko (1): tools, build: Propagate build failures from tools/build/Makefile.build Aneesh Kumar K.V (1): powerpc/book3s64/pkeys: Use PVR check instead of cpu feature Arnd Bergmann (1): leds: lm355x: avoid enum conversion warning Bartosz Golaszewski (1): irqchip/irq-mtk-sysirq: Replace spinlock with raw_spinlock Bjorn Helgaas (1): PCI: Fix pci_cfg_wait queue locking problem Bolarinwa Olayemi Saheed (1): iwlegacy: Check the return value of pcie_capability_read_*() Brant Merryman (2): USB: serial: cp210x: re-enable auto-RTS on open USB: serial: cp210x: enable usb generic throttle/unthrottle Chris Packham (1): net: dsa: mv88e6xxx: MV88E6097 does not support jumbo configuration Christian Eggers (1): spi: spidev: Align buffers for DMA Christian König (1): drm/radeon: disable AGP by default Christophe JAILLET (5): video: pxafb: Fix the function used to balance a 'dma_alloc_coherent()' call scsi: cumana_2: Fix different dev_id between request_irq() and free_irq() scsi: powertec: Fix different dev_id between request_irq() and free_irq() scsi: eesox: Fix different dev_id between request_irq() and free_irq() net: spider_net: Fix the size used in a 'dma_free_coherent()' call Chuck Lever (1): svcrdma: Fix page leak in svc_rdma_recv_read_chunk() Chuhong Yuan (2): media: omap3isp: Add missed v4l2_ctrl_handler_free() for preview_init_entities() media: exynos4-is: Add missed check for pinctrl_lookup_state() Chunfeng Yun (1): usb: mtu3: clear dual mode of u3port when disable device Colin Ian King (3): drm/arm: fix unintentional integer overflow on left shift drm/radeon: fix array out-of-bounds read and write issues staging: rtl8192u: fix a dubious looking mask before a shift Coly Li (1): bcache: fix super block seq numbers comparision in register_cache_set() Cristian Marussi (1): firmware: arm_scmi: Fix SCMI genpd domain probing Dan Carpenter (5): media: firewire: Using uninitialized values in node_probe() mwifiex: Prevent memory corruption handling keys thermal: ti-soc-thermal: Fix reversed condition in ti_thermal_expose_sensor() Smack: fix another vsscanf out of bounds Smack: prevent underflow in smk_set_cipso() Danesh Petigara (1): usb: bdc: Halt controller on suspend Darrick J. Wong (2): xfs: don't eat an EIO/ENOSPC writeback error when scrubbing data fork xfs: fix reflink quota reservation accounting error Dave Airlie (1): drm/ttm/nouveau: don't call tt destroy callback on alloc failure. Dejin Zheng (2): video: fbdev: sm712fb: fix an issue about iounmap for a wrong address console: newport_con: fix an issue about leak related system resources Dilip Kota (1): spi: lantiq: fix: Rx overflow error in full duplex mode Dmitry Osipenko (1): gpu: host1x: debug: Fix multiple channels emitting messages simultaneously Drew Fustini (1): pinctrl-single: fix pcs_parse_pinconf() return value Emil Velikov (1): drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline Eric Biggers (3): fs/minix: check return value of sb_getblk() fs/minix: don't allow getting deleted inodes fs/minix: reject too-large maximum file size Eric Dumazet (1): x86/fsgsbase/64: Fix NULL deref in 86_fsgsbase_read_task Erik Kaneda (1): ACPICA: Do not increment operation_region reference counts for field units Evan Green (1): ath10k: Acquire tx_lock in tx error paths Evgeny Novikov (2): video: fbdev: neofb: fix memory leak in neo_scan_monitor() usb: gadget: net2280: fix memory leak on probe error handling paths Finn Thain (3): m68k: mac: Don't send IOP message until channel is idle m68k: mac: Fix IOP status/control register writes scsi: mesh: Fix panic after host or bus reset Florinel Iordache (5): fsl/fman: use 32-bit unsigned integer fsl/fman: fix dereference null return value fsl/fman: fix unreachable code fsl/fman: check dereferencing null pointer fsl/fman: fix eth hash table allocation Gilad Ben-Yossef (1): crypto: ccree - fix resource leak on error path Grant Likely (1): HID: input: Fix devices that return multiple bytes in battery report Greg Kroah-Hartman (1): Linux 4.19.140 Hanjun Guo (1): PCI: Release IVRS table in AMD ACS quirk Harish (1): selftests/powerpc: Fix CPU affinity for child process Hector Martin (3): ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109 ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109 ALSA: usb-audio: add quirk for Pioneer DDJ-RB Heiko Stuebner (3): arm64: dts: rockchip: fix rk3368-lion gmac reset gpio arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio arm64: dts: rockchip: fix rk3399-puma gmac reset gpio Hui Wang (1): ALSA: hda - fix the micmute led status for Lenovo ThinkCentre AIO Ira Weiny (1): net/tls: Fix kmap usage Ivan Kokshaysky (1): cpufreq: dt: fix oops on armada37xx Jack Xiao (1): drm/amdgpu: avoid dereferencing a NULL pointer Jakub Kicinski (1): bitfield.h: don't compile-time validate _val in FIELD_FIT Jerome Brunet (1): ASoC: meson: axg-tdm-interface: fix link fmt setup Jian Cai (1): crypto: aesni - add compatibility with IAS Jim Cromie (1): dyndbg: fix a BUG_ON in ddebug_describe_flags Johan Hovold (1): USB: serial: iuu_phoenix: fix led-activity helpers John Allen (1): crypto: ccp - Fix use of merged scatterlists John David Anglin (1): parisc: Implement __smp_store_release and __smp_load_acquire barriers John Garry (1): scsi: scsi_debug: Add check for sdebug_max_queue during module init John Ogness (1): af_packet: TPACKET_V3: fix fill status rwlock imbalance Jon Derrick (1): irqdomain/treewide: Free firmware node after domain removal Julian Anastasov (1): ipvs: allow connection reuse for unconfirmed conntrack Julian Wiedmann (1): s390/qeth: don't process empty bridge port events Kai-Heng Feng (1): leds: core: Flush scheduled work for system suspend Kars Mulder (1): usb: core: fix quirks_param_set() writing to a const pointer Kishon Vijay Abraham I (1): PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register Laurent Pinchart (1): drm: panel: simple: Fix bpc for LG LB070WV8 panel Li Heng (1): RDMA/core: Fix return error value in _ib_modify_qp() to negative Lihong Kou (1): Bluetooth: add a mutex lock to avoid UAF in do_enale_set Linus Walleij (2): net: dsa: rtl8366: Fix VLAN semantics net: dsa: rtl8366: Fix VLAN set-up Lu Wei (2): platform/x86: intel-hid: Fix return value check in check_acpi_dev() platform/x86: intel-vbtn: Fix return value check in check_acpi_dev() Lubomir Rintel (1): drm/etnaviv: Fix error path on failure to enable bus clk Luis Chamberlain (1): loop: be paranoid on exit and prevent new additions / removals Marco Felsch (1): drm/imx: tve: fix regulator_disable error path Marek Szyprowski (2): phy: exynos5-usbdrd: Calibrating makes sense only for USB2.0 PHY usb: dwc2: Fix error path in gadget registration Matteo Croce (1): pstore: Fix linking when crypto API disabled Maulik Shah (1): soc: qcom: rpmh-rsc: Set suppress_bind_attrs flag Miaohe Lin (1): net: Set fput_needed iff FDPUT_FPUT is set Michael Ellerman (1): powerpc/boot: Fix CONFIG_PPC_MPC52XX references Michael Tretter (1): drm/debugfs: fix plain echo to connector "force" attribute Mikhail Malygin (1): RDMA/rxe: Prevent access to wr->next ptr afrer wr is posted to send queue Mikulas Patocka (2): crypto: hisilicon - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified crypto: cpt - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified Milton Miller (1): powerpc/vdso: Fix vdso cpu truncation Mirko Dietrich (1): ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob support Nathan Huckleberry (1): ARM: 8992/1: Fix unwind_frame for clang-built kernels Navid Emamdoost (1): drm/etnaviv: fix ref count leak via pm_runtime_get_sync Nick Desaulniers (1): tracepoint: Mark __tracepoint_string's __used Nicolas Boichat (2): Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Bluetooth: hci_serdev: Only unregister device if it was registered Niklas Söderlund (2): ARM: dts: gose: Fix ports node name for adv7180 ARM: dts: gose: Fix ports node name for adv7612 Oleksandr Andrushchenko (1): xen/gntdev: Fix dmabuf import with non-zero sgt offset Paul E. McKenney (2): fs/btrfs: Add cond_resched() for try_release_extent_mapping() stalls mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls Pavel Machek (1): ocfs2: fix unbalanced locking Peng Liu (1): sched: correct SD_flags returned by tl->sd_flags() Pierre-Louis Bossart (1): ASoC: Intel: bxt_rt298: add missing .owner field Prasanna Kerekoppa (1): brcmfmac: To fix Bss Info flag definition Bug Qingyu Li (1): net/nfc/rawsock.c: add CAP_NET_RAW check. Qiushi Wu (2): EDAC: Fix reference count leaks agp/intel: Fix a memory leak on module initialisation failure Ricardo Cañuelo (1): arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding Rob Clark (1): drm/msm: ratelimit crtc event overflow error Roger Pau Monne (2): xen/balloon: fix accounting in alloc_xenballooned_pages error path xen/balloon: make the balloon wait interruptible Romain Naour (1): include/asm-generic/vmlinux.lds.h: align ro_after_init Sai Prakash Ranjan (1): coresight: tmc: Fix TMC mode read in tmc_read_unprepare_etb() Sandipan Das (1): selftests/powerpc: Fix online CPU selection Sasi Kumar (1): bdc: Fix bug causing crash after multiple disconnects Sedat Dilek (1): crypto: aesni - Fix build with LLVM_IAS=1 Sivaprakash Murugesan (1): mtd: rawnand: qcom: avoid write to unavailable register Stephan Gerhold (1): arm64: dts: qcom: msm8916: Replace invalid bias-pull-none property Sudeep Holla (1): clk: scmi: Fix min and max rate when registering clocks with discrete rates Sven Schnelle (1): parisc: mask out enable and reserved bits from sba imask Tianjia Zhang (2): net: ethernet: aquantia: Fix wrong return value liquidio: Fix wrong return value in cn23xx_get_pf_num() Tim Froidcoeur (2): net: refactor bind_bucket fastreuse into helper net: initialize fastreuse on inet_inherit_port Tom Rix (3): drm/bridge: sil_sii8620: initialize return of sii8620_readb power: supply: check if calc_soc succeeded in pm860x_init_battery crypto: qat - fix double free in qat_uclo_create_batch_init_list Tomasz Duszynski (1): iio: improve IIO_CONCENTRATION channel type description Tomi Valkeinen (1): drm/tilcdc: fix leak & null ref in panel_connector_get_modes Trond Myklebust (2): NFS: Don't move layouts to plh_return_segs list while in use NFS: Don't return layout segments that are in use Vincent Guittot (1): sched/fair: Fix NOHZ next idle balance Wang Hai (3): cxl: Fix kobject memleak wl1251: fix always return 0 error dlm: Fix kobject memleak Wright Feng (2): brcmfmac: keep SDIO watchdog running when console_interval is non-zero brcmfmac: set state of hanger slot to FREE when flushing PSQ Xie He (1): drivers/net/wan/lapbether: Added needed_headroom and a skb->len check Xiongfeng Wang (1): PCI/ASPM: Add missing newline in sysfs 'policy' Yang Yingliang (1): Revert "pci: lock the pci_cfg_wait queue for the consistency of data" Yu Kuai (2): ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh() MIPS: OCTEON: add missing put_device() call in dwc3_octeon_device_init() Yuval Basson (1): RDMA/qedr: SRQ's bug fixes Zhao Heming (1): md-cluster: fix wild pointer of unlock_all_bitmaps() Zheng Bin (1): 9p: Fix memory leak in v9fs_mount Zhenzhong Duan (1): x86/mce/inject: Fix a wrong assignment of i_mce.status Zhu Yanjun (1): RDMA/rxe: Skip dgid check in loopback mode yu kuai (1): ARM: at91: pm: add missing put_device() call in at91_pm_sram_init() Documentation/ABI/testing/sysfs-bus-iio | 3 +- Makefile | 2 +- arch/arm/boot/dts/r8a7793-gose.dts | 4 +- arch/arm/kernel/stacktrace.c | 24 +++++ arch/arm/mach-at91/pm.c | 11 ++- arch/arm/mach-socfpga/pm.c | 8 +- .../boot/dts/exynos/exynos7-espresso.dts | 1 + .../boot/dts/hisilicon/hi3660-hikey960.dts | 11 +++ .../arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 10 +- arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 +- arch/m68k/mac/iop.c | 21 ++-- arch/mips/cavium-octeon/octeon-usb.c | 5 +- arch/parisc/include/asm/barrier.h | 61 ++++++++++++ arch/powerpc/boot/Makefile | 2 +- arch/powerpc/boot/serial.c | 2 +- arch/powerpc/kernel/vdso.c | 2 +- arch/powerpc/mm/pkeys.c | 16 +-- arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 14 +-- arch/x86/crypto/aesni-intel_asm.S | 6 +- arch/x86/kernel/apic/io_apic.c | 5 + arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/kernel/ptrace.c | 2 +- drivers/acpi/acpica/exprep.c | 4 - drivers/acpi/acpica/utdelete.c | 6 +- drivers/block/loop.c | 4 + drivers/bluetooth/hci_h5.c | 2 +- drivers/bluetooth/hci_serdev.c | 3 +- drivers/char/agp/intel-gtt.c | 4 +- drivers/clk/clk-scmi.c | 22 ++++- drivers/cpufreq/armada-37xx-cpufreq.c | 1 + drivers/crypto/cavium/cpt/cptvf_algs.c | 1 + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 12 +-- drivers/crypto/cavium/cpt/request_manager.h | 2 + drivers/crypto/ccp/ccp-dev.h | 1 + drivers/crypto/ccp/ccp-ops.c | 37 ++++--- drivers/crypto/ccree/cc_cipher.c | 30 +++--- drivers/crypto/hisilicon/sec/sec_algs.c | 34 ++++--- drivers/crypto/qat/qat_common/qat_uclo.c | 9 +- drivers/edac/edac_device_sysfs.c | 1 + drivers/edac/edac_pci_sysfs.c | 2 +- drivers/firmware/arm_scmi/scmi_pm_domain.c | 12 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 19 ++-- drivers/gpu/drm/arm/malidp_planes.c | 2 +- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 8 +- drivers/gpu/drm/drm_mipi_dsi.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 19 +++- drivers/gpu/drm/imx/imx-tve.c | 20 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 8 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 9 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/radeon/ci_dpm.c | 2 +- drivers/gpu/drm/radeon/radeon_display.c | 4 +- drivers/gpu/drm/radeon/radeon_drv.c | 9 +- drivers/gpu/drm/radeon/radeon_kms.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 +- drivers/gpu/drm/ttm/ttm_tt.c | 3 - drivers/gpu/host1x/debug.c | 4 + drivers/hid/hid-input.c | 6 +- .../hwtracing/coresight/coresight-tmc-etf.c | 13 ++- drivers/infiniband/core/verbs.c | 2 +- drivers/infiniband/hw/qedr/qedr.h | 4 +- drivers/infiniband/hw/qedr/verbs.c | 22 ++--- drivers/infiniband/sw/rxe/rxe_recv.c | 6 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 5 +- drivers/iommu/intel_irq_remapping.c | 8 ++ drivers/irqchip/irq-mtk-sysirq.c | 8 +- drivers/leds/led-class.c | 1 + drivers/leds/leds-lm355x.c | 7 +- drivers/md/bcache/super.c | 9 +- drivers/md/md-cluster.c | 1 + drivers/media/firewire/firedtv-fw.c | 2 + drivers/media/platform/exynos4-is/media-dev.c | 3 + drivers/media/platform/omap3isp/isppreview.c | 4 +- drivers/misc/cxl/sysfs.c | 2 +- drivers/mtd/nand/raw/qcom_nandc.c | 7 +- drivers/net/dsa/mv88e6xxx/chip.c | 1 - drivers/net/dsa/rtl8366.c | 35 ++++--- .../aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- .../cavium/liquidio/cn23xx_pf_device.c | 2 +- drivers/net/ethernet/freescale/fman/fman.c | 3 +- .../net/ethernet/freescale/fman/fman_dtsec.c | 4 +- .../net/ethernet/freescale/fman/fman_mac.h | 2 +- .../net/ethernet/freescale/fman/fman_memac.c | 3 +- .../net/ethernet/freescale/fman/fman_port.c | 9 +- .../net/ethernet/freescale/fman/fman_tgec.c | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 +- drivers/net/wan/lapbether.c | 10 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 4 + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 4 + .../broadcom/brcm80211/brcmfmac/sdio.c | 6 +- drivers/net/wireless/intel/iwlegacy/common.c | 4 +- .../wireless/marvell/mwifiex/sta_cmdresp.c | 22 +++-- drivers/net/wireless/ti/wl1251/event.c | 2 +- drivers/parisc/sba_iommu.c | 2 +- drivers/pci/access.c | 8 +- drivers/pci/controller/pcie-cadence-host.c | 9 +- drivers/pci/controller/vmd.c | 3 + drivers/pci/pcie/aspm.c | 1 + drivers/pci/quirks.c | 2 + drivers/phy/samsung/phy-exynos5-usbdrd.c | 4 +- drivers/pinctrl/pinctrl-single.c | 11 ++- drivers/platform/x86/intel-hid.c | 2 +- drivers/platform/x86/intel-vbtn.c | 2 +- drivers/power/supply/88pm860x_battery.c | 6 +- drivers/s390/net/qeth_l2_main.c | 4 + drivers/scsi/arm/cumana_2.c | 2 +- drivers/scsi/arm/eesox.c | 2 +- drivers/scsi/arm/powertec.c | 2 +- drivers/scsi/mesh.c | 8 +- drivers/scsi/scsi_debug.c | 6 ++ drivers/soc/qcom/rpmh-rsc.c | 1 + drivers/spi/spi-lantiq-ssc.c | 10 ++ drivers/spi/spidev.c | 21 ++-- drivers/staging/rtl8192u/r8192U_core.c | 2 +- .../ti-soc-thermal/ti-thermal-common.c | 2 +- drivers/usb/core/quirks.c | 16 ++- drivers/usb/dwc2/platform.c | 4 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 13 ++- drivers/usb/gadget/udc/bdc/bdc_ep.c | 16 +-- drivers/usb/gadget/udc/net2280.c | 4 +- drivers/usb/mtu3/mtu3_core.c | 6 +- drivers/usb/serial/cp210x.c | 19 ++++ drivers/usb/serial/iuu_phoenix.c | 14 +-- drivers/video/console/newport_con.c | 12 ++- drivers/video/fbdev/neofb.c | 1 + drivers/video/fbdev/pxafb.c | 4 +- drivers/video/fbdev/sm712fb.c | 2 + drivers/xen/balloon.c | 12 ++- drivers/xen/gntdev-dmabuf.c | 8 ++ fs/9p/v9fs.c | 5 +- fs/btrfs/extent_io.c | 2 + fs/dlm/lockspace.c | 6 +- fs/minix/inode.c | 36 ++++++- fs/minix/itree_common.c | 8 +- fs/nfs/pnfs.c | 46 +++------ fs/ocfs2/dlmglue.c | 8 +- fs/pstore/platform.c | 5 +- fs/xfs/scrub/bmap.c | 22 ++++- fs/xfs/xfs_reflink.c | 21 ++-- include/asm-generic/vmlinux.lds.h | 1 + include/linux/bitfield.h | 2 +- include/linux/tracepoint.h | 2 +- include/net/inet_connection_sock.h | 4 + include/net/ip_vs.h | 10 +- kernel/sched/fair.c | 23 +++-- kernel/sched/topology.c | 2 +- lib/dynamic_debug.c | 23 +++-- mm/mmap.c | 1 + net/bluetooth/6lowpan.c | 5 + net/ipv4/inet_connection_sock.c | 97 ++++++++++--------- net/ipv4/inet_hashtables.c | 1 + net/netfilter/ipvs/ip_vs_core.c | 12 ++- net/nfc/rawsock.c | 7 +- net/packet/af_packet.c | 9 +- net/socket.c | 2 +- net/sunrpc/xprtrdma/svc_rdma_rw.c | 28 ++++-- net/tls/tls_device.c | 3 +- security/smack/smackfs.c | 6 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/intel/boards/bxt_rt298.c | 2 + sound/soc/meson/axg-tdm-interface.c | 26 +++-- sound/usb/card.h | 1 + sound/usb/mixer_quirks.c | 1 + sound/usb/pcm.c | 6 ++ sound/usb/quirks-table.h | 64 +++++++++++- sound/usb/quirks.c | 3 + sound/usb/stream.c | 1 + tools/build/Build.include | 3 +- .../powerpc/benchmarks/context_switch.c | 21 +++- tools/testing/selftests/powerpc/utils.c | 37 ++++--- 176 files changed, 1085 insertions(+), 490 deletions(-) -- 2.25.1

1 169

Re: [Dev] [kernel] kernel arm build failed
by Xie XiuQi 25 Aug '20

25 Aug '20

Hi, On 2020/8/24 21:23, Sugar wrote: > Hi, everyone. > > I have been working on porting openeuler to a cortex-a7 based board. > Some errors hit me when building arm32 openeuler 4.19.90 kernel in *ubuntu-base-16.04-core-armhf.tar.gz* chroot environment emulated by qemu-user-static. > The errors were endless even though I commented on some CONFIG options and fixed some errors. > Here are some of my questions: > - Did openeuler test kernel arm32 build before the LTS-20.03 release, that maybe help me out? No. LTS-20.03 does not have an arm32 release and has not been tested on the arm32 platform. > - Will openeuler provide arm32 support in future version? And a detailed date? We do not have a plan to support ARM32 at this point, and it would be great if you could help to do it. IMHO, the patches merged into the openEuler kernel do not break the support for ARM32. So, select a proper config would be helpful for building on arm32 platform. > > Looking for your rely. > > _______________________________________________ > Dev mailing list -- dev(a)openeuler.org > To unsubscribe send an email to dev-leave(a)openeuler.org >

2 1

[PATCH] ACPI: GED: implement powerkey evged freeze function
by huangjun 24 Aug '20

24 Aug '20

From: Jun Huang <huangjun63(a)huawei.com> The acpi_execute_simple_method function uses a mutex, so it cannot be called in the timer. We replace timer with delayed work. Signed-off-by: Jun Huang <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 60 ++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index 7354d8d..5bf65b1 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -34,7 +34,7 @@ * Method (_EVT, 1) { * if (Lequal(123, Arg0)) * { - * } + * }# * } * } * @@ -46,20 +46,23 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> -#include <linux/timer.h> #include <linux/jiffies.h> +#include <linux/workqueue.h> #define MODULE_NAME "acpi-ged" +static void gpp_enable_pwr_btn(struct work_struct *private_); + +static DECLARE_DELAYED_WORK(gpp_work, gpp_enable_pwr_btn); + struct acpi_ged_handle { - struct timer_list timer; /* For 4s anti-shake of power button */ acpi_handle gpp_handle; /* ACPI Handle: enable shutdown */ acpi_handle gpo_handle; /* ACPI Handle: set sleep flag */ }; struct acpi_ged_device { struct device *dev; - struct acpi_ged_handle *wakeup_handle; + struct acpi_ged_handle *ged_handle; struct list_head event_list; }; @@ -71,6 +74,8 @@ struct acpi_ged_event { acpi_handle handle; }; +static struct acpi_ged_handle *wakeup_handle; + static irqreturn_t acpi_ged_irq_handler(int irq, void *data) { struct acpi_ged_event *event = data; @@ -142,7 +147,6 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, #ifdef CONFIG_PM_SLEEP static void init_ged_handle(struct acpi_ged_device *geddev) { - struct acpi_ged_handle *wakeup_handle; acpi_handle gpo_handle = NULL; acpi_handle gpp_handle = NULL; acpi_status acpi_ret; @@ -151,10 +155,7 @@ static void init_ged_handle(struct acpi_ged_device *geddev) { if (!wakeup_handle) return; - geddev->wakeup_handle = wakeup_handle; - - /* Initialize wakeup_handle, prepare for ged suspend and resume */ - timer_setup(&wakeup_handle->timer, NULL, 0); + geddev->ged_handle = wakeup_handle; acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPO", &gpo_handle); if (ACPI_FAILURE(acpi_ret)) @@ -204,8 +205,6 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } - if (geddev->wakeup_handle) - del_timer(&geddev->wakeup_handle->timer); } static int ged_remove(struct platform_device *pdev) @@ -220,23 +219,10 @@ static const struct acpi_device_id ged_acpi_ids[] = { }; #ifdef CONFIG_PM_SLEEP -static void ged_timer_callback(struct timer_list *t) -{ - struct acpi_ged_handle *wakeup_handle = from_timer(wakeup_handle, t, timer); - acpi_status acpi_ret; - - /* _GPP method enable power button */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); - if (ACPI_FAILURE(acpi_ret)) - pr_warn("_GPP method execution failed\n"); - } -} - static int ged_suspend(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + //struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; acpi_status acpi_ret; @@ -255,18 +241,26 @@ static int ged_suspend(struct device *dev) return 0; } +static void gpp_enable_pwr_btn(struct work_struct *private_) +{ + acpi_status acpi_ret; + + /* _GPP method enable power button */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) + pr_warn("_GPP method execution failed\n"); + } + +} + static int ged_resume(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; - - /* use timer to complete 4s anti-shake */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - wakeup_handle->timer.expires = jiffies + (4 * HZ); - wakeup_handle->timer.function = ged_timer_callback; - add_timer(&wakeup_handle->timer); - } + + /* use delayed_work to complete 4s anti-shake */ + schedule_delayed_work(&gpp_work, 4 * HZ); list_for_each_entry_safe(event, next, &geddev->event_list, node) disable_irq_wake(event->irq); -- 2.23.0.windows.1

1 0

[PATCH] scripts: add helper script to generate backport patch changelog
by Xie XiuQi 23 Aug '20

23 Aug '20

hulk inclusion category: doc bugzilla: NA CVE: NA Link: https://gitee.com/openeuler/kernel/issues/I1SF7H ------------------------------------------------- provide a simple script to help generate mainline patch info. It is useful when backport many patches from mainline or stable tree. usage: 1) backport a patch from mainline ./scripts/pick -c <commit> --issue I1SF7H 2) insert patch info to exsit patch file ./scripts/pick -c <commit> --issue I1SF7H -i test.patch 3) backport a patch from stable branch ./scripts/pick -c <commit> -s --issue I1SF7H 4) insert patch info to a out-of-tree patch ./scripts/pick --from driver --issue I1SF7H -i 0001-driver.patch ./scripts/pick --from driver --cate feature --feat "xxx feature" --issue I1SF7H -i 0001-driver.patch 5) if the commit information is not provided in the argument, try to identify it from the input file. The following formats can be recognized: (cherry picked from commit 587a87b9d7e94927edcdea018565bc1939381eb1) commit 65caafd0d2145d1dd02072c4ced540624daeab40 upstream. ./scripts/pick --issue I1SF7H -i 0001-input.patch Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- scripts/pick | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100755 scripts/pick diff --git a/scripts/pick b/scripts/pick new file mode 100755 index 000000000000..1166a300f508 --- /dev/null +++ b/scripts/pick @@ -0,0 +1,205 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# pick - helpers for pick a patch from upstream +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# (C) Copyright 2015-2020 Huawei Technologies Co., Ltd +# +# Authors: Xie XiuQi <xiexiuqi(a)huawei.com> + +# +# usage: +# 1) backport a patch from mainline +# ./scripts/pick -c <commit> --issue I1SF7H +# +# 2) insert patch info to exsit patch file +# ./scripts/pick -c <commit> --issue I1SF7H -i test.patch +# +# 3) backport a patch from stable branch +# ./scripts/pick -c <commit> -s --issue I1SF7H +# +# 4) insert patch info to a out-of-tree patch +# ./scripts/pick --from driver --issue I1SF7H -i 0001-driver.patch +# ./scripts/pick --from driver --cate feature --feat "xxx feature" --issue I1SF7H -i 0001-driver.patch +# +# 5) if the commit information is not provided in the argument, +# try to identify it from the input file. +# The following formats can be recognized: +# (cherry picked from commit 587a87b9d7e94927edcdea018565bc1939381eb1) +# commit 65caafd0d2145d1dd02072c4ced540624daeab40 upstream. +# +# ./scripts/pick --issue I1SF7H -i 0001-input.patch +# + +# set -x + +COMMIT= +CVE=NA +BUG=NA +ISSUE=NA +WITH_ISSUE=0 +ISSUE_PREFIX=https://gitee.com/openeuler/kernel/issues +OUTPUT_PREFIX= +OUTPUT= +FROM=mainline # default +CATEGORY=bugfix # default +FEATURE="" +SUBJECT_PREFIX= +WITH_SOB= +INSERT_LINE=0 + +usage() +{ + echo "usage: $(basename $0) [options]" >&2 + echo " -h|--help show this help message" >&2 + echo " -s|--stable from stable (default mainline)" >&2 + echo " -f|--from where does the patch from (default mainline)" >&2 + echo " -C|--cve ID of CVE (without CVE prefix)" >&2 + echo " --cate category(feature/bugfix/...)" >&2 + echo " --feat feature" >&2 + echo " --subject-prefix " >&2 + echo " -b|--bugzilla ID of BUGZILLA" >&2 + echo " --issue issue id of gitee" >&2 + echo " -o|--output output filename, use input filename if no specific" >&2 + echo " -i|--input input patch filename" >&2 + echo " --output-prefix output filename" >&2 + echo " --with-sob with signed-off-by" >&2 + echo " -c|--commit <commit id>" >&2 +} + +options=$(getopt -o hr:u:c: "help,pick,stable,from:bugzilla:cate:feat:cve:commit" -- "$@") || die "getopt failed" + +eval set -- "$options" +while [[ $# -gt 0 ]]; do + case "$1" in + -h|--help) + usage + exit 0 + ;; + -f|--from) + FROM="$2" + shift + ;; + -s|--stable) + FROM="stable" + ;; + -C|--cve) + CVE="$2" + shift + ;; + --cate) + CATEGORY="$2" + shift + ;; + --feat) + FEATURE="$2" + shift + ;; + --subject-prefix) + SUBJECT_PREFIX=" $2" + shift + ;; + --with-sob) + WITH_SOB="-s" + ;; + -b|--bugzilla) + BUG="$2" + shift + ;; + --issue) + ISSUE=$2 + WITH_ISSUE=1 + shift + ;; + -i|--input) + INPUT=$2 + shift + ;; + -u|--utf8) + UTF8=1 + ;; + -c|--commit) + COMMIT=$2 + shift + ;; + esac + shift +done + +if [ -z "$COMMIT" ] && [ -z "$INPUT" ]; then + echo 'Your must specific at least commit or input filename' + exit 1 +fi + +if [ "$INPUT" != "" ] && [ "$COMMIT" == "" ]; then + COMMIT=$(grep "^(cherry picked from commit" $INPUT | sed 's/^(cherry picked from commit $[a-f0-9]*$.*/\1/g') + + if [ "$COMMIT" == "" ]; then + COMMIT=$(grep "^commit [a-f0-9]* upstream" $INPUT | sed 's/^commit $[a-f0-9]*$.*/\1/g') + fi +fi + +if [ "$PREFIX" != "" ]; then + PREFIX="[$PREFIX] " +fi + +if [ $(echo $CVE |grep CVE -c) -eq 0 ] && [ "$CVE" != "NA" ]; then + CVE=CVE-$CVE +fi + +TAG=$(git name-rev --tags $COMMIT |sed 's/^[a-f0-9]* tags\/v//g' | sed 's/~.*//' | sed 's/-.*//') + +trap 'rm -f "$TMPFILE"' EXIT +TMPFILE=$(mktemp) || exit 1 + +printf "%s\n" "$FROM inclusion" >> $TMPFILE +if [ $FROM == "mainline" ] || [ "$FROM" == "stable" ]; then + printf "%s\n" "from $FROM-$TAG" >> $TMPFILE + printf "%s\n" "commit $COMMIT" >> $TMPFILE +fi +printf "%s\n" "category: $CATEGORY" >> $TMPFILE + +if [ "$CATEGORY" == "feature" ]; then + if [ "$FEATURE" == "" ]; then + echo "please describe this feature" + exit 1 + else + printf "%s\n" "feature: $FEATURE" >> $TMPFILE + fi +fi + +printf "%s\n" "bugzilla: $BUG" >> $TMPFILE +printf "%s\n" "CVE: $CVE" >> $TMPFILE + +if [ "$BUG" == "NA" ] && [ "$ISSUE" == "NA" ]; +then + echo please set bugzilla id or issue id + exit 1 +fi + +if [ $WITH_ISSUE -eq 1 ] && [ "$ISSUE" != "" ]; then + printf "%s\n" "Link: $ISSUE_PREFIX/$ISSUE" >> $TMPFILE +fi + +printf "\n%s\n\n" "-------------------------------------------------" >> $TMPFILE + +if [ -z $INPUT ]; then + INPUT=$(git format-patch -1 $WITH_SOB --subject-prefix="PATCH$SUBJECT_PREFIX" $COMMIT) +fi + +if [ -z $OUTPUT ]; then + OUTPUT=$INPUT +fi + +INSERT_LINE=$(sed -n -e '/^$/=' $INPUT |head -n1) +sed -i "$INSERT_LINE"r" $TMPFILE" $OUTPUT -- 2.20.1

1 0

[PATCH 00/20] KVM: arm64 support vCPU preempted check and PV qspinlock
by Yang Yingliang 20 Aug '20

20 Aug '20

This patch set aims to support the vCPU preempted check and PV qspinlock under KVM/arm64. Christoffer Dall (1): KVM: arm/arm64: Factor out hypercall handling from PSCI code Qian Cai (1): arm64/spinlock: fix a -Wunused-function warning Steven Price (3): KVM: Implement kvm_put_guest() arm/arm64: Provide a wrapper for SMCCC 1.1 calls arm/arm64: Make use of the SMCCC 1.1 wrapper Waiman Long (1): locking/osq: Use optimized spinning loop for arm64 Wanpeng Li (2): KVM: Boost vCPUs that are delivering interrupts KVM: Check preempted_in_kernel for involuntary preemption Zengruan Ye (12): arm/paravirt: Use a single ops structure KVM: arm64: Document PV-sched interface KVM: arm64: Implement PV_SCHED_FEATURES call KVM: arm64: Support pvsched preempted via shared structure KVM: arm64: Add interface to support vCPU preempted check KVM: arm64: Support the vCPU preemption check KVM: arm64: Add SMCCC PV-sched to kick cpu KVM: arm64: Implement PV_SCHED_KICK_CPU call KVM: arm64: Add interface to support PV qspinlock KVM: arm64: Enable PV qspinlock KVM: arm64: Add tracepoints for PV qspinlock arm64: defconfig: add CONFIG_PARAVIRT_SPINLOCKS in default Documentation/virtual/kvm/arm/pvsched.txt | 72 ++++++++ arch/arm/include/asm/kvm_host.h | 25 +++ arch/arm/include/asm/paravirt.h | 9 +- arch/arm/kernel/paravirt.c | 4 +- arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/handle_exit.c | 2 +- arch/arm/mm/proc-v7-bugs.c | 13 +- arch/arm64/Kconfig | 14 ++ arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/kvm_host.h | 20 +++ arch/arm64/include/asm/paravirt.h | 63 ++++++- arch/arm64/include/asm/pvsched-abi.h | 16 ++ arch/arm64/include/asm/qspinlock.h | 15 +- arch/arm64/include/asm/qspinlock_paravirt.h | 12 ++ arch/arm64/include/asm/spinlock.h | 26 +++ arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/alternative.c | 5 +- arch/arm64/kernel/cpu_errata.c | 82 +++------ arch/arm64/kernel/paravirt-spinlocks.c | 18 ++ arch/arm64/kernel/paravirt.c | 188 +++++++++++++++++++- arch/arm64/kernel/setup.c | 2 + arch/arm64/kernel/trace-paravirt.h | 66 +++++++ arch/arm64/kvm/Makefile | 2 + arch/arm64/kvm/handle_exit.c | 5 +- arch/s390/kvm/interrupt.c | 2 +- drivers/xen/time.c | 4 + include/kvm/arm_hypercalls.h | 43 +++++ include/kvm/arm_psci.h | 2 +- include/linux/arm-smccc.h | 71 ++++++++ include/linux/cpuhotplug.h | 1 + include/linux/kvm_host.h | 23 +++ include/linux/kvm_types.h | 2 + kernel/locking/osq_lock.c | 23 ++- virt/kvm/arm/arm.c | 12 +- virt/kvm/arm/hypercalls.c | 72 ++++++++ virt/kvm/arm/psci.c | 76 +------- virt/kvm/arm/pvsched.c | 83 +++++++++ virt/kvm/arm/trace.h | 18 ++ virt/kvm/kvm_main.c | 17 +- 41 files changed, 939 insertions(+), 177 deletions(-) create mode 100644 Documentation/virtual/kvm/arm/pvsched.txt create mode 100644 arch/arm64/include/asm/pvsched-abi.h create mode 100644 arch/arm64/include/asm/qspinlock_paravirt.h create mode 100644 arch/arm64/kernel/paravirt-spinlocks.c create mode 100644 arch/arm64/kernel/trace-paravirt.h create mode 100644 include/kvm/arm_hypercalls.h create mode 100644 virt/kvm/arm/hypercalls.c create mode 100644 virt/kvm/arm/pvsched.c -- 2.25.1

1 20

[PATCH] printk: Export a symbol.
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xu Qiang <xuqiang36(a)huawei.com> ascend inclusion category: feature Bugzilla: N/A CVE: N/A ------------------------------------------- Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> Acked-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/printk/printk_safe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index af5f4e42ca54..63ba880a6df0 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -290,6 +290,7 @@ void printk_safe_flush_on_panic(void) printk_safe_flush(); } +EXPORT_SYMBOL_GPL(printk_safe_flush_on_panic); #ifdef CONFIG_PRINTK_NMI /* -- 2.25.1

1 0

[PATCH 1/7] serial: amba-pl011: Fix serial port discard interrupt when interrupt signal line of serial port is connected to mbigen.
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xu Qiang <xuqiang36(a)huawei.com> ascend inclusion category: bugfix Bugzilla: N/A CVE: N/A --------------------------------------- Hisi when designing ascend chip, connect the serial port interrupt signal lines to mbigen equipment, mbigen write GICD_SETSPI_NSR register trigger the SPI interrupt. This can result in serial port drop interrupts. Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/tty/serial/Kconfig | 18 ++++++++++ drivers/tty/serial/amba-pl011.c | 64 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index df8bd0c7b97d..66e69c7d10a3 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -73,6 +73,24 @@ config SERIAL_AMBA_PL011_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) +if ASCEND_FEATURES + +config SERIAL_ATTACHED_MBIGEN + bool "Serial port interrupt signal lines connected to the mbigen" + depends on SERIAL_AMBA_PL011=y + default n + help + Say Y here when the interrupt signal line of the serial port is + connected to the mbigne. The mbigen device has the function of + clearing interrupts automatically. However, the interrupt processing + function of the serial port driver may process multiple interrupts + at a time. The mbigen device cannot adapt to this scenario. + As a result, interrupts are lost.Because it maybe discard interrupt. + + If unsure, say N. + +endif + config SERIAL_EARLYCON_ARM_SEMIHOST bool "Early console using ARM semihosting" depends on ARM64 || ARM diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 1d501154e9f7..781a27eebf0b 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1473,6 +1473,63 @@ static void check_apply_cts_event_workaround(struct uart_amba_port *uap) dummy_read = pl011_read(uap, REG_ICR); } +#ifdef CONFIG_SERIAL_ATTACHED_MBIGEN +struct workaround_oem_info { + char oem_id[ACPI_OEM_ID_SIZE + 1]; + char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1]; + u32 oem_revision; +}; + +static bool pl011_enable_hisi_wkrd; +static struct workaround_oem_info pl011_wkrd_info[] = { + { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x300, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x301, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x400, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x401, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x402, + } +}; + +static void pl011_check_hisi_workaround(void) +{ + struct acpi_table_header *tbl; + acpi_status status = AE_OK; + int i; + + status = acpi_get_table(ACPI_SIG_MADT, 0, &tbl); + if (ACPI_FAILURE(status) || !tbl) + return; + + for (i = 0; i < ARRAY_SIZE(pl011_wkrd_info); i++) { + if (!memcmp(pl011_wkrd_info[i].oem_id, tbl->oem_id, ACPI_OEM_ID_SIZE) && + !memcmp(pl011_wkrd_info[i].oem_table_id, tbl->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) && + pl011_wkrd_info[i].oem_revision == tbl->oem_revision) { + pl011_enable_hisi_wkrd = true; + break; + } + } +} + +#else +#define pl011_enable_hisi_wkrd 0 +static inline void pl011_check_hisi_workaround(void){ } +#endif + static irqreturn_t pl011_int(int irq, void *dev_id) { struct uart_amba_port *uap = dev_id; @@ -1510,6 +1567,11 @@ static irqreturn_t pl011_int(int irq, void *dev_id) handled = 1; } + if (pl011_enable_hisi_wkrd) { + pl011_write(0, uap, REG_IMSC); + pl011_write(uap->im, uap, REG_IMSC); + } + spin_unlock_irqrestore(&uap->port.lock, flags); return IRQ_RETVAL(handled); @@ -1687,6 +1749,8 @@ static int pl011_hwinit(struct uart_port *port) if (plat->init) plat->init(); } + + pl011_check_hisi_workaround(); return 0; } -- 2.25.1

1 6

[PATCH] iommu: fix a mistake for iommu_unregister_device_fault_handler
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Bixuan Cui <cuibixuan(a)huawei.com> ascend inclusion category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- Fix a mistake check for commit bd6c06e0917d ("iommu: introduce device fault report API") Fixes: bd6c06e0917d ("iommu: introduce device fault report API") Signed-off-by: Bixuan Cui <cuibixuan(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 831c5065f7f8..bee6b8fcfe0e 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -982,7 +982,7 @@ int iommu_unregister_device_fault_handler(struct device *dev) mutex_lock(&param->lock); /* we cannot unregister handler if there are pending faults */ - if (list_empty(&param->fault_param->faults)) { + if (!list_empty(&param->fault_param->faults)) { ret = -EBUSY; goto unlock; } -- 2.25.1

1 0

[PATCH] x86/config: enable CONFIG_HINIC by default
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xie XiuQi <xiexiuqi(a)huawei.com> hulk inclusion cagegory: feature feature: support 1822 on x86 platform After patch "5d57d1e24808 net/hinic: Add support for X86 Arch", hinic driver could support x86 platform, so enable this config by default. Link: https://gitee.com/openeuler/kernel/issues/I1DC1F Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/x86/configs/hulk_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + arch/x86/configs/syzkaller_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/arch/x86/configs/hulk_defconfig b/arch/x86/configs/hulk_defconfig index ddd209c39445..6a1d3307e34e 100644 --- a/arch/x86/configs/hulk_defconfig +++ b/arch/x86/configs/hulk_defconfig @@ -2526,6 +2526,7 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=m CONFIG_E1000E=m CONFIG_E1000E_HWTS=y +CONFIG_HINIC=m CONFIG_IGB=m CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 4c9de1198798..747c6bd5967f 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -2523,6 +2523,7 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=m CONFIG_E1000E=m CONFIG_E1000E_HWTS=y +CONFIG_HINIC=m CONFIG_IGB=m CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y diff --git a/arch/x86/configs/syzkaller_defconfig b/arch/x86/configs/syzkaller_defconfig index 061f2fe87382..ff5f843e09c4 100644 --- a/arch/x86/configs/syzkaller_defconfig +++ b/arch/x86/configs/syzkaller_defconfig @@ -1716,6 +1716,7 @@ CONFIG_E1000=y CONFIG_E1000E=y CONFIG_E1000E_HWTS=y # CONFIG_IGB is not set +CONFIG_HINIC=m # CONFIG_IGBVF is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set -- 2.25.1

1 0

[PATCH 00/30] KVM RISC-V Support
by Xie XiuQi 19 Aug '20

19 Aug '20

This series adds initial KVM RISC-V support. Currently, we are able to boot RISC-V 64bit Linux Guests with multiple VCPUs. This series can be found in riscv_kvm_v13 branch at: https//github.com/avpatel/linux.git Link: https://gitee.com/openeuler/kernel/issues/I1RR1Y This is backported by Mingwang Li <limingwang(a)huawei.com>. Alistair Francis (1): Revert "riscv: Use latest system call ABI" Anup Patel (19): RISC-V: Add bitmap reprensenting ISA features common across CPUs RISC-V: Add fragmented config for debug options RISC-V: Enable CPU Hotplug in defconfigs RISC-V: Add hypervisor extension related CSR defines RISC-V: Add initial skeletal KVM support RISC-V: KVM: Implement VCPU create, init and destroy functions RISC-V: KVM: Implement VCPU interrupts and requests handling RISC-V: KVM: Implement KVM_GET_ONE_REG/KVM_SET_ONE_REG ioctls RISC-V: KVM: Implement VCPU world-switch RISC-V: KVM: Handle MMIO exits for VCPU RISC-V: KVM: Handle WFI exits for VCPU RISC-V: KVM: Implement VMID allocator RISC-V: KVM: Implement stage2 page table programming RISC-V: KVM: Implement MMU notifiers RISC-V: KVM: Document RISC-V specific parts of KVM API. RISC-V: KVM: Add MAINTAINERS entry RISC-V: Enable KVM for RV64 and RV32 RISC-V: KVM: Fix stage2_map_page() and kvm_riscv_vcpu_unpriv_read() RISC-V: KVM: Determine instruction correctly from HTINST CSR Atish Patra (9): RISC-V: Mark existing SBI as 0.1 SBI. RISC-V: Add basic support for SBI v0.2 RISC-V: Add SBI v0.2 extension definitions RISC-V: Introduce a new config for SBI v0.1 RISC-V: Implement new SBI v0.2 extensions RISC-V: KVM: Add timer functionality RISC-V: KVM: FP lazy save/restore RISC-V: KVM: Implement ONE REG interface for FP registers RISC-V: KVM: Add SBI v0.1 support limingwang (1): RISC-V: KVM: fix some interfaces problems Documentation/virt/kvm/api.txt | 169 +++- MAINTAINERS | 11 + arch/riscv/Kconfig | 9 + arch/riscv/Makefile | 2 + arch/riscv/configs/defconfig | 24 +- arch/riscv/configs/extra_debug.config | 21 + arch/riscv/configs/rv32_defconfig | 24 +- arch/riscv/include/asm/csr.h | 90 +- arch/riscv/include/asm/hwcap.h | 22 + arch/riscv/include/asm/kvm_host.h | 274 ++++++ arch/riscv/include/asm/kvm_vcpu_timer.h | 44 + arch/riscv/include/asm/pgtable-bits.h | 1 + arch/riscv/include/asm/sbi.h | 178 ++-- arch/riscv/include/uapi/asm/kvm.h | 127 +++ arch/riscv/include/uapi/asm/unistd.h | 5 +- arch/riscv/kernel/asm-offsets.c | 154 ++++ arch/riscv/kernel/cpufeature.c | 83 +- arch/riscv/kernel/sbi.c | 522 +++++++++++- arch/riscv/kernel/setup.c | 2 + arch/riscv/kvm/Kconfig | 34 + arch/riscv/kvm/Makefile | 14 + arch/riscv/kvm/main.c | 99 +++ arch/riscv/kvm/mmu.c | 804 ++++++++++++++++++ arch/riscv/kvm/tlb.S | 74 ++ arch/riscv/kvm/vcpu.c | 1037 +++++++++++++++++++++++ arch/riscv/kvm/vcpu_exit.c | 678 +++++++++++++++ arch/riscv/kvm/vcpu_sbi.c | 173 ++++ arch/riscv/kvm/vcpu_switch.S | 391 +++++++++ arch/riscv/kvm/vcpu_timer.c | 225 +++++ arch/riscv/kvm/vm.c | 86 ++ arch/riscv/kvm/vmid.c | 120 +++ drivers/clocksource/timer-riscv.c | 8 + include/clocksource/timer-riscv.h | 16 + include/uapi/linux/kvm.h | 8 + 34 files changed, 5402 insertions(+), 127 deletions(-) create mode 100644 arch/riscv/configs/extra_debug.config create mode 100644 arch/riscv/include/asm/kvm_host.h create mode 100644 arch/riscv/include/asm/kvm_vcpu_timer.h create mode 100644 arch/riscv/include/uapi/asm/kvm.h create mode 100644 arch/riscv/kvm/Kconfig create mode 100644 arch/riscv/kvm/Makefile create mode 100644 arch/riscv/kvm/main.c create mode 100644 arch/riscv/kvm/mmu.c create mode 100644 arch/riscv/kvm/tlb.S create mode 100644 arch/riscv/kvm/vcpu.c create mode 100644 arch/riscv/kvm/vcpu_exit.c create mode 100644 arch/riscv/kvm/vcpu_sbi.c create mode 100644 arch/riscv/kvm/vcpu_switch.S create mode 100644 arch/riscv/kvm/vcpu_timer.c create mode 100644 arch/riscv/kvm/vm.c create mode 100644 arch/riscv/kvm/vmid.c create mode 100644 include/clocksource/timer-riscv.h -- 2.20.1

2 32

[PATCH,V2,kernel-4.19 1/2] kexec: Add quick kexec support for kernel
by Sang Yan 18 Aug '20

18 Aug '20

euleros inclusion category: feature bugzilla: NA issues: #I1RC8Z CVE: NA In normal kexec, relocating kernel may cost 5 ~ 10 seconds, to copy all segments from vmalloced memory to kernel boot memory, because of disabled mmu. We introduce quick kexec to save time of copying memory as above, just like kdump(kexec on crash), by using reserved memory "Quick Kexec". Constructing quick kimage as the same as crash kernel, then simply copy all segments of kimage to reserved memroy. We also add this support in syscall kexec_load using flags of KEXEC_QUICK. Signed-off-by: Sang Yan <sangyan(a)huawei.com> --- arch/Kconfig | 9 +++++++++ include/linux/ioport.h | 1 + include/linux/kexec.h | 11 ++++++++++- include/uapi/linux/kexec.h | 1 + kernel/kexec.c | 10 ++++++++++ kernel/kexec_core.c | 41 ++++++++++++++++++++++++++++++++--------- 6 files changed, 63 insertions(+), 10 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index d3d70369..11580292 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -18,6 +18,15 @@ config KEXEC_CORE select CRASH_CORE bool +config QUICK_KEXEC + bool "Support for quick kexec" + depends on KEXEC_CORE + help + It uses pre-reserved memory to accelerate kexec, just like + crash kexec, loads new kernel and initrd to reserved memory, + and boots new kernel on that memory. It will save the time + of relocating kernel. + config HAVE_IMA_KEXEC bool diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5330288..1a438ec 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -139,6 +139,7 @@ enum { IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5, IORES_DESC_DEVICE_PRIVATE_MEMORY = 6, IORES_DESC_DEVICE_PUBLIC_MEMORY = 7, + IORES_DESC_QUICK_KEXEC = 8, }; /* helpers to define resources */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d6b8d0a..98cf0fb 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -233,9 +233,10 @@ struct kimage { unsigned long control_page; /* Flags to indicate special processing */ - unsigned int type : 1; + unsigned int type : 2; #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 +#define KEXEC_TYPE_QUICK 2 unsigned int preserve_context : 1; /* If set, we are using file mode kexec syscall */ unsigned int file_mode:1; @@ -296,6 +297,11 @@ extern int kexec_load_disabled; #define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT) #endif +#ifdef CONFIG_QUICK_KEXEC +#undef KEXEC_FLAGS +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_QUICK) +#endif + /* List of defined/legal kexec file flags */ #define KEXEC_FILE_FLAGS (KEXEC_FILE_UNLOAD | KEXEC_FILE_ON_CRASH | \ KEXEC_FILE_NO_INITRAMFS) @@ -305,6 +311,9 @@ extern int kexec_load_disabled; extern struct resource crashk_res; extern struct resource crashk_low_res; extern note_buf_t __percpu *crash_notes; +#ifdef CONFIG_QUICK_KEXEC +extern struct resource quick_kexec_res; +#endif /* flag to track if kexec reboot is in progress */ extern bool kexec_in_progress; diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 6d11286..ca3cebe 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -12,6 +12,7 @@ /* kexec flags for different usage scenarios */ #define KEXEC_ON_CRASH 0x00000001 #define KEXEC_PRESERVE_CONTEXT 0x00000002 +#define KEXEC_QUICK 0x00000004 #define KEXEC_ARCH_MASK 0xffff0000 /* diff --git a/kernel/kexec.c b/kernel/kexec.c index 6855980..47dfad7 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -46,6 +46,9 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, int ret; struct kimage *image; bool kexec_on_panic = flags & KEXEC_ON_CRASH; +#ifdef CONFIG_QUICK_KEXEC + bool kexec_on_quick = flags & KEXEC_QUICK; +#endif if (kexec_on_panic) { /* Verify we have a valid entry point */ @@ -71,6 +74,13 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, image->type = KEXEC_TYPE_CRASH; } +#ifdef CONFIG_QUICK_KEXEC + if (kexec_on_quick) { + image->control_page = quick_kexec_res.start; + image->type = KEXEC_TYPE_QUICK; + } +#endif + ret = sanity_check_segment_list(image); if (ret) goto out_free_image; diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index b36c9c4..595a757 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -74,6 +74,16 @@ struct resource crashk_low_res = { .desc = IORES_DESC_CRASH_KERNEL }; +#ifdef CONFIG_QUICK_KEXEC +struct resource quick_kexec_res = { + .name = "Quick kexec", + .start = 0, + .end = 0, + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_QUICK_KEXEC +}; +#endif + int kexec_should_crash(struct task_struct *p) { /* @@ -470,8 +480,10 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image, return pages; } -static struct page *kimage_alloc_crash_control_pages(struct kimage *image, - unsigned int order) + +static struct page *kimage_alloc_special_control_pages(struct kimage *image, + unsigned int order, + unsigned long end) { /* Control pages are special, they are the intermediaries * that are needed while we copy the rest of the pages @@ -501,7 +513,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, size = (1 << order) << PAGE_SHIFT; hole_start = (image->control_page + (size - 1)) & ~(size - 1); hole_end = hole_start + size - 1; - while (hole_end <= crashk_res.end) { + while (hole_end <= end) { unsigned long i; cond_resched(); @@ -536,7 +548,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, return pages; } - struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order) { @@ -547,8 +558,15 @@ struct page *kimage_alloc_control_pages(struct kimage *image, pages = kimage_alloc_normal_control_pages(image, order); break; case KEXEC_TYPE_CRASH: - pages = kimage_alloc_crash_control_pages(image, order); + pages = kimage_alloc_special_control_pages(image, order, + crashk_res.end); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + pages = kimage_alloc_special_control_pages(image, order, + quick_kexec_res.end); break; +#endif } return pages; @@ -898,11 +916,11 @@ static int kimage_load_normal_segment(struct kimage *image, return result; } -static int kimage_load_crash_segment(struct kimage *image, +static int kimage_load_special_segment(struct kimage *image, struct kexec_segment *segment) { - /* For crash dumps kernels we simply copy the data from - * user space to it's destination. + /* For crash dumps kernels and quick kexec kernels + * we simply copy the data from user space to it's destination. * We do things a page at a time for the sake of kmap. */ unsigned long maddr; @@ -976,8 +994,13 @@ int kimage_load_segment(struct kimage *image, result = kimage_load_normal_segment(image, segment); break; case KEXEC_TYPE_CRASH: - result = kimage_load_crash_segment(image, segment); + result = kimage_load_special_segment(image, segment); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + result = kimage_load_special_segment(image, segment); break; +#endif } return result; -- 2.9.5

1 1

[PATCH,V2,kernel-4.19 1/2] kexec: Add quick kexec support for kernel
by Sang Yan 18 Aug '20

18 Aug '20

euleros inclusion category: feature bugzilla: NA issues: #I1RC8Z CVE: NA In normal kexec, relocating kernel may cost 5 ~ 10 seconds, to copy all segments from vmalloced memory to kernel boot memory, because of disabled mmu. We introduce quick kexec to save time of copying memory as above, just like kdump(kexec on crash), by using reserved memory "Quick Kexec". Constructing quick kimage as the same as crash kernel, then simply copy all segments of kimage to reserved memroy. We also add this support in syscall kexec_load using flags of KEXEC_QUICK. Signed-off-by: Sang Yan <sangyan(a)huawei.com> --- arch/Kconfig | 9 +++++++++ include/linux/ioport.h | 1 + include/linux/kexec.h | 11 ++++++++++- include/uapi/linux/kexec.h | 1 + kernel/kexec.c | 10 ++++++++++ kernel/kexec_core.c | 41 ++++++++++++++++++++++++++++++++--------- 6 files changed, 63 insertions(+), 10 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index d3d70369..11580292 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -18,6 +18,15 @@ config KEXEC_CORE select CRASH_CORE bool +config QUICK_KEXEC + bool "Support for quick kexec" + depends on KEXEC_CORE + help + It uses pre-reserved memory to accelerate kexec, just like + crash kexec, loads new kernel and initrd to reserved memory, + and boots new kernel on that memory. It will save the time + of relocating kernel. + config HAVE_IMA_KEXEC bool diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5330288..1a438ec 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -139,6 +139,7 @@ enum { IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5, IORES_DESC_DEVICE_PRIVATE_MEMORY = 6, IORES_DESC_DEVICE_PUBLIC_MEMORY = 7, + IORES_DESC_QUICK_KEXEC = 8, }; /* helpers to define resources */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d6b8d0a..98cf0fb 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -233,9 +233,10 @@ struct kimage { unsigned long control_page; /* Flags to indicate special processing */ - unsigned int type : 1; + unsigned int type : 2; #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 +#define KEXEC_TYPE_QUICK 2 unsigned int preserve_context : 1; /* If set, we are using file mode kexec syscall */ unsigned int file_mode:1; @@ -296,6 +297,11 @@ extern int kexec_load_disabled; #define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT) #endif +#ifdef CONFIG_QUICK_KEXEC +#undef KEXEC_FLAGS +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_QUICK) +#endif + /* List of defined/legal kexec file flags */ #define KEXEC_FILE_FLAGS (KEXEC_FILE_UNLOAD | KEXEC_FILE_ON_CRASH | \ KEXEC_FILE_NO_INITRAMFS) @@ -305,6 +311,9 @@ extern int kexec_load_disabled; extern struct resource crashk_res; extern struct resource crashk_low_res; extern note_buf_t __percpu *crash_notes; +#ifdef CONFIG_QUICK_KEXEC +extern struct resource quick_kexec_res; +#endif /* flag to track if kexec reboot is in progress */ extern bool kexec_in_progress; diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 6d11286..ca3cebe 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -12,6 +12,7 @@ /* kexec flags for different usage scenarios */ #define KEXEC_ON_CRASH 0x00000001 #define KEXEC_PRESERVE_CONTEXT 0x00000002 +#define KEXEC_QUICK 0x00000004 #define KEXEC_ARCH_MASK 0xffff0000 /* diff --git a/kernel/kexec.c b/kernel/kexec.c index 6855980..47dfad7 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -46,6 +46,9 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, int ret; struct kimage *image; bool kexec_on_panic = flags & KEXEC_ON_CRASH; +#ifdef CONFIG_QUICK_KEXEC + bool kexec_on_quick = flags & KEXEC_QUICK; +#endif if (kexec_on_panic) { /* Verify we have a valid entry point */ @@ -71,6 +74,13 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, image->type = KEXEC_TYPE_CRASH; } +#ifdef CONFIG_QUICK_KEXEC + if (kexec_on_quick) { + image->control_page = quick_kexec_res.start; + image->type = KEXEC_TYPE_QUICK; + } +#endif + ret = sanity_check_segment_list(image); if (ret) goto out_free_image; diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index b36c9c4..595a757 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -74,6 +74,16 @@ struct resource crashk_low_res = { .desc = IORES_DESC_CRASH_KERNEL }; +#ifdef CONFIG_QUICK_KEXEC +struct resource quick_kexec_res = { + .name = "Quick kexec", + .start = 0, + .end = 0, + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_QUICK_KEXEC +}; +#endif + int kexec_should_crash(struct task_struct *p) { /* @@ -470,8 +480,10 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image, return pages; } -static struct page *kimage_alloc_crash_control_pages(struct kimage *image, - unsigned int order) + +static struct page *kimage_alloc_special_control_pages(struct kimage *image, + unsigned int order, + unsigned long end) { /* Control pages are special, they are the intermediaries * that are needed while we copy the rest of the pages @@ -501,7 +513,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, size = (1 << order) << PAGE_SHIFT; hole_start = (image->control_page + (size - 1)) & ~(size - 1); hole_end = hole_start + size - 1; - while (hole_end <= crashk_res.end) { + while (hole_end <= end) { unsigned long i; cond_resched(); @@ -536,7 +548,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, return pages; } - struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order) { @@ -547,8 +558,15 @@ struct page *kimage_alloc_control_pages(struct kimage *image, pages = kimage_alloc_normal_control_pages(image, order); break; case KEXEC_TYPE_CRASH: - pages = kimage_alloc_crash_control_pages(image, order); + pages = kimage_alloc_special_control_pages(image, order, + crashk_res.end); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + pages = kimage_alloc_special_control_pages(image, order, + quick_kexec_res.end); break; +#endif } return pages; @@ -898,11 +916,11 @@ static int kimage_load_normal_segment(struct kimage *image, return result; } -static int kimage_load_crash_segment(struct kimage *image, +static int kimage_load_special_segment(struct kimage *image, struct kexec_segment *segment) { - /* For crash dumps kernels we simply copy the data from - * user space to it's destination. + /* For crash dumps kernels and quick kexec kernels + * we simply copy the data from user space to it's destination. * We do things a page at a time for the sake of kmap. */ unsigned long maddr; @@ -976,8 +994,13 @@ int kimage_load_segment(struct kimage *image, result = kimage_load_normal_segment(image, segment); break; case KEXEC_TYPE_CRASH: - result = kimage_load_crash_segment(image, segment); + result = kimage_load_special_segment(image, segment); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + result = kimage_load_special_segment(image, segment); break; +#endif } return result; -- 2.9.5

1 1

[PATCH] defconfig: Update defconfigs for x86
by Yang Yingliang 18 Aug '20

18 Aug '20

From: Hanjun Guo <guohanjun(a)huawei.com> hulk inclusion category: feature bugzilla: NA CVE: NA --------------------------- New features were mereged but leave the defconfig un-updated, such as Hygon CPU support, update it now. Signed-off-by: Hanjun Guo <guohanjun(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/x86/configs/hulk_defconfig | 105 ++++++++++++-------------- arch/x86/configs/openeuler_defconfig | 66 ++++++---------- arch/x86/configs/storage_ci_defconfig | 40 ++++++---- arch/x86/configs/syzkaller_defconfig | 56 ++++++++++---- 4 files changed, 140 insertions(+), 127 deletions(-) diff --git a/arch/x86/configs/hulk_defconfig b/arch/x86/configs/hulk_defconfig index 0a74cfe00137..ddd209c39445 100644 --- a/arch/x86/configs/hulk_defconfig +++ b/arch/x86/configs/hulk_defconfig @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.21 Kernel Configuration +# Linux/x86 4.19.138 Kernel Configuration # # -# Compiler: gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28) +# Compiler: gcc 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=40805 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -46,6 +47,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y +CONFIG_KTASK=y # # IRQ subsystem @@ -150,14 +152,15 @@ CONFIG_CGROUP_PERF=y CONFIG_CGROUP_BPF=y # CONFIG_CGROUP_DEBUG is not set CONFIG_SOCK_CGROUP_DATA=y +# CONFIG_CGROUP_FILES is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y -CONFIG_CHECKPOINT_RESTORE=y CONFIG_SCHED_STEAL=y +CONFIG_CHECKPOINT_RESTORE=y CONFIG_SCHED_AUTOGROUP=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -169,6 +172,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_INITRAMFS_FILE_METADATA="" CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -307,6 +311,7 @@ CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set # CONFIG_XEN_PVH is not set CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y @@ -326,6 +331,7 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_HYGON=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y @@ -373,8 +379,8 @@ CONFIG_X86_DIRECT_GBPAGES=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_AMD_MEM_ENCRYPT=y # CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set -CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_NUMA=y +CONFIG_NUMA_AWARE_SPINLOCKS=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_NODES_SPAN_OTHER_NODES=y @@ -402,6 +408,9 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y # CONFIG_X86_INTEL_MPX is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y @@ -436,6 +445,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y # CONFIG_CMDLINE_BOOL is not set CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH_FTRACE=y +CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y # # Enable Livepatch @@ -578,6 +588,8 @@ CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_IDLE_GOV_TEO=y +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_HALTPOLL_CPUIDLE=y CONFIG_INTEL_IDLE=y # @@ -637,6 +649,7 @@ CONFIG_VMD=y # DesignWare PCI Core Support # # CONFIG_PCIE_DW_PLAT_HOST is not set +CONFIG_HISILICON_PCIE_CAE=m # # PCI Endpoint @@ -669,7 +682,6 @@ CONFIG_YENTA_TOSHIBA=y # Binary Emulations # CONFIG_IA32_EMULATION=y -# CONFIG_IA32_AOUT is not set # CONFIG_X86_X32 is not set CONFIG_COMPAT_32=y CONFIG_COMPAT=y @@ -731,6 +743,7 @@ CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_KVM_COMPAT=y CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_HAVE_KVM_NO_POLL=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -832,18 +845,16 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -# CONFIG_REFCOUNT_FULL is not set CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y # # GCOV-based kernel profiling # # CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_PLUGIN_HOSTCC="g++" +CONFIG_PLUGIN_HOSTCC="" CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -996,6 +1007,7 @@ CONFIG_THP_SWAP=y CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y +# CONFIG_SHRINK_PAGECACHE is not set # CONFIG_CMA is not set CONFIG_MEM_SOFT_DIRTY=y CONFIG_ZSWAP=y @@ -1940,6 +1952,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_HISILICON_SFC=m # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PARPORT=m @@ -2124,7 +2137,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_ENCLOSURE=m @@ -2505,6 +2517,9 @@ CONFIG_BE2NET_LANCER=y CONFIG_BE2NET_SKYHAWK=y # CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_HP is not set +CONFIG_NET_VENDOR_HUAWEI=y +# CONFIG_HINIC is not set +# CONFIG_BMA is not set # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y # CONFIG_E100 is not set @@ -2647,7 +2662,7 @@ CONFIG_LED_TRIGGER_PHY=y # CONFIG_AMD_PHY=m CONFIG_AQUANTIA_PHY=m -CONFIG_ASIX_PHY=m +# CONFIG_AX88796B_PHY is not set CONFIG_AT803X_PHY=m CONFIG_BCM7XXX_PHY=m CONFIG_BCM87XX_PHY=m @@ -3286,6 +3301,7 @@ CONFIG_NOZOMI=m CONFIG_N_HDLC=m CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -3358,7 +3374,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=y CONFIG_NVRAM=y -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_MWAVE is not set CONFIG_RAW_DRIVER=y @@ -3602,6 +3617,7 @@ CONFIG_GPIO_ICH=m # PCI GPIO expanders # # CONFIG_GPIO_AMD8111 is not set +# CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_PCI_IDIO_16 is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3964,8 +3980,6 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set CONFIG_LPC_ICH=m CONFIG_LPC_SCH=m -# CONFIG_INTEL_SOC_PMIC is not set -# CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set CONFIG_MFD_INTEL_LPSS=y CONFIG_MFD_INTEL_LPSS_ACPI=y @@ -4010,7 +4024,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_TPS6507X is not set # CONFIG_MFD_TPS65086 is not set # CONFIG_MFD_TPS65090 is not set -# CONFIG_MFD_TPS68470 is not set # CONFIG_MFD_TI_LP873X is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set @@ -4082,9 +4095,6 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m CONFIG_DVB_CORE=m # CONFIG_DVB_MMAP is not set CONFIG_DVB_NET=y @@ -4158,7 +4168,6 @@ CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y # CONFIG_VIDEO_CPIA2 is not set -CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m # CONFIG_VIDEO_USBTV is not set @@ -4181,13 +4190,6 @@ CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828_V4L2=y # CONFIG_VIDEO_AU0828_RC is not set -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices @@ -4272,16 +4274,11 @@ CONFIG_VIDEO_IVTV=m # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set # CONFIG_VIDEO_IVTV_ALSA is not set CONFIG_VIDEO_FB_IVTV=m -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_MXB is not set # CONFIG_VIDEO_DT3155 is not set # # Media capture/analog/hybrid TV support # -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m CONFIG_MEDIA_ALTERA_CI=m # CONFIG_VIDEO_CX25821 is not set @@ -4291,8 +4288,6 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m # CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y @@ -4302,14 +4297,9 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_DVB_AV7110_IR=y -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set CONFIG_DVB_PLUTO2=m @@ -4376,7 +4366,6 @@ CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y # CONFIG_SMS_SIANO_DEBUGFS is not set @@ -4391,11 +4380,8 @@ CONFIG_VIDEO_IR_I2C=m # # Audio decoders, processors and mixers # -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m @@ -4519,7 +4505,6 @@ CONFIG_DVB_MN88473=m # # DVB-S (satellite) frontends # -CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m CONFIG_DVB_ZL10036=m @@ -4532,12 +4517,10 @@ CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m CONFIG_DVB_VES1X93=m CONFIG_DVB_TUNER_ITD1000=m CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_CX24117=m CONFIG_DVB_CX24120=m @@ -4550,8 +4533,6 @@ CONFIG_DVB_TDA10071=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m CONFIG_DVB_DRXD=m @@ -4587,7 +4568,6 @@ CONFIG_DVB_STV0297=m # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m @@ -4707,6 +4687,7 @@ CONFIG_CHASH=m # CONFIG_CHASH_STATS is not set # CONFIG_CHASH_SELFTEST is not set CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_MMU is not set @@ -4755,10 +4736,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -5559,7 +5540,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set @@ -5948,7 +5928,6 @@ CONFIG_VFIO_PCI_INTX=y # CONFIG_VFIO_PCI_IGD is not set CONFIG_VFIO_MDEV=m CONFIG_VFIO_MDEV_DEVICE=m -# CONFIG_VFIO_SPIMDEV is not set CONFIG_IRQ_BYPASS_MANAGER=m # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO=y @@ -6065,6 +6044,7 @@ CONFIG_PVPANIC=y CONFIG_MLX_PLATFORM=m CONFIG_INTEL_TURBO_MAX_3=y # CONFIG_I2C_MULTI_INSTANTIATE is not set +# CONFIG_INTEL_ATOMISP2_PM is not set CONFIG_PMC_ATOM=y # CONFIG_CHROME_PLATFORMS is not set CONFIG_MELLANOX_PLATFORM=y @@ -6100,9 +6080,14 @@ CONFIG_IOMMU_SUPPORT=y # # Generic IOMMU Pagetable Support # + +# +# Generic PASID table support +# # CONFIG_IOMMU_DEBUGFS is not set CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y CONFIG_IOMMU_IOVA=y +# CONFIG_IOMMU_PROCESS is not set CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y @@ -6111,6 +6096,7 @@ CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_IRQ_REMAP=y +# CONFIG_SMMU_BYPASS_DEV is not set # # Remoteproc drivers @@ -6153,6 +6139,8 @@ CONFIG_IRQ_REMAP=y # Xilinx SoC drivers # # CONFIG_XILINX_VCU is not set +CONFIG_SOC_HISILICON_LBC=m +CONFIG_SOC_HISILICON_SYSCTL=m # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set @@ -6581,6 +6569,7 @@ CONFIG_NVMEM=y # CONFIG_FPGA is not set # CONFIG_UNISYS_VISORBUS is not set # CONFIG_SIOX is not set +# CONFIG_UACCE is not set # CONFIG_SLIMBUS is not set # @@ -6676,7 +6665,6 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" # CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_NTFS_FS is not set # # Pseudo filesystems @@ -6927,6 +6915,7 @@ CONFIG_IMA_APPRAISE_BOOTPARAM=y CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_BLACKLIST_KEYRING is not set # CONFIG_IMA_LOAD_X509 is not set +# CONFIG_IMA_DIGEST_LIST is not set CONFIG_EVM=y CONFIG_EVM_ATTR_FSUUID=y # CONFIG_EVM_ADD_XATTRS is not set @@ -7142,13 +7131,15 @@ CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CHELSIO_IPSEC_INLINE=y # CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set CONFIG_CRYPTO_DEV_VIRTIO=m -# CONFIG_CRYPTO_DEV_HISILICON is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set CONFIG_SIGNED_PE_FILE_VERIFICATION=y +# CONFIG_PGP_LIBRARY is not set +# CONFIG_PGP_KEY_PARSER is not set +# CONFIG_PGP_PRELOAD is not set # # Certificates for signature checking @@ -7160,6 +7151,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SECONDARY_TRUSTED_KEYRING is not set CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" +# CONFIG_PGP_PRELOAD_PUBLIC_KEYS is not set CONFIG_BINARY_PRINTF=y # @@ -7191,6 +7183,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m +CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -7325,6 +7318,8 @@ CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_HAVE_ARCH_KASAN=y # CONFIG_KASAN is not set CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set CONFIG_DEBUG_SHIRQ=y # diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 8a05478477dc..4c9de1198798 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1,5 +1,13 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 4.19.138 Kernel Configuration +# + +# +# Compiler: gcc 7.5.0 +# CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=50400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -151,8 +159,8 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y -CONFIG_CHECKPOINT_RESTORE=y CONFIG_SCHED_STEAL=y +CONFIG_CHECKPOINT_RESTORE=y CONFIG_SCHED_AUTOGROUP=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -303,6 +311,7 @@ CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set # CONFIG_XEN_PVH is not set CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y @@ -322,6 +331,7 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_HYGON=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y @@ -700,17 +710,15 @@ CONFIG_FW_CFG_SYSFS=y # # EFI (Extensible Firmware Interface) Support # -#CONFIG_EFI_VARS is not set +# CONFIG_EFI_VARS is not set CONFIG_EFI_ESRT=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_WRAPPERS=y -# CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y # CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y CONFIG_EFI_DEV_PATH_PARSER=y @@ -731,6 +739,7 @@ CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_KVM_COMPAT=y CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_HAVE_KVM_NO_POLL=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m @@ -832,8 +841,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -# CONFIG_REFCOUNT_FULL is not set CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y @@ -842,9 +849,8 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y # # CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_PLUGIN_HOSTCC="g++" +CONFIG_PLUGIN_HOSTCC="" CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -2128,7 +2134,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_ENCLOSURE=m @@ -2509,6 +2514,8 @@ CONFIG_BE2NET_LANCER=y CONFIG_BE2NET_SKYHAWK=y # CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_HP is not set +CONFIG_NET_VENDOR_HUAWEI=y +# CONFIG_HINIC is not set CONFIG_BMA=m # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y @@ -3609,6 +3616,7 @@ CONFIG_GPIO_ICH=m # PCI GPIO expanders # # CONFIG_GPIO_AMD8111 is not set +# CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_ML_IOH is not set # CONFIG_GPIO_PCI_IDIO_16 is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -4085,9 +4093,6 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_TUNER=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m CONFIG_DVB_CORE=m # CONFIG_DVB_MMAP is not set CONFIG_DVB_NET=y @@ -4161,7 +4166,6 @@ CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y # CONFIG_VIDEO_CPIA2 is not set -CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m # CONFIG_VIDEO_USBTV is not set @@ -4184,13 +4188,6 @@ CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828_V4L2=y # CONFIG_VIDEO_AU0828_RC is not set -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices @@ -4275,16 +4272,11 @@ CONFIG_VIDEO_IVTV=m # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set # CONFIG_VIDEO_IVTV_ALSA is not set CONFIG_VIDEO_FB_IVTV=m -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_MXB is not set # CONFIG_VIDEO_DT3155 is not set # # Media capture/analog/hybrid TV support # -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m CONFIG_MEDIA_ALTERA_CI=m # CONFIG_VIDEO_CX25821 is not set @@ -4294,8 +4286,6 @@ CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m # CONFIG_VIDEO_CX88_ENABLE_VP3054 is not set CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y @@ -4305,14 +4295,9 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_DVB_AV7110_IR=y -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set CONFIG_DVB_PLUTO2=m @@ -4379,7 +4364,6 @@ CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y # CONFIG_SMS_SIANO_DEBUGFS is not set @@ -4394,11 +4378,8 @@ CONFIG_VIDEO_IR_I2C=m # # Audio decoders, processors and mixers # -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m @@ -4522,7 +4503,6 @@ CONFIG_DVB_MN88473=m # # DVB-S (satellite) frontends # -CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m CONFIG_DVB_ZL10036=m @@ -4535,12 +4515,10 @@ CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m CONFIG_DVB_VES1X93=m CONFIG_DVB_TUNER_ITD1000=m CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_CX24117=m CONFIG_DVB_CX24120=m @@ -4553,8 +4531,6 @@ CONFIG_DVB_TDA10071=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m CONFIG_DVB_DRXD=m @@ -4590,7 +4566,6 @@ CONFIG_DVB_STV0297=m # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m @@ -6110,6 +6085,7 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_IOMMU_DEBUGFS is not set CONFIG_IOMMU_DEFAULT_PASSTHROUGH=y CONFIG_IOMMU_IOVA=y +# CONFIG_IOMMU_PROCESS is not set CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y @@ -6894,7 +6870,7 @@ CONFIG_SECURITY_NETWORK=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_NETWORK_XFRM=y -# CONFIG_SECURITY_PATH is not set +CONFIG_SECURITY_PATH=y CONFIG_INTEL_TXT=y CONFIG_LSM_MMAP_MIN_ADDR=65535 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y @@ -7349,6 +7325,8 @@ CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_HAVE_ARCH_KASAN=y # CONFIG_KASAN is not set CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set CONFIG_DEBUG_SHIRQ=y # diff --git a/arch/x86/configs/storage_ci_defconfig b/arch/x86/configs/storage_ci_defconfig index c7344e20d964..889f42e8a968 100644 --- a/arch/x86/configs/storage_ci_defconfig +++ b/arch/x86/configs/storage_ci_defconfig @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.44 Kernel Configuration +# Linux/x86 4.19.138 Kernel Configuration # # -# Compiler: gcc (Ubuntu 5.4.0-6ubuntu1~16.04.10) 5.4.0 20160609 +# Compiler: gcc (Ubuntu 7.5.0-6ubuntu2) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=50400 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -47,6 +48,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y +CONFIG_KTASK=y # # IRQ subsystem @@ -157,8 +159,8 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y -# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_SCHED_STEAL=y +# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_SCHED_AUTOGROUP=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -170,6 +172,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_INITRAMFS_FILE_METADATA="" CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -298,6 +301,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_XEN is not set CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y @@ -317,6 +321,7 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_HYGON=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y @@ -391,6 +396,9 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y @@ -422,6 +430,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y # CONFIG_CMDLINE_BOOL is not set CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH_FTRACE=y +CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y # # Enable Livepatch @@ -551,6 +560,8 @@ CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_IDLE_GOV_TEO=y +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_HALTPOLL_CPUIDLE=y CONFIG_INTEL_IDLE=y # @@ -607,6 +618,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y # DesignWare PCI Core Support # # CONFIG_PCIE_DW_PLAT_HOST is not set +CONFIG_HISILICON_PCIE_CAE=m # # PCI Endpoint @@ -627,7 +639,6 @@ CONFIG_AMD_NB=y # Binary Emulations # CONFIG_IA32_EMULATION=y -# CONFIG_IA32_AOUT is not set # CONFIG_X86_X32 is not set CONFIG_COMPAT_32=y CONFIG_COMPAT=y @@ -646,7 +657,6 @@ CONFIG_FIRMWARE_MEMMAP=y # CONFIG_DMIID is not set # CONFIG_DMI_SYSFS is not set CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -CONFIG_ISCSI_IBFT_FIND=y # CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -663,7 +673,6 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y # CONFIG_EFI_TEST is not set # CONFIG_APPLE_PROPERTIES is not set # CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y @@ -760,8 +769,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -# CONFIG_REFCOUNT_FULL is not set CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y # @@ -1348,7 +1355,6 @@ CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set CONFIG_SCSI_CONSTANTS=y @@ -1670,6 +1676,8 @@ CONFIG_NET_VENDOR_EMULEX=y CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_HP=y # CONFIG_HP100 is not set +CONFIG_NET_VENDOR_HUAWEI=y +# CONFIG_BMA is not set CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_INTEL=y # CONFIG_E100 is not set @@ -2049,10 +2057,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -2537,7 +2545,6 @@ CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_FAT_DEFAULT_UTF8 is not set -# CONFIG_NTFS_FS is not set # # Pseudo filesystems @@ -2962,6 +2969,9 @@ CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PGP_LIBRARY is not set +# CONFIG_PGP_KEY_PARSER is not set +# CONFIG_PGP_PRELOAD is not set # # Certificates for signature checking @@ -2971,6 +2981,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +# CONFIG_PGP_PRELOAD_PUBLIC_KEYS is not set CONFIG_BINARY_PRINTF=y # @@ -3002,6 +3013,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=y # CONFIG_CRC8 is not set +CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y @@ -3128,6 +3140,8 @@ CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_HAVE_ARCH_KASAN=y # CONFIG_KASAN is not set CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set CONFIG_DEBUG_SHIRQ=y # diff --git a/arch/x86/configs/syzkaller_defconfig b/arch/x86/configs/syzkaller_defconfig index fe45137f8529..061f2fe87382 100644 --- a/arch/x86/configs/syzkaller_defconfig +++ b/arch/x86/configs/syzkaller_defconfig @@ -1,14 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.32 Kernel Configuration +# Linux/x86 4.19.138 Kernel Configuration # # -# Compiler: gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0 +# Compiler: gcc (Ubuntu 7.5.0-6ubuntu2) 7.5.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70300 +CONFIG_GCC_VERSION=70500 CONFIG_CLANG_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -47,6 +48,7 @@ CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y +CONFIG_KTASK=y # # IRQ subsystem @@ -158,6 +160,7 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y +# CONFIG_SCHED_STEAL is not set # CONFIG_CHECKPOINT_RESTORE is not set CONFIG_SCHED_AUTOGROUP=y # CONFIG_SYSFS_DEPRECATED is not set @@ -170,6 +173,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_INITRAMFS_FILE_METADATA="" CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -311,6 +315,7 @@ CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set # CONFIG_XEN_PVH is not set CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y @@ -330,6 +335,7 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_HYGON=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y @@ -377,6 +383,7 @@ CONFIG_X86_DIRECT_GBPAGES=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y # CONFIG_AMD_MEM_ENCRYPT is not set CONFIG_NUMA=y +CONFIG_NUMA_AWARE_SPINLOCKS=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_NODES_SPAN_OTHER_NODES=y @@ -403,6 +410,9 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y @@ -433,6 +443,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y # CONFIG_CMDLINE_BOOL is not set CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH_FTRACE=y +CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y # # Enable Livepatch @@ -562,6 +573,9 @@ CONFIG_X86_INTEL_PSTATE=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_CPU_IDLE_GOV_TEO is not set +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_HALTPOLL_CPUIDLE=y CONFIG_INTEL_IDLE=y # @@ -620,6 +634,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y # DesignWare PCI Core Support # # CONFIG_PCIE_DW_PLAT_HOST is not set +CONFIG_HISILICON_PCIE_CAE=m # # PCI Endpoint @@ -647,7 +662,6 @@ CONFIG_CARDBUS=y # Binary Emulations # CONFIG_IA32_EMULATION=y -# CONFIG_IA32_AOUT is not set # CONFIG_X86_X32 is not set CONFIG_COMPAT_32=y CONFIG_COMPAT=y @@ -666,7 +680,6 @@ CONFIG_FIRMWARE_MEMMAP=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -CONFIG_ISCSI_IBFT_FIND=y # CONFIG_ISCSI_IBFT is not set # CONFIG_FW_CFG_SYSFS is not set # CONFIG_GOOGLE_FIRMWARE is not set @@ -782,8 +795,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -# CONFIG_REFCOUNT_FULL is not set CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y # @@ -1610,6 +1621,7 @@ CONFIG_IPVLAN=y # CONFIG_IPVTAP is not set # CONFIG_VXLAN is not set # CONFIG_GENEVE is not set +# CONFIG_GTP is not set # CONFIG_MACSEC is not set # CONFIG_NETCONSOLE is not set CONFIG_TUN=y @@ -1694,6 +1706,9 @@ CONFIG_NET_VENDOR_EMULEX=y # CONFIG_BE2NET is not set CONFIG_NET_VENDOR_EZCHIP=y # CONFIG_NET_VENDOR_HP is not set +CONFIG_NET_VENDOR_HUAWEI=y +# CONFIG_HINIC is not set +# CONFIG_BMA is not set # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y # CONFIG_E100 is not set @@ -1795,7 +1810,7 @@ CONFIG_SWPHY=y # # CONFIG_AMD_PHY is not set # CONFIG_AQUANTIA_PHY is not set -# CONFIG_ASIX_PHY is not set +# CONFIG_AX88796B_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_BCM7XXX_PHY is not set # CONFIG_BCM87XX_PHY is not set @@ -2039,6 +2054,7 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_N_HDLC is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2098,7 +2114,6 @@ CONFIG_HW_RANDOM_INTEL=y CONFIG_HW_RANDOM_AMD=y CONFIG_HW_RANDOM_VIA=y CONFIG_NVRAM=y -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_MWAVE is not set CONFIG_RAW_DRIVER=y @@ -2475,10 +2490,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -2825,7 +2840,6 @@ CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set @@ -3108,7 +3122,6 @@ CONFIG_STAGING=y # Gasket devices # # CONFIG_STAGING_GASKET_FRAMEWORK is not set -# CONFIG_XIL_AXIS_FIFO is not set # CONFIG_EROFS_FS is not set CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_ACER_WIRELESS is not set @@ -3148,6 +3161,7 @@ CONFIG_PVPANIC=y # CONFIG_SURFACE_PRO3_BUTTON is not set # CONFIG_INTEL_PUNIT_IPC is not set # CONFIG_INTEL_TURBO_MAX_3 is not set +# CONFIG_INTEL_ATOMISP2_PM is not set CONFIG_PMC_ATOM=y # CONFIG_CHROME_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set @@ -3176,6 +3190,10 @@ CONFIG_IOMMU_SUPPORT=y # # Generic IOMMU Pagetable Support # + +# +# Generic PASID table support +# # CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_IOVA=y @@ -3187,6 +3205,7 @@ CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_IRQ_REMAP=y +# CONFIG_SMMU_BYPASS_DEV is not set # # Remoteproc drivers @@ -3229,6 +3248,8 @@ CONFIG_IRQ_REMAP=y # Xilinx SoC drivers # # CONFIG_XILINX_VCU is not set +CONFIG_SOC_HISILICON_LBC=m +CONFIG_SOC_HISILICON_SYSCTL=m CONFIG_PM_DEVFREQ=y # @@ -3299,6 +3320,7 @@ CONFIG_NVMEM=y CONFIG_PM_OPP=y # CONFIG_UNISYS_VISORBUS is not set # CONFIG_SIOX is not set +# CONFIG_UACCE is not set # CONFIG_SLIMBUS is not set # @@ -3359,7 +3381,6 @@ CONFIG_AUTOFS_FS=y # # CONFIG_MSDOS_FS is not set # CONFIG_VFAT_FS is not set -# CONFIG_NTFS_FS is not set # # Pseudo filesystems @@ -3536,6 +3557,7 @@ CONFIG_IMA_APPRAISE_BOOTPARAM=y CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_BLACKLIST_KEYRING is not set # CONFIG_IMA_LOAD_X509 is not set +# CONFIG_IMA_DIGEST_LIST is not set CONFIG_EVM=y CONFIG_EVM_ATTR_FSUUID=y # CONFIG_EVM_ADD_XATTRS is not set @@ -3726,13 +3748,15 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set -# CONFIG_CRYPTO_DEV_HISILICON is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set CONFIG_SIGNED_PE_FILE_VERIFICATION=y +# CONFIG_PGP_LIBRARY is not set +# CONFIG_PGP_KEY_PARSER is not set +# CONFIG_PGP_PRELOAD is not set # # Certificates for signature checking @@ -3743,6 +3767,7 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SECONDARY_TRUSTED_KEYRING is not set # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +# CONFIG_PGP_PRELOAD_PUBLIC_KEYS is not set CONFIG_BINARY_PRINTF=y # @@ -3773,6 +3798,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set # CONFIG_CRC8 is not set +CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -- 2.25.1

1 0

[PATCH] x86/config: enable CONFIG_HINIC by default
by Yang Yingliang 18 Aug '20

18 Aug '20

From: Xie XiuQi <xiexiuqi(a)huawei.com> hulk inclusion cagegory: feature feature: support 1822 on x86 platform After patch "5d57d1e24808 net/hinic: Add support for X86 Arch", hinic driver could support x86 platform, so enable this config by default. Link: https://gitee.com/openeuler/kernel/issues/I1DC1F Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/x86/configs/hulk_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + arch/x86/configs/syzkaller_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/arch/x86/configs/hulk_defconfig b/arch/x86/configs/hulk_defconfig index ddd209c39445..6a1d3307e34e 100644 --- a/arch/x86/configs/hulk_defconfig +++ b/arch/x86/configs/hulk_defconfig @@ -2526,6 +2526,7 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=m CONFIG_E1000E=m CONFIG_E1000E_HWTS=y +CONFIG_HINIC=m CONFIG_IGB=m CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 4c9de1198798..747c6bd5967f 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -2523,6 +2523,7 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=m CONFIG_E1000E=m CONFIG_E1000E_HWTS=y +CONFIG_HINIC=m CONFIG_IGB=m CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y diff --git a/arch/x86/configs/syzkaller_defconfig b/arch/x86/configs/syzkaller_defconfig index 061f2fe87382..ff5f843e09c4 100644 --- a/arch/x86/configs/syzkaller_defconfig +++ b/arch/x86/configs/syzkaller_defconfig @@ -1716,6 +1716,7 @@ CONFIG_E1000=y CONFIG_E1000E=y CONFIG_E1000E_HWTS=y # CONFIG_IGB is not set +CONFIG_HINIC=m # CONFIG_IGBVF is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set -- 2.25.1

1 0

[PATCH] cgroup: add missing skcd->no_refcnt check in cgroup_sk_clone()
by Yang Yingliang 17 Aug '20

17 Aug '20

hulk inclusion category: bugfix bugzilla: CVE: NA --------------------------- Add skcd->no_refcnt check which is missed when backporting ad0f75e5f57c ("cgroup: fix cgroup_sk_alloc() for sk_clone_lock()"). This patch is needed in stable-4.9, stable-4.14 and stable-4.19. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/cgroup/cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 12fd72d94b7b..e38da89fad66 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5955,6 +5955,8 @@ void cgroup_sk_clone(struct sock_cgroup_data *skcd) { /* Socket clone path */ if (skcd->val) { + if (skcd->is_data & 2) + return; /* * We might be cloning a socket which is left in an empty * cgroup and the cgroup might have already been rmdir'd. -- 2.25.1

1 0

[PATCH 1/6] net/hinic: Fix misspelled word and wrong print format
by Yang Yingliang 17 Aug '20

17 Aug '20

From: Chiqijun <chiqijun(a)huawei.com> driver inclusion category: bugfix bugzilla: 4472 ----------------------------------------------------------------------- Fix misspelled word and wrong print format. Signed-off-by: Chiqijun <chiqijun(a)huawei.com> Reviewed-by: Zengweiliang <zengweiliang.zengweiliang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../net/ethernet/huawei/hinic/hinic_api_cmd.c | 4 +- drivers/net/ethernet/huawei/hinic/hinic_cfg.c | 20 +++--- .../net/ethernet/huawei/hinic/hinic_cmdq.c | 4 +- drivers/net/ethernet/huawei/hinic/hinic_dcb.c | 34 +++++----- drivers/net/ethernet/huawei/hinic/hinic_eqs.c | 4 +- .../net/ethernet/huawei/hinic/hinic_ethtool.c | 20 +++--- .../net/ethernet/huawei/hinic/hinic_hwdev.c | 40 +++++------ drivers/net/ethernet/huawei/hinic/hinic_lld.c | 20 +++--- .../net/ethernet/huawei/hinic/hinic_main.c | 6 +- .../net/ethernet/huawei/hinic/hinic_mbox.c | 9 +-- .../net/ethernet/huawei/hinic/hinic_mgmt.c | 20 +++--- .../net/ethernet/huawei/hinic/hinic_nic_cfg.c | 34 +++++----- .../net/ethernet/huawei/hinic/hinic_nic_dbg.c | 6 +- .../net/ethernet/huawei/hinic/hinic_nic_io.c | 2 +- .../net/ethernet/huawei/hinic/hinic_nictool.c | 68 +++++++++---------- .../ethernet/huawei/hinic/hinic_port_cmd.h | 2 +- .../net/ethernet/huawei/hinic/hinic_sriov.c | 4 +- drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 +- drivers/net/ethernet/huawei/hinic/hinic_wq.c | 2 +- 19 files changed, 154 insertions(+), 149 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c b/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c index 5a1e8655be38..6ce69dc73064 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_api_cmd.c @@ -129,7 +129,7 @@ static void dump_api_chain_reg(struct hinic_api_cmd_chain *chain) addr = HINIC_CSR_API_CMD_STATUS_0_ADDR(chain->chain_type); val = hinic_hwif_read_reg(chain->hwdev->hwif, addr); - sdk_err(dev, "Chain type: 0x%x, cpld error: 0x%x, check error: 0x%x, current fsm: 0x%x\n", + sdk_err(dev, "Chain type: 0x%x, cpld error: 0x%x, check error: 0x%x, current fsm: 0x%x\n", chain->chain_type, HINIC_API_CMD_STATUS_GET(val, CPLD_ERR), HINIC_API_CMD_STATUS_GET(val, CHKSUM_ERR), HINIC_API_CMD_STATUS_GET(val, FSM)); @@ -161,7 +161,7 @@ static int chain_busy(struct hinic_api_cmd_chain *chain) resp_header = be64_to_cpu(ctxt->resp->header); if (ctxt->status && !HINIC_API_CMD_RESP_HEADER_VALID(resp_header)) { - sdk_err(dev, "Context(0x%x) busy!, pi: %d, resp_header: 0x%08x%08x\n", + sdk_err(dev, "Context(0x%x) busy, pi: %d, resp_header: 0x%08x%08x\n", ctxt->status, chain->prod_idx, upper_32_bits(resp_header), lower_32_bits(resp_header)); diff --git a/drivers/net/ethernet/huawei/hinic/hinic_cfg.c b/drivers/net/ethernet/huawei/hinic/hinic_cfg.c index 18937d7d9057..303225e5689e 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_cfg.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_cfg.c @@ -629,7 +629,7 @@ static int get_cap_from_pf(struct hinic_hwdev *dev, enum func_type type) err = hinic_msg_to_mgmt_sync(dev, HINIC_MOD_CFGM, HINIC_CFG_MBOX_CAP, &dev_cap, in_len, &dev_cap, &out_len, 0); if (err || dev_cap.status || !out_len) { - sdk_err(dev->dev_hdl, "Failed to get capability from PF, err: %d, status: 0x%x, out size: 0x%x\n", + sdk_err(dev->dev_hdl, "Failed to get capability from PF, err: %d, status: 0x%x, out size: 0x%x\n", err, dev_cap.status, out_len); return -EFAULT; } @@ -925,7 +925,7 @@ int hinic_vector_to_eqn(void *hwdev, enum hinic_service_type type, int vector) if (type != SERVICE_T_ROCE && type != SERVICE_T_IWARP) { sdk_err(dev->dev_hdl, - "Service type :%d, only RDMA service could get eqn by vector.\n", + "Service type: %d, only RDMA service could get eqn by vector\n", type); return -EINVAL; } @@ -982,7 +982,7 @@ static int cfg_enable_interrupt(struct hinic_hwdev *dev) irq_info = cfg_mgmt->irq_param_info.alloc_info; - sdk_info(dev->dev_hdl, "Interrupt type: %d, irq num: %d.\n", + sdk_info(dev->dev_hdl, "Interrupt type: %d, irq num: %d\n", cfg_mgmt->svc_cap.interrupt_type, nreq); switch (cfg_mgmt->svc_cap.interrupt_type) { @@ -1001,7 +1001,7 @@ static int cfg_enable_interrupt(struct hinic_hwdev *dev) actual_irq = pci_enable_msix_range(pcidev, entry, VECTOR_THRESHOLD, nreq); if (actual_irq < 0) { - sdk_err(dev->dev_hdl, "Alloc msix entries with threshold 2 failed.\n"); + sdk_err(dev->dev_hdl, "Alloc msix entries with threshold 2 failed\n"); kfree(entry); return -ENOMEM; } @@ -1009,7 +1009,7 @@ static int cfg_enable_interrupt(struct hinic_hwdev *dev) nreq = (u16)actual_irq; cfg_mgmt->irq_param_info.num_total = nreq; cfg_mgmt->irq_param_info.num_irq_remain = nreq; - sdk_info(dev->dev_hdl, "Request %d msix vector success.\n", + sdk_info(dev->dev_hdl, "Request %d msix vector success\n", nreq); for (i = 0; i < nreq; ++i) { @@ -1059,12 +1059,12 @@ int hinic_alloc_irqs(void *hwdev, enum hinic_service_type type, u16 num, if (num > free_num_irq) { if (free_num_irq == 0) { sdk_err(dev->dev_hdl, - "no free irq resource in cfg mgmt.\n"); + "no free irq resource in cfg mgmt\n"); mutex_unlock(&irq_info->irq_mutex); return -ENOMEM; } - sdk_warn(dev->dev_hdl, "only %d irq resource in cfg mgmt.\n", + sdk_warn(dev->dev_hdl, "only %d irq resource in cfg mgmt\n", free_num_irq); num = free_num_irq; } @@ -1125,7 +1125,7 @@ void hinic_free_irq(void *hwdev, enum hinic_service_type type, u32 irq_id) alloc_info[i].free = CFG_FREE; irq_info->num_irq_remain++; if (irq_info->num_irq_remain > max_num_irq) { - sdk_err(dev->dev_hdl, "Find target,but over range\n"); + sdk_err(dev->dev_hdl, "Find target, but over range\n"); mutex_unlock(&irq_info->irq_mutex); return; } @@ -1135,7 +1135,7 @@ void hinic_free_irq(void *hwdev, enum hinic_service_type type, u32 irq_id) } if (i >= max_num_irq) - sdk_warn(dev->dev_hdl, "Irq %d don`t need to free\n", irq_id); + sdk_warn(dev->dev_hdl, "Irq %d don't need to free\n", irq_id); mutex_unlock(&irq_info->irq_mutex); } @@ -1262,7 +1262,7 @@ void hinic_free_ceq(void *hwdev, enum hinic_service_type type, int ceq_id) } if (i >= num_ceq) - sdk_warn(dev->dev_hdl, "ceq %d don`t need to free.\n", ceq_id); + sdk_warn(dev->dev_hdl, "ceq %d don't need to free\n", ceq_id); mutex_unlock(&eq->eq_mutex); } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c b/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c index 7293ff216a7c..6d78d22272f0 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_cmdq.c @@ -251,7 +251,7 @@ struct hinic_cmd_buf *hinic_alloc_cmd_buf(void *hwdev) void *dev; if (!hwdev) { - pr_err("Failed to alloc cmd buf, Invalid hwdev\n"); + pr_err("Failed to alloc cmd buf, invalid hwdev\n"); return NULL; } @@ -1516,7 +1516,7 @@ int hinic_cmdqs_init(struct hinic_hwdev *hwdev) err = init_cmdq(&cmdqs->cmdq[cmdq_type], hwdev, &cmdqs->saved_wqs[cmdq_type], cmdq_type); if (err) { - sdk_err(hwdev->dev_hdl, "Failed to initialize cmdq type :%d\n", + sdk_err(hwdev->dev_hdl, "Failed to initialize cmdq type: %d\n", cmdq_type); goto init_cmdq_err; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_dcb.c b/drivers/net/ethernet/huawei/hinic/hinic_dcb.c index e17a91f8bd59..0c7ae9133407 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_dcb.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_dcb.c @@ -338,8 +338,8 @@ u8 hinic_setup_dcb_tool(struct net_device *netdev, u8 *dcb_en, bool wr_flag) if (wr_flag) { if (nic_dev->max_qps < nic_dev->dcb_cfg.pg_tcs && *dcb_en) { - netif_err(nic_dev, drv, netdev, - "max_qps:%d is less than %d\n", + nicif_err(nic_dev, drv, netdev, + "max_qps: %d is less than %d\n", nic_dev->max_qps, nic_dev->dcb_cfg.pg_tcs); return 1; } @@ -357,7 +357,7 @@ u8 hinic_setup_dcb_tool(struct net_device *netdev, u8 *dcb_en, bool wr_flag) mutex_lock(&nic_dev->nic_mutex); if (!err) - netif_info(nic_dev, drv, netdev, "%s DCB\n", + nicif_info(nic_dev, drv, netdev, "%s DCB\n", *dcb_en ? "Enable" : "Disable"); } else { *dcb_en = (u8)test_bit(HINIC_DCB_ENABLE, &nic_dev->flags); @@ -386,15 +386,15 @@ static u8 hinic_dcbnl_set_state(struct net_device *netdev, u8 state) return 0; if (nic_dev->max_qps < nic_dev->dcb_cfg.pg_tcs && state) { - netif_err(nic_dev, drv, netdev, - "max_qps:%d is less than %d\n", + nicif_err(nic_dev, drv, netdev, + "max_qps: %d is less than %d\n", nic_dev->max_qps, nic_dev->dcb_cfg.pg_tcs); return 1; } err = hinic_setup_tc(netdev, state ? nic_dev->dcb_cfg.pg_tcs : 0); if (!err) - netif_info(nic_dev, drv, netdev, "%s DCB\n", + nicif_info(nic_dev, drv, netdev, "%s DCB\n", state ? "Enable" : "Disable"); return !!err; @@ -1062,12 +1062,12 @@ static int __set_hw_ets(struct hinic_nic_dev *nic_dev) err = hinic_dcb_set_ets(nic_dev->hwdev, up_tc, pg_bw, up_pgid, up_bw, up_strict); if (err) { - hinic_err(nic_dev, drv, "Failed to set ets with mode:%d\n", + hinic_err(nic_dev, drv, "Failed to set ets with mode: %d\n", nic_dev->dcbx_cap); return err; } - hinic_info(nic_dev, drv, "Set ets to hw done with mode:%d\n", + hinic_info(nic_dev, drv, "Set ets to hw done with mode: %d\n", nic_dev->dcbx_cap); return 0; @@ -1332,8 +1332,8 @@ static int hinic_dcbnl_ieee_set_ets(struct net_device *netdev, if (max_tc != netdev_get_num_tc(netdev)) { err = hinic_setup_tc(netdev, max_tc); if (err) { - netif_err(nic_dev, drv, netdev, - "Failed to setup tc with max_tc:%d, err:%d\n", + nicif_err(nic_dev, drv, netdev, + "Failed to setup tc with max_tc: %d, err: %d\n", max_tc, err); memcpy(my_ets, &back_ets, sizeof(struct ieee_ets)); return err; @@ -1386,7 +1386,7 @@ static int hinic_dcbnl_ieee_set_pfc(struct net_device *netdev, pfc_map = pfc->pfc_en & nic_dev->up_valid_bitmap; outof_range_pfc = pfc->pfc_en & (~nic_dev->up_valid_bitmap); if (outof_range_pfc) - netif_info(nic_dev, drv, netdev, + nicif_info(nic_dev, drv, netdev, "pfc setting out of range, 0x%x will be ignored\n", outof_range_pfc); @@ -1407,7 +1407,7 @@ static int hinic_dcbnl_ieee_set_pfc(struct net_device *netdev, err = hinic_dcb_set_pfc(nic_dev->hwdev, pfc_en, pfc_map); if (err) { hinic_info(nic_dev, drv, - "Failed to set pfc to hw with pfc_map:0x%x err:%d\n", + "Failed to set pfc to hw with pfc_map: 0x%x err: %d\n", pfc_map, err); hinic_start_port_traffic_flow(nic_dev); return err; @@ -1416,7 +1416,7 @@ static int hinic_dcbnl_ieee_set_pfc(struct net_device *netdev, hinic_start_port_traffic_flow(nic_dev); my_pfc->pfc_en = pfc->pfc_en; hinic_info(nic_dev, drv, - "Set pfc successfully with pfc_map:0x%x, pfc_en:%d\n", + "Set pfc successfully with pfc_map: 0x%x, pfc_en: %d\n", pfc_map, pfc_en); return 0; @@ -1479,7 +1479,7 @@ static u8 hinic_dcbnl_setdcbx(struct net_device *netdev, u8 mode) ((mode & DCB_CAP_DCBX_LLD_MANAGED) && (!(mode & DCB_CAP_DCBX_HOST)))) { nicif_info(nic_dev, drv, netdev, - "Set dcbx failed with invalid mode:%d\n", mode); + "Set dcbx failed with invalid mode: %d\n", mode); return 1; } @@ -1497,7 +1497,7 @@ static u8 hinic_dcbnl_setdcbx(struct net_device *netdev, u8 mode) err = hinic_setup_tc(netdev, 0); if (err) { nicif_err(nic_dev, drv, netdev, - "Failed to setup tc with mode:%d\n", + "Failed to setup tc with mode: %d\n", mode); return 1; } @@ -1509,7 +1509,7 @@ static u8 hinic_dcbnl_setdcbx(struct net_device *netdev, u8 mode) err = hinic_setup_tc(netdev, 0); if (err) { nicif_err(nic_dev, drv, netdev, - "Failed to setup tc with mode:%d\n", mode); + "Failed to setup tc with mode: %d\n", mode); return 1; } } @@ -1617,7 +1617,7 @@ int __set_cos_up_map(struct hinic_nic_dev *nic_dev, u8 *cos_up) return -EFAULT; } - nicif_info(nic_dev, drv, netdev, "Set cos2up:%d%d%d%d%d%d%d%d\n", + nicif_info(nic_dev, drv, netdev, "Set cos2up: %d%d%d%d%d%d%d%d\n", cos_up[0], cos_up[1], cos_up[2], cos_up[3], cos_up[4], cos_up[5], cos_up[6], cos_up[7]); diff --git a/drivers/net/ethernet/huawei/hinic/hinic_eqs.c b/drivers/net/ethernet/huawei/hinic/hinic_eqs.c index 22fc49d16462..6c352dff996a 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_eqs.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_eqs.c @@ -486,7 +486,7 @@ static void ceq_event_handler(struct hinic_ceqs *ceqs, u32 ceqe) u32 ceqe_data = CEQE_DATA(ceqe); if (event >= HINIC_MAX_CEQ_EVENTS) { - sdk_err(hwdev->dev_hdl, "Ceq unknown event:%d, ceqe date: 0x%x\n", + sdk_err(hwdev->dev_hdl, "Ceq unknown event: %d, ceqe date: 0x%x\n", event, ceqe_data); return; } @@ -1126,7 +1126,7 @@ static int init_eq(struct hinic_eq *eq, struct hinic_hwdev *hwdev, u16 q_id, eq->orig_page_size = eq->page_size; eq->num_pages = GET_EQ_NUM_PAGES(eq, eq->page_size); if (eq->num_pages > HINIC_EQ_MAX_PAGES) { - sdk_err(hwdev->dev_hdl, "Number pages:%d too many pages for eq\n", + sdk_err(hwdev->dev_hdl, "Number pages: %d too many pages for eq\n", eq->num_pages); return -EINVAL; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c index 98e230d4e3c1..f79594570002 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c @@ -753,7 +753,7 @@ static int hinic_set_settings_to_hw(struct hinic_nic_dev *nic_dev, (autoneg ? "autong enable " : "autong disable ") : ""); if (err < 0 || err >= SET_LINK_STR_MAX_LEN) { nicif_err(nic_dev, drv, netdev, - "Failed snprintf link state, function return(%d) and dest_len(%d)\n", + "Failed to snprintf link state, function return(%d) and dest_len(%d)\n", err, SET_LINK_STR_MAX_LEN); return -EFAULT; } @@ -763,7 +763,7 @@ static int hinic_set_settings_to_hw(struct hinic_nic_dev *nic_dev, "%sspeed %d ", set_link_str, speed); if (err <= 0 || err >= SET_LINK_STR_MAX_LEN) { nicif_err(nic_dev, drv, netdev, - "Failed snprintf link speed, function return(%d) and dest_len(%d)\n", + "Failed to snprintf link speed, function return(%d) and dest_len(%d)\n", err, SET_LINK_STR_MAX_LEN); return -EFAULT; } @@ -897,7 +897,7 @@ static void hinic_get_drvinfo(struct net_device *netdev, "%s", mgmt_ver); if (err <= 0 || err >= (int)sizeof(info->fw_version)) nicif_err(nic_dev, drv, netdev, - "Failed snprintf fw_version, function return(%d) and dest_len(%d)\n", + "Failed to snprintf fw_version, function return(%d) and dest_len(%d)\n", err, (int)sizeof(info->fw_version)); } @@ -997,7 +997,7 @@ static int hinic_set_ringparam(struct net_device *netdev, ring->rx_pending > HINIC_MAX_QUEUE_DEPTH || ring->rx_pending < HINIC_MIN_QUEUE_DEPTH) { nicif_err(nic_dev, drv, netdev, - "Queue depth out of rang [%d-%d]\n", + "Queue depth out of range [%d-%d]\n", HINIC_MIN_QUEUE_DEPTH, HINIC_MAX_QUEUE_DEPTH); return -EINVAL; } @@ -1449,7 +1449,7 @@ static int __hinic_set_coalesce(struct net_device *netdev, err = snprintf(obj_str, sizeof(obj_str), "for netdev"); if (err <= 0 || err >= OBJ_STR_MAX_LEN) { nicif_err(nic_dev, drv, netdev, - "Failed snprintf string, function return(%d) and dest_len(%d)\n", + "Failed to snprintf string, function return(%d) and dest_len(%d)\n", err, OBJ_STR_MAX_LEN); return -EFAULT; } @@ -1458,7 +1458,7 @@ static int __hinic_set_coalesce(struct net_device *netdev, err = snprintf(obj_str, sizeof(obj_str), "for queue %d", queue); if (err <= 0 || err >= OBJ_STR_MAX_LEN) { nicif_err(nic_dev, drv, netdev, - "Failed snprintf string, function return(%d) and dest_len(%d)\n", + "Failed to snprintf string, function return(%d) and dest_len(%d)\n", err, OBJ_STR_MAX_LEN); return -EFAULT; } @@ -1712,7 +1712,7 @@ static void hinic_get_strings(struct net_device *netdev, return; default: nicif_err(nic_dev, drv, netdev, - "Invalid string set %d.", stringset); + "Invalid string set %d", stringset); return; } } @@ -1913,7 +1913,7 @@ static int hinic_run_lp_test(struct hinic_nic_dev *nic_dev, u32 test_time) } dev_kfree_skb_any(skb_tmp); - nicif_info(nic_dev, drv, netdev, "Loopback test succeed.\n"); + nicif_info(nic_dev, drv, netdev, "Loopback test succeed\n"); return 0; } @@ -1961,7 +1961,7 @@ void hinic_lp_test(struct net_device *netdev, struct ethtool_test *eth_test, lb_test_rx_buf = vmalloc(LP_PKT_CNT * LP_PKT_LEN); if (!lb_test_rx_buf) { nicif_err(nic_dev, drv, netdev, - "Failed to alloc rx buffer for loopback test.\n"); + "Failed to alloc rx buffer for loopback test\n"); err = 1; } else { nic_dev->lb_test_rx_buf = lb_test_rx_buf; @@ -1980,7 +1980,7 @@ void hinic_lp_test(struct net_device *netdev, struct ethtool_test *eth_test, if (!(test.flags & ETH_TEST_FL_EXTERNAL_LB)) { if (hinic_set_loopback_mode(nic_dev->hwdev, false)) { nicif_err(nic_dev, drv, netdev, - "Failed to cancel port loopback mode after loopback test.\n"); + "Failed to cancel port loopback mode after loopback test\n"); err = 1; goto resume_link; diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c b/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c index e815eec59b45..d19da7238f9b 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c @@ -1369,7 +1369,7 @@ int hinic_clean_root_ctxt(void *hwdev) &root_ctxt, &out_size, 0); if (err || !out_size || root_ctxt.status) { sdk_err(((struct hinic_hwdev *)hwdev)->dev_hdl, - "Failed to set root context, err: %d, status: 0x%x, out_size: 0x%x\n", + "Failed to clean root context, err: %d, status: 0x%x, out_size: 0x%x\n", err, root_ctxt.status, out_size); return -EFAULT; } @@ -1528,7 +1528,7 @@ static int hinic_vf_rx_tx_flush_in_pf(struct hinic_hwdev *hwdev, u16 vf_id) HINIC_MGMT_CMD_START_FLR, &clr_res, sizeof(clr_res), &clr_res, &out_size, 0); if (err || !out_size || clr_res.status) { - sdk_warn(hwdev->dev_hdl, "Failed to flush doorbell, err: %d, status: 0x%x, out_size: 0x%x\n", + sdk_warn(hwdev->dev_hdl, "Failed to start flr, err: %d, status: 0x%x, out_size: 0x%x\n", err, clr_res.status, out_size); ret = err ? err : (-EFAULT); } @@ -1759,7 +1759,7 @@ static int init_aeqs_msix_attr(struct hinic_hwdev *hwdev) info.msix_index = eq->eq_irq.msix_entry_idx; err = hinic_set_interrupt_cfg_direct(hwdev, &info); if (err) { - sdk_err(hwdev->dev_hdl, "Set msix attr for aeq %d failed\n", + sdk_err(hwdev->dev_hdl, "Failed to set msix attr for aeq %d\n", q_id); return -EFAULT; } @@ -1789,7 +1789,7 @@ static int init_ceqs_msix_attr(struct hinic_hwdev *hwdev) info.msix_index = eq->eq_irq.msix_entry_idx; err = hinic_set_interrupt_cfg(hwdev, info); if (err) { - sdk_err(hwdev->dev_hdl, "Set msix attr for ceq %d failed\n", + sdk_err(hwdev->dev_hdl, "Failed to set msix attr for ceq %d\n", q_id); return -EFAULT; } @@ -2032,7 +2032,7 @@ int comm_pf_mbox_handler(void *handle, u16 vf_id, u8 cmd, void *buf_in, if (!hinic_mbox_check_cmd_valid(handle, hw_cmd_support_vf, vf_id, cmd, buf_in, in_size, size)) { sdk_err(((struct hinic_hwdev *)handle)->dev_hdl, - "PF Receive VF(%d) common cmd(0x%x), mbox len(0x%x) is invalid\n", + "PF Receive VF(%d) common cmd(0x%x) or mbox len(0x%x) is invalid\n", vf_id + hinic_glb_pf_vf_offset(handle), cmd, in_size); err = HINIC_MBOX_VF_CMD_ERROR; return err; @@ -2050,8 +2050,8 @@ int comm_pf_mbox_handler(void *handle, u16 vf_id, u8 cmd, void *buf_in, if (err && err != HINIC_DEV_BUSY_ACTIVE_FW && err != HINIC_MBOX_PF_BUSY_ACTIVE_FW) sdk_err(((struct hinic_hwdev *)handle)->dev_hdl, - "PF mbox common callback handler err: %d\n", - err); + "PF mbox common cmd %d callback handler err: %d\n", + cmd, err); } return err; @@ -2462,7 +2462,7 @@ int hinic_init_comm_ch(struct hinic_hwdev *hwdev) err = __get_func_misc_info(hwdev); if (err) { - sdk_err(hwdev->dev_hdl, "Failed to get function msic information\n"); + sdk_err(hwdev->dev_hdl, "Failed to get function misc information\n"); goto get_func_info_err; } @@ -3133,7 +3133,7 @@ int mqm_eqm_init(struct hinic_hwdev *hwdev) &info_eqm_fix, sizeof(info_eqm_fix), &info_eqm_fix, &len, 0); if (ret || !len || info_eqm_fix.status) { - sdk_err(hwdev->dev_hdl, "Get mqm fix info fail,err: %d, status: 0x%x, out_size: 0x%x\n", + sdk_err(hwdev->dev_hdl, "Get mqm fix info failed, err: %d, status: 0x%x, out_size: 0x%x\n", ret, info_eqm_fix.status, len); return -EFAULT; } @@ -3149,25 +3149,25 @@ int mqm_eqm_init(struct hinic_hwdev *hwdev) kcalloc(hwdev->mqm_att.chunk_num, sizeof(struct hinic_page_addr), GFP_KERNEL); if (!(hwdev->mqm_att.brm_srch_page_addr)) { - sdk_err(hwdev->dev_hdl, "Alloc virtual mem failed\r\n"); + sdk_err(hwdev->dev_hdl, "Alloc virtual mem failed\n"); return -EFAULT; } ret = mqm_eqm_alloc_page_mem(hwdev); if (ret) { - sdk_err(hwdev->dev_hdl, "Alloc eqm page mem failed\r\n"); + sdk_err(hwdev->dev_hdl, "Alloc eqm page mem failed\n"); goto err_page; } ret = mqm_eqm_set_page_2_hw(hwdev); if (ret) { - sdk_err(hwdev->dev_hdl, "Set page to hw failed\r\n"); + sdk_err(hwdev->dev_hdl, "Set page to hw failed\n"); goto err_ecmd; } ret = mqm_eqm_set_cfg_2_hw(hwdev, 1); if (ret) { - sdk_err(hwdev->dev_hdl, "Set page to hw failed\r\n"); + sdk_err(hwdev->dev_hdl, "Set page to hw failed\n"); goto err_ecmd; } @@ -3197,7 +3197,7 @@ void mqm_eqm_deinit(struct hinic_hwdev *hwdev) ret = mqm_eqm_set_cfg_2_hw(hwdev, 0); if (ret) { - sdk_err(hwdev->dev_hdl, "Set mqm eqm cfg to chip fail! err: %d\n", + sdk_err(hwdev->dev_hdl, "Set mqm eqm cfg to chip fail, err: %d\n", ret); return; } @@ -3218,7 +3218,7 @@ int hinic_ppf_ext_db_init(void *dev) ret = mqm_eqm_init(hwdev); if (ret) { - sdk_err(hwdev->dev_hdl, "MQM eqm init fail!\n"); + sdk_err(hwdev->dev_hdl, "MQM eqm init failed\n"); return -EFAULT; } @@ -3425,7 +3425,7 @@ static void fault_report_show(struct hinic_hwdev *hwdev, struct hinic_fault_event_stats *fault; u8 node_id; - sdk_err(hwdev->dev_hdl, "Fault event report received, func_id: %d.\n", + sdk_err(hwdev->dev_hdl, "Fault event report received, func_id: %d\n", hinic_global_func_id(hwdev)); memset(type_str, 0, FAULT_SHOW_STR_LEN + 1); @@ -3759,7 +3759,7 @@ static void sw_watchdog_timeout_info_show(struct hinic_hwdev *hwdev, u32 *dump_addr, *reg, stack_len, i, j; if (in_size != sizeof(*watchdog_info)) { - sdk_err(hwdev->dev_hdl, "Invalid mgmt watchdog report, length: %d, should be %ld.\n", + sdk_err(hwdev->dev_hdl, "Invalid mgmt watchdog report, length: %d, should be %ld\n", in_size, sizeof(*watchdog_info)); return; } @@ -3924,7 +3924,7 @@ static void hinic_fmw_act_ntc_handler(struct hinic_hwdev *hwdev, struct hinic_fmw_act_ntc *notice_info; if (in_size != sizeof(*notice_info)) { - sdk_err(hwdev->dev_hdl, "Invalid mgmt firmware active notice, length: %d, should be %ld.\n", + sdk_err(hwdev->dev_hdl, "Invalid mgmt firmware active notice, length: %d, should be %ld\n", in_size, sizeof(*notice_info)); return; } @@ -3957,7 +3957,7 @@ static void hinic_pcie_dfx_event_handler(struct hinic_hwdev *hwdev, u32 *reg; if (in_size != sizeof(*notice_info)) { - sdk_err(hwdev->dev_hdl, "Invalid mgmt firmware active notice, length: %d, should be %ld.\n", + sdk_err(hwdev->dev_hdl, "Invalid mgmt firmware active notice, length: %d, should be %ld\n", in_size, sizeof(*notice_info)); return; } @@ -4724,7 +4724,7 @@ u8 hinic_nic_sw_aeqe_handler(void *handle, u8 event, u64 data) event_level = FAULT_LEVEL_FATAL; break; default: - sdk_err(hwdev->dev_hdl, "Unsupported sw event %d to process.\n", + sdk_err(hwdev->dev_hdl, "Unsupported sw event %d to process\n", event); } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_lld.c b/drivers/net/ethernet/huawei/hinic/hinic_lld.c index 81461da5e9aa..a19a1f67bc97 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_lld.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_lld.c @@ -668,7 +668,7 @@ static void hinic_ignore_minor_version(char *version) err = snprintf(version, max_ver_len, "%s.%s.%s.0", ver_split[0], ver_split[1], ver_split[2]); if (err <= 0 || err >= max_ver_len) - pr_err("Failed snprintf version, function return(%d) and dest_len(%d)\n", + pr_err("Failed to snprintf version, function return(%d) and dest_len(%d)\n", err, max_ver_len); } @@ -1087,7 +1087,7 @@ void *hinic_get_uld_dev_by_ifname(char *ifname, enum hinic_service_type type) struct hinic_pcidev *dev; if (type >= SERVICE_T_MAX) { - pr_err("Service type :%d is error\n", type); + pr_err("Service type: %d is error\n", type); return NULL; } @@ -1467,7 +1467,7 @@ struct net_device *hinic_get_netdev_by_lld(struct hinic_lld_dev *lld_dev) nic_dev = pci_adapter->uld_dev[SERVICE_T_NIC]; if (!nic_dev) { sdk_err(&pci_adapter->pcidev->dev, - "There's no net device attached on the pci device"); + "There's no net device attached on the pci device\n"); return NULL; } @@ -1501,7 +1501,7 @@ struct net_device *hinic_get_netdev_by_pcidev(struct pci_dev *pdev) nic_dev = pci_adapter->uld_dev[SERVICE_T_NIC]; if (!nic_dev) { sdk_err(&pci_adapter->pcidev->dev, - "There`s no net device attached on the pci device"); + "There`s no net device attached on the pci device\n"); return NULL; } @@ -1739,7 +1739,7 @@ int hinic_ovs_set_vf_nic_state(struct hinic_lld_dev *lld_dev, u16 vf_func_id, if (err) { sdk_err(&des_dev->pcidev->dev, - "%s driver Set VF max_queue_num failed, err=%d.\n", + "%s driver Set VF max_queue_num failed, err=%d\n", s_uld_name[SERVICE_T_NIC], err); break; @@ -2071,7 +2071,7 @@ static int alloc_chip_node(struct hinic_pcidev *pci_adapter) HINIC_CHIP_NAME, i); if (err <= 0 || err >= IFNAMSIZ) { sdk_err(&pci_adapter->pcidev->dev, - "Failed snprintf chip_name, function return(%d) and dest_len(%d)\n", + "Failed to snprintf chip_name, function return(%d) and dest_len(%d)\n", err, IFNAMSIZ); goto alloc_dbgtool_attr_file_err; } @@ -2080,7 +2080,7 @@ static int alloc_chip_node(struct hinic_pcidev *pci_adapter) IFNAMSIZ, "%s%d", HINIC_CHIP_NAME, i); if (err <= 0 || err >= IFNAMSIZ) { sdk_err(&pci_adapter->pcidev->dev, - "Failed snprintf dbgtool_attr_file_name, function return(%d) and dest_len(%d)\n", + "Failed to snprintf dbgtool_attr_file_name, function return(%d) and dest_len(%d)\n", err, IFNAMSIZ); goto alloc_dbgtool_attr_file_err; } @@ -2188,13 +2188,13 @@ int hinic_ovs_set_vf_load_state(struct pci_dev *pdev) { struct hinic_pcidev *pci_adapter; if (!pdev) { - pr_err("pdev is null.\n"); + pr_err("pdev is null\n"); return -EINVAL; } pci_adapter = pci_get_drvdata(pdev); if (!pci_adapter) { - pr_err("pci_adapter is null.\n"); + pr_err("pci_adapter is null\n"); return -EFAULT; } @@ -2699,7 +2699,7 @@ static int hinic_probe(struct pci_dev *pdev, const struct pci_device_id *id) create_singlethread_workqueue(HINIC_SLAVE_NIC_DELAY); if (!pci_adapter->slave_nic_init_workq) { sdk_err(&pdev->dev, - "Failed to create work queue:%s\n", + "Failed to create work queue: %s\n", HINIC_SLAVE_NIC_DELAY); goto ceate_nic_delay_work_fail; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c index 1679c24eba9d..56af81d132fd 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c @@ -407,7 +407,7 @@ static int hinic_setup_num_qps(struct hinic_nic_dev *nic_dev) } nic_dev->qps_irq_info = kzalloc(irq_size, GFP_KERNEL); if (!nic_dev->qps_irq_info) { - nicif_err(nic_dev, drv, netdev, "Failed to alloc msix entries\n"); + nicif_err(nic_dev, drv, netdev, "Failed to alloc qps_irq_info\n"); return -ENOMEM; } @@ -560,7 +560,7 @@ static int hinic_request_irq(struct hinic_irq *irq_cfg, u16 q_id) err = hinic_set_interrupt_cfg(nic_dev->hwdev, info); if (err) { nicif_err(nic_dev, drv, irq_cfg->netdev, - "Failed to set RX interrupt coalescing attribute.\n"); + "Failed to set RX interrupt coalescing attribute\n"); qp_del_napi(irq_cfg); return err; } @@ -2977,7 +2977,7 @@ int hinic_enable_func_rss(struct hinic_nic_dev *nic_dev) if (err) { if (err == -ENOSPC) nicif_warn(nic_dev, drv, netdev, - "Failed to alloc RSS template,table is full\n"); + "Failed to alloc RSS template, table is full\n"); else nicif_err(nic_dev, drv, netdev, "Failed to alloc RSS template\n"); diff --git a/drivers/net/ethernet/huawei/hinic/hinic_mbox.c b/drivers/net/ethernet/huawei/hinic/hinic_mbox.c index fc91bdffe1eb..29feb9b4a16c 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_mbox.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_mbox.c @@ -213,8 +213,8 @@ static bool check_func_id(struct hinic_hwdev *hwdev, u16 src_func_idx, if (in_size < offset + sizeof(func_idx)) { sdk_warn(hwdev->dev_hdl, - "Reveice mailbox msg len: %d less than 10 Bytes is invalid\n", - in_size); + "Receive mailbox msg len: %d less than %ld Bytes is invalid\n", + in_size, offset + sizeof(func_idx)); return false; } @@ -222,7 +222,7 @@ static bool check_func_id(struct hinic_hwdev *hwdev, u16 src_func_idx, if (src_func_idx != func_idx) { sdk_warn(hwdev->dev_hdl, - "Reveice mailbox function id(0x%x) not equal to msg function id(0x%x)\n", + "Reveive mailbox function id(0x%x) not equal to msg function id(0x%x)\n", src_func_idx, func_idx); return false; } @@ -909,7 +909,8 @@ void hinic_mbox_func_aeqe_handler(void *handle, u8 *header, u8 size) if (src >= HINIC_MAX_FUNCTIONS) { sdk_err(func_to_func->hwdev->dev_hdl, - "Mailbox source function id:%u is invalid\n", (u32)src); + "Mailbox source function id: %u is invalid\n", + (u32)src); return; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c b/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c index 38abf8fe0817..3a8362cc7d01 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_mgmt.c @@ -680,7 +680,7 @@ static int hinic_read_clp_data(struct hinic_hwdev *hwdev, err = hinic_read_clp_reg(hwdev, HINIC_CLP_RSP_HOST, HINIC_CLP_READY_RSP_HOST, &ready); if (err || delay_cnt > HINIC_CLP_DELAY_CNT_MAX) { - sdk_err(hwdev->dev_hdl, "timeout with delay_cnt:%d\n", + sdk_err(hwdev->dev_hdl, "Timeout with delay_cnt: %d\n", delay_cnt); return -EINVAL; } @@ -692,7 +692,7 @@ static int hinic_read_clp_data(struct hinic_hwdev *hwdev, return err; if (temp_out_size > HINIC_CLP_SRAM_SIZE_REG_MAX || !temp_out_size) { - sdk_err(hwdev->dev_hdl, "invalid temp_out_size:%d\n", + sdk_err(hwdev->dev_hdl, "Invalid temp_out_size: %d\n", temp_out_size); return -EINVAL; } @@ -757,14 +757,16 @@ static int hinic_check_clp_init_status(struct hinic_hwdev *hwdev) err = hinic_read_clp_reg(hwdev, HINIC_CLP_REQ_HOST, HINIC_CLP_BA_HOST, &reg_value); if (err || !reg_value) { - sdk_err(hwdev->dev_hdl, "Wrong req ba value:0x%x\n", reg_value); + sdk_err(hwdev->dev_hdl, "Wrong req ba value: 0x%x\n", + reg_value); return -EINVAL; } err = hinic_read_clp_reg(hwdev, HINIC_CLP_RSP_HOST, HINIC_CLP_BA_HOST, &reg_value); if (err || !reg_value) { - sdk_err(hwdev->dev_hdl, "Wrong rsp ba value:0x%x\n", reg_value); + sdk_err(hwdev->dev_hdl, "Wrong rsp ba value: 0x%x\n", + reg_value); return -EINVAL; } @@ -822,7 +824,7 @@ int hinic_pf_clp_to_mgmt(void *hwdev, enum hinic_mod_type mod, u8 cmd, if (real_size > (HINIC_CLP_INPUT_BUFFER_LEN_HOST / HINIC_CLP_DATA_UNIT_HOST)) { - sdk_err(dev->dev_hdl, "Invalid real_size:%d\n", real_size); + sdk_err(dev->dev_hdl, "Invalid real_size: %d\n", real_size); return -EINVAL; } down(&clp_pf_to_mgmt->clp_msg_lock); @@ -871,13 +873,13 @@ int hinic_pf_clp_to_mgmt(void *hwdev, enum hinic_mod_type mod, u8 cmd, real_size = (u16)((real_size * HINIC_CLP_DATA_UNIT_HOST) & 0xffff); if (real_size <= sizeof(header) || real_size > HINIC_CLP_INPUT_BUFFER_LEN_HOST) { - sdk_err(dev->dev_hdl, "Invalid response size:%d", real_size); + sdk_err(dev->dev_hdl, "Invalid response size: %d", real_size); up(&clp_pf_to_mgmt->clp_msg_lock); return -EINVAL; } real_size = real_size - sizeof(header); if (real_size != *out_size) { - sdk_err(dev->dev_hdl, "Invalid real_size:%d, out_size:%d\n", + sdk_err(dev->dev_hdl, "Invalid real_size: %d, out_size: %d\n", real_size, *out_size); up(&clp_pf_to_mgmt->clp_msg_lock); return -EINVAL; @@ -1090,11 +1092,11 @@ static void mgmt_resp_msg_handler(struct hinic_msg_pf_to_mgmt *pf_to_mgmt, pf_to_mgmt->event_flag == SEND_EVENT_START) { complete(&recv_msg->recv_done); } else if (recv_msg->msg_id != pf_to_mgmt->sync_msg_id) { - sdk_err(dev, "Send msg id(0x%x) recv msg id(0x%x) dismatch, event state=%d\n", + sdk_err(dev, "Send msg id(0x%x) recv msg id(0x%x) dismatch, event state: %d\n", pf_to_mgmt->sync_msg_id, recv_msg->msg_id, pf_to_mgmt->event_flag); } else { - sdk_err(dev, "Wait timeout, send msg id(0x%x) recv msg id(0x%x), event state=%d!\n", + sdk_err(dev, "Wait timeout, send msg id(0x%x) recv msg id(0x%x), event state: %d\n", pf_to_mgmt->sync_msg_id, recv_msg->msg_id, pf_to_mgmt->event_flag); } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c index 90b16ea9658d..1bac0ea08a52 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c @@ -309,7 +309,7 @@ int hinic_del_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id) return -EINVAL; } if (mac_info.status == HINIC_PF_SET_VF_ALREADY) { - nic_warn(nic_hwdev->dev_hdl, "PF has already set VF mac, Ignore delete operation.\n"); + nic_warn(nic_hwdev->dev_hdl, "PF has already set VF mac, Ignore delete operation\n"); return HINIC_PF_SET_VF_ALREADY; } @@ -461,12 +461,14 @@ int hinic_set_port_mtu(void *hwdev, u32 new_mtu) if (new_mtu < HINIC_MIN_MTU_SIZE) { nic_err(nic_hwdev->dev_hdl, - "Invalid mtu size, mtu size < 256bytes"); + "Invalid mtu size, mtu size < %dbytes\n", + HINIC_MIN_MTU_SIZE); return -EINVAL; } if (new_mtu > HINIC_MAX_JUMBO_FRAME_SIZE) { - nic_err(nic_hwdev->dev_hdl, "Invalid mtu size, mtu size > 9600bytes"); + nic_err(nic_hwdev->dev_hdl, "Invalid mtu size, mtu size > %dbytes\n", + HINIC_MAX_JUMBO_FRAME_SIZE); return -EINVAL; } @@ -2220,7 +2222,7 @@ int hinic_get_mgmt_version(void *hwdev, u8 *mgmt_ver) err = snprintf(mgmt_ver, HINIC_MGMT_VERSION_MAX_LEN, "%s", up_ver.ver); if (err <= 0 || err >= HINIC_MGMT_VERSION_MAX_LEN) { nic_err(dev->dev_hdl, - "Failed snprintf fw version, function return(%d) and dest_len(%d)\n", + "Failed to snprintf fw version, function return(%d) and dest_len(%d)\n", err, HINIC_MGMT_VERSION_MAX_LEN); return -EINVAL; } @@ -2501,7 +2503,7 @@ static int hinic_del_vf_mac_msg_handler(struct hinic_nic_io *nic_io, u16 vf, if (vf_info->pf_set_mac && !(vf_info->trust) && is_valid_ether_addr(mac_in->mac) && !memcmp(vf_info->vf_mac_addr, mac_in->mac, ETH_ALEN)) { - nic_warn(nic_io->hwdev->dev_hdl, "PF has already set VF mac.\n"); + nic_warn(nic_io->hwdev->dev_hdl, "PF has already set VF mac\n"); mac_out->status = HINIC_PF_SET_VF_ALREADY; *out_size = sizeof(*mac_out); return 0; @@ -2530,12 +2532,12 @@ static int hinic_update_vf_mac_msg_handler(struct hinic_nic_io *nic_io, u16 vf, int err; if (!is_valid_ether_addr(mac_in->new_mac)) { - nic_err(nic_io->hwdev->dev_hdl, "Update VF MAC is invalid.\n"); + nic_err(nic_io->hwdev->dev_hdl, "Update VF MAC is invalid\n"); return -EINVAL; } if (vf_info->pf_set_mac && !(vf_info->trust)) { - nic_warn(nic_io->hwdev->dev_hdl, "PF has already set VF mac.\n"); + nic_warn(nic_io->hwdev->dev_hdl, "PF has already set VF mac\n"); mac_out->status = HINIC_PF_SET_VF_ALREADY; *out_size = sizeof(*mac_out); return 0; @@ -2724,7 +2726,7 @@ int nic_pf_mbox_handler(void *hwdev, u16 vf_id, u8 cmd, void *buf_in, if (!hinic_mbox_check_cmd_valid(hwdev, nic_cmd_support_vf, vf_id, cmd, buf_in, in_size, size)) { nic_err(((struct hinic_hwdev *)hwdev)->dev_hdl, - "PF Receive VF nic cmd(0x%x), mbox len(0x%x) is invalid\n", + "PF Receive VF nic cmd(0x%x) or mbox len(0x%x) is invalid\n", cmd, in_size); err = HINIC_MBOX_VF_CMD_ERROR; return err; @@ -2793,7 +2795,7 @@ int nic_pf_mbox_handler(void *hwdev, u16 vf_id, u8 cmd, void *buf_in, if (err && err != HINIC_DEV_BUSY_ACTIVE_FW && err != HINIC_MBOX_PF_BUSY_ACTIVE_FW) - nic_err(nic_io->hwdev->dev_hdl, "PF receive VF L2NIC cmd: %d process error, err:%d\n", + nic_err(nic_io->hwdev->dev_hdl, "PF receive VF L2NIC cmd: %d process error, err: %d\n", cmd, err); return err; } @@ -3522,13 +3524,13 @@ int hinic_set_anti_attack(void *hwdev, bool enable) &rate, sizeof(rate), &rate, &out_size); if (err || !out_size || rate.status) { - nic_err(nic_hwdev->dev_hdl, "Can`t %s port Anti-Attack rate limit err: %d, status: 0x%x, out size: 0x%x\n", + nic_err(nic_hwdev->dev_hdl, "Can't %s port Anti-Attack rate limit err: %d, status: 0x%x, out size: 0x%x\n", (enable ? "enable" : "disable"), err, rate.status, out_size); return -EINVAL; } - nic_info(nic_hwdev->dev_hdl, "%s port Anti-Attack rate limit succeed.\n", + nic_info(nic_hwdev->dev_hdl, "%s port Anti-Attack rate limit succeed\n", (enable ? "Enable" : "Disable")); return 0; @@ -3616,13 +3618,13 @@ int hinic_set_super_cqe_state(void *hwdev, bool enable) &super_cqe, sizeof(super_cqe), &super_cqe, &out_size); if (err || !out_size || super_cqe.status) { - nic_err(nic_hwdev->dev_hdl, "Can`t %s surper cqe, err: %d, status: 0x%x, out size: 0x%x\n", + nic_err(nic_hwdev->dev_hdl, "Can't %s surper cqe, err: %d, status: 0x%x, out size: 0x%x\n", (enable ? "enable" : "disable"), err, super_cqe.status, out_size); return -EINVAL; } - nic_info(nic_hwdev->dev_hdl, "%s super cqe succeed.\n", + nic_info(nic_hwdev->dev_hdl, "%s super cqe succeed\n", (enable ? "Enable" : "Disable")); return 0; @@ -3960,16 +3962,16 @@ int hinic_disable_tx_promisc(void *hwdev) info.cfg = HINIC_TX_PROMISC_DISABLE; err = hinic_msg_to_mgmt_sync(hwdev, HINIC_MOD_L2NIC, - HINIC_PORT_CMD_DISABLE_PROMISIC, &info, + HINIC_PORT_CMD_DISABLE_PROMISC, &info, sizeof(info), &info, &out_size, 0); if (err || !out_size || info.status) { if (info.status == HINIC_MGMT_CMD_UNSUPPORTED) { nic_info(((struct hinic_hwdev *)hwdev)->dev_hdl, - "Unsupported to disable TX promisic\n"); + "Unsupported to disable TX promisc\n"); return 0; } nic_err(((struct hinic_hwdev *)hwdev)->dev_hdl, - "Failed to disable multihost promisic, err: %d, status: 0x%x, out size: 0x%x\n", + "Failed to disable multihost promisc, err: %d, status: 0x%x, out size: 0x%x\n", err, info.status, out_size); return -EFAULT; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_dbg.c b/drivers/net/ethernet/huawei/hinic/hinic_nic_dbg.c index e49a21fa952e..9bcdcd3ce1c0 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_dbg.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_dbg.c @@ -101,7 +101,7 @@ u16 hinic_dbg_get_rq_hw_pi(void *hwdev, u16 q_id) if (qp) return cpu_to_be16(*qp->rq.pi_virt_addr); - nic_err(((struct hinic_hwdev *)hwdev)->dev_hdl, "Get rq hw pi failed!\n"); + nic_err(((struct hinic_hwdev *)hwdev)->dev_hdl, "Get rq hw pi failed\n"); return INVALID_PI; } @@ -184,7 +184,7 @@ static int get_wqe_info(struct hinic_wq *wq, u16 idx, u16 wqebb_cnt, return -EFAULT; if (*wqe_size != (u16)(wq->wqebb_size * wqebb_cnt)) { - pr_err("Unexpect out buf size from user :%d, expect: %d\n", + pr_err("Unexpect out buf size from user: %d, expect: %d\n", *wqe_size, (u16)(wq->wqebb_size * wqebb_cnt)); return -EFAULT; } @@ -231,7 +231,7 @@ int hinic_dbg_get_rq_wqe_info(void *hwdev, u16 q_id, u16 idx, u16 wqebb_cnt, int hinic_dbg_get_hw_stats(const void *hwdev, u8 *hw_stats, u16 *out_size) { if (!hw_stats || *out_size != sizeof(struct hinic_hw_stats)) { - pr_err("Unexpect out buf size from user :%d, expect: %lu\n", + pr_err("Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(struct hinic_hw_stats)); return -EFAULT; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_io.c b/drivers/net/ethernet/huawei/hinic/hinic_nic_io.c index f2fb0bc54570..b935c41a4435 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_io.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_io.c @@ -253,7 +253,7 @@ int hinic_create_qps(void *dev, u16 num_qp, u16 sq_depth, u16 rq_depth, max_qps = hinic_func_max_qnum(hwdev); if (num_qp > max_qps) { - nic_err(hwdev->dev_hdl, "Create number of qps: %d > max number of qps:%d\n", + nic_err(hwdev->dev_hdl, "Create number of qps: %d > max number of qps: %d\n", num_qp, max_qps); return -EINVAL; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c index 3fcb855bd605..8ef008af05e8 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c @@ -336,7 +336,7 @@ static int get_inter_num(struct hinic_nic_dev *nic_dev, void *buf_in, if (*out_size != sizeof(u16)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(u16)); return -EFAULT; } @@ -381,7 +381,7 @@ static int get_num_cos(struct hinic_nic_dev *nic_dev, void *buf_in, if (*out_size != sizeof(*num_cos)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(*num_cos)); return -EFAULT; } @@ -399,7 +399,7 @@ static int get_dcb_cos_up_map(struct hinic_nic_dev *nic_dev, void *buf_in, if (*out_size != sizeof(*map)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(*map)); return -EFAULT; } @@ -438,7 +438,7 @@ static int get_rx_cqe_info(struct hinic_nic_dev *nic_dev, void *buf_in, if (*out_size != sizeof(struct hinic_rq_cqe)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(struct hinic_rq_cqe)); return -EFAULT; } @@ -477,7 +477,7 @@ static int hinic_dbg_get_sq_info(struct hinic_nic_dev *nic_dev, u16 q_id, if (*msg_size != sizeof(*sq_info)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *msg_size, sizeof(*sq_info)); return -EFAULT; } @@ -576,7 +576,7 @@ static int get_loopback_mode(struct hinic_nic_dev *nic_dev, void *buf_in, if (*out_size != sizeof(*mode)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(*mode)); return -EFAULT; } @@ -717,7 +717,7 @@ int set_pfc_control(struct hinic_nic_dev *nic_dev, void *buf_in, pfc_en = *((u8 *)buf_in); if (!(test_bit(HINIC_DCB_ENABLE, &nic_dev->flags))) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Need to enable dcb first.\n"); + "Need to enable dcb first\n"); err = 0xff; goto exit; } @@ -752,7 +752,7 @@ int set_ets(struct hinic_nic_dev *nic_dev, void *buf_in, if (!(test_bit(HINIC_DCB_ENABLE, &nic_dev->flags))) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Need to enable dcb first.\n"); + "Need to enable dcb first\n"); err = 0xff; goto exit; } @@ -765,7 +765,7 @@ int set_ets(struct hinic_nic_dev *nic_dev, void *buf_in, if (!(test_bit(HINIC_ETS_ENABLE, &nic_dev->flags))) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Need to enable ets first.\n"); + "Need to enable ets first\n"); err = 0xff; goto exit; } @@ -792,7 +792,7 @@ int set_ets(struct hinic_nic_dev *nic_dev, void *buf_in, err = hinic_dcbnl_set_ets_tool(nic_dev->netdev); if (err) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Failed to set ets [%d].\n", err); + "Failed to set ets [%d]\n", err); } exit: *((u8 *)buf_out) = err; @@ -838,7 +838,7 @@ int get_support_tc(struct hinic_nic_dev *nic_dev, void *buf_in, if (*out_size != sizeof(*tc_num)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(*tc_num)); return -EFAULT; } @@ -881,7 +881,7 @@ int set_pfc_priority(struct hinic_nic_dev *nic_dev, void *buf_in, if (!((test_bit(HINIC_DCB_ENABLE, &nic_dev->flags)) && nic_dev->tmp_dcb_cfg.pfc_state)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Need to enable pfc first.\n"); + "Need to enable pfc first\n"); err = 0xff; goto exit; } @@ -983,7 +983,7 @@ static int set_poll_weight(struct hinic_nic_dev *nic_dev, void *buf_in, if (!buf_in || in_size != sizeof(*weight_info)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect in buf size from user :%u, expect: %lu\n", + "Unexpect in buf size from user: %u, expect: %lu\n", *out_size, sizeof(*weight_info)); return -EFAULT; } @@ -999,7 +999,7 @@ static int get_homologue(struct hinic_nic_dev *nic_dev, void *buf_in, struct hinic_homologues *homo = buf_out; if (!buf_out || *out_size != sizeof(*homo)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(*homo)); return -EFAULT; } @@ -1020,7 +1020,7 @@ static int set_homologue(struct hinic_nic_dev *nic_dev, void *buf_in, struct hinic_homologues *homo = buf_in; if (!buf_in || in_size != sizeof(*homo)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect in buf size from user :%d, expect: %lu\n", + "Unexpect in buf size from user: %d, expect: %lu\n", *out_size, sizeof(*homo)); return -EFAULT; } @@ -1030,7 +1030,7 @@ static int set_homologue(struct hinic_nic_dev *nic_dev, void *buf_in, } else if (homo->homo_state == HINIC_HOMOLOGUES_OFF) { clear_bit(HINIC_SAME_RXTX, &nic_dev->flags); } else { - pr_err("Invalid parameters.\n"); + pr_err("Invalid parameters\n"); return -EFAULT; } @@ -1047,7 +1047,7 @@ static int get_sset_count(struct hinic_nic_dev *nic_dev, void *buf_in, if (!buf_in || !buf_out || in_size != sizeof(u32) || *out_size != sizeof(u32)) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Invalid parameters.\n"); + "Invalid parameters\n"); return -EINVAL; } @@ -1083,7 +1083,7 @@ static int get_sset_stats(struct hinic_nic_dev *nic_dev, void *buf_in, if (count * sizeof(*items) != *out_size) { nicif_err(nic_dev, drv, nic_dev->netdev, - "Unexpect out buf size from user :%d, expect: %lu\n", + "Unexpect out buf size from user: %d, expect: %lu\n", *out_size, count * sizeof(*items)); return -EINVAL; } @@ -1112,7 +1112,7 @@ static int get_func_type(void *hwdev, void *buf_in, u32 in_size, func_typ = hinic_func_type(hwdev); if (!buf_out || *out_size != sizeof(u16)) { - pr_err("Unexpect out buf size from user :%d, expect: %lu\n", + pr_err("Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(u16)); return -EFAULT; } @@ -1126,7 +1126,7 @@ static int get_func_id(void *hwdev, void *buf_in, u32 in_size, u16 func_id; if (!buf_out || *out_size != sizeof(u16)) { - pr_err("Unexpect out buf size from user :%d, expect: %lu\n", + pr_err("Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(u16)); return -EFAULT; } @@ -1145,7 +1145,7 @@ static int get_chip_faults_stats(void *hwdev, void *buf_in, u32 in_size, if (!buf_in || !buf_out || *out_size != sizeof(*fault_info) || in_size != sizeof(*fault_info)) { - pr_err("Unexpect out buf size from user :%d, expect: %lu\n", + pr_err("Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(*fault_info)); return -EFAULT; } @@ -1178,7 +1178,7 @@ static int get_drv_version(void *hwdev, void *buf_in, u32 in_size, int err; if (*out_size != sizeof(*ver_info)) { - pr_err("Unexpect out buf size from user :%d, expect: %lu\n", + pr_err("Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(*ver_info)); return -EFAULT; } @@ -1212,7 +1212,7 @@ static int get_single_card_info(void *hwdev, void *buf_in, u32 in_size, { if (!buf_in || !buf_out || in_size != sizeof(struct card_info) || *out_size != sizeof(struct card_info)) { - pr_err("Unexpect out buf size from user :%d, expect: %lu\n", + pr_err("Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(struct card_info)); return -EFAULT; } @@ -1230,7 +1230,7 @@ static int get_device_id(void *hwdev, void *buf_in, u32 in_size, int err; if (!buf_out || !buf_in || *out_size != sizeof(u16) || in_size != sizeof(u16)) { - pr_err("Unexpect out buf size from user :%d, expect: %lu\n", + pr_err("Unexpect out buf size from user: %d, expect: %lu\n", *out_size, sizeof(u16)); return -EFAULT; } @@ -1297,7 +1297,7 @@ static int __get_card_usr_api_chain_mem(int card_idx) (void *)__get_free_pages(GFP_KERNEL, DBGTOOL_PAGE_ORDER); if (!g_card_vir_addr[card_idx]) { - pr_err("Alloc api chain memory fail for card %d.\n", + pr_err("Alloc api chain memory fail for card %d\n", card_idx); mutex_unlock(&g_addr_lock); return -EFAULT; @@ -1309,7 +1309,7 @@ static int __get_card_usr_api_chain_mem(int card_idx) g_card_phy_addr[card_idx] = virt_to_phys(g_card_vir_addr[card_idx]); if (!g_card_phy_addr[card_idx]) { - pr_err("phy addr for card %d is 0.\n", card_idx); + pr_err("phy addr for card %d is 0\n", card_idx); free_pages((unsigned long)g_card_vir_addr[card_idx], DBGTOOL_PAGE_ORDER); g_card_vir_addr[card_idx] = NULL; @@ -1589,7 +1589,7 @@ static int send_to_ucode(void *hwdev, struct msg_module *nt_msg, nt_msg->ucode_cmd.ucode_db.ucode_cmd_type, buf_in, buf_out, 0); if (ret) - pr_err("Send direct cmdq err: %d!\n", ret); + pr_err("Send direct cmdq err: %d\n", ret); } else { ret = hinic_cmdq_detail_resp (hwdev, nt_msg->ucode_cmd.ucode_db.cmdq_ack_type, @@ -1597,7 +1597,7 @@ static int send_to_ucode(void *hwdev, struct msg_module *nt_msg, nt_msg->ucode_cmd.ucode_db.ucode_cmd_type, buf_in, buf_out, 0); if (ret) - pr_err("Send detail cmdq err: %d!\n", ret); + pr_err("Send detail cmdq err: %d\n", ret); } return ret; @@ -1732,7 +1732,7 @@ static int check_useparam_valid(struct msg_module *nt_msg, void *buf_in) u32 rd_len = csr_write_msg->rd_len; if (rd_len > TOOL_COUNTER_MAX_LEN) { - pr_err("Csr read or write len is invalid!\n"); + pr_err("Csr read or write len is invalid\n"); return -EINVAL; } @@ -1810,7 +1810,7 @@ static int sm_rd32(void *hwdev, u32 id, u8 instance, ret = hinic_sm_ctr_rd32(hwdev, node, instance, id, &val1); if (ret) { - pr_err("Get sm ctr information (32 bits)failed!\n"); + pr_err("Get sm ctr information (32 bits)failed\n"); val1 = 0xffffffff; } @@ -1827,7 +1827,7 @@ static int sm_rd64_pair(void *hwdev, u32 id, u8 instance, ret = hinic_sm_ctr_rd64_pair(hwdev, node, instance, id, &val1, &val2); if (ret) { - pr_err("Get sm ctr information (64 bits pair)failed!\n"); + pr_err("Get sm ctr information (64 bits pair)failed\n"); val1 = 0xffffffff; } @@ -1845,7 +1845,7 @@ static int sm_rd64(void *hwdev, u32 id, u8 instance, ret = hinic_sm_ctr_rd64(hwdev, node, instance, id, &val1); if (ret) { - pr_err("Get sm ctr information (64 bits)failed!\n"); + pr_err("Get sm ctr information (64 bits)failed\n"); val1 = 0xffffffff; } buf_out->val1 = val1; @@ -1890,7 +1890,7 @@ static int send_to_sm(void *hwdev, struct msg_module *nt_msg, } if (ret) - pr_err("Get sm information fail!\n"); + pr_err("Get sm information fail\n"); *out_size = sizeof(struct sm_out_st); @@ -2024,7 +2024,7 @@ static int get_self_test_cmd(struct msg_module *nt_msg) ret = hinic_get_self_test_result(nt_msg->device_name, &res); if (ret) { - pr_err("Get self test result failed!\n"); + pr_err("Get self test result failed\n"); return -EFAULT; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_port_cmd.h b/drivers/net/ethernet/huawei/hinic/hinic_port_cmd.h index 0b13ba9d2f26..1d3c0301ba63 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_port_cmd.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_port_cmd.h @@ -93,7 +93,7 @@ enum hinic_port_cmd { HINIC_PORT_CMD_SET_JUMBO_FRAME_SIZE, /* 0x4c ~ 0x57 have defined in base line */ - HINIC_PORT_CMD_DISABLE_PROMISIC = 0x4c, + HINIC_PORT_CMD_DISABLE_PROMISC = 0x4c, HINIC_PORT_CMD_ENABLE_SPOOFCHK = 0x4e, HINIC_PORT_CMD_GET_MGMT_VERSION = 0x58, HINIC_PORT_CMD_GET_BOOT_VERSION, diff --git a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c index 047023267ead..1a436c133785 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c @@ -39,7 +39,7 @@ int hinic_pci_sriov_disable(struct pci_dev *dev) if (test_and_set_bit(HINIC_SRIOV_DISABLE, &sriov_info->state)) { nic_err(&sriov_info->pdev->dev, - "SR-IOV disable in process, please wait"); + "SR-IOV disable in process, please wait\n"); return -EPERM; } @@ -190,7 +190,7 @@ int hinic_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) return err; nic_info(&sriov_info->pdev->dev, "Setting MAC %pM on VF %d\n", mac, vf); - nic_info(&sriov_info->pdev->dev, "Reload the VF driver to make this change effective."); + nic_info(&sriov_info->pdev->dev, "Reload the VF driver to make this change effective\n"); return 0; } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c index b556132a72af..8d921ad104e8 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_tx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.c @@ -949,7 +949,7 @@ int hinic_setup_all_tx_resources(struct net_device *netdev) txq = &nic_dev->txqs[q_id]; tx_info_sz = txq->q_depth * sizeof(*txq->tx_info); if (!tx_info_sz) { - nicif_err(nic_dev, drv, netdev, "Cannot allocate zero size tx%d info\n", + nicif_err(nic_dev, drv, netdev, "Cannot allocate zero size txq%d info\n", q_id); err = -EINVAL; goto init_txq_err; @@ -965,7 +965,7 @@ int hinic_setup_all_tx_resources(struct net_device *netdev) err = hinic_setup_tx_wqe(txq); if (err != txq->q_depth) { - nicif_err(nic_dev, drv, netdev, "Failed to setup Tx:%d wqe\n", + nicif_err(nic_dev, drv, netdev, "Failed to setup Tx: %d wqe\n", q_id); q_id++; goto init_txq_err; diff --git a/drivers/net/ethernet/huawei/hinic/hinic_wq.c b/drivers/net/ethernet/huawei/hinic/hinic_wq.c index 032b28332a65..fcf98413d2de 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_wq.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_wq.c @@ -55,7 +55,7 @@ static int queue_alloc_page(void *handle, u64 **vaddr, u64 *paddr, } if (!ADDR_4K_ALIGNED(dma_addr)) { - sdk_err(handle, "Cla is not 4k aligned!\n"); + sdk_err(handle, "Cla is not 4k aligned\n"); goto shadow_vaddr_err; } -- 2.25.1

1 5

[PATCH 00/48] stable 4.19.139
by Yang Yingliang 17 Aug '20

17 Aug '20

Adam Ford (1): omapfb: dss: Fix max fclk divider for omap36xx Ben Skeggs (2): drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason drm/nouveau/fbcon: zero-initialise the mode_cmd2 structure Christoph Hellwig (1): net/9p: validate fds in p9_fd_open Cong Wang (1): ipv6: fix memory leaks on IPV6_ADDRFORM path David Howells (1): rxrpc: Fix race between recvmsg and sendmsg on immediate call failure Dexuan Cui (1): Drivers: hv: vmbus: Ignore CHANNELMSG_TL_CONNECT_RESULT(23) Eric Biggers (1): Smack: fix use-after-free in smk_write_relabel_self() Erik Ekman (1): USB: serial: qcserial: add EM7305 QDL product ID Forest Crossman (2): usb: xhci: define IDs for various ASMedia host controllers usb: xhci: Fix ASMedia ASM1142 DMA addressing Francesco Ruggeri (1): igb: reinit_locked() should be called with rtnl_lock Frank van der Linden (1): xattr: break delegations in {set,remove}xattr Greg Kroah-Hartman (3): USB: iowarrior: fix up report size handling for some devices mtd: properly check all write ioctls for permissions Linux 4.19.139 Grzegorz Siwik (1): i40e: Wrong truncation from u16 to u8 Hangbin Liu (1): Revert "vxlan: fix tos value before xmit" Hui Wang (1): Revert "ALSA: hda: call runtime_allow() for all hda controllers" Ido Schimmel (2): ipv4: Silence suspicious RCU usage warning vxlan: Ensure FDB dump is performed under RCU Jann Horn (1): binder: Prevent context manager from incrementing ref 0 Johan Hovold (5): leds: wm831x-status: fix use-after-free on unbind leds: da903x: fix use-after-free on unbind leds: lm3533: fix use-after-free on unbind leds: 88pm860x: fix use-after-free on unbind net: lan78xx: replace bogus endpoint lookup Julian Squires (1): cfg80211: check vendor command doit pointer before use Landen Chao (1): net: ethernet: mtk_eth_soc: fix MTU warnings Lorenzo Bianconi (1): net: gre: recompute gre csum for sctp over gre tunnels Martyna Szapar (2): i40e: Fix of memory leak and integer truncation in i40e_virtchnl.c i40e: Memory leak in i40e_config_iwarp_qvlist Peilin Ye (4): Bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt() Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt() Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_with_rssi_evt() openvswitch: Prevent kernel-infoleak in ovs_ct_put_key() Philippe Duplessis-Guindon (1): tools lib traceevent: Fix memory leak in process_dynamic_array_len Qiushi Wu (1): firmware: Fix a reference count leak. Rustam Kovhaev (1): usb: hso: check for return value in hso_serial_common_create() Sergey Nemov (1): i40e: add num_vectors checker in iwarp handler Stephen Hemminger (1): hv_netvsc: do not use VF device if link is down Suren Baghdasaryan (1): staging: android: ashmem: Fix lockdep warning for write operation Takashi Iwai (1): ALSA: seq: oss: Serialize ioctls Willem de Bruijn (1): selftests/net: relax cpu affinity requirement in msg_zerocopy test Wolfram Sang (2): i2c: slave: improve sanity check when registering i2c: slave: add sanity check when unregistering Xin Long (1): net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task() Xin Xiong (1): atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent Makefile | 2 +- drivers/android/binder.c | 15 ++- drivers/atm/atmtcp.c | 10 +- drivers/firmware/qemu_fw_cfg.c | 7 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 +- drivers/hv/channel_mgmt.c | 21 ++-- drivers/hv/vmbus_drv.c | 4 + drivers/i2c/i2c-core-slave.c | 7 +- drivers/leds/leds-88pm860x.c | 14 ++- drivers/leds/leds-da903x.c | 14 ++- drivers/leds/leds-lm3533.c | 12 +- drivers/leds/leds-wm831x-status.c | 14 ++- drivers/mtd/mtdchar.c | 56 +++++++-- .../net/ethernet/cavium/thunder/nicvf_main.c | 4 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 51 +++++--- drivers/net/ethernet/intel/igb/igb_main.c | 9 ++ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 + drivers/net/hyperv/netvsc_drv.c | 7 +- drivers/net/usb/hso.c | 5 +- drivers/net/usb/lan78xx.c | 117 +++++------------- drivers/net/vxlan.c | 10 +- drivers/staging/android/ashmem.c | 12 ++ drivers/usb/host/xhci-pci.c | 10 +- drivers/usb/misc/iowarrior.c | 35 ++++-- drivers/usb/serial/qcserial.c | 1 + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 2 +- fs/xattr.c | 84 +++++++++++-- include/linux/hyperv.h | 2 + include/linux/xattr.h | 2 + include/net/addrconf.h | 1 + net/9p/trans_fd.c | 24 ++-- net/bluetooth/hci_event.c | 11 +- net/ipv4/fib_trie.c | 2 +- net/ipv4/gre_offload.c | 13 +- net/ipv6/anycast.c | 17 ++- net/ipv6/ipv6_sockglue.c | 1 + net/openvswitch/conntrack.c | 38 +++--- net/rxrpc/call_object.c | 27 ++-- net/rxrpc/conn_object.c | 8 +- net/rxrpc/recvmsg.c | 2 +- net/rxrpc/sendmsg.c | 3 + net/wireless/nl80211.c | 6 +- security/smack/smackfs.c | 13 +- sound/core/seq/oss/seq_oss.c | 8 +- sound/pci/hda/hda_intel.c | 1 - tools/lib/traceevent/event-parse.c | 1 + tools/testing/selftests/net/msg_zerocopy.c | 5 +- 47 files changed, 483 insertions(+), 230 deletions(-) -- 2.25.1

1 48

[PATCH 01/26] arm64/ascend: Add new enable_oom_killer interface for oom contrl
by Yang Yingliang 17 Aug '20

17 Aug '20

From: Weilong Chen <chenweilong(a)huawei.com> ascend inclusion category: feature bugzilla: NA CVE: NA ------------------------------------------------- Support disable oom-killer, and report oom events to bbox vm.enable_oom_killer: 0: disable oom killer 1: enable oom killer (default,compatible with mainline) 2: disable oom killer and panic on oom Signed-off-by: Weilong Chen <chenweilong(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/Kconfig | 11 +++++++++ include/linux/oom.h | 11 +++++++++ kernel/sysctl.c | 12 ++++++++++ mm/memcontrol.c | 6 +++++ mm/oom_kill.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ mm/util.c | 6 +++++ 6 files changed, 102 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 10fabb5f633d..4412f14547af 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1351,6 +1351,17 @@ config ASCEND_DVPP_MMAP special memory for DvPP processor, the new flag is only valid for Ascend platform. +config ASCEND_OOM + bool "Enable support for disable oom killer" + default y + help + In some cases we hopes that the oom will not kill the process when it occurs, + be able to notify the black box to report the event, and be able to trigger + the panic to locate the problem. + vm.enable_oom_killer: + 0: disable oom killer + 1: enable oom killer (default,compatible with mainline) + 2: disable oom killer and panic on oom endif endmenu diff --git a/include/linux/oom.h b/include/linux/oom.h index 69864a547663..689d32ab694b 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -117,4 +117,15 @@ extern struct task_struct *find_lock_task_mm(struct task_struct *p); extern int sysctl_oom_dump_tasks; extern int sysctl_oom_kill_allocating_task; extern int sysctl_panic_on_oom; + +#ifdef CONFIG_ASCEND_OOM +#define HISI_OOM_TYPE_NOMEM 0 +#define HISI_OOM_TYPE_OVERCOMMIT 1 +#define HISI_OOM_TYPE_CGROUP 2 + +extern int sysctl_enable_oom_killer; +extern int register_hisi_oom_notifier(struct notifier_block *nb); +extern int hisi_oom_notifier_call(unsigned long val, void *v); +extern int unregister_hisi_oom_notifier(struct notifier_block *nb); +#endif #endif /* _INCLUDE_LINUX_OOM_H */ diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 54ae74d3180b..665c9e2a8802 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1264,6 +1264,18 @@ static struct ctl_table vm_table[] = { .extra1 = &zero, .extra2 = &two, }, +#ifdef CONFIG_ASCEND_OOM + { + /* 0: diasable, 1: enable, 2: disable and panic on oom */ + .procname = "enable_oom_killer", + .data = &sysctl_enable_oom_killer, + .maxlen = sizeof(sysctl_enable_oom_killer), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, + .extra2 = &two, + }, +#endif { .procname = "oom_kill_allocating_task", .data = &sysctl_oom_kill_allocating_task, diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e0377bae0bf6..a63bfd73da9a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1729,6 +1729,9 @@ static enum oom_status mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int current->memcg_in_oom = memcg; current->memcg_oom_gfp_mask = mask; current->memcg_oom_order = order; +#ifdef CONFIG_ASCEND_OOM + hisi_oom_notifier_call(HISI_OOM_TYPE_CGROUP, NULL); +#endif return OOM_ASYNC; } @@ -1802,6 +1805,9 @@ bool mem_cgroup_oom_synchronize(bool handle) mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask, current->memcg_oom_order); } else { +#ifdef CONFIG_ASCEND_OOM + hisi_oom_notifier_call(HISI_OOM_TYPE_CGROUP, NULL); +#endif schedule(); mem_cgroup_unmark_under_oom(memcg); finish_wait(&memcg_oom_waitq, &owait.wait); diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 8a4570c53e83..c08041ecd286 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -52,6 +52,9 @@ int sysctl_panic_on_oom; int sysctl_oom_kill_allocating_task; int sysctl_oom_dump_tasks = 1; +#ifdef CONFIG_ASCEND_OOM +int sysctl_enable_oom_killer = 1; +#endif /* * Serializes oom killer invocations (out_of_memory()) from all contexts to @@ -1047,6 +1050,42 @@ int unregister_oom_notifier(struct notifier_block *nb) } EXPORT_SYMBOL_GPL(unregister_oom_notifier); +#ifdef CONFIG_ASCEND_OOM +static BLOCKING_NOTIFIER_HEAD(hisi_oom_notify_list); + +int register_hisi_oom_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&hisi_oom_notify_list, nb); +} +EXPORT_SYMBOL_GPL(register_hisi_oom_notifier); + +static unsigned long last_jiffies; +int hisi_oom_notifier_call(unsigned long val, void *v) +{ + /* when enable oom killer, just return */ + if (sysctl_enable_oom_killer == 1) + return 0; + + /* Print time interval to 10 seconds */ + if (time_after(jiffies, last_jiffies + 10 * HZ)) { + pr_err("OOM_NOTIFIER: oom type %lu\n", val); + dump_stack(); + show_mem(SHOW_MEM_FILTER_NODES, NULL); + dump_tasks(NULL, 0); + last_jiffies = jiffies; + } + + return blocking_notifier_call_chain(&hisi_oom_notify_list, val, v); +} +EXPORT_SYMBOL_GPL(hisi_oom_notifier_call); + +int unregister_hisi_oom_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&hisi_oom_notify_list, nb); +} +EXPORT_SYMBOL_GPL(unregister_hisi_oom_notifier); +#endif + /** * out_of_memory - kill the "best" process when we run out of memory * @oc: pointer to struct oom_control @@ -1060,10 +1099,27 @@ bool out_of_memory(struct oom_control *oc) { unsigned long freed = 0; enum oom_constraint constraint = CONSTRAINT_NONE; +#ifdef CONFIG_ASCEND_OOM + unsigned long oom_type; +#endif if (oom_killer_disabled) return false; +#ifdef CONFIG_ASCEND_OOM + if (sysctl_enable_oom_killer == 0 || sysctl_enable_oom_killer == 2) { + if (is_memcg_oom(oc)) + oom_type = HISI_OOM_TYPE_CGROUP; + else + oom_type = HISI_OOM_TYPE_NOMEM; + + hisi_oom_notifier_call(oom_type, NULL); + if (unlikely(sysctl_enable_oom_killer == 2)) + panic("Out of memory, panic by sysctl_enable_oom_killer"); + return false; + } +#endif + if (!is_memcg_oom(oc)) { blocking_notifier_call_chain(&oom_notify_list, 0, &freed); if (freed > 0) diff --git a/mm/util.c b/mm/util.c index 5515219168e8..ed64ef1f8387 100644 --- a/mm/util.c +++ b/mm/util.c @@ -17,6 +17,9 @@ #include <asm/sections.h> #include <linux/uaccess.h> +#ifdef CONFIG_ASCEND_OOM +#include <linux/oom.h> +#endif #include "internal.h" @@ -744,6 +747,9 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) if (percpu_counter_read_positive(&vm_committed_as) < allowed) return 0; error: +#ifdef CONFIG_ASCEND_OOM + hisi_oom_notifier_call(HISI_OOM_TYPE_OVERCOMMIT, NULL); +#endif vm_unacct_memory(pages); return -ENOMEM; -- 2.25.1

1 25

kernel branch openEuler-1.0-LTS build failed
by 李义 17 Aug '20

17 Aug '20

Hi ALL, [Description] The kernel branch  openEuler-1.0-LTS  has import the patch  f6b330acc  but has no no_refcnt and build failed [Debug] the upstream commit ad0f75  has introduce the no_refcnt to the struct sock_cgroup_data. Maybe we should the merge the patch or revert it on branch openEuler-1.0-LTS

2 1

[PATCH kernel-4.19] arm64: add pmem module for kernel update
by zhuling 17 Aug '20

17 Aug '20

Euleros inclusion Category: feature Bugzilla: NA CVE: NA Use reserved memory to create a pmem device to store the processes information that dumped before kernel update. When you want to use this feature you need to declare by "pmemmem=pmem_size:pmem_phystart" in cmdline. (exp: pmemmem=100M:0x202000000000) Signed-off-by: zhuling <zhuling8(a)huawei.com> --- arch/arm64/kernel/setup.c | 5 +++ arch/arm64/mm/init.c | 90 ++++++++++++++++++++++++++++++++++++++ drivers/nvdimm/Kconfig | 11 +++++ drivers/nvdimm/Makefile | 3 ++ drivers/nvdimm/kup_pmem.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/ioport.h | 1 + include/linux/mm.h | 4 ++ lib/Kconfig | 6 +++ 8 files changed, 227 insertions(+) create mode 100644 drivers/nvdimm/kup_pmem.c diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 155b8a6..e96cade 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -251,6 +251,11 @@ static void __init request_standard_resources(void) if (kernel_data.start >= res->start && kernel_data.end <= res->end) request_resource(res, &kernel_data); +#ifdef CONFIG_KUP_PMEM_MEMORY + if (pmem_res.end) + insert_resource(&iomem_resource, &pmem_res); +#endif + #ifdef CONFIG_KEXEC_CORE /* Userspace will find "Crash kernel" region in /proc/iomem. */ if (crashk_low_res.end && crashk_low_res.start >= res->start && diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index e43764d..169d663 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -65,6 +65,18 @@ phys_addr_t arm64_dma_phys_limit __ro_after_init; struct res_mem res_mem[MAX_RES_REGIONS]; int res_mem_count; +#ifdef CONFIG_KUP_PMEM_MEMORY +static unsigned long long pmem_size, pmem_phystart; + +struct resource pmem_res = { + .name = "Kpmem Dev", + .start = 0, + .end = 0, + .flags = IORESOURCE_MEM, + .desc = IORES_DESC_KPMEM_DEV +}; +#endif + #ifdef CONFIG_BLK_DEV_INITRD static int __init early_initrd(char *p) { @@ -192,6 +204,80 @@ static void __init kexec_reserve_crashkres_pages(void) } #endif /* CONFIG_KEXEC_CORE */ +#ifdef CONFIG_KUP_PMEM_MEMORY +/* + * reserve_pmem() - reserves memory for pmem + * + * This function reserves memory area given in "pmemmem=" kernel command + * line parameter. The memory reserved is used by pmem restore progress + * when kernel update. + */ +static int __init parse_pmem(char *par) +{ + char *cur = par; + + if(!par) + return 0; + + pmem_size = 0; + pmem_phystart = 0; + + pmem_size = memparse(par, &cur); + if (par == cur) { + pr_warn("pmem: memory value expected\n"); + return -EINVAL; + } + + if (*cur == ':') + pmem_phystart = memparse(cur+1, &cur); + else if (*cur != ' ' && *cur != '\0') { + pr_warn("pmem: unrecognized char %c\n", *cur); + return -EINVAL; + } + + return 0; +} +early_param("pmemmem", parse_pmem); + +static void __init reserve_pmem(void) +{ + if (!pmem_size ||!pmem_phystart) { + return; + } + + pmem_size = PAGE_ALIGN(pmem_size); + + if (!memblock_is_region_memory(pmem_phystart, pmem_size)) { + pr_warn("cannot reserve pmem: region is not memory!\n"); + return; + } + + if (memblock_is_region_reserved(pmem_phystart, pmem_size)) { + pr_warn("cannot reserve pmem: region overlaps reserved memory!\n"); + return; + } + + if (!IS_ALIGNED(pmem_phystart, SZ_2M)) { + pr_warn("cannot reserve pmem: base address is not 2MB aligned\n"); + return; + } + memblock_reserve(pmem_phystart, pmem_size); + memblock_remove(pmem_phystart, pmem_size); + pr_info("pmem reserved: 0x%016llx - 0x%016llx (%lld MB)\n", + pmem_phystart, pmem_phystart + pmem_size, pmem_size >> 20); + + pmem_res.start = pmem_phystart; + pmem_res.end = pmem_phystart + pmem_size - 1; +} +#else +static void __init reserve_pmem(void) +{ +} +static void __init reserve_pmem_pages(void) +{ +} +#endif /*CONFIG_KUP_PMEM_MEMORY*/ + #ifdef CONFIG_CRASH_DUMP static int __init early_init_dt_scan_elfcorehdr(unsigned long node, const char *uname, int depth, void *data) @@ -584,6 +670,10 @@ void __init arm64_memblock_init(void) reserve_elfcorehdr(); +#ifdef CONFIG_KUP_PMEM_MEMORY + reserve_pmem(); +#endif + high_memory = __va(memblock_end_of_DRAM() - 1) + 1; dma_contiguous_reserve(arm64_dma_phys_limit); diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index 9d36473..1097a8d 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -112,4 +112,15 @@ config OF_PMEM Select Y if unsure. +config KUP_PMEM + tristate "Persistent memory for kernel update" + depends on LIBNVDIMM + depends on KUP_PMEM_MEMORY + default LIBNVDIMM + help + Allows regions of persistent memory to be described in the + device-tree. + + Select Y if unsure. + endif diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile index e884704..853cbcb 100644 --- a/drivers/nvdimm/Makefile +++ b/drivers/nvdimm/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_ND_BTT) += nd_btt.o obj-$(CONFIG_ND_BLK) += nd_blk.o obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o obj-$(CONFIG_OF_PMEM) += of_pmem.o +obj-$(CONFIG_KUP_PMEM) += nd_kup_pmem.o nd_pmem-y := pmem.o @@ -14,6 +15,8 @@ nd_blk-y := blk.o nd_e820-y := e820.o +nd_kup_pmem-y := kup_pmem.o + libnvdimm-y := core.o libnvdimm-y += bus.o libnvdimm-y += dimm_devs.o diff --git a/drivers/nvdimm/kup_pmem.c b/drivers/nvdimm/kup_pmem.c new file mode 100644 index 00000000..d9b0633 --- /dev/null +++ b/drivers/nvdimm/kup_pmem.c @@ -0,0 +1,107 @@ +/* + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. + * + * kup_pmem.c - kernel update support code. + * create a pmem device to store the processes information that is dumped + * when we want to kernel update. + */ + +#include <linux/platform_device.h> +#include <linux/memory_hotplug.h> +#include <linux/libnvdimm.h> +#include <linux/module.h> +#include <asm/io.h> + +static const struct attribute_group *kup_pmem_attribute_groups[] = { + &nvdimm_bus_attribute_group, + NULL, +}; + +static const struct attribute_group *kup_pmem_region_attribute_groups[] = { + &nd_region_attribute_group, + &nd_device_attribute_group, + NULL, +}; + +static int kup_pmem_remove(struct platform_device *pdev) +{ + struct nvdimm_bus *nvdimm_bus = platform_get_drvdata(pdev); + + nvdimm_bus_unregister(nvdimm_bus); + + return 0; +} + +static int kup_register_one(struct resource *res, void *data) +{ + struct nd_region_desc ndr_desc; + struct nvdimm_bus *nvdimm_bus = data; + + memset(&ndr_desc, 0, sizeof(ndr_desc)); + ndr_desc.res = res; + ndr_desc.attr_groups = kup_pmem_region_attribute_groups; + ndr_desc.numa_node = NUMA_NO_NODE; + set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); + if (!nvdimm_pmem_region_create(nvdimm_bus, &ndr_desc)) + return -ENXIO; + return 0; +} + +static int kup_pmem_probe(struct platform_device *pdev) +{ + static struct nvdimm_bus_descriptor nd_desc; + struct device *dev = &pdev->dev; + struct nvdimm_bus *nvdimm_bus; + int rc = -ENXIO; + + nd_desc.attr_groups = kup_pmem_attribute_groups; + nd_desc.provider_name = "kup_pmem"; + nd_desc.module = THIS_MODULE; + nvdimm_bus = nvdimm_bus_register(dev, &nd_desc); + if (!nvdimm_bus) + goto err; + platform_set_drvdata(pdev, nvdimm_bus); + + rc = walk_iomem_res_desc(IORES_DESC_KPMEM_DEV, + IORESOURCE_MEM, 0, -1, nvdimm_bus, kup_register_one); + if (rc) + goto err; + + return 0; +err: + nvdimm_bus_unregister(nvdimm_bus); + dev_err(dev, "kup_pmem: failed to register legacy persistent memory ranges\n"); + return rc; +} + +static struct platform_driver kup_pmem_driver = { + .probe = kup_pmem_probe, + .remove = kup_pmem_remove, + .driver = { + .name = "kup_pmem", + }, +}; +static struct platform_device *pdev; + +static __init int register_kup_pmem(void) +{ + platform_driver_register(&kup_pmem_driver); + pdev = platform_device_alloc("kup_pmem", -1); + + return platform_device_add(pdev); +} + +static __exit void unregister_kup_pmem(void) +{ + platform_device_del(pdev); + platform_driver_unregister(&kup_pmem_driver); +} + +module_init(register_kup_pmem); +module_exit(unregister_kup_pmem); +MODULE_ALIAS("platform:kup_pmem*"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Huawei Corporation"); diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5330288..c5f59b9 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -139,6 +139,7 @@ enum { IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5, IORES_DESC_DEVICE_PRIVATE_MEMORY = 6, IORES_DESC_DEVICE_PUBLIC_MEMORY = 7, + IORES_DESC_KPMEM_DEV = 8, }; /* helpers to define resources */ diff --git a/include/linux/mm.h b/include/linux/mm.h index b985af8..d84b0f0 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -38,6 +38,10 @@ struct bdi_writeback; void init_mm_internals(void); +#ifdef CONFIG_KUP_PMEM_MEMORY +extern struct resource pmem_res; +#endif + #ifndef CONFIG_NEED_MULTIPLE_NODES /* Don't use mapnrs, do it properly */ extern unsigned long max_mapnr; diff --git a/lib/Kconfig b/lib/Kconfig index a3928d4..cc49a86 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -621,3 +621,9 @@ config GENERIC_LIB_CMPDI2 config GENERIC_LIB_UCMPDI2 bool + +config KUP_PMEM_MEMORY + bool "reserve memory for kup pmem to store image" + default y + help + Say y here to enable this feature -- 2.9.5

1 0

[PATCH kernel-4.19 1/2] kexec: Add quick kexec support for kernel
by Sang Yan 13 Aug '20

13 Aug '20

euleros inclusion category: feature bugzilla: NA issues: #I1RC8Z CVE: NA In normal kexec, relocating kernel may cost 5 ~ 10 seconds, to copy all segments from vmalloced memory to kernel boot memory, because of disabled mmu. We introduce quick kexec to save time of copying memory as above, just like kdump(kexec on crash), by using reserved memory "Quick Kexec". Constructing quick kimage as the same as crash kernel, then simply copy all segments of kimage to reserved memroy. We also add this support in syscall kexec_load using flags of KEXEC_QUICK. Signed-off-by: Sang Yan <sangyan(a)huawei.com> --- arch/Kconfig | 7 +++++++ include/linux/ioport.h | 3 +++ include/linux/kexec.h | 13 +++++++++++- include/uapi/linux/kexec.h | 3 +++ kernel/kexec.c | 10 ++++++++++ kernel/kexec_core.c | 41 +++++++++++++++++++++++++++++--------- 6 files changed, 67 insertions(+), 10 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index b54e485e47ae..1a9d00a6e122 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -18,6 +18,13 @@ config KEXEC_CORE select CRASH_CORE bool +config QUICK_KEXEC + bool "Support for quick kexec" + depends on KEXEC_CORE + help + Say y here to enable this feature. + It use reserved memory to accelerate kexec. + config HAVE_IMA_KEXEC bool diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5330288da8db..a42a1800c133 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -139,6 +139,9 @@ enum { IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5, IORES_DESC_DEVICE_PRIVATE_MEMORY = 6, IORES_DESC_DEVICE_PUBLIC_MEMORY = 7, +#ifdef CONFIG_QUICK_KEXEC + IORES_DESC_QUICK_KEXEC = 8, +#endif }; /* helpers to define resources */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d6b8d0a69720..d5e42a44f2ca 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -233,9 +233,12 @@ struct kimage { unsigned long control_page; /* Flags to indicate special processing */ - unsigned int type : 1; + unsigned int type : 2; #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 +#ifdef CONFIG_QUICK_KEXEC +#define KEXEC_TYPE_QUICK 2 +#endif unsigned int preserve_context : 1; /* If set, we are using file mode kexec syscall */ unsigned int file_mode:1; @@ -296,6 +299,11 @@ extern int kexec_load_disabled; #define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT) #endif +#ifdef CONFIG_QUICK_KEXEC +#undef KEXEC_FLAGS +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_QUICK) +#endif + /* List of defined/legal kexec file flags */ #define KEXEC_FILE_FLAGS (KEXEC_FILE_UNLOAD | KEXEC_FILE_ON_CRASH | \ KEXEC_FILE_NO_INITRAMFS) @@ -305,6 +313,9 @@ extern int kexec_load_disabled; extern struct resource crashk_res; extern struct resource crashk_low_res; extern note_buf_t __percpu *crash_notes; +#ifdef CONFIG_QUICK_KEXEC +extern struct resource quick_kexec_res; +#endif /* flag to track if kexec reboot is in progress */ extern bool kexec_in_progress; diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 6d112868272d..dcf9857452da 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -12,6 +12,9 @@ /* kexec flags for different usage scenarios */ #define KEXEC_ON_CRASH 0x00000001 #define KEXEC_PRESERVE_CONTEXT 0x00000002 +#ifdef CONFIG_QUICK_KEXEC +#define KEXEC_QUICK 0x00000004 +#endif #define KEXEC_ARCH_MASK 0xffff0000 /* diff --git a/kernel/kexec.c b/kernel/kexec.c index 68559808fdfa..47dfad722b7c 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -46,6 +46,9 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, int ret; struct kimage *image; bool kexec_on_panic = flags & KEXEC_ON_CRASH; +#ifdef CONFIG_QUICK_KEXEC + bool kexec_on_quick = flags & KEXEC_QUICK; +#endif if (kexec_on_panic) { /* Verify we have a valid entry point */ @@ -71,6 +74,13 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, image->type = KEXEC_TYPE_CRASH; } +#ifdef CONFIG_QUICK_KEXEC + if (kexec_on_quick) { + image->control_page = quick_kexec_res.start; + image->type = KEXEC_TYPE_QUICK; + } +#endif + ret = sanity_check_segment_list(image); if (ret) goto out_free_image; diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index b36c9c46cd2c..595a757af656 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -74,6 +74,16 @@ struct resource crashk_low_res = { .desc = IORES_DESC_CRASH_KERNEL }; +#ifdef CONFIG_QUICK_KEXEC +struct resource quick_kexec_res = { + .name = "Quick kexec", + .start = 0, + .end = 0, + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_QUICK_KEXEC +}; +#endif + int kexec_should_crash(struct task_struct *p) { /* @@ -470,8 +480,10 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image, return pages; } -static struct page *kimage_alloc_crash_control_pages(struct kimage *image, - unsigned int order) + +static struct page *kimage_alloc_special_control_pages(struct kimage *image, + unsigned int order, + unsigned long end) { /* Control pages are special, they are the intermediaries * that are needed while we copy the rest of the pages @@ -501,7 +513,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, size = (1 << order) << PAGE_SHIFT; hole_start = (image->control_page + (size - 1)) & ~(size - 1); hole_end = hole_start + size - 1; - while (hole_end <= crashk_res.end) { + while (hole_end <= end) { unsigned long i; cond_resched(); @@ -536,7 +548,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, return pages; } - struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order) { @@ -547,8 +558,15 @@ struct page *kimage_alloc_control_pages(struct kimage *image, pages = kimage_alloc_normal_control_pages(image, order); break; case KEXEC_TYPE_CRASH: - pages = kimage_alloc_crash_control_pages(image, order); + pages = kimage_alloc_special_control_pages(image, order, + crashk_res.end); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + pages = kimage_alloc_special_control_pages(image, order, + quick_kexec_res.end); break; +#endif } return pages; @@ -898,11 +916,11 @@ static int kimage_load_normal_segment(struct kimage *image, return result; } -static int kimage_load_crash_segment(struct kimage *image, +static int kimage_load_special_segment(struct kimage *image, struct kexec_segment *segment) { - /* For crash dumps kernels we simply copy the data from - * user space to it's destination. + /* For crash dumps kernels and quick kexec kernels + * we simply copy the data from user space to it's destination. * We do things a page at a time for the sake of kmap. */ unsigned long maddr; @@ -976,8 +994,13 @@ int kimage_load_segment(struct kimage *image, result = kimage_load_normal_segment(image, segment); break; case KEXEC_TYPE_CRASH: - result = kimage_load_crash_segment(image, segment); + result = kimage_load_special_segment(image, segment); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + result = kimage_load_special_segment(image, segment); break; +#endif } return result; -- 2.19.1

1 1

[PATCH kernel-4.19 1/2] kexec: Add quick kexec support for kernel
by Sang Yan 13 Aug '20

13 Aug '20

euleros inclusion category: feature bugzilla: NA issues: #I1RC8Z CVE: NA In normal kexec, relocating kernel may cost 5 ~ 10 seconds, to copy all segments from vmalloced memory to kernel boot memory, because of disabled mmu. We introduce quick kexec to save time of copying memory as above, just like kdump(kexec on crash), by using reserved memory "Quick Kexec". Constructing quick kimage as the same as crash kernel, then simply copy all segments of kimage to reserved memroy. We also add this support in syscall kexec_load using flags of KEXEC_QUICK. Signed-off-by: Sang Yan <sangyan(a)huawei.com> --- arch/Kconfig | 7 +++++++ include/linux/ioport.h | 3 +++ include/linux/kexec.h | 13 +++++++++++- include/uapi/linux/kexec.h | 3 +++ kernel/kexec.c | 10 ++++++++++ kernel/kexec_core.c | 41 +++++++++++++++++++++++++++++--------- 6 files changed, 67 insertions(+), 10 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index b54e485e47ae..1a9d00a6e122 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -18,6 +18,13 @@ config KEXEC_CORE select CRASH_CORE bool +config QUICK_KEXEC + bool "Support for quick kexec" + depends on KEXEC_CORE + help + Say y here to enable this feature. + It use reserved memory to accelerate kexec. + config HAVE_IMA_KEXEC bool diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5330288da8db..a42a1800c133 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -139,6 +139,9 @@ enum { IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5, IORES_DESC_DEVICE_PRIVATE_MEMORY = 6, IORES_DESC_DEVICE_PUBLIC_MEMORY = 7, +#ifdef CONFIG_QUICK_KEXEC + IORES_DESC_QUICK_KEXEC = 8, +#endif }; /* helpers to define resources */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d6b8d0a69720..d5e42a44f2ca 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -233,9 +233,12 @@ struct kimage { unsigned long control_page; /* Flags to indicate special processing */ - unsigned int type : 1; + unsigned int type : 2; #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 +#ifdef CONFIG_QUICK_KEXEC +#define KEXEC_TYPE_QUICK 2 +#endif unsigned int preserve_context : 1; /* If set, we are using file mode kexec syscall */ unsigned int file_mode:1; @@ -296,6 +299,11 @@ extern int kexec_load_disabled; #define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT) #endif +#ifdef CONFIG_QUICK_KEXEC +#undef KEXEC_FLAGS +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_QUICK) +#endif + /* List of defined/legal kexec file flags */ #define KEXEC_FILE_FLAGS (KEXEC_FILE_UNLOAD | KEXEC_FILE_ON_CRASH | \ KEXEC_FILE_NO_INITRAMFS) @@ -305,6 +313,9 @@ extern int kexec_load_disabled; extern struct resource crashk_res; extern struct resource crashk_low_res; extern note_buf_t __percpu *crash_notes; +#ifdef CONFIG_QUICK_KEXEC +extern struct resource quick_kexec_res; +#endif /* flag to track if kexec reboot is in progress */ extern bool kexec_in_progress; diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 6d112868272d..dcf9857452da 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -12,6 +12,9 @@ /* kexec flags for different usage scenarios */ #define KEXEC_ON_CRASH 0x00000001 #define KEXEC_PRESERVE_CONTEXT 0x00000002 +#ifdef CONFIG_QUICK_KEXEC +#define KEXEC_QUICK 0x00000004 +#endif #define KEXEC_ARCH_MASK 0xffff0000 /* diff --git a/kernel/kexec.c b/kernel/kexec.c index 68559808fdfa..47dfad722b7c 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -46,6 +46,9 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, int ret; struct kimage *image; bool kexec_on_panic = flags & KEXEC_ON_CRASH; +#ifdef CONFIG_QUICK_KEXEC + bool kexec_on_quick = flags & KEXEC_QUICK; +#endif if (kexec_on_panic) { /* Verify we have a valid entry point */ @@ -71,6 +74,13 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, image->type = KEXEC_TYPE_CRASH; } +#ifdef CONFIG_QUICK_KEXEC + if (kexec_on_quick) { + image->control_page = quick_kexec_res.start; + image->type = KEXEC_TYPE_QUICK; + } +#endif + ret = sanity_check_segment_list(image); if (ret) goto out_free_image; diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index b36c9c46cd2c..595a757af656 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -74,6 +74,16 @@ struct resource crashk_low_res = { .desc = IORES_DESC_CRASH_KERNEL }; +#ifdef CONFIG_QUICK_KEXEC +struct resource quick_kexec_res = { + .name = "Quick kexec", + .start = 0, + .end = 0, + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_QUICK_KEXEC +}; +#endif + int kexec_should_crash(struct task_struct *p) { /* @@ -470,8 +480,10 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image, return pages; } -static struct page *kimage_alloc_crash_control_pages(struct kimage *image, - unsigned int order) + +static struct page *kimage_alloc_special_control_pages(struct kimage *image, + unsigned int order, + unsigned long end) { /* Control pages are special, they are the intermediaries * that are needed while we copy the rest of the pages @@ -501,7 +513,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, size = (1 << order) << PAGE_SHIFT; hole_start = (image->control_page + (size - 1)) & ~(size - 1); hole_end = hole_start + size - 1; - while (hole_end <= crashk_res.end) { + while (hole_end <= end) { unsigned long i; cond_resched(); @@ -536,7 +548,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, return pages; } - struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order) { @@ -547,8 +558,15 @@ struct page *kimage_alloc_control_pages(struct kimage *image, pages = kimage_alloc_normal_control_pages(image, order); break; case KEXEC_TYPE_CRASH: - pages = kimage_alloc_crash_control_pages(image, order); + pages = kimage_alloc_special_control_pages(image, order, + crashk_res.end); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + pages = kimage_alloc_special_control_pages(image, order, + quick_kexec_res.end); break; +#endif } return pages; @@ -898,11 +916,11 @@ static int kimage_load_normal_segment(struct kimage *image, return result; } -static int kimage_load_crash_segment(struct kimage *image, +static int kimage_load_special_segment(struct kimage *image, struct kexec_segment *segment) { - /* For crash dumps kernels we simply copy the data from - * user space to it's destination. + /* For crash dumps kernels and quick kexec kernels + * we simply copy the data from user space to it's destination. * We do things a page at a time for the sake of kmap. */ unsigned long maddr; @@ -976,8 +994,13 @@ int kimage_load_segment(struct kimage *image, result = kimage_load_normal_segment(image, segment); break; case KEXEC_TYPE_CRASH: - result = kimage_load_crash_segment(image, segment); + result = kimage_load_special_segment(image, segment); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + result = kimage_load_special_segment(image, segment); break; +#endif } return result; -- 2.19.1

1 1

[PATCH 0/7] Improvements and fixes
by Roberto Sassu 07 Aug '20

07 Aug '20

This patch set provides some improvements and fixes. The first three patches solve a permission problem caused by EVM. EVM denies xattr operations also for files that are not appraised by IMA. If only executables are appraised, xattr operations on the other files should be allowed, even if metadata verification fails (for example due to missing security.evm). At the moment, in openEuler we use EVM_ALLOW_METADATA_WRITES to avoid this problem (EVM does not check metadata integrity), but it would be useful to do the verification for example to prevent accidental changes on immutable metadata. The fourth patch enables the choice of the algorithm for the HMAC and ensures that the parameters passed to the functions which handle the HMAC are consistent with the algorithm chosen. The last three patches are simple bug fixes. Roberto Sassu (7): evm: Move hooks outside LSM infrastructure evm: Extend API of post hooks to pass the result of pre hooks evm: Return -EAGAIN to ignore verification failures evm: Propagate choice of HMAC algorithm in evm_crypto.c ima: Fix datalen check in ima_write_data() evm: Fix validation of fake xattr passed by IMA evm: Initialize saved_evm_status fs/attr.c | 7 ++- fs/xattr.c | 64 +++++++++++++++++--------- include/linux/evm.h | 18 +++++--- security/integrity/evm/Kconfig | 32 +++++++++++++ security/integrity/evm/evm.h | 1 + security/integrity/evm/evm_crypto.c | 15 ++++-- security/integrity/evm/evm_main.c | 71 +++++++++++++++++++++-------- security/integrity/ima/ima_fs.c | 2 +- security/integrity/integrity.h | 2 +- security/security.c | 18 ++------ 10 files changed, 158 insertions(+), 72 deletions(-) -- 2.27.GIT

1 7

[PATCH 01/23] ima: Use buffer large enough to store fake IMA xattr for appraisal
by Roberto Sassu 06 Aug '20

06 Aug '20

hulk inclusion category: feature feature: digest-lists --------------------------- A fake IMA xattr is created to perform EVM verification even if security.ima is not present. Appraisal could succeed if EVM status is unknown and the file digest is found in a digest list. This patch allocates a larger buffer to store fake IMA xattrs (struct evm_ima_xattr_data can be used only for SHA1 digests). Signed-off-by: Roberto Sassu <roberto.sassu(a)huawei.com> --- security/integrity/ima/ima_appraise.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index a11577147022..c6376ec28ccd 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -193,19 +193,19 @@ int ima_appraise_measurement(enum ima_hooks func, struct dentry *dentry = file_dentry(file); struct inode *inode = d_backing_inode(dentry); enum integrity_status status = INTEGRITY_UNKNOWN; - struct evm_ima_xattr_data digest_list_value; + char _buf[sizeof(struct evm_ima_xattr_data) + SHA512_DIGEST_SIZE]; int rc = xattr_len, hash_start = 0; if (!(inode->i_opflags & IOP_XATTR)) return INTEGRITY_UNKNOWN; if (rc == -ENODATA && found_digest && - !(file->f_mode && FMODE_CREATED)) { - digest_list_value.type = EVM_IMA_XATTR_DIGEST_LIST; - digest_list_value.digest[0] = found_digest->algo; - memcpy(&digest_list_value.digest[1], found_digest->digest, + !(file->f_mode & FMODE_CREATED)) { + xattr_value = (struct evm_ima_xattr_data *)_buf; + xattr_value->type = IMA_XATTR_DIGEST_NG; + xattr_value->digest[0] = found_digest->algo; + memcpy(&xattr_value->digest[1], found_digest->digest, hash_digest_size[found_digest->algo]); - xattr_value = &digest_list_value; rc = hash_digest_size[found_digest->algo] + 2; } @@ -283,7 +283,6 @@ int ima_appraise_measurement(enum ima_hooks func, status = INTEGRITY_PASS; break; } - if (!ima_appraise_no_metadata) { cause = "IMA-xattr-untrusted"; status = INTEGRITY_FAIL; -- 2.27.GIT

3 26

[PATCH 01/35] selinux: allow labeling before policy is loaded
by Roberto Sassu 06 Aug '20

06 Aug '20

From: Jonathan Lebon <jlebon(a)redhat.com> mainline inclusion from mainline-v5.5-rc1 commit 3e3e24b42043eceb97ed834102c2d094dfd7aaa6 category: bugfix --------------------------- Currently, the SELinux LSM prevents one from setting the `security.selinux` xattr on an inode without a policy first being loaded. However, this restriction is problematic: it makes it impossible to have newly created files with the correct label before actually loading the policy. This is relevant in distributions like Fedora, where the policy is loaded by systemd shortly after pivoting out of the initrd. In such instances, all files created prior to pivoting will be unlabeled. One then has to relabel them after pivoting, an operation which inherently races with other processes trying to access those same files. Going further, there are use cases for creating the entire root filesystem on first boot from the initrd (e.g. Container Linux supports this today[1], and we'd like to support it in Fedora CoreOS as well[2]). One can imagine doing this in two ways: at the block device level (e.g. laying down a disk image), or at the filesystem level. In the former, labeling can simply be part of the image. But even in the latter scenario, one still really wants to be able to set the right labels when populating the new filesystem. This patch enables this by changing behaviour in the following two ways: 1. allow `setxattr` on mounts without `SBLABEL_MNT` (which is all of them if no policy is loaded yet) 2. don't try to set the in-core inode SID if we're not initialized; instead leave it as `LABEL_INVALID` so that revalidation may be attempted at a later time Note the first hunk of this patch is functionally the same as a previously discussed one[3], though it was part of a larger series which wasn't accepted. Co-developed-by: Victor Kamensky <kamensky(a)cisco.com> Signed-off-by: Victor Kamensky <kamensky(a)cisco.com> Signed-off-by: Jonathan Lebon <jlebon(a)redhat.com> [1] https://coreos.com/os/docs/latest/root-filesystem-placement.html [2] https://github.com/coreos/fedora-coreos-tracker/issues/94 [3] https://www.spinics.net/lists/linux-initramfs/msg04593.html --- security/selinux/hooks.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 452254fd89f8..931546d80211 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3305,7 +3305,7 @@ static int selinux_inode_setxattr(struct dentry *dentry, const char *name, } sbsec = inode->i_sb->s_security; - if (!(sbsec->flags & SBLABEL_MNT)) + if (!(sbsec->flags & SBLABEL_MNT) && selinux_state.initialized) return -EOPNOTSUPP; if (!inode_owner_or_capable(inode)) @@ -3387,6 +3387,15 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name, return; } + if (!selinux_state.initialized) { + /* If we haven't even been initialized, then we can't validate + * against a policy, so leave the label as invalid. It may + * resolve to a valid label on the next revalidation try if + * we've since initialized. + */ + return; + } + rc = security_context_to_sid_force(&selinux_state, value, size, &newsid); if (rc) { -- 2.27.GIT

3 40

[PATCH 1/5] cgroup: memcg: net: do not associate sock with unrelated cgroup
by Yang Yingliang 04 Aug '20

04 Aug '20

From: Shakeel Butt <shakeelb(a)google.com> [ Upstream commit e876ecc67db80dfdb8e237f71e5b43bb88ae549c ] We are testing network memory accounting in our setup and noticed inconsistent network memory usage and often unrelated cgroups network usage correlates with testing workload. On further inspection, it seems like mem_cgroup_sk_alloc() and cgroup_sk_alloc() are broken in irq context specially for cgroup v1. mem_cgroup_sk_alloc() and cgroup_sk_alloc() can be called in irq context and kind of assumes that this can only happen from sk_clone_lock() and the source sock object has already associated cgroup. However in cgroup v1, where network memory accounting is opt-in, the source sock can be unassociated with any cgroup and the new cloned sock can get associated with unrelated interrupted cgroup. Cgroup v2 can also suffer if the source sock object was created by process in the root cgroup or if sk_alloc() is called in irq context. The fix is to just do nothing in interrupt. WARNING: Please note that about half of the TCP sockets are allocated from the IRQ context, so, memory used by such sockets will not be accouted by the memcg. The stack trace of mem_cgroup_sk_alloc() from IRQ-context: CPU: 70 PID: 12720 Comm: ssh Tainted: 5.6.0-smp-DEV #1 Hardware name: ... Call Trace: <IRQ> dump_stack+0x57/0x75 mem_cgroup_sk_alloc+0xe9/0xf0 sk_clone_lock+0x2a7/0x420 inet_csk_clone_lock+0x1b/0x110 tcp_create_openreq_child+0x23/0x3b0 tcp_v6_syn_recv_sock+0x88/0x730 tcp_check_req+0x429/0x560 tcp_v6_rcv+0x72d/0xa40 ip6_protocol_deliver_rcu+0xc9/0x400 ip6_input+0x44/0xd0 ? ip6_protocol_deliver_rcu+0x400/0x400 ip6_rcv_finish+0x71/0x80 ipv6_rcv+0x5b/0xe0 ? ip6_sublist_rcv+0x2e0/0x2e0 process_backlog+0x108/0x1e0 net_rx_action+0x26b/0x460 __do_softirq+0x104/0x2a6 do_softirq_own_stack+0x2a/0x40 </IRQ> do_softirq.part.19+0x40/0x50 __local_bh_enable_ip+0x51/0x60 ip6_finish_output2+0x23d/0x520 ? ip6table_mangle_hook+0x55/0x160 __ip6_finish_output+0xa1/0x100 ip6_finish_output+0x30/0xd0 ip6_output+0x73/0x120 ? __ip6_finish_output+0x100/0x100 ip6_xmit+0x2e3/0x600 ? ipv6_anycast_cleanup+0x50/0x50 ? inet6_csk_route_socket+0x136/0x1e0 ? skb_free_head+0x1e/0x30 inet6_csk_xmit+0x95/0xf0 __tcp_transmit_skb+0x5b4/0xb20 __tcp_send_ack.part.60+0xa3/0x110 tcp_send_ack+0x1d/0x20 tcp_rcv_state_process+0xe64/0xe80 ? tcp_v6_connect+0x5d1/0x5f0 tcp_v6_do_rcv+0x1b1/0x3f0 ? tcp_v6_do_rcv+0x1b1/0x3f0 __release_sock+0x7f/0xd0 release_sock+0x30/0xa0 __inet_stream_connect+0x1c3/0x3b0 ? prepare_to_wait+0xb0/0xb0 inet_stream_connect+0x3b/0x60 __sys_connect+0x101/0x120 ? __sys_getsockopt+0x11b/0x140 __x64_sys_connect+0x1a/0x20 do_syscall_64+0x51/0x200 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The stack trace of mem_cgroup_sk_alloc() from IRQ-context: Fixes: 2d7580738345 ("mm: memcontrol: consolidate cgroup socket tracking") Fixes: d979a39d7242 ("cgroup: duplicate cgroup reference when cloning sockets") Signed-off-by: Shakeel Butt <shakeelb(a)google.com> Reviewed-by: Roman Gushchin <guro(a)fb.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/cgroup/cgroup.c | 4 ++++ mm/memcontrol.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 78ef274b036e..94f4d6a73d70 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5928,6 +5928,10 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd) return; } + /* Don't associate the sock with unrelated interrupted task's cgroup. */ + if (in_interrupt()) + return; + rcu_read_lock(); while (true) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5d62c1fada01..f90672e7b4e6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6328,6 +6328,10 @@ void mem_cgroup_sk_alloc(struct sock *sk) return; } + /* Do not associate the sock with unrelated interrupted task's memcg. */ + if (in_interrupt()) + return; + rcu_read_lock(); memcg = mem_cgroup_from_task(current); if (memcg == root_mem_cgroup) -- 2.25.1

1 4

[PATCH 1/6] net/hinic: Set net device link down when the chip fault
by Yang Yingliang 04 Aug '20

04 Aug '20

From: Chiqijun <chiqijun(a)huawei.com> driver inclusion category: bugfix bugzilla: 4472 ----------------------------------------------------------------------- Set the fault device link down so that the bond device can fail over to the backup device. Signed-off-by: Chiqijun <chiqijun(a)huawei.com> Reviewed-by: Zengweiliang <zengweiliang.zengweiliang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/ethernet/huawei/hinic/hinic_hw.h | 4 +- .../net/ethernet/huawei/hinic/hinic_hwdev.c | 22 +++-- drivers/net/ethernet/huawei/hinic/hinic_lld.c | 83 +++++++++++++++++-- .../net/ethernet/huawei/hinic/hinic_main.c | 8 ++ 4 files changed, 100 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw.h b/drivers/net/ethernet/huawei/hinic/hinic_hw.h index 6afe31c9b80e..c4d48ccf8f2a 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hw.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_hw.h @@ -565,7 +565,8 @@ union hinic_fault_hw_mgmt { struct hinic_fault_event { /* enum hinic_fault_type */ u8 type; - u8 rsvd0[3]; + u8 fault_level; /* sdk write fault level for uld event */ + u8 rsvd0[2]; union hinic_fault_hw_mgmt event; }; @@ -653,6 +654,7 @@ enum hinic_event_type { HINIC_EVENT_MCTP_GET_HOST_INFO, HINIC_EVENT_MULTI_HOST_MGMT, HINIC_EVENT_INIT_MIGRATE_PF, + HINIC_EVENT_MGMT_WATCHDOG_EVENT, }; struct hinic_event_info { diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c b/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c index 058939d05346..2d6a547c4d34 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_hwdev.c @@ -3537,9 +3537,10 @@ static void fault_event_handler(struct hinic_hwdev *hwdev, void *buf_in, struct hinic_cmd_fault_event *fault_event; struct hinic_event_info event_info; struct hinic_fault_info_node *fault_node; + u8 fault_level; if (in_size != sizeof(*fault_event)) { - sdk_err(hwdev->dev_hdl, "Invalid fault event report, length: %d, should be %ld.\n", + sdk_err(hwdev->dev_hdl, "Invalid fault event report, length: %d, should be %ld\n", in_size, sizeof(*fault_event)); return; } @@ -3547,11 +3548,16 @@ static void fault_event_handler(struct hinic_hwdev *hwdev, void *buf_in, fault_event = buf_in; fault_report_show(hwdev, &fault_event->event); + if (fault_event->event.type == HINIC_FAULT_SRC_HW_MGMT_CHIP) + fault_level = fault_event->event.event.chip.err_level; + else + fault_level = FAULT_LEVEL_FATAL; + if (hwdev->event_callback) { event_info.type = HINIC_EVENT_FAULT; memcpy(&event_info.info, &fault_event->event, sizeof(event_info.info)); - + event_info.info.fault_level = fault_level; hwdev->event_callback(hwdev->event_pri_handle, &event_info); } @@ -3567,11 +3573,7 @@ static void fault_event_handler(struct hinic_hwdev *hwdev, void *buf_in, else if (fault_event->event.type == FAULT_TYPE_PHY_FAULT) fault_node->info.fault_src = HINIC_FAULT_SRC_HW_PHY_FAULT; - if (fault_node->info.fault_src == HINIC_FAULT_SRC_HW_MGMT_CHIP) - fault_node->info.fault_lev = - fault_event->event.event.chip.err_level; - else - fault_node->info.fault_lev = FAULT_LEVEL_FATAL; + fault_node->info.fault_lev = fault_level; memcpy(&fault_node->info.fault_data.hw_mgmt, &fault_event->event.event, sizeof(union hinic_fault_hw_mgmt)); @@ -3811,10 +3813,16 @@ static void mgmt_watchdog_timeout_event_handler(struct hinic_hwdev *hwdev, void *buf_out, u16 *out_size) { struct hinic_fault_info_node *fault_node; + struct hinic_event_info event_info = { 0 }; sw_watchdog_timeout_info_show(hwdev, buf_in, in_size, buf_out, out_size); + if (hwdev->event_callback) { + event_info.type = HINIC_EVENT_MGMT_WATCHDOG_EVENT; + hwdev->event_callback(hwdev->event_pri_handle, &event_info); + } + /* refresh history fault info */ fault_node = kzalloc(sizeof(*fault_node), GFP_KERNEL); if (!fault_node) { diff --git a/drivers/net/ethernet/huawei/hinic/hinic_lld.c b/drivers/net/ethernet/huawei/hinic/hinic_lld.c index 044d0df996e5..412f4c8a93ea 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_lld.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_lld.c @@ -1793,18 +1793,11 @@ static void __multi_host_mgmt(struct hinic_pcidev *dev, } } -void hinic_event_process(void *adapter, struct hinic_event_info *event) +static void send_uld_dev_event(struct hinic_pcidev *dev, + struct hinic_event_info *event) { - struct hinic_pcidev *dev = adapter; enum hinic_service_type type; - if (event->type == HINIC_EVENT_FMW_ACT_NTC) - return hinic_sync_time_to_fmw(dev); - else if (event->type == HINIC_EVENT_MCTP_GET_HOST_INFO) - return __mctp_get_host_info(dev, &event->mctp_info); - else if (event->type == HINIC_EVENT_MULTI_HOST_MGMT) - return __multi_host_mgmt(dev, &event->mhost_mgmt); - for (type = SERVICE_T_NIC; type < SERVICE_T_MAX; type++) { if (test_and_set_bit(type, &dev->state)) { sdk_warn(&dev->pcidev->dev, "Event: 0x%x can't handler, %s is in detach\n", @@ -1819,6 +1812,78 @@ void hinic_event_process(void *adapter, struct hinic_event_info *event) } } +static void send_event_to_all_pf(struct hinic_pcidev *dev, + struct hinic_event_info *event) +{ + struct hinic_pcidev *des_dev = NULL; + + lld_dev_hold(); + list_for_each_entry(des_dev, &dev->chip_node->func_list, node) { + if (test_bit(HINIC_FUNC_IN_REMOVE, &des_dev->flag)) + continue; + + if (hinic_func_type(des_dev->hwdev) == TYPE_VF) + continue; + + send_uld_dev_event(des_dev, event); + } + lld_dev_put(); +} + +static void send_event_to_dst_pf(struct hinic_pcidev *dev, u16 func_id, + struct hinic_event_info *event) +{ + struct hinic_pcidev *des_dev = NULL; + + lld_dev_hold(); + list_for_each_entry(des_dev, &dev->chip_node->func_list, node) { + if (test_bit(HINIC_FUNC_IN_REMOVE, &des_dev->flag)) + continue; + + if (hinic_func_type(des_dev->hwdev) == TYPE_VF) + continue; + + if (hinic_global_func_id(des_dev->hwdev) == func_id) { + send_uld_dev_event(des_dev, event); + break; + } + } + lld_dev_put(); +} + +void hinic_event_process(void *adapter, struct hinic_event_info *event) +{ + struct hinic_pcidev *dev = adapter; + u16 func_id; + + switch (event->type) { + case HINIC_EVENT_FMW_ACT_NTC: + hinic_sync_time_to_fmw(dev); + break; + case HINIC_EVENT_MCTP_GET_HOST_INFO: + __mctp_get_host_info(dev, &event->mctp_info); + break; + case HINIC_EVENT_MULTI_HOST_MGMT: + __multi_host_mgmt(dev, &event->mhost_mgmt); + break; + case HINIC_EVENT_FAULT: + if (event->info.fault_level == FAULT_LEVEL_SERIOUS_FLR && + event->info.event.chip.func_id < HINIC_MAX_PF_NUM) { + func_id = event->info.event.chip.func_id; + send_event_to_dst_pf(adapter, func_id, event); + } else { + send_uld_dev_event(adapter, event); + } + break; + case HINIC_EVENT_MGMT_WATCHDOG_EVENT: + send_event_to_all_pf(adapter, event); + break; + default: + send_uld_dev_event(adapter, event); + break; + } +} + static int mapping_bar(struct pci_dev *pdev, struct hinic_pcidev *pci_adapter) { u32 db_dwqe_size; diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c index 8dc7b555f0bf..e0635287bf05 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c @@ -3026,8 +3026,13 @@ void nic_event(struct hinic_lld_dev *lld_dev, void *adapter, break; case HINIC_EVENT_HEART_LOST: hinic_heart_lost(nic_dev); + hinic_link_status_change(nic_dev, false); break; case HINIC_EVENT_FAULT: + if (event->info.fault_level == FAULT_LEVEL_SERIOUS_FLR && + event->info.event.chip.func_id == + hinic_global_func_id(lld_dev->hwdev)) + hinic_link_status_change(nic_dev, false); break; case HINIC_EVENT_DCB_STATE_CHANGE: if (nic_dev->default_cos_id == event->dcb_state.default_cos) @@ -3047,6 +3052,9 @@ void nic_event(struct hinic_lld_dev *lld_dev, void *adapter, case HINIC_EVENT_PORT_MODULE_EVENT: hinic_port_module_event_handler(nic_dev, event); break; + case HINIC_EVENT_MGMT_WATCHDOG_EVENT: + hinic_link_status_change(nic_dev, false); + break; default: break; } -- 2.25.1

1 5

[PATCH 00/18] stable 4.19.136
by Yang Yingliang 04 Aug '20

04 Aug '20

Cong Wang (1): qrtr: orphan socket in qrtr_release() Dan Carpenter (1): AX.25: Prevent integer overflows in connect and sendmsg David Howells (1): rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA Greg Kroah-Hartman (1): Linux 4.19.136 Kuniyuki Iwashima (2): udp: Copy has_conns in reuseport_grow(). udp: Improve load balancing for SO_REUSEPORT. Miaohe Lin (1): net: udp: Fix wrong clean up for IS_UDPLITE macro Peilin Ye (2): AX.25: Fix out-of-bounds read in ax25_connect() AX.25: Prevent out-of-bounds read in ax25_sendmsg() Peng Fan (1): regmap: debugfs: check count when read regmap file Subash Abhinov Kasiviswanathan (1): dev: Defer free of skbs in flush_backlog Wei Yongjun (1): ip6_gre: fix null-ptr-deref in ip6gre_init_net() Weilong Chen (1): rtnetlink: Fix memory(net_device) leak when ->newlink fails Xie He (1): drivers/net/wan/x25_asy: Fix to make it work Xin Long (2): sctp: shrink stream outq only when new outcnt < old outcnt sctp: shrink stream outq when fails to do addstream reconf Xiongfeng Wang (1): net-sysfs: add a newline when printing 'tx_timeout' by sysfs Yuchung Cheng (1): tcp: allow at most one TLP probe per flight Makefile | 2 +- drivers/base/regmap/regmap-debugfs.c | 6 ++++++ drivers/net/wan/x25_asy.c | 21 ++++++++++++++------- include/linux/tcp.h | 4 +++- net/ax25/af_ax25.c | 10 ++++++++-- net/core/dev.c | 2 +- net/core/net-sysfs.c | 2 +- net/core/rtnetlink.c | 3 ++- net/core/sock_reuseport.c | 1 + net/ipv4/tcp_input.c | 11 ++++++----- net/ipv4/tcp_output.c | 13 ++++++++----- net/ipv4/udp.c | 17 ++++++++++------- net/ipv6/ip6_gre.c | 11 ++++++----- net/ipv6/udp.c | 17 ++++++++++------- net/qrtr/qrtr.c | 1 + net/rxrpc/recvmsg.c | 2 +- net/rxrpc/sendmsg.c | 2 +- net/sctp/stream.c | 27 ++++++++++++++++++--------- 18 files changed, 98 insertions(+), 54 deletions(-) -- 2.25.1

1 18

[PATCH 00/87] stable 4.19.135
by Yang Yingliang 03 Aug '20

03 Aug '20

Alexander Lobakin (1): qed: suppress "don't support RoCE & iWARP" flooding on HW init Arnd Bergmann (1): x86: math-emu: Fix up 'cmp' insn for clang ias Ben Skeggs (1): drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout Boris Burkov (1): btrfs: fix mount failure caused by race with umount Caiyuan Xie (1): HID: alps: support devices with report id 2 Chen-Yu Tsai (1): drm: sun4i: hdmi: Fix inverted HPD result Christophe JAILLET (1): hippi: Fix a size used in a 'pci_free_consistent()' in an error handling path Chu Lin (1): hwmon: (adm1275) Make sure we are reading enough data for different chips Chunfeng Yun (1): usb: xhci-mtk: fix the failure of bandwidth allocation Cong Wang (1): bonding: check return value of register_netdevice() in bond_newlink() Cristian Marussi (1): hwmon: (scmi) Fix potential buffer overflow in scmi_hwmon_probe() Dinghao Liu (1): dmaengine: tegra210-adma: Fix runtime PM imbalance on error Douglas Anderson (1): soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner Evgeny Novikov (2): hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow usb: gadget: udc: gr_udc: fix memleak on error handling path in gr_ep_init() Fangrui Song (1): Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation Federico Ricchiuto (1): HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override Filipe Manana (1): btrfs: fix double free on ulist after backref resolution failure Forest Crossman (1): usb: xhci: Fix ASM2142/ASM3142 DMA addressing Gavin Shan (1): drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() Geert Uytterhoeven (1): ASoC: qcom: Drop HAS_DMA dependency to fix link failure George Kennedy (1): ax88172a: fix ax88172a_unbind() failures Greg Kroah-Hartman (1): Linux 4.19.135 Hans de Goede (3): ASoC: rt5670: Correct RT5670_LDO_SEL_MASK HID: apple: Disable Fn-key key-re-mapping on clone keyboards ASoC: rt5670: Add new gpio1_is_ext_spk_en quirk and enable it on the Lenovo Miix 2 10 Hugh Dickins (1): mm/memcg: fix refcount error while moving and swapping Ian Abbott (4): staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG shift staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG shift Ilya Katsnelson (1): Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen Jacky Hu (1): pinctrl: amd: fix npins for uart0 in kerncz_groups Joerg Roedel (1): x86, vmlinux.lds: Page-align end of ..page_aligned sections John David Anglin (1): parisc: Add atomic64_set_release() define to avoid CPU soft lockups Jon Maloy (1): tipc: clean up skb list lock handling on send path Leonid Ravich (1): dmaengine: ioat setting ioat timeout as module parameter Liu Jian (2): ieee802154: fix one possible memleak in adf7242_probe mlxsw: destroy workqueue when trap_register in mlxsw_emad_init Marc Kleine-Budde (1): regmap: dev_get_regmap_match(): fix string comparison Mark O'Donovan (1): ath9k: Fix regression with Atheros 9271 Markus Theil (1): mac80211: allow rx of mesh eapol frames with default rx key Matthew Gerlach (1): fpga: dfl: fix bug in port reset handshake Matthew Howell (1): serial: exar: Fix GPIO configuration for Sealevel cards based on XR17V35X Max Filippov (2): xtensa: fix __sync_fetch_and_{and,or}_4 declarations xtensa: update *pos in cpuinfo_op.next Merlijn Wajer (1): Input: add `SW_MACHINE_COVER` Michael J. Ruhl (1): io-mapping: indicate mapping failure Miklos Szeredi (1): fuse: fix weird page warning Mikulas Patocka (1): dm integrity: fix integrity recalculation that is improperly skipped Muchun Song (1): mm: memcg/slab: fix memory leak at non-root kmem_cache destroy Navid Emamdoost (2): gpio: arizona: handle pm_runtime_get_sync failure case gpio: arizona: put pm_runtime in case of failure Oleg Nesterov (1): uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression Olga Kornievskaia (1): SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion") Palmer Dabbelt (1): RISC-V: Upgrade smp_mb__after_spinlock() to iorw,iorw Paweł Gronowski (1): drm/amdgpu: Fix NULL dereference in dpm sysfs handlers Pi-Hsun Shih (1): scripts/decode_stacktrace: strip basepath from all paths Qiu Wenbo (1): drm/amd/powerplay: fix a crash when overclocking Vega M Qiujun Huang (1): ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb Robbie Ko (1): btrfs: fix page leaks after failure to lock page for delalloc Rodrigo Rivas Costa (1): HID: steam: fixes race in handling device list. Roman Gushchin (1): mm: memcg/slab: synchronize access to kmem_cache dying flag using a spinlock Rustam Kovhaev (1): staging: wlan-ng: properly check endpoint types Serge Semin (1): serial: 8250_mtk: Fix high-speed baud rates clamping Sergey Organov (1): net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration Stefano Garzarella (1): scripts/gdb: fix lx-symbols 'gdb.error' while loading modules Steve French (1): Revert "cifs: Fix the target file was deleted when rename failed." Taehee Yoo (1): bonding: check error value of register_netdevice() immediately Takashi Iwai (1): ALSA: info: Drop WARN_ON() from buffer NULL sanity check Tetsuo Handa (3): binder: Don't use mmput() from shrinker function. fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins. vt: Reject zero-sized screen buffer size. Thomas Gleixner (1): irqdomain/treewide: Keep firmware node unconditionally allocated Tom Rix (2): scsi: scsi_transport_spi: Fix function pointer check net: sky2: initialize return of gm_phy_read Vasundhara Volam (1): bnxt_en: Fix race when modifying pause settings. Vladimir Oltean (1): spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours Wang Hai (2): net: smc91x: Fix possible memory leak in smc_drv_probe() net: ethernet: ave: Fix error returns in ave_init Will Deacon (1): arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP Wolfram Sang (1): i2c: rcar: always clear ICSAR to avoid side effects Xie He (1): drivers/net/wan/lapbether: Fixed the value of hard_header_len Yang Yingliang (2): IB/umem: fix reference count leak in ib_umem_odp_get() serial: 8250: fix null-ptr-deref in serial8250_start_tx() guodeqing (1): ipvs: fix the connection sync failed in some cases leilk.liu (1): spi: mediatek: use correct SPI_CFG2_REG MACRO Makefile | 4 +- arch/arm64/kernel/debug-monitors.c | 4 +- arch/parisc/include/asm/atomic.h | 2 + arch/riscv/include/asm/barrier.h | 10 ++- arch/x86/kernel/apic/io_apic.c | 10 +-- arch/x86/kernel/apic/msi.c | 18 +++-- arch/x86/kernel/apic/vector.c | 1 - arch/x86/kernel/vmlinux.lds.S | 1 + arch/x86/math-emu/wm_sqrt.S | 2 +- arch/x86/platform/uv/uv_irq.c | 3 +- arch/xtensa/kernel/setup.c | 3 +- arch/xtensa/kernel/xtensa_ksyms.c | 4 +- drivers/android/binder_alloc.c | 2 +- drivers/base/regmap/regmap.c | 2 +- drivers/dma/ioat/dma.c | 12 ++++ drivers/dma/ioat/dma.h | 2 - drivers/dma/tegra210-adma.c | 5 +- drivers/firmware/psci_checker.c | 5 +- drivers/fpga/dfl-afu-main.c | 3 +- drivers/gpio/gpio-arizona.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 +-- .../drm/amd/powerplay/smumgr/vegam_smumgr.c | 10 +-- .../gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 +- .../drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- drivers/hid/hid-alps.c | 2 + drivers/hid/hid-apple.c | 18 +++++ drivers/hid/hid-steam.c | 6 +- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 +++ drivers/hwmon/aspeed-pwm-tacho.c | 2 + drivers/hwmon/pmbus/adm1275.c | 10 ++- drivers/hwmon/scmi-hwmon.c | 2 +- drivers/i2c/busses/i2c-rcar.c | 3 + drivers/infiniband/core/umem_odp.c | 3 +- drivers/input/mouse/synaptics.c | 1 + drivers/iommu/amd_iommu.c | 5 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/md/dm-integrity.c | 4 +- drivers/md/dm.c | 17 +++++ drivers/net/bonding/bond_main.c | 10 ++- drivers/net/bonding/bond_netlink.c | 3 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 +- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 4 +- drivers/net/ethernet/smsc/smc91x.c | 4 +- drivers/net/ethernet/socionext/sni_ave.c | 2 +- drivers/net/hippi/rrunner.c | 2 +- drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/phy/dp83640.c | 4 ++ drivers/net/usb/ax88172a.c | 1 + drivers/net/wan/lapbether.c | 9 ++- drivers/net/wireless/ath/ath9k/hif_usb.c | 52 ++++++++++---- drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ++ drivers/pci/controller/vmd.c | 5 +- drivers/pinctrl/pinctrl-amd.h | 2 +- drivers/scsi/scsi_transport_spi.c | 2 +- drivers/soc/qcom/rpmh.c | 8 +-- drivers/spi/spi-fsl-dspi.c | 4 +- drivers/spi/spi-mt65xx.c | 15 ++-- .../staging/comedi/drivers/addi_apci_1032.c | 20 ++++-- .../staging/comedi/drivers/addi_apci_1500.c | 24 +++++-- .../staging/comedi/drivers/addi_apci_1564.c | 20 ++++-- drivers/staging/comedi/drivers/ni_6527.c | 2 +- drivers/staging/wlan-ng/prism2usb.c | 16 ++++- drivers/tty/serial/8250/8250_core.c | 2 +- drivers/tty/serial/8250/8250_exar.c | 12 +++- drivers/tty/serial/8250/8250_mtk.c | 18 +++++ drivers/tty/vt/vt.c | 29 +++++--- drivers/usb/gadget/udc/gr_udc.c | 7 +- drivers/usb/host/xhci-mtk-sch.c | 4 ++ drivers/usb/host/xhci-pci.c | 3 + drivers/video/fbdev/core/bitblit.c | 4 +- drivers/video/fbdev/core/fbcon_ccw.c | 4 +- drivers/video/fbdev/core/fbcon_cw.c | 4 +- drivers/video/fbdev/core/fbcon_ud.c | 4 +- fs/btrfs/backref.c | 1 + fs/btrfs/extent_io.c | 3 +- fs/btrfs/volumes.c | 8 +++ fs/cifs/inode.c | 10 +-- fs/fuse/dev.c | 3 +- fs/nfs/direct.c | 13 ++-- fs/nfs/file.c | 1 - include/asm-generic/vmlinux.lds.h | 5 +- include/linux/device-mapper.h | 1 + include/linux/io-mapping.h | 5 +- include/linux/mod_devicetable.h | 2 +- include/sound/rt5670.h | 1 + include/uapi/linux/input-event-codes.h | 3 +- kernel/events/uprobes.c | 2 +- mm/memcontrol.c | 4 +- mm/slab_common.c | 50 ++++++++++--- net/mac80211/rx.c | 26 +++++++ net/netfilter/ipvs/ip_vs_sync.c | 12 ++-- net/tipc/bcast.c | 8 +-- net/tipc/group.c | 4 +- net/tipc/link.c | 12 ++-- net/tipc/node.c | 7 +- net/tipc/socket.c | 12 ++-- scripts/decode_stacktrace.sh | 4 +- scripts/gdb/linux/symbols.py | 2 +- sound/core/info.c | 4 +- sound/soc/codecs/rt5670.c | 71 +++++++++++++++---- sound/soc/codecs/rt5670.h | 2 +- sound/soc/qcom/Kconfig | 2 +- 105 files changed, 584 insertions(+), 225 deletions(-) -- 2.25.1

1 87

[PATCH] netfilter: nat: check the bounds of nf_nat_l3protos and nf_nat_l4protos
by Yang Yingliang 29 Jul '20

29 Jul '20

hulk inclusion category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- famliy can be passed from user space and will be out of range of nf_nat_l3protos or nf_nat_l4protos, so we need check the family when call __nf_nat_l3proto_find() or __nf_nat_l4proto_find(). nfnetlink_parse_nat_setup() need return EAGAIN, if __nf_nat_l3proto_find() returns null, so we return a error number to distinguish this case. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 4 +++- net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 4 +++- net/netfilter/nf_nat_core.c | 21 ++++++++++++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c index 6115bf1ff6f0..52e3f9c7bc69 100644 --- a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c @@ -218,6 +218,8 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, return 1; l4proto = __nf_nat_l4proto_find(NFPROTO_IPV4, inside->ip.protocol); + if (!l4proto) + return 1; if (!nf_nat_ipv4_manip_pkt(skb, hdrlen + sizeof(inside->icmp), l4proto, &ct->tuplehash[!dir].tuple, !manip)) return 0; @@ -234,7 +236,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, /* Change outer to look like the reply to an incoming packet */ nf_ct_invert_tuplepr(&target, &ct->tuplehash[!dir].tuple); l4proto = __nf_nat_l4proto_find(NFPROTO_IPV4, 0); - if (!nf_nat_ipv4_manip_pkt(skb, 0, l4proto, &target, manip)) + if (l4proto && !nf_nat_ipv4_manip_pkt(skb, 0, l4proto, &target, manip)) return 0; return 1; diff --git a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c index ca6d38698b1a..bf25263b2dcd 100644 --- a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c @@ -228,6 +228,8 @@ int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, return 1; l4proto = __nf_nat_l4proto_find(NFPROTO_IPV6, inside->ip6.nexthdr); + if (!l4proto) + return 1; if (!nf_nat_ipv6_manip_pkt(skb, hdrlen + sizeof(inside->icmp6), l4proto, &ct->tuplehash[!dir].tuple, !manip)) return 0; @@ -245,7 +247,7 @@ int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, nf_ct_invert_tuplepr(&target, &ct->tuplehash[!dir].tuple); l4proto = __nf_nat_l4proto_find(NFPROTO_IPV6, IPPROTO_ICMPV6); - if (!nf_nat_ipv6_manip_pkt(skb, 0, l4proto, &target, manip)) + if (l4proto && !nf_nat_ipv6_manip_pkt(skb, 0, l4proto, &target, manip)) return 0; return 1; diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 2268b10a9dcf..f1576e46ee2c 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -64,12 +64,18 @@ struct nat_net { inline const struct nf_nat_l3proto * __nf_nat_l3proto_find(u8 family) { + if (unlikely(family >= NFPROTO_NUMPROTO)) + return ERR_PTR(-EPROTONOSUPPORT); + return rcu_dereference(nf_nat_l3protos[family]); } inline const struct nf_nat_l4proto * __nf_nat_l4proto_find(u8 family, u8 protonum) { + if (unlikely(family >= NFPROTO_NUMPROTO || nf_nat_l4protos[family] == NULL)) + return NULL; + return rcu_dereference(nf_nat_l4protos[family][protonum]); } EXPORT_SYMBOL_GPL(__nf_nat_l4proto_find); @@ -90,7 +96,7 @@ static void __nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl) family = nf_ct_l3num(ct); l3proto = __nf_nat_l3proto_find(family); - if (l3proto == NULL) + if (IS_ERR_OR_NULL(l3proto)) return; dir = CTINFO2DIR(ctinfo); @@ -333,8 +339,12 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple, rcu_read_lock(); l3proto = __nf_nat_l3proto_find(orig_tuple->src.l3num); + if (IS_ERR_OR_NULL(l3proto)) + goto out; l4proto = __nf_nat_l4proto_find(orig_tuple->src.l3num, orig_tuple->dst.protonum); + if (!l4proto) + goto out; /* 1) If this srcip/proto/src-proto-part is currently mapped, * and that same mapping gives a unique tuple within the given @@ -509,8 +519,12 @@ static unsigned int nf_nat_manip_pkt(struct sk_buff *skb, struct nf_conn *ct, nf_ct_invert_tuplepr(&target, &ct->tuplehash[!dir].tuple); l3proto = __nf_nat_l3proto_find(target.src.l3num); + if (IS_ERR_OR_NULL(l3proto)) + return NF_DROP; l4proto = __nf_nat_l4proto_find(target.src.l3num, target.dst.protonum); + if (!l4proto) + return NF_DROP; if (!l3proto->manip_pkt(skb, 0, l4proto, &target, mtype)) return NF_DROP; @@ -816,6 +830,9 @@ static int nfnetlink_parse_nat_proto(struct nlattr *attr, return err; l4proto = __nf_nat_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct)); + if (!l4proto) + return -EPROTONOSUPPORT; + if (l4proto->nlattr_to_range) err = l4proto->nlattr_to_range(tb, range); @@ -876,6 +893,8 @@ nfnetlink_parse_nat_setup(struct nf_conn *ct, l3proto = __nf_nat_l3proto_find(nf_ct_l3num(ct)); if (l3proto == NULL) return -EAGAIN; + if (IS_ERR(l3proto)) + return PTR_ERR(l3proto); /* No NAT information has been passed, allocate the null-binding */ if (attr == NULL) -- 2.25.1

1 0

2024

2023

2022

2021

2020

2019

Kernel