summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorMartin KaFai Lau <kafai@fb.com>2022-03-02 22:55:50 +0300
committerDavid S. Miller <davem@davemloft.net>2022-03-03 17:38:48 +0300
commitd98d58a002619b5c165f1eedcd731e2fe2c19088 (patch)
treebe1104cfd2c72c090a9a131b38c41915ce28abaf /net/core
parentd93376f503c7a586707925957592c0f16f4db0b1 (diff)
downloadlinux-d98d58a002619b5c165f1eedcd731e2fe2c19088.tar.xz
net: Set skb->mono_delivery_time and clear it after sch_handle_ingress()
The previous patches handled the delivery_time before sch_handle_ingress(). This patch can now set the skb->mono_delivery_time to flag the skb->tstamp is used as the mono delivery_time (EDT) instead of the (rcv) timestamp and also clear it with skb_clear_delivery_time() after sch_handle_ingress(). This will make the bpf_redirect_*() to keep the mono delivery_time and used by a qdisc (fq) of the egress-ing interface. A latter patch will postpone the skb_clear_delivery_time() until the stack learns that the skb is being delivered locally and that will make other kernel forwarding paths (ip[6]_forward) able to keep the delivery_time also. Thus, like the previous patches on using the skb->mono_delivery_time bit, calling skb_clear_delivery_time() is not limited within the CONFIG_NET_INGRESS to avoid too many code churns among this set. Signed-off-by: Martin KaFai Lau <kafai@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 5db2443c2371..4b572bbbd07e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5220,8 +5220,10 @@ another_round:
goto out;
}
- if (skb_skip_tc_classify(skb))
+ if (skb_skip_tc_classify(skb)) {
+ skb_clear_delivery_time(skb);
goto skip_classify;
+ }
if (pfmemalloc)
goto skip_taps;
@@ -5250,12 +5252,14 @@ skip_taps:
goto another_round;
if (!skb)
goto out;
+ skb_clear_delivery_time(skb);
nf_skip_egress(skb, false);
if (nf_ingress(skb, &pt_prev, &ret, orig_dev) < 0)
goto out;
- }
+ } else
#endif
+ skb_clear_delivery_time(skb);
skb_reset_redirect(skb);
skip_classify:
if (pfmemalloc && !skb_pfmemalloc_protocol(skb))