--- /dev/null
+From 82ca67321f55a8d1da6ac3ed611da3c32818bb37 Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+Date: Thu, 30 Dec 2021 18:19:40 +0100
+Subject: Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization
+
+From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+
+commit 82ca67321f55a8d1da6ac3ed611da3c32818bb37 upstream.
+
+The config RANDOMIZE_SLAB does not exist, the authors probably intended to
+refer to the config RANDOMIZE_BASE, which provides kernel address-space
+randomization. They probably just confused SLAB with BASE (these two
+four-letter words coincidentally share three common letters), as they also
+point out the config SLAB_FREELIST_RANDOM as further randomization within
+the same sentence.
+
+Fix the reference of the config for kernel address-space randomization to
+the config that provides that.
+
+Fixes: 6e88559470f5 ("Documentation: Add section about CPU vulnerabilities for Spectre")
+Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+Link: https://lore.kernel.org/r/20211230171940.27558-1-lukas.bulwahn@gmail.com
+Signed-off-by: Jonathan Corbet <corbet@lwn.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/admin-guide/hw-vuln/spectre.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Documentation/admin-guide/hw-vuln/spectre.rst
++++ b/Documentation/admin-guide/hw-vuln/spectre.rst
+@@ -468,7 +468,7 @@ Spectre variant 2
+ before invoking any firmware code to prevent Spectre variant 2 exploits
+ using the firmware.
+
+- Using kernel address space randomization (CONFIG_RANDOMIZE_SLAB=y
++ Using kernel address space randomization (CONFIG_RANDOMIZE_BASE=y
+ and CONFIG_SLAB_FREELIST_RANDOM=y in the kernel configuration) makes
+ attacks on the kernel generally more difficult.
+
--- /dev/null
+From d185a3466f0cd5af8f1c5c782c53bc0e6f2e7136 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 18 Jun 2018 23:55:40 +0100
+Subject: firmware: Update Kconfig help text for Google firmware
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+commit d185a3466f0cd5af8f1c5c782c53bc0e6f2e7136 upstream.
+
+The help text for GOOGLE_FIRMWARE states that it should only be
+enabled when building a kernel for Google's own servers. However,
+many of the drivers dependent on it are also useful on Chromebooks or
+on any platform using coreboot.
+
+Update the help text to reflect this double duty.
+
+Fixes: d384d6f43d1e ("firmware: google memconsole: Add coreboot support")
+Reviewed-by: Julius Werner <jwerner@chromium.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Link: https://lore.kernel.org/r/20180618225540.GD14131@decadent.org.uk
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/firmware/google/Kconfig | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/firmware/google/Kconfig
++++ b/drivers/firmware/google/Kconfig
+@@ -2,9 +2,9 @@ menuconfig GOOGLE_FIRMWARE
+ bool "Google Firmware Drivers"
+ default n
+ help
+- These firmware drivers are used by Google's servers. They are
+- only useful if you are working directly on one of their
+- proprietary servers. If in doubt, say "N".
++ These firmware drivers are used by Google servers,
++ Chromebooks and other devices using coreboot firmware.
++ If in doubt, say "N".
+
+ if GOOGLE_FIRMWARE
+
--- /dev/null
+From bbd2e05fad3e692ff2495895975bd0fce02bdbae Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Wed, 19 Jan 2022 18:10:28 -0800
+Subject: lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+commit bbd2e05fad3e692ff2495895975bd0fce02bdbae upstream.
+
+Commit b05fbcc36be1 ("btrfs: disable build on platforms having page size
+256K") disabled btrfs for configurations that used a 256kB page size.
+However, it did not fully solve the problem because CONFIG_TEST_KMOD
+selects CONFIG_BTRFS, which does not account for the dependency. This
+results in a Kconfig warning and the failed BUILD_BUG_ON error
+returning.
+
+ WARNING: unmet direct dependencies detected for BTRFS_FS
+ Depends on [n]: BLOCK [=y] && !PPC_256K_PAGES && !PAGE_SIZE_256KB [=y]
+ Selected by [m]:
+ - TEST_KMOD [=m] && RUNTIME_TESTING_MENU [=y] && m && MODULES [=y] && NETDEVICES [=y] && NET_CORE [=y] && INET [=y] && BLOCK [=y]
+
+To resolve this, add CONFIG_PAGE_SIZE_LESS_THAN_256KB as a dependency of
+CONFIG_TEST_KMOD so there is no more invalid configuration or build
+errors.
+
+Link: https://lkml.kernel.org/r/20211129230141.228085-4-nathan@kernel.org
+Fixes: b05fbcc36be1 ("btrfs: disable build on platforms having page size 256K")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Reported-by: kernel test robot <lkp@intel.com>
+Cc: Chris Mason <clm@fb.com>
+Cc: David Sterba <dsterba@suse.com>
+Cc: Josef Bacik <josef@toxicpanda.com>
+Cc: Luis Chamberlain <mcgrof@kernel.org>
+Cc: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/Kconfig.debug | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -1884,6 +1884,7 @@ config TEST_KMOD
+ depends on BLOCK && (64BIT || LBDAF) # for XFS, BTRFS
+ depends on NETDEVICES && NET_CORE && INET # for TUN
+ depends on BLOCK
++ depends on PAGE_SIZE_LESS_THAN_256KB # for BTRFS
+ select TEST_LKM
+ select XFS_FS
+ select TUN
--- /dev/null
+From 39d5534b1302189c809e90641ffae8cbdc42a8fc Mon Sep 17 00:00:00 2001
+From: Yixing Liu <liuyixing1@huawei.com>
+Date: Mon, 6 Dec 2021 21:36:52 +0800
+Subject: RDMA/hns: Modify the mapping attribute of doorbell to device
+
+From: Yixing Liu <liuyixing1@huawei.com>
+
+commit 39d5534b1302189c809e90641ffae8cbdc42a8fc upstream.
+
+It is more general for ARM device drivers to use the device attribute to
+map PCI BAR spaces.
+
+Fixes: 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver")
+Link: https://lore.kernel.org/r/20211206133652.27476-1-liangwenpeng@huawei.com
+Signed-off-by: Yixing Liu <liuyixing1@huawei.com>
+Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
+Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/infiniband/hw/hns/hns_roce_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/infiniband/hw/hns/hns_roce_main.c
++++ b/drivers/infiniband/hw/hns/hns_roce_main.c
+@@ -377,7 +377,7 @@ static int hns_roce_mmap(struct ib_ucont
+ return -EINVAL;
+
+ if (vma->vm_pgoff == 0) {
+- vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
++ vma->vm_page_prot = pgprot_device(vma->vm_page_prot);
+ if (io_remap_pfn_range(vma, vma->vm_start,
+ to_hr_ucontext(context)->uar.pfn,
+ PAGE_SIZE, vma->vm_page_prot))
--- /dev/null
+From 8d1cfb884e881efd69a3be4ef10772c71cb22216 Mon Sep 17 00:00:00 2001
+From: Chengguang Xu <cgxu519@mykernel.net>
+Date: Sat, 18 Dec 2021 19:23:20 +0800
+Subject: RDMA/rxe: Fix a typo in opcode name
+
+From: Chengguang Xu <cgxu519@mykernel.net>
+
+commit 8d1cfb884e881efd69a3be4ef10772c71cb22216 upstream.
+
+There is a redundant ']' in the name of opcode IB_OPCODE_RC_SEND_MIDDLE,
+so just fix it.
+
+Fixes: 8700e3e7c485 ("Soft RoCE driver")
+Link: https://lore.kernel.org/r/20211218112320.3558770-1-cgxu519@mykernel.net
+Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
+Acked-by: Zhu Yanjun <zyjzyj2000@gmail.com>
+Reviewed-by: Bob Pearson <rpearsonhpe@gmail.com>
+Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/infiniband/sw/rxe/rxe_opcode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/infiniband/sw/rxe/rxe_opcode.c
++++ b/drivers/infiniband/sw/rxe/rxe_opcode.c
+@@ -137,7 +137,7 @@ struct rxe_opcode_info rxe_opcode[RXE_NU
+ }
+ },
+ [IB_OPCODE_RC_SEND_MIDDLE] = {
+- .name = "IB_OPCODE_RC_SEND_MIDDLE]",
++ .name = "IB_OPCODE_RC_SEND_MIDDLE",
+ .mask = RXE_PAYLOAD_MASK | RXE_REQ_MASK | RXE_SEND_MASK
+ | RXE_MIDDLE_MASK,
+ .length = RXE_BTH_BYTES,
fuse-fix-bad-inode.patch
fuse-fix-live-lock-in-fuse_iget.patch
drm-radeon-fix-error-handling-in-radeon_driver_open_kms.patch
+firmware-update-kconfig-help-text-for-google-firmware.patch
+lib-kconfig.debug-make-test_kmod-depend-on-page_size_less_than_256kb.patch
+documentation-refer-to-config-randomize_base-for-kernel-address-space-randomization.patch
+rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
+rdma-rxe-fix-a-typo-in-opcode-name.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
