From patchwork Thu Jan 20 12:06:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1582109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Jfh8H18zJz9t25 for ; Thu, 20 Jan 2022 23:07:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232001AbiATMHK (ORCPT ); Thu, 20 Jan 2022 07:07:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231989AbiATMHJ (ORCPT ); Thu, 20 Jan 2022 07:07:09 -0500 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D069C061574 for ; Thu, 20 Jan 2022 04:07:09 -0800 (PST) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nAWDb-0002kA-PG; Thu, 20 Jan 2022 13:07:07 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nf-next 0/4] netfilter: conntrack: remove extension register api Date: Thu, 20 Jan 2022 13:06:58 +0100 Message-Id: <20220120120702.15939-1-fw@strlen.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This starts to simplify the extension infra. Should have no impact on functionality. Extension IDs already need compile-time allocation, the dynamic registration isn't necessary, just place the sizes in the extension core and handle the only instance of the ->destroy hook manually. Also avoids the ->destroy hook invocation during ct destruction if the conntrack wasn't added to the bysource hash list. Florian Westphal (4): netfilter: conntrack: make all extensions 8-byte alignned netfilter: conntrack: move extension sizes into core netfilter: conntrack: hande ->destroy hook via nat_ops instead netfilter: conntrack: remove extension register api include/linux/netfilter.h | 1 + include/net/netfilter/nf_conntrack_acct.h | 1 - include/net/netfilter/nf_conntrack_ecache.h | 13 -- include/net/netfilter/nf_conntrack_extend.h | 18 +-- include/net/netfilter/nf_conntrack_labels.h | 3 - include/net/netfilter/nf_conntrack_seqadj.h | 3 - include/net/netfilter/nf_conntrack_timeout.h | 12 -- .../net/netfilter/nf_conntrack_timestamp.h | 13 -- net/netfilter/nf_conntrack_acct.c | 19 --- net/netfilter/nf_conntrack_core.c | 94 ++----------- net/netfilter/nf_conntrack_ecache.c | 24 +--- net/netfilter/nf_conntrack_extend.c | 132 ++++++++++-------- net/netfilter/nf_conntrack_helper.c | 17 --- net/netfilter/nf_conntrack_labels.c | 20 +-- net/netfilter/nf_conntrack_seqadj.c | 16 --- net/netfilter/nf_conntrack_timeout.c | 19 --- net/netfilter/nf_conntrack_timestamp.c | 20 --- net/netfilter/nf_nat_core.c | 28 +--- net/netfilter/nf_synproxy_core.c | 24 +--- net/sched/act_ct.c | 13 -- 20 files changed, 95 insertions(+), 395 deletions(-)