| From foo@baz Mon Sep 17 13:33:56 CEST 2018 |
| From: Stephen Hemminger <stephen@networkplumber.org> |
| Date: Thu, 13 Sep 2018 07:58:49 -0700 |
| Subject: inet: frags: reorganize struct netns_frags |
| To: davem@davemloft.net, gregkh@linuxfoundation.org |
| Cc: netdev@vger.kernel.org, stable@vger.kernel.org, edumazet@google.com |
| Message-ID: <20180913145902.17531-18-sthemmin@microsoft.com> |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| 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> |
| (cherry picked from commit c2615cf5a761b32bf74e85bddc223dfff3d9b9f0) |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| include/net/inet_frag.h | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| --- a/include/net/inet_frag.h |
| +++ b/include/net/inet_frag.h |
| @@ -5,16 +5,17 @@ |
| #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; |
| int max_dist; |
| 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; |
| }; |
| |
| /** |
