From 2417bdca7525f96b73571c3d625ff96423df0991 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Wed, 16 Nov 2022 16:38:43 +0200 Subject: [PATCH] catch-up --- linux-lts/0002-fix-pahole.patch | 11 + ...nd-CONFIG-to-disallow-unprivileged-C.patch | 151 + ...DIA-controllers-to-the-MSI-masking-q.patch | 21 + ...eep-dma-unmapping-to-avoid-kernel-fl.patch | 85 + ...l-Fix-bdaddress-comparison-with-garb.patch | 57 + ...0005-lg-laptop-Recognize-more-models.patch | 36 + .../0006-Fix-NFSv4-mount-regression.patch | 238 + linux/linux-lts/PKGBUILD | 213 + linux/linux-lts/config | 10701 ++++++++++++++++ 9 files changed, 11513 insertions(+) create mode 100644 linux-lts/0002-fix-pahole.patch create mode 100644 linux/linux-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch create mode 100644 linux/linux-lts/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch create mode 100644 linux/linux-lts/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch create mode 100644 linux/linux-lts/0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch create mode 100644 linux/linux-lts/0005-lg-laptop-Recognize-more-models.patch create mode 100644 linux/linux-lts/0006-Fix-NFSv4-mount-regression.patch create mode 100644 linux/linux-lts/PKGBUILD create mode 100644 linux/linux-lts/config diff --git a/linux-lts/0002-fix-pahole.patch b/linux-lts/0002-fix-pahole.patch new file mode 100644 index 0000000..003ab68 --- /dev/null +++ b/linux-lts/0002-fix-pahole.patch @@ -0,0 +1,11 @@ +--- a/scripts/link-vmlinux.sh ++++ b/scripts/link-vmlinux.sh +@@ -161,7 +161,7 @@ + vmlinux_link + + info BTF +- LLVM_OBJCOPY= -J ++ LLVM_OBJCOPY= --skip_encoding_btf_enum64 -J + + # Create which contains just .BTF section but no symbols. Add + # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all diff --git a/linux/linux-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/linux/linux-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch new file mode 100644 index 0000000..e0c4a76 --- /dev/null +++ b/linux/linux-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -0,0 +1,151 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Mon, 16 Sep 2019 04:53:20 +0200 +Subject: [PATCH] ZEN: Add sysctl and CONFIG to disallow unprivileged + CLONE_NEWUSER + +Our default behavior continues to match the vanilla kernel. +--- + include/linux/user_namespace.h | 4 ++++ + init/Kconfig | 16 ++++++++++++++++ + kernel/fork.c | 14 ++++++++++++++ + kernel/sysctl.c | 12 ++++++++++++ + kernel/user_namespace.c | 7 +++++++ + 5 files changed, 53 insertions(+) + +diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h +index 33a4240e6a6f..82213f9c4c17 100644 +--- a/include/linux/user_namespace.h ++++ b/include/linux/user_namespace.h +@@ -139,6 +139,8 @@ static inline void set_rlimit_ucount_max(struct user_namespace *ns, + + #ifdef CONFIG_USER_NS + ++extern int unprivileged_userns_clone; ++ + static inline struct user_namespace *get_user_ns(struct user_namespace *ns) + { + if (ns) +@@ -172,6 +174,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); + struct ns_common *ns_get_owner(struct ns_common *ns); + #else + ++#define unprivileged_userns_clone 0 ++ + static inline struct user_namespace *get_user_ns(struct user_namespace *ns) + { + return &init_user_ns; +diff --git a/init/Kconfig b/init/Kconfig +index d19ed66aba3b..a67689ca1929 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -1231,6 +1231,22 @@ config USER_NS + + If unsure, say N. + ++config USER_NS_UNPRIVILEGED ++ bool "Allow unprivileged users to create namespaces" ++ default y ++ depends on USER_NS ++ help ++ When disabled, unprivileged users will not be able to create ++ new namespaces. Allowing users to create their own namespaces ++ has been part of several recent local privilege escalation ++ exploits, so if you need user namespaces but are ++ paranoid^Wsecurity-conscious you want to disable this. ++ ++ This setting can be overridden at runtime via the ++ kernel.unprivileged_userns_clone sysctl. ++ ++ If unsure, say Y. ++ + config PID_NS + bool "PID Namespaces" + default y +diff --git a/kernel/fork.c b/kernel/fork.c +index 908ba3c93893..b4982474fb93 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -98,6 +98,10 @@ + #include + #include + ++#ifdef CONFIG_USER_NS ++#include ++#endif ++ + #include + #include + #include +@@ -1951,6 +1955,10 @@ static __latent_entropy struct task_struct *copy_process( + if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) + return ERR_PTR(-EINVAL); + ++ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) ++ if (!capable(CAP_SYS_ADMIN)) ++ return ERR_PTR(-EPERM); ++ + /* + * Thread groups must share signals as well, and detached threads + * can only be started up within the thread group. +@@ -3067,6 +3075,12 @@ int ksys_unshare(unsigned long unshare_flags) + if (unshare_flags & CLONE_NEWNS) + unshare_flags |= CLONE_FS; + ++ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) { ++ err = -EPERM; ++ if (!capable(CAP_SYS_ADMIN)) ++ goto bad_unshare_out; ++ } ++ + err = check_unshare_flags(unshare_flags); + if (err) + goto bad_unshare_out; +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 23c08bf3db58..63ab60778e5d 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -105,6 +105,9 @@ + #ifdef CONFIG_LOCKUP_DETECTOR + #include + #endif ++#ifdef CONFIG_USER_NS ++#include ++#endif + + #if defined(CONFIG_SYSCTL) + +@@ -1953,6 +1956,15 @@ static struct ctl_table kern_table[] = { + .proc_handler = proc_dointvec, + }, + #endif ++#ifdef CONFIG_USER_NS ++ { ++ .procname = "unprivileged_userns_clone", ++ .data = &unprivileged_userns_clone, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = proc_dointvec, ++ }, ++#endif + #ifdef CONFIG_PROC_SYSCTL + { + .procname = "tainted", +diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c +index 5481ba44a8d6..423ab2563ad7 100644 +--- a/kernel/user_namespace.c ++++ b/kernel/user_namespace.c +@@ -21,6 +21,13 @@ + #include + #include + ++/* sysctl */ ++#ifdef CONFIG_USER_NS_UNPRIVILEGED ++int unprivileged_userns_clone = 1; ++#else ++int unprivileged_userns_clone; ++#endif ++ + static struct kmem_cache *user_ns_cachep __read_mostly; + static DEFINE_MUTEX(userns_state_mutex); + diff --git a/linux/linux-lts/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch b/linux/linux-lts/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch new file mode 100644 index 0000000..952176f --- /dev/null +++ b/linux/linux-lts/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Thu, 18 Nov 2021 22:53:31 +0100 +Subject: [PATCH] PCI: Add more NVIDIA controllers to the MSI masking quirk + +For: https://bugs.archlinux.org/task/72734 +For: https://bugs.archlinux.org/task/72777 +--- + drivers/pci/quirks.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index a531064233f9..e1893dde40f6 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -5824,3 +5824,5 @@ static void nvidia_ion_ahci_fixup(struct pci_dev *pdev) + pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING; + } + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab9, nvidia_ion_ahci_fixup); ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0d88, nvidia_ion_ahci_fixup); diff --git a/linux/linux-lts/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch b/linux/linux-lts/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch new file mode 100644 index 0000000..fe97ce9 --- /dev/null +++ b/linux/linux-lts/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch @@ -0,0 +1,85 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ajay Garg +Date: Tue, 12 Oct 2021 19:26:53 +0530 +Subject: [PATCH] iommu: intel: do deep dma-unmapping, to avoid + kernel-flooding. + +Origins at : +https://lists.linuxfoundation.org/pipermail/iommu/2021-October/thread.html + +=== Changes from v1 => v2 === + +a) +Improved patch-description. + +b) +A more root-level fix, as suggested by + + 1. + Alex Williamson + + 2. + Lu Baolu + +=== Issue === + +Kernel-flooding is seen, when an x86_64 L1 guest (Ubuntu-21) is booted in qemu/kvm +on a x86_64 host (Ubuntu-21), with a host-pci-device attached. + +Following kind of logs, along with the stacktraces, cause the flood : + +...... + DMAR: ERROR: DMA PTE for vPFN 0x428ec already set (to 3f6ec003 not 3f6ec003) + DMAR: ERROR: DMA PTE for vPFN 0x428ed already set (to 3f6ed003 not 3f6ed003) + DMAR: ERROR: DMA PTE for vPFN 0x428ee already set (to 3f6ee003 not 3f6ee003) + DMAR: ERROR: DMA PTE for vPFN 0x428ef already set (to 3f6ef003 not 3f6ef003) + DMAR: ERROR: DMA PTE for vPFN 0x428f0 already set (to 3f6f0003 not 3f6f0003) +...... + +=== Current Behaviour, leading to the issue === + +Currently, when we do a dma-unmapping, we unmap/unlink the mappings, but +the pte-entries are not cleared. + +Thus, following sequencing would flood the kernel-logs : + +i) +A dma-unmapping makes the real/leaf-level pte-slot invalid, but the +pte-content itself is not cleared. + +ii) +Now, during some later dma-mapping procedure, as the pte-slot is about +to hold a new pte-value, the intel-iommu checks if a prior +pte-entry exists in the pte-slot. If it exists, it logs a kernel-error, +along with a corresponding stacktrace. + +iii) +Step ii) runs in abundance, and the kernel-logs run insane. + +=== Fix === + +We ensure that as part of a dma-unmapping, each (unmapped) pte-slot +is also cleared of its value/content (at the leaf-level, where the +real mapping from a iova => pfn mapping is stored). + +This completes a "deep" dma-unmapping. + +Signed-off-by: Ajay Garg +Link: https://lore.kernel.org/linux-iommu/20211012135653.3852-1-ajaygargnsit@gmail.com/ +--- + drivers/iommu/intel/iommu.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c +index 71a932017772..d8f9bec2c1f7 100644 +--- a/drivers/iommu/intel/iommu.c ++++ b/drivers/iommu/intel/iommu.c +@@ -5123,6 +5123,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain, + gather->freelist = domain_unmap(dmar_domain, start_pfn, + last_pfn, gather->freelist); + ++ dma_pte_clear_range(dmar_domain, start_pfn, last_pfn); ++ + if (dmar_domain->max_addr == iova + size) + dmar_domain->max_addr = iova; + diff --git a/linux/linux-lts/0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/linux/linux-lts/0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch new file mode 100644 index 0000000..26ae0ef --- /dev/null +++ b/linux/linux-lts/0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch @@ -0,0 +1,57 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kiran K +Date: Wed, 13 Oct 2021 13:35:11 +0530 +Subject: [PATCH] Bluetooth: btintel: Fix bdaddress comparison with garbage + value + +Intel Read Verision(TLV) data is parsed into a local structure variable +and it contains a field for bd address. Bd address is returned only in +bootloader mode and hence bd address in TLV structure needs to be validated +only if controller is present in boot loader mode. + +Signed-off-by: Kiran K +Reviewed-by: Tedd Ho-Jeong An +--- + drivers/bluetooth/btintel.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c +index d122cc973917..a828fcd05d83 100644 +--- a/drivers/bluetooth/btintel.c ++++ b/drivers/bluetooth/btintel.c +@@ -2006,14 +2006,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, + if (ver->img_type == 0x03) { + btintel_clear_flag(hdev, INTEL_BOOTLOADER); + btintel_check_bdaddr(hdev); +- } +- +- /* If the OTP has no valid Bluetooth device address, then there will +- * also be no valid address for the operational firmware. +- */ +- if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) { +- bt_dev_info(hdev, "No device address configured"); +- set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); ++ } else { ++ /* ++ * Check for valid bd address in boot loader mode. Device ++ * will be marked as unconfigured if empty bd address is ++ * found. ++ */ ++ if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) { ++ bt_dev_info(hdev, "No device address configured"); ++ set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); ++ } + } + + btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi"); +@@ -2309,6 +2311,10 @@ static int btintel_setup_combined(struct hci_dev *hdev) + goto exit_error; + } + ++ /* memset ver_tlv to start with clean state as few fields are exclusive ++ * to bootloader mode and are not populated in operational mode ++ */ ++ memset(&ver_tlv, 0, sizeof(ver_tlv)); + /* For TLV type device, parse the tlv data */ + err = btintel_parse_version_tlv(hdev, &ver_tlv, skb); + if (err) { diff --git a/linux/linux-lts/0005-lg-laptop-Recognize-more-models.patch b/linux/linux-lts/0005-lg-laptop-Recognize-more-models.patch new file mode 100644 index 0000000..663e4be --- /dev/null +++ b/linux/linux-lts/0005-lg-laptop-Recognize-more-models.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matan Ziv-Av +Date: Tue, 23 Nov 2021 22:14:55 +0200 +Subject: [PATCH] lg-laptop: Recognize more models + +LG uses 5 instead of 0 in the third digit (second digit after 2019) of the year string to indicate newer models in the same year. Handle this case as well. + +Signed-off-by: Matan Ziv-Av +For: https://bugs.archlinux.org/task/71772 +--- + drivers/platform/x86/lg-laptop.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c +index 88b551caeaaf..d6f74d3a7605 100644 +--- a/drivers/platform/x86/lg-laptop.c ++++ b/drivers/platform/x86/lg-laptop.c +@@ -658,6 +658,18 @@ static int acpi_add(struct acpi_device *device) + if (product && strlen(product) > 4) + switch (product[4]) { + case '5': ++ if (strlen(product) > 5) ++ switch (product[5]) { ++ case 'N': ++ year = 2021; ++ break; ++ case '0': ++ year = 2016; ++ break; ++ default: ++ year = 2022; ++ } ++ break; + case '6': + year = 2016; + break; diff --git a/linux/linux-lts/0006-Fix-NFSv4-mount-regression.patch b/linux/linux-lts/0006-Fix-NFSv4-mount-regression.patch new file mode 100644 index 0000000..2fda928 --- /dev/null +++ b/linux/linux-lts/0006-Fix-NFSv4-mount-regression.patch @@ -0,0 +1,238 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 6 Aug 2022 22:54:33 +0200 +Subject: [PATCH] Fix NFSv4 mount regression + +This reverts commit 6f2836341d8a (NFSv4.1 query for fs_location attr on +a new file system, 2022-01-12). + +For: https://bugs.archlinux.org/task/73838 +For: https://bugs.archlinux.org/task/73860 +--- + fs/nfs/client.c | 7 ---- + fs/nfs/nfs4_fs.h | 9 +++-- + fs/nfs/nfs4proc.c | 76 ++++++----------------------------------- + fs/nfs/nfs4state.c | 3 +- + include/linux/nfs_xdr.h | 1 - + 5 files changed, 15 insertions(+), 81 deletions(-) + +diff --git a/fs/nfs/client.c b/fs/nfs/client.c +index 090b16890e3d..551833862171 100644 +--- a/fs/nfs/client.c ++++ b/fs/nfs/client.c +@@ -860,13 +860,6 @@ int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs + server->namelen = pathinfo.max_namelen; + } + +- if (clp->rpc_ops->discover_trunking != NULL && +- (server->caps & NFS_CAP_FS_LOCATIONS)) { +- error = clp->rpc_ops->discover_trunking(server, mntfh); +- if (error < 0) +- return error; +- } +- + return 0; + } + EXPORT_SYMBOL_GPL(nfs_probe_fsinfo); +diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h +index f8672a34fd63..36471dd0e82b 100644 +--- a/fs/nfs/nfs4_fs.h ++++ b/fs/nfs/nfs4_fs.h +@@ -261,8 +261,8 @@ struct nfs4_state_maintenance_ops { + }; + + struct nfs4_mig_recovery_ops { +- int (*get_locations)(struct nfs_server *, struct nfs_fh *, +- struct nfs4_fs_locations *, struct page *, const struct cred *); ++ int (*get_locations)(struct inode *, struct nfs4_fs_locations *, ++ struct page *, const struct cred *); + int (*fsid_present)(struct inode *, const struct cred *); + }; + +@@ -304,9 +304,8 @@ extern int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait); + extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle); + extern int nfs4_proc_fs_locations(struct rpc_clnt *, struct inode *, const struct qstr *, + struct nfs4_fs_locations *, struct page *); +-extern int nfs4_proc_get_locations(struct nfs_server *, struct nfs_fh *, +- struct nfs4_fs_locations *, +- struct page *page, const struct cred *); ++extern int nfs4_proc_get_locations(struct inode *, struct nfs4_fs_locations *, ++ struct page *page, const struct cred *); + extern int nfs4_proc_fsid_present(struct inode *, const struct cred *); + extern struct rpc_clnt *nfs4_proc_lookup_mountpoint(struct inode *, + struct dentry *, +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index a808763c52c1..7c05dbe595ac 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -3962,60 +3962,6 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) + return err; + } + +-static int _nfs4_discover_trunking(struct nfs_server *server, +- struct nfs_fh *fhandle) +-{ +- struct nfs4_fs_locations *locations = NULL; +- struct page *page; +- const struct cred *cred; +- struct nfs_client *clp = server->nfs_client; +- const struct nfs4_state_maintenance_ops *ops = +- clp->cl_mvops->state_renewal_ops; +- int status = -ENOMEM; +- +- cred = ops->get_state_renewal_cred(clp); +- if (cred == NULL) { +- cred = nfs4_get_clid_cred(clp); +- if (cred == NULL) +- return -ENOKEY; +- } +- +- page = alloc_page(GFP_KERNEL); +- locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL); +- if (page == NULL || locations == NULL) +- goto out; +- +- status = nfs4_proc_get_locations(server, fhandle, locations, page, +- cred); +- if (status) +- goto out; +-out: +- if (page) +- __free_page(page); +- kfree(locations); +- return status; +-} +- +-static int nfs4_discover_trunking(struct nfs_server *server, +- struct nfs_fh *fhandle) +-{ +- struct nfs4_exception exception = { +- .interruptible = true, +- }; +- struct nfs_client *clp = server->nfs_client; +- int err = 0; +- +- if (!nfs4_has_session(clp)) +- goto out; +- do { +- err = nfs4_handle_exception(server, +- _nfs4_discover_trunking(server, fhandle), +- &exception); +- } while (exception.retry); +-out: +- return err; +-} +- + static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, + struct nfs_fsinfo *info) + { +@@ -7951,18 +7897,18 @@ int nfs4_proc_fs_locations(struct rpc_clnt *client, struct inode *dir, + * appended to this compound to identify the client ID which is + * performing recovery. + */ +-static int _nfs40_proc_get_locations(struct nfs_server *server, +- struct nfs_fh *fhandle, ++static int _nfs40_proc_get_locations(struct inode *inode, + struct nfs4_fs_locations *locations, + struct page *page, const struct cred *cred) + { ++ struct nfs_server *server = NFS_SERVER(inode); + struct rpc_clnt *clnt = server->client; + u32 bitmask[2] = { + [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS, + }; + struct nfs4_fs_locations_arg args = { + .clientid = server->nfs_client->cl_clientid, +- .fh = fhandle, ++ .fh = NFS_FH(inode), + .page = page, + .bitmask = bitmask, + .migration = 1, /* skip LOOKUP */ +@@ -8008,17 +7954,17 @@ static int _nfs40_proc_get_locations(struct nfs_server *server, + * When the client supports GETATTR(fs_locations_info), it can + * be plumbed in here. + */ +-static int _nfs41_proc_get_locations(struct nfs_server *server, +- struct nfs_fh *fhandle, ++static int _nfs41_proc_get_locations(struct inode *inode, + struct nfs4_fs_locations *locations, + struct page *page, const struct cred *cred) + { ++ struct nfs_server *server = NFS_SERVER(inode); + struct rpc_clnt *clnt = server->client; + u32 bitmask[2] = { + [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS, + }; + struct nfs4_fs_locations_arg args = { +- .fh = fhandle, ++ .fh = NFS_FH(inode), + .page = page, + .bitmask = bitmask, + .migration = 1, /* skip LOOKUP */ +@@ -8067,28 +8013,27 @@ static int _nfs41_proc_get_locations(struct nfs_server *server, + * -NFS4ERR_LEASE_MOVED is returned if the server still has leases + * from this client that require migration recovery. + */ +-int nfs4_proc_get_locations(struct nfs_server *server, +- struct nfs_fh *fhandle, ++int nfs4_proc_get_locations(struct inode *inode, + struct nfs4_fs_locations *locations, + struct page *page, const struct cred *cred) + { ++ struct nfs_server *server = NFS_SERVER(inode); + struct nfs_client *clp = server->nfs_client; + const struct nfs4_mig_recovery_ops *ops = + clp->cl_mvops->mig_recovery_ops; + struct nfs4_exception exception = { + .interruptible = true, + }; + int status; + + dprintk("%s: FSID %llx:%llx on \"%s\"\n", __func__, + (unsigned long long)server->fsid.major, + (unsigned long long)server->fsid.minor, + clp->cl_hostname); +- nfs_display_fhandle(fhandle, __func__); ++ nfs_display_fhandle(NFS_FH(inode), __func__); + + do { +- status = ops->get_locations(server, fhandle, locations, page, +- cred); ++ status = ops->get_locations(inode, locations, page, cred); + if (status != -NFS4ERR_DELAY) + break; + nfs4_handle_exception(server, status, &exception); +@@ -10588,7 +10533,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = { + .free_client = nfs4_free_client, + .create_server = nfs4_create_server, + .clone_server = nfs_clone_server, +- .discover_trunking = nfs4_discover_trunking, + }; + + static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = { +diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c +index 83c88b54d712..42707e12d35c 100644 +--- a/fs/nfs/nfs4state.c ++++ b/fs/nfs/nfs4state.c +@@ -2098,8 +2098,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred + } + + inode = d_inode(server->super->s_root); +- result = nfs4_proc_get_locations(server, NFS_FH(inode), locations, +- page, cred); ++ result = nfs4_proc_get_locations(inode, locations, page, cred); + if (result) { + dprintk("<-- %s: failed to retrieve fs_locations: %d\n", + __func__, result); +diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h +index ecd74cc34797..e9698b6278a5 100644 +--- a/include/linux/nfs_xdr.h ++++ b/include/linux/nfs_xdr.h +@@ -1805,7 +1805,6 @@ struct nfs_rpc_ops { + struct nfs_server *(*create_server)(struct fs_context *); + struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *, + struct nfs_fattr *, rpc_authflavor_t); +- int (*discover_trunking)(struct nfs_server *, struct nfs_fh *); + }; + + /* diff --git a/linux/linux-lts/PKGBUILD b/linux/linux-lts/PKGBUILD new file mode 100644 index 0000000..760dfc3 --- /dev/null +++ b/linux/linux-lts/PKGBUILD @@ -0,0 +1,213 @@ +# Maintainer: Andreas Radke + +pkgbase=linux-lts +pkgver=5.15.74 +pkgrel=1 +pkgdesc='LTS Linux' +url="https://www.kernel.org/" +arch=(x86_64) +license=(GPL2) +makedepends=( + bc libelf pahole cpio perl tar xz + xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra +) +options=('!strip') +_srcname=linux-$pkgver +source=( + https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} + config # the main kernel config file + 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch + 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch + 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch + 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch + 0005-lg-laptop-Recognize-more-models.patch + 0006-Fix-NFSv4-mount-regression.patch +) +validpgpkeys=( + 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman +) +# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256sums=('2c1539a2f85b835c36c4a07c8270b52b0bec38fdda7339477d07f0c3af8c4265' + 'SKIP' + '8924e710cf047279574bd3dd5a8a9869f7baeb0cd291bbaf3b9530c70600a643' + '3b5cfc9ca9cf778ea2c4b619b933cda26519969df2d764b5a687f63cf59974cd' + 'c175fbb141c3cec013c799f694d88310375ac5456042f6a4a1adc7667836d786' + '8357f000b2b622e73dcfd41c2bad42b5e99fffe8f7ee64f774aa771f86cef43c' + '5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde' + '067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9' + '10801c245064777873b580bea1fc17a4288ec519e0ce9500aa1b7c6e19fe777b') + +export KBUILD_BUILD_HOST=archlinux +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + +prepare() { + cd $_srcname + + echo "Setting version..." + scripts/setlocalversion --save-scmversion + echo "-$pkgrel" > localversion.10-pkgrel + echo "${pkgbase#linux}" > localversion.20-pkgname + + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done + + echo "Setting config..." + cp ../config .config + make olddefconfig + diff -u ../config .config || : + + make -s kernelrelease > version + echo "Prepared $pkgbase version $(