mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-22 10:01:03 +00:00
d540725871
Without this patch, the chacha block counter is not incremented on neon rounds, resulting in incorrect calculations and corrupt packets. This also switches to using `--no-numbered --zero-commit` so that future diffs are smaller. Reported-by: Hans Geiblinger <cybrnook2002@yahoo.com> Reviewed-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Mon, 22 Feb 2021 17:25:46 +0100
|
|
Subject: [PATCH] wireguard: peer: put frequently used members above cache
|
|
lines
|
|
|
|
commit 5a0598695634a6bb4126818902dd9140cd9df8b6 upstream.
|
|
|
|
The is_dead boolean is checked for every single packet, while the
|
|
internal_id member is used basically only for pr_debug messages. So it
|
|
makes sense to hoist up is_dead into some space formerly unused by a
|
|
struct hole, while demoting internal_api to below the lowest struct
|
|
cache line.
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/wireguard/peer.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireguard/peer.h
|
|
+++ b/drivers/net/wireguard/peer.h
|
|
@@ -39,6 +39,7 @@ struct wg_peer {
|
|
struct crypt_queue tx_queue, rx_queue;
|
|
struct sk_buff_head staged_packet_queue;
|
|
int serial_work_cpu;
|
|
+ bool is_dead;
|
|
struct noise_keypairs keypairs;
|
|
struct endpoint endpoint;
|
|
struct dst_cache endpoint_cache;
|
|
@@ -61,9 +62,8 @@ struct wg_peer {
|
|
struct rcu_head rcu;
|
|
struct list_head peer_list;
|
|
struct list_head allowedips_list;
|
|
- u64 internal_id;
|
|
struct napi_struct napi;
|
|
- bool is_dead;
|
|
+ u64 internal_id;
|
|
};
|
|
|
|
struct wg_peer *wg_peer_create(struct wg_device *wg,
|