From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D855C433B4 for ; Fri, 9 Apr 2021 13:31:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0999A610A4 for ; Fri, 9 Apr 2021 13:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231621AbhDINb0 (ORCPT ); Fri, 9 Apr 2021 09:31:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231127AbhDINb0 (ORCPT ); Fri, 9 Apr 2021 09:31:26 -0400 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 597CCC061760 for ; Fri, 9 Apr 2021 06:31:13 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1lUrE7-0006k5-Jt; Fri, 09 Apr 2021 15:31:11 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nf-next 0/5] netfilter: conntrack: shrink size of netns_ct Date: Fri, 9 Apr 2021 15:30:54 +0200 Message-Id: <20210409133059.17963-1-fw@strlen.de> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This reduces size of the netns_ct structure, which itself is embedded in struct net. First two patches move two helper related settings to net_generic, these are only accessed when a new connection is added. Patches 3 and 4 move the ct and expect counter to net_generic too. While these are used from packet path, they are not accessed when conntack finds an existing entry. This also makes netns_ct a read-mostly structure, at this time each newly accepted conntrack dirties the first netns_ct cacheline for other cpus. Last patch converts a few sysctls to u8. Most conntrack sysctls are timeouts, so these need to be kept as ints. Florian Westphal (5): netfilter: conntrack: move autoassign warning member to net_generic data netfilter: conntrack: move autoassign_helper sysctl to net_generic data netfilter: conntrack: move expect counter to net_generic data netfilter: conntrack: move ct counter to net_generic data netfilter: conntrack: convert sysctls to u8 include/net/netfilter/nf_conntrack.h | 8 +++ include/net/netns/conntrack.h | 23 ++++----- net/netfilter/nf_conntrack_core.c | 46 ++++++++++++----- net/netfilter/nf_conntrack_expect.c | 22 ++++++--- net/netfilter/nf_conntrack_helper.c | 15 ++++-- net/netfilter/nf_conntrack_netlink.c | 5 +- net/netfilter/nf_conntrack_proto_tcp.c | 34 ++++++------- net/netfilter/nf_conntrack_standalone.c | 66 +++++++++++++------------ 8 files changed, 132 insertions(+), 87 deletions(-) -- 2.26.3