mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
ec780bdb92
These are the latest patches that just landed upstream for 5.13, will be
backported by Greg into 5.10 (because of stable@), and are now in the
5.4 backport branch of wireguard: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
Cc: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tested-by: Stijn Segers <foss@volatilesystems.org>
(cherry picked from commit 2a3b2f59fe)
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Fri, 4 Jun 2021 17:17:32 +0200
|
|
Subject: [PATCH] wireguard: do not use -O3
|
|
|
|
commit cc5060ca0285efe2728bced399a1955a7ce808b2 upstream.
|
|
|
|
Apparently, various versions of gcc have O3-related miscompiles. Looking
|
|
at the difference between -O2 and -O3 for gcc 11 doesn't indicate
|
|
miscompiles, but the difference also doesn't seem so significant for
|
|
performance that it's worth risking.
|
|
|
|
Link: https://lore.kernel.org/lkml/CAHk-=wjuoGyxDhAF8SsrTkN0-YfCx7E6jUN3ikC_tn2AKWTTsA@mail.gmail.com/
|
|
Link: https://lore.kernel.org/lkml/CAHmME9otB5Wwxp7H8bR_i2uH2esEMvoBMC8uEXBMH9p0q1s6Bw@mail.gmail.com/
|
|
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/wireguard/Makefile | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/Makefile
|
|
+++ b/drivers/net/wireguard/Makefile
|
|
@@ -1,5 +1,4 @@
|
|
-ccflags-y := -O3
|
|
-ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
|
|
+ccflags-y := -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
|
|
ccflags-$(CONFIG_WIREGUARD_DEBUG) += -DDEBUG
|
|
wireguard-y := main.o
|
|
wireguard-y += noise.o
|