- Kernel - mailweb.openeuler.org

[PATCH 1/6] driver core: Introduce device_iommu_mapped() function
by Yang Yingliang 22 Oct '20

22 Oct '20

From: Joerg Roedel <jroedel(a)suse.de> mainline inclusion from mainline-v4.20-rc1 commit dbba197edf32209d110727a02d3a91de4c88520f category:feature bugzilla:NA CVE:NA ------------------- Some places in the kernel check the iommu_group pointer in 'struct device' in order to find out whether a device is mapped by an IOMMU. This is not good way to make this check, as the pointer will be moved to 'struct dev_iommu_data'. This way to make the check is also not very readable. Introduce an explicit function to perform this check. Acked-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Acked-by: Robin Murphy <robin.murphy(a)arm.com> Signed-off-by: Joerg Roedel <jroedel(a)suse.de> Signed-off-by: Chen Jun <chenjun102(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/linux/device.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/device.h b/include/linux/device.h index ee4ed3af30d0..cb9df20a9c97 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1090,6 +1090,16 @@ static inline struct device *kobj_to_dev(struct kobject *kobj) return container_of(kobj, struct device, kobj); } +/** + * device_iommu_mapped - Returns true when the device DMA is translated + * by an IOMMU + * @dev: Device to perform the check on + */ +static inline bool device_iommu_mapped(struct device *dev) +{ + return (dev->iommu_group != NULL); +} + /* Get the wakeup routines, which depend on struct device */ #include <linux/pm_wakeup.h> -- 2.25.1

1 5

[PATCH 1/6] net/hinic: Fix the driver does not report an error when setting MAC fails
by Yang Yingliang 22 Oct '20

22 Oct '20

From: Chiqijun <chiqijun(a)huawei.com> driver inclusion category: bugfix bugzilla: 4472 ----------------------------------------------------------------------- When using the ip link command to configure the MAC for the VF in the PF, the status 4 will be returned when the MAC is set on the VF; when the PF driver receives the status 4 returned by the firmwre, the MAC setting failed and an error should be reported. Signed-off-by: Chiqijun <chiqijun(a)huawei.com> Reviewed-by: Wangxiaoyun <cloud.wangxiaoyun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../net/ethernet/huawei/hinic/hinic_main.c | 7 +++- .../net/ethernet/huawei/hinic/hinic_nic_cfg.c | 41 ++++++++++++------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c index b5d0bdadf509..cf7b6ceef060 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c @@ -1305,8 +1305,11 @@ static int hinic_set_mac_addr(struct net_device *netdev, void *addr) err = hinic_update_mac(nic_dev->hwdev, netdev->dev_addr, saddr->sa_data, 0, func_id); - if (err) - return err; + if (err) { + nicif_err(nic_dev, drv, netdev, "Failed to update mac, err: %d\n", + err); + return err == HINIC_PF_SET_VF_ALREADY ? -EPERM : err; + } memcpy(netdev->dev_addr, saddr->sa_data, ETH_ALEN); diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c index a42dea0ad707..2b349e17260b 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nic_cfg.c @@ -231,6 +231,23 @@ int hinic_get_fw_support_func(void *hwdev) #define HINIC_ADD_VLAN_IN_MAC 0x8000 #define HINIC_VLAN_ID_MASK 0x7FFF +#define PF_SET_VF_MAC(hwdev, status) \ + (HINIC_FUNC_TYPE(hwdev) == TYPE_VF && \ + (status) == HINIC_PF_SET_VF_ALREADY) + +static int hinic_check_mac_status(struct hinic_hwdev *hwdev, u8 status, + u16 vlan_id) +{ + if ((status && status != HINIC_MGMT_STATUS_EXIST) || + (vlan_id & CHECK_IPSU_15BIT && status == HINIC_MGMT_STATUS_EXIST)) { + if (PF_SET_VF_MAC(hwdev, status)) + return 0; + + return -EINVAL; + } + + return 0; +} int hinic_set_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id) { @@ -255,17 +272,14 @@ int hinic_set_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id) err = l2nic_msg_to_mgmt_sync(hwdev, HINIC_PORT_CMD_SET_MAC, &mac_info, sizeof(mac_info), &mac_info, &out_size); if (err || !out_size || - (mac_info.status && mac_info.status != HINIC_MGMT_STATUS_EXIST && - mac_info.status != HINIC_PF_SET_VF_ALREADY) || - (mac_info.vlan_id & CHECK_IPSU_15BIT && - mac_info.status == HINIC_MGMT_STATUS_EXIST)) { + hinic_check_mac_status(hwdev, mac_info.status, mac_info.vlan_id)) { nic_err(nic_hwdev->dev_hdl, "Failed to update MAC, err: %d, status: 0x%x, out size: 0x%x\n", err, mac_info.status, out_size); - return -EINVAL; + return -EIO; } - if (mac_info.status == HINIC_PF_SET_VF_ALREADY) { + if (PF_SET_VF_MAC(nic_hwdev, mac_info.status)) { nic_warn(nic_hwdev->dev_hdl, "PF has already set VF mac, Ignore set operation\n"); return HINIC_PF_SET_VF_ALREADY; } @@ -302,13 +316,13 @@ int hinic_del_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id) err = l2nic_msg_to_mgmt_sync(hwdev, HINIC_PORT_CMD_DEL_MAC, &mac_info, sizeof(mac_info), &mac_info, &out_size); if (err || !out_size || - (mac_info.status && mac_info.status != HINIC_PF_SET_VF_ALREADY)) { + (mac_info.status && !PF_SET_VF_MAC(nic_hwdev, mac_info.status))) { nic_err(nic_hwdev->dev_hdl, "Failed to delete MAC, err: %d, status: 0x%x, out size: 0x%x\n", err, mac_info.status, out_size); - return -EINVAL; + return -EIO; } - if (mac_info.status == HINIC_PF_SET_VF_ALREADY) { + if (PF_SET_VF_MAC(nic_hwdev, mac_info.status)) { nic_warn(nic_hwdev->dev_hdl, "PF has already set VF mac, Ignore delete operation\n"); return HINIC_PF_SET_VF_ALREADY; } @@ -343,17 +357,14 @@ int hinic_update_mac(void *hwdev, u8 *old_mac, u8 *new_mac, u16 vlan_id, &mac_info, sizeof(mac_info), &mac_info, &out_size); if (err || !out_size || - (mac_info.status && mac_info.status != HINIC_MGMT_STATUS_EXIST && - mac_info.status != HINIC_PF_SET_VF_ALREADY) || - (mac_info.vlan_id & CHECK_IPSU_15BIT && - mac_info.status == HINIC_MGMT_STATUS_EXIST)) { + hinic_check_mac_status(hwdev, mac_info.status, mac_info.vlan_id)) { nic_err(nic_hwdev->dev_hdl, "Failed to update MAC, err: %d, status: 0x%x, out size: 0x%x\n", err, mac_info.status, out_size); - return -EINVAL; + return -EIO; } - if (mac_info.status == HINIC_PF_SET_VF_ALREADY) { + if (PF_SET_VF_MAC(nic_hwdev, mac_info.status)) { nic_warn(nic_hwdev->dev_hdl, "PF has already set VF MAC. Ignore update operation\n"); return HINIC_PF_SET_VF_ALREADY; } -- 2.25.1

1 5

[PATCH 01/20] nvme-rdma: remove redundant reference between ib_device and tagset
by Yang Yingliang 22 Oct '20

22 Oct '20

From: Max Gurtovoy <maxg(a)mellanox.com> mainline inclusion from mainline-v5.2-rc1 commit 87fd125344d68adf7699ec7396aa9f905ce79a80 category: bugfix bugzilla: NA CVE: NA Link: https://gitee.com/openeuler/kernel/issues/I1WGZE ------------------------------------------------- In the past, before adding f41725bb ("nvme-rdma: Use mr pool") commit, we needed a reference on the ib_device as long as the tagset was alive, as the MRs in the request structures needed a valid ib_device. Now, we allocate/deallocate MR pool per QP and consume on demand. Also remove nvme_rdma_free_tagset function and use blk_mq_free_tag_set instead, as it unneeded anymore. This commit also fixes a memory leakage and possible segmentation fault. When configuring the system with NIC teaming (aka bonding), we use 1 network interface to create an HA connection to the target side. In case one connection breaks down, nvme-rdma driver will get notification from rdma-cm layer that underlying address was change and will start error recovery process. During this process, we'll reconnect to the target via the second interface in the bond without destroying the tagset. This will cause a leakage of the initial rdma device (ndev) and miscount in the reference count of the new created rdma device (new ndev). In the final destruction (or in another error flow), we'll get a warning dump from the ib_dealloc_pd that we still have inflight MR's related to that pd. This happens becasue of the miscount of the reference tag of the rdma device and causing access violation to it's elements (some queues are not destroyed yet). Signed-off-by: Max Gurtovoy <maxg(a)mellanox.com> Signed-off-by: Israel Rukshin <israelr(a)mellanox.com> Signed-off-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Chao Leng <lengchao(a)huawei.com> Reviewed-by: Jike Cheng <chengjike.cheng(a)huawei.com> Conflicts: drivers/nvme/host/rdma.c [lrz: adjust context] Signed-off-by: Ruozhu Li <liruozhu(a)huawei.com> Signed-off-by: Lijie <lijie34(a)huawei.com> Reviewed-by: Tao Hou <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/nvme/host/rdma.c | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 077c67816665..0bfc1875575d 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -666,15 +666,6 @@ static int nvme_rdma_alloc_io_queues(struct nvme_rdma_ctrl *ctrl) return ret; } -static void nvme_rdma_free_tagset(struct nvme_ctrl *nctrl, - struct blk_mq_tag_set *set) -{ - struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl); - - blk_mq_free_tag_set(set); - nvme_rdma_dev_put(ctrl->device); -} - static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl, bool admin) { @@ -712,24 +703,9 @@ static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl, ret = blk_mq_alloc_tag_set(set); if (ret) - goto out; - - /* - * We need a reference on the device as long as the tag_set is alive, - * as the MRs in the request structures need a valid ib_device. - */ - ret = nvme_rdma_dev_get(ctrl->device); - if (!ret) { - ret = -EINVAL; - goto out_free_tagset; - } + return ERR_PTR(ret); return set; - -out_free_tagset: - blk_mq_free_tag_set(set); -out: - return ERR_PTR(ret); } static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl, @@ -737,7 +713,7 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl, { if (remove) { blk_cleanup_queue(ctrl->ctrl.admin_q); - nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset); + blk_mq_free_tag_set(ctrl->ctrl.admin_tagset); } if (ctrl->async_event_sqe.data) { cancel_work_sync(&ctrl->ctrl.async_event_work); @@ -815,7 +791,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl, blk_cleanup_queue(ctrl->ctrl.admin_q); out_free_tagset: if (new) - nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset); + blk_mq_free_tag_set(ctrl->ctrl.admin_tagset); out_free_async_qe: if (ctrl->async_event_sqe.data) { nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe, @@ -832,7 +808,7 @@ static void nvme_rdma_destroy_io_queues(struct nvme_rdma_ctrl *ctrl, { if (remove) { blk_cleanup_queue(ctrl->ctrl.connect_q); - nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.tagset); + blk_mq_free_tag_set(ctrl->ctrl.tagset); } nvme_rdma_free_io_queues(ctrl); } @@ -873,7 +849,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new) blk_cleanup_queue(ctrl->ctrl.connect_q); out_free_tag_set: if (new) - nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.tagset); + blk_mq_free_tag_set(ctrl->ctrl.tagset); out_free_io_queues: nvme_rdma_free_io_queues(ctrl); return ret; -- 2.25.1

1 19

【议题收集】【Meeting Notice】openEuler kernel sig meeting Time: 2020-10-16 10:00-12:00
by Xie XiuQi 20 Oct '20

20 Oct '20

openEuler kernel sig meeting 定于 2020-10-16 10:00-12:00 召开，欢迎回复邮件申报议题。 --- 会议信息 --- 会议链接：https://zoom.us/j/94156903933 会议 ID : 94156903933 --- 会议纪要归档 --- Meeting Record 20200918： https://gitee.com/openeuler/kernel/issues/I1WGN0

1 3

[PATCH 00/19] backport stable-4.19.152
by Yang Yingliang 19 Oct '20

19 Oct '20

Anant Thazhemadam (1): staging: comedi: check validity of wMaxPacketSize of usb endpoints found Arnaud Patard (1): drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case Dmitry Golovin (1): ARM: 8939/1: kbuild: use correct nm executable Dominik Przychodni (1): crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA Greg Kroah-Hartman (1): Linux 4.19.152 Herbert Xu (1): crypto: bcm - Verify GCM/CCM key length in setkey Jan Kara (2): reiserfs: Initialize inode keys properly reiserfs: Fix oops during mount Jason A. Donenfeld (1): ARM: 8867/1: vdso: pass --be8 to linker if necessary Leo Yan (1): perf cs-etm: Move definition of 'traceid_list' global variable from header file Leonid Bloch (1): USB: serial: option: Add Telit FT980-KS composition Luiz Augusto von Dentz (2): Bluetooth: Consolidate encryption handling in hci_encrypt_cfm Bluetooth: Disconnect if E0 is used for Level 4 Masahiro Yamada (1): ARM: 8858/1: vdso: use $(LD) instead of $(CC) to link VDSO Mychaela N. Falconia (1): USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters Oliver Neukum (1): media: usbtv: Fix refcounting mixup Patrick Steinhardt (1): Bluetooth: Fix update of connection state in `hci_encrypt_cfm` Scott Chen (1): USB: serial: pl2303: add device-id for HP GC device Wilken Gottwalt (1): USB: serial: option: add Cellient MPL200 card Makefile | 2 +- arch/arm/boot/compressed/Makefile | 4 +- arch/arm/vdso/Makefile | 22 +++++------ drivers/crypto/bcm/cipher.c | 15 +++++++- drivers/crypto/qat/qat_common/qat_algs.c | 10 ++++- drivers/media/usb/usbtv/usbtv-core.c | 3 +- drivers/net/ethernet/marvell/mvmdio.c | 22 ++++++++--- drivers/staging/comedi/drivers/vmk80xx.c | 3 ++ drivers/usb/serial/ftdi_sio.c | 5 +++ drivers/usb/serial/ftdi_sio_ids.h | 7 ++++ drivers/usb/serial/option.c | 5 +++ drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + fs/reiserfs/inode.c | 6 +-- fs/reiserfs/xattr.c | 7 ++++ include/net/bluetooth/hci_core.h | 30 ++++++++++++--- net/bluetooth/hci_conn.c | 17 +++++++++ net/bluetooth/hci_event.c | 48 ++++++------------------ tools/perf/util/cs-etm.c | 3 ++ tools/perf/util/cs-etm.h | 3 -- 20 files changed, 138 insertions(+), 76 deletions(-) -- 2.25.1

1 19

[PATCH 00/26] huge vmalloc mappings
by Yang Yingliang 19 Oct '20

19 Oct '20

Anshuman Khandual (1): mm/ioremap: probe platform for p4d huge map support Christoph Hellwig (8): mm: remove __get_vm_area mm: unexport unmap_kernel_range_noflush mm: only allow page table mappings for built-in zsmalloc mm: pass addr as unsigned long to vb_free mm: remove vmap_page_range_noflush and vunmap_page_range mm: rename vmap_page_range to map_kernel_range mm: don't return the number of pages from map_kernel_range{, _noflush} mm: remove map_vm_range Daniel Axtens (1): mm/memory.c: add apply_to_existing_page_range() helper Ingo Molnar (1): mm/vmalloc: Add empty <asm/vmalloc.h> headers and use them from <linux/vmalloc.h> Mike Rapoport (1): mm: move lib/ioremap.c to mm/ Nicholas Piggin (9): mm/vmalloc: fix vmalloc_to_page for huge vmap mappings mm: apply_to_pte_range warn and fail if a large pte is encountered mm/vmalloc: rename vmap_*_range vmap_pages_*_range mm/ioremap: rename ioremap_*_range to vmap_*_range mm: HUGE_VMAP arch support cleanup arm64: inline huge vmap supported functions mm: Move vmap_range from mm/ioremap.c to mm/vmalloc.c mm/vmalloc: add vmap_range_noflush variant mm/vmalloc: Hugepage vmalloc mappings Steven Price (2): mm: add generic p?d_leaf() macros arm64: mm: add p?d_leaf() definitions Will Deacon (3): ioremap: rework pXd_free_pYd_page() API lib/ioremap: ensure phys_addr actually corresponds to a physical address lib/ioremap: ensure break-before-make is used for huge p4d mappings Documentation/core-api/cachetlb.rst | 2 +- arch/Kconfig | 4 + arch/alpha/include/asm/vmalloc.h | 4 + arch/arc/include/asm/vmalloc.h | 4 + arch/arm/include/asm/vmalloc.h | 4 + arch/arm64/include/asm/pgtable.h | 2 + arch/arm64/include/asm/vmalloc.h | 29 ++ arch/arm64/mm/mmu.c | 16 - arch/c6x/include/asm/vmalloc.h | 4 + arch/csky/include/asm/vmalloc.h | 4 + arch/h8300/include/asm/vmalloc.h | 4 + arch/hexagon/include/asm/vmalloc.h | 4 + arch/ia64/include/asm/vmalloc.h | 4 + arch/m68k/include/asm/vmalloc.h | 4 + arch/microblaze/include/asm/vmalloc.h | 4 + arch/mips/include/asm/vmalloc.h | 4 + arch/nds32/include/asm/vmalloc.h | 4 + arch/nios2/include/asm/vmalloc.h | 4 + arch/openrisc/include/asm/vmalloc.h | 4 + arch/parisc/include/asm/vmalloc.h | 4 + arch/powerpc/include/asm/vmalloc.h | 12 + arch/powerpc/kernel/pci_64.c | 3 +- arch/riscv/include/asm/vmalloc.h | 4 + arch/s390/include/asm/vmalloc.h | 4 + arch/sh/include/asm/vmalloc.h | 4 + arch/sh/kernel/cpu/sh4/sq.c | 3 +- arch/sparc/include/asm/vmalloc.h | 4 + arch/um/include/asm/vmalloc.h | 4 + arch/unicore32/include/asm/vmalloc.h | 4 + arch/x86/include/asm/vmalloc.h | 12 + arch/x86/mm/ioremap.c | 11 +- arch/x86/mm/pgtable.c | 8 + arch/xtensa/include/asm/vmalloc.h | 4 + include/asm-generic/pgtable.h | 25 ++ include/linux/io.h | 8 - include/linux/mm.h | 3 + include/linux/vmalloc.h | 24 +- init/main.c | 1 - kernel/dma/mapping.c | 3 +- lib/Makefile | 1 - lib/ioremap.c | 183 --------- mm/Kconfig | 2 +- mm/Makefile | 2 +- mm/ioremap.c | 34 ++ mm/memory.c | 152 ++++++-- mm/vmalloc.c | 518 +++++++++++++++++++------- mm/zsmalloc.c | 4 +- 47 files changed, 752 insertions(+), 398 deletions(-) create mode 100644 arch/alpha/include/asm/vmalloc.h create mode 100644 arch/arc/include/asm/vmalloc.h create mode 100644 arch/arm/include/asm/vmalloc.h create mode 100644 arch/arm64/include/asm/vmalloc.h create mode 100644 arch/c6x/include/asm/vmalloc.h create mode 100644 arch/csky/include/asm/vmalloc.h create mode 100644 arch/h8300/include/asm/vmalloc.h create mode 100644 arch/hexagon/include/asm/vmalloc.h create mode 100644 arch/ia64/include/asm/vmalloc.h create mode 100644 arch/m68k/include/asm/vmalloc.h create mode 100644 arch/microblaze/include/asm/vmalloc.h create mode 100644 arch/mips/include/asm/vmalloc.h create mode 100644 arch/nds32/include/asm/vmalloc.h create mode 100644 arch/nios2/include/asm/vmalloc.h create mode 100644 arch/openrisc/include/asm/vmalloc.h create mode 100644 arch/parisc/include/asm/vmalloc.h create mode 100644 arch/powerpc/include/asm/vmalloc.h create mode 100644 arch/riscv/include/asm/vmalloc.h create mode 100644 arch/s390/include/asm/vmalloc.h create mode 100644 arch/sh/include/asm/vmalloc.h create mode 100644 arch/sparc/include/asm/vmalloc.h create mode 100644 arch/um/include/asm/vmalloc.h create mode 100644 arch/unicore32/include/asm/vmalloc.h create mode 100644 arch/x86/include/asm/vmalloc.h create mode 100644 arch/xtensa/include/asm/vmalloc.h delete mode 100644 lib/ioremap.c create mode 100644 mm/ioremap.c -- 2.25.1

1 26

[PATCH 0/4] fixes CVE-2020-12351 and CVE-2020-12352
by Yang Yingliang 19 Oct '20

19 Oct '20

Luiz Augusto von Dentz (4): Bluetooth: A2MP: Fix not initializing all members Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel Bluetooth: Disable High Speed by default Bluetooth: MGMT: Fix not checking if BT_HS is enabled include/net/bluetooth/l2cap.h | 2 ++ net/bluetooth/Kconfig | 1 - net/bluetooth/a2mp.c | 22 +++++++++++++++++++++- net/bluetooth/l2cap_core.c | 7 ++++--- net/bluetooth/l2cap_sock.c | 14 ++++++++++++++ net/bluetooth/mgmt.c | 7 ++++++- 6 files changed, 47 insertions(+), 6 deletions(-) -- 2.25.1

1 4

[PATCH 00/49] backport stable-4.19.151
by Yang Yingliang 19 Oct '20

19 Oct '20

Aaron Ma (1): platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse Anant Thazhemadam (3): net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key() net: team: fix memory leak in __team_options_register net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails Antony Antony (4): xfrm: clone XFRMA_SET_MARK in xfrm_do_migrate xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate xfrm: clone whole liftime_cur structure in xfrm_do_migrate Aya Levin (2): net/mlx5e: Fix VLAN cleanup flow net/mlx5e: Fix VLAN create flow Chaitanya Kulkarni (1): nvme-core: put ctrl ref when module ref get fail Coly Li (1): mmc: core: don't set limits.discard_granularity as 0 Cristian Ciocaltea (1): i2c: owl: Clear NACK and BUS error bits David Howells (3): rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read() rxrpc: Fix some missing _bh annotations on locking conn->state_lock rxrpc: Fix server keyring leak Dinh Nguyen (1): arm64: dts: stratix10: add status to qspi dts node Dumitru Ceara (1): openvswitch: handle DNAT tuple collision Eric Dumazet (4): macsec: avoid use-after-free in macsec_handle_frame() sctp: fix sctp_auth_init_hmacs() error path team: set dev->needed_headroom in team_setup_by_port() bonding: set dev->needed_headroom in bond_setup_by_slave() Geert Uytterhoeven (1): Revert "ravb: Fixed to be able to unload modules" Greg Kroah-Hartman (1): Linux 4.19.151 Hans de Goede (2): platform/x86: intel-vbtn: Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360 platform/x86: intel-vbtn: Switch to an allow-list for SW_TABLET_MODE reporting Herbert Xu (1): xfrm: Use correct address family in xfrm_state_find Hugh Dickins (1): mm/khugepaged: fix filemap page_to_pgoff(page) != offset Jean Delvare (1): i2c: i801: Exclude device from suspend direct complete optimization Jerome Brunet (1): i2c: meson: fix clock setting overwrite Kajol Jain (1): perf: Fix task_function_call() error handling Karol Herbst (1): drm/nouveau/mem: guard against NULL pointer access in mem_del Linus Torvalds (1): usermodehelper: reset umask to default before executing user process Marc Dionne (1): rxrpc: Fix rxkad token xdr encoding Miquel Raynal (1): mtd: rawnand: sunxi: Fix the probe error path Necip Fazil Yildiran (1): platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP Nicolas Belin (1): i2c: meson: fixup rate calculation with filter delay Peilin Ye (3): fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts fbcon: Fix global-out-of-bounds read in fbcon_get_font() Philip Yang (1): drm/amdgpu: prevent double kfree ttm->sg Randy Dunlap (1): mdio: fix mdio-thunder.c dependency & build error Sabrina Dubroca (1): xfrmi: drop ignore_df check before updating pmtu Tetsuo Handa (1): driver core: Fix probe_count imbalance in really_probe() Tom Rix (1): platform/x86: thinkpad_acpi: initialize tp_nvram_state variable Vijay Balakrishna (1): mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged Vladimir Zapolskiy (1): cifs: Fix incomplete memory allocation on setxattr path Voon Weifeng (1): net: stmmac: removed enabling eee in EEE set callback Wilken Gottwalt (1): net: usb: ax88179_178a: fix missing stop entry in driver_info Makefile | 2 +- .../dts/altera/socfpga_stratix10_socdk.dts | 1 + drivers/base/dd.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + drivers/gpu/drm/nouveau/nouveau_mem.c | 2 + drivers/i2c/busses/i2c-i801.c | 1 + drivers/i2c/busses/i2c-meson.c | 42 +++++-- drivers/i2c/busses/i2c-owl.c | 6 + drivers/mmc/core/queue.c | 2 +- drivers/mtd/nand/raw/sunxi_nand.c | 2 +- drivers/net/bonding/bond_main.c | 1 + .../net/ethernet/mellanox/mlx5/core/en_fs.c | 14 ++- drivers/net/ethernet/renesas/ravb_main.c | 110 +++++++++--------- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 15 +-- drivers/net/macsec.c | 4 +- drivers/net/phy/Kconfig | 1 + drivers/net/team/team.c | 3 +- drivers/net/usb/ax88179_178a.c | 1 + drivers/net/usb/rtl8150.c | 16 ++- drivers/nvme/host/core.c | 4 +- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/intel-vbtn.c | 64 +++++++--- drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/video/console/newport_con.c | 7 +- drivers/video/fbdev/core/fbcon.c | 12 ++ drivers/video/fbdev/core/fbcon.h | 7 -- drivers/video/fbdev/core/fbcon_rotate.c | 1 + drivers/video/fbdev/core/tileblit.c | 1 + fs/cifs/smb2ops.c | 2 +- include/linux/font.h | 13 +++ include/linux/khugepaged.h | 5 + include/net/xfrm.h | 16 +-- kernel/events/core.c | 5 +- kernel/umh.c | 9 ++ lib/fonts/font_10x18.c | 9 +- lib/fonts/font_6x10.c | 9 +- lib/fonts/font_6x11.c | 9 +- lib/fonts/font_7x14.c | 9 +- lib/fonts/font_8x16.c | 9 +- lib/fonts/font_8x8.c | 9 +- lib/fonts/font_acorn_8x8.c | 9 +- lib/fonts/font_mini_4x6.c | 8 +- lib/fonts/font_pearl_8x8.c | 9 +- lib/fonts/font_sun12x22.c | 9 +- lib/fonts/font_sun8x16.c | 7 +- mm/khugepaged.c | 25 +++- mm/page_alloc.c | 3 + net/openvswitch/conntrack.c | 22 ++-- net/rxrpc/conn_event.c | 6 +- net/rxrpc/key.c | 18 ++- net/sctp/auth.c | 1 + net/wireless/nl80211.c | 3 + net/xfrm/xfrm_interface.c | 2 +- net/xfrm/xfrm_state.c | 42 ++++++- 54 files changed, 391 insertions(+), 209 deletions(-) -- 2.25.1

1 49

[PATCH] perf/core: Fix race in the perf_mmap_close() function
by Yang Yingliang 16 Oct '20

16 Oct '20

From: Jiri Olsa <jolsa(a)redhat.com> mainline inclusion from mainline-v5.10 commit f91072ed1b7283b13ca57fcfbece5a3b92726143 category: bugfix bugzilla: NA CVE: CVE-2020-14351 -------------------------------- There's a possible race in perf_mmap_close() when checking ring buffer's mmap_count refcount value. The problem is that the mmap_count check is not atomic because we call atomic_dec() and atomic_read() separately. perf_mmap_close: ... atomic_dec(&rb->mmap_count); ... if (atomic_read(&rb->mmap_count)) goto out_put; <ring buffer detach> free_uid out_put: ring_buffer_put(rb); /* could be last */ The race can happen when we have two (or more) events sharing same ring buffer and they go through atomic_dec() and then they both see 0 as refcount value later in atomic_read(). Then both will go on and execute code which is meant to be run just once. The code that detaches ring buffer is probably fine to be executed more than once, but the problem is in calling free_uid(), which will later on demonstrate in related crashes and refcount warnings, like: refcount_t: addition on 0; use-after-free. ... RIP: 0010:refcount_warn_saturate+0x6d/0xf ... Call Trace: prepare_creds+0x190/0x1e0 copy_creds+0x35/0x172 copy_process+0x471/0x1a80 _do_fork+0x83/0x3a0 __do_sys_wait4+0x83/0x90 __do_sys_clone+0x85/0xa0 do_syscall_64+0x5b/0x1e0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Using atomic decrease and check instead of separated calls. Tested-by: Michael Petlan <mpetlan(a)redhat.com> Signed-off-by: Jiri Olsa <jolsa(a)kernel.org> Signed-off-by: Ingo Molnar <mingo(a)kernel.org> Acked-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Acked-by: Namhyung Kim <namhyung(a)kernel.org> Acked-by: Wade Mealing <wmealing(a)redhat.com> Fixes: 9bb5d40cd93c ("perf: Fix mmap() accounting hole"); Link: https://lore.kernel.org/r/20200916115311.GE2301783@krava Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Conflicts: kernel/events/core.c [yyl: adjust context] Reviewed-by: Jian Cheng <cj.chengjian(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/events/core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 30a81d1b7b5c..452775f68129 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5496,11 +5496,11 @@ static void perf_pmu_output_stop(struct perf_event *event); static void perf_mmap_close(struct vm_area_struct *vma) { struct perf_event *event = vma->vm_file->private_data; - struct ring_buffer *rb = ring_buffer_get(event); struct user_struct *mmap_user = rb->mmap_user; int mmap_locked = rb->mmap_locked; unsigned long size = perf_data_size(rb); + bool detach_rest = false; if (event->pmu->event_unmapped) event->pmu->event_unmapped(event, vma->vm_mm); @@ -5531,7 +5531,8 @@ static void perf_mmap_close(struct vm_area_struct *vma) mutex_unlock(&event->mmap_mutex); } - atomic_dec(&rb->mmap_count); + if (atomic_dec_and_test(&rb->mmap_count)) + detach_rest = true; if (!atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex)) goto out_put; @@ -5540,7 +5541,7 @@ static void perf_mmap_close(struct vm_area_struct *vma) mutex_unlock(&event->mmap_mutex); /* If there's still other mmap()s of this buffer, we're done. */ - if (atomic_read(&rb->mmap_count)) + if (!detach_rest) goto out_put; /* -- 2.25.1

1 0

[PATCH] geneve: add transport ports in route lookup for geneve
by Yang Yingliang 15 Oct '20

15 Oct '20

From: Mark Gray <mark.d.gray(a)redhat.com> stable inclusion from linux-4.19.148 commit c797110d97c48054d1491251fd713900ff51615c CVE: CVE-2020-25645 -------------------------------- [ Upstream commit 34beb21594519ce64a55a498c2fe7d567bc1ca20 ] This patch adds transport ports information for route lookup so that IPsec can select Geneve tunnel traffic to do encryption. This is needed for OVS/OVN IPsec with encrypted Geneve tunnels. This can be tested by configuring a host-host VPN using an IKE daemon and specifying port numbers. For example, for an Openswan-type configuration, the following parameters should be configured on both hosts and IPsec set up as-per normal: $ cat /etc/ipsec.conf conn in ... left=$IP1 right=$IP2 ... leftprotoport=udp/6081 rightprotoport=udp ... conn out ... left=$IP1 right=$IP2 ... leftprotoport=udp rightprotoport=udp/6081 ... The tunnel can then be setup using "ip" on both hosts (but changing the relevant IP addresses): $ ip link add tun type geneve id 1000 remote $IP2 $ ip addr add 192.168.0.1/24 dev tun $ ip link set tun up This can then be tested by pinging from $IP1: $ ping 192.168.0.2 Without this patch the traffic is unencrypted on the wire. Fixes: 2d07dc79fe04 ("geneve: add initial netdev driver for GENEVE tunnels") Signed-off-by: Qiuyu Xiao <qiuyu.xiao.qyx(a)gmail.com> Signed-off-by: Mark Gray <mark.d.gray(a)redhat.com> Reviewed-by: Greg Rose <gvrose8192(a)gmail.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> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/geneve.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 1506e913cebb..fdb251e1f471 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -721,7 +721,8 @@ static struct rtable *geneve_get_v4_rt(struct sk_buff *skb, struct net_device *dev, struct geneve_sock *gs4, struct flowi4 *fl4, - const struct ip_tunnel_info *info) + const struct ip_tunnel_info *info, + __be16 dport, __be16 sport) { bool use_cache = ip_tunnel_dst_cache_usable(skb, info); struct geneve_dev *geneve = netdev_priv(dev); @@ -737,6 +738,8 @@ static struct rtable *geneve_get_v4_rt(struct sk_buff *skb, fl4->flowi4_proto = IPPROTO_UDP; fl4->daddr = info->key.u.ipv4.dst; fl4->saddr = info->key.u.ipv4.src; + fl4->fl4_dport = dport; + fl4->fl4_sport = sport; tos = info->key.tos; if ((tos == 1) && !geneve->collect_md) { @@ -771,7 +774,8 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb, struct net_device *dev, struct geneve_sock *gs6, struct flowi6 *fl6, - const struct ip_tunnel_info *info) + const struct ip_tunnel_info *info, + __be16 dport, __be16 sport) { bool use_cache = ip_tunnel_dst_cache_usable(skb, info); struct geneve_dev *geneve = netdev_priv(dev); @@ -787,6 +791,9 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb, fl6->flowi6_proto = IPPROTO_UDP; fl6->daddr = info->key.u.ipv6.dst; fl6->saddr = info->key.u.ipv6.src; + fl6->fl6_dport = dport; + fl6->fl6_sport = sport; + prio = info->key.tos; if ((prio == 1) && !geneve->collect_md) { prio = ip_tunnel_get_dsfield(ip_hdr(skb), skb); @@ -833,14 +840,15 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, __be16 df; int err; - rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info); + sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true); + rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info, + geneve->info.key.tp_dst, sport); if (IS_ERR(rt)) return PTR_ERR(rt); skb_tunnel_check_pmtu(skb, &rt->dst, GENEVE_IPV4_HLEN + info->options_len); - sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true); if (geneve->collect_md) { tos = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb); ttl = key->ttl; @@ -875,13 +883,14 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, __be16 sport; int err; - dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info); + sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true); + dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info, + geneve->info.key.tp_dst, sport); if (IS_ERR(dst)) return PTR_ERR(dst); skb_tunnel_check_pmtu(skb, dst, GENEVE_IPV6_HLEN + info->options_len); - sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true); if (geneve->collect_md) { prio = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb); ttl = key->ttl; @@ -957,13 +966,18 @@ static int geneve_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) { struct ip_tunnel_info *info = skb_tunnel_info(skb); struct geneve_dev *geneve = netdev_priv(dev); + __be16 sport; if (ip_tunnel_info_af(info) == AF_INET) { struct rtable *rt; struct flowi4 fl4; + struct geneve_sock *gs4 = rcu_dereference(geneve->sock4); + sport = udp_flow_src_port(geneve->net, skb, + 1, USHRT_MAX, true); - rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info); + rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info, + geneve->info.key.tp_dst, sport); if (IS_ERR(rt)) return PTR_ERR(rt); @@ -973,9 +987,13 @@ static int geneve_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) } else if (ip_tunnel_info_af(info) == AF_INET6) { struct dst_entry *dst; struct flowi6 fl6; + struct geneve_sock *gs6 = rcu_dereference(geneve->sock6); + sport = udp_flow_src_port(geneve->net, skb, + 1, USHRT_MAX, true); - dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info); + dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info, + geneve->info.key.tp_dst, sport); if (IS_ERR(dst)) return PTR_ERR(dst); @@ -986,8 +1004,7 @@ static int geneve_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) return -EINVAL; } - info->key.tp_src = udp_flow_src_port(geneve->net, skb, - 1, USHRT_MAX, true); + info->key.tp_src = sport; info->key.tp_dst = geneve->info.key.tp_dst; return 0; } -- 2.25.1

1 0

[PATCH 00/78] bugfixes for openEuler-1.0-LTS
by Yang Yingliang 15 Oct '20

15 Oct '20

Al Grant (1): perf tools: Correct SNOOPX field offset Al Viro (2): do_epoll_ctl(): clean the failure exits up a bit fix regression in "epoll: Keep a reference on files added to the check list" Alex Williamson (1): vfio/type1: Add proper error unwind for vfio_iommu_replay() Alvin Šipraga (1): macvlan: validate setting of multiple remote source MAC addresses Bodo Stroesser (1): scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM Brian Foster (3): xfs: acquire superblock freeze protection on eofblocks scans xfs: reset buffer write failure state on successful completion xfs: fix duplicate verification from xfs_qm_dqflush() Charan Teja Reddy (1): mm, page_alloc: fix core hung in free_pcppages_bulk() Chris Wilson (1): locking/lockdep: Fix overflow in presentation of average lock-time Chuck Lever (1): NFS: Zero-stateid SETATTR should first return delegation Daniel Borkmann (1): uaccess: Add non-pagefault user-space write function Darrick J. Wong (4): xfs: fix partially uninitialized structure in xfs_reflink_remap_extent xfs: fix inode quota reservation checks xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files xfs: initialize the shortform attr header padding entry Dave Chinner (1): xfs: Don't allow logging of XFS_ISTALE inodes David Milburn (2): nvme-fc: cancel async events before freeing event struct nvme-rdma: cancel async events before freeing event struct Doug Berger (1): mm: include CMA pages in lowmem_reserve at boot Eiichi Tsukata (1): xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init Eric Biggers (1): xfs: clear PF_MEMALLOC before exiting xfsaild thread George Kennedy (1): vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize() Gustav Wiklander (1): spi: Fix memory leak on splited transfers Heikki Krogerus (1): device property: Fix the secondary firmware node handling in set_primary_fwnode() Helge Deller (1): fs/signalfd.c: fix inconsistent return codes for signalfd4 Hou Pu (1): scsi: target: iscsi: Fix hang in iscsit_access_np() when getting tpg->np_login_sem Hugh Dickins (2): khugepaged: khugepaged_test_exit() check mmget_still_valid() khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter() Jan Kara (5): ext4: fix checking of directory entry validity for inline directories ext4: don't BUG on inconsistent journal feature writeback: Protect inode->i_io_list with inode->i_lock writeback: Avoid skipping inode writeback writeback: Fix sync livelock due to b_dirty_time processing Jarkko Sakkinen (1): tpm: Unify the mismatching TPM space buffer sizes Jason Gunthorpe (1): include/linux/log2.h: add missing () around n in roundup_pow_of_two() Javed Hasan (1): scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del() Jens Axboe (1): block: ensure bdi->io_pages is always initialized Jing Xiangfeng (1): scsi: iscsi: Do not put host in iscsi_set_flashnode_param() Li Heng (1): efi: add missed destroy_workqueue when efisubsys_init fails Lukas Czerner (3): jbd2: make sure jh have b_transaction set in refile/unfile_buffer ext4: handle read only external journal device ext4: handle option set by mount flags correctly Lukas Wunner (4): spi: Prevent adding devices below an unregistering controller serial: pl011: Fix oops on -EPROBE_DEFER serial: pl011: Don't leak amba_ports entry on driver register error serial: 8250: Avoid error message on reprobe Luo Meng (1): ext4: only set last error block when check system zone failed Mao Wenan (1): virtio_ring: Avoid loop when vq is broken in virtqueue_poll Marc Zyngier (1): epoll: Keep a reference on files added to the check list Masami Hiramatsu (2): perf probe: Fix memory leakage when the probe point is not found uaccess: Add non-pagefault user-space read functions Max Reitz (1): xfs: Fix tail rounding in xfs_alloc_file_space() Mikulas Patocka (2): xfs: don't update mtime on COW faults dm writecache: handle DAX to partitions on persistent memory correctly Ming Lei (1): blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART Muchun Song (1): kprobes: fix kill kprobe which has been marked as gone Namhyung Kim (1): perf jevents: Fix suspicious code in fixregex() Peter Xu (1): mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible Peter Zijlstra (1): cpuidle: Fixup IRQ state Qiushi Wu (1): PCI: Fix pci_create_slot() reference count leak Rafael J. Wysocki (1): PM: sleep: core: Fix the handling of pending runtime resume requests Ralph Campbell (1): mm/thp: fix __split_huge_pmd_locked() for migration PMD Robin Murphy (1): iommu/iova: Don't BUG on invalid PFNs Selvin Xavier (1): RDMA/bnxt_re: Do not add user qps to flushlist Sergey Senozhatsky (1): serial: 8250: change lock order in serial8250_do_startup() Sunghyun Jin (1): percpu: fix first chunk size calculation for populated bitmap Tejun Heo (1): libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks Tetsuo Handa (1): vt: defer kfree() of vc_screenbuf in vc_do_resize() Valmer Huhn (1): serial: 8250_exar: Fix number of ports for Commtech PCIe cards Varun Prakash (1): scsi: target: iscsi: Fix data digest calculation Wei Yongjun (1): kernel/relay.c: fix memleak on destroy relay channel Xianting Tian (1): fs: prevent BUG_ON in submit_bh_wbc() Xunlei Pang (1): mm: memcg: fix memcg reclaim soft lockup Yang Xu (1): KEYS: reaching the keys quotas correctly kaixuxia (1): xfs: Fix deadlock between AGI and AGF with RENAME_WHITEOUT zhangyi (F) (1): jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock() block/blk-core.c | 2 + block/blk-mq-sched.c | 9 ++ block/blk-mq.c | 9 ++ drivers/ata/libata-core.c | 5 +- drivers/ata/libata-scsi.c | 8 +- drivers/base/core.c | 12 +- drivers/base/power/main.c | 16 ++- drivers/char/tpm/tpm-chip.c | 9 +- drivers/char/tpm/tpm.h | 6 +- drivers/char/tpm/tpm2-space.c | 26 ++-- drivers/char/tpm/tpmrm-dev.c | 2 +- drivers/cpuidle/cpuidle.c | 3 +- drivers/firmware/efi/efi.c | 2 + drivers/infiniband/hw/bnxt_re/main.c | 3 +- drivers/iommu/iova.c | 4 +- drivers/md/dm-writecache.c | 12 +- drivers/net/macvlan.c | 21 ++- drivers/nvme/host/fc.c | 1 + drivers/nvme/host/rdma.c | 1 + drivers/pci/slot.c | 6 +- drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/spi/Kconfig | 3 + drivers/spi/spi.c | 30 +++- drivers/target/iscsi/iscsi_target.c | 17 ++- drivers/target/iscsi/iscsi_target_login.c | 6 +- drivers/target/iscsi/iscsi_target_login.h | 3 +- drivers/target/iscsi/iscsi_target_nego.c | 3 +- drivers/target/target_core_user.c | 2 +- drivers/tty/serial/8250/8250_core.c | 11 +- drivers/tty/serial/8250/8250_exar.c | 24 +++- drivers/tty/serial/8250/8250_port.c | 9 +- drivers/tty/serial/amba-pl011.c | 16 ++- drivers/tty/vt/vt.c | 5 +- drivers/tty/vt/vt_ioctl.c | 12 +- drivers/vfio/vfio_iommu_type1.c | 71 ++++++++- drivers/virtio/virtio_ring.c | 3 + fs/buffer.c | 9 ++ fs/eventpoll.c | 23 +-- fs/ext4/block_validity.c | 3 +- fs/ext4/namei.c | 6 +- fs/ext4/super.c | 147 ++++++++++++------- fs/fs-writeback.c | 83 ++++++----- fs/jbd2/journal.c | 4 +- fs/jbd2/transaction.c | 10 ++ fs/nfs/nfs4proc.c | 4 +- fs/signalfd.c | 10 +- fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_bmap_util.c | 4 +- fs/xfs/xfs_buf.c | 8 +- fs/xfs/xfs_dquot.c | 9 +- fs/xfs/xfs_file.c | 12 +- fs/xfs/xfs_icache.c | 13 +- fs/xfs/xfs_inode.c | 110 ++++++++------ fs/xfs/xfs_ioctl.c | 5 +- fs/xfs/xfs_reflink.c | 1 + fs/xfs/xfs_sysfs.h | 6 +- fs/xfs/xfs_trans_ail.c | 4 +- fs/xfs/xfs_trans_dquot.c | 2 +- fs/xfs/xfs_trans_inode.c | 2 + include/linux/fs.h | 8 +- include/linux/libata.h | 1 + include/linux/log2.h | 2 +- include/linux/uaccess.h | 26 ++++ include/trace/events/writeback.h | 13 +- kernel/kprobes.c | 9 +- kernel/locking/lockdep_proc.c | 2 +- kernel/relay.c | 1 + mm/huge_memory.c | 40 +++--- mm/hugetlb.c | 24 ++-- mm/khugepaged.c | 7 +- mm/maccess.c | 167 ++++++++++++++++++++-- mm/page_alloc.c | 7 +- mm/percpu.c | 2 +- mm/vmscan.c | 8 ++ security/keys/key.c | 2 +- security/keys/keyctl.c | 4 +- tools/include/uapi/linux/perf_event.h | 2 +- tools/perf/pmu-events/jevents.c | 2 +- tools/perf/util/probe-finder.c | 2 +- 81 files changed, 864 insertions(+), 322 deletions(-) -- 2.25.1

1 78

[PATCH 01/11] xfs: Fix tail rounding in xfs_alloc_file_space()
by Yang Yingliang 15 Oct '20

15 Oct '20

From: Max Reitz <mreitz(a)redhat.com> mainline inclusion from mainline-v5.4-rc3 commit e093c4be760ebf46c131ae0dd6138865a22f46fa category: bugfix bugzilla: NA CVE: NA --------------------------- To ensure that all blocks touched by the range [offset, offset + count) are allocated, we need to calculate the block count from the difference of the range end (rounded up) and the range start (rounded down). Before this patch, we just round up the byte count, which may lead to unaligned ranges not being fully allocated: $ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..7]: 1396264..1396271 1: [8..15]: hole There should not be a hole there. Instead, the first two blocks should be fully allocated. With this patch applied, the result is something like this: $ touch test_file $ block_size=$(stat -fc '%S' test_file) $ fallocate -o $((block_size / 2)) -l $block_size test_file $ xfs_bmap test_file test_file: 0: [0..15]: 11024..11039 Signed-off-by: Max Reitz <mreitz(a)redhat.com> Reviewed-by: Carlos Maiolino <cmaiolino(a)redhat.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong(a)oracle.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: zhangyi (F) <yi.zhang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/xfs/xfs_bmap_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 3e1dd66bd676..e54f5aed30a9 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -869,6 +869,7 @@ xfs_alloc_file_space( xfs_filblks_t allocatesize_fsb; xfs_extlen_t extsz, temp; xfs_fileoff_t startoffset_fsb; + xfs_fileoff_t endoffset_fsb; int nimaps; int quota_flag; int rt; @@ -896,7 +897,8 @@ xfs_alloc_file_space( imapp = &imaps[0]; nimaps = 1; startoffset_fsb = XFS_B_TO_FSBT(mp, offset); - allocatesize_fsb = XFS_B_TO_FSB(mp, count); + endoffset_fsb = XFS_B_TO_FSB(mp, offset + count); + allocatesize_fsb = endoffset_fsb - startoffset_fsb; /* * Allocate file space until done or until there is an error -- 2.25.1

1 10

[PATCH kernel-5.5] RISCV-V: KVM: use __u64 define variables instead of u64 in kvm.h
by l00484210 13 Oct '20

13 Oct '20

From: MingWang Li <limingwang(a)huawei.com> euleros inclusion category: bugfix bugzilla: NA CVE: NA one error occurred while building qemu on riscv system, which is unknown type name 'u64'. Link: https://gitee.com/openeuler/kernel/issues/I1XUB0 Signed-off-by: MingWang Li <limingwang(a)huawei.com> --- arch/riscv/include/uapi/asm/kvm.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index 65cd00654..c2b4ad6b1 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -75,10 +75,10 @@ struct kvm_riscv_csr { /* TIMER registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ struct kvm_riscv_timer { - u64 frequency; - u64 time; - u64 compare; - u64 state; + __u64 frequency; + __u64 time; + __u64 compare; + __u64 state; }; /* Possible states for kvm_riscv_timer */ @@ -110,17 +110,17 @@ struct kvm_riscv_timer { /* Timer registers are mapped as type 4 */ #define KVM_REG_RISCV_TIMER (0x04 << KVM_REG_RISCV_TYPE_SHIFT) #define KVM_REG_RISCV_TIMER_REG(name) \ - (offsetof(struct kvm_riscv_timer, name) / sizeof(u64)) + (offsetof(struct kvm_riscv_timer, name) / sizeof(__u64)) /* F extension registers are mapped as type 5 */ #define KVM_REG_RISCV_FP_F (0x05 << KVM_REG_RISCV_TYPE_SHIFT) #define KVM_REG_RISCV_FP_F_REG(name) \ - (offsetof(struct __riscv_f_ext_state, name) / sizeof(u32)) + (offsetof(struct __riscv_f_ext_state, name) / sizeof(__u32)) /* D extension registers are mapped as type 6 */ #define KVM_REG_RISCV_FP_D (0x06 << KVM_REG_RISCV_TYPE_SHIFT) #define KVM_REG_RISCV_FP_D_REG(name) \ - (offsetof(struct __riscv_d_ext_state, name) / sizeof(u64)) + (offsetof(struct __riscv_d_ext_state, name) / sizeof(__u64)) #endif -- 2.19.1

2 1

[PATCH 1/2] netfilter: nf_tables: incorrect enum nft_list_attributes definition
by Yang Yingliang 13 Oct '20

13 Oct '20

From: Pablo Neira Ayuso <pablo(a)netfilter.org> stable inclusion from linux-4.19.144 commit 3f21d1dd7cafb0230dc141e64ec5da622b3b1c46 -------------------------------- [ Upstream commit da9125df854ea48a6240c66e8a67be06e2c12c03 ] This should be NFTA_LIST_UNSPEC instead of NFTA_LIST_UNPEC, all other similar attribute definitions are postfixed with _UNSPEC. Fixes: 96518518cc41 ("netfilter: add nftables") Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Aichun Li <liaichun(a)huawei.com> Reviewed-by: wangxiaopeng <wangxiaopeng7(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/uapi/linux/netfilter/nf_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 44c8ba1f3652..8586c816bea0 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -132,7 +132,7 @@ enum nf_tables_msg_types { * @NFTA_LIST_ELEM: list element (NLA_NESTED) */ enum nft_list_attributes { - NFTA_LIST_UNPEC, + NFTA_LIST_UNSPEC, NFTA_LIST_ELEM, __NFTA_LIST_MAX }; -- 2.25.1

1 1

[PATCH 1/6] blk-mq: insert passthrough request into hctx->dispatch directly
by Yang Yingliang 13 Oct '20

13 Oct '20

From: Ming Lei <ming.lei(a)redhat.com> mainline inclusion from mainline-5.6-rc4 commit 01e99aeca3979600302913cef3f89076786f32c8 category: bugfix bugzilla: 42777 CVE: NA --------------------------- For some reason, device may be in one situation which can't handle FS request, so STS_RESOURCE is always returned and the FS request will be added to hctx->dispatch. However passthrough request may be required at that time for fixing the problem. If passthrough request is added to scheduler queue, there isn't any chance for blk-mq to dispatch it given we prioritize requests in hctx->dispatch. Then the FS IO request may never be completed, and IO hang is caused. So passthrough request has to be added to hctx->dispatch directly for fixing the IO hang. Fix this issue by inserting passthrough request into hctx->dispatch directly together withing adding FS request to the tail of hctx->dispatch in blk_mq_dispatch_rq_list(). Actually we add FS request to tail of hctx->dispatch at default, see blk_mq_request_bypass_insert(). Then it becomes consistent with original legacy IO request path, in which passthrough request is always added to q->queue_head. Cc: Dongli Zhang <dongli.zhang(a)oracle.com> Cc: Christoph Hellwig <hch(a)infradead.org> Cc: Ewan D. Milne <emilne(a)redhat.com> Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Conflicts: block/blk-flush.c block/blk-mq.c block/blk-mq-sched.c 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-flush.c | 2 +- block/blk-mq-sched.c | 22 +++++++++++++++------- block/blk-mq.c | 18 +++++++++++------- block/blk-mq.h | 3 ++- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index 256fa1ccc2bd..2a8369eb6c1c 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -495,7 +495,7 @@ void blk_insert_flush(struct request *rq) if ((policy & REQ_FSEQ_DATA) && !(policy & (REQ_FSEQ_PREFLUSH | REQ_FSEQ_POSTFLUSH))) { if (q->mq_ops) - blk_mq_request_bypass_insert(rq, false); + blk_mq_request_bypass_insert(rq, false, false); else list_add_tail(&rq->queuelist, &q->queue_head); return; diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index e98f51b86342..623c258d0b34 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -357,13 +357,19 @@ static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx, bool has_sched, struct request *rq) { - /* dispatch flush rq directly */ - if (rq->rq_flags & RQF_FLUSH_SEQ) { - spin_lock(&hctx->lock); - list_add(&rq->queuelist, &hctx->dispatch); - spin_unlock(&hctx->lock); + /* + * dispatch flush and passthrough rq directly + * + * passthrough request has to be added to hctx->dispatch directly. + * For some reason, device may be in one situation which can't + * handle FS request, so STS_RESOURCE is always returned and the + * FS request will be added to hctx->dispatch. However passthrough + * request may be required at that time for fixing the problem. If + * passthrough request is added to scheduler queue, there isn't any + * chance to dispatch it given we prioritize requests in hctx->dispatch. + */ + if ((rq->rq_flags & RQF_FLUSH_SEQ) || blk_rq_is_passthrough(rq)) return true; - } if (has_sched) rq->rq_flags |= RQF_SORTED; @@ -387,8 +393,10 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head, WARN_ON(e && (rq->tag != -1)); - if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) + if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) { + blk_mq_request_bypass_insert(rq, at_head, false); goto run; + } if (e && e->type->ops.mq.insert_requests) { LIST_HEAD(list); diff --git a/block/blk-mq.c b/block/blk-mq.c index 59c92961cc20..a9138235b870 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -721,7 +721,7 @@ static void blk_mq_requeue_work(struct work_struct *work) * merge. */ if (rq->rq_flags & RQF_DONTPREP) - blk_mq_request_bypass_insert(rq, false); + blk_mq_request_bypass_insert(rq, false, false); else blk_mq_sched_insert_request(rq, true, false, false); } @@ -1227,7 +1227,7 @@ bool blk_mq_dispatch_rq_list(struct request_queue *q, struct list_head *list, bool needs_restart; spin_lock(&hctx->lock); - list_splice_init(list, &hctx->dispatch); + list_splice_tail_init(list, &hctx->dispatch); spin_unlock(&hctx->lock); /* @@ -1590,13 +1590,17 @@ void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, * Should only be used carefully, when the caller knows we want to * bypass a potential IO scheduler on the target device. */ -void blk_mq_request_bypass_insert(struct request *rq, bool run_queue) +void blk_mq_request_bypass_insert(struct request *rq, bool at_head, + bool run_queue) { struct blk_mq_ctx *ctx = rq->mq_ctx; struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(rq->q, ctx->cpu); spin_lock(&hctx->lock); - list_add_tail(&rq->queuelist, &hctx->dispatch); + if (at_head) + list_add(&rq->queuelist, &hctx->dispatch); + else + list_add_tail(&rq->queuelist, &hctx->dispatch); spin_unlock(&hctx->lock); if (run_queue) @@ -1776,7 +1780,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, if (bypass_insert) return BLK_STS_RESOURCE; - blk_mq_request_bypass_insert(rq, run_queue); + blk_mq_request_bypass_insert(rq, false, run_queue); return BLK_STS_OK; } @@ -1792,7 +1796,7 @@ static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, ret = __blk_mq_try_issue_directly(hctx, rq, cookie, false); if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE) - blk_mq_request_bypass_insert(rq, true); + blk_mq_request_bypass_insert(rq, false, true); else if (ret != BLK_STS_OK) blk_mq_end_request(rq, ret); @@ -1827,7 +1831,7 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx, if (ret != BLK_STS_OK) { if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE) { - blk_mq_request_bypass_insert(rq, + blk_mq_request_bypass_insert(rq, false, list_empty(list)); break; } diff --git a/block/blk-mq.h b/block/blk-mq.h index a6094c27b827..debc646e1bed 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -64,7 +64,8 @@ int blk_mq_alloc_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, */ void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, bool at_head); -void blk_mq_request_bypass_insert(struct request *rq, bool run_queue); +void blk_mq_request_bypass_insert(struct request *rq, bool at_head, + bool run_queue); void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, struct list_head *list); -- 2.25.1

1 5

[PATCH] arm64/ascend: Fix register_persistent_clock definition
by Yang Yingliang 13 Oct '20

13 Oct '20

From: Fang Lijun <fanglijun3(a)huawei.com> ascend inclusion category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- The register_persistent_clock will be called after kernel init, so it can not be defined as __init. Fixes: 76ab899d73d6 ("arm64/ascend: Implement the read_persistend_clock64 for aarch64") Signed-off-by: Fang Lijun <fanglijun3(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Reviewed-by: Ding Tianhong <dingtianhong(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/kernel/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index c06c3feb6772..902d0f0b4f7b 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -77,7 +77,7 @@ void read_persistent_clock64(struct timespec64 *ts) __read_persistent_clock(ts); } -int __init register_persistent_clock(clock_access_fn read_persistent) +int register_persistent_clock(clock_access_fn read_persistent) { /* Only allow the clockaccess functions to be registered once */ if (__read_persistent_clock == dummy_clock_access) { -- 2.25.1

1 0

[PATCH 00/38] backport stable-4.19.150
by Yang Yingliang 13 Oct '20

13 Oct '20

Al Viro (4): epoll: do not insert into poll queues until all sanity checks are done epoll: replace ->visited/visited_list with generation count epoll: EPOLL_CTL_ADD: close the race in decision to take fast path ep_create_wakeup_source(): dentry name can change under you... Bartosz Golaszewski (1): gpio: mockup: fix resource leak in error path Bryan O'Donoghue (1): USB: gadget: f_ncm: Fix NDP16 datagram validation Chaitanya Kulkarni (1): nvme-core: get/put ctrl and transport module in nvme_dev_open/release() Chris Packham (2): spi: fsl-espi: Only process interrupts for expected events pinctrl: mvebu: Fix i2c sda definition for 98DX3236 Dinh Nguyen (1): clk: socfpga: stratix10: fix the divider for the emac_ptp_free_clk Felix Fietkau (1): mac80211: do not allow bigger VHT MPDUs than the hardware supports Greg Kroah-Hartman (1): Linux 4.19.150 Hans de Goede (1): mmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models James Smart (1): nvme-fc: fail new connections to a deleted host or remote port Jean Delvare (1): drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config Jeffrey Mitchell (1): nfs: Fix security label length not being reset Jiri Kosina (1): Input: i8042 - add nopnp quirk for Acer Aspire 5 A515 Laurent Dufour (2): mm: replace memmap_context by meminit_context mm: don't rely on system state to detect hot-plug operations Lucy Yan (1): net: dec: de2104x: Increase receive ring size for Tulip Marek Szyprowski (1): clk: samsung: exynos4: mark 'chipid' clock as CLK_IGNORE_UNUSED Martin Cerveny (1): drm/sun4i: mixer: Extend regmap max_register Nicolas VINCENT (1): i2c: cpm: Fix i2c_ram structure Olympia Giannou (1): rndis_host: increase sleep time in the query-response loop Sebastien Boeuf (1): net: virtio_vsock: Enhance connection semantics Stefano Garzarella (3): vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock vsock/virtio: stop workers during the .remove() vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock() Steven Rostedt (VMware) (1): ftrace: Move RCU is watching check after recursion check Taiping Lai (1): gpio: sprd: Clear interrupt when setting the type as edge Thibaut Sautereau (1): random32: Restore __latent_entropy attribute on net_rand_state Vincent Huang (1): Input: trackpoint - enable Synaptics trackpoints Will McVicker (1): netfilter: ctnetlink: add a range check for l3/l4 protonum Xie He (3): drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices drivers/net/wan/lapbether: Make skb->protocol consistent with the header drivers/net/wan/hdlc: Set skb->protocol before transmitting Yu Kuai (1): iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate() dillon min (1): gpio: tc35894: fix up tc35894 interrupt configuration Makefile | 2 +- arch/ia64/mm/init.c | 6 +- drivers/base/node.c | 84 ++++--- drivers/clk/samsung/clk-exynos4.c | 4 +- drivers/clk/socfpga/clk-s10.c | 2 +- drivers/gpio/gpio-mockup.c | 2 + drivers/gpio/gpio-sprd.c | 3 + drivers/gpio/gpio-tc3589x.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- drivers/i2c/busses/i2c-cpm.c | 3 + drivers/input/mouse/trackpoint.c | 2 + drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/iommu/exynos-iommu.c | 8 +- drivers/mmc/host/sdhci-pci-core.c | 3 +- drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- drivers/net/usb/rndis_host.c | 2 +- drivers/net/wan/hdlc_cisco.c | 1 + drivers/net/wan/hdlc_fr.c | 6 +- drivers/net/wan/hdlc_ppp.c | 1 + drivers/net/wan/lapbether.c | 4 +- drivers/nvme/host/core.c | 15 ++ drivers/nvme/host/fc.c | 6 +- drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 2 +- drivers/spi/spi-fsl-espi.c | 5 +- drivers/usb/gadget/function/f_ncm.c | 30 +-- drivers/vhost/vsock.c | 94 +++---- fs/eventpoll.c | 71 +++--- fs/nfs/dir.c | 3 + include/linux/mm.h | 2 +- include/linux/mmzone.h | 11 +- include/linux/node.h | 11 +- include/linux/virtio_vsock.h | 3 +- kernel/trace/ftrace.c | 6 +- lib/random32.c | 2 +- mm/memory_hotplug.c | 5 +- mm/page_alloc.c | 11 +- net/mac80211/vht.c | 8 +- net/netfilter/nf_conntrack_netlink.c | 2 + net/vmw_vsock/virtio_transport.c | 265 +++++++++++++------- net/vmw_vsock/virtio_transport_common.c | 13 +- 41 files changed, 416 insertions(+), 297 deletions(-) -- 2.25.1

1 38

openEuler 20.09 kernel release
by Xie XiuQi 10 Oct '20

10 Oct '20

很高兴 openEuler 20.09 kernel 如期而至，该版本包含众多特性，欢迎通过 openEuler 版本来体验。 openEuler-20.09 kernel tree 位于: git@gitee.com:openeuler/kernel.git openEuler-20.09 openEuler kernel 项目位于: https://gitee.com/openeuler/kernel openEuler 20.09 kernel 依然基于社区的 Linux 4.19 LTS 内核，在 openEuler 1.0 LTS 基础上往前演进(跟踪到 4.19.140)，在这大概6个月的时间内，合入并使能了多个特性, 下面从架构支持，驱动支持，以及内核特性支持等几个方面来进行介绍。 1 架构支持 1.1 支持海光CPU-Hygon Dhyana 海光的Peng Wu向openEuler贡献了Hygon CPU的支持补丁集，通过这个补丁集，新增了 Hygon CPU 的ACPI, cpufreq，perf，KVM，NTB以及Hygon CPU的识别等支持，通过这个补丁集，openEuler完整支持海光x86 CPU。 1.2 支持昇腾芯片包括CPU和AI CPU共享虚拟地址的SVM（shared virtual memory）特性，以及芯片的硬件支持。 1.3 支持鲲鹏PC平台鲲鹏PC CPU基于鲲鹏920,8核。20.09 版本内核加入了对PC的休眠支持（架构特性），以及I2C控制器等支持。 1.4 支持 ARM v8.x 特性 - ARMv8.0 CRC32 instructions - ARMv8.0-SB Control of speculation - Armv8.2 Cache clean to Point of Deep Persistence - ARMv8.2-TTCNP, Translation table Common not private translations - ARMv8.4-TLBI, TLB maintenance and TLB range instructions - Armv8.5-RNG, Random number generator - Armv8.5-BTI, Branch target identification - Armv8.5-E0PD, Preventing EL0 access to halves of address map - ARMv8.6 Data gathering hint - ARMv8.6 Matrix multiply extension 1.5 支持 risc-v 支持 risc-v kvm. (openEuler 20.09 通过 kernel 5.5 来支持 risc-v) kernel tree 位于： git@gitee.com:openeuler/kernel.git kernel-5.5 2. 新介质以及新驱动支持 2.1 ARM64支持 persistence memory ARMv8.2引入新的指令支持 persistent memory，鲲鹏920处理器完整支持该特性，通过打开内核的 ACPI NFIT以及libnvdimm的配置文件，就能在鲲鹏上完美支持NVDIMM介质内存。 2.2 1822 网卡驱动增强 - 1822网卡支持x86架构 - 1822网卡支持128队列 2.3 3408/3416 RAID卡规避 3408iMR/3416iMRraid卡在ARM64平台上（ARM64生态问题）使用存在问题，开启SMMU后，会存在不兼容，通过SMMU 设备bypass特性，规避不兼容问题。 2.4 Huawei iBMA 驱动 iBMA 驱动是一组 BMC 与带内系统通信的驱动，系统宕机时，能辅助保存宕机时的运行状态信息，帮助定位故障原因。 2.5 hns3: update hns3 version to 1.9.38.8 2.6 TIPC: enable TIPC module by default 3. 存储/IO特性支持 3.1 bcache稳定性提升 bcache Maintainer Coly回合了大量bcache的bugfix以及特性，大幅提升bcache稳定性和可用性 4. 性能优化特性 4.1 sched Task Steal 回合社区的Task Steal特性，通过提升CPU利用率，替身MySQL数据库mix场景的性能10%+； 4.2 REFCOUNT_FULL以及CMPXCHG_LOOP()优化通过atomic_fetch_*操作来降低cmpxchg()带来的性能开销，从而提升refcount机制性能，带来文件读写等场景的性能提升，在ARM64服务器上尤其明显，空文件读写的benchmark 20+提升。 4.3 Linux's vmalloc Seeing "Large Performance Benefits" 优化 vmalloc 性能，内核针对vmalloc区的查找做了优化，从O(N)到~O(log(N) 。 See: https://www.phoronix.com/scan.php?page=news_item&px=Linux-5.2-vmalloc-Perfo… 4.4 MPAM特性增强支持通过ACPI获取系统MPAM资源； 4.5 percpu refcount for pagecache pagecache的生命周期管理是通过refcount来管理的，在多核并发压力下，读取文件cache 的atomic操作成为瓶颈，因此引入percpu refcount mechanism来提升性能，针对nginx http测试，性能有1倍+的提升 4.6 ARM64 clear_page()性能优化通过‘stnp’代替'dc zva'指令，提升clear_page()的性能，在鲲鹏920上，针对hugetlb 测试，有53%的性能提升。 4.7 调度，优化关键进程的抢占时延，提升响应速度对 SCHED_IDLE 策略的优化，之前选核的时候只选择 idle 的CPU，现在是如果那个CPU 上运行的是 SCHED_IDLE 的进程，也可以选择到，由于运行SCHED_IDLE进程的CPU并不是 idle，没有唤醒时延，能提升响应速度。 5. 安全特性 5.1 支持AppArmor AppArmor相比Selinux使用起来简单，但之前版本未开启AppArmor支持。20.09版本支持 AppArmor，但默认的安全策略依然是Selinux，需要在启动参数传入security=apparmor使能 5.2 IMA摘要列表增强相比内核社区原生 IMA 机制，IMA 摘要列表扩展从安全性、性能、易用性三个方面进行了改良，助力完整性保护机制在生产场景下落地，并具有三大优势：极致安全原生 IMA 机制要求在现网环境下预先生成并标记文件扩展属性，访问文件时将文件扩展属性作为参考值，信任链不完整。摘要列表扩展将文件参考摘要值保存在内核空间中，构建阶段通过摘要列表的形式携带在发布的 rpm 包中，安装 rpm 包的同时导入摘要列表并执行验签，确保了参考值来自于软件发行商，实现了完整的信任链。惊艳的性能表现 IMA 度量场景下，摘要列表扩展在确保安全性的前提下，减少了不必要的 PCR 扩展操作，开启度量时性能损失小于 5%，相比原生 IMA 度量性能提升高达 50%。IMA 评估场景下，摘要列表扩展将签名验证统一移动到启动阶段进行，避免每次访问文件时都执行验签，相比原生 IMA 评估场景提升运行阶段文件访问的性能约 20%。快速部署，平滑升级原生 IMA 机制在初次部署或每次更新软件包时，需要切换到 ﬁx 模式手动标记文件扩展属性后再重启进入 enforce 模式，才能正常访问安装的程序。摘要列表扩展可实现安装完成后开箱即用，且允许直接在enforce 模式下安装或升级 rpm 包，无需重启和手动标记即可使用，实现了用户感知最小化，适合现网环境下快速批量部署。 6. 功耗特性 6.1 支持 CPU idle TEO governor TEO 是新引入的CPU调频算法，更适合 tickless 系统，可以为CPU选择更合适的节能状态。 7 调测特性 7.1 support livepatch without ftrace 8. 虚拟化特性 8.1 支持双层调度双层调度就是让Hypervisor的调度器感知到VM的VCPU上跑什么应用。让VM的调度器感知到 Hypervisor 层物理CPU压力。两层调度感知，整机达到最好的业务性能。 8.2 支持 PMU nmi watchdog 8.3 支持 SmartPolling （guest idle poll) ARM 平台上 cpu idle 支持 smart polling，用来提升性能。 8.4 支持 vmtop, 用于虚拟机性能指标监测 8.5 支持ARM架构PV qspinlock功能，提升vcpu的自旋锁等锁性能 --- openEuler Kernel SIG

1 0

[PATCH 01/43] mpls: fix warning with multi-label encap
by Yang Yingliang 10 Oct '20

10 Oct '20

From: George Wilkie <gwilkie(a)vyatta.att-mail.com> [ Upstream commit 2f3f7d1fa0d1039b24a55d127ed190f196fc3e79 ] If you configure a route with multiple labels, e.g. ip route add 10.10.3.0/24 encap mpls 16/100 via 10.10.2.2 dev ens4 A warning is logged: kernel: [ 130.561819] netlink: 'ip': attribute type 1 has an invalid length. This happens because mpls_iptunnel_policy has set the type of MPLS_IPTUNNEL_DST to fixed size NLA_U32. Change it to a minimum size. nla_get_labels() does the remaining validation. Fixes: e3e4712ec096 ("mpls: ip tunnel support") Signed-off-by: George Wilkie <gwilkie(a)vyatta.att-mail.com> Reviewed-by: David Ahern <dsahern(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Aichun Li <liaichun(a)huawei.com> Reviewed-by: wangxiaopeng <wangxiaopeng7(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/mpls/mpls_iptunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mpls/mpls_iptunnel.c b/net/mpls/mpls_iptunnel.c index 8141eb10752f..b556acebdc86 100644 --- a/net/mpls/mpls_iptunnel.c +++ b/net/mpls/mpls_iptunnel.c @@ -28,7 +28,7 @@ #include "internal.h" static const struct nla_policy mpls_iptunnel_policy[MPLS_IPTUNNEL_MAX + 1] = { - [MPLS_IPTUNNEL_DST] = { .type = NLA_U32 }, + [MPLS_IPTUNNEL_DST] = { .len = sizeof(u32) }, [MPLS_IPTUNNEL_TTL] = { .type = NLA_U8 }, }; -- 2.25.1

1 42

[PATCH] hdlc_ppp: add range checks in ppp_cp_parse_cr()
by Yang Yingliang 10 Oct '20

10 Oct '20

From: Dan Carpenter <dan.carpenter(a)oracle.com> stable inclusion from linux-4.19.148 commit 45676c0bc28eff8f46455b28e2db80a77676488b CVE: CVE-2020-25643 -------------------------------- [ Upstream commit 66d42ed8b25b64eb63111a2b8582c5afc8bf1105 ] There are a couple bugs here: 1) If opt[1] is zero then this results in a forever loop. If the value is less than 2 then it is invalid. 2) It assumes that "len" is more than sizeof(valid_accm) or 6 which can result in memory corruption. In the case of LCP_OPTION_ACCM, then we should check "opt[1]" instead of "len" because, if "opt[1]" is less than sizeof(valid_accm) then "nak_len" gets out of sync and it can lead to memory corruption in the next iterations through the loop. In case of LCP_OPTION_MAGIC, the only valid value for opt[1] is 6, but the code is trying to log invalid data so we should only discard the data when "len" is less than 6 because that leads to a read overflow. Reported-by: ChenNan Of Chaitin Security Research Lab <whutchennan(a)gmail.com> Fixes: e022c2f07ae5 ("WAN: new synchronous PPP implementation for generic HDLC.") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> Reviewed-by: Eric Dumazet <edumazet(a)google.com> Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> 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> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/wan/hdlc_ppp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index ab8b3cbbb205..85844f26547d 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -386,11 +386,8 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, } for (opt = data; len; len -= opt[1], opt += opt[1]) { - if (len < 2 || len < opt[1]) { - dev->stats.rx_errors++; - kfree(out); - return; /* bad packet, drop silently */ - } + if (len < 2 || opt[1] < 2 || len < opt[1]) + goto err_out; if (pid == PID_LCP) switch (opt[0]) { @@ -398,6 +395,8 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, continue; /* MRU always OK and > 1500 bytes? */ case LCP_OPTION_ACCM: /* async control character map */ + if (opt[1] < sizeof(valid_accm)) + goto err_out; if (!memcmp(opt, valid_accm, sizeof(valid_accm))) continue; @@ -409,6 +408,8 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, } break; case LCP_OPTION_MAGIC: + if (len < 6) + goto err_out; if (opt[1] != 6 || (!opt[2] && !opt[3] && !opt[4] && !opt[5])) break; /* reject invalid magic number */ @@ -427,6 +428,11 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, ppp_cp_event(dev, pid, RCR_GOOD, CP_CONF_ACK, id, req_len, data); kfree(out); + return; + +err_out: + dev->stats.rx_errors++; + kfree(out); } static int ppp_rx(struct sk_buff *skb) -- 2.25.1

1 0

[PATCH 000/237] backport stable-4.19.149
by Yang Yingliang 10 Oct '20

10 Oct '20

Adrian Hunter (1): perf kcore_copy: Fix module map when there are no modules loaded Al Viro (1): fix dget_parent() fastpath race Alain Michaud (1): Bluetooth: guard against controllers sending zero'd events Alex Deucher (2): drm/amdgpu/powerplay: fix AVFS handling with custom powerplay table drm/amdgpu/powerplay/smu7: fix AVFS handling with custom powerplay table Alex Williamson (1): vfio/pci: Clear error and request eventfd ctx after releasing Alexander Duyck (1): e1000: Do not perform reset in reset_task if we are already down Alexandre Belloni (2): rtc: sa1100: fix possible race condition rtc: ds1374: fix possible race condition Amelie Delaunay (2): dmaengine: stm32-mdma: use vchan_terminate_vdesc() in .terminate_all dmaengine: stm32-dma: use vchan_terminate_vdesc() in .terminate_all Andreas Steinmetz (1): ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor Andy Lutomirski (1): selftests/x86/syscall_nt: Clear weird flags after each test Anshuman Khandual (1): arm64/cpufeature: Drop TraceFilt feature exposure from ID_DFR0 register Anthony Iliopoulos (1): nvme: explicitly update mpath disk capacity on revalidation Aric Cyr (1): drm/amd/display: dal_ddc_i2c_payloads_create can fail causing panic Ayush Sawal (1): crypto: chelsio - This fixes the kernel panic which occurs during a libkcapi test Balsundar P (1): scsi: aacraid: fix illegal IO beyond last LBA Bart Van Assche (3): scsi: ufs: Make ufshcd_add_command_trace() easier to read scsi: ufs: Fix a race condition in the tracing code RDMA/rxe: Fix configuration of atomic queue pair attributes Bob Peterson (1): gfs2: clean up iopen glock mess in gfs2_create_inode Boris Brezillon (1): mtd: parser: cmdline: Support MTD names containing one or more colons Bradley Bolen (1): mmc: core: Fix size overflow for mmc partitions Brian Foster (1): xfs: fix attr leaf header freemap.size underflow Chris Wilson (1): dma-fence: Serialise signal enabling (dma_fence_enable_sw_signaling) Christian Borntraeger (1): s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl Christophe JAILLET (4): RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()' perf cpumap: Fix snprintf overflow check SUNRPC: Fix a potential buffer overflow in 'svc_print_xprts()' scsi: aacraid: Fix error handling paths in aac_probe_one() Chuck Lever (1): svcrdma: Fix leak of transport addresses Colin Ian King (2): media: tda10071: fix unsigned sign extension overflow USB: EHCI: ehci-mv: fix less than zero comparison of an unsigned int Cong Wang (1): atm: fix a memory leak of vcc->user_back Dan Carpenter (1): media: staging/imx: Missing assignment in imx_media_capture_device_register() Daniel Borkmann (1): bpf: Fix clobbering of r2 in bpf_gen_ld_abs Darrick J. Wong (3): xfs: fix log reservation overflows when allocating large rt extents xfs: don't ever return a stale pointer from __xfs_dir3_free_read xfs: mark dir corrupt when lookup-by-hash fails Dave Hansen (1): x86/pkeys: Add check for pkey "overflow" David Sterba (1): btrfs: don't force read-only after error in drop snapshot Dennis Li (1): drm/amdkfd: fix a memory leak issue Dinghao Liu (8): drm/nouveau/debugfs: fix runtime pm imbalance on error drm/nouveau: fix runtime pm imbalance on error drm/nouveau/dispnv50: fix runtime pm imbalance on error ASoC: img-i2s-out: Fix runtime PM imbalance on error wlcore: fix runtime pm imbalance in wl1271_tx_work wlcore: fix runtime pm imbalance in wlcore_regdomain_config mtd: rawnand: omap_elm: Fix runtime PM imbalance on error PCI: tegra: Fix runtime PM imbalance on error Dinh Nguyen (1): clk: stratix10: use do_div() for 64-bit calculation Divya Indi (1): tracing: Adding NULL checks for trace_array descriptor pointer Dmitry Baryshkov (1): regmap: fix page selection for noinc reads Dmitry Bogdanov (1): net: qed: RDMA personality shouldn't fail VF load Dmitry Osipenko (2): PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out dmaengine: tegra-apb: Prevent race conditions on channel's freeing Don Brace (1): scsi: hpsa: correct race condition in offload enabled Doug Smythies (1): tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility Douglas Anderson (1): bdev: Reduce time holding bd_mutex in sync in blkdev_close() Eric Dumazet (2): net: silence data-races on sk_backlog.tail mac802154: tx: fix use-after-free Felix Fietkau (1): mt76: clear skb pointers from rx aggregation reorder buffer during cleanup Fuqian Huang (1): m68k: q40: Fix info-leak in rtc_ioctl Gabriel Ravier (1): tools: gpio-hammer: Avoid potential overflow in main Gao Xiang (1): mm, THP, swap: fix allocating cluster for swapfile by mistake Greg Kroah-Hartman (1): Linux 4.19.149 Gustavo Romero (1): KVM: PPC: Book3S HV: Treat TM-related invalid form instructions on P9 like the valid ones Hans de Goede (2): ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN Converter9 2-in-1 i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices() Hillf Danton (1): Bluetooth: prefetch channel before killing sock Hou Tao (2): mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup() ubi: fastmap: Free unused fastmap anchor peb during detach Howard Chung (1): Bluetooth: L2CAP: handle l2cap config request during open state Hui Wang (1): ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged Ian Rogers (5): perf parse-events: Fix 3 use after frees found with clang ASAN perf mem2node: Avoid double free related to realloc perf evsel: Fix 2 memory leaks perf trace: Fix the selection for architectures to generate the errno name tables perf metricgroup: Free metric_events on error Ilya Leoshkevich (1): s390/init: add missing __init annotations Israel Rukshin (2): nvme: Fix controller creation races with teardown flow nvmet-rdma: fix double free of rdma queue Ivan Lazeev (1): tpm_crb: fix fTPM on AMD Zen+ CPUs Ivan Safonov (1): staging:r8188eu: avoid skb_clone for amsdu to msdu conversion Jaewon Kim (1): mm/mmap.c: initialize align_offset explicitly for vm_unmapped_area James Morse (1): firmware: arm_sdei: Use cpus_read_lock() to avoid races with cpuhp James Smart (3): scsi: lpfc: Fix kernel crash at lpfc_nvme_info_show during remote port bounce scsi: lpfc: Fix RQ buffer leakage when no IOCBs available scsi: lpfc: Fix coverity errors in fmdi attribute handling Jan Höppner (1): s390/dasd: Fix zero write for FBA devices Jason Gunthorpe (1): RDMA/cm: Remove a race freeing timewait_info Javed Hasan (2): scsi: libfc: Handling of extra kref scsi: libfc: Skip additional kref updating work event Jeff Layton (2): ceph: ensure we have a new cap before continuing in fill_inode ceph: fix potential race in ceph_check_caps Jia He (1): mm: fix double page fault on arm64 if PTE_AF is cleared Jin Yao (1): perf parse-events: Use strcmp() to compare the PMU name Jing Xiangfeng (1): atm: eni: fix the missed pci_disable_device() for eni_init_one() Jiri Olsa (1): perf stat: Fix duration_time value for higher intervals Jiri Slaby (3): ata: define AC_ERR_OK ata: make qc_prep return ata_completion_errors ata: sata_mv, avoid trigerrable BUG_ON Joakim Tjernlund (1): ALSA: usb-audio: Add delay quirk for H570e USB headsets Joe Perches (1): kernel/sys.c: avoid copying possible padding bytes in copy_to_user John Clements (1): drm/amdgpu: increase atombios cmd timeout John Garry (2): bus: hisi_lpc: Fixup IO ports addresses to avoid use-after-free in host removal perf jevents: Fix leak of mapfile memory John Meneghini (1): nvme-multipath: do not reset on unknown status Jonathan Bakker (3): power: supply: max17040: Correct voltage reading phy: samsung: s5pv210-usb2: Add delay after reset tty: serial: samsung: Correct clock selection logic Jordan Crouse (1): drm/msm/a5xx: Always set an OPP supported hardware value Josef Bacik (1): tracing: Set kernel_stack's caller size properly Josh Poimboeuf (1): objtool: Fix noreturn detection for ignored functions Kai-Heng Feng (1): ALSA: hda/realtek: Enable front panel headset LED on Lenovo ThinkStation P520 Kangjie Lu (1): gma/gma500: fix a memory disclosure bug due to uninitialized bytes Kevin Kou (1): sctp: move trace_sctp_probe_path into sctp_outq_sack Kirill A. Shutemov (1): mm: avoid data corruption on CoW fault into PFN-mapped VMA Krzysztof Kozlowski (1): dt-bindings: sound: wm8994: Correct required supplies based on actual implementaion Kusanagi Kouichi (1): debugfs: Fix !DEBUG_FS debugfs_create_automount Lee Jones (1): mfd: mfd-core: Protect against NULL call-back function pointer Linus Lüssing (4): batman-adv: bla: fix type misuse for backbone_gw hash indexing batman-adv: mcast/TT: fix wrongly dropped or rerouted packets batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh Liu Jian (1): ieee802154: fix one possible memleak in ca8210_dev_com_init Liu Song (1): ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len Madhuparna Bhowmik (2): drivers: char: tlclk.c: Avoid data race between init and interrupt handler rapidio: avoid data race between file operation callbacks and mport_cdev_add(). Manish Mandlik (1): Bluetooth: Fix refcount use-after-free issue Marc Zyngier (1): KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch Marco Elver (1): seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier Marek Szyprowski (1): drm/vc4/vc4_hdmi: fill ASoC card owner Martin Cerveny (1): drm/sun4i: sun8i-csc: Secondary CSC register correction Masami Hiramatsu (1): kprobes: Fix to check probe enabled before disarm_kprobe_ftrace() Matthias Fend (1): dmaengine: zynqmp_dma: fix burst length configuration Maxim Mikityanskiy (1): Bluetooth: btrtl: Use kvmalloc for FW allocations Maximilian Luz (1): mwifiex: Increase AES key storage size to 256 bits Mert Dirik (1): ar5523: Add USB ID of SMCWUSBT-G2 wireless adapter Miaohe Lin (1): KVM: arm/arm64: vgic: Fix potential double free dist->spis in __kvm_vgic_destroy() Miaoqing Pan (2): ath10k: fix array out-of-bounds access ath10k: fix memory leak for tpc_stats_final Mikel Rychliski (1): PCI: Use ioremap(), not phys_to_virt() for platform ROM Miklos Szeredi (1): fuse: don't check refcount after stealing page Mikulas Patocka (1): arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback Mohan Kumar (1): ALSA: hda: Clear RIRB status before reading WP Nathan Chancellor (2): tracing: Use address-of operator on section symbols mm/kmemleak.c: use address-of operator on section symbols Nicholas Piggin (1): powerpc/traps: Make unrecoverable NMIs die instead of panic Nick Desaulniers (1): lib/string.c: implement stpcpy Nikhil Devshatwar (1): media: ti-vpe: cal: Restrict DMA to avoid memory corruption Niklas Söderlund (1): thermal: rcar_thermal: Handle probe error gracefully Nilesh Javali (1): scsi: qedi: Fix termination timeouts in session logout Oleh Kravchenko (1): leds: mlxreg: Fix possible buffer overflow Oliver O'Halloran (1): powerpc/eeh: Only dump stack once if an MMIO loop is detected Palmer Dabbelt (1): RISC-V: Take text_mutex in ftrace_init_nop() Pan Bian (3): scsi: fnic: fix use after free RDMA/qedr: Fix potential use after free RDMA/i40iw: Fix potential use after free Paolo Bonzini (1): KVM: x86: fix incorrect comparison in trace event Pavel Machek (1): drm/msm: fix leaks if initialization fails Pavel Shilovsky (1): CIFS: Properly process SMB3 lease breaks Peter Ujfalusi (1): serial: 8250_omap: Fix sleeping function called from invalid context during probe Pratik Rajesh Sampat (1): cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_work_fn Qian Cai (4): skbuff: fix a data race in skb_queue_len() random: fix data races at timer_rand_state mm/vmscan.c: fix data races using kswapd_classzone_idx vfio/pci: fix memory leaks of eventfd ctx Qu Wenruo (1): btrfs: qgroup: fix data leak caused by race between writeback and truncate Rafael J. Wysocki (1): ACPI: EC: Reference count query handlers under lock Raviteja Narayanam (1): serial: uartps: Wait for tx_empty in console setup Rodrigo Siqueira (1): drm/amd/display: Stop if retimer is not available Russell King (1): ASoC: kirkwood: fix IRQ error handling Sagar Biradar (1): scsi: aacraid: Disabling TM path and only processing IOP reset Sagi Grimberg (1): nvme: fix possible deadlock when I/O is blocked Sakari Ailus (1): media: smiapp: Fix error handling at NVM reading Sascha Hauer (1): ubi: Fix producing anchor PEBs Satendra Singh Thakur (1): dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails Sean Christopherson (1): KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE Shreyas Joshi (1): printk: handle blank console arguments passed in. Sonny Sasaka (1): Bluetooth: Handle Inquiry Cancel error after Inquiry Complete Stefan Berger (1): tpm: ibmvtpm: Wait for buffer to be set before proceeding Stephen Kitt (1): clk/ti/adpll: allocate room for terminating null Steve Grubb (1): audit: CONFIG_CHANGE don't log internal bookkeeping as an event Steve Rutherford (1): KVM: Remove CREATE_IRQCHIP/SET_PIT2 race Stuart Hayes (1): PCI: pciehp: Fix MSI interrupt race Sven Eckelmann (1): batman-adv: Add missing include for in_interrupt() Sven Schnelle (2): selftests/ftrace: fix glob selftest lockdep: fix order in trace_hardirqs_off_caller() Sylwester Nawrocki (2): ASoC: wm8994: Skip setting of the WM8994_MICBIAS register for WM1811 ASoC: wm8994: Ensure the device is resumed in wm89xx_mic_detect functions Takashi Iwai (3): ALSA: usb-audio: Don't create a mixer element with bogus volume range media: go7007: Fix URB type for interrupt handling ALSA: hda: Fix potential race in unsol event handler Tang Bin (1): USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe() Thomas Gleixner (3): x86/ioapic: Unbreak check_timer() bpf: Remove recursion prevention from rcu free callback x86/speculation/mds: Mark mds_user_clear_cpu_buffers() __always_inline Thomas Richter (2): s390/cpum_sf: Use kzalloc and minor changes perf test: Fix test trace+probe_vfs_getname.sh on s390 Tianjia Zhang (1): clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init() Tom Lendacky (1): KVM: SVM: Add a dedicated INVD intercept routine Tom Rix (3): ieee802154/adf7242: check status of adf7242_read_reg ALSA: asihpi: fix iounmap in error handler tracing: fix double free Tonghao Zhang (2): net: openvswitch: use u64 for meter bucket net: openvswitch: use div_u64() for 64-by-32 divisions Trond Myklebust (2): nfsd: Don't add locks to closed or closing open stateids NFS: Fix races nfs_page_group_destroy() vs nfs_destroy_unlinked_subrequests() Tuong Lien (1): tipc: fix memory leak in service subscripting Tzung-Bi Shih (1): ASoC: max98090: remove msleep in PLL unlocked workaround Vasily Averin (5): neigh_stat_seq_next() should increase position index rt_cpu_seq_next should increase position index ipv6_route_seq_next should increase position index mm/swapfile.c: swap_next should increase position index selinux: sel_avc_get_stat_idx should increase position index Vignesh Raghavendra (2): serial: 8250_port: Don't service RX FIFO if throttled serial: 8250: 8250_omap: Terminate DMA before pushing data on RX timeout Vincent Whitchurch (1): ARM: 8948/1: Prevent OOB access in stacktrace Wei Li (1): MIPS: Add the missing 'CPU_1074K' into __get_cpu_type() Wei Yongjun (2): sparc64: vcc: Fix error return code in vcc_probe() scsi: cxlflash: Fix error return code in cxlflash_probe() Wen Gong (1): ath10k: use kzalloc to read for ath10k_sdio_hif_diag_read Wen Yang (1): drm/omap: fix possible object reference leak Will Deacon (1): arm64: cpufeature: Relax checks for AArch32 support at EL[0-2] Xianting Tian (1): mm/filemap.c: clear page error before actual read Xie XiuQi (1): perf util: Fix memory leak of prefix_if_not_in Yonghong Song (1): bpf: Fix a rcu warning for bpffs map pretty-print Yu Chen (1): usb: dwc3: Increase timeout for CmdAct cleared by device controller Zeng Tao (1): vfio/pci: fix racy on error and request eventfd ctx Zenghui Yu (1): KVM: arm64: vgic-its: Fix memory leak on the error path of vgic_add_lpi() Zhang Xiaoxu (1): cifs: Fix double add page to memcg when cifs_readpages Zhu Yanjun (1): RDMA/rxe: Set sys_image_guid to be aligned with HW IB devices Zhuang Yanying (1): KVM: fix overflow of zero page refcount with ksm running peter chang (1): scsi: pm80xx: Cleanup command when a reset times out zhengbin (1): media: mc-device.c: fix memleak in media_device_register_entity .../devicetree/bindings/sound/wm8994.txt | 18 ++- Documentation/driver-api/libata.rst | 2 +- Makefile | 2 +- arch/arm/include/asm/kvm_emulate.h | 11 +- arch/arm/kernel/stacktrace.c | 2 + arch/arm/kernel/traps.c | 6 +- arch/arm64/include/asm/kvm_emulate.h | 9 +- arch/arm64/kernel/cpufeature.c | 12 +- arch/arm64/kvm/hyp/switch.c | 2 +- arch/m68k/q40/config.c | 1 + arch/mips/include/asm/cpu-type.h | 1 + arch/powerpc/include/asm/kvm_asm.h | 3 + arch/powerpc/kernel/eeh.c | 2 +- arch/powerpc/kernel/traps.c | 6 +- arch/powerpc/kvm/book3s_hv_tm.c | 28 +++- arch/powerpc/kvm/book3s_hv_tm_builtin.c | 16 +- arch/riscv/include/asm/ftrace.h | 7 + arch/riscv/kernel/ftrace.c | 19 +++ arch/s390/kernel/perf_cpum_sf.c | 9 +- arch/s390/kernel/setup.c | 6 +- arch/x86/include/asm/nospec-branch.h | 4 +- arch/x86/include/asm/pkeys.h | 5 + arch/x86/kernel/apic/io_apic.c | 1 + arch/x86/kernel/fpu/xstate.c | 9 +- arch/x86/kvm/mmutrace.h | 2 +- arch/x86/kvm/svm.c | 8 +- arch/x86/kvm/x86.c | 13 +- arch/x86/lib/usercopy_64.c | 2 +- drivers/acpi/ec.c | 16 +- drivers/ata/acard-ahci.c | 6 +- drivers/ata/libahci.c | 6 +- drivers/ata/libata-core.c | 9 +- drivers/ata/libata-sff.c | 12 +- drivers/ata/pata_macio.c | 6 +- drivers/ata/pata_pxa.c | 8 +- drivers/ata/pdc_adma.c | 7 +- drivers/ata/sata_fsl.c | 4 +- drivers/ata/sata_inic162x.c | 4 +- drivers/ata/sata_mv.c | 34 ++-- drivers/ata/sata_nv.c | 18 ++- drivers/ata/sata_promise.c | 6 +- drivers/ata/sata_qstor.c | 8 +- drivers/ata/sata_rcar.c | 6 +- drivers/ata/sata_sil.c | 8 +- drivers/ata/sata_sil24.c | 6 +- drivers/ata/sata_sx4.c | 6 +- drivers/atm/eni.c | 2 +- drivers/base/regmap/regmap.c | 12 +- drivers/bluetooth/btrtl.c | 20 +-- drivers/bus/hisi_lpc.c | 27 +++- drivers/char/random.c | 12 +- drivers/char/tlclk.c | 17 +- drivers/char/tpm/tpm_crb.c | 123 +++++++++++---- drivers/char/tpm/tpm_ibmvtpm.c | 9 ++ drivers/char/tpm/tpm_ibmvtpm.h | 1 + drivers/clk/socfpga/clk-pll-s10.c | 4 +- drivers/clk/ti/adpll.c | 11 +- drivers/clocksource/h8300_timer8.c | 2 +- drivers/cpufreq/powernv-cpufreq.c | 13 +- drivers/crypto/chelsio/chcr_algo.c | 5 +- drivers/crypto/chelsio/chtls/chtls_io.c | 10 +- drivers/devfreq/tegra-devfreq.c | 4 +- drivers/dma-buf/dma-fence.c | 78 +++++----- drivers/dma/mediatek/mtk-hsdma.c | 4 +- drivers/dma/stm32-dma.c | 9 +- drivers/dma/stm32-mdma.c | 9 +- drivers/dma/tegra20-apb-dma.c | 3 +- drivers/dma/xilinx/zynqmp_dma.c | 24 +-- drivers/firmware/arm_sdei.c | 26 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 31 ++-- drivers/gpu/drm/amd/amdgpu/atom.c | 4 +- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 67 ++++---- .../gpu/drm/amd/display/dc/core/dc_link_ddc.c | 52 +++---- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 7 + .../drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 7 + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 27 +++- drivers/gpu/drm/msm/msm_drv.c | 6 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 5 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- .../drm/nouveau/nvkm/subdev/bios/shadowpci.c | 17 +- .../gpu/drm/omapdrm/dss/omapdss-boot-init.c | 4 +- drivers/gpu/drm/radeon/radeon_bios.c | 30 ++-- drivers/gpu/drm/sun4i/sun8i_csc.h | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 1 + drivers/i2c/i2c-core-base.c | 2 +- drivers/infiniband/core/cm.c | 25 +-- drivers/infiniband/hw/cxgb4/cm.c | 4 +- drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 +- drivers/infiniband/sw/rxe/rxe.c | 2 + drivers/infiniband/sw/rxe/rxe_qp.c | 7 +- drivers/leds/leds-mlxreg.c | 4 +- drivers/media/dvb-frontends/tda10071.c | 9 +- drivers/media/i2c/smiapp/smiapp-core.c | 3 +- drivers/media/media-device.c | 65 ++++---- drivers/media/platform/ti-vpe/cal.c | 6 +- drivers/media/usb/go7007/go7007-usb.c | 4 +- drivers/mfd/mfd-core.c | 10 ++ drivers/mmc/core/mmc.c | 9 +- drivers/mtd/chips/cfi_cmdset_0002.c | 1 - drivers/mtd/cmdlinepart.c | 23 ++- drivers/mtd/nand/raw/omap_elm.c | 1 + drivers/mtd/ubi/fastmap-wl.c | 46 ++++-- drivers/mtd/ubi/fastmap.c | 14 +- drivers/mtd/ubi/ubi.h | 6 +- drivers/mtd/ubi/wl.c | 32 ++-- drivers/mtd/ubi/wl.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 18 ++- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/ieee802154/ca8210.c | 1 + drivers/net/wireless/ath/ar5523/ar5523.c | 2 + drivers/net/wireless/ath/ath10k/debug.c | 3 +- drivers/net/wireless/ath/ath10k/sdio.c | 18 ++- drivers/net/wireless/ath/ath10k/wmi.c | 49 +++--- drivers/net/wireless/marvell/mwifiex/fw.h | 2 +- .../wireless/marvell/mwifiex/sta_cmdresp.c | 4 +- drivers/net/wireless/mediatek/mt76/agg-rx.c | 1 + drivers/net/wireless/ti/wlcore/main.c | 4 +- drivers/net/wireless/ti/wlcore/tx.c | 1 + drivers/nvme/host/core.c | 12 +- drivers/nvme/host/multipath.c | 21 ++- drivers/nvme/host/nvme.h | 19 ++- drivers/nvme/target/rdma.c | 30 ++-- drivers/pci/controller/pci-tegra.c | 3 +- drivers/pci/hotplug/pciehp_hpc.c | 26 +++- drivers/pci/rom.c | 17 -- drivers/phy/samsung/phy-s5pv210-usb2.c | 4 + drivers/power/supply/max17040_battery.c | 2 +- drivers/rapidio/devices/rio_mport_cdev.c | 14 +- drivers/rtc/rtc-ds1374.c | 15 +- drivers/rtc/rtc-sa1100.c | 18 ++- drivers/s390/block/dasd_fba.c | 9 +- drivers/s390/crypto/zcrypt_api.c | 3 +- drivers/scsi/aacraid/aachba.c | 8 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aacraid/linit.c | 46 ++++-- drivers/scsi/cxlflash/main.c | 1 + drivers/scsi/fnic/fnic_scsi.c | 3 +- drivers/scsi/hpsa.c | 80 +++++++--- drivers/scsi/libfc/fc_rport.c | 13 +- drivers/scsi/lpfc/lpfc_attr.c | 35 +++-- drivers/scsi/lpfc/lpfc_ct.c | 137 +++++++++-------- drivers/scsi/lpfc/lpfc_hw.h | 36 ++--- drivers/scsi/lpfc/lpfc_sli.c | 4 + drivers/scsi/pm8001/pm8001_sas.c | 50 ++++-- drivers/scsi/qedi/qedi_iscsi.c | 3 + drivers/scsi/ufs/ufshcd.c | 14 +- drivers/staging/media/imx/imx-media-capture.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 19 +-- drivers/thermal/rcar_thermal.c | 6 +- drivers/tty/serial/8250/8250_omap.c | 8 +- drivers/tty/serial/8250/8250_port.c | 16 +- drivers/tty/serial/samsung.c | 8 +- drivers/tty/serial/xilinx_uartps.c | 8 + drivers/tty/vcc.c | 1 + drivers/usb/dwc3/gadget.c | 2 +- drivers/usb/host/ehci-mv.c | 8 +- drivers/vfio/pci/vfio_pci.c | 13 ++ fs/block_dev.c | 10 ++ fs/btrfs/extent-tree.c | 2 - fs/btrfs/inode.c | 23 ++- fs/ceph/caps.c | 14 +- fs/ceph/inode.c | 5 +- fs/cifs/cifsglob.h | 9 +- fs/cifs/file.c | 21 ++- fs/cifs/misc.c | 17 +- fs/cifs/smb1ops.c | 8 +- fs/cifs/smb2misc.c | 32 +--- fs/cifs/smb2ops.c | 44 ++++-- fs/cifs/smb2pdu.h | 2 +- fs/dcache.c | 4 +- fs/fuse/dev.c | 1 - fs/gfs2/inode.c | 13 +- fs/nfs/pagelist.c | 67 +++++--- fs/nfs/write.c | 10 +- fs/nfsd/nfs4state.c | 73 +++++---- fs/ubifs/io.c | 16 +- fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- fs/xfs/libxfs/xfs_dir2_node.c | 1 + fs/xfs/libxfs/xfs_trans_resv.c | 96 +++++++++--- fs/xfs/scrub/dir.c | 3 + include/linux/debugfs.h | 5 +- include/linux/libata.h | 13 +- include/linux/mmc/card.h | 2 +- include/linux/nfs_page.h | 2 + include/linux/pci.h | 1 - include/linux/seqlock.h | 11 +- include/linux/skbuff.h | 14 +- include/net/sock.h | 4 +- include/trace/events/sctp.h | 9 -- kernel/audit_watch.c | 2 - kernel/bpf/hashtab.c | 8 - kernel/bpf/inode.c | 4 +- kernel/kprobes.c | 5 +- kernel/printk/printk.c | 3 + kernel/sys.c | 4 +- kernel/trace/trace.c | 5 +- kernel/trace/trace_entries.h | 2 +- kernel/trace/trace_events.c | 2 + kernel/trace/trace_events_hist.c | 1 - kernel/trace/trace_preemptirq.c | 4 +- lib/string.c | 24 +++ mm/filemap.c | 8 + mm/kmemleak.c | 2 +- mm/memory.c | 121 +++++++++++++-- mm/mmap.c | 2 + mm/swapfile.c | 4 +- mm/vmscan.c | 45 +++--- net/atm/lec.c | 6 + net/batman-adv/bridge_loop_avoidance.c | 145 ++++++++++++++---- net/batman-adv/bridge_loop_avoidance.h | 4 +- net/batman-adv/routing.c | 4 + net/batman-adv/soft-interface.c | 6 +- net/bluetooth/hci_event.c | 25 ++- net/bluetooth/l2cap_core.c | 29 ++-- net/bluetooth/l2cap_sock.c | 18 ++- net/core/filter.c | 4 +- net/core/neighbour.c | 1 + net/ipv4/route.c | 1 + net/ipv4/tcp.c | 2 +- net/ipv6/ip6_fib.c | 7 +- net/llc/af_llc.c | 2 +- net/mac802154/tx.c | 8 +- net/openvswitch/meter.c | 4 +- net/openvswitch/meter.h | 2 +- net/sctp/outqueue.c | 6 + net/sunrpc/svc_xprt.c | 19 ++- net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 + net/tipc/topsrv.c | 4 +- net/unix/af_unix.c | 11 +- security/selinux/selinuxfs.c | 1 + sound/hda/hdac_bus.c | 4 + sound/pci/asihpi/hpioctl.c | 4 +- sound/pci/hda/hda_controller.c | 11 +- sound/pci/hda/patch_realtek.c | 13 +- sound/soc/codecs/max98090.c | 8 +- sound/soc/codecs/wm8994.c | 10 ++ sound/soc/codecs/wm_hubs.c | 3 + sound/soc/codecs/wm_hubs.h | 1 + sound/soc/img/img-i2s-out.c | 8 +- sound/soc/intel/boards/bytcr_rt5640.c | 10 ++ sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/usb/midi.c | 29 +++- sound/usb/mixer.c | 10 ++ sound/usb/quirks.c | 7 +- tools/gpio/gpio-hammer.c | 17 +- tools/objtool/check.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/pmu-events/jevents.c | 15 +- .../perf/tests/shell/lib/probe_vfs_getname.sh | 2 +- tools/perf/trace/beauty/arch_errno_names.sh | 2 +- tools/perf/util/cpumap.c | 10 +- tools/perf/util/evsel.c | 3 + tools/perf/util/mem2node.c | 3 +- tools/perf/util/metricgroup.c | 3 + tools/perf/util/parse-events.c | 9 +- tools/perf/util/sort.c | 2 +- tools/perf/util/symbol-elf.c | 7 + .../intel_pstate_tracer.py | 22 +-- .../ftrace/test.d/ftrace/func-filter-glob.tc | 2 +- tools/testing/selftests/x86/syscall_nt.c | 1 + virt/kvm/arm/mmio.c | 2 +- virt/kvm/arm/mmu.c | 5 +- virt/kvm/arm/vgic/vgic-init.c | 1 + virt/kvm/arm/vgic/vgic-its.c | 11 +- virt/kvm/kvm_main.c | 1 + 270 files changed, 2313 insertions(+), 1196 deletions(-) -- 2.25.1

1 237

[PATCH 01/65] mm: memcg: make memory.oom.group tolerable to task migration
by Yang Yingliang 10 Oct '20

10 Oct '20

From: Roman Gushchin <guro(a)fb.com> mainline inclusion from mainline-5.7-rc1 commit 48fe267c503ec22014ba4e83d002b07caad034d0 category: bugfix bugzilla: 33351 CVE: NA ------------------------------------------------- If a task is getting moved out of the OOMing cgroup, it might result in unexpected OOM killings if memory.oom.group is used anywhere in the cgroup tree. Imagine the following example: A (oom.group = 1) / \ (OOM) B C Let's say B's memory.max is exceeded and it's OOMing. The OOM killer selects a task in B as a victim, but someone asynchronously moves the task into C. mem_cgroup_get_oom_group() will iterate over all ancestors of C up to the root cgroup. In theory it had to stop at the oom_domain level - the memory cgroup which is OOMing. But because B is not an ancestor of C, it's not happening. Instead it chooses A (because it's oom.group is set), and kills all tasks in A. This behavior is wrong because the OOM happened in B, so there is no reason to kill anything outside. Fix this by checking it the memory cgroup to which the task belongs is a descendant of the oom_domain. If not, memory.oom.group should be ignored, and the OOM killer should kill only the victim task. Reported-by: Dan Schatzberg <dschatzberg(a)fb.com> Signed-off-by: Roman Gushchin <guro(a)fb.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Acked-by: Michal Hocko <mhocko(a)suse.com> Acked-by: Johannes Weiner <hannes(a)cmpxchg.org> Link: http://lkml.kernel.org/r/20200316223510.3176148-1-guro@fb.com Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> (cherry picked from commit 48fe267c503ec22014ba4e83d002b07caad034d0) Signed-off-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Liu Shixin <liushixin2(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/memcontrol.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1342b9540476..8611f3301686 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1856,6 +1856,14 @@ struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, if (memcg == root_mem_cgroup) goto out; + /* + * If the victim task has been asynchronously moved to a different + * memory cgroup, we might end up killing tasks outside oom_domain. + * In this case it's better to ignore memory.group.oom. + */ + if (unlikely(!mem_cgroup_is_descendant(memcg, oom_domain))) + goto out; + /* * Traverse the memory cgroup hierarchy from the victim task's * cgroup up to the OOMing cgroup (or root) to find the -- 2.25.1

1 64

[PATCH] mm/swapfile: fix and annotate various data races
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Qian Cai <cai(a)lca.pw> mainline inclusion from mainline-v5.9-rc1 commit a449bf58e45abf919b27ba62a9dcbae3ad36e725 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- swap_info_struct si.highest_bit, si.swap_map[offset] and si.flags could be accessed concurrently separately as noticed by KCSAN, === si.highest_bit === write to 0xffff8d5abccdc4d4 of 4 bytes by task 5353 on cpu 24: swap_range_alloc+0x81/0x130 swap_range_alloc at mm/swapfile.c:681 scan_swap_map_slots+0x371/0xb90 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff8d5abccdc4d4 of 4 bytes by task 6672 on cpu 70: scan_swap_map_slots+0x4a6/0xb90 scan_swap_map_slots at mm/swapfile.c:892 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 Reported by Kernel Concurrency Sanitizer on: CPU: 70 PID: 6672 Comm: oom01 Tainted: G W L 5.5.0-next-20200205+ #3 Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 === si.swap_map[offset] === write to 0xffffbc370c29a64c of 1 bytes by task 6856 on cpu 86: __swap_entry_free_locked+0x8c/0x100 __swap_entry_free_locked at mm/swapfile.c:1209 (discriminator 4) __swap_entry_free.constprop.20+0x69/0xb0 free_swap_and_cache+0x53/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 read to 0xffffbc370c29a64c of 1 bytes by task 6855 on cpu 20: _swap_info_get+0x81/0xa0 _swap_info_get at mm/swapfile.c:1140 free_swap_and_cache+0x40/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 === si.flags === write to 0xffff956c8fc6c400 of 8 bytes by task 6087 on cpu 23: scan_swap_map_slots+0x6fe/0xb50 scan_swap_map_slots at mm/swapfile.c:887 get_swap_pages+0x39d/0x5c0 get_swap_page+0x377/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff956c8fc6c400 of 8 bytes by task 6207 on cpu 63: _swap_info_get+0x41/0xa0 __swap_info_get at mm/swapfile.c:1114 put_swap_page+0x84/0x490 __remove_mapping+0x384/0x5f0 shrink_page_list+0xff1/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 The writes are under si->lock but the reads are not. For si.highest_bit and si.swap_map[offset], data race could trigger logic bugs, so fix them by having WRITE_ONCE() for the writes and READ_ONCE() for the reads except those isolated reads where they compare against zero which a data race would cause no harm. Thus, annotate them as intentional data races using the data_race() macro. For si.flags, the readers are only interested in a single bit where a data race there would cause no issue there. [cai(a)lca.pw: add a missing annotation for si->flags in memory.c] Link: http://lkml.kernel.org/r/1581612647-5958-1-git-send-email-cai@lca.pw Signed-off-by: Qian Cai <cai(a)lca.pw> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Marco Elver <elver(a)google.com> Cc: Hugh Dickins <hughd(a)google.com> Link: http://lkml.kernel.org/r/1581095163-12198-1-git-send-email-cai@lca.pw Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> [yyl: remove data_race(), this macro is used when KCSAN is enabled] Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/swapfile.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 60ccb3072318..41400ae4e7c1 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -639,7 +639,7 @@ static void swap_range_alloc(struct swap_info_struct *si, unsigned long offset, if (offset == si->lowest_bit) si->lowest_bit += nr_entries; if (end == si->highest_bit) - si->highest_bit -= nr_entries; + WRITE_ONCE(si->highest_bit, si->highest_bit - nr_entries); si->inuse_pages += nr_entries; if (si->inuse_pages == si->pages) { si->lowest_bit = si->max; @@ -671,7 +671,7 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset, if (end > si->highest_bit) { bool was_full = !si->highest_bit; - si->highest_bit = end; + WRITE_ONCE(si->highest_bit, end); if (was_full && (si->flags & SWP_WRITEOK)) add_to_avail_list(si); } @@ -804,7 +804,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si, else goto done; } - si->swap_map[offset] = usage; + WRITE_ONCE(si->swap_map[offset], usage); inc_cluster_info_page(si, si->cluster_info, offset); unlock_cluster(ci); @@ -850,12 +850,13 @@ static int scan_swap_map_slots(struct swap_info_struct *si, scan: spin_unlock(&si->lock); - while (++offset <= si->highest_bit) { + while (++offset <= READ_ONCE(si->highest_bit)) { if (!si->swap_map[offset]) { spin_lock(&si->lock); goto checks; } - if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) { + if (vm_swap_full() && + READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) { spin_lock(&si->lock); goto checks; } @@ -870,7 +871,8 @@ static int scan_swap_map_slots(struct swap_info_struct *si, spin_lock(&si->lock); goto checks; } - if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) { + if (vm_swap_full() && + READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) { spin_lock(&si->lock); goto checks; } @@ -1166,7 +1168,10 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p, } usage = count | has_cache; - p->swap_map[offset] = usage ? : SWAP_HAS_CACHE; + if (usage) + WRITE_ONCE(p->swap_map[offset], usage); + else + WRITE_ONCE(p->swap_map[offset], SWAP_HAS_CACHE); return usage; } @@ -3522,7 +3527,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) } else err = -ENOENT; /* unused swap entry */ - p->swap_map[offset] = count | has_cache; + WRITE_ONCE(p->swap_map[offset], count | has_cache); unlock_out: unlock_cluster_or_swap_info(p, ci); -- 2.25.1

1 0

[PATCH] iommu: fix a mistake for iommu_unregister_device_fault_handler
by Yang Yingliang 30 Sep '20

30 Sep '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] arm64: Kconfig: change fix compile error if gcc don't support armv8.4-a
by Yang Yingliang 30 Sep '20

30 Sep '20

hulk inclusion category: feature CVE: NA ----------------------- After 4d0831e8a029 ("kconfig: unify cc-option and as-option") in mainline, we can use cc-option. But in linux-4.19, this patch is not merged, so we will get the follow error: CC scripts/mod/empty.o CC scripts/mod/devicetable-offsets.s Assembler messages: Error: unknown architecture `armv8.4-a' Error: unrecognized option -march=armv8.4-a Fix this by changing cc-option to as-option. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1ef7862d1b75..e379fca3c8ad 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1307,7 +1307,7 @@ endmenu menu "ARMv8.4 architectural features" config AS_HAS_ARMV8_4 - def_bool $(cc-option,-Wa$(comma)-march=armv8.4-a) + def_bool $(as-option,-Wa$(comma)-march=armv8.4-a) config ARM64_TLB_RANGE bool "Enable support for tlbi range feature" -- 2.25.1

1 0

[PATCH 1/2] block: loop: set discard granularity and alignment for block device backed loop
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Ming Lei <ming.lei(a)redhat.com> mainline inclusion from mainline-v5.9-rc3 commit bcb21c8cc9947286211327d663ace69f07d37a76 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- In case of block device backend, if the backend supports write zeros, the loop device will set queue flag of QUEUE_FLAG_DISCARD. However, limits.discard_granularity isn't setup, and this way is wrong, see the following description in Documentation/ABI/testing/sysfs-block: A discard_granularity of 0 means that the device does not support discard functionality. Especially 9b15d109a6b2 ("block: improve discard bio alignment in __blkdev_issue_discard()") starts to take q->limits.discard_granularity for computing max discard sectors. And zero discard granularity may cause kernel oops, or fail discard request even though the loop queue claims discard support via QUEUE_FLAG_DISCARD. Fix the issue by setup discard granularity and alignment. Fixes: c52abf563049 ("loop: Better discard support for block devices") Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Acked-by: Coly Li <colyli(a)suse.de> Cc: Hannes Reinecke <hare(a)suse.com> Cc: Xiao Ni <xni(a)redhat.com> Cc: Martin K. Petersen <martin.petersen(a)oracle.com> Cc: Evan Green <evgreen(a)chromium.org> Cc: Gwendal Grignou <gwendal(a)chromium.org> Cc: Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> Cc: Andrzej Pietrasiewicz <andrzej.p(a)collabora.com> Cc: Christoph Hellwig <hch(a)lst.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Yufen Yu <yuyufen(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/block/loop.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index da68c42aed68..19042b42a8ba 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -864,6 +864,7 @@ static void loop_config_discard(struct loop_device *lo) struct file *file = lo->lo_backing_file; struct inode *inode = file->f_mapping->host; struct request_queue *q = lo->lo_queue; + u32 granularity, max_discard_sectors; /* * If the backing device is a block device, mirror its zeroing @@ -876,11 +877,10 @@ static void loop_config_discard(struct loop_device *lo) struct request_queue *backingq; backingq = bdev_get_queue(inode->i_bdev); - blk_queue_max_discard_sectors(q, - backingq->limits.max_write_zeroes_sectors); - blk_queue_max_write_zeroes_sectors(q, - backingq->limits.max_write_zeroes_sectors); + max_discard_sectors = backingq->limits.max_write_zeroes_sectors; + granularity = backingq->limits.discard_granularity ?: + queue_physical_block_size(backingq); /* * We use punch hole to reclaim the free space used by the @@ -889,23 +889,26 @@ static void loop_config_discard(struct loop_device *lo) * useful information. */ } else if (!file->f_op->fallocate || lo->lo_encrypt_key_size) { - q->limits.discard_granularity = 0; - q->limits.discard_alignment = 0; - blk_queue_max_discard_sectors(q, 0); - blk_queue_max_write_zeroes_sectors(q, 0); + max_discard_sectors = 0; + granularity = 0; } else { - q->limits.discard_granularity = inode->i_sb->s_blocksize; - q->limits.discard_alignment = 0; - - blk_queue_max_discard_sectors(q, UINT_MAX >> 9); - blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); + max_discard_sectors = UINT_MAX >> 9; + granularity = inode->i_sb->s_blocksize; } - if (q->limits.max_write_zeroes_sectors) + if (max_discard_sectors) { + q->limits.discard_granularity = granularity; + blk_queue_max_discard_sectors(q, max_discard_sectors); + blk_queue_max_write_zeroes_sectors(q, max_discard_sectors); blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); - else + } else { + q->limits.discard_granularity = 0; + blk_queue_max_discard_sectors(q, 0); + blk_queue_max_write_zeroes_sectors(q, 0); blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); + } + q->limits.discard_alignment = 0; } static void loop_unprepare_queue(struct loop_device *lo) -- 2.25.1

1 1

[PATCH 1/2] Revert "KVM: arm64: Add kvm_extable for vaxorcism code"
by Yang Yingliang 30 Sep '20

30 Sep '20

This reverts commit 8cc25436c41592b2236b4d2911a3031131a62872. --- arch/arm64/include/asm/kvm_asm.h | 15 ---------- arch/arm64/kernel/vmlinux.lds.S | 8 ----- arch/arm64/kvm/hyp/entry.S | 16 ++++------ arch/arm64/kvm/hyp/hyp-entry.S | 51 +++++++++++++------------------- arch/arm64/kvm/hyp/switch.c | 31 ------------------- 5 files changed, 26 insertions(+), 95 deletions(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 5df55a4dab42..400cb2af5ba6 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -146,21 +146,6 @@ extern u32 __kvm_get_mdcr_el2(void); kern_hyp_va \vcpu .endm -/* - * KVM extable for unexpected exceptions. - * In the same format _asm_extable, but output to a different section so that - * it can be mapped to EL2. The KVM version is not sorted. The caller must - * ensure: - * x18 has the hypervisor value to allow any Shadow-Call-Stack instrumented - * code to write to it, and that SPSR_EL2 and ELR_EL2 are restored by the fixup. - */ -.macro _kvm_extable, from, to - .pushsection __kvm_ex_table, "a" - .align 3 - .long (\from - .), (\to - .) - .popsection -.endm - #endif #endif /* __ARM_KVM_ASM_H__ */ diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 69e7c8d4a00f..d6050c6e65bc 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -24,13 +24,6 @@ ENTRY(_text) jiffies = jiffies_64; - -#define HYPERVISOR_EXTABLE \ - . = ALIGN(SZ_8); \ - __start___kvm_ex_table = .; \ - *(__kvm_ex_table) \ - __stop___kvm_ex_table = .; - #define HYPERVISOR_TEXT \ /* \ * Align to 4 KB so that \ @@ -46,7 +39,6 @@ jiffies = jiffies_64; __hyp_idmap_text_end = .; \ __hyp_text_start = .; \ *(.hyp.text) \ - HYPERVISOR_EXTABLE \ __hyp_text_end = .; #define IDMAP_TEXT \ diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 90e012fa3ca5..a0552b5177c5 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -164,22 +164,18 @@ alternative_endif // This is our single instruction exception window. A pending // SError is guaranteed to occur at the earliest when we unmask // it, and at the latest just after the ISB. + .global abort_guest_exit_start abort_guest_exit_start: isb + .global abort_guest_exit_end abort_guest_exit_end: - msr daifset, #4 // Mask aborts - ret - - _kvm_extable abort_guest_exit_start, 9997f - _kvm_extable abort_guest_exit_end, 9997f -9997: - msr daifset, #4 // Mask aborts - mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) - // restore the EL1 exception context so that we can report some - // information. Merge the exception code with the SError pending bit. + // If the exception took place, restore the EL1 exception + // context so that we can report some information. + // Merge the exception code with the SError pending bit. + tbz x0, #ARM_EXIT_WITH_SERROR_BIT, 1f msr elr_el2, x2 msr esr_el2, x3 msr spsr_el2, x4 diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index c3e4ae84f3a4..71591a6ee63e 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -26,30 +26,6 @@ #include <asm/kvm_mmu.h> #include <asm/mmu.h> -.macro save_caller_saved_regs_vect - /* x0 and x1 were saved in the vector entry */ - stp x2, x3, [sp, #-16]! - stp x4, x5, [sp, #-16]! - stp x6, x7, [sp, #-16]! - stp x8, x9, [sp, #-16]! - stp x10, x11, [sp, #-16]! - stp x12, x13, [sp, #-16]! - stp x14, x15, [sp, #-16]! - stp x16, x17, [sp, #-16]! -.endm - -.macro restore_caller_saved_regs_vect - ldp x16, x17, [sp], #16 - ldp x14, x15, [sp], #16 - ldp x12, x13, [sp], #16 - ldp x10, x11, [sp], #16 - ldp x8, x9, [sp], #16 - ldp x6, x7, [sp], #16 - ldp x4, x5, [sp], #16 - ldp x2, x3, [sp], #16 - ldp x0, x1, [sp], #16 -.endm - .text .pushsection .hyp.text, "ax" @@ -209,14 +185,27 @@ el2_sync: el2_error: - save_caller_saved_regs_vect - stp x29, x30, [sp, #-16]! - - bl kvm_unexpected_el2_exception - - ldp x29, x30, [sp], #16 - restore_caller_saved_regs_vect + ldp x0, x1, [sp], #16 + /* + * Only two possibilities: + * 1) Either we come from the exit path, having just unmasked + * PSTATE.A: change the return code to an EL2 fault, and + * carry on, as we're already in a sane state to handle it. + * 2) Or we come from anywhere else, and that's a bug: we panic. + * + * For (1), x0 contains the original return code and x1 doesn't + * contain anything meaningful at that stage. We can reuse them + * as temp registers. + * For (2), who cares? + */ + mrs x0, elr_el2 + adr x1, abort_guest_exit_start + cmp x0, x1 + adr x1, abort_guest_exit_end + ccmp x0, x1, #4, ne + b.ne __hyp_panic + mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) eret sb diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index e9ea7cf3e98f..acd2d84b190c 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -25,7 +25,6 @@ #include <asm/barrier.h> #include <asm/cpufeature.h> -#include <asm/extable.h> #include <asm/kprobes.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> @@ -37,9 +36,6 @@ #include <asm/processor.h> #include <asm/thread_info.h> -extern struct exception_table_entry __start___kvm_ex_table; -extern struct exception_table_entry __stop___kvm_ex_table; - /* Check whether the FP regs were dirtied while in the host-side run loop: */ static bool __hyp_text update_fp_enabled(struct kvm_vcpu *vcpu) { @@ -730,30 +726,3 @@ void __hyp_text __noreturn hyp_panic(struct kvm_cpu_context *host_ctxt) unreachable(); } - -asmlinkage void __hyp_text kvm_unexpected_el2_exception(void) -{ - unsigned long addr, fixup; - struct kvm_cpu_context *host_ctxt; - struct exception_table_entry *entry, *end; - unsigned long elr_el2 = read_sysreg(elr_el2); - - entry = hyp_symbol_addr(__start___kvm_ex_table); - end = hyp_symbol_addr(__stop___kvm_ex_table); - host_ctxt = __hyp_this_cpu_ptr(kvm_host_cpu_state); - - while (entry < end) { - addr = (unsigned long)&entry->insn + entry->insn; - fixup = (unsigned long)&entry->fixup + entry->fixup; - - if (addr != elr_el2) { - entry++; - continue; - } - - write_sysreg(fixup, elr_el2); - return; - } - - hyp_panic(host_ctxt); -} -- 2.25.1

2 3

[PATCH 1/3] net: hns3: modify the sensitive words
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Shengzui You <youshengzui(a)huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA ----------------------------------- Reviewed-by: Weiwei Deng <dengweiwei(a)huawei.com> Reviewed-by: Zhaohui Zhong <zhongzhaohui(a)huawei.com> Reviewed-by: Junxin Chen <chenjunxin1(a)huawei.com> Signed-off-by: Shengzui You <youshengzui(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h index cd1636e6dd65..343e036412d4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h @@ -36,14 +36,14 @@ typedef void (*nic_event_fn_t) (struct net_device *netdev, enum hnae3_event_type_custom); /** - * nic_register_event - register for nic event listening + * nic_register_event - register for nic event handling * @event_call: nic event handler * return 0 - success , negative - fail */ int nic_register_event(nic_event_fn_t event_call); /** - * nic_unregister_event - quit nic event listening + * nic_unregister_event - quit nic event handling * return 0 - success , negative - fail */ int nic_unregister_event(void); -- 2.25.1

1 2

[PATCH kernel-5.5] riscv/kvm: Add Linux-syscall-note at kvm.h
by Yipeng Yin 29 Sep '20

29 Sep '20

euleros inclusion category: bugfix bugzilla: NA CVE: NA It will raise 'missing "WITH Linux-syscall-note" for SPDX-License-Identifier' when make headers_install. this patch fix it. Link: https://gitee.com/openeuler/kernel/issues/I1WZL5 Signed-off-by: Yipeng Yin <yinyipeng1(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- arch/riscv/include/uapi/asm/kvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index f4274c2e5..65cd00654 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (C) 2019 Western Digital Corporation or its affiliates. * -- 2.19.1

2 1

[PATCH] block: allow for_each_bvec to support zero len bvec
by Yang Yingliang 29 Sep '20

29 Sep '20

From: Ming Lei <ming.lei(a)redhat.com> stable inclusion from linux-4.19.144 commit b48bcb664b657ae94b19c0728978c88e012f7a37 CVE: CVE-2020-25641 -------------------------------- commit 7e24969022cbd61ddc586f14824fc205661bb124 upstream. Block layer usually doesn't support or allow zero-length bvec. Since commit 1bdc76aea115 ("iov_iter: use bvec iterator to implement iterate_bvec()"), iterate_bvec() switches to bvec iterator. However, Al mentioned that 'Zero-length segments are not disallowed' in iov_iter. Fixes for_each_bvec() so that it can move on after seeing one zero length bvec. Fixes: 1bdc76aea115 ("iov_iter: use bvec iterator to implement iterate_bvec()") Reported-by: syzbot <syzbot+61acc40a49a3e46e25ea(a)syzkaller.appspotmail.com> Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Tested-by: Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: <stable(a)vger.kernel.org> Link: https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2262077.html Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/linux/bvec.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/bvec.h b/include/linux/bvec.h index fe7a22dd133b..bc1f16e9f3f4 100644 --- a/include/linux/bvec.h +++ b/include/linux/bvec.h @@ -119,11 +119,18 @@ static inline bool bvec_iter_rewind(const struct bio_vec *bv, return true; } +static inline void bvec_iter_skip_zero_bvec(struct bvec_iter *iter) +{ + iter->bi_bvec_done = 0; + iter->bi_idx++; +} + #define for_each_bvec(bvl, bio_vec, iter, start) \ for (iter = (start); \ (iter).bi_size && \ ((bvl = bvec_iter_bvec((bio_vec), (iter))), 1); \ - bvec_iter_advance((bio_vec), &(iter), (bvl).bv_len)) + (bvl).bv_len ? (void)bvec_iter_advance((bio_vec), &(iter), \ + (bvl).bv_len) : bvec_iter_skip_zero_bvec(&(iter))) /* for iterating one bio from start to end */ #define BVEC_ITER_ALL_INIT (struct bvec_iter) \ -- 2.25.1

1 0

[PATCH 1/6] loop: Report EOPNOTSUPP properly
by Yang Yingliang 28 Sep '20

28 Sep '20

From: Evan Green <evgreen(a)chromium.org> mainline inclusion from mainline-v5.7-rc1 commit 8cd55087dc45b2e1a73ed2a197cbf405f32deb08 category: bugfix bugzilla: 38877 CVE: NA Properly plumb out EOPNOTSUPP from loop driver operations, which may get returned when for instance a discard operation is attempted but not supported by the underlying block device. Before this change, everything was reported in the log as an I/O error, which is scary and not helpful in debugging. Signed-off-by: Evan Green <evgreen(a)chromium.org> Reviewed-by: Gwendal Grignou <gwendal(a)chromium.org> Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p(a)collabora.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Luo Meng <luomeng12(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/block/loop.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index da68c42aed68..19b64ca8c4e3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -461,7 +461,7 @@ static void lo_complete_rq(struct request *rq) if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || req_op(rq) != REQ_OP_READ) { if (cmd->ret < 0) - ret = BLK_STS_IOERR; + ret = errno_to_blk_status(cmd->ret); goto end_io; } @@ -1924,7 +1924,10 @@ static void loop_handle_cmd(struct loop_cmd *cmd) failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { - cmd->ret = ret ? -EIO : 0; + if (ret == -EOPNOTSUPP) + cmd->ret = ret; + else + cmd->ret = ret ? -EIO : 0; blk_mq_complete_request(rq); } } -- 2.25.1

1 5

[PATCH 00/38] backport stable-4.19.148
by Yang Yingliang 28 Sep '20

28 Sep '20

Dan Carpenter (1): hdlc_ppp: add range checks in ppp_cp_parse_cr() David Ahern (1): ipv4: Update exception handling for multipath routes via same device Dmitry Golovin (1): x86/boot: kbuild: allow readelf executable to be specified Edwin Peer (1): bnxt_en: return proper error codes in bnxt_show_temp Eric Dumazet (3): ipv6: avoid lockdep issue in fib6_del() net: qrtr: check skb_put_padto() return value net: add __must_check to skb_put_padto() Fangrui Song (1): Documentation/llvm: fix the name of llvm-size Florian Fainelli (1): net: phy: Avoid NPD upon phy_detach() when driver is unbound Ganji Aravind (1): cxgb4: Fix offset when clearing filter byte counters Greg Kroah-Hartman (1): Linux 4.19.148 Jakub Kicinski (1): nfp: use correct define to return NONE fec Linus Walleij (1): net: dsa: rtl8366: Properly clear member config Lukas Wunner (1): serial: 8250: Avoid error message on reprobe Mark Gray (1): geneve: add transport ports in route lookup for geneve Mark Salyzyn (1): af_key: pfkey_dump needs parameter validation Masahiro Yamada (5): net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware kbuild: remove AS variable kbuild: replace AS=clang with LLVM_IAS=1 kbuild: support LLVM=1 to switch the default tools to Clang/LLVM Michael Chan (1): bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex. Muchun Song (1): kprobes: fix kill kprobe which has been marked as gone Necip Fazil Yildiran (1): net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC Nick Desaulniers (2): MAINTAINERS: add CLANG/LLVM BUILD SUPPORT info Documentation/llvm: add documentation on building w/ Clang/LLVM Peilin Ye (1): tipc: Fix memory leak in tipc_group_create_member() Petr Machata (1): net: DCB: Validate DCB_ATTR_DCB_BUFFER argument Priyaranjan Jha (2): tcp_bbr: refactor bbr_target_cwnd() for general inflight provisioning tcp_bbr: adapt cwnd based on ack aggregation estimation Ralph Campbell (1): mm/thp: fix __split_huge_pmd_locked() for migration PMD Rustam Kovhaev (1): KVM: fix memory leak in kvm_io_bus_unregister_dev() Tetsuo Handa (1): tipc: fix shutdown() of connection oriented socket Vasily Gorbik (1): kbuild: add OBJSIZE variable for the size tool Wei Wang (1): ip: fix tos reflection in ack and reset packets Xin Long (1): tipc: use skb_unshare() instead in tipc_buf_append() Xunlei Pang (1): mm: memcg: fix memcg reclaim soft lockup Yunsheng Lin (1): net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc Documentation/kbuild/llvm.rst | 87 +++++++++ MAINTAINERS | 9 + Makefile | 38 +++- arch/x86/boot/compressed/Makefile | 2 +- drivers/net/dsa/rtl8366.c | 20 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 31 +-- .../net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 9 +- .../ethernet/netronome/nfp/nfp_net_ethtool.c | 4 +- drivers/net/geneve.c | 37 +++- drivers/net/phy/phy_device.c | 3 +- drivers/net/wan/Kconfig | 2 +- drivers/net/wan/Makefile | 12 +- drivers/net/wan/hdlc_ppp.c | 16 +- drivers/tty/serial/8250/8250_core.c | 11 +- include/linux/skbuff.h | 7 +- include/net/inet_connection_sock.h | 4 +- kernel/kprobes.c | 9 +- mm/huge_memory.c | 40 ++-- mm/vmscan.c | 8 + net/dcb/dcbnl.c | 8 + net/ipv4/ip_output.c | 3 +- net/ipv4/route.c | 13 +- net/ipv4/tcp_bbr.c | 180 ++++++++++++++++-- net/ipv6/Kconfig | 1 + net/ipv6/ip6_fib.c | 13 +- net/key/af_key.c | 7 + net/qrtr/qrtr.c | 20 +- net/sched/sch_generic.c | 49 +++-- net/tipc/group.c | 14 +- net/tipc/msg.c | 3 +- net/tipc/socket.c | 5 +- tools/objtool/Makefile | 6 + virt/kvm/kvm_main.c | 21 +- 34 files changed, 550 insertions(+), 161 deletions(-) create mode 100644 Documentation/kbuild/llvm.rst -- 2.25.1

1 38

【议题收集】【Meeting Notice】openEuler kernel sig meeting Time: 2020-10-16 10:00-12:00
by Xie XiuQi 28 Sep '20

28 Sep '20

openEuler kernel sig meeting 定于 2020-10-16 10:00-12:00 召开，欢迎回复邮件申报议题。 (受十一假期影响，中间跳过一次例会，如有问题需要交流，可以先发邮件列表） --- 会议信息 --- 会议链接：https://zoom.us/j/94156903933 会议 ID : 94156903933 --- 会议纪要归档 --- Meeting Record 20200918： https://gitee.com/openeuler/kernel/issues/I1WGN0

1 0

[PATCH kernel-5.5] riscv/kvm: Add Linux-syscall-note at kvm.h
by Yipeng Yin 28 Sep '20

28 Sep '20

euleros inclusion category: bugfix bugzilla: NA CVE: NA It will raise 'missing "WITH Linux-syscall-note" for SPDX-License-Identifier' when make headers_install. this patch fix it. Link: https://gitee.com/openeuler/kernel/issues/I1WZL5 Signed-off-by: Yipeng Yin <yinyipeng1(a)huawei.com> --- arch/riscv/include/uapi/asm/kvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index f4274c2e5..65cd00654 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (C) 2019 Western Digital Corporation or its affiliates. * -- 2.19.1

2 1

[PATCH openEuler-1.0-LTS 00/13] steal tasks to improve CPU utilization
by Wei Li 27 Sep '20

27 Sep '20

Steal tasks to improve CPU utilization, backported from branch 'kernel-4.19'. Cheng Jian (3): disable stealing by default sched/fair: introduce SCHED_STEAL config: enable CONFIG_SCHED_STEAL by default Steve Sistare (10): sched: Provide sparsemask, a reduced contention bitmap sched/topology: Provide hooks to allocate data shared per LLC sched/topology: Provide cfs_overload_cpus bitmap sched/fair: Dynamically update cfs_overload_cpus sched/fair: Hoist idle_stamp up from idle_balance sched/fair: Generalize the detach_task interface sched/fair: Provide can_migrate_task_llc sched/fair: Steal work from an overloaded CPU when CPU goes idle sched/fair: disable stealing if too many NUMA nodes sched/fair: Provide idle search schedstats arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/configs/storage_ci_defconfig | 1 + arch/arm64/configs/syzkaller_defconfig | 1 + arch/x86/configs/hulk_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + arch/x86/configs/storage_ci_defconfig | 1 + include/linux/sched/topology.h | 3 + init/Kconfig | 15 + kernel/sched/core.c | 35 ++- kernel/sched/fair.c | 367 ++++++++++++++++++++++-- kernel/sched/features.h | 8 + kernel/sched/sched.h | 20 ++ kernel/sched/sparsemask.h | 210 ++++++++++++++ kernel/sched/stats.c | 15 + kernel/sched/stats.h | 20 ++ kernel/sched/topology.c | 141 ++++++++- 18 files changed, 810 insertions(+), 32 deletions(-) create mode 100644 kernel/sched/sparsemask.h -- 2.17.1

1 13

[PATCH 00/50] backport stable-4.19.147
by Yang Yingliang 24 Sep '20

24 Sep '20

Adam Borowski (1): x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y Alexey Kardashevskiy (1): powerpc/dma: Fix dma_map_ops::get_required_mask Arvind Sankar (1): x86/boot/compressed: Disable relocation relaxation Bob Peterson (1): gfs2: initialize transaction tr_ailX_lists earlier Christophe JAILLET (1): clk: davinci: Use the correct size when allocating memory Chuck Lever (1): NFS: Zero-stateid SETATTR should first return delegation Daniel Mack (1): dsa: Allow forwarding of redirected IGMP traffic David Milburn (2): nvme-fc: cancel async events before freeing event struct nvme-rdma: cancel async events before freeing event struct Dinghao Liu (1): scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort Evan Nimmo (1): i2c: algo: pca: Reapply i2c bus settings after reset Gabriel Krisman Bertazi (1): f2fs: Return EOF on unaligned end of file DIO read Greg Kroah-Hartman (2): Revert "ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO" Linux 4.19.147 Gustav Wiklander (1): spi: Fix memory leak on splited transfers Haiyang Zhang (1): hv_netvsc: Remove "unlikely" from netvsc_select_queue Hans de Goede (1): Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists Huacai Chen (1): KVM: MIPS: Change the definition of kvm type J. Bruce Fields (1): SUNRPC: stop printk reading past end of string James Smart (1): scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery Javed Hasan (1): scsi: libfc: Fix for double free() Jiri Olsa (1): perf test: Fix the "signal" test inline assembly Laurent Pinchart (1): rapidio: Replace 'select' DMAENGINES 'with depends on' Miaohe Lin (1): net: handle the return value of pskb_carve_frag_list() correctly Michael Kelley (1): Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload Namhyung Kim (1): perf test: Free formats for perf pmu parse test Naresh Kumar PBS (1): RDMA/bnxt_re: Restrict the max_gids to 256 Nathan Chancellor (1): clk: rockchip: Fix initialization of mux_pll_src_4plls_p Olga Kornievskaia (1): NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall Oliver Neukum (2): USB: UAS: fix disconnect by unplugging a hub usblp: fix race between disconnect() and read() Penghao (1): USB: quirks: Add USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk for BYD zhaoxin notebook Quentin Perret (1): ehci-hcd: Move include to keep CRC stable Quinn Tran (3): scsi: qla2xxx: Update rscn_rcvd field to more meaningful scan_needed scsi: qla2xxx: Move rport registration out of internal work_list scsi: qla2xxx: Reduce holding sess_lock to prevent CPU lock-up Sahitya Tummala (1): f2fs: fix indefinite loop scanning for free nid Stafford Horne (1): openrisc: Fix cache API compile issue when not inlining Stephan Gerhold (1): ASoC: qcom: Set card->owner to avoid warnings Sunghyun Jin (1): percpu: fix first chunk size calculation for populated bitmap Tetsuo Handa (1): fbcon: Fix user font detection test at fbcon_resize(). Thomas Bogendoerfer (2): MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT MIPS: SNI: Fix spurious interrupts Tobias Diedrich (1): serial: 8250_pci: Add Realtek 816a and 816b Vincent Huang (1): Input: trackpoint - add new trackpoint variant IDs Vincent Whitchurch (2): regulator: pwm: Fix machine constraints application spi: spi-loopback-test: Fix out-of-bounds read Volker Rümelin (1): i2c: i801: Fix resume bug Yu Kuai (2): drm/mediatek: Add exception handing in mtk_drm_probe() if component init fail drm/mediatek: Add missing put_device() call in mtk_hdmi_dt_parse_pdata() Makefile | 2 +- arch/mips/Kconfig | 1 + arch/mips/kvm/mips.c | 2 + arch/mips/sni/a20r.c | 9 +- arch/openrisc/mm/cache.c | 2 +- arch/powerpc/kernel/dma-iommu.c | 3 +- arch/x86/boot/compressed/Makefile | 2 + arch/x86/configs/i386_defconfig | 1 + arch/x86/configs/x86_64_defconfig | 1 + drivers/clk/davinci/pll.c | 2 +- drivers/clk/rockchip/clk-rk3228.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++++-- drivers/hv/channel_mgmt.c | 7 +- drivers/i2c/algos/i2c-algo-pca.c | 35 +++++--- drivers/i2c/busses/i2c-i801.c | 21 +++-- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 1 + drivers/input/mouse/trackpoint.c | 10 ++- drivers/input/mouse/trackpoint.h | 10 ++- drivers/input/serio/i8042-x86ia64io.h | 16 ++++ drivers/net/hyperv/netvsc_drv.c | 2 +- drivers/nvme/host/fc.c | 1 + drivers/nvme/host/rdma.c | 1 + drivers/rapidio/Kconfig | 2 +- drivers/regulator/pwm-regulator.c | 2 +- drivers/scsi/libfc/fc_disc.c | 2 - drivers/scsi/lpfc/lpfc_els.c | 4 +- drivers/scsi/pm8001/pm8001_sas.c | 2 +- drivers/scsi/qla2xxx/qla_def.h | 10 ++- drivers/scsi/qla2xxx/qla_gbl.h | 5 +- drivers/scsi/qla2xxx/qla_gs.c | 30 ++++--- drivers/scsi/qla2xxx/qla_init.c | 101 +++++++++++++++++------ drivers/scsi/qla2xxx/qla_os.c | 29 ++++--- drivers/scsi/qla2xxx/qla_target.c | 85 +++++++++++++++---- drivers/spi/spi-loopback-test.c | 2 +- drivers/spi/spi.c | 9 +- drivers/tty/serial/8250/8250_pci.c | 11 +++ drivers/usb/class/usblp.c | 5 ++ drivers/usb/core/quirks.c | 4 + drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ehci-hub.c | 1 - drivers/usb/storage/uas.c | 14 +++- drivers/video/fbdev/core/fbcon.c | 2 +- fs/f2fs/data.c | 3 + fs/f2fs/node.c | 3 + fs/gfs2/glops.c | 2 + fs/gfs2/log.c | 2 - fs/gfs2/trans.c | 2 + fs/nfs/nfs4proc.c | 11 ++- include/linux/i2c-algo-pca.h | 15 ++++ include/uapi/linux/kvm.h | 5 +- mm/percpu.c | 2 +- net/core/skbuff.c | 10 ++- net/dsa/tag_edsa.c | 37 ++++++++- net/sunrpc/rpcb_clnt.c | 4 +- sound/pci/hda/patch_realtek.c | 1 - sound/soc/qcom/apq8016_sbc.c | 1 + sound/soc/qcom/apq8096.c | 1 + sound/soc/qcom/sdm845.c | 1 + sound/soc/qcom/storm.c | 1 + tools/perf/tests/bp_signal.c | 5 +- tools/perf/tests/pmu.c | 1 + tools/perf/util/pmu.c | 11 +++ tools/perf/util/pmu.h | 1 + 65 files changed, 457 insertions(+), 149 deletions(-) -- 2.25.1

1 50

[PATCH 1/5] loop: Report EOPNOTSUPP properly
by Yang Yingliang 24 Sep '20

24 Sep '20

From: Evan Green <evgreen(a)chromium.org> mainline inclusion from mainline-v5.7-rc1 commit 8cd55087dc45b2e1a73ed2a197cbf405f32deb08 category: bugfix bugzilla: 38877 CVE: NA Properly plumb out EOPNOTSUPP from loop driver operations, which may get returned when for instance a discard operation is attempted but not supported by the underlying block device. Before this change, everything was reported in the log as an I/O error, which is scary and not helpful in debugging. Signed-off-by: Evan Green <evgreen(a)chromium.org> Reviewed-by: Gwendal Grignou <gwendal(a)chromium.org> Reviewed-by: Bart Van Assche <bvanassche(a)acm.org> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p(a)collabora.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Luo Meng <luomeng12(a)huawei.com> Reviewed-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/block/loop.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 19042b42a8ba..d0687e90e5d4 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -461,7 +461,7 @@ static void lo_complete_rq(struct request *rq) if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) || req_op(rq) != REQ_OP_READ) { if (cmd->ret < 0) - ret = BLK_STS_IOERR; + ret = errno_to_blk_status(cmd->ret); goto end_io; } @@ -1927,7 +1927,10 @@ static void loop_handle_cmd(struct loop_cmd *cmd) failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { - cmd->ret = ret ? -EIO : 0; + if (ret == -EOPNOTSUPP) + cmd->ret = ret; + else + cmd->ret = ret ? -EIO : 0; blk_mq_complete_request(rq); } } -- 2.25.1

1 4

[PATCH 00/75] backport stable-4.19.146
by Yang Yingliang 23 Sep '20

23 Sep '20

Adam Ford (2): ARM: dts: logicpd-torpedo-baseboard: Fix broken audio ARM: dts: logicpd-som-lv-baseboard: Fix broken audio Aleksander Morgado (1): USB: serial: option: add support for SIM7070/SIM7080/SIM7090 modules Angelo Compagnucci (2): iio: adc: mcp3422: fix locking scope iio: adc: mcp3422: fix locking on error path Bjørn Mork (1): USB: serial: option: support dynamic Quectel USB compositions Chris Healy (1): ARM: dts: vfxxx: Add syscon compatible with OCOTP Darrick J. Wong (1): xfs: initialize the shortform attr header padding entry Dinghao Liu (4): RDMA/rxe: Fix memleak in rxe_mem_init_user NFC: st95hf: Fix memleak in st95hf_in_send_cmd firestream: Fix memleak in fs_open HID: elan: Fix memleak in elan_input_configured Dinh Nguyen (1): ARM: dts: socfpga: fix register entry for timer3 on Arria10 Douglas Anderson (1): mmc: sdhci-msm: Add retries when all tuning phases are found valid Evgeniy Didin (1): ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id Filipe Manana (1): btrfs: fix wrong address when faulting in pages in the search ioctl Florian Fainelli (4): ARM: dts: bcm: HR2: Fixed QSPI compatible string ARM: dts: NSP: Fixed QSPI compatible string ARM: dts: BCM5301X: Fixed QSPI compatible string arm64: dts: ns2: Fixed QSPI compatible string Florian Westphal (1): netfilter: conntrack: allow sctp hearbeat after connection re-use Francisco Jerez (1): cpufreq: intel_pstate: Fix intel_pstate_get_hwp_max() for turbo disabled Greg Kroah-Hartman (1): Linux 4.19.146 Hanjun Guo (1): dmaengine: acpi: Put the CSRT table after using it Heikki Krogerus (1): usb: typec: ucsi: acpi: Check the _DEP dependencies Hou Pu (1): scsi: target: iscsi: Fix hang in iscsit_access_np() when getting tpg->np_login_sem Joerg Roedel (1): iommu/amd: Do not use IOMMUv2 functionality when SME is active Jonathan Cameron (12): iio:light:ltr501 Fix timestamp alignment issue. iio:accel:bmc150-accel: Fix timestamp alignment and prevent data leak. iio:adc:ti-adc084s021 Fix alignment and data leak issues. iio:adc:ina2xx Fix timestamp alignment issue. iio:adc:max1118 Fix alignment of timestamp and data leak issues iio:adc:ti-adc081c Fix alignment and data leak issues iio:magnetometer:ak8975 Fix alignment and data leak issues. iio:light:max44000 Fix timestamp alignment and prevent data leak. iio:chemical:ccs811: Fix timestamp alignment and prevent data leak. iio: accel: kxsd9: Fix alignment of local buffer. iio:accel:mma7455: Fix timestamp alignment and prevent data leak. iio:accel:mma8452: Fix timestamp alignment and prevent data leak. Jordan Crouse (1): drm/msm: Disable preemption on all 5xx targets Josef Bacik (1): btrfs: fix lockdep splat in add_missing_dev Kamal Heib (2): RDMA/rxe: Drop pointless checks in rxe_init_ports RDMA/core: Fix reported speed and width Leon Romanovsky (1): gcov: Disable gcov build with GCC 10 Linus Torvalds (1): vgacon: remove software scrollback support Linus Walleij (1): drm/tve200: Stabilize enable/disable Mathias Nyman (1): usb: Fix out of sync data toggle if a configured device is reconfigured Matthias Schiffer (1): ARM: dts: ls1021a: fix QuadSPI-memory reg range Maxim Kochetkov (1): iio: adc: ti-ads1015: fix conversion when CONFIG_PM is not set Michał Mirosław (1): regulator: push allocation in set_consumer_device_supply() out of lock Mohan Kumar (1): ALSA: hda: Fix 2 channel swapping for Tegra Nirenjan Krishnan (1): HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for all Saitek X52 devices Ondrej Jirman (1): drm/sun4i: Fix dsi dcs long write function Patrick Riphagen (1): USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter Peter Oberparleiter (1): gcov: add support for GCC 10.1 Qu Wenruo (1): btrfs: require only sector size alignment for parent eb bytenr Rafael J. Wysocki (1): cpufreq: intel_pstate: Refuse to turn off with HWP enabled Rander Wang (1): ALSA: hda: fix a runtime pm issue in SOF when integrated GPU is disabled Rustam Kovhaev (1): staging: wlan-ng: fix out of bounds read in prism2sta_probe_usb() Sagi Grimberg (2): nvme-fabrics: don't check state NVME_CTRL_NEW for request acceptance nvme-rdma: serialize controller teardown sequences Sandeep Raghuraman (1): drm/amdgpu: Fix bug in reporting voltage for CIK Selvin Xavier (1): RDMA/bnxt_re: Do not report transparent vlan from QP1 Sivaprakash Murugesan (1): phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init Tetsuo Handa (1): video: fbdev: fix OOB read in vga_8planes_imageblit() Vaibhav Agarwal (1): staging: greybus: audio: fix uninitialized value issue Varun Prakash (1): scsi: target: iscsi: Fix data digest calculation Vineet Gupta (2): ARC: HSDK: wireup perf irq irqchip/eznps: Fix build error for !ARC700 builds Wanpeng Li (1): KVM: VMX: Don't freeze guest when event delivery causes an APIC-access exit Xie He (3): drivers/net/wan/lapbether: Added needed_tailroom drivers/net/wan/lapbether: Set network_header before transmitting drivers/net/wan/hdlc_cisco: Add hard_header_len Yi Zhang (1): RDMA/rxe: Fix the parent sysfs read when the interface has 15 chars Zeng Tao (1): usb: core: fix slab-out-of-bounds Read in read_descriptors Makefile | 2 +- arch/arc/boot/dts/hsdk.dts | 6 +- arch/arc/plat-eznps/include/plat/ctop.h | 1 - arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- .../boot/dts/logicpd-som-lv-baseboard.dtsi | 2 + .../boot/dts/logicpd-torpedo-baseboard.dtsi | 2 + arch/arm/boot/dts/ls1021a.dtsi | 2 +- arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- arch/arm/boot/dts/vfxxx.dtsi | 2 +- .../boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- arch/powerpc/configs/pasemi_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/x86/configs/i386_defconfig | 1 - arch/x86/configs/x86_64_defconfig | 1 - arch/x86/kvm/vmx.c | 1 + drivers/atm/firestream.c | 1 + drivers/cpufreq/intel_pstate.c | 14 +- drivers/dma/acpi-dma.c | 4 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 +- drivers/gpu/drm/tve200/tve200_display.c | 22 +- drivers/hid/hid-elan.c | 2 + drivers/hid/hid-ids.h | 2 + drivers/hid/hid-quirks.c | 2 + drivers/iio/accel/bmc150-accel-core.c | 15 +- drivers/iio/accel/kxsd9.c | 16 +- drivers/iio/accel/mma7455_core.c | 16 +- drivers/iio/accel/mma8452.c | 11 +- drivers/iio/adc/ina2xx-adc.c | 11 +- drivers/iio/adc/max1118.c | 10 +- drivers/iio/adc/mcp3422.c | 16 +- drivers/iio/adc/ti-adc081c.c | 11 +- drivers/iio/adc/ti-adc084s021.c | 10 +- drivers/iio/adc/ti-ads1015.c | 10 + drivers/iio/chemical/ccs811.c | 13 +- drivers/iio/light/ltr501.c | 15 +- drivers/iio/light/max44000.c | 12 +- drivers/iio/magnetometer/ak8975.c | 16 +- drivers/infiniband/core/verbs.c | 2 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 21 +- drivers/infiniband/sw/rxe/rxe.c | 3 - drivers/infiniband/sw/rxe/rxe_mr.c | 1 + drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- drivers/iommu/amd_iommu_v2.c | 7 + drivers/mmc/host/sdhci-msm.c | 18 +- drivers/net/wan/hdlc_cisco.c | 1 + drivers/net/wan/lapbether.c | 3 + drivers/nfc/st95hf/core.c | 2 +- drivers/nvme/host/fabrics.c | 1 - drivers/nvme/host/rdma.c | 6 + drivers/phy/qualcomm/phy-qcom-qmp.c | 16 +- drivers/phy/qualcomm/phy-qcom-qmp.h | 2 + drivers/regulator/core.c | 46 ++-- drivers/staging/greybus/audio_topology.c | 29 +-- drivers/staging/wlan-ng/hfa384x_usb.c | 5 - drivers/staging/wlan-ng/prism2usb.c | 19 +- drivers/target/iscsi/iscsi_target.c | 17 +- drivers/target/iscsi/iscsi_target_login.c | 6 +- drivers/target/iscsi/iscsi_target_login.h | 3 +- drivers/target/iscsi/iscsi_target_nego.c | 3 +- drivers/usb/core/message.c | 91 ++++---- drivers/usb/core/sysfs.c | 5 + drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 1 + drivers/usb/serial/option.c | 22 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 4 + drivers/video/console/Kconfig | 46 ---- drivers/video/console/vgacon.c | 221 +----------------- drivers/video/fbdev/vga16fb.c | 2 +- fs/btrfs/extent-tree.c | 19 +- fs/btrfs/ioctl.c | 3 +- fs/btrfs/print-tree.c | 12 +- fs/btrfs/volumes.c | 10 + fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- include/linux/netfilter/nf_conntrack_sctp.h | 2 + include/soc/nps/common.h | 6 + kernel/gcov/gcc_4_7.c | 4 +- net/netfilter/nf_conntrack_proto_sctp.c | 39 +++- sound/hda/hdac_device.c | 2 + sound/pci/hda/patch_hdmi.c | 5 + 83 files changed, 479 insertions(+), 504 deletions(-) -- 2.25.1

1 75

[PATCH] config: add digest list options for arm64
by Yang Yingliang 22 Sep '20

22 Sep '20

From: Roberto Sassu <roberto.sassu(a)huawei.com> hulk inclusion category: feature feature: digest-lists --------------------------- Enable digest lists and PGP keys preload. Signed-off-by: Roberto Sassu <roberto.sassu(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 73 +++++++++++++++++++------- 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 809350e03968..b2abedf899b5 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -3048,20 +3048,23 @@ CONFIG_HW_RANDOM_CAVIUM=y # CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=8192 -CONFIG_TCG_TPM=m +CONFIG_TCG_TPM=y CONFIG_HW_RANDOM_TPM=y -CONFIG_TCG_TIS_CORE=m -CONFIG_TCG_TIS=m -CONFIG_TCG_TIS_SPI=m -# CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_INFINEON is not set -# CONFIG_TCG_TIS_I2C_NUVOTON is not set -CONFIG_TCG_ATMEL=m -# CONFIG_TCG_INFINEON is not set -CONFIG_TCG_CRB=m +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_TIS_SPI=y +CONFIG_TCG_TIS_I2C_ATMEL=y +CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_TCG_TIS_I2C_NUVOTON=y +CONFIG_TCG_NSC=y +CONFIG_TCG_ATMEL=y +CONFIG_TCG_INFINEON=y +# CONFIG_TCG_XEN is not set +CONFIG_TCG_CRB=y # CONFIG_TCG_VTPM_PROXY is not set -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set -# CONFIG_TCG_TIS_ST33ZP24_SPI is not set +CONFIG_TCG_TIS_ST33ZP24=y +CONFIG_TCG_TIS_ST33ZP24_I2C=y +CONFIG_TCG_TIS_ST33ZP24_SPI=y # CONFIG_DEVPORT is not set # CONFIG_XILLYBUS is not set CONFIG_HISI_SVM=y @@ -5425,8 +5428,8 @@ CONFIG_KEYS=y CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y -CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m +CONFIG_TRUSTED_KEYS=y +CONFIG_ENCRYPTED_KEYS=y # CONFIG_KEY_DH_OPERATIONS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y @@ -5459,7 +5462,39 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_APPARMOR_DEBUG is not set # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_YAMA=y -# CONFIG_INTEGRITY is not set +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_AUDIT=y +CONFIG_IMA=y +CONFIG_IMA_MEASURE_PCR_IDX=10 +CONFIG_IMA_LSM_RULES=y +# CONFIG_IMA_TEMPLATE is not set +CONFIG_IMA_NG_TEMPLATE=y +# CONFIG_IMA_SIG_TEMPLATE is not set +CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y +CONFIG_IMA_DEFAULT_HASH="sha256" +# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_READ_POLICY=y +CONFIG_IMA_APPRAISE=y +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +CONFIG_IMA_TRUSTED_KEYRING=y +# CONFIG_IMA_BLACKLIST_KEYRING is not set +CONFIG_IMA_LOAD_X509=y +CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" +# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set +CONFIG_IMA_DIGEST_LIST=y +CONFIG_IMA_DIGEST_LISTS_DIR="/etc/ima/digest_lists" +CONFIG_IMA_PARSER_BINARY_PATH="/usr/bin/upload_digest_lists" +CONFIG_EVM=y +CONFIG_EVM_ATTR_FSUUID=y +# CONFIG_EVM_ADD_XATTRS is not set +CONFIG_EVM_LOAD_X509=y +CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SECURITY_APPARMOR is not set # CONFIG_DEFAULT_SECURITY_DAC is not set @@ -5646,9 +5681,9 @@ 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 +CONFIG_PGP_LIBRARY=y +CONFIG_PGP_KEY_PARSER=y +CONFIG_PGP_PRELOAD=y # # Certificates for signature checking @@ -5659,7 +5694,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_PGP_PRELOAD_PUBLIC_KEYS=y CONFIG_BINARY_PRINTF=y # -- 2.25.1

1 0

[PATCH] acpi/arm64: check the returned logical CPU number of 'acpi_map_cpuid()'
by Yang Yingliang 22 Sep '20

22 Sep '20

From: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> hulk inclusion category: bugfix bugzilla: NA CVE: NA --------------------------- When we set 'nr_cpus=1' in kernel parameter, we get the following error. It's because 'acpi_map_cpuid()' return -ENODEV in 'acpi_map_cpu()' when there are not enough logical CPU numbers. So we need to check the returned logical CPU number and return error if it is negative. 'acpi_map_cpu' when there are not enough logical CPU [ 0.025955] Unable to handle kernel paging request at virtual address ffff00002915b828 [ 0.025958] Mem abort info: [ 0.025959] ESR = 0x96000006 [ 0.025961] Exception class = DABT (current EL), IL = 32 bits [ 0.025963] SET = 0, FnV = 0 [ 0.025965] EA = 0, S1PTW = 0 [ 0.025966] Data abort info: [ 0.025968] ISV = 0, ISS = 0x00000006 [ 0.025970] CM = 0, WnR = 0 [ 0.025972] swapper pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 0.025974] [ffff00002915b828] pgd=000000013fffe003, pud=000000013fffd003, pmd=0000000000000000 [ 0.025979] Internal error: Oops: 96000006 [#1] SMP [ 0.025981] Modules linked in: [ 0.025983] Process swapper/0 (pid: 1, stack limit = 0x(____ptrval____)) [ 0.025986] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 4.19.141+ #37 [ 0.025988] Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 [ 0.025991] pstate: a0c00005 (NzCv daif +PAN +UAO) [ 0.025993] pc : acpi_map_cpu+0xe0/0x170 [ 0.025996] lr : acpi_map_cpu+0xb8/0x170 [ 0.025997] sp : ffff8000fef1fa50 [ 0.025999] x29: ffff8000fef1fa50 x28: ffff000008e22058 [ 0.026001] x27: ffff0000092a6000 x26: ffff000008d60778 [ 0.026004] x25: ffff0000094c3000 x24: 0000000000000001 [ 0.026006] x23: ffff8000fe802c18 x22: 00000000ffffffff [ 0.026008] x21: ffff000008a16000 x20: ffff000008a16a20 [ 0.026011] x19: 00000000ffffffed x18: ffffffffffffffff [ 0.026013] x17: 0000000087411dcf x16: 00000000b93a5600 [ 0.026015] x15: ffff000009159708 x14: 0720072007200720 [ 0.026018] x13: 0720072007200720 x12: 0720072007200720 [ 0.026020] x11: 072007200720073d x10: 073d073d073d073d [ 0.026022] x9 : 073d073d073d0764 x8 : 0765076607660766 [ 0.026024] x7 : 0766076607660778 x6 : 0000000000000130 [ 0.026027] x5 : ffff0000085955c8 x4 : 0000000000000000 [ 0.026029] x3 : 0000000000000000 x2 : ffff00000915b830 [ 0.026031] x1 : ffff00002915b828 x0 : 0000200000000000 [ 0.026033] Call trace: [ 0.026035] acpi_map_cpu+0xe0/0x170 [ 0.026038] acpi_processor_add+0x44c/0x640 [ 0.026040] acpi_bus_attach+0x174/0x218 [ 0.026043] acpi_bus_attach+0xa8/0x218 [ 0.026045] acpi_bus_attach+0xa8/0x218 [ 0.026047] acpi_bus_attach+0xa8/0x218 [ 0.026049] acpi_bus_scan+0x58/0xb8 [ 0.026052] acpi_scan_init+0xf4/0x234 [ 0.026054] acpi_init+0x318/0x384 [ 0.026056] do_one_initcall+0x54/0x250 [ 0.026059] kernel_init_freeable+0x2d4/0x3c0 [ 0.026061] kernel_init+0x18/0x118 [ 0.026063] ret_from_fork+0x10/0x18 [ 0.026066] Code: d2800020 9120c042 8b010c41 9ad32000 (f820303f) Signed-off-by: Xiongfeng Wang <wangxiongfeng2(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Reviewed-by: Keqian Zhu <zhukeqian1(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/kernel/acpi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 73eb04f997a7..729733536cb4 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -270,6 +270,10 @@ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id, int cpu, nid; cpu = acpi_map_cpuid(physid, acpi_id); + if (cpu < 0) { + pr_info("Unable to map GICC to logical cpu number\n"); + return cpu; + } nid = acpi_get_node(handle); if (nid != NUMA_NO_NODE) { set_cpu_numa_node(cpu, nid); -- 2.25.1

1 0

[PATCH 0/9] backport stable-4.19.145
by Yang Yingliang 22 Sep '20

22 Sep '20

Greg Kroah-Hartman (1): Linux 4.19.145 Jakub Kicinski (1): net: disable netpoll on fresh napis Jens Axboe (1): block: ensure bdi->io_pages is always initialized Kamil Lorenc (1): net: usb: dm9601: Add USB ID of Keenetic Plus DSL Paul Moore (1): netlabel: fix problems with mapping removal Roi Dayan (1): net/mlx5e: Don't support phys switch id if not in switchdev mode Takashi Sakamoto (1): ALSA; firewire-tascam: exclude Tascam FE-8 from detection Tetsuo Handa (1): tipc: fix shutdown() of connectionless socket Xin Long (1): sctp: not disable bh in the whole sctp_get_port_local() Makefile | 2 +- block/blk-core.c | 2 + .../net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- drivers/net/usb/dm9601.c | 4 ++ net/core/dev.c | 3 +- net/core/netpoll.c | 2 +- net/netlabel/netlabel_domainhash.c | 59 ++++++++++--------- net/sctp/socket.c | 16 ++--- net/tipc/socket.c | 9 ++- sound/firewire/tascam/tascam.c | 30 +++++++++- 10 files changed, 82 insertions(+), 47 deletions(-) -- 2.25.1

1 9

[PATCH 00/79] backport stable-4.19.144
by Yang Yingliang 22 Sep '20

22 Sep '20

Al Grant (1): perf tools: Correct SNOOPX field offset Al Viro (1): fix regression in "epoll: Keep a reference on files added to the check list" Amit Engel (1): nvmet: Disable keep-alive timer when kato is cleared to 0h Bodo Stroesser (2): scsi: target: tcmu: Fix size in calls to tcmu_flush_dcache_range scsi: target: tcmu: Optimize use of flush_dcache_page Christophe JAILLET (1): nvmet-fc: Fix a missed _irqsave version of spin_lock in 'nvmet_fc_fod_op_done()' Dan Carpenter (1): net: gemini: Fix another missing clk_disable_unprepare() in probe Dan Crawford (1): ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO Daniel Borkmann (1): uaccess: Add non-pagefault user-space write function Daniele Palmas (1): net: usb: qmi_wwan: add Telit 0x1050 composition Darrick J. Wong (1): xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files Dinghao Liu (3): net: hns: Fix memleak in hns_nic_dev_probe net: systemport: Fix memleak in bcm_sysport_probe net: arc_emac: Fix memleak in arc_mdio_probe Dmitry Baryshkov (1): drm/msm/a6xx: fix gmu start on newer firmware Edwin Peer (1): bnxt_en: fix HWRM error when querying VF temperature Florian Fainelli (2): MIPS: mm: BMIPS5000 has inclusive physical caches MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores Florian Westphal (1): netfilter: nf_tables: fix destination register zeroing Greg Kroah-Hartman (1): Linux 4.19.144 Himadri Pandya (1): net: usb: Fix uninit-was-stored issue in asix_read_phy_addr() Huang Ying (1): x86, fakenuma: Fix invalid starting node ID Jakub Kicinski (1): bnxt: don't enable NAPI until rings are ready James Morse (4): KVM: arm64: Add kvm_extable for vaxorcism code KVM: arm64: Defer guest entry when an asynchronous exception is pending KVM: arm64: Survive synchronous exceptions caused by AT instructions KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception Jason Gunthorpe (1): include/linux/log2.h: add missing () around n in roundup_pow_of_two() Jeff Layton (1): ceph: don't allow setlease on cephfs Jesper Dangaard Brouer (1): selftests/bpf: Fix massive output from test_maps Johannes Berg (1): cfg80211: regulatory: reject invalid hints John Stultz (1): tty: serial: qcom_geni_serial: Drop __init from qcom_geni_console_setup Josef Bacik (3): btrfs: drop path before adding new uuid tree entry btrfs: set the lockdep class for log tree extent buffers btrfs: fix potential deadlock in the search ioctl Jussi Kivilinna (1): batman-adv: bla: use netif_rx_ni when not in interrupt context Kai Vehmanen (1): ALSA: hda/hdmi: always check pin power status in i915 pin fixup Kim Phillips (1): perf record/stat: Explicitly call out event modifiers in the documentation Krishna Manikandan (1): drm/msm: add shutdown support for display platform_driver Linus Lüssing (1): batman-adv: Fix own OGM check in aggregated OGMs Lu Baolu (1): iommu/vt-d: Serialize IOMMU GCMD register modifications Marc Zyngier (2): HID: core: Correctly handle ReportSize being zero HID: core: Sanitize event code and type when mapping input Marek Szyprowski (1): dmaengine: pl330: Fix burst length if burst size is smaller than bus width Masami Hiramatsu (1): uaccess: Add non-pagefault user-space read functions Max Staudt (1): affs: fix basic permission bits to actually work Michael Chan (1): tg3: Fix soft lockup when tg3_reset_task() fails. Mikulas Patocka (3): ext2: don't update mtime on COW faults xfs: don't update mtime on COW faults dm writecache: handle DAX to partitions on persistent memory correctly Ming Lei (1): block: allow for_each_bvec to support zero len bvec Mrinal Pandey (1): checkpatch: fix the usage of capture group ( ... ) Namhyung Kim (1): perf jevents: Fix suspicious code in fixregex() Nicolas Dichtel (1): gtp: add GTPA_LINK info to msg sent to userspace Nikolay Borisov (2): btrfs: Remove redundant extent_buffer_get in get_old_root btrfs: Remove extraneous extent_buffer_get from tree_mod_log_rewind Pablo Neira Ayuso (3): netfilter: nf_tables: add NFTA_SET_USERDATA if not null netfilter: nf_tables: incorrect enum nft_list_attributes definition netfilter: nfnetlink: nfnetlink_unicast() reports EAGAIN instead of ENOBUFS Pavan Chebbi (1): bnxt_en: Don't query FW when netif_running() is false. Peter Ujfalusi (1): dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling Peter Zijlstra (1): cpuidle: Fixup IRQ state Rogan Dawes (1): usb: qmi_wwan: add D-Link DWM-222 A2 device ID Sean Young (2): media: rc: do not access device via sysfs after rc_unregister_device() media: rc: uevent sysfs file races with rc_unregister_device() Shung-Hsi Yu (1): net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init() Simon Leiner (1): xen/xenbus: Fix granting of vmalloc'd memory Sven Eckelmann (1): batman-adv: Avoid uninitialized chaddr when handling DHCP Sven Schnelle (1): s390: don't trace preemption in percpu macros Takashi Iwai (1): ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check Takashi Sakamoto (1): ALSA: firewire-digi00x: exclude Avid Adrenaline from detection Tejun Heo (1): libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks Tom Rix (1): hwmon: (applesmc) check status earlier. Tong Zhang (1): ALSA: ca0106: fix error code handling Tony Lindgren (1): thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430 Vasundhara Volam (2): bnxt_en: Check for zero dir entries in NVRAM. bnxt_en: Fix PCI AER error recovery flow Yu Kuai (1): dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate() Yuusuke Ashizuka (1): ravb: Fixed to be able to unload modules Documentation/filesystems/affs.txt | 16 +- Makefile | 2 +- arch/arm64/include/asm/kvm_arm.h | 3 +- arch/arm64/include/asm/kvm_asm.h | 43 +++++ arch/arm64/kernel/vmlinux.lds.S | 8 + arch/arm64/kvm/hyp/entry.S | 31 +++- arch/arm64/kvm/hyp/hyp-entry.S | 66 ++++--- arch/arm64/kvm/hyp/switch.c | 39 +++- arch/mips/kernel/smp-bmips.c | 2 + arch/mips/mm/c-r4k.c | 4 + arch/s390/include/asm/percpu.h | 28 +-- arch/x86/mm/numa_emulation.c | 2 +- drivers/ata/libata-core.c | 5 +- drivers/ata/libata-scsi.c | 8 +- drivers/cpuidle/cpuidle.c | 3 +- drivers/dma/at_hdmac.c | 2 + drivers/dma/of-dma.c | 8 +- drivers/dma/pl330.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +- drivers/gpu/drm/msm/msm_drv.c | 8 + drivers/hid/hid-core.c | 15 +- drivers/hid/hid-input.c | 4 + drivers/hid/hid-multitouch.c | 2 + drivers/hwmon/applesmc.c | 31 ++-- drivers/iommu/intel_irq_remapping.c | 10 +- drivers/md/dm-writecache.c | 12 +- drivers/media/rc/rc-main.c | 44 +++-- drivers/net/ethernet/arc/emac_mdio.c | 1 + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 26 +-- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 +- drivers/net/ethernet/broadcom/tg3.c | 17 +- drivers/net/ethernet/cortina/gemini.c | 34 ++-- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 9 +- drivers/net/ethernet/mellanox/mlx4/mr.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 110 ++++++------ drivers/net/gtp.c | 1 + drivers/net/usb/asix_common.c | 2 +- drivers/net/usb/qmi_wwan.c | 2 + drivers/nvme/target/core.c | 6 + drivers/nvme/target/fc.c | 4 +- drivers/target/target_core_user.c | 15 +- .../ti-soc-thermal/omap4-thermal-data.c | 23 +-- .../thermal/ti-soc-thermal/omap4xxx-bandgap.h | 10 +- drivers/tty/serial/qcom_geni_serial.c | 2 +- drivers/xen/xenbus/xenbus_client.c | 10 +- fs/affs/amigaffs.c | 27 +++ fs/affs/file.c | 26 ++- fs/btrfs/ctree.c | 8 +- fs/btrfs/extent_io.c | 8 +- fs/btrfs/extent_io.h | 6 +- fs/btrfs/ioctl.c | 27 ++- fs/btrfs/volumes.c | 3 +- fs/ceph/file.c | 1 + fs/eventpoll.c | 6 +- fs/ext2/file.c | 6 +- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_file.c | 12 +- include/linux/bvec.h | 9 +- include/linux/hid.h | 42 +++-- include/linux/libata.h | 1 + include/linux/log2.h | 2 +- include/linux/netfilter/nfnetlink.h | 3 +- include/linux/uaccess.h | 26 +++ include/net/netfilter/nf_tables.h | 2 + include/uapi/linux/netfilter/nf_tables.h | 2 +- mm/maccess.c | 167 ++++++++++++++++-- net/batman-adv/bat_v_ogm.c | 11 +- net/batman-adv/bridge_loop_avoidance.c | 5 +- net/batman-adv/gateway_client.c | 6 +- net/netfilter/nf_tables_api.c | 64 ++++--- net/netfilter/nfnetlink.c | 11 +- net/netfilter/nfnetlink_log.c | 3 +- net/netfilter/nfnetlink_queue.c | 2 +- net/netfilter/nft_payload.c | 4 +- net/wireless/reg.c | 3 + scripts/checkpatch.pl | 4 +- sound/core/oss/mulaw.c | 4 +- sound/firewire/digi00x/digi00x.c | 5 + sound/pci/ca0106/ca0106_main.c | 3 +- sound/pci/hda/patch_hdmi.c | 1 + sound/pci/hda/patch_realtek.c | 1 + tools/include/uapi/linux/perf_event.h | 2 +- tools/perf/Documentation/perf-record.txt | 4 + tools/perf/Documentation/perf-stat.txt | 4 + tools/perf/pmu-events/jevents.c | 2 +- tools/testing/selftests/bpf/test_maps.c | 2 + 87 files changed, 885 insertions(+), 337 deletions(-) -- 2.25.1

1 79

[PATCH 000/120] backport stable-4.19.143
by Yang Yingliang 22 Sep '20

22 Sep '20

Aditya Pakki (5): drm/radeon: fix multiple reference count leak omapfb: fix multiple reference count leaks due to pm_runtime_get_sync drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open drm/nouveau: fix reference count leak in nv50_disp_atomic_commit drm/nouveau: Fix reference count leak in nouveau_connector_detect Adrian Hunter (1): scsi: ufs: Improve interrupt handling for shared interrupts Alan Stern (3): USB: yurex: Fix bad gfp argument USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D usb: storage: Add unusual_uas entry for Sony PSZ drives Alex Deucher (1): drm/amdgpu: Fix buffer overflow in INFO ioctl Alexey Kardashevskiy (1): powerpc/xive: Ignore kmemleak false positives Alvin Šipraga (1): macvlan: validate setting of multiple remote source MAC addresses Amelie Delaunay (1): spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate Andrey Konovalov (1): efi: provide empty efi_enter_virtual_mode implementation Andy Shevchenko (2): mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs USB: gadget: u_f: Unbreak offset calculation in VLAs Arnd Bergmann (1): powerpc/spufs: add CONFIG_COREDUMP dependency Athira Rajeev (1): powerpc/perf: Fix soft lockups due to missed interrupt accounting Bodo Stroesser (1): scsi: target: tcmu: Fix crash on ARM during cmd completion Brooke Basile (2): USB: gadget: u_f: add overflow checks to VLA macros USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb() Changming Liu (1): USB: sisusbvga: Fix a potential UB casued by left shifting a negative value Chao Yu (1): f2fs: fix error path in do_recover_data() Chris Wilson (1): locking/lockdep: Fix overflow in presentation of average lock-time Christophe JAILLET (1): usb: gadget: f_tcm: Fix some resource leaks in some error paths Cong Wang (1): tipc: fix uninit skb->data in tipc_nl_compat_dumpit() Cyril Roelandt (1): USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge Dave Chinner (1): xfs: Don't allow logging of XFS_ISTALE inodes David Brazdil (1): KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe Desnes A. Nunes do Rosario (1): selftests/powerpc: Purge extra count_pmc() calls of ebb selftests Dick Kennedy (1): scsi: lpfc: Fix shost refcount mismatch when deleting vport Ding Hui (1): xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed Evan Quan (2): drm/amd/pm: correct Vega10 swctf limit setting drm/amd/pm: correct Vega12 swctf limit setting Evgeny Novikov (1): USB: lvtest: return proper error code in probe Filipe Manana (1): btrfs: fix space cache memory leak after transaction abort George Kennedy (2): fbcon: prevent user font height or width change from causing potential out-of-bounds access vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize() Greg Kroah-Hartman (1): Linux 4.19.143 Hans Verkuil (1): cec-api: prevent leaking memory through hole in structure Hans de Goede (1): HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands Hector Martin (1): ALSA: usb-audio: Update documentation comment for MS2109 quirk Heikki Krogerus (1): device property: Fix the secondary firmware node handling in set_primary_fwnode() Hou Pu (1): null_blk: fix passing of REQ_FUA flag in null_handle_rq Ikjoon Jang (1): HID: quirks: add NOGET quirk for Logitech GROUP Jan Kara (4): ext4: don't BUG on inconsistent journal feature writeback: Protect inode->i_io_list with inode->i_lock writeback: Avoid skipping inode writeback writeback: Fix sync livelock due to b_dirty_time processing Jarkko Sakkinen (1): tpm: Unify the mismatching TPM space buffer sizes Jason Baron (1): EDAC/ie31200: Fallback if host bridge device is already initialized Javed Hasan (1): scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del() Jia-Ju Bai (1): media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq() Jing Xiangfeng (1): scsi: iscsi: Do not put host in iscsi_set_flashnode_param() Josef Bacik (1): btrfs: check the right error variable in btrfs_del_dir_entries_in_log Kai-Heng Feng (2): xhci: Do warm-reset when both CAS and XDEV_RESUME are set USB: quirks: Add no-lpm quirk for another Raydium touchscreen Li Guifu (1): f2fs: fix use-after-free issue Li Jun (1): usb: host: xhci: fix ep context print mismatch in debugfs Lukas Czerner (3): jbd2: make sure jh have b_transaction set in refile/unfile_buffer ext4: handle read only external journal device ext4: handle option set by mount flags correctly Lukas Wunner (2): serial: pl011: Fix oops on -EPROBE_DEFER serial: pl011: Don't leak amba_ports entry on driver register error Mahesh Bandewar (1): ipvlan: fix device features Marcos Paulo de Souza (1): btrfs: reset compression level for lzo on remount Mark Tomlinson (1): gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY Miaohe Lin (1): net: Fix potential wrong skb->protocol in skb_vlan_untag() Michael Ellerman (1): powerpc/64s: Don't init FSCR_DSCR in __init_FSCR() Mike Christie (1): scsi: fcoe: Fix I/O path allocation Ming Lei (1): blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART Navid Emamdoost (4): drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms drm/amd/display: fix ref count leak in amdgpu_drm_ioctl drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails Necip Fazil Yildiran (1): net: qrtr: fix usage of idr in port assignment to socket Peilin Ye (2): net/smc: Prevent kernel-infoleak in __smc_diag_dump() HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage() Peng Fan (1): mips/vdso: Fix resource leaks in genvdso.c Qiushi Wu (5): ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt ASoC: img-parallel-out: Fix a reference count leak ASoC: tegra: Fix reference count leaks. drm/amdkfd: Fix reference count leaks. PCI: Fix pci_create_slot() reference count leak Qu Wenruo (1): btrfs: file: reserve qgroup space after the hole punch range is locked Quinn Tran (1): scsi: qla2xxx: Fix null pointer access during disconnect from subsystem Rafael J. Wysocki (1): PM: sleep: core: Fix the handling of pending runtime resume requests Randy Dunlap (1): ALSA: pci: delete repeated words in comments Reto Schneider (1): rtlwifi: rtl8192cu: Prevent leaking urb Rob Clark (1): drm/msm/adreno: fix updating ring fence Robin Murphy (1): iommu/iova: Don't BUG on invalid PFNs Saurav Kashyap (2): scsi: qla2xxx: Check if FW supports MQ before enabling Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command" Sean Young (1): media: gpio-ir-tx: improve precision of transmitted signal due to scheduling Sergey Senozhatsky (1): serial: 8250: change lock order in serial8250_do_startup() Shay Agroskin (1): net: ena: Make missed_tx stat incremental Stanley Chu (2): scsi: ufs: Fix possible infinite loop in ufshcd_hold scsi: ufs: Clean up completed request without interrupt notification Stephan Gerhold (1): arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep Sumera Priyadarsini (1): net: gianfar: Add of_node_put() before goto statement Sylwester Nawrocki (1): ASoC: wm8994: Avoid attempts to read unreadable registers Tamseel Shams (1): serial: samsung: Removes the IRQ not found warning Tang Bin (1): usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe() Tetsuo Handa (1): vt: defer kfree() of vc_screenbuf in vc_do_resize() Thinh Nguyen (4): usb: uas: Add quirk for PNY Pro Elite usb: dwc3: gadget: Don't setup more than requested usb: dwc3: gadget: Fix handling ZLP usb: dwc3: gadget: Handle ZLP for sg requests Thomas Gleixner (2): XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information. genirq/matrix: Deal with the sillyness of for_each_cpu() on UP Tianjia Zhang (1): nvme-fc: Fix wrong return value in __nvme_fc_init_request() Tom Rix (1): USB: cdc-acm: rework notification_buffer resizing Valmer Huhn (1): serial: 8250_exar: Fix number of ports for Commtech PCIe cards Vineeth Vijayan (1): s390/cio: add cond_resched() in the slow_eval_known_fn() loop Wolfram Sang (1): i2c: rcar: in slave mode, clear NACK earlier Xianting Tian (1): fs: prevent BUG_ON in submit_bh_wbc() Xiubo Li (1): ceph: fix potential mdsc use-after-free crash Yangbo Lu (1): ARM: dts: ls1021a: output PPS signal on FIPER2 Zhi Chen (1): Revert "ath10k: fix DMA related firmware crashes on multiple devices" qiuguorui1 (1): irqchip/stm32-exti: Avoid losing interrupts due to clearing pending bits by mistake Makefile | 2 +- arch/arm/boot/dts/ls1021a.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +- arch/arm64/kvm/hyp/switch.c | 2 +- arch/mips/vdso/genvdso.c | 10 ++ arch/powerpc/kernel/cpu_setup_power.S | 2 +- arch/powerpc/perf/core-book3s.c | 4 + arch/powerpc/platforms/cell/Kconfig | 1 + arch/powerpc/sysdev/xive/native.c | 2 + block/blk-mq-sched.c | 9 ++ block/blk-mq.c | 9 ++ drivers/base/core.c | 12 +- drivers/base/power/main.c | 16 +- drivers/block/null_blk_main.c | 2 +- drivers/char/tpm/tpm-chip.c | 9 +- drivers/char/tpm/tpm.h | 6 +- drivers/char/tpm/tpm2-space.c | 26 ++-- drivers/char/tpm/tpmrm-dev.c | 2 +- drivers/edac/ie31200_edac.c | 50 +++++- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 20 ++- .../drm/amd/powerplay/hwmgr/vega10_thermal.c | 7 +- .../drm/amd/powerplay/hwmgr/vega12_thermal.c | 6 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- drivers/gpu/drm/radeon/radeon_connectors.c | 20 ++- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 22 +-- drivers/hid/usbhid/hiddev.c | 4 + drivers/i2c/busses/i2c-rcar.c | 1 + drivers/iommu/iova.c | 4 +- drivers/irqchip/irq-stm32-exti.c | 14 +- drivers/media/cec/cec-api.c | 8 +- drivers/media/pci/ttpci/av7110.c | 5 +- drivers/media/rc/gpio-ir-tx.c | 7 +- drivers/mfd/intel-lpss-pci.c | 3 + drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- drivers/net/ethernet/freescale/gianfar.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ipvlan/ipvlan_main.c | 27 +++- drivers/net/macvlan.c | 21 ++- drivers/net/wireless/ath/ath10k/hw.h | 2 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +- drivers/nvme/host/fc.c | 4 +- drivers/pci/slot.c | 6 +- drivers/s390/cio/css.c | 5 + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 26 +--- drivers/scsi/qla2xxx/qla_mbx.c | 8 - drivers/scsi/qla2xxx/qla_nvme.c | 5 + drivers/scsi/qla2xxx/qla_os.c | 5 + drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/scsi/ufs/ufshcd.c | 14 +- drivers/spi/spi-stm32.c | 3 +- drivers/target/target_core_user.c | 9 +- drivers/tty/serial/8250/8250_exar.c | 24 ++- drivers/tty/serial/8250/8250_port.c | 9 +- drivers/tty/serial/amba-pl011.c | 16 +- drivers/tty/serial/samsung.c | 8 +- drivers/tty/vt/vt.c | 5 +- drivers/tty/vt/vt_ioctl.c | 12 +- drivers/usb/class/cdc-acm.c | 22 ++- drivers/usb/core/quirks.c | 7 + drivers/usb/dwc3/gadget.c | 104 ++++++++++--- drivers/usb/gadget/function/f_ncm.c | 81 ++++++++-- drivers/usb/gadget/function/f_tcm.c | 7 +- drivers/usb/gadget/u_f.h | 38 +++-- drivers/usb/host/ohci-exynos.c | 5 +- drivers/usb/host/xhci-debugfs.c | 8 +- drivers/usb/host/xhci-hub.c | 19 +-- drivers/usb/host/xhci.c | 3 +- drivers/usb/misc/lvstest.c | 2 +- drivers/usb/misc/sisusbvga/sisusb.c | 2 +- drivers/usb/misc/yurex.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- drivers/usb/storage/unusual_uas.h | 14 ++ drivers/video/fbdev/core/fbcon.c | 25 ++- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +- drivers/xen/events/events_base.c | 16 +- fs/btrfs/disk-io.c | 1 + fs/btrfs/file.c | 8 +- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/super.c | 1 + fs/btrfs/tree-log.c | 10 +- fs/buffer.c | 9 ++ fs/ceph/mds_client.c | 14 +- fs/ext4/super.c | 147 ++++++++++++------ fs/f2fs/f2fs.h | 4 +- fs/f2fs/inline.c | 19 ++- fs/f2fs/node.c | 6 +- fs/f2fs/recovery.c | 10 +- fs/f2fs/super.c | 5 +- fs/fs-writeback.c | 83 +++++----- fs/jbd2/transaction.c | 10 ++ fs/xfs/xfs_icache.c | 3 +- fs/xfs/xfs_inode.c | 25 ++- fs/xfs/xfs_trans_inode.c | 2 + include/linux/efi.h | 4 + include/linux/fs.h | 8 +- include/trace/events/writeback.h | 13 +- kernel/irq/matrix.c | 7 + kernel/locking/lockdep_proc.c | 2 +- net/core/skbuff.c | 4 +- net/ipv6/ip6_tunnel.c | 10 +- net/qrtr/qrtr.c | 20 +-- net/smc/smc_diag.c | 16 +- net/tipc/netlink_compat.c | 12 +- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/ice1712/prodigy192.c | 2 +- sound/pci/oxygen/xonar_dg.c | 2 +- sound/soc/codecs/wm8958-dsp2.c | 4 + sound/soc/img/img-i2s-in.c | 4 +- sound/soc/img/img-parallel-out.c | 4 +- sound/soc/tegra/tegra30_ahub.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 4 +- sound/usb/quirks-table.h | 4 +- .../powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 - .../selftests/powerpc/pmu/ebb/cycles_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 - tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 - .../pmu/ebb/ebb_on_willing_child_test.c | 2 - .../powerpc/pmu/ebb/lost_exception_test.c | 1 - .../powerpc/pmu/ebb/multi_counter_test.c | 7 - .../powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 - .../powerpc/pmu/ebb/pmae_handling_test.c | 2 - .../powerpc/pmu/ebb/pmc56_overflow_test.c | 2 - 142 files changed, 1037 insertions(+), 442 deletions(-) -- 2.25.1

1 120

[PATCH 01/37] arm64/ascend: enable ascend features for Ascend910 platform
by Yang Yingliang 22 Sep '20

22 Sep '20

From: Ding Tianhong <dingtianhong(a)huawei.com> ascend inclusion category: feature bugzilla: NA CVE: NA ------------------------------------------------- The Ascend910 platform only use the acpi mode to boot system, the oem message is recorded in the oem_table_id of IORT table, so use the oem message to enable the ascend features. Signed-off-by: Ding Tianhong <dingtianhong(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/mm/init.c | 7 ++++++- drivers/acpi/arm64/iort.c | 24 ++++++++++++++++++++++++ include/linux/init.h | 7 +++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 883350f9cc42..f23da539a476 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -769,7 +769,7 @@ __setup("keepinitrd", keepinitrd_setup); #endif #ifdef CONFIG_ASCEND_FEATURES -static int __init ascend_enable_setup(char *__unused) +void ascend_enable_all_features(void) { if (IS_ENABLED(CONFIG_ASCEND_DVPP_MMAP)) enable_mmap_dvpp = 1; @@ -782,6 +782,11 @@ static int __init ascend_enable_setup(char *__unused) if (IS_ENABLED(CONFIG_SUSPEND)) mem_sleep_current = PM_SUSPEND_ON; +} + +static int __init ascend_enable_setup(char *__unused) +{ + ascend_enable_all_features(); return 1; } diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 5a724bdb4a4d..7408ffab7303 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -25,6 +25,7 @@ #include <linux/pci.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/init.h> #define IORT_TYPE_MASK(type) (1 << (type)) #define IORT_MSI_TYPE (1 << ACPI_IORT_NODE_ITS_GROUP) @@ -1639,6 +1640,26 @@ static void __init iort_init_platform_devices(void) } } +/* + * This function detects the ascend platform by oem table id. + */ +static bool ascend_platform_detected(struct acpi_table_header *h) +{ + if (!memcmp(h->oem_table_id, "HI19801P", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + if (!memcmp(h->oem_table_id, "HI19802P", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + if (!memcmp(h->oem_table_id, "HI19804P", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + if (!memcmp(h->oem_table_id, "HI1980\0\0", ACPI_OEM_TABLE_ID_SIZE)) + return true; + + return false; +} + void __init acpi_iort_init(void) { acpi_status status; @@ -1654,5 +1675,8 @@ void __init acpi_iort_init(void) return; } + if (ascend_platform_detected(iort_table)) + ascend_enable_all_features(); + iort_init_platform_devices(); } diff --git a/include/linux/init.h b/include/linux/init.h index 2538d176dd1f..e6f970ac7bf4 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -306,4 +306,11 @@ void __init parse_early_options(char *cmdline); #define __exit_p(x) NULL #endif +#ifndef __ASSEMBLY__ +#ifdef CONFIG_ASCEND_FEATURES +extern void ascend_enable_all_features(void); +#else +static inline void ascend_enable_all_features(void) { } +#endif +#endif #endif /* _LINUX_INIT_H */ -- 2.25.1

1 36

[PATCH] export walk_page_range and tlb flush function
by Miaohe Lin 18 Sep '20

18 Sep '20

From: yanxiaodan <yanxiaodan(a)huawei.com> Export walk_page_range,__kvm_tlb_flush_vmid and flush_tlb_mm_range, so that memory-scan module can use these functions to scan the memory pages and flush TLB. memory-scan link: https://gitee.com/openeuler/memory-scan Signed-off-by: yanxiaodan <yanxiaodan(a)huawei.com> --- arch/arm64/kvm/hyp/tlb.c | 1 + arch/x86/mm/tlb.c | 2 +- mm/pagewalk.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/tlb.c b/arch/arm64/kvm/hyp/tlb.c index d063a57..7158622 100644 --- a/arch/arm64/kvm/hyp/tlb.c +++ b/arch/arm64/kvm/hyp/tlb.c @@ -205,6 +205,7 @@ void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm) __tlb_switch_to_host(kvm, &cxt); } +EXPORT_SYMBOL(__kvm_tlb_flush_vmid); void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu) { diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 1a3569b..be19bf5 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -945,7 +945,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, put_flush_tlb_info(); put_cpu(); } - +EXPORT_SYMBOL(flush_tlb_mm_range); static void do_flush_tlb_all(void *info) { diff --git a/mm/pagewalk.c b/mm/pagewalk.c index e81640d..44a9ab1 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -430,6 +430,7 @@ int walk_page_range(struct mm_struct *mm, unsigned long start, } while (start = next, start < end); return err; } +EXPORT_SYMBOL(walk_page_range); /* * Similar to walk_page_range() but can walk any page tables even if they are -- 1.8.3.1

1 0

【Meeting Notice】openEuler kernel sig meeting Time: 2020-09-18 10:00-12:00
by Meeting Book 17 Sep '20

17 Sep '20

5 7

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

15 Sep '20

hulk inclusion category: tools bugzilla: NA CVE: NA Link: https://gitee.com/src-openeuler/kernel/issues/I1SMDG ------------------------------------------------- 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

3 2

[PATCH] arm64: configs: enable CONFIG_NUMA_AWARE_SPINLOCKS
by Yang Yingliang 15 Sep '20

15 Sep '20

hulk inclusion category: feature CVE: NA ----------------------- enable CONFIG_NUMA_AWARE_SPINLOCKS. 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/configs/euleros_defconfig | 3 ++- arch/arm64/configs/hulk_defconfig | 2 +- arch/arm64/configs/openeuler_defconfig | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/euleros_defconfig b/arch/arm64/configs/euleros_defconfig index 09c604738074..2762ee8afe05 100644 --- a/arch/arm64/configs/euleros_defconfig +++ b/arch/arm64/configs/euleros_defconfig @@ -418,6 +418,7 @@ CONFIG_ARM64_ERR_RECOV=y CONFIG_MPAM=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=3 +CONFIG_NUMA_AWARE_SPINLOCKS=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y @@ -440,7 +441,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_SECCOMP=y CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 9952d0b89744..4979492bb484 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -440,7 +440,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_SECCOMP=y CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index beb292fa9b47..809350e03968 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -421,7 +421,7 @@ CONFIG_ARM64_ERR_RECOV=y CONFIG_MPAM=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=4 -# CONFIG_NUMA_AWARE_SPINLOCKS is not set +CONFIG_NUMA_AWARE_SPINLOCKS=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -- 2.25.1

1 0

[PATCH 1/2] random: only read from /dev/random after its pool has received 128 bits
by Yang Yingliang 15 Sep '20

15 Sep '20

From: Theodore Ts'o <tytso(a)mit.edu> mainline inclusion from mainline-v5.2-rc1 commit eb9d1bf079bb438d1a066d72337092935fc770f6 category: bugfix bugzilla: NA CVE: NA https://gitee.com/openeuler/kernel/issues/I1CVQ4?from=project-issue ------------------------------------------------- Immediately after boot, we allow reads from /dev/random before its entropy pool has been fully initialized. Fix this so that we don't allow this until the blocking pool has received 128 bits. We do this by repurposing the initialized flag in the entropy pool struct, and use the initialized flag in the blocking pool to indicate whether it is safe to pull from the blocking pool. To do this, we needed to rework when we decide to push entropy from the input pool to the blocking pool, since the initialized flag for the input pool was used for this purpose. To simplify things, we no longer use the initialized flag for that purpose, nor do we use the entropy_total field any more. Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> 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> --- drivers/char/random.c | 44 +++++++++++++++++------------------ include/trace/events/random.h | 13 ++++------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 6a5d4dfafc47..750d2ab2ac54 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -471,7 +471,6 @@ struct entropy_store { unsigned short add_ptr; unsigned short input_rotate; int entropy_count; - int entropy_total; unsigned int initialized:1; unsigned int last_data_init:1; __u8 last_data[EXTRACT_SIZE]; @@ -644,7 +643,7 @@ static void process_random_ready_list(void) */ static void credit_entropy_bits(struct entropy_store *r, int nbits) { - int entropy_count, orig; + int entropy_count, orig, has_initialized = 0; const int pool_size = r->poolinfo->poolfracbits; int nfrac = nbits << ENTROPY_SHIFT; @@ -699,23 +698,25 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) entropy_count = 0; } else if (entropy_count > pool_size) entropy_count = pool_size; + if ((r == &blocking_pool) && !r->initialized && + (entropy_count >> ENTROPY_SHIFT) > 128) + has_initialized = 1; if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig) goto retry; - r->entropy_total += nbits; - if (!r->initialized && r->entropy_total > 128) { + if (has_initialized) r->initialized = 1; - r->entropy_total = 0; - } trace_credit_entropy_bits(r->name, nbits, - entropy_count >> ENTROPY_SHIFT, - r->entropy_total, _RET_IP_); + entropy_count >> ENTROPY_SHIFT, _RET_IP_); if (r == &input_pool) { int entropy_bits = entropy_count >> ENTROPY_SHIFT; + struct entropy_store *other = &blocking_pool; - if (crng_init < 2 && entropy_bits >= 128) { + if (crng_init < 2) { + if (entropy_bits < 128) + return; crng_reseed(&primary_crng, r); entropy_bits = r->entropy_count >> ENTROPY_SHIFT; } @@ -726,20 +727,14 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) wake_up_interruptible(&random_read_wait); kill_fasync(&fasync, SIGIO, POLL_IN); } - /* If the input pool is getting full, send some - * entropy to the blocking pool until it is 75% full. + /* If the input pool is getting full, and the blocking + * pool has room, send some entropy to the blocking + * pool. */ - if (entropy_bits > random_write_wakeup_bits && - r->initialized && - r->entropy_total >= 2*random_read_wakeup_bits) { - struct entropy_store *other = &blocking_pool; - - if (other->entropy_count <= - 3 * other->poolinfo->poolfracbits / 4) { - schedule_work(&other->push_work); - r->entropy_total = 0; - } - } + if (!work_pending(&other->push_work) && + (ENTROPY_BITS(r) > 6 * r->poolinfo->poolbytes) && + (ENTROPY_BITS(other) <= 6 * other->poolinfo->poolbytes)) + schedule_work(&other->push_work); } } @@ -1558,6 +1553,11 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf, int large_request = (nbytes > 256); trace_extract_entropy_user(r->name, nbytes, ENTROPY_BITS(r), _RET_IP_); + if (!r->initialized && r->pull) { + xfer_secondary_pool(r, ENTROPY_BITS(r->pull)/8); + if (!r->initialized) + return 0; + } xfer_secondary_pool(r, nbytes); nbytes = account(r, nbytes, 0, 0); diff --git a/include/trace/events/random.h b/include/trace/events/random.h index 0560dfc33f1c..32c10a515e2d 100644 --- a/include/trace/events/random.h +++ b/include/trace/events/random.h @@ -62,15 +62,14 @@ DEFINE_EVENT(random__mix_pool_bytes, mix_pool_bytes_nolock, TRACE_EVENT(credit_entropy_bits, TP_PROTO(const char *pool_name, int bits, int entropy_count, - int entropy_total, unsigned long IP), + unsigned long IP), - TP_ARGS(pool_name, bits, entropy_count, entropy_total, IP), + TP_ARGS(pool_name, bits, entropy_count, IP), TP_STRUCT__entry( __field( const char *, pool_name ) __field( int, bits ) __field( int, entropy_count ) - __field( int, entropy_total ) __field(unsigned long, IP ) ), @@ -78,14 +77,12 @@ TRACE_EVENT(credit_entropy_bits, __entry->pool_name = pool_name; __entry->bits = bits; __entry->entropy_count = entropy_count; - __entry->entropy_total = entropy_total; __entry->IP = IP; ), - TP_printk("%s pool: bits %d entropy_count %d entropy_total %d " - "caller %pS", __entry->pool_name, __entry->bits, - __entry->entropy_count, __entry->entropy_total, - (void *)__entry->IP) + TP_printk("%s pool: bits %d entropy_count %d caller %pS", + __entry->pool_name, __entry->bits, + __entry->entropy_count, (void *)__entry->IP) ); TRACE_EVENT(push_to_pool, -- 2.25.1

1 1

[PATCH 0/6] Support E0PD
by Yang Yingliang 14 Sep '20

14 Sep '20

Chen Jun (1): config: set default value of CONFIG_ARM64_E0PD Mark Brown (4): arm64: Add initial support for E0PD arm64: Factor out checks for KASLR in KPTI code into separate function arm64: Don't use KPTI where we have E0PD arm64: Use a variable to store non-global mappings decision Will Deacon (1): arm64: kpti: Fix "kpti=off" when KASLR is enabled arch/arm64/Kconfig | 16 +++++++ arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 2 + arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/mmu.h | 4 +- arch/arm64/include/asm/pgtable-hwdef.h | 2 + arch/arm64/include/asm/pgtable-prot.h | 6 ++- arch/arm64/include/asm/sysreg.h | 1 + arch/arm64/kernel/cpufeature.c | 61 ++++++++++++++++++++++++-- arch/arm64/kernel/setup.c | 7 +++ 11 files changed, 95 insertions(+), 9 deletions(-) -- 2.25.1

1 6