Skip to contentSkip to conversation

Linux 5.10.240

DISCUSSION Greg Kroah-Hartman 1 participant 2 messages Jul 17, 2025 Stable branch

lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

I'm announcing the release of the 5.10.240 kernel.

All users of the 5.10 kernel series must upgrade.

The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Documentation/ABI/testing/sysfs-devices-system-cpu              |    2 
 Documentation/ABI/testing/sysfs-driver-ufs                      |    2 
 Documentation/admin-guide/hw-vuln/index.rst                     |    1 
 Documentation/admin-guide/hw-vuln/indirect-target-selection.rst |  156 +++++
 Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst |    4 
 Documentation/admin-guide/kernel-parameters.txt                 |   28 
 Documentation/devicetree/bindings/serial/8250.yaml              |    2 
 Makefile                                                        |    2 
 arch/arm64/mm/mmu.c                                             |    3 
 arch/powerpc/include/uapi/asm/ioctls.h                          |    8 
 arch/s390/Makefile                                              |    2 
 arch/s390/purgatory/Makefile                                    |    2 
 arch/um/drivers/ubd_user.c                                      |    2 
 arch/um/drivers/vector_kern.c                                   |   42 -
 arch/um/include/asm/asm-prototypes.h                            |    5 
 arch/x86/Kconfig                                                |   22 
 arch/x86/entry/entry.S                                          |    8 
 arch/x86/include/asm/alternative.h                              |   26 
 arch/x86/include/asm/cpu.h                                      |   13 
 arch/x86/include/asm/cpufeature.h                               |    5 
 arch/x86/include/asm/cpufeatures.h                              |   14 
 arch/x86/include/asm/disabled-features.h                        |    2 
 arch/x86/include/asm/irqflags.h                                 |    4 
 arch/x86/include/asm/msr-index.h                                |   13 
 arch/x86/include/asm/mwait.h                                    |   19 
 arch/x86/include/asm/nospec-branch.h                            |   50 +
 arch/x86/include/asm/required-features.h                        |    2 
 arch/x86/include/asm/text-patching.h                            |   31 +
 arch/x86/kernel/alternative.c                                   |  308 +++++++++-
 arch/x86/kernel/cpu/amd.c                                       |   58 +
 arch/x86/kernel/cpu/bugs.c                                      |  272 ++++++++
 arch/x86/kernel/cpu/common.c                                    |   77 ++
 arch/x86/kernel/cpu/mce/amd.c                                   |   15 
 arch/x86/kernel/cpu/mce/core.c                                  |    8 
 arch/x86/kernel/cpu/mce/intel.c                                 |    1 
 arch/x86/kernel/cpu/scattered.c                                 |    1 
 arch/x86/kernel/ftrace.c                                        |    4 
 arch/x86/kernel/kprobes/core.c                                  |   39 -
 arch/x86/kernel/module.c                                        |   14 
 arch/x86/kernel/process.c                                       |   15 
 arch/x86/kernel/static_call.c                                   |    2 
 arch/x86/kernel/vmlinux.lds.S                                   |    8 
 arch/x86/kvm/cpuid.c                                            |   31 -
 arch/x86/kvm/cpuid.h                                            |    1 
 arch/x86/kvm/svm/vmenter.S                                      |    3 
 arch/x86/kvm/vmx/vmx.c                                          |    2 
 arch/x86/kvm/x86.c                                              |    4 
 arch/x86/lib/retpoline.S                                        |   39 +
 arch/x86/net/bpf_jit_comp.c                                     |    8 
 arch/x86/um/asm/checksum.h                                      |    3 
 drivers/acpi/acpi_pad.c                                         |    7 
 drivers/acpi/acpica/dsmethod.c                                  |    7 
 drivers/acpi/battery.c                                          |   19 
 drivers/ata/pata_cs5536.c                                       |    2 
 drivers/atm/idt77252.c                                          |    5 
 drivers/base/cpu.c                                              |   15 
 drivers/dma-buf/dma-resv.c                                      |    2 
 drivers/dma/xilinx/xilinx_dma.c                                 |    2 
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c              |    2 
 drivers/gpu/drm/bridge/cdns-dsi.c                               |   27 
 drivers/gpu/drm/exynos/exynos7_drm_decon.c                      |    4 
 drivers/gpu/drm/exynos/exynos_drm_fimd.c                        |   12 
 drivers/gpu/drm/i915/gt/intel_ring_submission.c                 |    3 
 drivers/gpu/drm/i915/selftests/i915_request.c                   |   20 
 drivers/gpu/drm/i915/selftests/mock_request.c                   |    2 
 drivers/gpu/drm/tegra/dc.c                                      |   17 
 drivers/gpu/drm/tegra/hub.c                                     |    4 
 drivers/gpu/drm/tegra/hub.h                                     |    3 
 drivers/gpu/drm/udl/udl_drv.c                                   |    2 
 drivers/gpu/drm/v3d/v3d_drv.h                                   |    7 
 drivers/gpu/drm/v3d/v3d_gem.c                                   |    2 
 drivers/gpu/drm/v3d/v3d_irq.c                                   |   38 -
 drivers/hid/hid-ids.h                                           |    5 
 drivers/hid/hid-quirks.c                                        |    3 
 drivers/hid/wacom_sys.c                                         |    6 
 drivers/hv/channel_mgmt.c                                       |  117 ++-
 drivers/hv/hyperv_vmbus.h                                       |   19 
 drivers/hv/vmbus_drv.c                                          |    2 
 drivers/hwmon/pmbus/max34440.c                                  |   48 +
 drivers/i2c/busses/i2c-robotfuzz-osif.c                         |    6 
 drivers/i2c/busses/i2c-tiny-usb.c                               |    6 
 drivers/iio/pressure/zpa2326.c                                  |    2 
 drivers/infiniband/core/iwcm.c                                  |   38 -
 drivers/infiniband/core/iwcm.h                                  |    2 
 drivers/infiniband/hw/mlx5/counters.c                           |    2 
 drivers/infiniband/hw/mlx5/devx.c                               |    2 
 drivers/infiniband/hw/mlx5/main.c                               |   33 +
 drivers/input/joystick/xpad.c                                   |    5 
 drivers/input/keyboard/atkbd.c                                  |    3 
 drivers/leds/led-class-multicolor.c                             |    3 
 drivers/mailbox/mailbox.c                                       |    2 
 drivers/md/bcache/super.c                                       |    7 
 drivers/md/dm-raid.c                                            |    2 
 drivers/md/md-bitmap.c                                          |    2 
 drivers/md/raid1.c                                              |    1 
 drivers/media/platform/omap3isp/ispccdc.c                       |    8 
 drivers/media/platform/omap3isp/ispstat.c                       |    6 
 drivers/media/usb/uvc/uvc_ctrl.c                                |   61 +
 drivers/mfd/max14577.c                                          |    1 
 drivers/misc/vmw_vmci/vmci_host.c                               |    9 
 drivers/mmc/host/mtk-sd.c                                       |   39 -
 drivers/mmc/host/sdhci.c                                        |    9 
 drivers/mmc/host/sdhci.h                                        |   16 
 drivers/net/can/m_can/m_can.c                                   |    2 
 drivers/net/can/m_can/tcan4x5x.c                                |    9 
 drivers/net/ethernet/amd/xgbe/xgbe-common.h                     |    2 
 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c                       |    9 
 drivers/net/ethernet/amd/xgbe/xgbe.h                            |    4 
 drivers/net/ethernet/atheros/atlx/atl1.c                        |   78 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c                   |    2 
 drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c                   |    2 
 drivers/net/ethernet/cisco/enic/enic_main.c                     |    4 
 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c                |  141 +++-
 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h                |   20 
 drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c            |   18 
 drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h                 |    6 
 drivers/net/ethernet/freescale/dpaa2/dpni.c                     |    2 
 drivers/net/ethernet/freescale/dpaa2/dpni.h                     |    6 
 drivers/net/ethernet/freescale/enetc/enetc_hw.h                 |    2 
 drivers/net/ethernet/sun/niu.c                                  |   31 -
 drivers/net/ethernet/sun/niu.h                                  |    4 
 drivers/net/ethernet/xilinx/ll_temac_main.c                     |    2 
 drivers/net/phy/microchip.c                                     |    2 
 drivers/net/phy/smsc.c                                          |   28 
 drivers/net/usb/qmi_wwan.c                                      |    1 
 drivers/net/wireless/ath/ath6kl/bmi.c                           |    4 
 drivers/net/wireless/zydas/zd1211rw/zd_mac.c                    |    6 
 drivers/pci/controller/cadence/pcie-cadence-ep.c                |    5 
 drivers/pci/controller/pci-hyperv.c                             |   17 
 drivers/pinctrl/qcom/pinctrl-msm.c                              |   20 
 drivers/platform/mellanox/mlxbf-tmfifo.c                        |    3 
 drivers/pwm/pwm-mediatek.c                                      |   15 
 drivers/regulator/gpio-regulator.c                              |    4 
 drivers/rtc/lib_test.c                                          |    2 
 drivers/rtc/rtc-cmos.c                                          |   10 
 drivers/scsi/qla2xxx/qla_mbx.c                                  |    2 
 drivers/scsi/qla4xxx/ql4_os.c                                   |    2 
 drivers/scsi/ufs/ufs-sysfs.c                                    |    4 
 drivers/spi/spi-fsl-dspi.c                                      |   11 
 drivers/staging/rtl8723bs/core/rtw_security.c                   |   46 -
 drivers/target/target_core_pr.c                                 |    4 
 drivers/tty/vt/vt.c                                             |    1 
 drivers/uio/uio_hv_generic.c                                    |   18 
 drivers/usb/class/cdc-wdm.c                                     |   23 
 drivers/usb/common/usb-conn-gpio.c                              |   25 
 drivers/usb/core/quirks.c                                       |    3 
 drivers/usb/core/usb.c                                          |   14 
 drivers/usb/gadget/function/f_tcm.c                             |    4 
 drivers/usb/gadget/function/u_serial.c                          |    6 
 drivers/usb/host/xhci-dbgcap.c                                  |    4 
 drivers/usb/host/xhci-dbgtty.c                                  |    1 
 drivers/usb/typec/altmodes/displayport.c                        |    5 
 drivers/usb/typec/tcpm/tcpci_maxim.c                            |   20 
 drivers/vhost/scsi.c                                            |    7 
 fs/btrfs/inode.c                                                |   36 -
 fs/btrfs/tree-log.c                                             |    4 
 fs/btrfs/volumes.c                                              |    6 
 fs/ceph/file.c                                                  |    2 
 fs/cifs/misc.c                                                  |    8 
 fs/f2fs/super.c                                                 |   30 
 fs/jfs/jfs_dmap.c                                               |   41 -
 fs/namespace.c                                                  |    8 
 fs/nfs/flexfilelayout/flexfilelayout.c                          |  121 ++-
 fs/nfs/inode.c                                                  |   17 
 fs/nfs/nfs4proc.c                                               |   12 
 fs/nfs/pnfs.c                                                   |    4 
 fs/overlayfs/util.c                                             |    4 
 fs/proc/array.c                                                 |    6 
 fs/proc/inode.c                                                 |    2 
 fs/proc/proc_sysctl.c                                           |   18 
 include/drm/spsc_queue.h                                        |    4 
 include/linux/cpu.h                                             |    3 
 include/linux/hyperv.h                                          |    2 
 include/linux/ipv6.h                                            |    1 
 include/linux/module.h                                          |    5 
 include/linux/usb/typec_dp.h                                    |    1 
 include/uapi/linux/vm_sockets.h                                 |   30 
 kernel/events/core.c                                            |    2 
 kernel/rcu/tree.c                                               |    4 
 kernel/rseq.c                                                   |   60 +
 lib/test_objagg.c                                               |    4 
 net/appletalk/ddp.c                                             |    1 
 net/atm/clip.c                                                  |   75 +-
 net/atm/resources.c                                             |    3 
 net/bluetooth/l2cap_core.c                                      |    9 
 net/ipv6/ip6_output.c                                           |    9 
 net/mac80211/rx.c                                               |    4 
 net/mac80211/util.c                                             |    2 
 net/netlink/af_netlink.c                                        |   82 +-
 net/rose/rose_route.c                                           |   15 
 net/rxrpc/call_accept.c                                         |    3 
 net/sched/sch_api.c                                             |   42 -
 net/sched/sch_sfq.c                                             |   10 
 net/tipc/topsrv.c                                               |    2 
 net/vmw_vsock/af_vsock.c                                        |   78 ++
 net/vmw_vsock/vmci_transport.c                                  |    4 
 sound/isa/sb/sb16_main.c                                        |    4 
 sound/pci/hda/hda_bind.c                                        |    2 
 sound/pci/hda/hda_intel.c                                       |    3 
 sound/soc/fsl/fsl_asrc.c                                        |    3 
 sound/usb/stream.c                                              |    2 
 tools/lib/bpf/btf_dump.c                                        |    3 
 202 files changed, 2709 insertions(+), 793 deletions(-)

Al Viro (2):
attach_recursive_mnt(): do not lock the covering tree when sliding something under it fix proc_sys_compare() handling of in-lookup dentries

Alexandre Belloni (1):
rtc: lib_test: add MODULE_LICENSE

Alexandru Ardelean (1):
uio: uio_hv_generic: use devm_kzalloc() for private data alloc

Alexis Czezar Torreno (1):

      hwmon: (pmbus/max34440) Fix support for max34451

Alok Tiwari (2):
enic: fix incorrect MTU comparison in enic_change_mtu()
net: ll_temac: Fix missing tx_pending check in ethtools_set_ringparam()

Amit Sunil Dhamne (1):
usb: typec: tcpm/tcpci_maxim: Fix bounds check in process_rx()

Andra Paraschiv (4):
vm_sockets: Add flags field in the vsock address data structure
vm_sockets: Add VMADDR_FLAG_TO_HOST vsock flag
af_vsock: Set VMADDR_FLAG_TO_HOST flag on the receive path
af_vsock: Assign the vsock transport considering the vsock address flags

Andrei Kuchynski (1):
usb: typec: displayport: Fix potential deadlock

Andy Shevchenko (1):
usb: Add checks for snprintf() calls in usb_alloc_dev()

Aradhya Bhatia (4):
drm/bridge: cdns-dsi: Fix the clock variable for mode_valid() drm/bridge: cdns-dsi: Fix connecting to next bridge drm/bridge: cdns-dsi: Check return value when getting default PHY config drm/bridge: cdns-dsi: Wait for Clk and Data Lanes to be ready

Badhri Jagan Sridharan (1):
usb: typec: tcpci_maxim: Fix uninitialized return variable

Bart Van Assche (1):
scsi: ufs: core: Fix spelling of a sysfs attribute name

Bartosz Golaszewski (1):
pinctrl: qcom: msm: mark certain pins as invalid for interrupts

Benjamin Coddington (1):
NFSv4/pNFS: Fix a race to wake on NFS_LAYOUT_DRAIN

Borislav Petkov (5):
x86/bugs: Rename MDS machinery to something more generic x86/bugs: Add a Transient Scheduler Attacks mitigation
KVM: x86: add support for CPUID leaf 0x80000021
KVM: SVM: Advertise TSA CPUID bits to guests x86/process: Move the buffer clearing before MONITOR

Borislav Petkov (AMD) (1):
x86/alternative: Optimize returns patching

Brett A C Sheffield (Librecast) (1):
Revert "ipv6: save dontfrag in cork"

Brett Werling (1):
can: tcan4x5x: fix power regulator retrieval during probe

Cezary Rojewski (1):
ALSA: hda: Ignore unsol events for cards being shut down

Chance Yang (1):
usb: common: usb-conn-gpio: use a unique name for usb connector device

Chao Yu (1):
f2fs: don't over-report free space or inodes in statvfs

Chen Yufeng (1):
usb: potential integer overflow in usbg_make_tpg()

Chia-Lin Kao (AceLan) (1):
HID: quirks: Add quirk for 2 Chicony Electronics HP 5MP Cameras

Christian König (1):
dma-buf: fix timeout handling in dma_resv_wait_timeout v2

Dan Carpenter (2):
drm/i915/selftests: Change mock_request() to return error pointers
lib: test_objagg: Set error message in check_expect_hints_stats()

Daniel Sneddon (1):
x86/bhi: Define SPEC_CTRL_BHI_DIS_S

Daniil Dulov (1):
wifi: zd1211rw: Fix potential NULL pointer dereference in zd_mac_tx_to_dev()

Dave Kleikamp (1):
fs/jfs: consolidate sanity checking in dbMount

David Howells (1):
rxrpc: Fix oops due to non-existence of prealloc backlog struct

David Thompson (1):
platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignment

Dev Jain (1):
arm64: Restrict pagetable teardown to avoid false warning

Dexuan Cui (1):
PCI: hv: Do not set PCI_COMMAND_MEMORY to reduce VM boot time

Dmitry Kandybka (1):
ceph: fix possible integer overflow in ceph_zero_objects()

Dongli Zhang (1):

      vhost-scsi: protect vq->log_used with vq->mutex

Eric Biggers (1):
x86/its: Fix build errors when CONFIG_MODULES=n

Eric Dumazet (2):
net_sched: sch_sfq: reject invalid perturb period
atm: clip: prevent NULL deref in clip_push()

Filipe Manana (3):
btrfs: fix missing error handling when searching for inode refs during log replay
btrfs: propagate last_unlink_trans earlier when doing a rmdir
btrfs: use btrfs_record_snapshot_destroy() during rmdir

Frédéric Danis (1):
Bluetooth: L2CAP: Fix L2CAP MTU negotiation

Fushuai Wang (1):
dpaa2-eth: fix xdp_rxq_info leak

George Kennedy (1):

      VMCI: check context->notify_page after call to get_user_pages_fast() to avoid GPF

Greg Kroah-Hartman (1):

      Linux 5.10.240

Gustavo A. R. Silva (1):
net: rose: Fix fall-through warnings for Clang

Haiyang Zhang (1):
Drivers: hv: vmbus: Fix duplicate CPU assignments within a device

Hans de Goede (1):
Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID

HarshaVardhana S A (1):
vsock/vmci: Clear the vmci transport packet properly when initializing it

Heinz Mauelshagen (1):
dm-raid: fix variable in journal device check

Ioana Ciornei (2):
dpaa2-eth: rename dpaa2_eth_xdp_release_buf into dpaa2_eth_recycle_buf
net: dpaa2-eth: rearrange variable in dpaa2_eth_get_ethtool_stats

JP Kobryn (1):
x86/mce: Make sure CMCI banks are cleared during shutdown on Intel

Jakub Kicinski (1):
netlink: make sure we allow at least one dump skb

James Clark (1):
spi: spi-fsl-dspi: Clear completion counter before initiating transfer

Jann Horn (1):
x86/mm: Disable hugetlb page table sharing on 32-bit

Janusz Krzysztofik (1):
drm/i915/gt: Fix timeline left held on VMA alloc error

Jay Cornwall (1):
drm/amdkfd: Fix race in GWS queue scheduling

Johannes Berg (3):
ata: pata_cs5536: fix build on 32-bit UML
wifi: mac80211: drop invalid source address OCB frames
wifi: ath6kl: remove WARN on bad firmware input

Jonathan Cameron (1):
iio: pressure: zpa2326: Use aligned_s64 for the timestamp

Jos Wang (1):
usb: typec: displayport: Receive DP Status Update NAK request exit dp altmode

Josh Poimboeuf (1):
x86/alternatives: Remove faulty optimization

Junlin Yang (2):
usb: typec: tcpci_maxim: remove redundant assignment
usb: typec: tcpci_maxim: add terminating newlines to logging

Kaustabh Chakraborty (1):
drm/exynos: exynos7_drm_decon: add vblank check in IRQ handling

Kees Cook (1):
ovl: Check for NULL d_inode() in ovl_dentry_upper()

Kito Xu (1):
net: appletalk: Fix device refcount leak in atrtr_create()

Kohei Enju (1):
rose: fix dangling neighbour pointers in rose_rt_device_down()

Krzysztof Kozlowski (1):
mfd: max14577: Fix wakeup source leaks on device unbind

Kuen-Han Tsai (1):
usb: gadget: u_serial: Fix race condition in TTY wakeup

Kuniyuki Iwashima (8):
atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister().
nfs: Clean up /proc/net/rpc/nfs when nfs_fs_proc_net_init() fails.
netlink: Fix wraparounds of sk->sk_rmem_alloc.
tipc: Fix use-after-free in tipc_conn_close().
atm: clip: Fix potential null-ptr-deref in to_atmarpd().
atm: clip: Fix memory leak of struct clip_vcc.
atm: clip: Fix infinite recursive call of clip_push().
netlink: Fix rmem check in netlink_broadcast_deliver().

Lachlan Hodges (1):
wifi: mac80211: fix beacon interval calculation overflow

Linggang Zeng (1):
bcache: fix NULL pointer in cache_set_flush()

Lion Ackermann (1):
net/sched: Always pass notifications when child class becomes empty

Long Li (1):
uio_hv_generic: Align ring size to system page

Madhavan Srinivasan (1):
powerpc: Fix struct termio related ioctl macros

Manivannan Sadhasivam (1):
regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods

Marek Szyprowski (2):
media: omap3isp: use sgtable-based scatterlist wrappers drm/exynos: fimd: Guard display clock control with runtime PM calls

Mark Harmstone (1):
btrfs: update superblock's device bytes_used when dropping chunk

Mark Zhang (1):

      RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insert

Masami Hiramatsu (Google) (2):
mtk-sd: Fix a pagefault in dma_unmap_sg() for not prepared data
mtk-sd: Prevent memory corruption from DMA map failure

Mateusz Jończyk (1):
rtc: cmos: use spin_lock_irqsave in cmos_interrupt

Mathias Nyman (1):
xhci: dbc: Flush queued requests before stopping dbc

Matt Reynolds (1):
Input: xpad - add support for Amazon Game Controller

Matthew Brost (1):
drm/sched: Increment job count before swapping tail spsc queue

Maurizio Lombardi (1):
scsi: target: Fix NULL pointer dereference in core_scsi3_decode_spec_i_port()

Maíra Canal (1):
drm/v3d: Disable interrupts before resetting the GPU

Michael Jeanson (1):
rseq: Fix segfault on registration when rseq_cs is non-zero

Michal Luczaj (3):
vsock: Fix transport_{g2h,h2g} TOCTOU
vsock: Fix transport_* TOCTOU
vsock: Fix IOCTL_VM_SOCKETS_GET_LOCAL_CID to check also transport_local

Nathan Chancellor (2):
s390: Add '-std=gnu11' to decompressor and purgatory CFLAGS
staging: rtl8723bs: Avoid memset() in aes_cipher() and aes_decipher()

Nicolas Pitre (1):
vt: add missing notification when switching back to text mode

Niklas Cassel (1):
PCI: cadence-ep: Correct PBA offset in .set_msix() callback

Nilton Perim Neto (1):
Input: xpad - support Acer NGR 200 Controller

Oleg Nesterov (1):
fs/proc: do_task_stat: use __for_each_thread()

Oleksij Rempel (3):
net: phy: smsc: Fix Auto-MDIX configuration when disabled by strap
net: phy: smsc: Fix link failure in forced mode with Auto-MDIX
net: phy: microchip: limit 100M workaround to link-down events on LAN88xx

Olga Kornievskaia (1):
NFSv4.2: fix listxattr to return selinux security label

Oliver Neukum (1):
Logitech C-270 even more broken

Pali Rohár (1):
cifs: Fix cifs_query_path_info() for Windows NT servers

Patrisious Haddad (2):
RDMA/mlx5: Fix CC counters query for MPV RDMA/mlx5: Fix vport loopback for MPV device

Pawan Gupta (7):
Documentation: x86/bugs/its: Add ITS documentation x86/its: Enumerate Indirect Target Selection (ITS) bug x86/its: Add support for ITS-safe indirect thunk x86/its: Add support for ITS-safe return thunk x86/its: Fix undefined reference to cpu_wants_rethunk_at() x86/its: Enable Indirect Target Selection mitigation x86/its: Add "vmexit" option to skip mitigation on some CPUs

Peng Fan (1):
mailbox: Not protect module_put with spin_lock_irqsave

Peter Zijlstra (5):
perf: Revert to requiring CAP_SYS_ADMIN for uprobes x86/alternatives: Introduce int3_emulate_jcc() x86/alternatives: Teach text_poke_bp() to patch Jcc.d32 instructions x86/its: Use dynamic thunks for indirect branches x86/its: FineIBT-paranoid vs ITS

Qasim Ijaz (3):
HID: wacom: fix memory leak on kobject creation failure
HID: wacom: fix memory leak on sysfs attribute creation failure
HID: wacom: fix kobject reference count leak

Qiu-ji Chen (1):
drm/tegra: Fix a possible null pointer dereference

RD Babiera (1):
usb: typec: altmodes/displayport: do not index invalid pin_assignments

Radu Bulie (2):
dpaa2-eth: Update dpni_get_single_step_cfg command
dpaa2-eth: Update SINGLE_STEP register access

Rafael J. Wysocki (2):
ACPICA: Refuse to evaluate a method if arguments are missing Revert "ACPI: battery: negate current when discharging"

Raju Rangoju (1):
amd-xgbe: align CL37 AN sequence as per databook

Ricardo Ribalda (3):
media: uvcvideo: Return the number of processed controls
media: uvcvideo: Send control events for partial succeeds
media: uvcvideo: Rollback non processed entities on error

Robert Hodaszi (1):
usb: cdc-wdm: avoid setting WDM_READ for ZLP-s

Sami Tolvanen (1):
um: Add cmpxchg8b_emu and checksum functions to asm-prototypes.h

Saurabh Sengar (2):
Drivers: hv: vmbus: Add utility function for querying ring size
uio_hv_generic: Query the ringbuffer size for device

Sean Nyekjaer (1):
can: m_can: m_can_handle_lost_msg(): downgrade msg lost in rx message to debug level

Seiji Nishikawa (1):
ACPI: PAD: fix crash in exit_round_robin()

Sergey Senozhatsky (1):

      mtk-sd: reset host->mrq on prepare_data() error

Shengjiu Wang (1):
ASoC: fsl_asrc: use internal measured ratio for non-ideal ratio mode

Shin'ichiro Kawasaki (1):
RDMA/iwcm: Fix use-after-free of work objects after cm_id destruction

Shravya KN (1):
bnxt_en: Fix DCB ETS validation

Simon Horman (1):
net: enetc: Correct endianness handling in _enetc_rd_reg64

Somnath Kotur (1):
bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT

Stefano Garzarella (1):
vsock/uapi: fix linux/vm_sockets.h userspace compilation errors

Sven Schwermer (1):
leds: multicolor: Fix intensity setting while SW blinking

Takashi Iwai (1):
ALSA: sb: Force to disable DMAs once when DMA mode is changed

Thierry Reding (1):
drm/tegra: Assign plane type before registration

Thomas Fourier (5):
scsi: qla2xxx: Fix DMA mapping test in qla24xx_get_port_database()
scsi: qla4xxx: Fix missing DMA mapping error in qla4xxx_alloc_pdu()
nui: Fix dma_mapping_error() check
ethernet: atl1: Add missing DMA mapping error checks and count errors
atm: idt77252: Add missing dma_map_error()

Thomas Gessler (1):
dmaengine: xilinx_dma: Set dma_device directions

Thomas Gleixner (1):
x86/modules: Set VM_FLUSH_RESET_PERMS in module_alloc()

Thomas Zimmermann (1):
drm/udl: Unregister device before cleaning up on disconnect

Tigran Mkrtchyan (1):
flexfiles/pNFS: update stats on NFS4ERR_DELAY for v4.1 DSes

Tiwei Bie (2):
um: ubd: Add missing error check in start_io_thread()
um: vector: Reduce stack usage in vector_eth_configure()

Trond Myklebust (1):
NFSv4/flexfiles: Fix handling of NFS level errors in I/O

Uladzislau Rezki (Sony) (1):
rcu: Return early if callback is not specified

Ulf Hansson (1):
Revert "mmc: sdhci: Disable SD card clock before changing parameters"

Uwe Kleine-König (1):
pwm: mediatek: Ensure to disable clocks in error path

Vasiliy Kovalev (1):
jfs: validate AG parameters in dbMount() to prevent crashes

Vicki Pfau (1):
Input: xpad - add VID for Turtle Beach controllers

Victor Nogueira (1):
net/sched: Abort __tc_modify_qdisc if parent class does not exist

Victor Shih (1):
mmc: sdhci: Add a helper function for dump register in dynamic debug mode

Vijendar Mukunda (1):
ALSA: hda: Add new pci id for AMD GPU display HD audio controller

Vitaly Kuznetsov (1):
Drivers: hv: Rename 'alloced' to 'allocated'

Wang Jinchao (1):
md/raid1: Fix stack memory use after return in raid1_reshape

Weihang Li (1):
RDMA/core: Use refcount_t instead of atomic_t on refcount of iwcm_id_private

Wolfram Sang (2):
i2c: tiny-usb: disable zero-length read messages
i2c: robotfuzz-osif: disable zero-length read messages

Wupeng Ma (1):
VMCI: fix race between vmci_host_setup_notify and vmci_ctx_unset_notify

Xiaowei Li (1):
net: usb: qmi_wwan: add SIMCom 8230C composition

Yao Zi (1):
dt-bindings: serial: 8250: Make clocks and clock-frequency exclusive

Yazen Ghannam (2):
x86/mce/amd: Fix threshold limit reset
x86/mce: Don't remove sysfs if thresholding sysfs init fails

Youngjun Lee (1):
ALSA: usb-audio: Fix out-of-bounds read in snd_usb_get_audioformat_uac3()

Yu Kuai (1):
md/md-bitmap: fix dm-raid max_write_behind setting

Yuan Chen (1):
libbpf: Fix null pointer dereference in btf_dump__free on allocation failure

Yue Haibing (1):
atm: clip: Fix NULL pointer dereference in vcc_sendmsg()

Yue Hu (1):
mmc: mediatek: use data instead of mrq parameter from msdc_{un}prepare_data()

Zhang Heng (1):
HID: Add IGNORE quirk for SMARTLINKTECHNOLOGY

Łukasz Bartosik (1):
xhci: dbctty: disable ECHO flag by default

author maintainer
#1 lore raw
Documentation/ABI/testing/sysfs-devices-system-cpu +2 -0
index 2a273bfebed0..bf2b83e9c07d 100644
@@ -502,6 +502,7 @@ Description:	information about CPUs heterogeneity.
 
 What:		/sys/devices/system/cpu/vulnerabilities
 		/sys/devices/system/cpu/vulnerabilities/gather_data_sampling
+		/sys/devices/system/cpu/vulnerabilities/indirect_target_selection
 		/sys/devices/system/cpu/vulnerabilities/itlb_multihit
 		/sys/devices/system/cpu/vulnerabilities/l1tf
 		/sys/devices/system/cpu/vulnerabilities/mds
@@ -513,6 +514,7 @@ What:		/sys/devices/system/cpu/vulnerabilities
 		/sys/devices/system/cpu/vulnerabilities/spectre_v1
 		/sys/devices/system/cpu/vulnerabilities/spectre_v2
 		/sys/devices/system/cpu/vulnerabilities/srbds
+		/sys/devices/system/cpu/vulnerabilities/tsa
 		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
 Date:		January 2018
 Contact:	Linux kernel mailing list <[email protected]>
Documentation/ABI/testing/sysfs-driver-ufs +1 -1
index adc0d0e91607..00d8bd574d1a 100644
@@ -655,7 +655,7 @@ Description:	This file shows the thin provisioning type. This is one of
 
 		The file is read only.
 
-What:		/sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count
+What:		/sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count
 Date:		February 2018
 Contact:	Stanislav Nijnikov <[email protected]>
 Description:	This file shows the total physical memory resources. This is
Documentation/admin-guide/hw-vuln/index.rst +1 -0
index e020d1637e1c..04a7f9fea3f2 100644
@@ -19,3 +19,4 @@ are configurable at compile, boot or run time.
    gather_data_sampling.rst
    srso
    reg-file-data-sampling
+   indirect-target-selection
Documentation/admin-guide/hw-vuln/indirect-target-selection.rst new file +156 -0

156 lines not on this page · raw message

Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst +1 -3
index c98fd11907cc..e916dc232b0f 100644
@@ -157,9 +157,7 @@ This is achieved by using the otherwise unused and obsolete VERW instruction in
 combination with a microcode update. The microcode clears the affected CPU
 buffers when the VERW instruction is executed.
 
-Kernel reuses the MDS function to invoke the buffer clearing:
-
-	mds_clear_cpu_buffers()
+Kernel does the buffer clearing with x86_clear_cpu_buffers().
 
 On MDS affected CPUs, the kernel already invokes CPU buffer clear on
 kernel/userspace, hypervisor/guest and C-state (idle) transitions. No
Documentation/admin-guide/kernel-parameters.txt +28 -0
index 1eff15169983..bbe6c23a5778 100644
@@ -1851,6 +1851,20 @@
 			different crypto accelerators. This option can be used
 			to achieve best performance for particular HW.
 
+	indirect_target_selection= [X86,Intel] Mitigation control for Indirect
+			Target Selection(ITS) bug in Intel CPUs. Updated
+			microcode is also required for a fix in IBPB.
+
+			on:     Enable mitigation (default).
+			off:    Disable mitigation.
+			force:	Force the ITS bug and deploy default
+				mitigation.
+			vmexit: Only deploy mitigation if CPU is affected by
+				guest/host isolation part of ITS.
+
+			For details see:
+			Documentation/admin-guide/hw-vuln/indirect-target-selection.rst
+
 	init=		[KNL]
 			Format: <full_path>
 			Run specified binary instead of /sbin/init as init
@@ -2938,6 +2952,7 @@
 				improves system performance, but it may also
 				expose users to several CPU vulnerabilities.
 				Equivalent to: gather_data_sampling=off [X86]
+					       indirect_target_selection=off [X86]
 					       kpti=0 [ARM64]
 					       kvm.nx_huge_pages=off [X86]
 					       l1tf=off [X86]
@@ -5604,6 +5619,19 @@
 			See Documentation/admin-guide/mm/transhuge.rst
 			for more details.
 
+	tsa=		[X86] Control mitigation for Transient Scheduler
+			Attacks on AMD CPUs. Search the following in your
+			favourite search engine for more details:
+
+			"Technical guidance for mitigating transient scheduler
+			attacks".
+
+			off		- disable the mitigation
+			on		- enable the mitigation (default)
+			user		- mitigate only user/kernel transitions
+			vm		- mitigate only guest/host transitions
+
+
 	tsc=		Disable clocksource stability checks for TSC.
 			Format: <string>
 			[x86] reliable: mark tsc clocksource as reliable, this
Documentation/devicetree/bindings/serial/8250.yaml +1 -1
index 460cb546c54a..de1a869dd96f 100644
@@ -39,7 +39,7 @@ allOf:
                   - ns16550
                   - ns16550a
     then:
-      anyOf:
+      oneOf:
         - required: [ clock-frequency ]
         - required: [ clocks ]
 
Makefile +1 -1
index 9ffd9397399d..cff26a5d22bb 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 239
+SUBLEVEL = 240
 EXTRAVERSION =
 NAME = Dare mighty things
 
arch/arm64/mm/mmu.c +2 -1
index 78f9fb638c9c..b584bf200619 100644
@@ -1459,7 +1459,8 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr)
 	next = addr;
 	end = addr + PUD_SIZE;
 	do {
-		pmd_free_pte_page(pmdp, next);
+		if (pmd_present(READ_ONCE(*pmdp)))
+			pmd_free_pte_page(pmdp, next);
 	} while (pmdp++, next += PMD_SIZE, next != end);
 
 	pud_clear(pudp);
arch/powerpc/include/uapi/asm/ioctls.h +4 -4
index 2c145da3b774..b5211e413829 100644
@@ -23,10 +23,10 @@
 #define TCSETSW		_IOW('t', 21, struct termios)
 #define TCSETSF		_IOW('t', 22, struct termios)
 
-#define TCGETA		_IOR('t', 23, struct termio)
-#define TCSETA		_IOW('t', 24, struct termio)
-#define TCSETAW		_IOW('t', 25, struct termio)
-#define TCSETAF		_IOW('t', 28, struct termio)
+#define TCGETA		0x40147417 /* _IOR('t', 23, struct termio) */
+#define TCSETA		0x80147418 /* _IOW('t', 24, struct termio) */
+#define TCSETAW		0x80147419 /* _IOW('t', 25, struct termio) */
+#define TCSETAF		0x8014741c /* _IOW('t', 28, struct termio) */
 
 #define TCSBRK		_IO('t', 29)
 #define TCXONC		_IO('t', 30)
arch/s390/Makefile +1 -1
index 39ffcd4389f1..92f2426d8797 100644
@@ -23,7 +23,7 @@ endif
 aflags_dwarf	:= -Wa,-gdwarf-2
 KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__
 KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))
-KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2
+KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 -std=gnu11
 KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY
 KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float
 KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
arch/s390/purgatory/Makefile +1 -1
index a93c9aba834b..955f113cf320 100644
@@ -20,7 +20,7 @@ GCOV_PROFILE := n
 UBSAN_SANITIZE := n
 KASAN_SANITIZE := n
 
-KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes
+KBUILD_CFLAGS := -std=gnu11 -fno-strict-aliasing -Wall -Wstrict-prototypes
 KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare
 KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding
 KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common
arch/um/drivers/ubd_user.c +1 -1
index a1afe414ce48..fb5b1e7c133d 100644
@@ -41,7 +41,7 @@ int start_io_thread(unsigned long sp, int *fd_out)
 	*fd_out = fds[1];
 
 	err = os_set_fd_block(*fd_out, 0);
-	err = os_set_fd_block(kernel_fd, 0);
+	err |= os_set_fd_block(kernel_fd, 0);
 	if (err) {
 		printk("start_io_thread - failed to set nonblocking I/O.\n");
 		goto out_close;
arch/um/drivers/vector_kern.c +13 -29

48 lines not on this page · raw message

arch/um/include/asm/asm-prototypes.h +5 -0
index 5898a26daa0d..408b31d59127 100644
@@ -1 +1,6 @@
 #include <asm-generic/asm-prototypes.h>
+#include <asm/checksum.h>
+
+#ifdef CONFIG_UML_X86
+extern void cmpxchg8b_emu(void);
+#endif
arch/x86/Kconfig +21 -1
index 93a1f9937a9b..77efb16cbc24 100644
@@ -102,7 +102,7 @@ config X86
 	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
 	select ARCH_WANT_DEFAULT_BPF_JIT	if X86_64
 	select ARCH_WANTS_DYNAMIC_TASK_STRUCT
-	select ARCH_WANT_HUGE_PMD_SHARE
+	select ARCH_WANT_HUGE_PMD_SHARE		if X86_64
 	select ARCH_WANT_LD_ORPHAN_WARN
 	select ARCH_WANTS_THP_SWAP		if X86_64
 	select BUILDTIME_TABLE_SORT
@@ -2521,6 +2521,26 @@ config MITIGATION_RFDS
 	  stored in floating point, vector and integer registers.
 	  See also <file:Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst>
 
+config MITIGATION_ITS
+	bool "Enable Indirect Target Selection mitigation"
+	depends on CPU_SUP_INTEL && X86_64
+	depends on RETPOLINE && RETHUNK
+	default y
+	help
+	  Enable Indirect Target Selection (ITS) mitigation. ITS is a bug in
+	  BPU on some Intel CPUs that may allow Spectre V2 style attacks. If
+	  disabled, mitigation cannot be enabled via cmdline.
+	  See <file:Documentation/admin-guide/hw-vuln/indirect-target-selection.rst>
+
+config MITIGATION_TSA
+	bool "Mitigate Transient Scheduler Attacks"
+	depends on CPU_SUP_AMD
+	default y
+	help
+	  Enable mitigation for Transient Scheduler Attacks. TSA is a hardware
+	  security vulnerability on AMD CPUs which can lead to forwarding of
+	  invalid info to subsequent instructions and thus can affect their
+	  timing and thereby cause a leakage.
 endif
 
 config ARCH_HAS_ADD_PAGES
arch/x86/entry/entry.S +4 -4
index bda217961172..057eeb4eda4e 100644
@@ -31,20 +31,20 @@ EXPORT_SYMBOL_GPL(entry_ibpb);
 
 /*
  * Define the VERW operand that is disguised as entry code so that
- * it can be referenced with KPTI enabled. This ensure VERW can be
+ * it can be referenced with KPTI enabled. This ensures VERW can be
  * used late in exit-to-user path after page tables are switched.
  */
 .pushsection .entry.text, "ax"
 
 .align L1_CACHE_BYTES, 0xcc
-SYM_CODE_START_NOALIGN(mds_verw_sel)
+SYM_CODE_START_NOALIGN(x86_verw_sel)
 	UNWIND_HINT_EMPTY
 	ANNOTATE_NOENDBR
 	.word __KERNEL_DS
 .align L1_CACHE_BYTES, 0xcc
-SYM_CODE_END(mds_verw_sel);
+SYM_CODE_END(x86_verw_sel);
 /* For KVM */
-EXPORT_SYMBOL_GPL(mds_verw_sel);
+EXPORT_SYMBOL_GPL(x86_verw_sel);
 
 .popsection
 
arch/x86/include/asm/alternative.h +26 -0
index 0e777b27972b..f2cce0cd87a6 100644
@@ -80,6 +80,32 @@ extern void apply_returns(s32 *start, s32 *end);
 
 struct module;
 
+extern u8 *its_static_thunk(int reg);
+
+#ifdef CONFIG_MITIGATION_ITS
+extern void its_init_mod(struct module *mod);
+extern void its_fini_mod(struct module *mod);
+extern void its_free_mod(struct module *mod);
+#else /* CONFIG_MITIGATION_ITS */
+static inline void its_init_mod(struct module *mod) { }
+static inline void its_fini_mod(struct module *mod) { }
+static inline void its_free_mod(struct module *mod) { }
+#endif
+
+#if defined(CONFIG_RETHUNK) && defined(CONFIG_STACK_VALIDATION)
+extern bool cpu_wants_rethunk(void);
+extern bool cpu_wants_rethunk_at(void *addr);
+#else
+static __always_inline bool cpu_wants_rethunk(void)
+{
+	return false;
+}
+static __always_inline bool cpu_wants_rethunk_at(void *addr)
+{
+	return false;
+}
+#endif
+
 #ifdef CONFIG_SMP
 extern void alternatives_smp_module_add(struct module *mod, char *name,
 					void *locks, void *locks_end,
arch/x86/include/asm/cpu.h +13 -0
index da78ccbd493b..96ed5f1ceef5 100644
@@ -63,4 +63,17 @@ void init_ia32_feat_ctl(struct cpuinfo_x86 *c);
 #else
 static inline void init_ia32_feat_ctl(struct cpuinfo_x86 *c) {}
 #endif
+
+union zen_patch_rev {
+	struct {
+		__u32 rev	 : 8,
+		      stepping	 : 4,
+		      model	 : 4,
+		      __reserved : 4,
+		      ext_model	 : 4,
+		      ext_fam	 : 8;
+	};
+	__u32 ucode_rev;
+};
+
 #endif /* _ASM_X86_CPU_H */
arch/x86/include/asm/cpufeature.h +3 -2
index 955ca6b13e35..c8e966ed7aa4 100644
@@ -34,6 +34,7 @@ enum cpuid_leafs
 	CPUID_8000_001F_EAX,
 	CPUID_8000_0021_EAX,
 	CPUID_LNX_5,
+	CPUID_8000_0021_ECX,
 	NR_CPUID_WORDS,
 };
 
@@ -97,7 +98,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
 	   CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 20, feature_bit) ||	\
 	   CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 21, feature_bit) ||	\
 	   REQUIRED_MASK_CHECK					  ||	\
-	   BUILD_BUG_ON_ZERO(NCAPINTS != 22))
+	   BUILD_BUG_ON_ZERO(NCAPINTS != 23))
 
 #define DISABLED_MASK_BIT_SET(feature_bit)				\
 	 ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK,  0, feature_bit) ||	\
@@ -123,7 +124,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
 	   CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 20, feature_bit) ||	\
 	   CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 21, feature_bit) ||	\
 	   DISABLED_MASK_CHECK					  ||	\
-	   BUILD_BUG_ON_ZERO(NCAPINTS != 22))
+	   BUILD_BUG_ON_ZERO(NCAPINTS != 23))
 
 #define cpu_has(c, bit)							\
 	(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 :	\
arch/x86/include/asm/cpufeatures.h +11 -3
index f3365ec97376..ae0fbb168656 100644
@@ -13,7 +13,7 @@
 /*
  * Defines x86 CPU feature bits
  */
-#define NCAPINTS			22	   /* N 32-bit words worth of info */
+#define NCAPINTS			23	   /* N 32-bit words worth of info */
 #define NBUGINTS			2	   /* N 32-bit bug flags */
 
 /*
@@ -289,8 +289,8 @@
 #define X86_FEATURE_FENCE_SWAPGS_KERNEL	(11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */
 #define X86_FEATURE_SPLIT_LOCK_DETECT	(11*32+ 6) /* #AC for split lock */
 #define X86_FEATURE_PER_THREAD_MBA	(11*32+ 7) /* "" Per-thread Memory Bandwidth Allocation */
-/* FREE!				(11*32+ 8) */
-/* FREE!				(11*32+ 9) */
+#define X86_FEATURE_BHI_CTRL		(11*32+ 8) /* "" BHI_DIS_S HW control available */
+#define X86_FEATURE_INDIRECT_THUNK_ITS	(11*32+ 9) /* "" Use thunk for indirect branches in lower half of cacheline */
 #define X86_FEATURE_ENTRY_IBPB		(11*32+10) /* "" Issue an IBPB on kernel entry */
 #define X86_FEATURE_RRSBA_CTRL		(11*32+11) /* "" RET prediction control */
 #define X86_FEATURE_RETPOLINE		(11*32+12) /* "" Generic Retpoline mitigation for Spectre variant 2 */
@@ -406,11 +406,16 @@
 #define X86_FEATURE_SEV_ES		(19*32+ 3) /* AMD Secure Encrypted Virtualization - Encrypted State */
 #define X86_FEATURE_SME_COHERENT	(19*32+10) /* "" AMD hardware-enforced cache coherency */
 
+#define X86_FEATURE_VERW_CLEAR		(20*32+ 5) /* "" The memory form of VERW mitigates TSA */
 #define X86_FEATURE_AUTOIBRS		(20*32+ 8) /* "" Automatic IBRS */
 #define X86_FEATURE_SBPB		(20*32+27) /* "" Selective Branch Prediction Barrier */
 #define X86_FEATURE_IBPB_BRTYPE		(20*32+28) /* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */
 #define X86_FEATURE_SRSO_NO		(20*32+29) /* "" CPU is not affected by SRSO */
 
+#define X86_FEATURE_TSA_SQ_NO          (22*32+11) /* "" AMD CPU not vulnerable to TSA-SQ */
+#define X86_FEATURE_TSA_L1_NO          (22*32+12) /* "" AMD CPU not vulnerable to TSA-L1 */
+#define X86_FEATURE_CLEAR_CPU_BUF_VM   (22*32+13) /* "" Clear CPU buffers using VERW before VMRUN */
+
 /*
  * BUG word(s)
  */
@@ -459,4 +464,7 @@
 #define X86_BUG_RFDS			X86_BUG(1*32 + 2) /* CPU is vulnerable to Register File Data Sampling */
 #define X86_BUG_BHI			X86_BUG(1*32 + 3) /* CPU is affected by Branch History Injection */
 #define X86_BUG_IBPB_NO_RET		X86_BUG(1*32 + 4) /* "ibpb_no_ret" IBPB omits return target predictions */
+#define X86_BUG_ITS			X86_BUG(1*32 + 5) /* CPU is affected by Indirect Target Selection */
+#define X86_BUG_ITS_NATIVE_ONLY		X86_BUG(1*32 + 6) /* CPU is affected by ITS, VMX is not affected */
+#define X86_BUG_TSA			X86_BUG(1*32 + 9) /* "tsa" CPU is affected by Transient Scheduler Attacks */
 #endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/include/asm/disabled-features.h +1 -1
index e5f44a3e275c..170c87253340 100644
@@ -104,6 +104,6 @@
 #define DISABLED_MASK19	0
 #define DISABLED_MASK20	0
 #define DISABLED_MASK21	0
-#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 22)
+#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 23)
 
 #endif /* _ASM_X86_DISABLED_FEATURES_H */
arch/x86/include/asm/irqflags.h +2 -2
index e585a4705b8d..62b29995e51c 100644
@@ -56,13 +56,13 @@ static __always_inline void native_irq_enable(void)
 
 static inline __cpuidle void native_safe_halt(void)
 {
-	mds_idle_clear_cpu_buffers();
+	x86_idle_clear_cpu_buffers();
 	asm volatile("sti; hlt": : :"memory");
 }
 
 static inline __cpuidle void native_halt(void)
 {
-	mds_idle_clear_cpu_buffers();
+	x86_idle_clear_cpu_buffers();
 	asm volatile("hlt": : :"memory");
 }
 
arch/x86/include/asm/msr-index.h +12 -1
index 7fd03f4ff9ed..a479530e59ab 100644
@@ -55,10 +55,13 @@
 #define SPEC_CTRL_SSBD			BIT(SPEC_CTRL_SSBD_SHIFT)	/* Speculative Store Bypass Disable */
 #define SPEC_CTRL_RRSBA_DIS_S_SHIFT	6	   /* Disable RRSBA behavior */
 #define SPEC_CTRL_RRSBA_DIS_S		BIT(SPEC_CTRL_RRSBA_DIS_S_SHIFT)
+#define SPEC_CTRL_BHI_DIS_S_SHIFT	10	   /* Disable Branch History Injection behavior */
+#define SPEC_CTRL_BHI_DIS_S		BIT(SPEC_CTRL_BHI_DIS_S_SHIFT)
 
 /* A mask for bits which the kernel toggles when controlling mitigations */
 #define SPEC_CTRL_MITIGATIONS_MASK	(SPEC_CTRL_IBRS | SPEC_CTRL_STIBP | SPEC_CTRL_SSBD \
-							| SPEC_CTRL_RRSBA_DIS_S)
+							| SPEC_CTRL_RRSBA_DIS_S \
+							| SPEC_CTRL_BHI_DIS_S)
 
 #define MSR_IA32_PRED_CMD		0x00000049 /* Prediction Command */
 #define PRED_CMD_IBPB			BIT(0)	   /* Indirect Branch Prediction Barrier */
@@ -176,6 +179,14 @@
 						 * VERW clears CPU Register
 						 * File.
 						 */
+#define ARCH_CAP_ITS_NO			BIT_ULL(62) /*
+						     * Not susceptible to
+						     * Indirect Target Selection.
+						     * This bit is not set by
+						     * HW, but is synthesized by
+						     * VMMs for guests to know
+						     * their affected status.
+						     */
 
 #define MSR_IA32_FLUSH_CMD		0x0000010b
 #define L1D_FLUSH			BIT(0)	/*
arch/x86/include/asm/mwait.h +13 -6
index 29dd27b5a339..2a2de4f3cb20 100644
@@ -43,8 +43,6 @@ static inline void __monitorx(const void *eax, unsigned long ecx,
 
 static inline void __mwait(unsigned long eax, unsigned long ecx)
 {
-	mds_idle_clear_cpu_buffers();
-
 	/* "mwait %eax, %ecx;" */
 	asm volatile(".byte 0x0f, 0x01, 0xc9;"
 		     :: "a" (eax), "c" (ecx));
@@ -79,7 +77,7 @@ static inline void __mwait(unsigned long eax, unsigned long ecx)
 static inline void __mwaitx(unsigned long eax, unsigned long ebx,
 			    unsigned long ecx)
 {
-	/* No MDS buffer clear as this is AMD/HYGON only */
+	/* No need for TSA buffer clearing on AMD */
 
 	/* "mwaitx %eax, %ebx, %ecx;" */
 	asm volatile(".byte 0x0f, 0x01, 0xfb;"
@@ -88,7 +86,7 @@ static inline void __mwaitx(unsigned long eax, unsigned long ebx,
 
 static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
 {
-	mds_idle_clear_cpu_buffers();
+
 	/* "mwait %eax, %ecx;" */
 	asm volatile("sti; .byte 0x0f, 0x01, 0xc9;"
 		     :: "a" (eax), "c" (ecx));
@@ -106,6 +104,11 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
  */
 static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
 {
+	if (need_resched())
+		return;
+
+	x86_idle_clear_cpu_buffers();
+
 	if (static_cpu_has_bug(X86_BUG_MONITOR) || !current_set_polling_and_test()) {
 		if (static_cpu_has_bug(X86_BUG_CLFLUSH_MONITOR)) {
 			mb();
@@ -114,9 +117,13 @@ static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
 		}
 
 		__monitor((void *)&current_thread_info()->flags, 0, 0);
-		if (!need_resched())
-			__mwait(eax, ecx);
+		if (need_resched())
+			goto out;
+
+		__mwait(eax, ecx);
 	}
+
+out:
 	current_clr_polling();
 }
 
arch/x86/include/asm/nospec-branch.h +34 -16

109 lines not on this page · raw message

arch/x86/include/asm/required-features.h +1 -1
index 1fbe53583e95..4e3cd318323b 100644
@@ -104,6 +104,6 @@
 #define REQUIRED_MASK19	0
 #define REQUIRED_MASK20	0
 #define REQUIRED_MASK21	0
-#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 22)
+#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 23)
 
 #endif /* _ASM_X86_REQUIRED_FEATURES_H */
arch/x86/include/asm/text-patching.h +31 -0
index c6015b407461..7281ce64e99d 100644
@@ -181,6 +181,37 @@ void int3_emulate_ret(struct pt_regs *regs)
 	unsigned long ip = int3_emulate_pop(regs);
 	int3_emulate_jmp(regs, ip);
 }
+
+static __always_inline
+void int3_emulate_jcc(struct pt_regs *regs, u8 cc, unsigned long ip, unsigned long disp)
+{
+	static const unsigned long jcc_mask[6] = {
+		[0] = X86_EFLAGS_OF,
+		[1] = X86_EFLAGS_CF,
+		[2] = X86_EFLAGS_ZF,
+		[3] = X86_EFLAGS_CF | X86_EFLAGS_ZF,
+		[4] = X86_EFLAGS_SF,
+		[5] = X86_EFLAGS_PF,
+	};
+
+	bool invert = cc & 1;
+	bool match;
+
+	if (cc < 0xc) {
+		match = regs->flags & jcc_mask[cc >> 1];
+	} else {
+		match = ((regs->flags & X86_EFLAGS_SF) >> X86_EFLAGS_SF_BIT) ^
+			((regs->flags & X86_EFLAGS_OF) >> X86_EFLAGS_OF_BIT);
+		if (cc >= 0xe)
+			match = match || (regs->flags & X86_EFLAGS_ZF);
+	}
+
+	if ((match && !invert) || (!match && invert))
+		ip += disp;
+
+	int3_emulate_jmp(regs, ip);
+}
+
 #endif /* !CONFIG_UML_X86 */
 
 #endif /* _ASM_X86_TEXT_PATCHING_H */
arch/x86/kernel/alternative.c +295 -13

418 lines not on this page · raw message

arch/x86/kernel/cpu/amd.c +58 -0

70 lines not on this page · raw message

arch/x86/kernel/cpu/bugs.c +263 -9

364 lines not on this page · raw message

arch/x86/kernel/cpu/common.c +64 -13

111 lines not on this page · raw message

arch/x86/kernel/cpu/mce/amd.c +7 -8
index cd8db6b9ca2f..c011fe79f024 100644
@@ -297,7 +297,6 @@ static void smca_configure(unsigned int bank, unsigned int cpu)
 
 struct thresh_restart {
 	struct threshold_block	*b;
-	int			reset;
 	int			set_lvt_off;
 	int			lvt_off;
 	u16			old_limit;
@@ -392,13 +391,13 @@ static void threshold_restart_bank(void *_tr)
 
 	rdmsr(tr->b->address, lo, hi);
 
-	if (tr->b->threshold_limit < (hi & THRESHOLD_MAX))
-		tr->reset = 1;	/* limit cannot be lower than err count */
-
-	if (tr->reset) {		/* reset err count and overflow bit */
-		hi =
-		    (hi & ~(MASK_ERR_COUNT_HI | MASK_OVERFLOW_HI)) |
-		    (THRESHOLD_MAX - tr->b->threshold_limit);
+	/*
+	 * Reset error count and overflow bit.
+	 * This is done during init or after handling an interrupt.
+	 */
+	if (hi & MASK_OVERFLOW_HI || tr->set_lvt_off) {
+		hi &= ~(MASK_ERR_COUNT_HI | MASK_OVERFLOW_HI);
+		hi |= THRESHOLD_MAX - tr->b->threshold_limit;
 	} else if (tr->old_limit) {	/* change limit w/o reset */
 		int new_count = (hi & THRESHOLD_MAX) +
 		    (tr->old_limit - tr->b->threshold_limit);
arch/x86/kernel/cpu/mce/core.c +1 -7
index 97ab29429093..3199dfcb757c 100644
@@ -2627,15 +2627,9 @@ static int mce_cpu_dead(unsigned int cpu)
 static int mce_cpu_online(unsigned int cpu)
 {
 	struct timer_list *t = this_cpu_ptr(&mce_timer);
-	int ret;
 
 	mce_device_create(cpu);
-
-	ret = mce_threshold_create_device(cpu);
-	if (ret) {
-		mce_device_remove(cpu);
-		return ret;
-	}
+	mce_threshold_create_device(cpu);
 	mce_reenable_cpu();
 	mce_start_timer(t);
 	return 0;
arch/x86/kernel/cpu/mce/intel.c +1 -0
index 886d4648c9dd..85356dc936b5 100644
@@ -522,6 +522,7 @@ void mce_intel_feature_init(struct cpuinfo_x86 *c)
 void mce_intel_feature_clear(struct cpuinfo_x86 *c)
 {
 	intel_clear_lmce();
+	cmci_clear();
 }
 
 bool intel_filter_mce(struct mce *m)
arch/x86/kernel/cpu/scattered.c +1 -0
index f1cd1b6fb99e..53a9a55dc086 100644
@@ -27,6 +27,7 @@ static const struct cpuid_bit cpuid_bits[] = {
 	{ X86_FEATURE_APERFMPERF,       CPUID_ECX,  0, 0x00000006, 0 },
 	{ X86_FEATURE_EPB,		CPUID_ECX,  3, 0x00000006, 0 },
 	{ X86_FEATURE_RRSBA_CTRL,	CPUID_EDX,  2, 0x00000007, 2 },
+	{ X86_FEATURE_BHI_CTRL,		CPUID_EDX,  4, 0x00000007, 2 },
 	{ X86_FEATURE_CQM_LLC,		CPUID_EDX,  1, 0x0000000f, 0 },
 	{ X86_FEATURE_CQM_OCCUP_LLC,	CPUID_EDX,  0, 0x0000000f, 1 },
 	{ X86_FEATURE_CQM_MBM_TOTAL,	CPUID_EDX,  1, 0x0000000f, 1 },
arch/x86/kernel/ftrace.c +1 -3
index 46447877b594..bb02d5d474c2 100644
@@ -367,7 +367,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
 		goto fail;
 
 	ip = trampoline + size;
-	if (cpu_feature_enabled(X86_FEATURE_RETHUNK))
+	if (cpu_wants_rethunk_at(ip))
 		__text_gen_insn(ip, JMP32_INSN_OPCODE, ip, x86_return_thunk, JMP32_INSN_SIZE);
 	else
 		memcpy(ip, retq, sizeof(retq));
@@ -422,8 +422,6 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
 	/* ALLOC_TRAMP flags lets us know we created it */
 	ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
 
-	set_vm_flush_reset_perms(trampoline);
-
 	if (likely(system_state != SYSTEM_BOOTING))
 		set_memory_ro((unsigned long)trampoline, npages);
 	set_memory_x((unsigned long)trampoline, npages);
arch/x86/kernel/kprobes/core.c +8 -31
index 6d59c8e7719b..5254317125d8 100644
@@ -403,7 +403,6 @@ void *alloc_insn_page(void)
 	if (!page)
 		return NULL;
 
-	set_vm_flush_reset_perms(page);
 	/*
 	 * First make the page read-only, and only then make it executable to
 	 * prevent it from being W+X in between.
@@ -462,50 +461,26 @@ static void kprobe_emulate_call(struct kprobe *p, struct pt_regs *regs)
 }
 NOKPROBE_SYMBOL(kprobe_emulate_call);
 
-static nokprobe_inline
-void __kprobe_emulate_jmp(struct kprobe *p, struct pt_regs *regs, bool cond)
+static void kprobe_emulate_jmp(struct kprobe *p, struct pt_regs *regs)
 {
 	unsigned long ip = regs->ip - INT3_INSN_SIZE + p->ainsn.size;
 
-	if (cond)
-		ip += p->ainsn.rel32;
+	ip += p->ainsn.rel32;
 	int3_emulate_jmp(regs, ip);
 }
-
-static void kprobe_emulate_jmp(struct kprobe *p, struct pt_regs *regs)
-{
-	__kprobe_emulate_jmp(p, regs, true);
-}
 NOKPROBE_SYMBOL(kprobe_emulate_jmp);
 
-static const unsigned long jcc_mask[6] = {
-	[0] = X86_EFLAGS_OF,
-	[1] = X86_EFLAGS_CF,
-	[2] = X86_EFLAGS_ZF,
-	[3] = X86_EFLAGS_CF | X86_EFLAGS_ZF,
-	[4] = X86_EFLAGS_SF,
-	[5] = X86_EFLAGS_PF,
-};
-
 static void kprobe_emulate_jcc(struct kprobe *p, struct pt_regs *regs)
 {
-	bool invert = p->ainsn.jcc.type & 1;
-	bool match;
+	unsigned long ip = regs->ip - INT3_INSN_SIZE + p->ainsn.size;
 
-	if (p->ainsn.jcc.type < 0xc) {
-		match = regs->flags & jcc_mask[p->ainsn.jcc.type >> 1];
-	} else {
-		match = ((regs->flags & X86_EFLAGS_SF) >> X86_EFLAGS_SF_BIT) ^
-			((regs->flags & X86_EFLAGS_OF) >> X86_EFLAGS_OF_BIT);
-		if (p->ainsn.jcc.type >= 0xe)
-			match = match || (regs->flags & X86_EFLAGS_ZF);
-	}
-	__kprobe_emulate_jmp(p, regs, (match && !invert) || (!match && invert));
+	int3_emulate_jcc(regs, p->ainsn.jcc.type, ip, p->ainsn.rel32);
 }
 NOKPROBE_SYMBOL(kprobe_emulate_jcc);
 
 static void kprobe_emulate_loop(struct kprobe *p, struct pt_regs *regs)
 {
+	unsigned long ip = regs->ip - INT3_INSN_SIZE + p->ainsn.size;
 	bool match;
 
 	if (p->ainsn.loop.type != 3) {	/* LOOP* */
@@ -533,7 +508,9 @@ static void kprobe_emulate_loop(struct kprobe *p, struct pt_regs *regs)
 	else if (p->ainsn.loop.type == 1)	/* LOOPE */
 		match = match && (regs->flags & X86_EFLAGS_ZF);
 
-	__kprobe_emulate_jmp(p, regs, match);
+	if (match)
+		ip += p->ainsn.rel32;
+	int3_emulate_jmp(regs, ip);
 }
 NOKPROBE_SYMBOL(kprobe_emulate_loop);
 
arch/x86/kernel/module.c +10 -4
index 455e195847f9..1ab8e583c795 100644
@@ -73,10 +73,10 @@ void *module_alloc(unsigned long size)
 		return NULL;
 
 	p = __vmalloc_node_range(size, MODULE_ALIGN,
-				    MODULES_VADDR + get_module_load_offset(),
-				    MODULES_END, GFP_KERNEL,
-				    PAGE_KERNEL, 0, NUMA_NO_NODE,
-				    __builtin_return_address(0));
+				 MODULES_VADDR + get_module_load_offset(),
+				 MODULES_END, GFP_KERNEL, PAGE_KERNEL,
+				 VM_FLUSH_RESET_PERMS, NUMA_NO_NODE,
+				 __builtin_return_address(0));
 	if (p && (kasan_module_alloc(p, size) < 0)) {
 		vfree(p);
 		return NULL;
@@ -274,10 +274,15 @@ int module_finalize(const Elf_Ehdr *hdr,
 			returns = s;
 	}
 
+	its_init_mod(me);
+
 	if (retpolines) {
 		void *rseg = (void *)retpolines->sh_addr;
 		apply_retpolines(rseg, rseg + retpolines->sh_size);
 	}
+
+	its_fini_mod(me);
+
 	if (returns) {
 		void *rseg = (void *)returns->sh_addr;
 		apply_returns(rseg, rseg + returns->sh_size);
@@ -313,4 +318,5 @@ int module_finalize(const Elf_Ehdr *hdr,
 void module_arch_cleanup(struct module *mod)
 {
 	alternatives_smp_module_del(mod);
+	its_free_mod(mod);
 }
arch/x86/kernel/process.c +12 -3
index 34e7c49b8057..fd91c301218d 100644
@@ -825,6 +825,11 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)
  */
 static __cpuidle void mwait_idle(void)
 {
+	if (need_resched())
+		return;
+
+	x86_idle_clear_cpu_buffers();
+
 	if (!current_set_polling_and_test()) {
 		if (this_cpu_has(X86_BUG_CLFLUSH_MONITOR)) {
 			mb(); /* quirk */
@@ -833,13 +838,17 @@ static __cpuidle void mwait_idle(void)
 		}
 
 		__monitor((void *)&current_thread_info()->flags, 0, 0);
-		if (!need_resched())
-			__sti_mwait(0, 0);
-		else
+		if (need_resched()) {
 			raw_local_irq_enable();
+			goto out;
+		}
+
+		__sti_mwait(0, 0);
 	} else {
 		raw_local_irq_enable();
 	}
+
+out:
 	__current_clr_polling();
 }
 
arch/x86/kernel/static_call.c +1 -1
index 4544f124bbd4..42564d29eb1b 100644
@@ -41,7 +41,7 @@ static void __ref __static_call_transform(void *insn, enum insn_type type,
 		break;
 
 	case RET:
-		if (cpu_feature_enabled(X86_FEATURE_RETHUNK))
+		if (cpu_wants_rethunk_at(insn))
 			code = text_gen_insn(JMP32_INSN_OPCODE, insn, x86_return_thunk);
 		else
 			code = &retinsn;
arch/x86/kernel/vmlinux.lds.S +8 -0
index 740f87d8aa48..1f77896515c5 100644
@@ -538,6 +538,14 @@ INIT_PER_CPU(irq_stack_backing_store);
 		"SRSO function pair won't alias");
 #endif
 
+#ifdef CONFIG_MITIGATION_ITS
+. = ASSERT(__x86_indirect_its_thunk_rax & 0x20, "__x86_indirect_thunk_rax not in second half of cacheline");
+. = ASSERT(((__x86_indirect_its_thunk_rcx - __x86_indirect_its_thunk_rax) % 64) == 0, "Indirect thunks are not cacheline apart");
+. = ASSERT(__x86_indirect_its_thunk_array == __x86_indirect_its_thunk_rax, "Gap in ITS thunk array");
+
+. = ASSERT(its_return_thunk & 0x20, "its_return_thunk not in second half of cacheline");
+#endif
+
 #endif /* CONFIG_X86_32 */
 
 #ifdef CONFIG_KEXEC_CORE
arch/x86/kvm/cpuid.c +30 -1
index 8b07e48612d7..ab0ae4a30fd1 100644
@@ -500,6 +500,15 @@ void kvm_set_cpu_caps(void)
 	 */
 	kvm_cpu_cap_mask(CPUID_8000_000A_EDX, 0);
 
+	if (cpu_feature_enabled(X86_FEATURE_VERW_CLEAR))
+		kvm_cpu_cap_set(X86_FEATURE_VERW_CLEAR);
+
+	if (cpu_feature_enabled(X86_FEATURE_TSA_SQ_NO))
+		kvm_cpu_cap_set(X86_FEATURE_TSA_SQ_NO);
+
+	if (cpu_feature_enabled(X86_FEATURE_TSA_L1_NO))
+		kvm_cpu_cap_set(X86_FEATURE_TSA_L1_NO);
+
 	kvm_cpu_cap_mask(CPUID_C000_0001_EDX,
 		F(XSTORE) | F(XSTORE_EN) | F(XCRYPT) | F(XCRYPT_EN) |
 		F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) |
@@ -810,7 +819,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
 		entry->edx = 0;
 		break;
 	case 0x80000000:
-		entry->eax = min(entry->eax, 0x8000001f);
+		entry->eax = min(entry->eax, 0x80000021);
 		break;
 	case 0x80000001:
 		entry->ebx &= ~GENMASK(27, 16);
@@ -875,6 +884,26 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
 		if (!boot_cpu_has(X86_FEATURE_SEV))
 			entry->eax = entry->ebx = entry->ecx = entry->edx = 0;
 		break;
+	case 0x80000020:
+		entry->eax = entry->ebx = entry->ecx = entry->edx = 0;
+		break;
+	case 0x80000021:
+		entry->ebx = entry->edx = 0;
+		/*
+		 * Pass down these bits:
+		 *    EAX      0      NNDBP, Processor ignores nested data breakpoints
+		 *    EAX      2      LAS, LFENCE always serializing
+		 *    EAX      5      VERW_CLEAR, mitigate TSA
+		 *    EAX      6      NSCB, Null selector clear base
+		 *
+		 * Other defined bits are for MSRs that KVM does not expose:
+		 *   EAX      3      SPCL, SMM page configuration lock
+		 *   EAX      13     PCMSR, Prefetch control MSR
+		 */
+		cpuid_entry_override(entry, CPUID_8000_0021_EAX);
+		entry->eax &= BIT(0) | BIT(2) | BIT(5) | BIT(6);
+		cpuid_entry_override(entry, CPUID_8000_0021_ECX);
+		break;
 	/*Add support for Centaur's CPUID instruction*/
 	case 0xC0000000:
 		/*Just support up to 0xC0000004 now*/
arch/x86/kvm/cpuid.h +1 -0
index e25853c2eb0f..88315d43d380 100644
@@ -64,6 +64,7 @@ static const struct cpuid_reg reverse_cpuid[] = {
 	[CPUID_7_EDX]         = {         7, 0, CPUID_EDX},
 	[CPUID_7_1_EAX]       = {         7, 1, CPUID_EAX},
 	[CPUID_8000_0021_EAX] = {0x80000021, 0, CPUID_EAX},
+	[CPUID_8000_0021_ECX] = {0x80000021, 0, CPUID_ECX},
 };
 
 /*
arch/x86/kvm/svm/vmenter.S +3 -0
index a8859c173258..c3ec69f94b45 100644
@@ -77,6 +77,9 @@ SYM_FUNC_START(__svm_vcpu_run)
 	/* "POP" @vmcb to RAX. */
 	pop %_ASM_AX
 
+	/* Clobbers EFLAGS.ZF */
+	VM_CLEAR_CPU_BUFFERS
+
 	/* Enter guest mode */
 	sti
 1:	vmload %_ASM_AX
arch/x86/kvm/vmx/vmx.c +1 -1
index 1908f2aae9fa..795bbaf89d94 100644
@@ -6810,7 +6810,7 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu,
 		vmx_l1d_flush(vcpu);
 	else if (static_branch_unlikely(&mmio_stale_data_clear) &&
 		 kvm_arch_has_assigned_device(vcpu->kvm))
-		mds_clear_cpu_buffers();
+		x86_clear_cpu_buffers();
 
 	vmx_disable_fb_clear(vmx);
 
arch/x86/kvm/x86.c +3 -1
index bc295439360e..b61f697479a3 100644
@@ -1390,7 +1390,7 @@ static unsigned int num_msr_based_features;
 	 ARCH_CAP_PSCHANGE_MC_NO | ARCH_CAP_TSX_CTRL_MSR | ARCH_CAP_TAA_NO | \
 	 ARCH_CAP_SBDR_SSDP_NO | ARCH_CAP_FBSDP_NO | ARCH_CAP_PSDP_NO | \
 	 ARCH_CAP_FB_CLEAR | ARCH_CAP_RRSBA | ARCH_CAP_PBRSB_NO | ARCH_CAP_GDS_NO | \
-	 ARCH_CAP_RFDS_NO | ARCH_CAP_RFDS_CLEAR)
+	 ARCH_CAP_RFDS_NO | ARCH_CAP_RFDS_CLEAR | ARCH_CAP_ITS_NO)
 
 static u64 kvm_get_arch_capabilities(void)
 {
@@ -1429,6 +1429,8 @@ static u64 kvm_get_arch_capabilities(void)
 		data |= ARCH_CAP_MDS_NO;
 	if (!boot_cpu_has_bug(X86_BUG_RFDS))
 		data |= ARCH_CAP_RFDS_NO;
+	if (!boot_cpu_has_bug(X86_BUG_ITS))
+		data |= ARCH_CAP_ITS_NO;
 
 	if (!boot_cpu_has(X86_FEATURE_RTM)) {
 		/*
arch/x86/lib/retpoline.S +39 -0
index d1902213a0d6..01fcf0cd679b 100644
@@ -255,6 +255,45 @@ SYM_FUNC_START(entry_untrain_ret)
 SYM_FUNC_END(entry_untrain_ret)
 __EXPORT_THUNK(entry_untrain_ret)
 
+#ifdef CONFIG_MITIGATION_ITS
+
+.macro ITS_THUNK reg
+
+SYM_INNER_LABEL(__x86_indirect_its_thunk_\reg, SYM_L_GLOBAL)
+	UNWIND_HINT_EMPTY
+	ANNOTATE_NOENDBR
+	ANNOTATE_RETPOLINE_SAFE
+	jmp *%\reg
+	int3
+	.align 32, 0xcc		/* fill to the end of the line */
+	.skip  32, 0xcc		/* skip to the next upper half */
+.endm
+
+/* ITS mitigation requires thunks be aligned to upper half of cacheline */
+.align 64, 0xcc
+.skip 32, 0xcc
+SYM_CODE_START(__x86_indirect_its_thunk_array)
+
+#define GEN(reg) ITS_THUNK reg
+#include <asm/GEN-for-each-reg.h>
+#undef GEN
+
+	.align 64, 0xcc
+SYM_CODE_END(__x86_indirect_its_thunk_array)
+
+.align 64, 0xcc
+.skip 32, 0xcc
+SYM_CODE_START(its_return_thunk)
+	UNWIND_HINT_FUNC
+	ANNOTATE_NOENDBR
+	ANNOTATE_UNRET_SAFE
+	ret
+	int3
+SYM_CODE_END(its_return_thunk)
+EXPORT_SYMBOL(its_return_thunk)
+
+#endif /* CONFIG_MITIGATION_ITS */
+
 SYM_CODE_START(__x86_return_thunk)
 	UNWIND_HINT_FUNC
 	ANNOTATE_NOENDBR
arch/x86/net/bpf_jit_comp.c +6 -2
index d7d592c09298..d3450088569f 100644
@@ -387,7 +387,11 @@ static void emit_indirect_jump(u8 **pprog, int reg, u8 *ip)
 	int cnt = 0;
 
 #ifdef CONFIG_RETPOLINE
-	if (cpu_feature_enabled(X86_FEATURE_RETPOLINE_LFENCE)) {
+	if (IS_ENABLED(CONFIG_MITIGATION_ITS) &&
+	    cpu_feature_enabled(X86_FEATURE_INDIRECT_THUNK_ITS)) {
+		OPTIMIZER_HIDE_VAR(reg);
+		emit_jump(&prog, its_static_thunk(reg), ip);
+	} else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE_LFENCE)) {
 		EMIT_LFENCE();
 		EMIT2(0xFF, 0xE0 + reg);
 	} else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {
@@ -404,7 +408,7 @@ static void emit_return(u8 **pprog, u8 *ip)
 	u8 *prog = *pprog;
 	int cnt = 0;
 
-	if (cpu_feature_enabled(X86_FEATURE_RETHUNK)) {
+	if (cpu_wants_rethunk()) {
 		emit_jump(&prog, x86_return_thunk, ip);
 	} else {
 		EMIT1(0xC3);		/* ret */
arch/x86/um/asm/checksum.h +3 -0
index b07824500363..ddc144657efa 100644
@@ -20,6 +20,9 @@
  */
 extern __wsum csum_partial(const void *buff, int len, __wsum sum);
 
+/* Do not call this directly. Declared for export type visibility. */
+extern __visible __wsum csum_partial_copy_generic(const void *src, void *dst, int len);
+
 /**
  * csum_fold - Fold and invert a 32bit checksum.
  * sum: 32bit unfolded sum
drivers/acpi/acpi_pad.c +5 -2
index b84ab722feb4..6d592d8655cd 100644
@@ -128,8 +128,11 @@ static void round_robin_cpu(unsigned int tsk_index)
 static void exit_round_robin(unsigned int tsk_index)
 {
 	struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);
-	cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
-	tsk_in_cpu[tsk_index] = -1;
+
+	if (tsk_in_cpu[tsk_index] != -1) {
+		cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);
+		tsk_in_cpu[tsk_index] = -1;
+	}
 }
 
 static unsigned int idle_pct = 5; /* percentage */
drivers/acpi/acpica/dsmethod.c +7 -0
index 97971c79c5f5..13c67f58e905 100644
@@ -483,6 +483,13 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
 		return_ACPI_STATUS(AE_NULL_OBJECT);
 	}
 
+	if (this_walk_state->num_operands < obj_desc->method.param_count) {
+		ACPI_ERROR((AE_INFO, "Missing argument for method [%4.4s]",
+			    acpi_ut_get_node_name(method_node)));
+
+		return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
+	}
+
 	/* Init for new method, possibly wait on method mutex */
 
 	status =
drivers/acpi/battery.c +3 -16
index 4a188cc28b5c..f9fb092f33a2 100644
@@ -255,23 +255,10 @@ static int acpi_battery_get_property(struct power_supply *psy,
 		break;
 	case POWER_SUPPLY_PROP_CURRENT_NOW:
 	case POWER_SUPPLY_PROP_POWER_NOW:
-		if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN) {
+		if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
 			ret = -ENODEV;
-			break;
-		}
-
-		val->intval = battery->rate_now * 1000;
-		/*
-		 * When discharging, the current should be reported as a
-		 * negative number as per the power supply class interface
-		 * definition.
-		 */
-		if (psp == POWER_SUPPLY_PROP_CURRENT_NOW &&
-		    (battery->state & ACPI_BATTERY_STATE_DISCHARGING) &&
-		    acpi_battery_handle_discharging(battery)
-				== POWER_SUPPLY_STATUS_DISCHARGING)
-			val->intval = -val->intval;
-
+		else
+			val->intval = battery->rate_now * 1000;
 		break;
 	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
 	case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
drivers/ata/pata_cs5536.c +1 -1
index 760ac6e65216..3737d1bf1539 100644
@@ -27,7 +27,7 @@
 #include <scsi/scsi_host.h>
 #include <linux/dmi.h>
 
-#ifdef CONFIG_X86_32
+#if defined(CONFIG_X86) && defined(CONFIG_X86_32)
 #include <asm/msr.h>
 static int use_msr;
 module_param_named(msr, use_msr, int, 0644);
drivers/atm/idt77252.c +5 -0
index 25fd73fafb37..89b0ed8e5143 100644
@@ -852,6 +852,8 @@ queue_skb(struct idt77252_dev *card, struct vc_map *vc,
 
 	IDT77252_PRV_PADDR(skb) = dma_map_single(&card->pcidev->dev, skb->data,
 						 skb->len, DMA_TO_DEVICE);
+	if (dma_mapping_error(&card->pcidev->dev, IDT77252_PRV_PADDR(skb)))
+		return -ENOMEM;
 
 	error = -EINVAL;
 
@@ -1863,6 +1865,8 @@ add_rx_skb(struct idt77252_dev *card, int queue,
 		paddr = dma_map_single(&card->pcidev->dev, skb->data,
 				       skb_end_pointer(skb) - skb->data,
 				       DMA_FROM_DEVICE);
+		if (dma_mapping_error(&card->pcidev->dev, paddr))
+			goto outpoolrm;
 		IDT77252_PRV_PADDR(skb) = paddr;
 
 		if (push_rx_skb(card, skb, queue)) {
@@ -1877,6 +1881,7 @@ add_rx_skb(struct idt77252_dev *card, int queue,
 	dma_unmap_single(&card->pcidev->dev, IDT77252_PRV_PADDR(skb),
 			 skb_end_pointer(skb) - skb->data, DMA_FROM_DEVICE);
 
+outpoolrm:
 	handle = IDT77252_PRV_POOL(skb);
 	card->sbpool[POOL_QUEUE(handle)].skb[POOL_INDEX(handle)] = NULL;
 
drivers/base/cpu.c +15 -0
index e3aed8333f09..377d8837e2b1 100644
@@ -597,6 +597,17 @@ ssize_t __weak cpu_show_reg_file_data_sampling(struct device *dev,
 	return sysfs_emit(buf, "Not affected\n");
 }
 
+ssize_t __weak cpu_show_indirect_target_selection(struct device *dev,
+						  struct device_attribute *attr, char *buf)
+{
+	return sysfs_emit(buf, "Not affected\n");
+}
+
+ssize_t __weak cpu_show_tsa(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	return sysfs_emit(buf, "Not affected\n");
+}
+
 static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL);
 static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL);
 static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL);
@@ -611,6 +622,8 @@ static DEVICE_ATTR(retbleed, 0444, cpu_show_retbleed, NULL);
 static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gds, NULL);
 static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL);
 static DEVICE_ATTR(reg_file_data_sampling, 0444, cpu_show_reg_file_data_sampling, NULL);
+static DEVICE_ATTR(indirect_target_selection, 0444, cpu_show_indirect_target_selection, NULL);
+static DEVICE_ATTR(tsa, 0444, cpu_show_tsa, NULL);
 
 static struct attribute *cpu_root_vulnerabilities_attrs[] = {
 	&dev_attr_meltdown.attr,
@@ -627,6 +640,8 @@ static struct attribute *cpu_root_vulnerabilities_attrs[] = {
 	&dev_attr_gather_data_sampling.attr,
 	&dev_attr_spec_rstack_overflow.attr,
 	&dev_attr_reg_file_data_sampling.attr,
+	&dev_attr_indirect_target_selection.attr,
+	&dev_attr_tsa.attr,
 	NULL
 };
 
drivers/dma-buf/dma-resv.c +1 -1
index 1187e5e80ede..539cb4e04338 100644
@@ -591,7 +591,7 @@ long dma_resv_wait_timeout_rcu(struct dma_resv *obj,
 			goto retry;
 		}
 
-		ret = dma_fence_wait_timeout(fence, intr, ret);
+		ret = dma_fence_wait_timeout(fence, intr, timeout);
 		dma_fence_put(fence);
 		if (ret > 0 && wait_all && (i + 1 < shared_count))
 			goto retry;
drivers/dma/xilinx/xilinx_dma.c +2 -0
index 12ad4bb3c5f2..3ecf0109af2b 100644
@@ -2844,6 +2844,8 @@ static int xilinx_dma_chan_probe(struct xilinx_dma_device *xdev,
 		return -EINVAL;
 	}
 
+	xdev->common.directions |= chan->direction;
+
 	/* Request the interrupt */
 	chan->irq = irq_of_parse_and_map(node, chan->tdest);
 	err = request_irq(chan->irq, xdev->dma_config->irq_handler,
drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c +1 -1
index e3ba0cd3b6fa..a60bffe48501 100644
@@ -156,7 +156,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
 
 	packet->bitfields2.engine_sel =
 		engine_sel__mes_map_queues__compute_vi;
-	packet->bitfields2.gws_control_queue = q->gws ? 1 : 0;
+	packet->bitfields2.gws_control_queue = q->properties.is_gws ? 1 : 0;
 	packet->bitfields2.extended_engine_sel =
 		extended_engine_sel__mes_map_queues__legacy_engine_sel;
 	packet->bitfields2.queue_type =
drivers/gpu/drm/bridge/cdns-dsi.c +22 -5
index 0ced08d81d7a..77f05378efbd 100644
@@ -608,15 +608,18 @@ static int cdns_dsi_check_conf(struct cdns_dsi *dsi,
 	struct phy_configure_opts_mipi_dphy *phy_cfg = &output->phy_opts.mipi_dphy;
 	unsigned long dsi_hss_hsa_hse_hbp;
 	unsigned int nlanes = output->dev->lanes;
+	int mode_clock = (mode_valid_check ? mode->clock : mode->crtc_clock);
 	int ret;
 
 	ret = cdns_dsi_mode2cfg(dsi, mode, dsi_cfg, mode_valid_check);
 	if (ret)
 		return ret;
 
-	phy_mipi_dphy_get_default_config(mode->crtc_clock * 1000,
-					 mipi_dsi_pixel_format_to_bpp(output->dev->format),
-					 nlanes, phy_cfg);
+	ret = phy_mipi_dphy_get_default_config(mode_clock * 1000,
+					       mipi_dsi_pixel_format_to_bpp(output->dev->format),
+					       nlanes, phy_cfg);
+	if (ret)
+		return ret;
 
 	ret = cdns_dsi_adjust_phy_config(dsi, dsi_cfg, phy_cfg, mode, mode_valid_check);
 	if (ret)
@@ -786,8 +789,9 @@ static void cdns_dsi_bridge_enable(struct drm_bridge *bridge)
 	struct phy_configure_opts_mipi_dphy *phy_cfg = &output->phy_opts.mipi_dphy;
 	unsigned long tx_byte_period;
 	struct cdns_dsi_cfg dsi_cfg;
-	u32 tmp, reg_wakeup, div;
+	u32 tmp, reg_wakeup, div, status;
 	int nlanes;
+	int i;
 
 	if (WARN_ON(pm_runtime_get_sync(dsi->base.dev) < 0))
 		return;
@@ -800,6 +804,19 @@ static void cdns_dsi_bridge_enable(struct drm_bridge *bridge)
 	cdns_dsi_hs_init(dsi);
 	cdns_dsi_init_link(dsi);
 
+	/*
+	 * Now that the DSI Link and DSI Phy are initialized,
+	 * wait for the CLK and Data Lanes to be ready.
+	 */
+	tmp = CLK_LANE_RDY;
+	for (i = 0; i < nlanes; i++)
+		tmp |= DATA_LANE_RDY(i);
+
+	if (readl_poll_timeout(dsi->regs + MCTL_MAIN_STS, status,
+			       (tmp == (status & tmp)), 100, 500000))
+		dev_err(dsi->base.dev,
+			"Timed Out: DSI-DPhy Clock and Data Lanes not ready.\n");
+
 	writel(HBP_LEN(dsi_cfg.hbp) | HSA_LEN(dsi_cfg.hsa),
 	       dsi->regs + VID_HSIZE1);
 	writel(HFP_LEN(dsi_cfg.hfp) | HACT_LEN(dsi_cfg.hact),
@@ -960,7 +977,7 @@ static int cdns_dsi_attach(struct mipi_dsi_host *host,
 		bridge = drm_panel_bridge_add_typed(panel,
 						    DRM_MODE_CONNECTOR_DSI);
 	} else {
-		bridge = of_drm_find_bridge(dev->dev.of_node);
+		bridge = of_drm_find_bridge(np);
 		if (!bridge)
 			bridge = ERR_PTR(-EINVAL);
 	}
drivers/gpu/drm/exynos/exynos7_drm_decon.c +4 -0
index 1c04c232dce1..81494d593830 100644
@@ -595,6 +595,10 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id)
 	if (!ctx->drm_dev)
 		goto out;
 
+	/* check if crtc and vblank have been initialized properly */
+	if (!drm_dev_has_vblank(ctx->drm_dev))
+		goto out;
+
 	if (!ctx->i80_if) {
 		drm_crtc_handle_vblank(&ctx->crtc->base);
 
drivers/gpu/drm/exynos/exynos_drm_fimd.c +12 -0
index c045330f9c48..3b89a8774db5 100644
@@ -182,6 +182,7 @@ struct fimd_context {
 	u32				i80ifcon;
 	bool				i80_if;
 	bool				suspended;
+	bool				dp_clk_enabled;
 	wait_queue_head_t		wait_vsync_queue;
 	atomic_t			wait_vsync_event;
 	atomic_t			win_updated;
@@ -1003,7 +1004,18 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable)
 	struct fimd_context *ctx = container_of(clk, struct fimd_context,
 						dp_clk);
 	u32 val = enable ? DP_MIE_CLK_DP_ENABLE : DP_MIE_CLK_DISABLE;
+
+	if (enable == ctx->dp_clk_enabled)
+		return;
+
+	if (enable)
+		pm_runtime_resume_and_get(ctx->dev);
+
+	ctx->dp_clk_enabled = enable;
 	writel(val, ctx->regs + DP_MIE_CLKCON);
+
+	if (!enable)
+		pm_runtime_put(ctx->dev);
 }
 
 static const struct exynos_drm_crtc_ops fimd_crtc_ops = {
drivers/gpu/drm/i915/gt/intel_ring_submission.c +2 -1
index 6aaca73eaee6..af57192a7846 100644
@@ -576,7 +576,6 @@ static int ring_context_alloc(struct intel_context *ce)
 	/* One ringbuffer to rule them all */
 	GEM_BUG_ON(!engine->legacy.ring);
 	ce->ring = engine->legacy.ring;
-	ce->timeline = intel_timeline_get(engine->legacy.timeline);
 
 	GEM_BUG_ON(ce->state);
 	if (engine->context_size) {
@@ -591,6 +590,8 @@ static int ring_context_alloc(struct intel_context *ce)
 			__set_bit(CONTEXT_VALID_BIT, &ce->flags);
 	}
 
+	ce->timeline = intel_timeline_get(engine->legacy.timeline);
+
 	return 0;
 }
 
drivers/gpu/drm/i915/selftests/i915_request.c +10 -10
index 7a72faf29f27..1881a97659a7 100644
@@ -71,8 +71,8 @@ static int igt_add_request(void *arg)
 	/* Basic preliminary test to create a request and let it loose! */
 
 	request = mock_request(rcs0(i915)->kernel_context, HZ / 10);
-	if (!request)
-		return -ENOMEM;
+	if (IS_ERR(request))
+		return PTR_ERR(request);
 
 	i915_request_add(request);
 
@@ -89,8 +89,8 @@ static int igt_wait_request(void *arg)
 	/* Submit a request, then wait upon it */
 
 	request = mock_request(rcs0(i915)->kernel_context, T);
-	if (!request)
-		return -ENOMEM;
+	if (IS_ERR(request))
+		return PTR_ERR(request);
 
 	i915_request_get(request);
 
@@ -158,8 +158,8 @@ static int igt_fence_wait(void *arg)
 	/* Submit a request, treat it as a fence and wait upon it */
 
 	request = mock_request(rcs0(i915)->kernel_context, T);
-	if (!request)
-		return -ENOMEM;
+	if (IS_ERR(request))
+		return PTR_ERR(request);
 
 	if (dma_fence_wait_timeout(&request->fence, false, T) != -ETIME) {
 		pr_err("fence wait success before submit (expected timeout)!\n");
@@ -213,8 +213,8 @@ static int igt_request_rewind(void *arg)
 	GEM_BUG_ON(IS_ERR(ce));
 	request = mock_request(ce, 2 * HZ);
 	intel_context_put(ce);
-	if (!request) {
-		err = -ENOMEM;
+	if (IS_ERR(request)) {
+		err = PTR_ERR(request);
 		goto err_context_0;
 	}
 
@@ -227,8 +227,8 @@ static int igt_request_rewind(void *arg)
 	GEM_BUG_ON(IS_ERR(ce));
 	vip = mock_request(ce, 0);
 	intel_context_put(ce);
-	if (!vip) {
-		err = -ENOMEM;
+	if (IS_ERR(vip)) {
+		err = PTR_ERR(vip);
 		goto err_context_1;
 	}
 
drivers/gpu/drm/i915/selftests/mock_request.c +1 -1
index 09f747228dff..1b0cf073e964 100644
@@ -35,7 +35,7 @@ mock_request(struct intel_context *ce, unsigned long delay)
 	/* NB the i915->requests slab cache is enlarged to fit mock_request */
 	request = intel_context_create_request(ce);
 	if (IS_ERR(request))
-		return NULL;
+		return request;
 
 	request->mock.delay = delay;
 	return request;
drivers/gpu/drm/tegra/dc.c +12 -5
index 958d12da902d..85b4c2cc544f 100644
@@ -1134,10 +1134,16 @@ static struct drm_plane *tegra_dc_add_shared_planes(struct drm_device *drm,
 		if (wgrp->dc == dc->pipe) {
 			for (j = 0; j < wgrp->num_windows; j++) {
 				unsigned int index = wgrp->windows[j];
+				enum drm_plane_type type;
+
+				if (primary)
+					type = DRM_PLANE_TYPE_OVERLAY;
+				else
+					type = DRM_PLANE_TYPE_PRIMARY;
 
 				plane = tegra_shared_plane_create(drm, dc,
 								  wgrp->index,
-								  index);
+								  index, type);
 				if (IS_ERR(plane))
 					return plane;
 
@@ -1145,10 +1151,8 @@ static struct drm_plane *tegra_dc_add_shared_planes(struct drm_device *drm,
 				 * Choose the first shared plane owned by this
 				 * head as the primary plane.
 				 */
-				if (!primary) {
-					plane->type = DRM_PLANE_TYPE_PRIMARY;
+				if (!primary)
 					primary = plane;
-				}
 			}
 		}
 	}
@@ -1202,7 +1206,10 @@ static void tegra_crtc_reset(struct drm_crtc *crtc)
 	if (crtc->state)
 		tegra_crtc_atomic_destroy_state(crtc, crtc->state);
 
-	__drm_atomic_helper_crtc_reset(crtc, &state->base);
+	if (state)
+		__drm_atomic_helper_crtc_reset(crtc, &state->base);
+	else
+		__drm_atomic_helper_crtc_reset(crtc, NULL);
 }
 
 static struct drm_crtc_state *
drivers/gpu/drm/tegra/hub.c +2 -2
index 5ce771cba133..bafc865afe4b 100644
@@ -551,9 +551,9 @@ static const struct drm_plane_helper_funcs tegra_shared_plane_helper_funcs = {
 struct drm_plane *tegra_shared_plane_create(struct drm_device *drm,
 					    struct tegra_dc *dc,
 					    unsigned int wgrp,
-					    unsigned int index)
+					    unsigned int index,
+					    enum drm_plane_type type)
 {
-	enum drm_plane_type type = DRM_PLANE_TYPE_OVERLAY;
 	struct tegra_drm *tegra = drm->dev_private;
 	struct tegra_display_hub *hub = tegra->hub;
 	/* planes can be assigned to arbitrary CRTCs */
drivers/gpu/drm/tegra/hub.h +2 -1
index 3efa1be07ff8..aa219450413a 100644
@@ -81,7 +81,8 @@ void tegra_display_hub_cleanup(struct tegra_display_hub *hub);
 struct drm_plane *tegra_shared_plane_create(struct drm_device *drm,
 					    struct tegra_dc *dc,
 					    unsigned int wgrp,
-					    unsigned int index);
+					    unsigned int index,
+					    enum drm_plane_type type);
 
 int tegra_display_hub_atomic_check(struct drm_device *drm,
 				   struct drm_atomic_state *state);
drivers/gpu/drm/udl/udl_drv.c +1 -1
index bcf32d188c1b..8ea6fcde40bd 100644
@@ -115,9 +115,9 @@ static void udl_usb_disconnect(struct usb_interface *interface)
 {
 	struct drm_device *dev = usb_get_intfdata(interface);
 
+	drm_dev_unplug(dev);
 	drm_kms_helper_poll_fini(dev);
 	udl_drop_usb(dev);
-	drm_dev_unplug(dev);
 }
 
 /*
drivers/gpu/drm/v3d/v3d_drv.h +7 -0
index 8a390738d65b..a605b31a8224 100644
@@ -37,6 +37,12 @@ struct v3d_queue_state {
 	u64 emit_seqno;
 };
 
+enum v3d_irq {
+	V3D_CORE_IRQ,
+	V3D_HUB_IRQ,
+	V3D_MAX_IRQS,
+};
+
 struct v3d_dev {
 	struct drm_device drm;
 
@@ -46,6 +52,7 @@ struct v3d_dev {
 	int ver;
 	bool single_irq_line;
 
+	int irq[V3D_MAX_IRQS];
 	void __iomem *hub_regs;
 	void __iomem *core_regs[3];
 	void __iomem *bridge_regs;
drivers/gpu/drm/v3d/v3d_gem.c +2 -0
index 64fe63c1938f..32cc461937cf 100644
@@ -120,6 +120,8 @@ v3d_reset(struct v3d_dev *v3d)
 	if (false)
 		v3d_idle_axi(v3d, 0);
 
+	v3d_irq_disable(v3d);
+
 	v3d_idle_gca(v3d);
 	v3d_reset_v3d(v3d);
 
drivers/gpu/drm/v3d/v3d_irq.c +28 -10
index c678c4ce4f11..96766a788215 100644
@@ -218,7 +218,7 @@ v3d_hub_irq(int irq, void *arg)
 int
 v3d_irq_init(struct v3d_dev *v3d)
 {
-	int irq1, ret, core;
+	int irq, ret, core;
 
 	INIT_WORK(&v3d->overflow_mem_work, v3d_overflow_mem_work);
 
@@ -229,17 +229,24 @@ v3d_irq_init(struct v3d_dev *v3d)
 		V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS);
 	V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS);
 
-	irq1 = platform_get_irq(v3d_to_pdev(v3d), 1);
-	if (irq1 == -EPROBE_DEFER)
-		return irq1;
-	if (irq1 > 0) {
-		ret = devm_request_irq(v3d->drm.dev, irq1,
+	irq = platform_get_irq(v3d_to_pdev(v3d), 1);
+	if (irq == -EPROBE_DEFER)
+		return irq;
+	if (irq > 0) {
+		v3d->irq[V3D_CORE_IRQ] = irq;
+
+		ret = devm_request_irq(v3d->drm.dev, v3d->irq[V3D_CORE_IRQ],
 				       v3d_irq, IRQF_SHARED,
 				       "v3d_core0", v3d);
 		if (ret)
 			goto fail;
-		ret = devm_request_irq(v3d->drm.dev,
-				       platform_get_irq(v3d_to_pdev(v3d), 0),
+
+		irq = platform_get_irq(v3d_to_pdev(v3d), 0);
+		if (irq < 0)
+			return irq;
+		v3d->irq[V3D_HUB_IRQ] = irq;
+
+		ret = devm_request_irq(v3d->drm.dev, v3d->irq[V3D_HUB_IRQ],
 				       v3d_hub_irq, IRQF_SHARED,
 				       "v3d_hub", v3d);
 		if (ret)
@@ -247,8 +254,12 @@ v3d_irq_init(struct v3d_dev *v3d)
 	} else {
 		v3d->single_irq_line = true;
 
-		ret = devm_request_irq(v3d->drm.dev,
-				       platform_get_irq(v3d_to_pdev(v3d), 0),
+		irq = platform_get_irq(v3d_to_pdev(v3d), 0);
+		if (irq < 0)
+			return irq;
+		v3d->irq[V3D_CORE_IRQ] = irq;
+
+		ret = devm_request_irq(v3d->drm.dev, v3d->irq[V3D_CORE_IRQ],
 				       v3d_irq, IRQF_SHARED,
 				       "v3d", v3d);
 		if (ret)
@@ -283,12 +294,19 @@ void
 v3d_irq_disable(struct v3d_dev *v3d)
 {
 	int core;
+	int i;
 
 	/* Disable all interrupts. */
 	for (core = 0; core < v3d->cores; core++)
 		V3D_CORE_WRITE(core, V3D_CTL_INT_MSK_SET, ~0);
 	V3D_WRITE(V3D_HUB_INT_MSK_SET, ~0);
 
+	/* Finish any interrupt handler still in flight. */
+	for (i = 0; i < V3D_MAX_IRQS; i++) {
+		if (v3d->irq[i])
+			synchronize_irq(v3d->irq[i]);
+	}
+
 	/* Clear any pending interrupts we might have left. */
 	for (core = 0; core < v3d->cores; core++)
 		V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS);
drivers/hid/hid-ids.h +5 -0
index 4b8f8e0ce8ca..8bfa90e37ea1 100644
@@ -278,6 +278,8 @@
 #define USB_DEVICE_ID_ASUS_AK1D		0x1125
 #define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A	0x1408
 #define USB_DEVICE_ID_CHICONY_ACER_SWITCH12	0x1421
+#define USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA	0xb824
+#define USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA2	0xb82c
 
 #define USB_VENDOR_ID_CHUNGHWAT		0x2247
 #define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH	0x0001
@@ -1360,4 +1362,7 @@
 #define USB_VENDOR_ID_SIGNOTEC			0x2133
 #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011	0x0018
 
+#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY              0x4c4a
+#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155         0x4155
+
 #endif
drivers/hid/hid-quirks.c +3 -0
index b3e7ede8f398..9c1c65612adb 100644
@@ -726,6 +726,8 @@ static const struct hid_device_id hid_ignore_list[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_AXENTIA, USB_DEVICE_ID_AXENTIA_FM_RADIO) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI4713) },
@@ -873,6 +875,7 @@ static const struct hid_device_id hid_ignore_list[] = {
 #endif
 	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },
 	{ }
 };
 
drivers/hid/wacom_sys.c +5 -1
index 0f1c7a2f5185..abbfb53bb7dc 100644
@@ -2020,14 +2020,18 @@ static int wacom_initialize_remotes(struct wacom *wacom)
 
 	remote->remote_dir = kobject_create_and_add("wacom_remote",
 						    &wacom->hdev->dev.kobj);
-	if (!remote->remote_dir)
+	if (!remote->remote_dir) {
+		kfifo_free(&remote->remote_fifo);
 		return -ENOMEM;
+	}
 
 	error = sysfs_create_files(remote->remote_dir, remote_unpair_attrs);
 
 	if (error) {
 		hid_err(wacom->hdev,
 			"cannot create sysfs group err: %d\n", error);
+		kfifo_free(&remote->remote_fifo);
+		kobject_put(remote->remote_dir);
 		return error;
 	}
 
drivers/hv/channel_mgmt.c +79 -38

182 lines not on this page · raw message

drivers/hv/hyperv_vmbus.h +12 -7
index a785d790e0aa..1137c25d9a7a 100644
@@ -406,7 +406,12 @@ static inline bool hv_is_perf_channel(struct vmbus_channel *channel)
 	return vmbus_devs[channel->device_id].perf_device;
 }
 
-static inline bool hv_is_alloced_cpu(unsigned int cpu)
+static inline size_t hv_dev_ring_size(struct vmbus_channel *channel)
+{
+	return vmbus_devs[channel->device_id].pref_ring_size;
+}
+
+static inline bool hv_is_allocated_cpu(unsigned int cpu)
 {
 	struct vmbus_channel *channel, *sc;
 
@@ -428,23 +433,23 @@ static inline bool hv_is_alloced_cpu(unsigned int cpu)
 	return false;
 }
 
-static inline void hv_set_alloced_cpu(unsigned int cpu)
+static inline void hv_set_allocated_cpu(unsigned int cpu)
 {
 	cpumask_set_cpu(cpu, &hv_context.hv_numa_map[cpu_to_node(cpu)]);
 }
 
-static inline void hv_clear_alloced_cpu(unsigned int cpu)
+static inline void hv_clear_allocated_cpu(unsigned int cpu)
 {
-	if (hv_is_alloced_cpu(cpu))
+	if (hv_is_allocated_cpu(cpu))
 		return;
 	cpumask_clear_cpu(cpu, &hv_context.hv_numa_map[cpu_to_node(cpu)]);
 }
 
-static inline void hv_update_alloced_cpus(unsigned int old_cpu,
+static inline void hv_update_allocated_cpus(unsigned int old_cpu,
 					  unsigned int new_cpu)
 {
-	hv_set_alloced_cpu(new_cpu);
-	hv_clear_alloced_cpu(old_cpu);
+	hv_set_allocated_cpu(new_cpu);
+	hv_clear_allocated_cpu(old_cpu);
 }
 
 #ifdef CONFIG_HYPERV_TESTING
drivers/hv/vmbus_drv.c +1 -1
index e8bea7c79169..2fed2b169a91 100644
@@ -1790,7 +1790,7 @@ static ssize_t target_cpu_store(struct vmbus_channel *channel,
 
 	/* See init_vp_index(). */
 	if (hv_is_perf_channel(channel))
-		hv_update_alloced_cpus(origin_cpu, target_cpu);
+		hv_update_allocated_cpus(origin_cpu, target_cpu);
 
 	/* Currently set only for storvsc channels. */
 	if (channel->change_target_cpu_callback) {
drivers/hwmon/pmbus/max34440.c +44 -4

108 lines not on this page · raw message

drivers/i2c/busses/i2c-robotfuzz-osif.c +6 -0
index 66dfa211e736..8e4cf9028b23 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/busses/i2c-tiny-usb.c +6 -0
index d1fa9ff5aeab..204cc0883da6 100644

Lines of this file are not shown. View the raw message.

drivers/iio/pressure/zpa2326.c +1 -1
index b8bc2c67462d..00791bc65b70 100644

Lines of this file are not shown. View the raw message.

drivers/infiniband/core/iwcm.c +19 -19
index 44362f693df9..ce41f235af25 100644

Lines of this file are not shown. View the raw message.

drivers/infiniband/core/iwcm.h +1 -1
index 82c2cd1b0a80..bf74639be128 100644

Lines of this file are not shown. View the raw message.

drivers/infiniband/hw/mlx5/counters.c +1 -1
index f6bae1f7545b..33636268d43d 100644

Lines of this file are not shown. View the raw message.

drivers/infiniband/hw/mlx5/devx.c +1 -1
index f67ebd9f3cdd..301c061bb319 100644

Lines of this file are not shown. View the raw message.

drivers/infiniband/hw/mlx5/main.c +33 -0
index 1800cea46b2d..0e20b99cae8b 100644

Lines of this file are not shown. View the raw message.

drivers/input/joystick/xpad.c +5 -0
index 00b973e0f79f..a0362201b5d3 100644

Lines of this file are not shown. View the raw message.

drivers/input/keyboard/atkbd.c +2 -1
index d4c8275d49c3..26526924ffd2 100644

Lines of this file are not shown. View the raw message.

drivers/leds/led-class-multicolor.c +2 -1
index e317408583df..5b1479b5d32c 100644

Lines of this file are not shown. View the raw message.

drivers/mailbox/mailbox.c +1 -1
index 6f54501dc776..cb31ad917b35 100644

Lines of this file are not shown. View the raw message.

drivers/md/bcache/super.c +6 -1
index 85569bd253b2..a80de1cfbbd0 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-raid.c +1 -1
index 99995b1804b3..3c0960f294fb 100644

Lines of this file are not shown. View the raw message.

drivers/md/md-bitmap.c +1 -1
index 91bc764a854c..f2ba541ed89d 100644

Lines of this file are not shown. View the raw message.

drivers/md/raid1.c +1 -0
index dada9b2258a6..51e05ea3f137 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/omap3isp/ispccdc.c +4 -4
index 0fbb2aa6dd2c..6f46e2398953 100644

Lines of this file are not shown. View the raw message.

drivers/media/platform/omap3isp/ispstat.c +2 -4
index 5b9b57f4d9bf..e8a1837b1b74 100644

Lines of this file are not shown. View the raw message.

drivers/media/usb/uvc/uvc_ctrl.c +45 -16

61 lines not on this page · raw message

drivers/mfd/max14577.c +1 -0
index be185e9d5f16..c9e56145b08b 100644

Lines of this file are not shown. View the raw message.

drivers/misc/vmw_vmci/vmci_host.c +5 -4
index 4a903770b8e1..e7965ee6bdba 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/host/mtk-sd.c +26 -13
index 2c9ea5ed0b2f..8d0f888b219a 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/host/sdhci.c +2 -7
index 3d601a3f31c1..9091930f5859 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/host/sdhci.h +16 -0
index 4db57c3a8cd4..a188bf241a11 100644

Lines of this file are not shown. View the raw message.

drivers/net/can/m_can/m_can.c +1 -1
index 6181ac277b62..1c8a7c65530f 100644

Lines of this file are not shown. View the raw message.

drivers/net/can/m_can/tcan4x5x.c +5 -4
index f903f78af087..4bdea945c486 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/xgbe/xgbe-common.h +2 -0
index 533b8519ec35..c5dc23906a78 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +9 -0
index 60be836b294b..19fed56b6ee3 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/amd/xgbe/xgbe.h +2 -2
index 0493de8ee545..61f22462197a 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/atheros/atlx/atl1.c +56 -22

78 lines not on this page · raw message

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +2 -0
index 8e90224c43a2..6464de38c82e 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +1 -1
index fcc262064766..dc9afaa14da8 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/cisco/enic/enic_main.c +2 -2
index b695f3f23328..f59d658d624f 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +118 -23

141 lines not on this page · raw message

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +16 -4
index 2825f53e7e9b..5934b1b4ee97 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +8 -10
index f981a523e13a..d7de60049700 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h +5 -1
index 90453dc7baef..a0dfd25c6bd4 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/freescale/dpaa2/dpni.c +2 -0
index 6ea7db66a632..d248a40fbc3f 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/freescale/dpaa2/dpni.h +6 -0
index e7b9e195b534..f85445098398 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -1
index 2b90a345507b..e0a58471ff59 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sun/niu.c +30 -1
index 1a269fa8c1a0..6a626b1b0233 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/sun/niu.h +4 -0
index 04c215f91fc0..0b169c08b0f2 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/xilinx/ll_temac_main.c +1 -1
index e50b59efe188..5ace1a4905d7 100644

Lines of this file are not shown. View the raw message.

drivers/net/phy/microchip.c +1 -1
index 375bbd60b38a..e6ad7d29a055 100644

Lines of this file are not shown. View the raw message.

drivers/net/phy/smsc.c +24 -4
index b67de3f9ef18..d860a2626b13 100644

Lines of this file are not shown. View the raw message.

drivers/net/usb/qmi_wwan.c +1 -0
index 3ab7b27b6bac..9f493d504d20 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath6kl/bmi.c +3 -1
index af98e871199d..5a9e93fd1ef4 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/zydas/zd1211rw/zd_mac.c +5 -1
index 3ef8533205f9..0a7f368f0d99 100644

Lines of this file are not shown. View the raw message.

drivers/pci/controller/cadence/pcie-cadence-ep.c +3 -2
index 403ff93bc850..f6edbe77e640 100644

Lines of this file are not shown. View the raw message.

drivers/pci/controller/pci-hyperv.c +11 -6
index d0b3ec237385..e41726ec407c 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/qcom/pinctrl-msm.c +20 -0
index ad52846b6beb..049a34f0e13f 100644

Lines of this file are not shown. View the raw message.

drivers/platform/mellanox/mlxbf-tmfifo.c +2 -1
index 767f4406e55f..1eb7f4eb1156 100644

Lines of this file are not shown. View the raw message.

drivers/pwm/pwm-mediatek.c +9 -6
index f2cb5e0347e3..239eb052f40b 100644

Lines of this file are not shown. View the raw message.

drivers/regulator/gpio-regulator.c +2 -2
index 5927d4f3eabd..de07b16b34f8 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/lib_test.c +2 -0
index fa6fd2875b3d..225c859d6da5 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-cmos.c +6 -4
index a55a1cff2ef0..97fa887f4f02 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla2xxx/qla_mbx.c +1 -1
index 21ba7100ff67..8b7c71e779a7 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/qla4xxx/ql4_os.c +2 -0
index 05ae9b115709..f02d8bbea3e5 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/ufs/ufs-sysfs.c +2 -2
index 34b424ad96a2..32b6fe493ae9 100644

Lines of this file are not shown. View the raw message.

drivers/spi/spi-fsl-dspi.c +10 -1
index eda7ed618369..580fdcbcd9b6 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8723bs/core/rtw_security.c +14 -32

46 lines not on this page · raw message

drivers/target/target_core_pr.c +3 -1
index b42193c554fb..2bc849799739 100644

Lines of this file are not shown. View the raw message.

drivers/tty/vt/vt.c +1 -0
index 5d9de3a53548..98ca54330d77 100644

Lines of this file are not shown. View the raw message.

drivers/uio/uio_hv_generic.c +10 -8
index 67cfe838a787..6625d340f3ac 100644

Lines of this file are not shown. View the raw message.

drivers/usb/class/cdc-wdm.c +9 -14
index aa91d561a0ac..26a59443d25f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/common/usb-conn-gpio.c +22 -3
index 02446092520c..f5a1981c9eb4 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/quirks.c +2 -1
index 89ffadb1a4f0..ff3b5131903a 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/usb.c +10 -4
index c4cd9d46f9e3..7be4e8f77a5c 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_tcm.c +2 -2
index 7f825c961fb8..30c3a44abb18 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/u_serial.c +3 -3
index a2ba5ab9617c..02470345d854 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-dbgcap.c +4 -0
index 75108acf3741..03f047f5508b 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-dbgtty.c +1 -0
index 2a53b2831999..0b91cc2ba8fb 100644

Lines of this file are not shown. View the raw message.

drivers/usb/typec/altmodes/displayport.c +4 -1
index e0456e5e10b6..70a21451c58b 100644

Lines of this file are not shown. View the raw message.

drivers/usb/typec/tcpm/tcpci_maxim.c +10 -10
index 723d7dd38f75..d694094084f8 100644

Lines of this file are not shown. View the raw message.

drivers/vhost/scsi.c +6 -1
index a23a65e7d828..fcde3752b4f1 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/inode.c +18 -18
index 8d7ca8a21525..82805ac91b06 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/tree-log.c +3 -1
index 4ee681429327..dd1c40019412 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/volumes.c +6 -0
index 9524588346b8..9c1a7b3b84e4 100644

Lines of this file are not shown. View the raw message.

fs/ceph/file.c +1 -1
index d4974c652e8e..c1eafff45b19 100644

Lines of this file are not shown. View the raw message.

fs/cifs/misc.c +8 -0
index 2d46018b0283..54c443686dab 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/super.c +18 -12
index b7997df291a6..d7fd28a47701 100644

Lines of this file are not shown. View the raw message.

fs/jfs/jfs_dmap.c +13 -28

41 lines not on this page · raw message

fs/namespace.c +4 -4
index 2d5af6653cd1..ee6d139f7529 100644

Lines of this file are not shown. View the raw message.

fs/nfs/flexfilelayout/flexfilelayout.c +87 -34

121 lines not on this page · raw message

fs/nfs/inode.c +14 -3
index d82eb1b2164f..3e3114a9d193 100644

Lines of this file are not shown. View the raw message.

fs/nfs/nfs4proc.c +10 -2
index 1005ecf7c250..77cc1c4219e1 100644

Lines of this file are not shown. View the raw message.

fs/nfs/pnfs.c +3 -1
index 1800836306a5..758689877d85 100644

Lines of this file are not shown. View the raw message.

fs/overlayfs/util.c +3 -1
index 62a258c2b59c..26f29a3e5ada 100644

Lines of this file are not shown. View the raw message.

fs/proc/array.c +3 -3
index 8fba6d39e776..77b94c04e4af 100644

Lines of this file are not shown. View the raw message.

fs/proc/inode.c +1 -1
index ba35ffc426ea..269a14a50d8b 100644

Lines of this file are not shown. View the raw message.

fs/proc/proc_sysctl.c +11 -7
index f5c967735335..78bd60631428 100644

Lines of this file are not shown. View the raw message.

include/drm/spsc_queue.h +3 -1
index 125f096c88cb..ee9df8cc67b7 100644

Lines of this file are not shown. View the raw message.

include/linux/cpu.h +3 -0
index 2099226d8623..f00bbb174a2e 100644

Lines of this file are not shown. View the raw message.

include/linux/hyperv.h +2 -0
index 5e019d26b5b7..987cc04f1318 100644

Lines of this file are not shown. View the raw message.

include/linux/ipv6.h +0 -1
index 89b3527e0367..d758c131ed5e 100644

Lines of this file are not shown. View the raw message.

include/linux/module.h +5 -0
index 63fe94e6ae6f..f5a150c42918 100644

Lines of this file are not shown. View the raw message.

include/linux/usb/typec_dp.h +1 -0
index 296909ea04f2..afb73b3e0b80 100644

Lines of this file are not shown. View the raw message.

include/uapi/linux/vm_sockets.h +29 -1
index fd0ed7221645..4263c85593fa 100644

Lines of this file are not shown. View the raw message.

kernel/events/core.c +1 -1
index b133abe23a4b..bf9f9eab6f67 100644

Lines of this file are not shown. View the raw message.

kernel/rcu/tree.c +4 -0
index 06bfe61d3cd3..c4eb06d37ae9 100644

Lines of this file are not shown. View the raw message.

kernel/rseq.c +48 -12

60 lines not on this page · raw message

lib/test_objagg.c +3 -1
index da137939a410..78d25ab19a96 100644

Lines of this file are not shown. View the raw message.

net/appletalk/ddp.c +1 -0
index 46adb8cefccf..c9edfca153c9 100644

Lines of this file are not shown. View the raw message.

net/atm/clip.c +53 -22

75 lines not on this page · raw message

net/atm/resources.c +1 -2
index 3ad39ae97132..fb8cf4cd6c1d 100644

Lines of this file are not shown. View the raw message.

net/bluetooth/l2cap_core.c +8 -1
index 08d91a3d3460..8c8631e609f6 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6_output.c +4 -5
index f024d89cb0f8..426330b8dfa4 100644

Lines of this file are not shown. View the raw message.

net/mac80211/rx.c +4 -0
index 65fea564c9c0..b46c4c770608 100644

Lines of this file are not shown. View the raw message.

net/mac80211/util.c +1 -1
index 0da845d9d486..7cb32340108e 100644

Lines of this file are not shown. View the raw message.

net/netlink/af_netlink.c +50 -32

82 lines not on this page · raw message

net/rose/rose_route.c +5 -10
index 981bdefd478b..d0112f186385 100644

Lines of this file are not shown. View the raw message.

net/rxrpc/call_accept.c +3 -0
index 2a14d69b171f..b96af42a1b04 100644

Lines of this file are not shown. View the raw message.

net/sched/sch_api.c +21 -21

42 lines not on this page · raw message

net/sched/sch_sfq.c +8 -2
index e87560e24486..4a10f794be58 100644

Lines of this file are not shown. View the raw message.

net/tipc/topsrv.c +2 -0
index 89d8a2bd30cd..d914c5eb2517 100644

Lines of this file are not shown. View the raw message.

net/vmw_vsock/af_vsock.c +65 -13

78 lines not on this page · raw message

net/vmw_vsock/vmci_transport.c +2 -2
index 8c2856cbfecc..912bafcf825b 100644

Lines of this file are not shown. View the raw message.

sound/isa/sb/sb16_main.c +4 -0
index aa4870531023..19804d3fd98c 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_bind.c +1 -1
index 0a83afa5f373..6625643f333e 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_intel.c +3 -0
index dd7c7cb0de14..cb3dccdf3911 100644

Lines of this file are not shown. View the raw message.

sound/soc/fsl/fsl_asrc.c +2 -1
index 5e3c71f025f4..cf6d3c549707 100644

Lines of this file are not shown. View the raw message.

sound/usb/stream.c +2 -0
index 0c77f244e5d6..d6d3ce9e9637 100644

Lines of this file are not shown. View the raw message.

tools/lib/bpf/btf_dump.c +3 -0
index 2342aec3c5a3..d6818e22503c 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.