RoPieee · spockfish · Feb 17, 2024 · Feb 18, 2024 · Feb 15, 2024 · Feb 15, 2024
diff --git a/Documentation/ABI/testing/sysfs-class-net-statistics b/Documentation/ABI/testing/sysfs-class-net-statistics
@@ -1,20 +1,20 @@
-What: /sys/class/<iface>/statistics/collisions
+What: /sys/class/net/<iface>/statistics/collisions
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
 Description:
  Indicates the number of collisions seen by this network device.
  This value might not be relevant with all MAC layers.
 
-What: /sys/class/<iface>/statistics/multicast
+What: /sys/class/net/<iface>/statistics/multicast
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
 Description:
  Indicates the number of multicast packets received by this
  network device.
 
-What: /sys/class/<iface>/statistics/rx_bytes
+What: /sys/class/net/<iface>/statistics/rx_bytes
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description:
  See the network driver for the exact meaning of when this
  value is incremented.
 
-What: /sys/class/<iface>/statistics/rx_compressed
+What: /sys/class/net/<iface>/statistics/rx_compressed
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description:
  network device. This value might only be relevant for interfaces
  that support packet compression (e.g: PPP).
 
-What: /sys/class/<iface>/statistics/rx_crc_errors
+What: /sys/class/net/<iface>/statistics/rx_crc_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description:
  by this network device. Note that the specific meaning might
  depend on the MAC layer used by the interface.
 
-What: /sys/class/<iface>/statistics/rx_dropped
+What: /sys/class/net/<iface>/statistics/rx_dropped
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -51,15 +51,15 @@ Description:
  packet processing. See the network driver for the exact
  meaning of this value.
 
-What: /sys/class/<iface>/statistics/rx_errors
+What: /sys/class/net/<iface>/statistics/rx_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
 Description:
  Indicates the number of receive errors on this network device.
  See the network driver for the exact meaning of this value.
 
-What: /sys/class/<iface>/statistics/rx_fifo_errors
+What: /sys/class/net/<iface>/statistics/rx_fifo_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -68,7 +68,7 @@ Description:
  network device. See the network driver for the exact
  meaning of this value.
 
-What: /sys/class/<iface>/statistics/rx_frame_errors
+What: /sys/class/net/<iface>/statistics/rx_frame_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -78,7 +78,7 @@ Description:
  on the MAC layer protocol used. See the network driver for
  the exact meaning of this value.
 
-What: /sys/class/<iface>/statistics/rx_length_errors
+What: /sys/class/net/<iface>/statistics/rx_length_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -87,7 +87,7 @@ Description:
  error, oversized or undersized. See the network driver for the
  exact meaning of this value.
 
-What: /sys/class/<iface>/statistics/rx_missed_errors
+What: /sys/class/net/<iface>/statistics/rx_missed_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -96,15 +96,15 @@ Description:
  due to lack of capacity in the receive side. See the network
  driver for the exact meaning of this value.
 
-What: /sys/class/<iface>/statistics/rx_nohandler
+What: /sys/class/net/<iface>/statistics/rx_nohandler
 Date: February 2016
 KernelVersion: 4.6
 Contact: netdev@vger.kernel.org
 Description:
  Indicates the number of received packets that were dropped on
  an inactive device by the network core.
 
-What: /sys/class/<iface>/statistics/rx_over_errors
+What: /sys/class/net/<iface>/statistics/rx_over_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -114,15 +114,15 @@ Description:
  (e.g: larger than MTU). See the network driver for the exact
  meaning of this value.
 
-What: /sys/class/<iface>/statistics/rx_packets
+What: /sys/class/net/<iface>/statistics/rx_packets
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
 Description:
  Indicates the total number of good packets received by this
  network device.
 
-What: /sys/class/<iface>/statistics/tx_aborted_errors
+What: /sys/class/net/<iface>/statistics/tx_aborted_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -132,7 +132,7 @@ Description:
  a medium collision). See the network driver for the exact
  meaning of this value.
 
-What: /sys/class/<iface>/statistics/tx_bytes
+What: /sys/class/net/<iface>/statistics/tx_bytes
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -143,7 +143,7 @@ Description:
  transmitted packets or all packets that have been queued for
  transmission.
 
-What: /sys/class/<iface>/statistics/tx_carrier_errors
+What: /sys/class/net/<iface>/statistics/tx_carrier_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -152,7 +152,7 @@ Description:
  because of carrier errors (e.g: physical link down). See the
  network driver for the exact meaning of this value.
 
-What: /sys/class/<iface>/statistics/tx_compressed
+What: /sys/class/net/<iface>/statistics/tx_compressed
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -161,7 +161,7 @@ Description:
  this might only be relevant for devices that support
  compression (e.g: PPP).
 
-What: /sys/class/<iface>/statistics/tx_dropped
+What: /sys/class/net/<iface>/statistics/tx_dropped
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -170,7 +170,7 @@ Description:
  See the driver for the exact reasons as to why the packets were
  dropped.
 
-What: /sys/class/<iface>/statistics/tx_errors
+What: /sys/class/net/<iface>/statistics/tx_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -179,7 +179,7 @@ Description:
  a network device. See the driver for the exact reasons as to
  why the packets were dropped.
 
-What: /sys/class/<iface>/statistics/tx_fifo_errors
+What: /sys/class/net/<iface>/statistics/tx_fifo_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -188,7 +188,7 @@ Description:
  FIFO error. See the driver for the exact reasons as to why the
  packets were dropped.
 
-What: /sys/class/<iface>/statistics/tx_heartbeat_errors
+What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -197,7 +197,7 @@ Description:
  reported as heartbeat errors. See the driver for the exact
  reasons as to why the packets were dropped.
 
-What: /sys/class/<iface>/statistics/tx_packets
+What: /sys/class/net/<iface>/statistics/tx_packets
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org
@@ -206,7 +206,7 @@ Description:
  device. See the driver for whether this reports the number of all
  attempted or successful transmissions.
 
-What: /sys/class/<iface>/statistics/tx_window_errors
+What: /sys/class/net/<iface>/statistics/tx_window_errors
 Date: April 2005
 KernelVersion: 2.6.12
 Contact: netdev@vger.kernel.org

diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst
@@ -221,3 +221,10 @@ stable kernels.
 +----------------+-----------------+-----------------+-----------------------------+
 | Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
 +----------------+-----------------+-----------------+-----------------------------+
++----------------+-----------------+-----------------+-----------------------------+
+| Microsoft | Azure Cobalt 100| #2139208 | ARM64_ERRATUM_2139208 |
++----------------+-----------------+-----------------+-----------------------------+
+| Microsoft | Azure Cobalt 100| #2067961 | ARM64_ERRATUM_2067961 |
++----------------+-----------------+-----------------+-----------------------------+
+| Microsoft | Azure Cobalt 100| #2253138 | ARM64_ERRATUM_2253138 |
++----------------+-----------------+-----------------+-----------------------------+
diff --git a/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt b/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt
@@ -1,4 +1,4 @@
-Marvell 8787/8897/8997 (sd8787/sd8897/sd8997/pcie8997) SDIO/PCIE devices
+Marvell 8787/8897/8978/8997 (sd8787/sd8897/sd8978/sd8997/pcie8997) SDIO/PCIE devices
 ------
 
 This node provides properties for controlling the Marvell SDIO/PCIE wireless device.
@@ -10,7 +10,9 @@ Required properties:
  - compatible : should be one of the following:
  * "marvell,sd8787"
  * "marvell,sd8897"
+ * "marvell,sd8978"
  * "marvell,sd8997"
+ * "nxp,iw416"
  * "pci11ab,2b42"
  * "pci1b4b,2b42"
 

diff --git a/Documentation/x86/boot.rst b/Documentation/x86/boot.rst
@@ -1416,7 +1416,7 @@ execution context provided by the EFI firmware.
 
 The function prototype for the handover entry point looks like this::
 
- efi_main(void *handle, efi_system_table_t *table, struct boot_params *bp)
+ efi_stub_entry(void *handle, efi_system_table_t *table, struct boot_params *bp)
 
 'handle' is the EFI image handle passed to the boot loader by the EFI
 firmware, 'table' is the EFI system table - these are the first two

diff --git a/Documentation/x86/mds.rst b/Documentation/x86/mds.rst
@@ -95,6 +95,9 @@ The kernel provides a function to invoke the buffer clearing:
 
  mds_clear_cpu_buffers()
 
+Also macro CLEAR_CPU_BUFFERS can be used in ASM late in exit-to-user path.
+Other than CFLAGS.ZF, this macro doesn't clobber any registers.
+
 The mitigation is invoked on kernel/userspace, hypervisor/guest and C-state
 (idle) transitions.
 
@@ -138,17 +141,30 @@ Mitigation points
 
  When transitioning from kernel to user space the CPU buffers are flushed
  on affected CPUs when the mitigation is not disabled on the kernel
- command line. The migitation is enabled through the static key
- mds_user_clear.
-
- The mitigation is invoked in prepare_exit_to_usermode() which covers
- all but one of the kernel to user space transitions. The exception
- is when we return from a Non Maskable Interrupt (NMI), which is
- handled directly in do_nmi().
-
- (The reason that NMI is special is that prepare_exit_to_usermode() can
- enable IRQs. In NMI context, NMIs are blocked, and we don't want to
- enable IRQs with NMIs blocked.)
+ command line. The mitigation is enabled through the feature flag
+ X86_FEATURE_CLEAR_CPU_BUF.
+
+ The mitigation is invoked just before transitioning to userspace after
+ user registers are restored. This is done to minimize the window in
+ which kernel data could be accessed after VERW e.g. via an NMI after
+ VERW.
+
+ **Corner case not handled**
+ Interrupts returning to kernel don't clear CPUs buffers since the
+ exit-to-user path is expected to do that anyways. But, there could be
+ a case when an NMI is generated in kernel after the exit-to-user path
+ has cleared the buffers. This case is not handled and NMI returning to
+ kernel don't clear CPU buffers because:
+
+ 1. It is rare to get an NMI after VERW, but before returning to userspace.
+ 2. For an unprivileged user, there is no known way to make that NMI
+ less rare or target it.
+ 3. It would take a large number of these precisely-timed NMIs to mount
+ an actual attack. There's presumably not enough bandwidth.
+ 4. The NMI in question occurs after a VERW, i.e. when user state is
+ restored and most interesting data is already scrubbed. Whats left
+ is only the data that NMI touches, and that may or may not be of
+ any interest.
 
 
 2. C-State transition

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -10090,6 +10090,7 @@ F: drivers/infiniband/
 F: include/rdma/
 F: include/trace/events/ib_mad.h
 F: include/trace/events/ib_umad.h
+F: include/trace/misc/rdma.h
 F: include/uapi/linux/if_infiniband.h
 F: include/uapi/rdma/
 F: samples/bpf/ibumad_kern.c
@@ -11178,6 +11179,12 @@ F: fs/nfs_common/
 F: fs/nfsd/
 F: include/linux/lockd/
 F: include/linux/sunrpc/
+F: include/trace/events/rpcgss.h
+F: include/trace/events/rpcrdma.h
+F: include/trace/events/sunrpc.h
+F: include/trace/misc/fs.h
+F: include/trace/misc/nfs.h
+F: include/trace/misc/sunrpc.h
 F: include/uapi/linux/nfsd/
 F: include/uapi/linux/sunrpc/
 F: net/sunrpc/

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 77
+SUBLEVEL = 81
 EXTRAVERSION =
 NAME = Curry Ramen
 
@@ -459,8 +459,7 @@ HOSTRUSTC = rustc
 HOSTPKG_CONFIG = pkg-config
 
 KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
- -O2 -fomit-frame-pointer -std=gnu11 \
- -Wdeclaration-after-statement
+ -O2 -fomit-frame-pointer -std=gnu11
 KBUILD_USERCFLAGS := $(KBUILD_USERHOSTCFLAGS) $(USERCFLAGS)
 KBUILD_USERLDFLAGS := $(USERLDFLAGS)
 
@@ -1018,9 +1017,6 @@ endif
 # arch Makefile may override CC so keep this after arch Makefile is included
 NOSTDINC_FLAGS += -nostdinc
 
-# warn about C99 declaration after statement
-KBUILD_CFLAGS += -Wdeclaration-after-statement
-
 # Variable Length Arrays (VLAs) should not be used anywhere in the kernel
 KBUILD_CFLAGS += -Wvla
 

diff --git a/arch/Kconfig b/arch/Kconfig
@@ -642,6 +642,7 @@ config SHADOW_CALL_STACK
  bool "Shadow Call Stack"
  depends on ARCH_SUPPORTS_SHADOW_CALL_STACK
  depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
+ depends on MMU
  help
  This option enables the compiler's Shadow Call Stack, which
  uses a shadow stack to protect function return addresses from

diff --git a/arch/arc/include/asm/jump_label.h b/arch/arc/include/asm/jump_label.h
@@ -31,7 +31,7 @@
 static __always_inline bool arch_static_branch(struct static_key *key,
  bool branch)
 {
- asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
+ asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)"  \n"
  "1: \n"
  "nop \n"
  ".pushsection __jump_table, \"aw\" \n"
@@ -47,7 +47,7 @@ static __always_inline bool arch_static_branch(struct static_key *key,
 static __always_inline bool arch_static_branch_jump(struct static_key *key,
  bool branch)
 {
- asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
+ asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)"  \n"
  "1: \n"
  "b %l[l_yes] \n"
  ".pushsection __jump_table, \"aw\" \n"

diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
@@ -59,7 +59,7 @@
  reg = <0x80000000 0x2000>;
  };
 
- dma_apbh: dma-apbh@80004000 {
+ dma_apbh: dma-controller@80004000 {
  compatible = "fsl,imx23-dma-apbh";
  reg = <0x80004000 0x2000>;
  interrupts = <0 14 20 0

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
@@ -78,7 +78,7 @@
  status = "disabled";
  };
 
- dma_apbh: dma-apbh@80004000 {
+ dma_apbh: dma-controller@80004000 {
  compatible = "fsl,imx28-dma-apbh";
  reg = <0x80004000 0x2000>;
  interrupts = <82 83 84 85