From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: phil@nwl.cc, Florian Westphal <fw@strlen.de>
Subject: [PATCH 0/8] netfilter: merge nf_log_proto modules
Date: Thu, 25 Mar 2021 18:25:04 +0100 [thread overview]
Message-ID: <20210325172512.17729-1-fw@strlen.de> (raw)
Netfilter has multiple log modules:
nf_log_arp
nf_log_bridge
nf_log_ipv4
nf_log_ipv6
nf_log_netdev
nfnetlink_log
nf_log_common
With the exception of nfnetlink_log (packet is sent to userspace for
dissection/logging) all of them log to the kernel ringbuffer.
This series merges all modules except nfnetlink_log into a single
module, nf_log_syslog.
After the series, only two log modules remain:
nfnetlink_log and nf_log_syslog. The latter provides the same
functionality as the old per-af log modules.
Last patch allows to move log backend module load
to nft_log to avoid a deadlock that can occur when request_module()
is called with the nft transaction mutex held.
Florian Westphal (8):
netfilter: nf_log_ipv4: rename to nf_log_syslog
netfilter: nf_log_arp: merge with nf_log_syslog
netfilter: nf_log_ipv6: merge with nf_log_syslog
netfilter: nf_log_netdev: merge with nf_log_syslog
netfilter: nf_log_bridge: merge with nf_log_syslog
netfilter: nf_log_common: merge with nf_log_syslog
netfilter: nf_log: add module softdeps
netfilter: nft_log: perform module load from nf_tables
include/net/netfilter/nf_log.h | 25 -
include/net/netfilter/nf_tables.h | 5 +
net/bridge/netfilter/Kconfig | 4 -
net/bridge/netfilter/Makefile | 3 -
net/bridge/netfilter/nf_log_bridge.c | 79 --
net/ipv4/netfilter/Kconfig | 10 +-
net/ipv4/netfilter/Makefile | 4 -
net/ipv4/netfilter/nf_log_arp.c | 172 ----
net/ipv4/netfilter/nf_log_ipv4.c | 395 ----------
net/ipv6/netfilter/Kconfig | 5 +-
net/ipv6/netfilter/Makefile | 3 -
net/ipv6/netfilter/nf_log_ipv6.c | 427 ----------
net/netfilter/Kconfig | 20 +-
net/netfilter/Makefile | 6 +-
net/netfilter/nf_log.c | 10 -
net/netfilter/nf_log_common.c | 224 ------
net/netfilter/nf_log_netdev.c | 78 --
net/netfilter/nf_log_syslog.c | 1089 ++++++++++++++++++++++++++
net/netfilter/nf_tables_api.c | 5 +-
net/netfilter/nft_log.c | 20 +-
net/netfilter/xt_LOG.c | 1 +
net/netfilter/xt_NFLOG.c | 1 +
net/netfilter/xt_TRACE.c | 1 +
23 files changed, 1144 insertions(+), 1443 deletions(-)
delete mode 100644 net/bridge/netfilter/nf_log_bridge.c
delete mode 100644 net/ipv4/netfilter/nf_log_arp.c
delete mode 100644 net/ipv4/netfilter/nf_log_ipv4.c
delete mode 100644 net/ipv6/netfilter/nf_log_ipv6.c
delete mode 100644 net/netfilter/nf_log_common.c
delete mode 100644 net/netfilter/nf_log_netdev.c
create mode 100644 net/netfilter/nf_log_syslog.c
--
2.26.3
next reply other threads:[~2021-03-25 17:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 17:25 Florian Westphal [this message]
2021-03-25 17:25 ` [PATCH 1/8] netfilter: nf_log_ipv4: rename to nf_log_syslog Florian Westphal
2021-03-25 17:25 ` [PATCH 2/8] netfilter: nf_log_arp: merge with nf_log_syslog Florian Westphal
2021-03-25 17:25 ` [PATCH 3/8] netfilter: nf_log_ipv6: " Florian Westphal
2021-03-25 17:25 ` [PATCH 4/8] netfilter: nf_log_netdev: " Florian Westphal
2021-03-25 17:25 ` [PATCH 5/8] netfilter: nf_log_bridge: " Florian Westphal
2021-03-25 17:25 ` [PATCH 6/8] netfilter: nf_log_common: " Florian Westphal
2021-03-25 17:25 ` [PATCH 7/8] netfilter: nf_log: add module softdeps Florian Westphal
2021-03-25 17:25 ` [PATCH 8/8] netfilter: nft_log: perform module load from nf_tables Florian Westphal
2021-03-26 14:35 ` [PATCH 0/8] netfilter: merge nf_log_proto modules Phil Sutter
2021-03-30 22:50 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210325172512.17729-1-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=phil@nwl.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).