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@yahoo.com>
(cherry picked from commit c2d194a34eb1a62a610f0437287db6c3eca64d5a)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/armvirt/64/config-5.15 b/target/linux/armvirt/64/config-5.15
index 19ae3dc0cfa3405f844678a1930dc9a6959f612d..eb5405eb1ef9613e7e7f232d238d218574825191 100644 (file)
--- 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 477d70fc66cf3ce2dbba73919aa563268f8d6ffa..193bc7d5ee3071579b415303201144f2b3d356fe 100644 (file)
--- 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 2f8f9dccb1b2af20f8f41d534866f93c8b09a26b..e18728e49d6622dd1f40be5046bb40ecd9bf6e74 100644 (file)
--- 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 f13af8ba268f2f2c23120dfeca367e59c9a6d76f..6ac2993c155976c4338a141f77158ef991fa25b7 100644 (file)
--- 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/ipq806x/config-5.15 b/target/linux/ipq806x/config-5.15
index 69e17cfa5044fbafd5231a7f98140856c6f7563f..286f327e39da3c93c68d02fd8e12606fa8fd2aa7 100644 (file)
--- 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/layerscape/armv8_64b/config-5.15 b/target/linux/layerscape/armv8_64b/config-5.15
index 3fe55e61188e9628df851e561741bd8fe02a3383..df0a3fd849cfba26c30f9a6dd10870914912b12f 100644 (file)
--- 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 96ff95be13dbb91a002c62ead689de25536da7de..9df1494ca095d2cd560a28cc65bc2859e3ecbeb0 100644 (file)
--- 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 1ce6d852ba1c1ad185b99f5c1bb1620898013df6..ac09c8a9c47b4d57e98faf527d4d2d22fce7f9d3 100644 (file)
--- 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 c2ad7e7ab9d78affaff456347d9e2a38590a1509..9ca15896432546eb2995a395965156a127c8bbe6 100644 (file)
--- 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 2359fd8729e895f9adafaf807d66ec8efc6309b4..0ed009004f15a81550bb380b09150597b75eb453 100644 (file)
--- 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