[openwrt/openwrt] kernel: enable (ARM|ARM64)_MODULE_PLTS in generic config

LEDE Commits lede-commits at lists.infradead.org
Tue May 23 05:51:48 PDT 2023 

ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c2d194a34eb1a62a610f0437287db6c3eca64d5a

commit c2d194a34eb1a62a610f0437287db6c3eca64d5a
Author: Tony Ambardar <itugrok at yahoo.com>
AuthorDate: Thu May 4 19:17:35 2023 -0700

    kernel: enable (ARM|ARM64)_MODULE_PLTS in generic config
    
    This allows loading modules with large memory requirements, recently needed
    while testing on armvirt/32. Past forum discussions [1] and bug reports [2]
    also raised this and the ipq806x target already set it in response [3].
    Given this increases kernel image size by only ~1KB, is generally useful on
    multi-platform kernels, and enabled by default on upstream arm32 Linux, add
    it to the generic config.
    
    The setting has similar utility on arm64, is a requirement for KASLR, and
    already enabled on most OpenWrt aarch64 targets, so pull this into the
    top-level generic config.
    
    [1]: https://forum.openwrt.org/t/vmap-allocation-for-size-442368-failed-use-vmalloc-size-to-increase-size/34545/7
    [2]: https://github.com/openwrt/openwrt/issues/8282
    [3]: f81e148eb6 ("ipq806x: update 4.19 kernel config").
    
    Signed-off-by: Tony Ambardar <itugrok at yahoo.com>
---
 target/linux/armvirt/64/config-5.15           | 1 -
 target/linux/bcm27xx/bcm2710/config-5.15      | 1 -
 target/linux/bcm27xx/bcm2711/config-5.15      | 1 -
 target/linux/generic/config-5.15              | 4 ++--
 target/linux/generic/config-6.1               | 4 ++--
 target/linux/ipq806x/config-5.15              | 1 -
 target/linux/ipq806x/config-6.1               | 1 -
 target/linux/layerscape/armv8_64b/config-5.15 | 1 -
 target/linux/mediatek/filogic/config-5.15     | 1 -
 target/linux/mediatek/mt7622/config-5.15      | 1 -
 target/linux/octeontx/config-5.15             | 1 -
 target/linux/rockchip/armv8/config-5.15       | 1 -
 12 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/target/linux/armvirt/64/config-5.15 b/target/linux/armvirt/64/config-5.15
index 19ae3dc0cf..eb5405eb1e 100644
--- a/target/linux/armvirt/64/config-5.15
+++ b/target/linux/armvirt/64/config-5.15
@@ -23,7 +23,6 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_PA_BITS=48
diff --git a/target/linux/bcm27xx/bcm2710/config-5.15 b/target/linux/bcm27xx/bcm2710/config-5.15
index 477d70fc66..193bc7d5ee 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.15
+++ b/target/linux/bcm27xx/bcm2710/config-5.15
@@ -27,7 +27,6 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_PA_BITS=48
diff --git a/target/linux/bcm27xx/bcm2711/config-5.15 b/target/linux/bcm27xx/bcm2711/config-5.15
index 2f8f9dccb1..e18728e49d 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.15
+++ b/target/linux/bcm27xx/bcm2711/config-5.15
@@ -27,7 +27,6 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_PA_BITS=48
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index d00080c72e..934af3a768 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -343,7 +343,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_ERRATUM_858921 is not set
 # CONFIG_ARM64_HW_AFDBM is not set
 # CONFIG_ARM64_LSE_ATOMICS is not set
-# CONFIG_ARM64_MODULE_PLTS is not set
+CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_MTE is not set
 # CONFIG_ARM64_PAN is not set
 # CONFIG_ARM64_PMEM is not set
@@ -408,7 +408,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_MEDIATEK_CPUFREQ_HW is not set
 # CONFIG_ARM_MHU is not set
-# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_ARM_MODULE_PLTS=y
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_PSCI is not set
 # CONFIG_ARM_PSCI_CHECKER is not set
diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1
index 1b06116234..b6ece6c6e1 100644
--- a/target/linux/generic/config-6.1
+++ b/target/linux/generic/config-6.1
@@ -367,7 +367,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_ERRATUM_858921 is not set
 # CONFIG_ARM64_HW_AFDBM is not set
 # CONFIG_ARM64_LSE_ATOMICS is not set
-# CONFIG_ARM64_MODULE_PLTS is not set
+CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_MTE is not set
 # CONFIG_ARM64_PAN is not set
 # CONFIG_ARM64_PMEM is not set
@@ -433,7 +433,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_MEDIATEK_CPUFREQ_HW is not set
 # CONFIG_ARM_MHU is not set
-# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_ARM_MODULE_PLTS=y
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_PSCI is not set
 # CONFIG_ARM_PSCI_CHECKER is not set
diff --git a/target/linux/ipq806x/config-5.15 b/target/linux/ipq806x/config-5.15
index 69e17cfa50..286f327e39 100644
--- a/target/linux/ipq806x/config-5.15
+++ b/target/linux/ipq806x/config-5.15
@@ -39,7 +39,6 @@ CONFIG_ARM_HAS_SG_CHAIN=y
 # CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_MODULE_PLTS=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 # CONFIG_ARM_QCOM_CPUFREQ_HW is not set
diff --git a/target/linux/ipq806x/config-6.1 b/target/linux/ipq806x/config-6.1
index aae2f8a0b0..4f8c3c88df 100644
--- a/target/linux/ipq806x/config-6.1
+++ b/target/linux/ipq806x/config-6.1
@@ -43,7 +43,6 @@ CONFIG_ARM_HAS_SG_CHAIN=y
 # CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_MODULE_PLTS=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 # CONFIG_ARM_QCOM_CPUFREQ_HW is not set
diff --git a/target/linux/layerscape/armv8_64b/config-5.15 b/target/linux/layerscape/armv8_64b/config-5.15
index 3fe55e6118..df0a3fd849 100644
--- a/target/linux/layerscape/armv8_64b/config-5.15
+++ b/target/linux/layerscape/armv8_64b/config-5.15
@@ -30,7 +30,6 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_PA_BITS=48
diff --git a/target/linux/mediatek/filogic/config-5.15 b/target/linux/mediatek/filogic/config-5.15
index 96ff95be13..9df1494ca0 100644
--- a/target/linux/mediatek/filogic/config-5.15
+++ b/target/linux/mediatek/filogic/config-5.15
@@ -20,7 +20,6 @@ CONFIG_ARM64_4K_PAGES=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
diff --git a/target/linux/mediatek/mt7622/config-5.15 b/target/linux/mediatek/mt7622/config-5.15
index 1ce6d852ba..ac09c8a9c4 100644
--- a/target/linux/mediatek/mt7622/config-5.15
+++ b/target/linux/mediatek/mt7622/config-5.15
@@ -22,7 +22,6 @@ CONFIG_ARM64_CRYPTO=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
diff --git a/target/linux/octeontx/config-5.15 b/target/linux/octeontx/config-5.15
index c2ad7e7ab9..9ca1589643 100644
--- a/target/linux/octeontx/config-5.15
+++ b/target/linux/octeontx/config-5.15
@@ -26,7 +26,6 @@ CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_PA_BITS=48
diff --git a/target/linux/rockchip/armv8/config-5.15 b/target/linux/rockchip/armv8/config-5.15
index 2359fd8729..0ed009004f 100644
--- a/target/linux/rockchip/armv8/config-5.15
+++ b/target/linux/rockchip/armv8/config-5.15
@@ -31,7 +31,6 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_ERRATUM_1742098=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_PA_BITS=48

More information about the lede-commits mailing list