- Kernel - mailweb.openeuler.org

[PATCH 1/2] config: add certs dir to CONFIG_MODULE_SIG_KEY
by Yang Yingliang 08 Sep '20

08 Sep '20

hulk inclusion category: bugfix bugzilla: NA CVE: NA --------------------------- make[1]: *** No rule to make target 'signing_key.pem', needed by 'certs/signing_key.x509'. Stop. Fix the compile error by add certs dir to CONFIG_MODULE_SIG_KEY. Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/euleros_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/euleros_defconfig b/arch/arm64/configs/euleros_defconfig index c0ec409e48ac7..6b8a71fd4f846 100644 --- a/arch/arm64/configs/euleros_defconfig +++ b/arch/arm64/configs/euleros_defconfig @@ -5317,7 +5317,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="./signing_key.pem" +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set -- 2.25.1

1 1

[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