Netfilter fixes for net
Subsystems (5)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Extend nf_queue selftest to cover re-queueing, non-gso mode and delayed queueing, from Florian Westphal.
2) Clear skb->tstamp in IPVS forwarding path, from Julian Anastasov.
3) Provide netlink extended error reporting for EEXIST case.
4) Missing VLAN offload tag and proto in log target.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Absolutely nothing urgent in this batch, you might consider pulling this once net-next.git gets merged into net.git so this shows up in 5.10-rc.
Thank you.
----------------------------------------------------------------
The following changes since commit 874fb9e2ca949b443cc419a4f2227cafd4381d39:
ipv4: Restore flowi4_oif update before call to xfrm_lookup_route (2020-10-10 11:38:59 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 0d9826bc18ce356e8909919ad681ad65d0a6061e:
netfilter: nf_log: missing vlan offload tag and proto (2020-10-14 01:25:14 +0200)
----------------------------------------------------------------
Florian Westphal (1):
selftests: netfilter: extend nfqueue test case
Julian Anastasov (1):
ipvs: clear skb->tstamp in forwarding path
Pablo Neira Ayuso (2):
netfilter: nftables: extend error reporting for chain updates
netfilter: nf_log: missing vlan offload tag and proto
include/net/netfilter/nf_log.h | 1 + net/ipv4/netfilter/nf_log_arp.c | 19 ++++++- net/ipv4/netfilter/nf_log_ipv4.c | 6 ++- net/ipv6/netfilter/nf_log_ipv6.c | 8 +-- net/netfilter/ipvs/ip_vs_xmit.c | 6 +++ net/netfilter/nf_log_common.c | 12 +++++ net/netfilter/nf_tables_api.c | 19 +++++-- tools/testing/selftests/netfilter/nf-queue.c | 61 ++++++++++++++++++---- tools/testing/selftests/netfilter/nft_queue.sh | 70 +++++++++++++++++++++----- 9 files changed, 168 insertions(+), 34 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/4 selftests: netfilter: extend nfqueue test case
From: Florian Westphal <[email protected]>
add a test with re-queueing: usespace doesn't pass accept verdict, but tells to re-queue to another nf_queue instance.
Also, make the second nf-queue program use non-gso mode, kernel will have to perform software segmentation.
Lastly, do not queue every packet, just one per second, and add delay when re-injecting the packet to the kernel.
--- tools/testing/selftests/netfilter/nf-queue.c | 61 +++++++++++++--- .../testing/selftests/netfilter/nft_queue.sh | 70 +++++++++++++++---- 2 files changed, 109 insertions(+), 22 deletions(-)
tools/testing/selftests/netfilter/nf-queue.c +52 -9
@@ -17,9 +17,12 @@struct options {bool count_packets; +bool gso_enabled;int verbose;unsigned int queue_num;unsigned int timeout; +uint32_t verdict; +uint32_t delay_ms; };static unsigned int queue_stats[5 ];
@@ -27,7 +30,7 @@ static struct options opts;static void help (const char *p) { -printf ("Usage: %s [-c|-v [-vv] ] [-t timeout] [-q queue_num]\n" , p); +printf ("Usage: %s [-c|-v [-vv] ] [-t timeout] [-q queue_num] [-Qdst_queue ] [ -d ms_delay ] [-G]\n" , p); }static int parse_attr_cb (const struct nlattr *attr,void *data)
@@ -162,7 +165,7 @@ nfq_build_cfg_params(char *buf, uint8_t mode, int range, int queue_num) }static struct nlmsghdr * -nfq_build_verdict (char *buf,int id,int queue_num,int verd) +nfq_build_verdict (char *buf,int id,int queue_num,uint32_t verd) {struct nfqnl_msg_verdict_hdr vh = { .verdict =htonl (verd),
@@ -189,9 +192,6 @@ static void print_stats(void)unsigned int last, total;int i; -if (!opts.count_packets) -return ; - total =0 ; last = queue_stats[0 ];
@@ -234,7 +234,8 @@ struct mnl_socket *open_queue(void) nlh =nfq_build_cfg_params (buf,NFQNL_COPY_PACKET ,0xFFFF , queue_num); - flags =NFQA_CFG_F_GSO |NFQA_CFG_F_UID_GID ; + flags = opts.gso_enabled ?NFQA_CFG_F_GSO :0 ; + flags |=NFQA_CFG_F_UID_GID ;mnl_attr_put_u32 (nlh,NFQA_CFG_FLAGS ,htonl (flags));mnl_attr_put_u32 (nlh,NFQA_CFG_MASK ,htonl (flags));
@@ -255,6 +256,17 @@ struct mnl_socket *open_queue(void)return nl; } +static void sleep_ms (uint32_t delay) +{ +struct timespec ts = { .tv_sec = delay /1000 }; + + delay %=1000 ; + + ts.tv_nsec = delay *1000llu *1000llu ; + +nanosleep (&ts,NULL ); +} +static int mainloop (void ) {unsigned int buflen =64 *1024 +MNL_SOCKET_BUFFER_SIZE ;
@@ -278,7 +290,7 @@ static int mainloop(void) ret =mnl_socket_recvfrom (nl, buf, buflen);if (ret ==-1 ) { -if (errno ==ENOBUFS ) +if (errno ==ENOBUFS || errno ==EINTR )continue ;if (errno ==EAGAIN ) {
@@ -298,7 +310,10 @@ static int mainloop(void) } id = ret -MNL_CB_OK ; - nlh =nfq_build_verdict (buf, id, opts.queue_num,NF_ACCEPT ); +if (opts.delay_ms) +sleep_ms (opts.delay_ms); + + nlh =nfq_build_verdict (buf, id, opts.queue_num, opts.verdict);if (mnl_socket_sendto (nl, nlh, nlh->nlmsg_len) <0 ) {perror ("mnl_socket_sendto" );exit (EXIT_FAILURE );
@@ -314,7 +329,7 @@ static void parse_opts(int argc, char **argv) {int c; -while ((c =getopt (argc, argv,"chvt:q:" )) !=-1 ) { +while ((c =getopt (argc, argv,"chvt:q:Q:d:G" )) !=-1 ) {switch (c) {case 'c' : opts.count_packets = true;
@@ -328,20 +343,48 @@ static void parse_opts(int argc, char **argv)if (opts.queue_num >0xffff ) opts.queue_num =0 ;break ; +case 'Q' : + opts.verdict =atoi (optarg); +if (opts.verdict >0xffff ) { +fprintf (stderr,"Expected destination queue number\n" ); +exit (1 ); + } + + opts.verdict <<=16 ; + opts.verdict |=NF_QUEUE ; +break ; +case 'd' : + opts.delay_ms =atoi (optarg); +if (opts.delay_ms ==0 ) { +fprintf (stderr,"Expected nonzero delay (in milliseconds)\n" ); +exit (1 ); + } +break ;case 't' : opts.timeout =atoi (optarg);break ; +case 'G' : + opts.gso_enabled = false; +break ;case 'v' : opts.verbose++;break ; } } + +if (opts.verdict !=NF_ACCEPT && (opts.verdict >>16 == opts.queue_num)) { +fprintf (stderr,"Cannot use same destination and source queue\n" ); +exit (1 ); + } }int main (int argc,char *argv[]) {int ret; + opts.verdict =NF_ACCEPT ; + opts.gso_enabled = true; +parse_opts (argc, argv); ret =mainloop ();
tools/testing/selftests/netfilter/nft_queue.sh +57 -13
151 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH 1/4] selftests: netfilter: extend nfqueue test case
This series was applied to netdev/net.git (refs/heads/master):
Hello:
This series was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Wed, 14 Oct 2020 01:45:56 +0200 you wrote:
From: Florian Westphal <[email protected]>
add a test with re-queueing: usespace doesn't pass accept verdict, but tells to re-queue to another
nf_queueinstance.Also, make the second nf-queue program use non-gso mode, kernel will have to perform software segmentation.
[...]
Here is the summary with links:
- [1/4] selftests: netfilter: extend nfqueue test case
https://git.kernel.org/netdev/net/c/ea2f7da1799b - [2/4] ipvs: clear skb->tstamp in forwarding path https://git.kernel.org/netdev/net/c/7980d2eabde8 - [3/4] netfilter: nftables: extend error reporting for chain updates https://git.kernel.org/netdev/net/c/98a381a7d489 - [4/4] netfilter: nf_log: missing vlan offload tag and proto https://git.kernel.org/netdev/net/c/0d9826bc18ce
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH 2/4 ipvs: clear skb->tstamp in forwarding path
In reply to Pablo Neira AyusoFrom: Julian Anastasov <[email protected]>
fq qdisc requires tstamp to be cleared in forwarding path
--- net/netfilter/ipvs/ip_vs_xmit.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/ipvs/ip_vs_xmit.c +6 -0
@@ -609,6 +609,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,if (ret ==NF_ACCEPT ) {nf_reset_ct (skb);skb_forward_csum (skb); +if (skb->dev) + skb->tstamp =0 ; }return ret; }
@@ -649,6 +651,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,if (!local) {skb_forward_csum (skb); +if (skb->dev) + skb->tstamp =0 ;NF_HOOK (pf,NF_INET_LOCAL_OUT , cp->ipvs->net,NULL , skb,NULL ,skb_dst (skb)->dev, dst_output); }else
@@ -669,6 +673,8 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,if (!local) {ip_vs_drop_early_demux_sk (skb);skb_forward_csum (skb); +if (skb->dev) + skb->tstamp =0 ;NF_HOOK (pf,NF_INET_LOCAL_OUT , cp->ipvs->net,NULL , skb,NULL ,skb_dst (skb)->dev, dst_output); }else
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/4 netfilter: nftables: extend error reporting for chain updates
In reply to Pablo Neira AyusoThe initial support for netlink extended ACK is missing the chain update path, which results in misleading error reporting in case of EEXIST.
Fixes 36dd1bcc07e5 ("netfilter: nf_tables: initial support for extended ACK reporting")
--- net/netfilter/nf_tables_api.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +14 -5
@@ -2103,7 +2103,8 @@ static bool nft_hook_list_equal(struct list_head *hook_list1, }static int nf_tables_updchain (struct nft_ctx *ctx,u8 genmask,u8 policy, -u32 flags) +u32 flags,const struct nlattr *attr, +struct netlink_ext_ack *extack) {const struct nlattr *const *nla = ctx->nla;struct nft_table *table = ctx->table;
@@ -2119,9 +2120,10 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,return -EOPNOTSUPP ;if (nla[NFTA_CHAIN_HOOK ]) { -if (!nft_is_base_chain (chain)) +if (!nft_is_base_chain (chain)) { +NL_SET_BAD_ATTR (extack, attr);return -EEXIST ; - + } err =nft_chain_parse_hook (ctx->net, nla, &hook, ctx->family, false);if (err <0 )
@@ -2130,6 +2132,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, basechain =nft_base_chain (chain);if (basechain->type != hook.type) {nft_chain_release_hook (&hook); +NL_SET_BAD_ATTR (extack, attr);return -EEXIST ; }
@@ -2137,6 +2140,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,if (!nft_hook_list_equal (&basechain->hook_list, &hook.list)) {nft_chain_release_hook (&hook); +NL_SET_BAD_ATTR (extack, attr);return -EEXIST ; } }else {
@@ -2144,6 +2148,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,if (ops->hooknum != hook.num || ops->priority != hook.priority) {nft_chain_release_hook (&hook); +NL_SET_BAD_ATTR (extack, attr);return -EEXIST ; } }
@@ -2156,8 +2161,10 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, chain2 =nft_chain_lookup (ctx->net, table, nla[NFTA_CHAIN_NAME ], genmask); -if (!IS_ERR (chain2)) +if (!IS_ERR (chain2)) { +NL_SET_BAD_ATTR (extack, nla[NFTA_CHAIN_NAME ]);return -EEXIST ; + } }if (nla[NFTA_CHAIN_COUNTERS ]) {
@@ -2200,6 +2207,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, nft_trans_chain_update(tmp) && nft_trans_chain_name(tmp) && strcmp(name, nft_trans_chain_name(tmp)) == 0) { +NL_SET_BAD_ATTR (extack, nla[NFTA_CHAIN_NAME ]);kfree (name); goto err; }
@@ -2322,7 +2330,8 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk,return -EOPNOTSUPP ; flags |= chain->flags &NFT_CHAIN_BASE ; -return nf_tables_updchain (&ctx, genmask, policy, flags); +return nf_tables_updchain (&ctx, genmask, policy, flags, attr, + extack); }return nf_tables_addchain (&ctx, family, genmask, policy, flags);
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 4/4 netfilter: nf_log: missing vlan offload tag and proto
In reply to Pablo Neira AyusoDump vlan tag and proto for the usual vlan offload case if the NF_LOG_MACDECODE flag is set on. Without this information the logging is misleading as there is no reference to the VLAN header.
[12716.993704] test: IN=veth0 OUT= MACSRC=86:6c:92:ea:d6:73 MACDST=0e:3b:eb:86:73:76 VPROTO=8100 VID=10 MACPROTO=0800 SRC=192.168.10.2 DST=172.217.168.163 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=2548 DF PROTO=TCP SPT=55848 DPT=80 WINDOW=501 RES=0x00 ACK FIN URGP=0 [12721.157643] test: IN=veth0 OUT= MACSRC=86:6c:92:ea:d6:73 MACDST=0e:3b:eb:86:73:76 VPROTO=8100 VID=10 MACPROTO=0806 ARP HTYPE=1 PTYPE=0x0800 OPCODE=2 MACSRC=86:6c:92:ea:d6:73 IPSRC=192.168.10.2 MACDST=0e:3b:eb:86:73:76 IPDST=192.168.10.1
--- include/net/netfilter/nf_log.h | 1 + net/ipv4/netfilter/nf_log_arp.c | 19 +++++++++++++++++-- net/ipv4/netfilter/nf_log_ipv4.c | 6 ++++-- net/ipv6/netfilter/nf_log_ipv6.c | 8 +++++--- net/netfilter/nf_log_common.c | 12 ++++++++++++ 5 files changed, 39 insertions(+), 7 deletions(-)
include/net/netfilter/nf_log.h +1 -0
@@ -108,6 +108,7 @@ int nf_log_dump_tcp_header(struct nf_log_buf *m, const struct sk_buff *skb, unsigned int logflags);void nf_log_dump_sk_uid_gid (struct net *net,struct nf_log_buf *m,struct sock *sk); +void nf_log_dump_vlan (struct nf_log_buf *m,const struct sk_buff *skb); void nf_log_dump_packet_common(struct nf_log_buf *m, u_int8_t pf, unsigned int hooknum, const struct sk_buff *skb, const struct net_device *in,
net/ipv4/netfilter/nf_log_arp.c +17 -2
@@ -43,16 +43,31 @@ static void dump_arp_packet(struct nf_log_buf *m,const struct nf_loginfo *info, const struct sk_buff *skb, unsigned int nhoff) { - const struct arphdr *ah; -struct arphdr _arph; const struct arppayload *ap;struct arppayload _arpp; +const struct arphdr *ah; +unsigned int logflags; +struct arphdr _arph; ah =skb_header_pointer (skb,0 ,sizeof (_arph), &_arph);if (ah ==NULL ) {nf_log_buf_add (m,"TRUNCATED" );return ; } + +if (info->type ==NF_LOG_TYPE_LOG ) + logflags = info->u.log.logflags; +else + logflags =NF_LOG_DEFAULT_MASK ; + +if (logflags &NF_LOG_MACDECODE ) { +nf_log_buf_add (m,"MACSRC=%pM MACDST=%pM " , +eth_hdr (skb)->h_source,eth_hdr (skb)->h_dest); +nf_log_dump_vlan (m, skb); +nf_log_buf_add (m,"MACPROTO=%04x " , +ntohs (eth_hdr (skb)->h_proto)); + } +nf_log_buf_add (m,"ARP HTYPE=%d PTYPE=0x%04x OPCODE=%d" ,ntohs (ah->ar_hrd),ntohs (ah->ar_pro),ntohs (ah->ar_op));
net/ipv4/netfilter/nf_log_ipv4.c +4 -2
@@ -284,8 +284,10 @@ static void dump_ipv4_mac_header(struct nf_log_buf *m,switch (dev->type) {case ARPHRD_ETHER : -nf_log_buf_add (m,"MACSRC=%pM MACDST=%pM MACPROTO=%04x " , -eth_hdr (skb)->h_source,eth_hdr (skb)->h_dest, +nf_log_buf_add (m,"MACSRC=%pM MACDST=%pM " , +eth_hdr (skb)->h_source,eth_hdr (skb)->h_dest); +nf_log_dump_vlan (m, skb); +nf_log_buf_add (m,"MACPROTO=%04x " ,ntohs (eth_hdr (skb)->h_proto));return ;default :
net/ipv6/netfilter/nf_log_ipv6.c +5 -3
@@ -297,9 +297,11 @@ static void dump_ipv6_mac_header(struct nf_log_buf *m,switch (dev->type) {case ARPHRD_ETHER : -nf_log_buf_add (m,"MACSRC=%pM MACDST=%pM MACPROTO=%04x " , -eth_hdr (skb)->h_source,eth_hdr (skb)->h_dest, -ntohs (eth_hdr (skb)->h_proto)); +nf_log_buf_add (m,"MACSRC=%pM MACDST=%pM " , +eth_hdr (skb)->h_source,eth_hdr (skb)->h_dest); +nf_log_dump_vlan (m, skb); +nf_log_buf_add (m,"MACPROTO=%04x " , +ntohs (eth_hdr (skb)->h_proto));return ;default :break ;
net/netfilter/nf_log_common.c +12 -0
@@ -171,6 +171,18 @@ nf_log_dump_packet_common(struct nf_log_buf *m, u_int8_t pf, }EXPORT_SYMBOL_GPL (nf_log_dump_packet_common); +void nf_log_dump_vlan (struct nf_log_buf *m,const struct sk_buff *skb) +{ +u16 vid; + +if (!skb_vlan_tag_present (skb)) +return ; + + vid =skb_vlan_tag_get (skb); +nf_log_buf_add (m,"VPROTO=%04x VID=%u " ,ntohs (skb->vlan_proto), vid); +} +EXPORT_SYMBOL_GPL (nf_log_dump_vlan); +/* bridge and netdev logging families share this code. */ void nf_log_l2packet(struct net *net, u_int8_t pf, __be16 protocol,
Signature · 1 line
2.20.1
Jakub Kicinski
maintainerQuoted 11 lines · On Wed, 14 Oct 2020 01:45:55 +0200 Pablo Neira Ayuso wrote:
Hi,
The following patchset contains Netfilter fixes for net:
1) Extend
nf_queueselftest to cover re-queueing, non-gso mode and delayed queueing, from Florian Westphal.2) Clear
skb->tstampin IPVS forwarding path, from Julian Anastasov.3) Provide netlink extended error reporting for EEXIST case.
Quoted 8 lines
4) Missing VLAN offload tag and proto in log target.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.gitAbsolutely nothing urgent in this batch, you might consider pulling this once net-next.git gets merged into net.git so this shows up in 5.10-rc.
Pulled, thanks!