April 2018 - Linux-stable-mirror

v4.14.35 build: 11 failures 4 warnings (v4.14.35)

by Build bot for Mark Brown

Tree/Branch: v4.14.35 Git describe: v4.14.35 Commit: 672f07d827 Linux 4.14.35 Build Time: 0 min 27 sec Passed: 0 / 11 ( 0.00 %) Failed: 11 / 11 (100.00 %) Errors: 2 Warnings: 4 Section Mismatches: 0 Failed defconfigs: arm-multi_v5_defconfig arm-multi_v7_defconfig arm-allmodconfig arm-multi_v4t_defconfig arm-allnoconfig arm64-defconfig Errors: arm-multi_v5_defconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token arm-multi_v7_defconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token arm-allmodconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token arm-multi_v4t_defconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token arm-allnoconfig orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token arm64-defconfig orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 4 warnings 0 mismatches : arm-allnoconfig ------------------------------------------------------------------------------- Errors summary: 2 6 orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory 5 ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token Warnings Summary: 4 1 ../arch/arm/include/asm/barrier.h:9:5: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] 1 ../arch/arm/include/asm/barrier.h:20:35: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] 1 ../arch/arm/include/asm/barrier.h:16:5: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] 1 ../arch/arm/include/asm/barrier.h:10:3: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- arm-multi_v5_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- arm-multi_v7_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- arm-allmodconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- arm-multi_v4t_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- arm-allnoconfig : FAIL, 4 errors, 4 warnings, 0 section mismatches Errors: orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token Warnings: ../arch/arm/include/asm/barrier.h:9:5: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] ../arch/arm/include/asm/barrier.h:10:3: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] ../arch/arm/include/asm/barrier.h:16:5: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] ../arch/arm/include/asm/barrier.h:20:35: warning: "__LINUX_ARM_ARCH__" is not defined [-Wundef] ------------------------------------------------------------------------------- arm64-defconfig : FAIL, 3 errors, 0 warnings, 0 section mismatches Errors: orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: x86_64-allnoconfig arm64-allnoconfig arm64-allmodconfig x86_64-allmodconfig x86_64-defconfig

6 years, 9 months

2
1
0 0

FAILED: patch "[PATCH] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9c305eb442f3b371fc722ade827bbf673514123e Mon Sep 17 00:00:00 2001 From: Neil Armstrong <narmstrong(a)baylibre.com> Date: Fri, 23 Feb 2018 12:44:37 +0100 Subject: [PATCH] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs The Amlogic Meson GX SoCs, embedded the v2.01a controller, has been also identified needing this workaround. This patch adds the corresponding version to enable a single iteration for this specific version. Fixes: be41fc55f1aa ("drm: bridge: dw-hdmi: Handle overflow workaround based on device version") Acked-by: Archit Taneja <architt(a)codeaurora.org> [narmstrong: s/identifies/identified and rebased against Jernej's change] Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> Link: https://patchwork.freedesktop.org/patch/msgid/1519386277-25902-1-git-send-e… diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index f9802399cc0d..53ebbe2904b6 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1654,6 +1654,8 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) * (v1.31a) and multiple Allwinner SoCs (v1.32a) have been identified * as needing the workaround, with 4 iterations for v1.30a and 1 * iteration for others. + * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing + * the workaround with a single iteration. */ switch (hdmi->version) { @@ -1662,6 +1664,7 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) break; case 0x131a: case 0x132a: + case 0x201a: count = 1; break; default:

6 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic" failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9c305eb442f3b371fc722ade827bbf673514123e Mon Sep 17 00:00:00 2001 From: Neil Armstrong <narmstrong(a)baylibre.com> Date: Fri, 23 Feb 2018 12:44:37 +0100 Subject: [PATCH] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs The Amlogic Meson GX SoCs, embedded the v2.01a controller, has been also identified needing this workaround. This patch adds the corresponding version to enable a single iteration for this specific version. Fixes: be41fc55f1aa ("drm: bridge: dw-hdmi: Handle overflow workaround based on device version") Acked-by: Archit Taneja <architt(a)codeaurora.org> [narmstrong: s/identifies/identified and rebased against Jernej's change] Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> Link: https://patchwork.freedesktop.org/patch/msgid/1519386277-25902-1-git-send-e… diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index f9802399cc0d..53ebbe2904b6 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1654,6 +1654,8 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) * (v1.31a) and multiple Allwinner SoCs (v1.32a) have been identified * as needing the workaround, with 4 iterations for v1.30a and 1 * iteration for others. + * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing + * the workaround with a single iteration. */ switch (hdmi->version) { @@ -1662,6 +1664,7 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) break; case 0x131a: case 0x132a: + case 0x201a: count = 1; break; default:

6 years, 9 months

1
0
0 0

Linux 4.14.35

by Greg KH

I'm announcing the release of the 4.14.35 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/parisc/kernel/drivers.c | 4 + arch/parisc/kernel/hpmc.S | 6 + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 - arch/s390/kernel/ipl.c | 1 arch/x86/include/asm/mce.h | 3 arch/x86/kernel/cpu/mcheck/mce.c | 4 - arch/x86/kernel/cpu/mcheck/mce_amd.c | 54 +++++++++++++++- block/blk-mq-cpumap.c | 5 - drivers/acpi/nfit/core.c | 22 ++++-- drivers/block/loop.c | 12 ++- drivers/bluetooth/hci_bcm.c | 20 ------ drivers/edac/mce_amd.c | 11 ++- drivers/gpu/drm/radeon/radeon_object.c | 3 drivers/hv/channel_mgmt.c | 2 drivers/hwmon/ina2xx.c | 3 drivers/media/platform/vsp1/vsp1_dl.c | 3 drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 - drivers/net/slip/slhc.c | 5 + drivers/net/usb/cdc_ether.c | 6 + drivers/net/usb/lan78xx.c | 3 drivers/net/wireless/ath/ath9k/xmit.c | 4 + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 drivers/pci/host/pci-hyperv.c | 34 +++++----- drivers/s390/cio/qdio_main.c | 42 ++++++------- drivers/scsi/qla2xxx/qla_os.c | 44 ++++++------- drivers/vhost/vhost.c | 10 +-- drivers/xen/xenbus/xenbus_dev_frontend.c | 2 fs/f2fs/gc.c | 5 - fs/f2fs/segment.c | 3 fs/hugetlbfs/inode.c | 10 ++- fs/namei.c | 3 fs/nfsd/nfs4proc.c | 12 +++ fs/nfsd/nfs4xdr.c | 8 -- fs/nfsd/xdr4.h | 2 fs/overlayfs/namei.c | 9 ++ include/net/bluetooth/hci_core.h | 2 include/net/slhc_vj.h | 1 kernel/events/core.c | 6 + lib/bitmap.c | 2 lib/test_bitmap.c | 4 + mm/gup.c | 5 + net/bluetooth/hci_conn.c | 29 ++++++--- net/bluetooth/hci_event.c | 15 +++- net/bluetooth/l2cap_core.c | 2 net/netfilter/ipset/ip_set_core.c | 2 net/rds/send.c | 15 +++- net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 security/apparmor/apparmorfs.c | 4 - security/apparmor/include/audit.h | 8 +- security/apparmor/include/sig_names.h | 4 - security/apparmor/ipc.c | 2 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 64 +++++++++----------- tools/perf/util/intel-pt-decoder/intel-pt-decoder.h | 2 tools/perf/util/intel-pt.c | 37 +++++++++-- 55 files changed, 360 insertions(+), 214 deletions(-) Adrian Hunter (4): perf intel-pt: Fix overlap detection to identify consecutive buffers correctly perf intel-pt: Fix sync_switch perf intel-pt: Fix error recovery from missing TIP packet perf intel-pt: Fix timestamp following overflow Al Viro (1): getname_kernel() needs to make sure that ->name != ->iname in long case Amir Goldstein (1): ovl: fix lookup with middle layer opaque dir and absolute path redirects Arnd Bergmann (1): radeon: hide pointless #warning when compile testing Bassem Boubaker (1): cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN Bill Kuzeja (1): scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure Dan Williams (1): nfit: fix region registration vs block-data-window ranges Dexuan Cui (2): Drivers: hv: vmbus: do not mark HV_PCIE as perf_device PCI: hv: Serialize the present and eject work items Eric Auger (1): vhost: Fix vhost_copy_to_user() Eric Biggers (1): sunrpc: remove incorrect HMAC request initialization Greg Kroah-Hartman (1): Linux 4.14.35 Hans de Goede (1): Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low Helge Deller (2): parisc: Fix out of array access in match_pci_device() parisc: Fix HPMC handler by increasing size to multiple of 16 bytes J. Bruce Fields (1): nfsd: fix incorrect umasks John Johansen (3): apparmor: fix logging of the existence test for signals apparmor: fix display of .ns_name for containers apparmor: fix resource audit messages when auditing peer Jozsef Kadlecsik (1): netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit() Julian Wiedmann (2): s390/qdio: don't retry EQBS after CCQ 96 s390/qdio: don't merge ERROR output buffers Ka-Cheong Poon (1): rds: MP-RDS may use an invalid c_path Kieran Bingham (1): media: v4l: vsp1: Fix header display list status check in continuous mode Marek Szyprowski (1): hwmon: (ina2xx) Fix access to uninitialized mutex Mauro Carvalho Chehab (1): media: v4l2-compat-ioctl32: don't oops on overlay Michael S. Tsirkin (1): get_user_pages_fast(): return -EFAULT on access_ok failure Mike Kravetz (1): hugetlbfs: fix bug in pgoff overflow checking Ming Lei (1): blk-mq: don't keep offline CPUs mapped to hctx 0 Nicholas Piggin (1): KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode Phil Elwell (1): lan78xx: Correctly indicate invalid OTP Prashant Bhole (1): perf/core: Fix use-after-free in uprobe_perf_close() Simon Gaiser (1): xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling Stefan Hajnoczi (1): vhost: fix vhost_vq_access_ok() log check Sudhir Sreedharan (1): rtl8187: Fix NULL pointer dereference in priv->conf_mutex Szymon Janc (1): Bluetooth: Fix connection if directed advertising and privacy is used Tejaswi Tanikella (1): slip: Check if rstate is initialized before uncompressing Tetsuo Handa (1): block/loop: fix deadlock after loop_set_status Toke Høiland-Jørgensen (1): ath9k: Protect queue draining by rcu_read_lock() Vasily Gorbik (1): s390/ipl: ensure loadparm valid flag is set Yazen Ghannam (5): x86/MCE/AMD: Define a function to get SMCA bank type x86/MCE: Report only DRAM ECC as memory errors on AMD systems x86/mce/AMD: Pass the bank number to smca_get_bank_type() x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type x86/mce/AMD: Get address from already initialized block Yunlong Song (1): f2fs: fix heap mode to reset it back Yury Norov (1): lib: fix stall in __bitmap_parselist()

6 years, 9 months

1
1
0 0

Linux 4.15.18

by Greg KH

----------------------------- NOTE, this is the last release of the 4.15.y kernel. It is now end-of-life. Please move to the 4.16.y kernel tree at this point in time. ----------------------------- I'm announcing the release of the 4.15.18 kernel. All users of the 4.15 kernel series must upgrade. The updated 4.15.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.15.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/parisc/kernel/drivers.c | 4 arch/parisc/kernel/hpmc.S | 6 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 arch/s390/kernel/compat_signal.c | 2 arch/s390/kernel/ipl.c | 1 arch/x86/include/asm/apic.h | 4 arch/x86/kernel/acpi/boot.c | 13 - arch/x86/kernel/apic/apic_common.c | 2 arch/x86/kernel/apic/apic_numachip.c | 2 arch/x86/kernel/apic/x2apic.h | 2 arch/x86/kernel/apic/x2apic_phys.c | 2 arch/x86/kernel/apic/x2apic_uv_x.c | 2 arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 + arch/x86/xen/apic.c | 2 block/blk-core.c | 4 block/blk-mq-cpumap.c | 5 block/blk-mq.c | 21 - drivers/acpi/nfit/core.c | 22 +- drivers/block/loop.c | 12 - drivers/bluetooth/hci_bcm.c | 20 - drivers/char/ipmi/ipmi_si_intf.c | 18 + drivers/gpu/drm/i915/intel_dp_link_training.c | 26 +- drivers/hv/channel_mgmt.c | 2 drivers/hwmon/ina2xx.c | 3 drivers/media/platform/vsp1/vsp1_dl.c | 3 drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 drivers/net/slip/slhc.c | 5 drivers/net/usb/cdc_ether.c | 6 drivers/net/usb/lan78xx.c | 3 drivers/net/wireless/ath/ath9k/xmit.c | 4 drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 drivers/nvme/host/core.c | 1 drivers/pci/host/pci-hyperv.c | 92 ++++++-- drivers/s390/cio/qdio_main.c | 42 ++- drivers/scsi/qla2xxx/qla_os.c | 44 +--- drivers/vhost/vhost.c | 10 drivers/xen/xenbus/xenbus_dev_frontend.c | 2 fs/f2fs/gc.c | 5 fs/f2fs/segment.c | 3 fs/hugetlbfs/inode.c | 10 fs/namei.c | 3 fs/nfsd/nfs4proc.c | 12 - fs/nfsd/nfs4xdr.c | 8 fs/nfsd/xdr4.h | 2 fs/overlayfs/inode.c | 7 fs/overlayfs/namei.c | 9 include/net/bluetooth/hci_core.h | 2 include/net/slhc_vj.h | 1 kernel/events/core.c | 6 lib/bitmap.c | 2 lib/test_bitmap.c | 4 mm/gup.c | 5 mm/gup_benchmark.c | 4 net/bluetooth/hci_conn.c | 29 +- net/bluetooth/hci_event.c | 15 + net/bluetooth/l2cap_core.c | 2 net/ipv4/ip_gre.c | 6 net/l2tp/l2tp_core.c | 225 +++++++++------------ net/l2tp/l2tp_core.h | 4 net/l2tp/l2tp_netlink.c | 22 +- net/l2tp/l2tp_ppp.c | 9 net/netfilter/ipset/ip_set_core.c | 2 net/rds/send.c | 15 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 security/apparmor/apparmorfs.c | 4 security/apparmor/include/audit.h | 8 security/apparmor/include/sig_names.h | 4 security/apparmor/ipc.c | 2 69 files changed, 503 insertions(+), 344 deletions(-) Al Viro (1): getname_kernel() needs to make sure that ->name != ->iname in long case Amir Goldstein (2): ovl: fix lookup with middle layer opaque dir and absolute path redirects ovl: set lower layer st_dev only if setting lower st_ino Bart Van Assche (1): block: Change a rcu_read_{lock,unlock}_sched() pair into rcu_read_{lock,unlock}() Bassem Boubaker (1): cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN Bill Kuzeja (1): scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure Corey Minyard (1): ipmi: Fix some error cleanup issues Dan Williams (1): nfit: fix region registration vs block-data-window ranges Dexuan Cui (3): Drivers: hv: vmbus: do not mark HV_PCIE as perf_device PCI: hv: Serialize the present and eject work items PCI: hv: Fix 2 hang issues in hv_compose_msi_msg() Eric Auger (1): vhost: Fix vhost_copy_to_user() Eric Biggers (1): sunrpc: remove incorrect HMAC request initialization Greg Kroah-Hartman (1): Linux 4.15.18 Guillaume Nault (2): l2tp: fix races in tunnel creation l2tp: fix race in duplicate tunnel detection Hans de Goede (1): Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low Heiko Carstens (1): s390/compat: fix setup_frame32 Helge Deller (2): parisc: Fix out of array access in match_pci_device() parisc: Fix HPMC handler by increasing size to multiple of 16 bytes J. Bruce Fields (1): nfsd: fix incorrect umasks John Johansen (3): apparmor: fix logging of the existence test for signals apparmor: fix display of .ns_name for containers apparmor: fix resource audit messages when auditing peer Jozsef Kadlecsik (1): netfilter: ipset: Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit() Julian Wiedmann (2): s390/qdio: don't retry EQBS after CCQ 96 s390/qdio: don't merge ERROR output buffers Ka-Cheong Poon (1): rds: MP-RDS may use an invalid c_path Keith Busch (1): nvme: Skip checking heads without namespaces Kieran Bingham (1): media: v4l: vsp1: Fix header display list status check in continuous mode Li RongQing (1): x86/apic: Fix signedness bug in APIC ID validity checks Manasi Navare (1): drm/i915/edp: Do not do link training fallback or prune modes on EDP Marek Szyprowski (1): hwmon: (ina2xx) Fix access to uninitialized mutex Mauro Carvalho Chehab (1): media: v4l2-compat-ioctl32: don't oops on overlay Michael S. Tsirkin (2): get_user_pages_fast(): return -EFAULT on access_ok failure mm/gup_benchmark: handle gup failures Mike Kravetz (1): hugetlbfs: fix bug in pgoff overflow checking Ming Lei (2): blk-mq: order getting budget and driver tag blk-mq: don't keep offline CPUs mapped to hctx 0 Nicholas Piggin (1): KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode Phil Elwell (1): lan78xx: Correctly indicate invalid OTP Prashant Bhole (1): perf/core: Fix use-after-free in uprobe_perf_close() Sabrina Dubroca (1): ip_gre: clear feature flags when incompatible o_flags are set Simon Gaiser (1): xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling Stefan Hajnoczi (1): vhost: fix vhost_vq_access_ok() log check Sudhir Sreedharan (1): rtl8187: Fix NULL pointer dereference in priv->conf_mutex Szymon Janc (1): Bluetooth: Fix connection if directed advertising and privacy is used Tejaswi Tanikella (1): slip: Check if rstate is initialized before uncompressing Tetsuo Handa (1): block/loop: fix deadlock after loop_set_status Toke Høiland-Jørgensen (1): ath9k: Protect queue draining by rcu_read_lock() Vasily Gorbik (1): s390/ipl: ensure loadparm valid flag is set Yazen Ghannam (1): x86/mce/AMD: Get address from already initialized block Yunlong Song (1): f2fs: fix heap mode to reset it back Yury Norov (1): lib: fix stall in __bitmap_parselist()

6 years, 9 months

1
1
0 0

Linux 4.16.3

by Greg KH

I'm announcing the release of the 4.16.3 kernel. All users of the 4.16 kernel series must upgrade. The updated 4.16.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.16.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/compressed/misc.c | 9 arch/mips/boot/compressed/decompress.c | 9 arch/parisc/kernel/drivers.c | 4 arch/parisc/kernel/hpmc.S | 6 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 arch/s390/kernel/compat_signal.c | 2 arch/s390/kernel/ipl.c | 1 arch/sh/boot/compressed/misc.c | 9 arch/x86/include/asm/apic.h | 4 arch/x86/include/asm/mce.h | 1 arch/x86/include/uapi/asm/bootparam.h | 18 - arch/x86/kernel/acpi/boot.c | 13 - arch/x86/kernel/apic/apic_common.c | 2 arch/x86/kernel/apic/apic_numachip.c | 2 arch/x86/kernel/apic/x2apic.h | 2 arch/x86/kernel/apic/x2apic_phys.c | 2 arch/x86/kernel/apic/x2apic_uv_x.c | 2 arch/x86/kernel/cpu/mcheck/mce_amd.c | 37 ++- arch/x86/xen/apic.c | 2 block/blk-core.c | 4 block/blk-mq-cpumap.c | 5 block/blk-mq.c | 23 +- block/blk-timeout.c | 2 drivers/acpi/nfit/core.c | 22 + drivers/block/loop.c | 12 - drivers/bluetooth/hci_bcm.c | 20 - drivers/char/ipmi/ipmi_si_intf.c | 18 + drivers/edac/mce_amd.c | 11 drivers/gpu/drm/radeon/radeon_object.c | 3 drivers/hv/channel_mgmt.c | 2 drivers/media/platform/vsp1/vsp1_dl.c | 3 drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 drivers/media/v4l2-core/v4l2-dev.c | 8 drivers/net/slip/slhc.c | 5 drivers/net/usb/cdc_ether.c | 6 drivers/net/usb/lan78xx.c | 3 drivers/net/wireless/ath/ath9k/xmit.c | 4 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 157 +++++++++++++ drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 drivers/nvme/host/core.c | 1 drivers/pci/host/pci-hyperv.c | 92 ++++++-- drivers/s390/cio/qdio_main.c | 42 +-- drivers/sbus/char/oradax.c | 2 drivers/scsi/qla2xxx/qla_os.c | 44 +-- drivers/scsi/scsi_dh.c | 3 drivers/scsi/scsi_lib.c | 2 drivers/vhost/vhost.c | 10 drivers/xen/xenbus/xenbus_dev_frontend.c | 2 fs/f2fs/gc.c | 5 fs/f2fs/segment.c | 3 fs/hugetlbfs/inode.c | 10 fs/namei.c | 3 fs/nfsd/nfs4proc.c | 12 - fs/nfsd/nfs4xdr.c | 8 fs/nfsd/xdr4.h | 2 fs/overlayfs/inode.c | 28 +- fs/overlayfs/namei.c | 17 + fs/overlayfs/util.c | 8 include/media/v4l2-dev.h | 12 - include/net/bluetooth/hci_core.h | 2 include/net/slhc_vj.h | 1 kernel/events/core.c | 6 lib/bitmap.c | 2 lib/test_bitmap.c | 4 mm/gup.c | 5 mm/gup_benchmark.c | 4 net/bluetooth/hci_conn.c | 29 +- net/bluetooth/hci_event.c | 15 - net/bluetooth/l2cap_core.c | 2 net/ipv4/ip_gre.c | 6 net/l2tp/l2tp_core.c | 225 ++++++++------------ net/l2tp/l2tp_core.h | 4 net/l2tp/l2tp_netlink.c | 22 + net/l2tp/l2tp_ppp.c | 9 net/rds/send.c | 15 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 security/apparmor/apparmorfs.c | 4 security/apparmor/include/audit.h | 8 security/apparmor/include/sig_names.h | 4 security/apparmor/ipc.c | 2 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 64 ++--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.h | 2 tools/perf/util/intel-pt.c | 37 ++- 84 files changed, 784 insertions(+), 442 deletions(-) Adrian Hunter (4): perf intel-pt: Fix overlap detection to identify consecutive buffers correctly perf intel-pt: Fix sync_switch perf intel-pt: Fix error recovery from missing TIP packet perf intel-pt: Fix timestamp following overflow Al Viro (1): getname_kernel() needs to make sure that ->name != ->iname in long case Amir Goldstein (3): ovl: fix lookup with middle layer opaque dir and absolute path redirects ovl: set i_ino to the value of st_ino for NFS export ovl: set lower layer st_dev only if setting lower st_ino Arnd Bergmann (1): radeon: hide pointless #warning when compile testing Bart Van Assche (2): block: Change a rcu_read_{lock,unlock}_sched() pair into rcu_read_{lock,unlock}() Revert "scsi: core: return BLK_STS_OK for DID_OK in __scsi_error_from_host_byte()" Bassem Boubaker (1): cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN Bill Kuzeja (1): scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure Corey Minyard (1): ipmi: Fix some error cleanup issues Dan Williams (1): nfit: fix region registration vs block-data-window ranges Dexuan Cui (3): Drivers: hv: vmbus: do not mark HV_PCIE as perf_device PCI: hv: Serialize the present and eject work items PCI: hv: Fix 2 hang issues in hv_compose_msi_msg() Dmitry V. Levin (1): x86/uapi: Fix asm/bootparam.h userspace compilation errors Eric Auger (1): vhost: Fix vhost_copy_to_user() Eric Biggers (1): sunrpc: remove incorrect HMAC request initialization Greg Kroah-Hartman (1): Linux 4.16.3 Guillaume Nault (2): l2tp: fix races in tunnel creation l2tp: fix race in duplicate tunnel detection Hans de Goede (1): Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low Heiko Carstens (1): s390/compat: fix setup_frame32 Helge Deller (2): parisc: Fix out of array access in match_pci_device() parisc: Fix HPMC handler by increasing size to multiple of 16 bytes Huacai Chen (1): zboot: fix stack protector in compressed boot phase J. Bruce Fields (1): nfsd: fix incorrect umasks Johannes Thumshirn (1): scsi: scsi_dh: Don't look for NULL devices handlers by name John Johansen (3): apparmor: fix logging of the existence test for signals apparmor: fix display of .ns_name for containers apparmor: fix resource audit messages when auditing peer Julian Wiedmann (2): s390/qdio: don't retry EQBS after CCQ 96 s390/qdio: don't merge ERROR output buffers Ka-Cheong Poon (1): rds: MP-RDS may use an invalid c_path Keith Busch (1): nvme: Skip checking heads without namespaces Kieran Bingham (1): media: v4l: vsp1: Fix header display list status check in continuous mode Li RongQing (1): x86/apic: Fix signedness bug in APIC ID validity checks Luca Coelho (1): iwlwifi: add a bunch of new 9000 PCI IDs Mauro Carvalho Chehab (2): media: v4l2-core: fix size of devnode_nums[] bitarray media: v4l2-compat-ioctl32: don't oops on overlay Michael S. Tsirkin (2): get_user_pages_fast(): return -EFAULT on access_ok failure mm/gup_benchmark: handle gup failures Mike Kravetz (1): hugetlbfs: fix bug in pgoff overflow checking Ming Lei (3): blk-mq: order getting budget and driver tag blk-mq: make sure that correct hctx->next_cpu is set blk-mq: don't keep offline CPUs mapped to hctx 0 Nicholas Piggin (1): KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode Phil Elwell (1): lan78xx: Correctly indicate invalid OTP Prashant Bhole (1): perf/core: Fix use-after-free in uprobe_perf_close() Rob Gardner (1): sparc64: Properly range check DAX completion index Sabrina Dubroca (1): ip_gre: clear feature flags when incompatible o_flags are set Simon Gaiser (1): xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling Stefan Hajnoczi (1): vhost: fix vhost_vq_access_ok() log check Sudhir Sreedharan (1): rtl8187: Fix NULL pointer dereference in priv->conf_mutex Szymon Janc (1): Bluetooth: Fix connection if directed advertising and privacy is used Tejaswi Tanikella (1): slip: Check if rstate is initialized before uncompressing Tejun Heo (1): blk-mq: Directly schedule q->timeout_work when aborting a request Tetsuo Handa (1): block/loop: fix deadlock after loop_set_status Toke Høiland-Jørgensen (1): ath9k: Protect queue draining by rcu_read_lock() Vasily Gorbik (1): s390/ipl: ensure loadparm valid flag is set Vivek Goyal (1): ovl: Set d->last properly during lookup Yazen Ghannam (3): x86/mce/AMD: Pass the bank number to smca_get_bank_type() x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type x86/mce/AMD: Get address from already initialized block Yunlong Song (1): f2fs: fix heap mode to reset it back Yury Norov (1): lib: fix stall in __bitmap_parselist()

6 years, 9 months

1
1
0 0

v4.15.18 build: 11 failures 0 warnings (v4.15.18)

by Build bot for Mark Brown

Tree/Branch: v4.15.18 Git describe: v4.15.18 Commit: a8ec862fd3 Linux 4.15.18 Build Time: 0 min 30 sec Passed: 0 / 11 ( 0.00 %) Failed: 11 / 11 (100.00 %) Errors: 8 Warnings: 0 Section Mismatches: 0 Failed defconfigs: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig arm-multi_v4t_defconfig x86_64-allmodconfig arm64-defconfig Errors: arm64-allnoconfig ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) arm64-allmodconfig ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) arm-multi_v5_defconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token arm-multi_v7_defconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token x86_64-defconfig ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) arm-allmodconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token arm-allnoconfig orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory arm-multi_v4t_defconfig ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token x86_64-allmodconfig ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) arm64-defconfig orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): ------------------------------------------------------------------------------- Errors summary: 8 6 orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory 5 ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) 5 ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) 5 ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) 5 ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) 5 ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) 5 ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) 4 ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- arm64-allnoconfig : FAIL, 6 errors, 0 warnings, 0 section mismatches Errors: ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) ------------------------------------------------------------------------------- arm64-allmodconfig : FAIL, 6 errors, 0 warnings, 0 section mismatches Errors: ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) ------------------------------------------------------------------------------- arm-multi_v5_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- arm-multi_v7_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- x86_64-defconfig : FAIL, 6 errors, 0 warnings, 0 section mismatches Errors: ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) ------------------------------------------------------------------------------- arm-allmodconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- arm-allnoconfig : FAIL, 3 errors, 0 warnings, 0 section mismatches Errors: orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory ------------------------------------------------------------------------------- arm-multi_v4t_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches Errors: ../arch/arm/include/asm/string.h:45:3: error: expected identifier or '(' before '{' token ------------------------------------------------------------------------------- x86_64-allmodconfig : FAIL, 6 errors, 0 warnings, 0 section mismatches Errors: ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) ------------------------------------------------------------------------------- arm64-defconfig : FAIL, 9 errors, 0 warnings, 0 section mismatches Errors: orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory orc.h:21:27: fatal error: asm/orc_types.h: No such file or directory ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_match_flags' undeclared (first use in this function) ../scripts/mod/file2alias.c:103:45: error: 'OFF_tb_service_id_protocol_key' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_id' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_version' undeclared (first use in this function) ../scripts/mod/file2alias.c:97:68: error: 'OFF_tb_service_id_protocol_revision' undeclared (first use in this function) ../scripts/mod/file2alias.c:111:3: error: 'SIZE_tb_service_id' undeclared here (not in a function) ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: x86_64-allnoconfig

6 years, 9 months

1
0
0 0

[PATCH v4.9.y 00/42] arm64 spectre patches

by Mark Rutland

Hi Greg, These patches backport arm64 spectre mitigations to v4.9.y (based on 4.9.93). I've done this backport from scratch, following the patches in the arm64 kpti branch [1] (which contrary to its name, also has spectre patches intended for backporting). To the best of my understanding the code is correct, in the context of the v4.9.y kernel, and I've tested the series on arm64 hardware available to me, using firmware with SMCCC 1.1 and branch predictor mitigations. I've Cc'd the usual suspects for testing. For anyone willing to test this, I've pushed this out to the stable/4.9.y/spectre branch of my kernel.org repo [2]. Note that I've left off the Qualcomm Falkor patches, as it was pointed out that necessary errata workarounds for Falkor were never backported, and thus I assume that no-one is using v4.9.y on Falkor parts. Shanker, do you have any idea whether people are using v4.9.y on Falkor? Thanks, Mark. [1] https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=kpti [2] git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git stable/4.9.y/spectre Catalin Marinas (1): arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro James Morse (1): arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early Jayachandran C (1): arm64: Branch predictor hardening for Cavium ThunderX2 Laura Abbott (1): mm: Introduce lm_alias Marc Zyngier (20): arm64: Move post_ttbr_update_workaround to C code arm64: Move BP hardening to check_and_switch_context arm64: KVM: Use per-CPU vector when BP hardening is enabled arm64: cpu_errata: Allow an erratum to be match for all revisions of a core arm64: KVM: Increment PC after handling an SMC trap arm/arm64: KVM: Consolidate the PSCI include files arm/arm64: KVM: Add PSCI_VERSION helper arm/arm64: KVM: Add smccc accessors to PSCI code arm/arm64: KVM: Implement PSCI 1.0 support arm/arm64: KVM: Advertise SMCCC v1.1 arm64: KVM: Make PSCI_VERSION a fast path arm/arm64: KVM: Turn kvm_psci_version into a static inline arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling firmware/psci: Expose PSCI conduit firmware/psci: Expose SMCCC version through psci_ops arm/arm64: smccc: Make function identifiers an unsigned quantity arm/arm64: smccc: Implement SMCCC v1.1 inline primitive arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support arm64: Kill PSCI_GET_VERSION as a variant-2 workaround Robin Murphy (3): arm64: Implement array_index_mask_nospec() arm64: Make USER_DS an inclusive limit arm64: Use pointer masking to limit uaccess speculation Suzuki K Poulose (1): arm64: Run enable method for errata work arounds on late CPUs Will Deacon (13): arm64: barrier: Add CSDB macros to control data-value prediction arm64: entry: Ensure branch through syscall table is bounded under speculation arm64: uaccess: Prevent speculative use of the current addr_limit arm64: uaccess: Don't bother eliding access_ok checks in __{get, put}_user arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user arm64: futex: Mask __user pointers prior to dereference arm64: cpufeature: Pass capability structure to ->enable callback drivers/firmware: Expose psci_get_version through psci_ops structure arm64: Add skeleton to harden the branch predictor against aliasing attacks arm64: entry: Apply BP hardening for high-priority synchronous exceptions arm64: entry: Apply BP hardening for suspicious interrupts from EL0 arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 arm64: Implement branch predictor hardening for affected Cortex-A CPUs Yury Norov (1): arm64: move TASK_* definitions to <asm/processor.h> arch/arm/include/asm/kvm_host.h | 6 + arch/arm/include/asm/kvm_mmu.h | 10 + arch/arm/include/asm/kvm_psci.h | 27 - arch/arm/kvm/arm.c | 11 +- arch/arm/kvm/handle_exit.c | 4 +- arch/arm/kvm/psci.c | 143 ++- arch/arm64/Kconfig | 17 + arch/arm64/crypto/sha256-core.S | 2061 ++++++++++++++++++++++++++++++++++++ arch/arm64/crypto/sha512-core.S | 1085 +++++++++++++++++++ arch/arm64/include/asm/assembler.h | 19 + arch/arm64/include/asm/barrier.h | 23 + arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cputype.h | 6 + arch/arm64/include/asm/futex.h | 9 +- arch/arm64/include/asm/kvm_host.h | 5 + arch/arm64/include/asm/kvm_mmu.h | 38 + arch/arm64/include/asm/kvm_psci.h | 27 - arch/arm64/include/asm/memory.h | 15 - arch/arm64/include/asm/mmu.h | 39 + arch/arm64/include/asm/processor.h | 24 + arch/arm64/include/asm/sysreg.h | 2 + arch/arm64/include/asm/uaccess.h | 153 ++- arch/arm64/kernel/Makefile | 4 + arch/arm64/kernel/arm64ksyms.c | 4 +- arch/arm64/kernel/bpi.S | 75 ++ arch/arm64/kernel/cpu_errata.c | 189 +++- arch/arm64/kernel/cpufeature.c | 10 +- arch/arm64/kernel/entry.S | 25 +- arch/arm64/kvm/handle_exit.c | 16 +- arch/arm64/kvm/hyp/hyp-entry.S | 20 +- arch/arm64/kvm/hyp/switch.c | 5 +- arch/arm64/lib/clear_user.S | 6 +- arch/arm64/lib/copy_in_user.S | 4 +- arch/arm64/mm/context.c | 12 + arch/arm64/mm/fault.c | 34 +- arch/arm64/mm/proc.S | 7 +- drivers/firmware/psci.c | 57 +- include/kvm/arm_psci.h | 51 + include/linux/arm-smccc.h | 165 ++- include/linux/mm.h | 4 + include/linux/psci.h | 14 + include/uapi/linux/psci.h | 3 + 42 files changed, 4237 insertions(+), 195 deletions(-) delete mode 100644 arch/arm/include/asm/kvm_psci.h create mode 100644 arch/arm64/crypto/sha256-core.S create mode 100644 arch/arm64/crypto/sha512-core.S delete mode 100644 arch/arm64/include/asm/kvm_psci.h create mode 100644 arch/arm64/kernel/bpi.S create mode 100644 include/kvm/arm_psci.h -- 2.11.0

6 years, 9 months

3
47
0 0

[PATCH 4.16 00/68] 4.16.3-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.16.3 release. There are 68 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu Apr 19 15:57:33 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.16.3-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.16.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.16.3-rc1 Sudhir Sreedharan <ssreedharan(a)mvista.com> rtl8187: Fix NULL pointer dereference in priv->conf_mutex Hans de Goede <hdegoede(a)redhat.com> Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low Szymon Janc <szymon.janc(a)codecoup.pl> Bluetooth: Fix connection if directed advertising and privacy is used Al Viro <viro(a)zeniv.linux.org.uk> getname_kernel() needs to make sure that ->name != ->iname in long case Michael S. Tsirkin <mst(a)redhat.com> mm/gup_benchmark: handle gup failures Michael S. Tsirkin <mst(a)redhat.com> get_user_pages_fast(): return -EFAULT on access_ok failure Heiko Carstens <heiko.carstens(a)de.ibm.com> s390/compat: fix setup_frame32 Vasily Gorbik <gor(a)linux.ibm.com> s390/ipl: ensure loadparm valid flag is set Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qdio: don't merge ERROR output buffers Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qdio: don't retry EQBS after CCQ 96 Dan Williams <dan.j.williams(a)intel.com> nfit: fix region registration vs block-data-window ranges Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> block/loop: fix deadlock after loop_set_status John Johansen <john.johansen(a)canonical.com> apparmor: fix resource audit messages when auditing peer John Johansen <john.johansen(a)canonical.com> apparmor: fix display of .ns_name for containers John Johansen <john.johansen(a)canonical.com> apparmor: fix logging of the existence test for signals Bart Van Assche <bart.vanassche(a)wdc.com> Revert "scsi: core: return BLK_STS_OK for DID_OK in __scsi_error_from_host_byte()" Bill Kuzeja <William.Kuzeja(a)stratus.com> scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure Johannes Thumshirn <jthumshirn(a)suse.de> scsi: scsi_dh: Don't look for NULL devices handlers by name J. Bruce Fields <bfields(a)redhat.com> nfsd: fix incorrect umasks Mike Kravetz <mike.kravetz(a)oracle.com> hugetlbfs: fix bug in pgoff overflow checking Simon Gaiser <simon(a)invisiblethingslab.com> xen: xenbus_dev_frontend: Fix XS_TRANSACTION_END handling Amir Goldstein <amir73il(a)gmail.com> ovl: set lower layer st_dev only if setting lower st_ino Amir Goldstein <amir73il(a)gmail.com> ovl: set i_ino to the value of st_ino for NFS export Amir Goldstein <amir73il(a)gmail.com> ovl: fix lookup with middle layer opaque dir and absolute path redirects Vivek Goyal <vgoyal(a)redhat.com> ovl: Set d->last properly during lookup Ming Lei <ming.lei(a)redhat.com> blk-mq: don't keep offline CPUs mapped to hctx 0 Ming Lei <ming.lei(a)redhat.com> blk-mq: make sure that correct hctx->next_cpu is set Ming Lei <ming.lei(a)redhat.com> blk-mq: order getting budget and driver tag Tejun Heo <tj(a)kernel.org> blk-mq: Directly schedule q->timeout_work when aborting a request Huacai Chen <chenhc(a)lemote.com> zboot: fix stack protector in compressed boot phase Yury Norov <ynorov(a)caviumnetworks.com> lib: fix stall in __bitmap_parselist() Keith Busch <keith.busch(a)intel.com> nvme: Skip checking heads without namespaces Bart Van Assche <bart.vanassche(a)wdc.com> block: Change a rcu_read_{lock,unlock}_sched() pair into rcu_read_{lock,unlock}() Yunlong Song <yunlong.song(a)huawei.com> f2fs: fix heap mode to reset it back Eric Biggers <ebiggers(a)google.com> sunrpc: remove incorrect HMAC request initialization Li RongQing <lirongqing(a)baidu.com> x86/apic: Fix signedness bug in APIC ID validity checks Dmitry V. Levin <ldv(a)altlinux.org> x86/uapi: Fix asm/bootparam.h userspace compilation errors Toke Høiland-Jørgensen <toke(a)toke.dk> ath9k: Protect queue draining by rcu_read_lock() Yazen Ghannam <yazen.ghannam(a)amd.com> x86/mce/AMD: Get address from already initialized block Yazen Ghannam <yazen.ghannam(a)amd.com> x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type Yazen Ghannam <yazen.ghannam(a)amd.com> x86/mce/AMD: Pass the bank number to smca_get_bank_type() Arnd Bergmann <arnd(a)arndb.de> radeon: hide pointless #warning when compile testing Prashant Bhole <bhole_prashant_q7(a)lab.ntt.co.jp> perf/core: Fix use-after-free in uprobe_perf_close() Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix timestamp following overflow Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix error recovery from missing TIP packet Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix sync_switch Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix overlap detection to identify consecutive buffers correctly Nicholas Piggin <npiggin(a)gmail.com> KVM: PPC: Book3S HV: trace_tlbie must not be called in realmode Dexuan Cui <decui(a)microsoft.com> PCI: hv: Fix 2 hang issues in hv_compose_msi_msg() Dexuan Cui <decui(a)microsoft.com> PCI: hv: Serialize the present and eject work items Dexuan Cui <decui(a)microsoft.com> Drivers: hv: vmbus: do not mark HV_PCIE as perf_device Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: add a bunch of new 9000 PCI IDs Helge Deller <deller(a)gmx.de> parisc: Fix HPMC handler by increasing size to multiple of 16 bytes Helge Deller <deller(a)gmx.de> parisc: Fix out of array access in match_pci_device() Corey Minyard <cminyard(a)mvista.com> ipmi: Fix some error cleanup issues Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> media: v4l: vsp1: Fix header display list status check in continuous mode Mauro Carvalho Chehab <mchehab(a)kernel.org> media: v4l2-compat-ioctl32: don't oops on overlay Mauro Carvalho Chehab <mchehab(a)kernel.org> media: v4l2-core: fix size of devnode_nums[] bitarray Rob Gardner <rob.gardner(a)oracle.com> sparc64: Properly range check DAX completion index Phil Elwell <phil(a)raspberrypi.org> lan78xx: Correctly indicate invalid OTP Eric Auger <eric.auger(a)redhat.com> vhost: Fix vhost_copy_to_user() Sabrina Dubroca <sd(a)queasysnail.net> ip_gre: clear feature flags when incompatible o_flags are set Guillaume Nault <g.nault(a)alphalink.fr> l2tp: fix race in duplicate tunnel detection Guillaume Nault <g.nault(a)alphalink.fr> l2tp: fix races in tunnel creation Stefan Hajnoczi <stefanha(a)redhat.com> vhost: fix vhost_vq_access_ok() log check Tejaswi Tanikella <tejaswit(a)codeaurora.org> slip: Check if rstate is initialized before uncompressing Ka-Cheong Poon <ka-cheong.poon(a)oracle.com> rds: MP-RDS may use an invalid c_path Bassem Boubaker <bassem.boubaker(a)actia.fr> cdc_ether: flag the Cinterion AHS8 modem by gemalto as WWAN ------------- Diffstat: Makefile | 4 +- arch/arm/boot/compressed/misc.c | 9 +- arch/mips/boot/compressed/decompress.c | 9 +- arch/parisc/kernel/drivers.c | 4 + arch/parisc/kernel/hpmc.S | 6 +- arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 - arch/s390/kernel/compat_signal.c | 2 +- arch/s390/kernel/ipl.c | 1 + arch/sh/boot/compressed/misc.c | 9 +- arch/x86/include/asm/apic.h | 4 +- arch/x86/include/asm/mce.h | 1 + arch/x86/include/uapi/asm/bootparam.h | 18 +- arch/x86/kernel/acpi/boot.c | 13 +- arch/x86/kernel/apic/apic_common.c | 2 +- arch/x86/kernel/apic/apic_numachip.c | 2 +- arch/x86/kernel/apic/x2apic.h | 2 +- arch/x86/kernel/apic/x2apic_phys.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 37 +++- arch/x86/xen/apic.c | 2 +- block/blk-core.c | 4 +- block/blk-mq-cpumap.c | 5 - block/blk-mq.c | 23 ++- block/blk-timeout.c | 2 +- drivers/acpi/nfit/core.c | 22 +- drivers/block/loop.c | 12 +- drivers/bluetooth/hci_bcm.c | 20 +- drivers/char/ipmi/ipmi_si_intf.c | 18 +- drivers/edac/mce_amd.c | 11 +- drivers/gpu/drm/radeon/radeon_object.c | 3 +- drivers/hv/channel_mgmt.c | 2 +- drivers/media/platform/vsp1/vsp1_dl.c | 3 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 4 +- drivers/media/v4l2-core/v4l2-dev.c | 8 +- drivers/net/slip/slhc.c | 5 + drivers/net/usb/cdc_ether.c | 6 + drivers/net/usb/lan78xx.c | 3 +- drivers/net/wireless/ath/ath9k/xmit.c | 4 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 157 +++++++++++++- drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 +- drivers/nvme/host/core.c | 1 + drivers/pci/host/pci-hyperv.c | 92 +++++++-- drivers/s390/cio/qdio_main.c | 42 ++-- drivers/sbus/char/oradax.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 44 ++-- drivers/scsi/scsi_dh.c | 3 + drivers/scsi/scsi_lib.c | 2 - drivers/vhost/vhost.c | 10 +- drivers/xen/xenbus/xenbus_dev_frontend.c | 2 +- fs/f2fs/gc.c | 5 +- fs/f2fs/segment.c | 3 +- fs/hugetlbfs/inode.c | 10 +- fs/namei.c | 3 +- fs/nfsd/nfs4proc.c | 12 +- fs/nfsd/nfs4xdr.c | 8 +- fs/nfsd/xdr4.h | 2 + fs/overlayfs/inode.c | 28 ++- fs/overlayfs/namei.c | 17 +- fs/overlayfs/util.c | 8 +- include/media/v4l2-dev.h | 12 +- include/net/bluetooth/hci_core.h | 2 +- include/net/slhc_vj.h | 1 + kernel/events/core.c | 6 + lib/bitmap.c | 2 +- lib/test_bitmap.c | 4 + mm/gup.c | 5 +- mm/gup_benchmark.c | 4 +- net/bluetooth/hci_conn.c | 29 ++- net/bluetooth/hci_event.c | 15 +- net/bluetooth/l2cap_core.c | 2 +- net/ipv4/ip_gre.c | 6 + net/l2tp/l2tp_core.c | 225 +++++++++------------ net/l2tp/l2tp_core.h | 4 +- net/l2tp/l2tp_netlink.c | 22 +- net/l2tp/l2tp_ppp.c | 9 + net/rds/send.c | 15 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 - security/apparmor/apparmorfs.c | 4 +- security/apparmor/include/audit.h | 8 +- security/apparmor/include/sig_names.h | 4 +- security/apparmor/ipc.c | 2 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 64 +++--- .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 2 +- tools/perf/util/intel-pt.c | 37 +++- 84 files changed, 785 insertions(+), 443 deletions(-)

6 years, 9 months

5
72
0 0

[PATCH] drm/i915/gvt: init mmio by lri command in vgpu inhibit context

by Weinan Li

commit cd7e61b93d068a80bfe6cb55bf00f17332d831a1 upstream. There is one issue relates to Coarse Power Gating(CPG) on KBL NUC in GVT-g, vgpu can't get the correct default context by updating the registers before inhibit context submission. It always get back the hardware default value unless the inhibit context submission happened before the 1st time forcewake put. With this wrong default context, vgpu will run with incorrect state and meet unknown issues. The solution is initialize these mmios by adding lri command in ring buffer of the inhibit context, then gpu hardware has no chance to go down RC6 when lri commands are right being executed, and then vgpu can get correct default context for further use. v3: - fix code fault, use 'for' to loop through mmio render list(Zhenyu) v4: - save the count of engine mmio need to be restored for inhibit context and refine some comments. (Kevin) v5: - code rebase Cc: stable(a)vger.kernel.org # v4.16 Cc: Kevin Tian <kevin.tian(a)intel.com> Cc: Zhenyu Wang <zhenyuw(a)linux.intel.com> Signed-off-by: Weinan Li <weinan.z.li(a)intel.com> Signed-off-by: Zhenyu Wang <zhenyuw(a)linux.intel.com> Signed-off-by: Changbin Du <changbin.du(a)intel.com> --- drivers/gpu/drm/i915/gvt/gvt.h | 5 +- drivers/gpu/drm/i915/gvt/mmio_context.c | 210 +++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/gvt/mmio_context.h | 5 + drivers/gpu/drm/i915/gvt/scheduler.c | 5 + 4 files changed, 205 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h index c6197d9..d35b93f 100644 --- a/drivers/gpu/drm/i915/gvt/gvt.h +++ b/drivers/gpu/drm/i915/gvt/gvt.h @@ -308,7 +308,10 @@ struct intel_gvt { wait_queue_head_t service_thread_wq; unsigned long service_request; - struct engine_mmio *engine_mmio_list; + struct { + struct engine_mmio *mmio; + int ctx_mmio_count[I915_NUM_ENGINES]; + } engine_mmio_list; struct dentry *debugfs_root; }; diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.c b/drivers/gpu/drm/i915/gvt/mmio_context.c index 152df3d..c44dba3 100644 --- a/drivers/gpu/drm/i915/gvt/mmio_context.c +++ b/drivers/gpu/drm/i915/gvt/mmio_context.c @@ -50,6 +50,8 @@ #define RING_GFX_MODE(base) _MMIO((base) + 0x29c) #define VF_GUARDBAND _MMIO(0x83a4) +#define GEN9_MOCS_SIZE 64 + /* Raw offset is appened to each line for convenience. */ static struct engine_mmio gen8_engine_mmio_list[] __cacheline_aligned = { {RCS, GFX_MODE_GEN7, 0xffff, false}, /* 0x229c */ @@ -152,8 +154,8 @@ static struct engine_mmio gen9_engine_mmio_list[] __cacheline_aligned = { static struct { bool initialized; - u32 control_table[I915_NUM_ENGINES][64]; - u32 l3cc_table[32]; + u32 control_table[I915_NUM_ENGINES][GEN9_MOCS_SIZE]; + u32 l3cc_table[GEN9_MOCS_SIZE / 2]; } gen9_render_mocs; static void load_render_mocs(struct drm_i915_private *dev_priv) @@ -170,7 +172,7 @@ static void load_render_mocs(struct drm_i915_private *dev_priv) for (ring_id = 0; ring_id < ARRAY_SIZE(regs); ring_id++) { offset.reg = regs[ring_id]; - for (i = 0; i < 64; i++) { + for (i = 0; i < GEN9_MOCS_SIZE; i++) { gen9_render_mocs.control_table[ring_id][i] = I915_READ_FW(offset); offset.reg += 4; @@ -178,7 +180,7 @@ static void load_render_mocs(struct drm_i915_private *dev_priv) } offset.reg = 0xb020; - for (i = 0; i < 32; i++) { + for (i = 0; i < GEN9_MOCS_SIZE / 2; i++) { gen9_render_mocs.l3cc_table[i] = I915_READ_FW(offset); offset.reg += 4; @@ -186,6 +188,153 @@ static void load_render_mocs(struct drm_i915_private *dev_priv) gen9_render_mocs.initialized = true; } +static int +restore_context_mmio_for_inhibit(struct intel_vgpu *vgpu, + struct drm_i915_gem_request *req) +{ + u32 *cs; + int ret; + struct engine_mmio *mmio; + struct intel_gvt *gvt = vgpu->gvt; + int ring_id = req->engine->id; + int count = gvt->engine_mmio_list.ctx_mmio_count[ring_id]; + + if (count == 0) + return 0; + + ret = req->engine->emit_flush(req, EMIT_BARRIER); + if (ret) + return ret; + + cs = intel_ring_begin(req, count * 2 + 2); + if (IS_ERR(cs)) + return PTR_ERR(cs); + + *cs++ = MI_LOAD_REGISTER_IMM(count); + for (mmio = gvt->engine_mmio_list.mmio; + i915_mmio_reg_valid(mmio->reg); mmio++) { + if (mmio->ring_id != ring_id || + !mmio->in_context) + continue; + + *cs++ = i915_mmio_reg_offset(mmio->reg); + *cs++ = vgpu_vreg_t(vgpu, mmio->reg) | + (mmio->mask << 16); + gvt_dbg_core("add lri reg pair 0x%x:0x%x in inhibit ctx, vgpu:%d, rind_id:%d\n", + *(cs-2), *(cs-1), vgpu->id, ring_id); + } + + *cs++ = MI_NOOP; + intel_ring_advance(req, cs); + + ret = req->engine->emit_flush(req, EMIT_BARRIER); + if (ret) + return ret; + + return 0; +} + +static int +restore_render_mocs_control_for_inhibit(struct intel_vgpu *vgpu, + struct drm_i915_gem_request *req) +{ + unsigned int index; + u32 *cs; + + cs = intel_ring_begin(req, 2 * GEN9_MOCS_SIZE + 2); + if (IS_ERR(cs)) + return PTR_ERR(cs); + + *cs++ = MI_LOAD_REGISTER_IMM(GEN9_MOCS_SIZE); + + for (index = 0; index < GEN9_MOCS_SIZE; index++) { + *cs++ = i915_mmio_reg_offset(GEN9_GFX_MOCS(index)); + *cs++ = vgpu_vreg_t(vgpu, GEN9_GFX_MOCS(index)); + gvt_dbg_core("add lri reg pair 0x%x:0x%x in inhibit ctx, vgpu:%d, rind_id:%d\n", + *(cs-2), *(cs-1), vgpu->id, req->engine->id); + + } + + *cs++ = MI_NOOP; + intel_ring_advance(req, cs); + + return 0; +} + +static int +restore_render_mocs_l3cc_for_inhibit(struct intel_vgpu *vgpu, + struct drm_i915_gem_request *req) +{ + unsigned int index; + u32 *cs; + + cs = intel_ring_begin(req, 2 * GEN9_MOCS_SIZE / 2 + 2); + if (IS_ERR(cs)) + return PTR_ERR(cs); + + *cs++ = MI_LOAD_REGISTER_IMM(GEN9_MOCS_SIZE / 2); + + for (index = 0; index < GEN9_MOCS_SIZE / 2; index++) { + *cs++ = i915_mmio_reg_offset(GEN9_LNCFCMOCS(index)); + *cs++ = vgpu_vreg_t(vgpu, GEN9_LNCFCMOCS(index)); + gvt_dbg_core("add lri reg pair 0x%x:0x%x in inhibit ctx, vgpu:%d, rind_id:%d\n", + *(cs-2), *(cs-1), vgpu->id, req->engine->id); + + } + + *cs++ = MI_NOOP; + intel_ring_advance(req, cs); + + return 0; +} + +/* + * Use lri command to initialize the mmio which is in context state image for + * inhibit context, it contains tracked engine mmio, render_mocs and + * render_mocs_l3cc. + */ +int intel_vgpu_restore_inhibit_context(struct intel_vgpu *vgpu, + struct drm_i915_gem_request *req) +{ + int ret; + u32 *cs; + + cs = intel_ring_begin(req, 2); + if (IS_ERR(cs)) + return PTR_ERR(cs); + + *cs++ = MI_ARB_ON_OFF | MI_ARB_DISABLE; + *cs++ = MI_NOOP; + intel_ring_advance(req, cs); + + ret = restore_context_mmio_for_inhibit(vgpu, req); + if (ret) + goto out; + + /* no MOCS register in context except render engine */ + if (req->engine->id != RCS) + goto out; + + ret = restore_render_mocs_control_for_inhibit(vgpu, req); + if (ret) + goto out; + + ret = restore_render_mocs_l3cc_for_inhibit(vgpu, req); + if (ret) + goto out; + +out: + cs = intel_ring_begin(req, 2); + if (IS_ERR(cs)) + return PTR_ERR(cs); + + *cs++ = MI_ARB_ON_OFF | MI_ARB_ENABLE; + *cs++ = MI_NOOP; + intel_ring_advance(req, cs); + + return ret; +} + static void handle_tlb_pending_event(struct intel_vgpu *vgpu, int ring_id) { struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv; @@ -252,11 +401,14 @@ static void switch_mocs(struct intel_vgpu *pre, struct intel_vgpu *next, if (WARN_ON(ring_id >= ARRAY_SIZE(regs))) return; + if (IS_KABYLAKE(dev_priv) && ring_id == RCS) + return; + if (!pre && !gen9_render_mocs.initialized) load_render_mocs(dev_priv); offset.reg = regs[ring_id]; - for (i = 0; i < 64; i++) { + for (i = 0; i < GEN9_MOCS_SIZE; i++) { if (pre) old_v = vgpu_vreg_t(pre, offset); else @@ -274,7 +426,7 @@ static void switch_mocs(struct intel_vgpu *pre, struct intel_vgpu *next, if (ring_id == RCS) { l3_offset.reg = 0xb020; - for (i = 0; i < 32; i++) { + for (i = 0; i < GEN9_MOCS_SIZE / 2; i++) { if (pre) old_v = vgpu_vreg_t(pre, l3_offset); else @@ -294,6 +446,16 @@ static void switch_mocs(struct intel_vgpu *pre, struct intel_vgpu *next, #define CTX_CONTEXT_CONTROL_VAL 0x03 +bool is_inhibit_context(struct i915_gem_context *ctx, int ring_id) +{ + u32 *reg_state = ctx->engine[ring_id].lrc_reg_state; + u32 inhibit_mask = + _MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT); + + return inhibit_mask == + (reg_state[CTX_CONTEXT_CONTROL_VAL] & inhibit_mask); +} + /* Switch ring mmio values (context). */ static void switch_mmio(struct intel_vgpu *pre, struct intel_vgpu *next, @@ -301,9 +463,6 @@ static void switch_mmio(struct intel_vgpu *pre, { struct drm_i915_private *dev_priv; struct intel_vgpu_submission *s; - u32 *reg_state, ctx_ctrl; - u32 inhibit_mask = - _MASKED_BIT_ENABLE(CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT); struct engine_mmio *mmio; u32 old_v, new_v; @@ -311,10 +470,18 @@ static void switch_mmio(struct intel_vgpu *pre, if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) switch_mocs(pre, next, ring_id); - for (mmio = dev_priv->gvt->engine_mmio_list; + for (mmio = dev_priv->gvt->engine_mmio_list.mmio; i915_mmio_reg_valid(mmio->reg); mmio++) { if (mmio->ring_id != ring_id) continue; + /* + * No need to do save or restore of the mmio which is in context + * state image on kabylake, it's initialized by lri command and + * save or restore with context together. + */ + if (IS_KABYLAKE(dev_priv) && mmio->in_context) + continue; + // save if (pre) { vgpu_vreg_t(pre, mmio->reg) = I915_READ_FW(mmio->reg); @@ -328,16 +495,13 @@ static void switch_mmio(struct intel_vgpu *pre, // restore if (next) { s = &next->submission; - reg_state = - s->shadow_ctx->engine[ring_id].lrc_reg_state; - ctx_ctrl = reg_state[CTX_CONTEXT_CONTROL_VAL]; /* - * if it is an inhibit context, load in_context mmio - * into HW by mmio write. If it is not, skip this mmio - * write. + * No need to restore the mmio which is in context state + * image if it's not inhibit context, it will restore + * itself. */ if (mmio->in_context && - (ctx_ctrl & inhibit_mask) != inhibit_mask) + !is_inhibit_context(s->shadow_ctx, ring_id)) continue; if (mmio->mask) @@ -408,8 +572,16 @@ void intel_gvt_switch_mmio(struct intel_vgpu *pre, */ void intel_gvt_init_engine_mmio_context(struct intel_gvt *gvt) { + struct engine_mmio *mmio; + if (IS_SKYLAKE(gvt->dev_priv) || IS_KABYLAKE(gvt->dev_priv)) - gvt->engine_mmio_list = gen9_engine_mmio_list; + gvt->engine_mmio_list.mmio = gen9_engine_mmio_list; else - gvt->engine_mmio_list = gen8_engine_mmio_list; + gvt->engine_mmio_list.mmio = gen8_engine_mmio_list; + + for (mmio = gvt->engine_mmio_list.mmio; + i915_mmio_reg_valid(mmio->reg); mmio++) { + if (mmio->in_context) + gvt->engine_mmio_list.ctx_mmio_count[mmio->ring_id]++; + } } diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.h b/drivers/gpu/drm/i915/gvt/mmio_context.h index ca2c6a7..0b1d985 100644 --- a/drivers/gpu/drm/i915/gvt/mmio_context.h +++ b/drivers/gpu/drm/i915/gvt/mmio_context.h @@ -49,4 +49,9 @@ void intel_gvt_switch_mmio(struct intel_vgpu *pre, void intel_gvt_init_engine_mmio_context(struct intel_gvt *gvt); +bool is_inhibit_context(struct i915_gem_context *ctx, int ring_id); + +int intel_vgpu_restore_inhibit_context(struct intel_vgpu *vgpu, + struct drm_i915_gem_request *req); + #endif diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index d74d6f0..88b7b47 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -275,6 +275,11 @@ static int copy_workload_to_ring_buffer(struct intel_vgpu_workload *workload) struct intel_vgpu *vgpu = workload->vgpu; void *shadow_ring_buffer_va; u32 *cs; + struct drm_i915_gem_request *req = workload->req; + + if (IS_KABYLAKE(req->i915) && + is_inhibit_context(req->ctx, req->engine->id)) + intel_vgpu_restore_inhibit_context(vgpu, req); /* allocate shadow ring buffer */ cs = intel_ring_begin(workload->req, workload->rb_len / sizeof(u32)); -- 2.7.4

6 years, 9 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2018