aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_netlink.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2021-11-15 09:23:03 -0800
committerJakub Kicinski <kuba@kernel.org>2021-11-16 19:07:54 -0800
commit49ecc2e9c3abd269951972fa8b23a4d081111b80 (patch)
treea80df702ca11dfc0473c23ed47b6552ce63f2a6a /net/netfilter/nf_conntrack_netlink.c
parentnet: use .data.once section in netdev_level_once() (diff)
downloadlinux-dev-49ecc2e9c3abd269951972fa8b23a4d081111b80.tar.xz
linux-dev-49ecc2e9c3abd269951972fa8b23a4d081111b80.zip
net: align static siphash keys
siphash keys use 16 bytes. Define siphash_aligned_key_t macro so that we can make sure they are not crossing a cache line boundary. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index f1e5443fe7c7..3d6c8da3de1f 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -2997,7 +2997,7 @@ static const union nf_inet_addr any_addr;
static __be32 nf_expect_get_id(const struct nf_conntrack_expect *exp)
{
- static __read_mostly siphash_key_t exp_id_seed;
+ static siphash_aligned_key_t exp_id_seed;
unsigned long a, b, c, d;
net_get_random_once(&exp_id_seed, sizeof(exp_id_seed));