diff options
| author | Eric Dumazet <edumazet@google.com> | 2018-10-10 12:30:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-08 11:25:32 +0100 |
| commit | 29ff723c549906a5d8d64dd406d1b1b4da0eb85b (patch) | |
| tree | a38c8cef534f65c255d4a819dbf266bdd1c464f5 /include | |
| parent | 33990010ea40454a41c4c5dc78d26165579578ca (diff) | |
| download | linux-stable-29ff723c549906a5d8d64dd406d1b1b4da0eb85b.tar.gz linux-stable-29ff723c549906a5d8d64dd406d1b1b4da0eb85b.tar.bz2 linux-stable-29ff723c549906a5d8d64dd406d1b1b4da0eb85b.zip | |
inet: frags: reorganize struct netns_frags
commit c2615cf5a761b32bf74e85bddc223dfff3d9b9f0 upstream.
Put the read-mostly fields in a separate cache line
at the beginning of struct netns_frags, to reduce
false sharing noticed in inet_frag_kill()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 4.4: adjust context]
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/inet_frag.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index 197c172cc811..41a830ba11fc 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -4,15 +4,16 @@ #include <linux/rhashtable.h> struct netns_frags { - struct rhashtable rhashtable ____cacheline_aligned_in_smp; - - /* Keep atomic mem on separate cachelines in structs that include it */ - atomic_long_t mem ____cacheline_aligned_in_smp; /* sysctls */ long high_thresh; long low_thresh; int timeout; struct inet_frags *f; + + struct rhashtable rhashtable ____cacheline_aligned_in_smp; + + /* Keep atomic mem on separate cachelines in structs that include it */ + atomic_long_t mem ____cacheline_aligned_in_smp; }; /** |