Message ID | 20180921184127.58216-1-ldir@darbyshire-bryant.me.uk |
---|---|
State | Accepted |
Headers | show |
Series | [OpenWrt-Devel] kernel: re-enable MIPS VDSO | expand |
On Fri, Sep 21, 2018 at 11:42 AM Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> wrote: > > kernel upstream commit 9efcaa7c4afba5628f2650a76f69c798f47eeb18 to 4.14 > itself a backport of 0f02cfbc3d9e413d450d8d0fd660077c23f67eff has > resolved the cache line issues that led to us disabling VDSO by default > on MIPS. Do you know if this is related to the mmap failure on ar71xx? https://lists.openwrt.org/pipermail/openwrt-devel/2018-May/012135.html > > Remove our force disable patch: > > pending-4.14/206-mips-disable-vdso.patch > > Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> > --- > .../pending-4.14/206-mips-disable-vdso.patch | 23 ------------------- > 1 file changed, 23 deletions(-) > delete mode 100644 target/linux/generic/pending-4.14/206-mips-disable-vdso.patch > > diff --git a/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch b/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch > deleted file mode 100644 > index f3c58dcd3a..0000000000 > --- a/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From: Felix Fietkau <nbd@nbd.name> > -Subject: kernel: disable MIPS VDSO by default until the cache issues have been resolved > - > -lede-commit: 1185e645a773c86aa88cf04d0e2911dc62eb43f5 > -Signed-off-by: Felix Fietkau <nbd@nbd.name> > ---- > - arch/mips/vdso/Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > ---- a/arch/mips/vdso/Makefile > -+++ b/arch/mips/vdso/Makefile > -@@ -30,9 +30,9 @@ aflags-vdso := $(ccflags-vdso) \ > - ifndef CONFIG_CPU_MIPSR6 > - ifeq ($(call ld-ifversion, -lt, 225000000, y),y) > - $(warning MIPS VDSO requires binutils >= 2.25) > -- obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) > -- ccflags-vdso += -DDISABLE_MIPS_VDSO > - endif > -+ obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) > -+ ccflags-vdso += -DDISABLE_MIPS_VDSO > - endif > - > - # VDSO linker flags. > -- > 2.17.1 (Apple Git-112) > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
On 09/21/2018 08:41 PM, Kevin Darbyshire-Bryant wrote: > kernel upstream commit 9efcaa7c4afba5628f2650a76f69c798f47eeb18 to 4.14 > itself a backport of 0f02cfbc3d9e413d450d8d0fd660077c23f67eff has > resolved the cache line issues that led to us disabling VDSO by default > on MIPS. > > Remove our force disable patch: > > pending-4.14/206-mips-disable-vdso.patch > > Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> This will also get fixed in kernel 4.9 and 4.4, so we can later remove this patch also for these kernel versions. > --- > .../pending-4.14/206-mips-disable-vdso.patch | 23 ------------------- > 1 file changed, 23 deletions(-) > delete mode 100644 target/linux/generic/pending-4.14/206-mips-disable-vdso.patch > > diff --git a/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch b/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch > deleted file mode 100644 > index f3c58dcd3a..0000000000 > --- a/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From: Felix Fietkau <nbd@nbd.name> > -Subject: kernel: disable MIPS VDSO by default until the cache issues have been resolved > - > -lede-commit: 1185e645a773c86aa88cf04d0e2911dc62eb43f5 > -Signed-off-by: Felix Fietkau <nbd@nbd.name> > ---- > - arch/mips/vdso/Makefile | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > ---- a/arch/mips/vdso/Makefile > -+++ b/arch/mips/vdso/Makefile > -@@ -30,9 +30,9 @@ aflags-vdso := $(ccflags-vdso) \ > - ifndef CONFIG_CPU_MIPSR6 > - ifeq ($(call ld-ifversion, -lt, 225000000, y),y) > - $(warning MIPS VDSO requires binutils >= 2.25) > -- obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) > -- ccflags-vdso += -DDISABLE_MIPS_VDSO > - endif > -+ obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) > -+ ccflags-vdso += -DDISABLE_MIPS_VDSO > - endif > - > - # VDSO linker flags. >
Merged into my staging tree. Thank you!
diff --git a/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch b/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch deleted file mode 100644 index f3c58dcd3a..0000000000 --- a/target/linux/generic/pending-4.14/206-mips-disable-vdso.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Felix Fietkau <nbd@nbd.name> -Subject: kernel: disable MIPS VDSO by default until the cache issues have been resolved - -lede-commit: 1185e645a773c86aa88cf04d0e2911dc62eb43f5 -Signed-off-by: Felix Fietkau <nbd@nbd.name> ---- - arch/mips/vdso/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/mips/vdso/Makefile -+++ b/arch/mips/vdso/Makefile -@@ -30,9 +30,9 @@ aflags-vdso := $(ccflags-vdso) \ - ifndef CONFIG_CPU_MIPSR6 - ifeq ($(call ld-ifversion, -lt, 225000000, y),y) - $(warning MIPS VDSO requires binutils >= 2.25) -- obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) -- ccflags-vdso += -DDISABLE_MIPS_VDSO - endif -+ obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) -+ ccflags-vdso += -DDISABLE_MIPS_VDSO - endif - - # VDSO linker flags.
kernel upstream commit 9efcaa7c4afba5628f2650a76f69c798f47eeb18 to 4.14 itself a backport of 0f02cfbc3d9e413d450d8d0fd660077c23f67eff has resolved the cache line issues that led to us disabling VDSO by default on MIPS. Remove our force disable patch: pending-4.14/206-mips-disable-vdso.patch Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- .../pending-4.14/206-mips-disable-vdso.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 target/linux/generic/pending-4.14/206-mips-disable-vdso.patch