net: dropreason: add SKB_DROP_REASON_FRAG_MEM_LIMIT
Subsystems (5)
PATCH 1/1 net: dropreason: add SKB_DROP_REASON_FRAG_MEM_LIMIT
This is used to track fragments dropped when the reassembly memory is over the limit (ipfrag_high_thresh, ip6frag_high_thresh).
Fragments dropped because high_thresh is 0 get this reason too, the same way they are counted in IPSTATS_MIB_REASMFAILS.
Tested with pwru.
Before:
... PROTO MTU LEN FUNC ... 0x0800 65536 1500 ip_defrag ... 0x0800 65536 548 ip_defrag ... 0x0800 65536 548 sk_skb_reason_drop(SKB_DROP_REASON_NOT_SPECIFIED)
After:
... PROTO MTU LEN FUNC ... 0x0800 65536 1500 ip_defrag ... 0x0800 65536 548 ip_defrag ... 0x0800 65536 548 sk_skb_reason_drop(SKB_DROP_REASON_FRAG_MEM_LIMIT)
--- include/net/dropreason-core.h | 7 +++++++ include/net/inet_frag.h | 3 ++- net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv4/inet_fragment.c | 8 ++++++-- net/ipv4/ip_fragment.c | 10 ++++++---- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- net/ipv6/reassembly.c | 10 ++++++---- 7 files changed, 29 insertions(+), 13 deletions(-)
include/net/dropreason-core.h +7 -0
@@ -98,6 +98,7 @@ FN(DUP_FRAG) \ FN(FRAG_REASM_TIMEOUT) \ FN(FRAG_TOO_FAR) \ + FN(FRAG_MEM_LIMIT) \ FN(TCP_MINTTL) \ FN(IPV6_BAD_EXTHDR) \ FN(IPV6_TOO_MANY_EXTHDRS) \
@@ -493,6 +494,12 @@ enum skb_drop_reason {* (/proc/sys/net/ipv4/ipfrag_max_dist) */ SKB_DROP_REASON_FRAG_TOO_FAR , +/** +* @SKB_DROP_REASON_FRAG_MEM_LIMIT: reassembly memory is over the limit. +* (/proc/sys/net/ipv4/ipfrag_high_thresh, +* /proc/sys/net/ipv6/ip6frag_high_thresh) +*/ + SKB_DROP_REASON_FRAG_MEM_LIMIT,/** * @SKB_DROP_REASON_TCP_MINTTL: ipv4 ttl or ipv6 hoplimit below * the threshold (IP_MINTTL or IPV6_MINHOPCOUNT).
include/net/inet_frag.h +2 -1
@@ -130,7 +130,8 @@ void fqdir_exit(struct fqdir *fqdir);void inet_frag_kill (struct inet_frag_queue *q,int *refs);void inet_frag_destroy (struct inet_frag_queue *q); -struct inet_frag_queue *inet_frag_find (struct fqdir *fqdir,void *key); +struct inet_frag_queue *inet_frag_find (struct fqdir *fqdir,void *key, +enum skb_drop_reason *reason);void inet_frag_queue_flush (struct inet_frag_queue *q,enum skb_drop_reason reason);
net/ieee802154/6lowpan/reassembly.c +1 -1
@@ -76,7 +76,7 @@ fq_find(struct net *net, const struct lowpan_802154_cb *cb, key.src = *src; key.dst = *dst; - q =inet_frag_find (ieee802154_lowpan->fqdir, &key); + q =inet_frag_find (ieee802154_lowpan->fqdir, &key,NULL );if (!q)return NULL ;
net/ipv4/inet_fragment.c +6 -2
@@ -421,14 +421,18 @@ static struct inet_frag_queue *inet_frag_create(struct fqdir *fqdir,return q; } -struct inet_frag_queue *inet_frag_find (struct fqdir *fqdir,void *key) +struct inet_frag_queue *inet_frag_find (struct fqdir *fqdir,void *key, +enum skb_drop_reason *reason) {/* This pairs with WRITE_ONCE() in fqdir_pre_exit(). */ long high_thresh =READ_ONCE (fqdir->high_thresh);struct inet_frag_queue *fq =NULL , *prev; -if (!high_thresh ||frag_mem_limit (fqdir) > high_thresh) +if (!high_thresh ||frag_mem_limit (fqdir) > high_thresh) { +if (reason) + *reason =SKB_DROP_REASON_FRAG_MEM_LIMIT ;return NULL ; + } prev =rhashtable_lookup (&fqdir->rhashtable, key, fqdir->f->rhash_params);if (!prev)
net/ipv4/ip_fragment.c +6 -4
@@ -197,7 +197,8 @@ static void ip_expire(struct timer_list *t)* this IP datagram, and create new one, if nothing is found. */ static struct ipq *ip_find (struct net *net,struct iphdr *iph, -u32 user,int vif) +u32 user,int vif, +enum skb_drop_reason *reason) {struct frag_v4_compare_key key = { .saddr = iph->saddr,
@@ -209,7 +210,7 @@ static struct ipq *ip_find(struct net *net, struct iphdr *iph, };struct inet_frag_queue *q; - q =inet_frag_find (net->ipv4.fqdir, &key); + q =inet_frag_find (net->ipv4.fqdir, &key, reason);if (!q)return NULL ;
@@ -475,6 +476,7 @@ int ip_defrag(struct net *net, struct sk_buff *skb, u32 user) {struct net_device *dev;struct ipq *qp; +SKB_DR (reason);int vif;__IP_INC_STATS (net,IPSTATS_MIB_REASMREQDS );
@@ -483,7 +485,7 @@ int ip_defrag(struct net *net, struct sk_buff *skb, u32 user)rcu_read_lock (); dev = skb->dev ? :skb_dst_dev_rcu (skb); vif =l3mdev_master_ifindex_rcu (dev); - qp =ip_find (net,ip_hdr (skb), user, vif); + qp =ip_find (net,ip_hdr (skb), user, vif, &reason);if (qp) {int ret, refs =0 ;
@@ -499,7 +501,7 @@ int ip_defrag(struct net *net, struct sk_buff *skb, u32 user)rcu_read_unlock ();__IP_INC_STATS (net,IPSTATS_MIB_REASMFAILS ); -kfree_skb (skb); +kfree_skb_reason (skb, reason);return -ENOMEM ; }EXPORT_SYMBOL (ip_defrag);
net/ipv6/netfilter/nf_conntrack_reasm.c +1 -1
@@ -159,7 +159,7 @@ static struct frag_queue *fq_find(struct net *net, __be32 id, u32 user, IPV6_ADDR_LINKLOCAL))) key.iif = 0; - q =inet_frag_find (nf_frag->fqdir, &key); + q =inet_frag_find (nf_frag->fqdir, &key,NULL );if (!q)return NULL ;
net/ipv6/reassembly.c +6 -4
@@ -82,7 +82,8 @@ static void ip6_frag_expire(struct timer_list *t) }static struct frag_queue * -fq_find (struct net *net,__be32 id,const struct ipv6hdr *hdr,int iif) +fq_find (struct net *net,__be32 id,const struct ipv6hdr *hdr,int iif, +enum skb_drop_reason *reason) {struct frag_v6_compare_key key = { .id = id,
@@ -97,7 +98,7 @@ fq_find(struct net *net, __be32 id, const struct ipv6hdr *hdr, int iif) IPV6_ADDR_LINKLOCAL))) key.iif = 0; - q =inet_frag_find (net->ipv6.fqdir, &key); + q =inet_frag_find (net->ipv6.fqdir, &key, reason);if (!q)return NULL ;
@@ -337,6 +338,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)struct inet6_dev *idev;struct frag_hdr *fhdr;struct frag_queue *fq; +SKB_DR (reason);u8 nexthdr;int iif;
@@ -385,7 +387,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb) iif = skb->dev ? skb->dev->ifindex :0 ;rcu_read_lock (); - fq =fq_find (net, fhdr->identification, hdr, iif); + fq =fq_find (net, fhdr->identification, hdr, iif, &reason);if (fq) {u32 prob_offset =0 ;int ret, refs =0 ;
@@ -409,7 +411,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)rcu_read_unlock ();__IP6_INC_STATS (net, idev,IPSTATS_MIB_REASMFAILS ); -kfree_skb (skb); +kfree_skb_reason (skb, reason);return -1 ; fail_hdr:
Signature · 1 line
2.43.0
Quoted 16 lines · Jiayuan Chen
This is used to track fragments dropped when the reassembly memory is over the limit (
ipfrag_high_thresh,ip6frag_high_thresh).Fragments dropped because
high_threshis 0 get this reason too, the same way they are counted inIPSTATS_MIB_REASMFAILS.Tested with pwru.
Before:
... PROTO MTU LEN FUNC ... 0x0800 65536 1500 ip_defrag ... 0x0800 65536 548 ip_defrag ... 0x0800 65536 548 sk_skb_reason_drop(SKB_DROP_REASON_NOT_SPECIFIED)
Quoted 8 lines
After:
... PROTO MTU LEN FUNC ... 0x0800 65536 1500 ip_defrag ... 0x0800 65536 548 ip_defrag ... 0x0800 65536 548 sk_skb_reason_drop(SKB_DROP_REASON_FRAG_MEM_LIMIT)Signed-off-by Jiayuan Chen <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Wed, 18 Nov 2026 15:05:19 +0800 you wrote:
This is used to track fragments dropped when the reassembly memory is over the limit (
ipfrag_high_thresh,ip6frag_high_thresh).Fragments dropped because
high_threshis 0 get this reason too, the same way they are counted inIPSTATS_MIB_REASMFAILS.Tested with pwru.
[...]
Here is the summary with links:
- [net-next] net: dropreason: add SKB_DROP_REASON_FRAG_MEM_LIMIT
https://git.kernel.org/netdev/net-next/c/2cb41b6bea62
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html