From nobody Wed Nov 13 06:41:09 2024 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE79984FB1; Thu, 9 May 2024 21:19:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289543; cv=none; b=CKj7wm3d4Hg4asJSpMFoDrzlwyD5bkygIknNrctANrwTtVBmy1sJIfSSe889w35x0H0BX+21k2XZQz9IkV0CMHRMmZy90QCl0B/kDH5sD1jHWogh8fpj19vFL4uqgMNurDBT0H19VjkYCQNi04TEzaY/xkzm5T74hqeZg3l7/hY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289543; c=relaxed/simple; bh=UPhcHPsTBAFHCd1opQpZlP6t3kleKTxFdNJIGl4icy4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rJjrCuRTddr9I+NEDG0f1HUiFMlXH0EDof3BaY8vUlwlxa62sWJJmYBnqU7CVZdiOH1lm1MsSW5SHaOG9Gx29W+xcPG6ebbOeaYcfXe2qVJg2PtcpjnO9uz1DI/kRl2JBKVL4UVEiL5zXSH9MbY31iTBGhjhB00j9jFs6Fkwy5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=STiV/NDH; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="STiV/NDH" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 449KsprF022621; Thu, 9 May 2024 21:18:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=qcppdkim1; bh=f4na3TS XeERo/FpDFcGy/rb+WK2mxOuuc93e5k9uRq4=; b=STiV/NDH/ImVKERXkdtg62D Nb2rK6jLATrtc/kN0xcHAHkipX34f4M9j4BBsHy8jMdObIpvF7KoRea9H9S7oZNk oqzfhbesaYt78K3BBA3w7xydYsSpVA/5oMy8CKwP4KGmrtd74npszNps1nJKCBh9 4TftHv9yMtwLmbQVVS43M36eyS+IiwFgQSLBUkOn3CXeUMDNcybgxW57TylbwDov It/BGeDtIThQtPVa7/rSDVtv42vhTsU5BHAZ1VytaXdxd48jWDdpCbLJul4waWKV KuR7umARemyp6Edts/Wo9DpgwmcF2NxDt2mn2mHncsN+VWJfdWo2rsL1YNHMGkA= = Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3y07u0kvay-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:36 +0000 (GMT) Received: from pps.filterd (NALASPPMTA02.qualcomm.com [127.0.0.1]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTP id 449LIZJb026941; Thu, 9 May 2024 21:18:35 GMT Received: from pps.reinject (localhost [127.0.0.1]) by NALASPPMTA02.qualcomm.com (PPS) with ESMTPS id 3y0813wy3a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:35 +0000 Received: from NALASPPMTA02.qualcomm.com (NALASPPMTA02.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 449LIZUq026930; Thu, 9 May 2024 21:18:35 GMT Received: from hu-devc-lv-u20-a-new.qualcomm.com (hu-abchauha-lv.qualcomm.com [10.81.25.35]) by NALASPPMTA02.qualcomm.com (PPS) with ESMTPS id 449LIYji026928 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:35 +0000 Received: by hu-devc-lv-u20-a-new.qualcomm.com (Postfix, from userid 214165) id 4ED4D220B8; Thu, 9 May 2024 14:18:34 -0700 (PDT) From: Abhishek Chauhan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Halaney , Willem de Bruijn , Martin KaFai Lau , Martin KaFai Lau , Daniel Borkmann , bpf Cc: kernel@quicinc.com, Willem de Bruijn Subject: [PATCH bpf-next v8 1/3] net: Rename mono_delivery_time to tstamp_type for scalabilty Date: Thu, 9 May 2024 14:18:32 -0700 Message-Id: <20240509211834.3235191-2-quic_abchauha@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240509211834.3235191-1-quic_abchauha@quicinc.com> References: <20240509211834.3235191-1-quic_abchauha@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: -iNg2RUIaUShAEhiuknX7FXCofGFaaqY X-Proofpoint-ORIG-GUID: -iNg2RUIaUShAEhiuknX7FXCofGFaaqY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-09_12,2024-05-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 malwarescore=0 mlxscore=0 suspectscore=0 clxscore=1011 spamscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405090150 Content-Type: text/plain; charset="utf-8" mono_delivery_time was added to check if skb->tstamp has delivery time in mono clock base (i.e. EDT) otherwise skb->tstamp has timestamp in ingress and delivery_time at egress. Renaming the bitfield from mono_delivery_time to tstamp_type is for extensibilty for other timestamps such as userspace timestamp (i.e. SO_TXTIME) set via sock opts. As we are renaming the mono_delivery_time to tstamp_type, it makes sense to start assigning tstamp_type based on enum defined in this commit. Earlier we used bool arg flag to check if the tstamp is mono in function skb_set_delivery_time, Now the signature of the functions accepts tstamp_type to distinguish between mono and real time. Also skb_set_delivery_type_by_clockid is a new function which accepts clockid to determine the tstamp_type. In future tstamp_type:1 can be extended to support userspace timestamp by increasing the bitfield. Link: https://lore.kernel.org/netdev/bc037db4-58bb-4861-ac31-a361a93841d3@l= inux.dev/ Signed-off-by: Abhishek Chauhan Reviewed-by: Willem de Bruijn Reviewed-by: Martin KaFai Lau --- Changes since v7 - Added reviewed by tags and removed RFC=20 Changes since v6 - Moved documentation comment from patch 2 to patch 1 (Minor) - Instead of calling the wrapper api to set tstamp_type for tcp, directly call main api to set the tstamp_type as suggested by Willem Changes since v5 - Avoided using garble function names as mentioned by Willem. - Implemented a conversion function stead of duplicating=20 the same logic as mentioned by Willem. - Fixed indentation problems and minor documentation issues which mentions tstamp_type as a whole instead of bitfield notations. (Mentioned both by Willem and Martin) =20 Changes since v4 - Introduce new function to directly delivery_time and another to set tstamp_type based on clockid.=20 - Removed un-necessary comments in skbuff.h as=20 enums were obvious and understood. Changes since v3 - Fixed inconsistent capitalization in skbuff.h - remove reference to MONO_DELIVERY_TIME_MASK in skbuff.h and point it to skb_tstamp_type now. - Explicitely setting SKB_CLOCK_MONO if valid transmit_time ip_send_unicast_reply=20 - Keeping skb_tstamp inline with skb_clear_tstamp.=20 - skb_set_delivery_time checks if timstamp is 0 and=20 sets the tstamp_type to SKB_CLOCK_REAL. - Above comments are given by Willem=20 - Found out that skbuff.h has access to uapi/linux/time.h So now instead of using CLOCK_REAL/CLOCK_MONO=20 i am checking actual clockid_t directly to set tstamp_type=20 example:- CLOCK_REALTIME/CLOCK_MONOTONIC=20 - Compilation error fixed in=20 net/ieee802154/6lowpan/reassembly.c Changes since v2 - Minor changes to commit subject Changes since v1 - Squashed the two commits into one as mentioned by Willem. - Introduced switch in skb_set_delivery_time. - Renamed and removed directionality aspects w.r.t tstamp_type=20 as mentioned by Willem. include/linux/skbuff.h | 52 ++++++++++++++++------ include/net/inet_frag.h | 4 +- net/bridge/netfilter/nf_conntrack_bridge.c | 6 +-- net/core/dev.c | 2 +- net/core/filter.c | 10 ++--- net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv4/inet_fragment.c | 2 +- net/ipv4/ip_fragment.c | 2 +- net/ipv4/ip_output.c | 9 ++-- net/ipv4/tcp_output.c | 14 +++--- net/ipv6/ip6_output.c | 6 +-- net/ipv6/netfilter.c | 6 +-- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- net/ipv6/reassembly.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/sched/act_bpf.c | 4 +- net/sched/cls_bpf.c | 4 +- 17 files changed, 78 insertions(+), 51 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 1c2902eaebd3..05aec712d16d 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -706,6 +706,11 @@ typedef unsigned int sk_buff_data_t; typedef unsigned char *sk_buff_data_t; #endif =20 +enum skb_tstamp_type { + SKB_CLOCK_REALTIME, + SKB_CLOCK_MONOTONIC, +}; + /** * DOC: Basic sk_buff geometry * @@ -823,10 +828,8 @@ typedef unsigned char *sk_buff_data_t; * @dst_pending_confirm: need to confirm neighbour * @decrypted: Decrypted SKB * @slow_gro: state present at GRO time, slower prepare step required - * @mono_delivery_time: When set, skb->tstamp has the - * delivery_time in mono clock base (i.e. EDT). Otherwise, the - * skb->tstamp has the (rcv) timestamp at ingress and - * delivery_time at egress. + * @tstamp_type: When set, skb->tstamp has the + * delivery_time clock base of skb->tstamp. * @napi_id: id of the NAPI struct this skb came from * @sender_cpu: (aka @napi_id) source CPU in XPS * @alloc_cpu: CPU which did the skb allocation. @@ -954,7 +957,7 @@ struct sk_buff { /* private: */ __u8 __mono_tc_offset[0]; /* public: */ - __u8 mono_delivery_time:1; /* See SKB_MONO_DELIVERY_TIME_MASK */ + __u8 tstamp_type:1; /* See skb_tstamp_type */ #ifdef CONFIG_NET_XGRESS __u8 tc_at_ingress:1; /* See TC_AT_INGRESS_MASK */ __u8 tc_skip_classify:1; @@ -4179,7 +4182,7 @@ static inline void skb_get_new_timestampns(const stru= ct sk_buff *skb, static inline void __net_timestamp(struct sk_buff *skb) { skb->tstamp =3D ktime_get_real(); - skb->mono_delivery_time =3D 0; + skb->tstamp_type =3D SKB_CLOCK_REALTIME; } =20 static inline ktime_t net_timedelta(ktime_t t) @@ -4188,10 +4191,33 @@ static inline ktime_t net_timedelta(ktime_t t) } =20 static inline void skb_set_delivery_time(struct sk_buff *skb, ktime_t kt, - bool mono) + u8 tstamp_type) { skb->tstamp =3D kt; - skb->mono_delivery_time =3D kt && mono; + + if (kt) + skb->tstamp_type =3D tstamp_type; + else + skb->tstamp_type =3D SKB_CLOCK_REALTIME; +} + +static inline void skb_set_delivery_type_by_clockid(struct sk_buff *skb, + ktime_t kt, clockid_t clockid) +{ + u8 tstamp_type =3D SKB_CLOCK_REALTIME; + + switch (clockid) { + case CLOCK_REALTIME: + break; + case CLOCK_MONOTONIC: + tstamp_type =3D SKB_CLOCK_MONOTONIC; + break; + default: + WARN_ON_ONCE(1); + kt =3D 0; + } + + skb_set_delivery_time(skb, kt, tstamp_type); } =20 DECLARE_STATIC_KEY_FALSE(netstamp_needed_key); @@ -4201,8 +4227,8 @@ DECLARE_STATIC_KEY_FALSE(netstamp_needed_key); */ static inline void skb_clear_delivery_time(struct sk_buff *skb) { - if (skb->mono_delivery_time) { - skb->mono_delivery_time =3D 0; + if (skb->tstamp_type) { + skb->tstamp_type =3D SKB_CLOCK_REALTIME; if (static_branch_unlikely(&netstamp_needed_key)) skb->tstamp =3D ktime_get_real(); else @@ -4212,7 +4238,7 @@ static inline void skb_clear_delivery_time(struct sk_= buff *skb) =20 static inline void skb_clear_tstamp(struct sk_buff *skb) { - if (skb->mono_delivery_time) + if (skb->tstamp_type) return; =20 skb->tstamp =3D 0; @@ -4220,7 +4246,7 @@ static inline void skb_clear_tstamp(struct sk_buff *s= kb) =20 static inline ktime_t skb_tstamp(const struct sk_buff *skb) { - if (skb->mono_delivery_time) + if (skb->tstamp_type) return 0; =20 return skb->tstamp; @@ -4228,7 +4254,7 @@ static inline ktime_t skb_tstamp(const struct sk_buff= *skb) =20 static inline ktime_t skb_tstamp_cond(const struct sk_buff *skb, bool cond) { - if (!skb->mono_delivery_time && skb->tstamp) + if (skb->tstamp_type !=3D SKB_CLOCK_MONOTONIC && skb->tstamp) return skb->tstamp; =20 if (static_branch_unlikely(&netstamp_needed_key) || cond) diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index 153960663ce4..5af6eb14c5db 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -76,7 +76,7 @@ struct frag_v6_compare_key { * @stamp: timestamp of the last received fragment * @len: total length of the original datagram * @meat: length of received fragments so far - * @mono_delivery_time: stamp has a mono delivery time (EDT) + * @tstamp_type: stamp has a mono delivery time (EDT) * @flags: fragment queue flags * @max_size: maximum received fragment size * @fqdir: pointer to struct fqdir @@ -97,7 +97,7 @@ struct inet_frag_queue { ktime_t stamp; int len; int meat; - u8 mono_delivery_time; + u8 tstamp_type; __u8 flags; u16 max_size; struct fqdir *fqdir; diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfil= ter/nf_conntrack_bridge.c index c3c51b9a6826..816bb0fde718 100644 --- a/net/bridge/netfilter/nf_conntrack_bridge.c +++ b/net/bridge/netfilter/nf_conntrack_bridge.c @@ -32,7 +32,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock= *sk, struct sk_buff *)) { int frag_max_size =3D BR_INPUT_SKB_CB(skb)->frag_max_size; - bool mono_delivery_time =3D skb->mono_delivery_time; + u8 tstamp_type =3D skb->tstamp_type; unsigned int hlen, ll_rs, mtu; ktime_t tstamp =3D skb->tstamp; struct ip_frag_state state; @@ -82,7 +82,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock= *sk, if (iter.frag) ip_fraglist_prepare(skb, &iter); =20 - skb_set_delivery_time(skb, tstamp, mono_delivery_time); + skb_set_delivery_time(skb, tstamp, tstamp_type); err =3D output(net, sk, data, skb); if (err || !iter.frag) break; @@ -113,7 +113,7 @@ static int nf_br_ip_fragment(struct net *net, struct so= ck *sk, goto blackhole; } =20 - skb_set_delivery_time(skb2, tstamp, mono_delivery_time); + skb_set_delivery_time(skb2, tstamp, tstamp_type); err =3D output(net, sk, data, skb2); if (err) goto blackhole; diff --git a/net/core/dev.c b/net/core/dev.c index d2ce91a334c1..652b1979796b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2161,7 +2161,7 @@ EXPORT_SYMBOL(net_disable_timestamp); static inline void net_timestamp_set(struct sk_buff *skb) { skb->tstamp =3D 0; - skb->mono_delivery_time =3D 0; + skb->tstamp_type =3D SKB_CLOCK_REALTIME; if (static_branch_unlikely(&netstamp_needed_key)) skb->tstamp =3D ktime_get_real(); } diff --git a/net/core/filter.c b/net/core/filter.c index 2510464692af..a3781a796da4 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -7730,13 +7730,13 @@ BPF_CALL_3(bpf_skb_set_tstamp, struct sk_buff *, sk= b, if (!tstamp) return -EINVAL; skb->tstamp =3D tstamp; - skb->mono_delivery_time =3D 1; + skb->tstamp_type =3D SKB_CLOCK_MONOTONIC; break; case BPF_SKB_TSTAMP_UNSPEC: if (tstamp) return -EINVAL; skb->tstamp =3D 0; - skb->mono_delivery_time =3D 0; + skb->tstamp_type =3D SKB_CLOCK_REALTIME; break; default: return -EINVAL; @@ -9443,7 +9443,7 @@ static struct bpf_insn *bpf_convert_tstamp_read(const= struct bpf_prog *prog, TC_AT_INGRESS_MASK | SKB_MONO_DELIVERY_TIME_MASK); *insn++ =3D BPF_JMP32_IMM(BPF_JNE, tmp_reg, TC_AT_INGRESS_MASK | SKB_MONO_DELIVERY_TIME_MASK, 2); - /* skb->tc_at_ingress && skb->mono_delivery_time, + /* skb->tc_at_ingress && skb->tstamp_type, * read 0 as the (rcv) timestamp. */ *insn++ =3D BPF_MOV64_IMM(value_reg, 0); @@ -9468,7 +9468,7 @@ static struct bpf_insn *bpf_convert_tstamp_write(cons= t struct bpf_prog *prog, * the bpf prog is aware the tstamp could have delivery time. * Thus, write skb->tstamp as is if tstamp_type_access is true. * Otherwise, writing at ingress will have to clear the - * mono_delivery_time bit also. + * skb->tstamp_type bit also. */ if (!prog->tstamp_type_access) { __u8 tmp_reg =3D BPF_REG_AX; @@ -9478,7 +9478,7 @@ static struct bpf_insn *bpf_convert_tstamp_write(cons= t struct bpf_prog *prog, *insn++ =3D BPF_JMP32_IMM(BPF_JSET, tmp_reg, TC_AT_INGRESS_MASK, 1); /* goto */ *insn++ =3D BPF_JMP_A(2); - /* : mono_delivery_time */ + /* : skb->tstamp_type */ *insn++ =3D BPF_ALU32_IMM(BPF_AND, tmp_reg, ~SKB_MONO_DELIVERY_TIME_MASK= ); *insn++ =3D BPF_STX_MEM(BPF_B, skb_reg, tmp_reg, SKB_BF_MONO_TC_OFFSET); } diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/r= eassembly.c index 56ef873828f4..867d637d86f0 100644 --- a/net/ieee802154/6lowpan/reassembly.c +++ b/net/ieee802154/6lowpan/reassembly.c @@ -130,7 +130,7 @@ static int lowpan_frag_queue(struct lowpan_frag_queue *= fq, goto err; =20 fq->q.stamp =3D skb->tstamp; - fq->q.mono_delivery_time =3D skb->mono_delivery_time; + fq->q.tstamp_type =3D skb->tstamp_type; if (frag_type =3D=3D LOWPAN_DISPATCH_FRAG1) fq->q.flags |=3D INET_FRAG_FIRST_IN; =20 diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index faaec92a46ac..d179a2c84222 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -619,7 +619,7 @@ void inet_frag_reasm_finish(struct inet_frag_queue *q, = struct sk_buff *head, skb_mark_not_on_list(head); head->prev =3D NULL; head->tstamp =3D q->stamp; - head->mono_delivery_time =3D q->mono_delivery_time; + head->tstamp_type =3D q->tstamp_type; =20 if (sk) refcount_add(sum_truesize - head_truesize, &sk->sk_wmem_alloc); diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 08e2c92e25ab..a92664a5ef2e 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -355,7 +355,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff= *skb) qp->iif =3D dev->ifindex; =20 qp->q.stamp =3D skb->tstamp; - qp->q.mono_delivery_time =3D skb->mono_delivery_time; + qp->q.tstamp_type =3D skb->tstamp_type; qp->q.meat +=3D skb->len; qp->ecn |=3D ecn; add_frag_mem_limit(qp->q.fqdir, skb->truesize); diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 9500031a1f55..fe86cadfa85b 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -764,7 +764,7 @@ int ip_do_fragment(struct net *net, struct sock *sk, st= ruct sk_buff *skb, { struct iphdr *iph; struct sk_buff *skb2; - bool mono_delivery_time =3D skb->mono_delivery_time; + u8 tstamp_type =3D skb->tstamp_type; struct rtable *rt =3D skb_rtable(skb); unsigned int mtu, hlen, ll_rs; struct ip_fraglist_iter iter; @@ -856,7 +856,7 @@ int ip_do_fragment(struct net *net, struct sock *sk, st= ruct sk_buff *skb, } } =20 - skb_set_delivery_time(skb, tstamp, mono_delivery_time); + skb_set_delivery_time(skb, tstamp, tstamp_type); err =3D output(net, sk, skb); =20 if (!err) @@ -912,7 +912,7 @@ int ip_do_fragment(struct net *net, struct sock *sk, st= ruct sk_buff *skb, /* * Put this fragment into the sending queue. */ - skb_set_delivery_time(skb2, tstamp, mono_delivery_time); + skb_set_delivery_time(skb2, tstamp, tstamp_type); err =3D output(net, sk, skb2); if (err) goto fail; @@ -1649,7 +1649,8 @@ void ip_send_unicast_reply(struct sock *sk, struct sk= _buff *skb, arg->csumoffset) =3D csum_fold(csum_add(nskb->csum, arg->csum)); nskb->ip_summed =3D CHECKSUM_NONE; - nskb->mono_delivery_time =3D !!transmit_time; + if (transmit_time) + nskb->tstamp_type =3D SKB_CLOCK_MONOTONIC; if (txhash) skb_set_hash(nskb, txhash, PKT_HASH_TYPE_L4); ip_push_pending_frames(sk, &fl4); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 95caf8aaa8be..d44371cfa6ec 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1301,7 +1301,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct= sk_buff *skb, tp =3D tcp_sk(sk); prior_wstamp =3D tp->tcp_wstamp_ns; tp->tcp_wstamp_ns =3D max(tp->tcp_wstamp_ns, tp->tcp_clock_cache); - skb_set_delivery_time(skb, tp->tcp_wstamp_ns, true); + skb_set_delivery_time(skb, tp->tcp_wstamp_ns, SKB_CLOCK_MONOTONIC); if (clone_it) { oskb =3D skb; =20 @@ -1655,7 +1655,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_= queue, =20 skb_split(skb, buff, len); =20 - skb_set_delivery_time(buff, skb->tstamp, true); + skb_set_delivery_time(buff, skb->tstamp, SKB_CLOCK_MONOTONIC); tcp_fragment_tstamp(skb, buff); =20 old_factor =3D tcp_skb_pcount(skb); @@ -2764,7 +2764,7 @@ static bool tcp_write_xmit(struct sock *sk, unsigned = int mss_now, int nonagle, if (unlikely(tp->repair) && tp->repair_queue =3D=3D TCP_SEND_QUEUE) { /* "skb_mstamp_ns" is used as a start point for the retransmit timer */ tp->tcp_wstamp_ns =3D tp->tcp_clock_cache; - skb_set_delivery_time(skb, tp->tcp_wstamp_ns, true); + skb_set_delivery_time(skb, tp->tcp_wstamp_ns, SKB_CLOCK_MONOTONIC); list_move_tail(&skb->tcp_tsorted_anchor, &tp->tsorted_sent_queue); tcp_init_tso_segs(skb, mss_now); goto repair; /* Skip network transmission */ @@ -3752,11 +3752,11 @@ struct sk_buff *tcp_make_synack(const struct sock *= sk, struct dst_entry *dst, #ifdef CONFIG_SYN_COOKIES if (unlikely(synack_type =3D=3D TCP_SYNACK_COOKIE && ireq->tstamp_ok)) skb_set_delivery_time(skb, cookie_init_timestamp(req, now), - true); + SKB_CLOCK_MONOTONIC); else #endif { - skb_set_delivery_time(skb, now, true); + skb_set_delivery_time(skb, now, SKB_CLOCK_MONOTONIC); if (!tcp_rsk(req)->snt_synack) /* Timestamp first SYNACK */ tcp_rsk(req)->snt_synack =3D tcp_skb_timestamp_us(skb); } @@ -3843,7 +3843,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk= , struct dst_entry *dst, bpf_skops_write_hdr_opt((struct sock *)sk, skb, req, syn_skb, synack_type, &opts); =20 - skb_set_delivery_time(skb, now, true); + skb_set_delivery_time(skb, now, SKB_CLOCK_MONOTONIC); tcp_add_tx_delay(skb, tp); =20 return skb; @@ -4027,7 +4027,7 @@ static int tcp_send_syn_data(struct sock *sk, struct = sk_buff *syn) =20 err =3D tcp_transmit_skb(sk, syn_data, 1, sk->sk_allocation); =20 - skb_set_delivery_time(syn, syn_data->skb_mstamp_ns, true); + skb_set_delivery_time(syn, syn_data->skb_mstamp_ns, SKB_CLOCK_MONOTONIC); =20 /* Now full SYN+DATA was cloned and sent (or not), * remove the SYN from the original skb (syn_data) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index f4c018b6aa7d..8fd5bf85c657 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -859,7 +859,7 @@ int ip6_fragment(struct net *net, struct sock *sk, stru= ct sk_buff *skb, struct rt6_info *rt =3D dst_rt6_info(skb_dst(skb)); struct ipv6_pinfo *np =3D skb->sk && !dev_recursion_level() ? inet6_sk(skb->sk) : NULL; - bool mono_delivery_time =3D skb->mono_delivery_time; + u8 tstamp_type =3D skb->tstamp_type; struct ip6_frag_state state; unsigned int mtu, hlen, nexthdr_offset; ktime_t tstamp =3D skb->tstamp; @@ -955,7 +955,7 @@ int ip6_fragment(struct net *net, struct sock *sk, stru= ct sk_buff *skb, if (iter.frag) ip6_fraglist_prepare(skb, &iter); =20 - skb_set_delivery_time(skb, tstamp, mono_delivery_time); + skb_set_delivery_time(skb, tstamp, tstamp_type); err =3D output(net, sk, skb); if (!err) IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), @@ -1016,7 +1016,7 @@ int ip6_fragment(struct net *net, struct sock *sk, st= ruct sk_buff *skb, /* * Put this fragment into the sending queue. */ - skb_set_delivery_time(frag, tstamp, mono_delivery_time); + skb_set_delivery_time(frag, tstamp, tstamp_type); err =3D output(net, sk, frag); if (err) goto fail; diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 53d255838e6a..e0c2347b4dc6 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c @@ -126,7 +126,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk, s= truct sk_buff *skb, struct sk_buff *)) { int frag_max_size =3D BR_INPUT_SKB_CB(skb)->frag_max_size; - bool mono_delivery_time =3D skb->mono_delivery_time; + u8 tstamp_type =3D skb->tstamp_type; ktime_t tstamp =3D skb->tstamp; struct ip6_frag_state state; u8 *prevhdr, nexthdr =3D 0; @@ -192,7 +192,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk, s= truct sk_buff *skb, if (iter.frag) ip6_fraglist_prepare(skb, &iter); =20 - skb_set_delivery_time(skb, tstamp, mono_delivery_time); + skb_set_delivery_time(skb, tstamp, tstamp_type); err =3D output(net, sk, data, skb); if (err || !iter.frag) break; @@ -225,7 +225,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk, s= truct sk_buff *skb, goto blackhole; } =20 - skb_set_delivery_time(skb2, tstamp, mono_delivery_time); + skb_set_delivery_time(skb2, tstamp, tstamp_type); err =3D output(net, sk, data, skb2); if (err) goto blackhole; diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/n= f_conntrack_reasm.c index 5e1b50c6a44d..6f0844c9315d 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -263,7 +263,7 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, str= uct sk_buff *skb, fq->iif =3D dev->ifindex; =20 fq->q.stamp =3D skb->tstamp; - fq->q.mono_delivery_time =3D skb->mono_delivery_time; + fq->q.tstamp_type =3D skb->tstamp_type; fq->q.meat +=3D skb->len; fq->ecn |=3D ecn; if (payload_len > fq->q.max_size) diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 439f93512b0a..4a84b9348913 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -198,7 +198,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct= sk_buff *skb, fq->iif =3D dev->ifindex; =20 fq->q.stamp =3D skb->tstamp; - fq->q.mono_delivery_time =3D skb->mono_delivery_time; + fq->q.tstamp_type =3D skb->tstamp_type; fq->q.meat +=3D skb->len; fq->ecn |=3D ecn; add_frag_mem_limit(fq->q.fqdir, skb->truesize); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 37201c4fb393..16c545f0d064 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -975,7 +975,7 @@ static void tcp_v6_send_response(const struct sock *sk,= struct sk_buff *skb, u32 mark =3D inet_twsk(sk)->tw_mark; else mark =3D READ_ONCE(sk->sk_mark); - skb_set_delivery_time(buff, tcp_transmit_time(sk), true); + skb_set_delivery_time(buff, tcp_transmit_time(sk), SKB_CLOCK_MONOTONIC); } if (txhash) { /* autoflowlabel/skb_get_hash_flowi6 rely on buff->hash */ diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index 0e3cf11ae5fc..396b576390d0 100644 --- a/net/sched/act_bpf.c +++ b/net/sched/act_bpf.c @@ -54,8 +54,8 @@ TC_INDIRECT_SCOPE int tcf_bpf_act(struct sk_buff *skb, bpf_compute_data_pointers(skb); filter_res =3D bpf_prog_run(filter, skb); } - if (unlikely(!skb->tstamp && skb->mono_delivery_time)) - skb->mono_delivery_time =3D 0; + if (unlikely(!skb->tstamp && skb->tstamp_type)) + skb->tstamp_type =3D SKB_CLOCK_REALTIME; if (skb_sk_is_prefetched(skb) && filter_res !=3D TC_ACT_OK) skb_orphan(skb); =20 diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index 5e83e890f6a4..1941ebec23ff 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c @@ -104,8 +104,8 @@ TC_INDIRECT_SCOPE int cls_bpf_classify(struct sk_buff *= skb, bpf_compute_data_pointers(skb); filter_res =3D bpf_prog_run(prog->filter, skb); } - if (unlikely(!skb->tstamp && skb->mono_delivery_time)) - skb->mono_delivery_time =3D 0; + if (unlikely(!skb->tstamp && skb->tstamp_type)) + skb->tstamp_type =3D SKB_CLOCK_REALTIME; =20 if (prog->exts_integrated) { res->class =3D 0; --=20 2.25.1 From nobody Wed Nov 13 06:41:09 2024 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE84C84FD2; Thu, 9 May 2024 21:19:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289542; cv=none; b=hk77wtkwNWzDq8ViNSakTgY3fX6g16JodF+UTNgNaaonNo/29igfLY4zo8hk0EaKcL2d5EgCU8dBJtyzLvxknI4jJieUh2Ch4WZiGJXV5RiPCReS6YiVU9+3OK7alP8v5FqP8/cCNdNMqPkxoU5gCNhGaMPtrXuw/IG/iVKi8ME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289542; c=relaxed/simple; bh=5DXi8BED8QS/GOyDmP1kRO4F2ptVb+lejPIHKj3b1cU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=osd+yZF4atsFgu4SzWgtC0sys5g7ugCZkET1e+e4C6+KxWMhEOpL4tamN/XwqK7vxL0s+k8wGxOJxn3IKbbiYe4/VcR19qzyRTbdimNRBieKjGn6JovtNRVHK8i6yfJl1/DjdT1Rc0PStjNfob8RWWQZ8zIgcXbB+6iHayEe1Qw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=W0V9pEU6; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="W0V9pEU6" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 449KtF0h000795; Thu, 9 May 2024 21:18:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=qcppdkim1; bh=goXAT7X /uaFuT2iyrv3ze/cTZ55McQu8t2zglXtTUJY=; b=W0V9pEU6UknqDDzSUO4aBDO vBfPdNWHI9EsyYArBU7NVf4aJMxua6LTcGr+2uqNyTf3lDFh/icM1Bm8pasJDSM6 LixmE6q9jIGONiH41W9jU7IPx9hdGaCiEqpmKqshl9qu7atKFa75HALnIAC7DXou yY02R79scosWMigJdWzOtZhMK5qa8V/0iIQ68icxqCNSQGoV0cmTNy2rOZI07iKu hndLUOKiuNrj6pa8og4gsUeA6ji/xVMHzzPqno+55v+EhkZFqT+dIsFPw5Vwaoj2 R+2NKcb1hhMAnCxdhop77CYSnqL84DwL9DDmJqJt0loIeetOoe+E2k5mIheKn1w= = Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3y09gekmrx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:36 +0000 (GMT) Received: from pps.filterd (NALASPPMTA01.qualcomm.com [127.0.0.1]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTP id 449LIZ2x026852; Thu, 9 May 2024 21:18:35 GMT Received: from pps.reinject (localhost [127.0.0.1]) by NALASPPMTA01.qualcomm.com (PPS) with ESMTPS id 3y0njgg084-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:35 +0000 Received: from NALASPPMTA01.qualcomm.com (NALASPPMTA01.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 449LIZAm026589; Thu, 9 May 2024 21:18:35 GMT Received: from hu-devc-lv-u20-a-new.qualcomm.com (hu-abchauha-lv.qualcomm.com [10.81.25.35]) by NALASPPMTA01.qualcomm.com (PPS) with ESMTPS id 449LIYMr026440 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:35 +0000 Received: by hu-devc-lv-u20-a-new.qualcomm.com (Postfix, from userid 214165) id 5396523B02; Thu, 9 May 2024 14:18:34 -0700 (PDT) From: Abhishek Chauhan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Halaney , Willem de Bruijn , Martin KaFai Lau , Martin KaFai Lau , Daniel Borkmann , bpf Cc: kernel@quicinc.com, Willem de Bruijn Subject: [PATCH bpf-next v8 2/3] net: Add additional bit to support clockid_t timestamp type Date: Thu, 9 May 2024 14:18:33 -0700 Message-Id: <20240509211834.3235191-3-quic_abchauha@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240509211834.3235191-1-quic_abchauha@quicinc.com> References: <20240509211834.3235191-1-quic_abchauha@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: NZGkcoCNf7J-7zXOHOnCauuCgeuC-XZy X-Proofpoint-ORIG-GUID: NZGkcoCNf7J-7zXOHOnCauuCgeuC-XZy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-09_12,2024-05-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 suspectscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 impostorscore=0 clxscore=1015 adultscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405090149 Content-Type: text/plain; charset="utf-8" tstamp_type is now set based on actual clockid_t compressed into 2 bits. To make the design scalable for future needs this commit bring in the change to extend the tstamp_type:1 to tstamp_type:2 to support other clockid_t timestamp. We now support CLOCK_TAI as part of tstamp_type as part of this commit with existing support CLOCK_MONOTONIC and CLOCK_REALTIME. Link: https://lore.kernel.org/netdev/bc037db4-58bb-4861-ac31-a361a93841d3@l= inux.dev/ Signed-off-by: Abhishek Chauhan Reviewed-by: Willem de Bruijn Reviewed-by: Martin KaFai Lau --- Changes since v7 - Added reviewed by tags and removed RFC.=20 - Moved tools/include/uapi/linux/bpf.h to this patch from patch 3. - Fixed mis-spelled word exisiting to existing=20 in commit text. Changes since v6 - bpf_skb_set_tstamp now order cases by their enum value, starting with realtime. - custom socket now initialize the sk_clockid in files tcp_ipv4.c and tcp_ipv6.c Changes since v5 - Took care of documentation comments of tstamp_type=20 in skbuff.h as mentioned by Willem. - Use of complete words instead of abbrevation in=20 macro definitions as mentioned by Willem. - Fixed indentation problems=20 - Removed BPF_SKB_TSTAMP_UNSPEC and marked it=20 Deprecated as documentation, and introduced=20 BPF_SKB_CLOCK_REALTIME instead.=20 - BUILD_BUG_ON for additional enums introduced. - __ip_make_skb and ip6_make_skb now has=20 tcp checks to mark tcp packet as mono tstamp base.=20 - separated the selftests/bpf changes into another patch. - Made changes as per Martin in selftest bpf code and=20 tool/include/uapi/linux/bpf.h=20 Changes since v4 - Made changes to BPF code in filter.c as per=20 Martin's comments - Minor fixes on comments given on documentation from Willem in skbuff.h (removed obvious ones) - Made changes to ctx_rewrite.c and test_tc_dtime.c - test_tc_dtime.c i am not really sure if i took care=20 of all the changes as i am not too familiar with=20 the framework. - Introduce common mask SKB_TSTAMP_TYPE_MASK instead of multiple SKB mask. - Optimisation on BPF code as suggested by Martin. - Set default case to SKB_CLOCK_REALTME. =20 Changes since v3 - Carefully reviewed BPF APIs and made changes in=20 BPF code as well.=20 - Re-used actual clockid_t values since skbuff.h=20 indirectly includes uapi/linux/time.h - Added CLOCK_TAI as part of the skb_set_delivery_time handling instead of CLOCK_USER - Added default in switch for unsupported and invalid=20 timestamp with an WARN_ONCE - All of the above comments were given by Willem =20 - Made changes in filter.c as per Martin's comments to handle invalid cases in bpf code with addition of SKB_TAI_DELIVERY_TIME_MASK Changes since v2 - Minor changes to commit subject Changes since v1=20 - identified additional changes in BPF framework. - Bit shift in SKB_MONO_DELIVERY_TIME_MASK and TC_AT_INGRESS_MASK. - Made changes in skb_set_delivery_time to keep changes similar to=20 previous code for mono_delivery_time and just setting tstamp_type bit 1 for userspace timestamp. include/linux/skbuff.h | 18 ++++++++----- include/uapi/linux/bpf.h | 15 +++++++---- net/core/filter.c | 46 +++++++++++++++++++--------------- net/ipv4/ip_output.c | 5 +++- net/ipv4/raw.c | 2 +- net/ipv4/tcp_ipv4.c | 2 ++ net/ipv6/ip6_output.c | 5 +++- net/ipv6/raw.c | 2 +- net/ipv6/tcp_ipv6.c | 10 ++++++-- net/packet/af_packet.c | 7 +++--- tools/include/uapi/linux/bpf.h | 15 +++++++---- 11 files changed, 81 insertions(+), 46 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 05aec712d16d..fe7d8dbef77e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -709,6 +709,8 @@ typedef unsigned char *sk_buff_data_t; enum skb_tstamp_type { SKB_CLOCK_REALTIME, SKB_CLOCK_MONOTONIC, + SKB_CLOCK_TAI, + __SKB_CLOCK_MAX =3D SKB_CLOCK_TAI, }; =20 /** @@ -957,7 +959,7 @@ struct sk_buff { /* private: */ __u8 __mono_tc_offset[0]; /* public: */ - __u8 tstamp_type:1; /* See skb_tstamp_type */ + __u8 tstamp_type:2; /* See skb_tstamp_type */ #ifdef CONFIG_NET_XGRESS __u8 tc_at_ingress:1; /* See TC_AT_INGRESS_MASK */ __u8 tc_skip_classify:1; @@ -1087,15 +1089,16 @@ struct sk_buff { #endif #define PKT_TYPE_OFFSET offsetof(struct sk_buff, __pkt_type_offset) =20 -/* if you move tc_at_ingress or mono_delivery_time +/* if you move tc_at_ingress or tstamp_type * around, you also must adapt these constants. */ #ifdef __BIG_ENDIAN_BITFIELD -#define SKB_MONO_DELIVERY_TIME_MASK (1 << 7) -#define TC_AT_INGRESS_MASK (1 << 6) +#define SKB_TSTAMP_TYPE_MASK (3 << 6) +#define SKB_TSTAMP_TYPE_RSHIFT (6) +#define TC_AT_INGRESS_MASK (1 << 5) #else -#define SKB_MONO_DELIVERY_TIME_MASK (1 << 0) -#define TC_AT_INGRESS_MASK (1 << 1) +#define SKB_TSTAMP_TYPE_MASK (3) +#define TC_AT_INGRESS_MASK (1 << 2) #endif #define SKB_BF_MONO_TC_OFFSET offsetof(struct sk_buff, __mono_tc_offset) =20 @@ -4212,6 +4215,9 @@ static inline void skb_set_delivery_type_by_clockid(s= truct sk_buff *skb, case CLOCK_MONOTONIC: tstamp_type =3D SKB_CLOCK_MONOTONIC; break; + case CLOCK_TAI: + tstamp_type =3D SKB_CLOCK_TAI; + break; default: WARN_ON_ONCE(1); kt =3D 0; diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 90706a47f6ff..25ea393cf084 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -6207,12 +6207,17 @@ union { \ __u64 :64; \ } __attribute__((aligned(8))) =20 +/* The enum used in skb->tstamp_type. It specifies the clock type + * of the time stored in the skb->tstamp. + */ enum { - BPF_SKB_TSTAMP_UNSPEC, - BPF_SKB_TSTAMP_DELIVERY_MONO, /* tstamp has mono delivery time */ - /* For any BPF_SKB_TSTAMP_* that the bpf prog cannot handle, - * the bpf prog should handle it like BPF_SKB_TSTAMP_UNSPEC - * and try to deduce it by ingress, egress or skb->sk->sk_clockid. + BPF_SKB_TSTAMP_UNSPEC =3D 0, /* DEPRECATED */ + BPF_SKB_TSTAMP_DELIVERY_MONO =3D 1, /* DEPRECATED */ + BPF_SKB_CLOCK_REALTIME =3D 0, + BPF_SKB_CLOCK_MONOTONIC =3D 1, + BPF_SKB_CLOCK_TAI =3D 2, + /* For any future BPF_SKB_CLOCK_* that the bpf prog cannot handle, + * the bpf prog can try to deduce it by ingress/egress/skb->sk->sk_clocki= d. */ }; =20 diff --git a/net/core/filter.c b/net/core/filter.c index a3781a796da4..c6edfe9f41bc 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -7726,17 +7726,21 @@ BPF_CALL_3(bpf_skb_set_tstamp, struct sk_buff *, sk= b, return -EOPNOTSUPP; =20 switch (tstamp_type) { - case BPF_SKB_TSTAMP_DELIVERY_MONO: + case BPF_SKB_CLOCK_REALTIME: + skb->tstamp =3D tstamp; + skb->tstamp_type =3D SKB_CLOCK_REALTIME; + break; + case BPF_SKB_CLOCK_MONOTONIC: if (!tstamp) return -EINVAL; skb->tstamp =3D tstamp; skb->tstamp_type =3D SKB_CLOCK_MONOTONIC; break; - case BPF_SKB_TSTAMP_UNSPEC: - if (tstamp) + case BPF_SKB_CLOCK_TAI: + if (!tstamp) return -EINVAL; - skb->tstamp =3D 0; - skb->tstamp_type =3D SKB_CLOCK_REALTIME; + skb->tstamp =3D tstamp; + skb->tstamp_type =3D SKB_CLOCK_TAI; break; default: return -EINVAL; @@ -9387,16 +9391,17 @@ static struct bpf_insn *bpf_convert_tstamp_type_rea= d(const struct bpf_insn *si, { __u8 value_reg =3D si->dst_reg; __u8 skb_reg =3D si->src_reg; - /* AX is needed because src_reg and dst_reg could be the same */ - __u8 tmp_reg =3D BPF_REG_AX; - - *insn++ =3D BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, - SKB_BF_MONO_TC_OFFSET); - *insn++ =3D BPF_JMP32_IMM(BPF_JSET, tmp_reg, - SKB_MONO_DELIVERY_TIME_MASK, 2); - *insn++ =3D BPF_MOV32_IMM(value_reg, BPF_SKB_TSTAMP_UNSPEC); - *insn++ =3D BPF_JMP_A(1); - *insn++ =3D BPF_MOV32_IMM(value_reg, BPF_SKB_TSTAMP_DELIVERY_MONO); + BUILD_BUG_ON(__SKB_CLOCK_MAX !=3D (int)BPF_SKB_CLOCK_TAI); + BUILD_BUG_ON(SKB_CLOCK_REALTIME !=3D (int)BPF_SKB_CLOCK_REALTIME); + BUILD_BUG_ON(SKB_CLOCK_MONOTONIC !=3D (int)BPF_SKB_CLOCK_MONOTONIC); + BUILD_BUG_ON(SKB_CLOCK_TAI !=3D (int)BPF_SKB_CLOCK_TAI); + *insn++ =3D BPF_LDX_MEM(BPF_B, value_reg, skb_reg, SKB_BF_MONO_TC_OFFSET); + *insn++ =3D BPF_ALU32_IMM(BPF_AND, value_reg, SKB_TSTAMP_TYPE_MASK); +#ifdef __BIG_ENDIAN_BITFIELD + *insn++ =3D BPF_ALU32_IMM(BPF_RSH, value_reg, SKB_TSTAMP_TYPE_RSHIFT); +#else + BUILD_BUG_ON(!(SKB_TSTAMP_TYPE_MASK & 0x1)); +#endif =20 return insn; } @@ -9439,10 +9444,11 @@ static struct bpf_insn *bpf_convert_tstamp_read(con= st struct bpf_prog *prog, __u8 tmp_reg =3D BPF_REG_AX; =20 *insn++ =3D BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, SKB_BF_MONO_TC_OFFSET); - *insn++ =3D BPF_ALU32_IMM(BPF_AND, tmp_reg, - TC_AT_INGRESS_MASK | SKB_MONO_DELIVERY_TIME_MASK); - *insn++ =3D BPF_JMP32_IMM(BPF_JNE, tmp_reg, - TC_AT_INGRESS_MASK | SKB_MONO_DELIVERY_TIME_MASK, 2); + /* check if ingress mask bits is set */ + *insn++ =3D BPF_JMP32_IMM(BPF_JSET, tmp_reg, TC_AT_INGRESS_MASK, 1); + *insn++ =3D BPF_JMP_A(4); + *insn++ =3D BPF_JMP32_IMM(BPF_JSET, tmp_reg, SKB_TSTAMP_TYPE_MASK, 1); + *insn++ =3D BPF_JMP_A(2); /* skb->tc_at_ingress && skb->tstamp_type, * read 0 as the (rcv) timestamp. */ @@ -9479,7 +9485,7 @@ static struct bpf_insn *bpf_convert_tstamp_write(cons= t struct bpf_prog *prog, /* goto */ *insn++ =3D BPF_JMP_A(2); /* : skb->tstamp_type */ - *insn++ =3D BPF_ALU32_IMM(BPF_AND, tmp_reg, ~SKB_MONO_DELIVERY_TIME_MASK= ); + *insn++ =3D BPF_ALU32_IMM(BPF_AND, tmp_reg, ~SKB_TSTAMP_TYPE_MASK); *insn++ =3D BPF_STX_MEM(BPF_B, skb_reg, tmp_reg, SKB_BF_MONO_TC_OFFSET); } #endif diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index fe86cadfa85b..b90d0f78ac80 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1457,7 +1457,10 @@ struct sk_buff *__ip_make_skb(struct sock *sk, =20 skb->priority =3D (cork->tos !=3D -1) ? cork->priority: READ_ONCE(sk->sk_= priority); skb->mark =3D cork->mark; - skb->tstamp =3D cork->transmit_time; + if (sk_is_tcp(sk)) + skb_set_delivery_time(skb, cork->transmit_time, SKB_CLOCK_MONOTONIC); + else + skb_set_delivery_type_by_clockid(skb, cork->transmit_time, sk->sk_clocki= d); /* * Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec * on dst refcount diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 4cb43401e0e0..1a0953650356 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -360,7 +360,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flow= i4 *fl4, skb->protocol =3D htons(ETH_P_IP); skb->priority =3D READ_ONCE(sk->sk_priority); skb->mark =3D sockc->mark; - skb->tstamp =3D sockc->transmit_time; + skb_set_delivery_type_by_clockid(skb, sockc->transmit_time, sk->sk_clocki= d); skb_dst_set(skb, &rt->dst); *rtp =3D NULL; =20 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 95e3d28b83b8..46a8f1c11a91 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -3626,6 +3626,8 @@ void __init tcp_v4_init(void) */ inet_sk(sk)->pmtudisc =3D IP_PMTUDISC_DO; =20 + sk->sk_clockid =3D CLOCK_MONOTONIC; + per_cpu(ipv4_tcp_sk, cpu) =3D sk; } if (register_pernet_subsys(&tcp_sk_ops)) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 8fd5bf85c657..1985fbcf9b76 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1924,7 +1924,10 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, =20 skb->priority =3D READ_ONCE(sk->sk_priority); skb->mark =3D cork->base.mark; - skb->tstamp =3D cork->base.transmit_time; + if (sk_is_tcp(sk)) + skb_set_delivery_time(skb, cork->base.transmit_time, SKB_CLOCK_MONOTONIC= ); + else + skb_set_delivery_type_by_clockid(skb, cork->base.transmit_time, sk->sk_c= lockid); =20 ip6_cork_steal_dst(skb, cork); IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS); diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 2eedf255600b..f838366e8256 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -621,7 +621,7 @@ static int rawv6_send_hdrinc(struct sock *sk, struct ms= ghdr *msg, int length, skb->protocol =3D htons(ETH_P_IPV6); skb->priority =3D READ_ONCE(sk->sk_priority); skb->mark =3D sockc->mark; - skb->tstamp =3D sockc->transmit_time; + skb_set_delivery_type_by_clockid(skb, sockc->transmit_time, sk->sk_clocki= d); =20 skb_put(skb, length); skb_reset_network_header(skb); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 16c545f0d064..fa3f8e43c7e6 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -2388,8 +2388,14 @@ static struct inet_protosw tcpv6_protosw =3D { =20 static int __net_init tcpv6_net_init(struct net *net) { - return inet_ctl_sock_create(&net->ipv6.tcp_sk, PF_INET6, - SOCK_RAW, IPPROTO_TCP, net); + int res; + + res =3D inet_ctl_sock_create(&net->ipv6.tcp_sk, PF_INET6, + SOCK_RAW, IPPROTO_TCP, net); + if (!res) + net->ipv6.tcp_sk->sk_clockid =3D CLOCK_MONOTONIC; + + return res; } =20 static void __net_exit tcpv6_net_exit(struct net *net) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 8c6d3fbb4ed8..89b54021d196 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2056,8 +2056,7 @@ static int packet_sendmsg_spkt(struct socket *sock, s= truct msghdr *msg, skb->dev =3D dev; skb->priority =3D READ_ONCE(sk->sk_priority); skb->mark =3D READ_ONCE(sk->sk_mark); - skb->tstamp =3D sockc.transmit_time; - + skb_set_delivery_type_by_clockid(skb, sockc.transmit_time, sk->sk_clockid= ); skb_setup_tx_timestamp(skb, sockc.tsflags); =20 if (unlikely(extra_len =3D=3D 4)) @@ -2585,7 +2584,7 @@ static int tpacket_fill_skb(struct packet_sock *po, s= truct sk_buff *skb, skb->dev =3D dev; skb->priority =3D READ_ONCE(po->sk.sk_priority); skb->mark =3D READ_ONCE(po->sk.sk_mark); - skb->tstamp =3D sockc->transmit_time; + skb_set_delivery_type_by_clockid(skb, sockc->transmit_time, po->sk.sk_clo= ckid); skb_setup_tx_timestamp(skb, sockc->tsflags); skb_zcopy_set_nouarg(skb, ph.raw); =20 @@ -3063,7 +3062,7 @@ static int packet_snd(struct socket *sock, struct msg= hdr *msg, size_t len) skb->dev =3D dev; skb->priority =3D READ_ONCE(sk->sk_priority); skb->mark =3D sockc.mark; - skb->tstamp =3D sockc.transmit_time; + skb_set_delivery_type_by_clockid(skb, sockc.transmit_time, sk->sk_clockid= ); =20 if (unlikely(extra_len =3D=3D 4)) skb->no_fcs =3D 1; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 90706a47f6ff..25ea393cf084 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -6207,12 +6207,17 @@ union { \ __u64 :64; \ } __attribute__((aligned(8))) =20 +/* The enum used in skb->tstamp_type. It specifies the clock type + * of the time stored in the skb->tstamp. + */ enum { - BPF_SKB_TSTAMP_UNSPEC, - BPF_SKB_TSTAMP_DELIVERY_MONO, /* tstamp has mono delivery time */ - /* For any BPF_SKB_TSTAMP_* that the bpf prog cannot handle, - * the bpf prog should handle it like BPF_SKB_TSTAMP_UNSPEC - * and try to deduce it by ingress, egress or skb->sk->sk_clockid. + BPF_SKB_TSTAMP_UNSPEC =3D 0, /* DEPRECATED */ + BPF_SKB_TSTAMP_DELIVERY_MONO =3D 1, /* DEPRECATED */ + BPF_SKB_CLOCK_REALTIME =3D 0, + BPF_SKB_CLOCK_MONOTONIC =3D 1, + BPF_SKB_CLOCK_TAI =3D 2, + /* For any future BPF_SKB_CLOCK_* that the bpf prog cannot handle, + * the bpf prog can try to deduce it by ingress/egress/skb->sk->sk_clocki= d. */ }; =20 --=20 2.25.1 From nobody Wed Nov 13 06:41:09 2024 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C71684E05; Thu, 9 May 2024 21:19:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289544; cv=none; b=TLPn1NcWTOAOZ/2QhYBv/Z7esn3qlkfbo3unLQxUGjzCQ9Rr6N649w95USSsi5A5VGI+YEp2fKO4Nuo9YtOj3RTFdjXRU7atfd75WNg5ip0yZYCyeiS4o2qKeh4xmtEPIpu15ehiGuHM9AsCD+nqiRXkFGJEj9429dD4yvi70fQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715289544; c=relaxed/simple; bh=+3IL8mmWgPq6/LKtSawsB7OAAuLiwI+66mqqvtZgYb4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tUu3iJ1rmmhSI6XvhuWgsF4oQLAgttKMndSPgI2lHHxJwSUdSjdS6hdHnofRgQy6SPSeXnXBOUp9VfnpLvxn9xRdaMPIjW25iOfH9Skf6WZSJ3m2XtRF9b7saFw+Qb18cv65+VFmOKR+Xp2OqcOKY9A62a6HHJIbiVL/HjaKeHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=FNULpKpG; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="FNULpKpG" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 449KtJK6013729; Thu, 9 May 2024 21:18:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=qcppdkim1; bh=bbOwkZd /W35BwNHHq+9LVYNrGHQUSeou4ZSm3Pnduso=; b=FNULpKpGFBPW50DUJwUabW5 G+0WnOP8EaOMjMyrIVZSt2oh2UTAfV45Uk3wKZA3wd1/PiC8mYHlYWlCVnsuYKY8 jx808Bing76jh9E8txUCswByvzwtCRH3oNpHwxgeJeQavH7nvPDL27A94AL9p/Xf 5/LcgbryINQ3xwyqMfaXZEaQ5dGRGE/8TrPVmOeRgIYN342Ud96sF6onPuN3YeTA X1qckK4X8wGMQilXLeeIwSYLmLZhtvErr57ZJQHpkSwVUEWNpGBJjiRrriSS/lVI SqqJyY68DotG8J7evZiPJFw756lPJv7dIQOLJqYDkXnhRgyo+TWh+Kt2jPgDQZA= = Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3y07wfuwng-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:36 +0000 (GMT) Received: from pps.filterd (NALASPPMTA02.qualcomm.com [127.0.0.1]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTP id 449LIZLF026940; Thu, 9 May 2024 21:18:35 GMT Received: from pps.reinject (localhost [127.0.0.1]) by NALASPPMTA02.qualcomm.com (PPS) with ESMTPS id 3y0813wy3b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:35 +0000 Received: from NALASPPMTA02.qualcomm.com (NALASPPMTA02.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 449LIZu6026931; Thu, 9 May 2024 21:18:35 GMT Received: from hu-devc-lv-u20-a-new.qualcomm.com (hu-abchauha-lv.qualcomm.com [10.81.25.35]) by NALASPPMTA02.qualcomm.com (PPS) with ESMTPS id 449LIYPR026929 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 May 2024 21:18:35 +0000 Received: by hu-devc-lv-u20-a-new.qualcomm.com (Postfix, from userid 214165) id 569A723B2A; Thu, 9 May 2024 14:18:34 -0700 (PDT) From: Abhishek Chauhan To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Halaney , Willem de Bruijn , Martin KaFai Lau , Martin KaFai Lau , Daniel Borkmann , bpf Cc: kernel@quicinc.com Subject: [PATCH bpf-next v8 3/3] selftests/bpf: Handle forwarding of UDP CLOCK_TAI packets Date: Thu, 9 May 2024 14:18:34 -0700 Message-Id: <20240509211834.3235191-4-quic_abchauha@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240509211834.3235191-1-quic_abchauha@quicinc.com> References: <20240509211834.3235191-1-quic_abchauha@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 6FOefXc4WtoiStSfanms9TGEBnHiIney X-Proofpoint-ORIG-GUID: 6FOefXc4WtoiStSfanms9TGEBnHiIney X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-09_12,2024-05-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 spamscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405090150 Content-Type: text/plain; charset="utf-8" With changes in the design to forward CLOCK_TAI in the skbuff framework, existing selftest framework needs modification to handle forwarding of UDP packets with CLOCK_TAI as clockid. Link: https://lore.kernel.org/netdev/bc037db4-58bb-4861-ac31-a361a93841d3@l= inux.dev/ Signed-off-by: Abhishek Chauhan Reviewed-by: Martin KaFai Lau --- Changes since v7 - Added reviewed by tags and removed RFC=20 - Moved tools/include/uapi/linux/bpf.h from this=20 patch to patch 2 - Added detecting of non-zero REALTIME skb->tstamp=20 since it should not happen at egress as suggested=20 by Martin. Changes since v6 - Fixed issues in the ctx_rewrite.c with respect to dissembly in both .read and .write =20 Changes since v5 - Moved all the selftest to another patch Changes since v1 - v4 - Patch was not present .../selftests/bpf/prog_tests/ctx_rewrite.c | 10 +++-- .../selftests/bpf/prog_tests/tc_redirect.c | 3 -- .../selftests/bpf/progs/test_tc_dtime.c | 39 ++++++++----------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c b/tools/t= esting/selftests/bpf/prog_tests/ctx_rewrite.c index 3b7c57fe55a5..08b6391f2f56 100644 --- a/tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c +++ b/tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c @@ -69,15 +69,17 @@ static struct test_case test_cases[] =3D { { N(SCHED_CLS, struct __sk_buff, tstamp), .read =3D "r11 =3D *(u8 *)($ctx + sk_buff::__mono_tc_offset);" - "w11 &=3D 3;" - "if w11 !=3D 0x3 goto pc+2;" + "if w11 & 0x4 goto pc+1;" + "goto pc+4;" + "if w11 & 0x3 goto pc+1;" + "goto pc+2;" "$dst =3D 0;" "goto pc+1;" "$dst =3D *(u64 *)($ctx + sk_buff::tstamp);", .write =3D "r11 =3D *(u8 *)($ctx + sk_buff::__mono_tc_offset);" - "if w11 & 0x2 goto pc+1;" + "if w11 & 0x4 goto pc+1;" "goto pc+2;" - "w11 &=3D -2;" + "w11 &=3D -4;" "*(u8 *)($ctx + sk_buff::__mono_tc_offset) =3D r11;" "*(u64 *)($ctx + sk_buff::tstamp) =3D $src;", }, diff --git a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c b/tools/t= esting/selftests/bpf/prog_tests/tc_redirect.c index b1073d36d77a..327d51f59142 100644 --- a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c +++ b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c @@ -890,9 +890,6 @@ static void test_udp_dtime(struct test_tc_dtime *skel, = int family, bool bpf_fwd) =20 ASSERT_EQ(dtimes[INGRESS_FWDNS_P100], 0, dtime_cnt_str(t, INGRESS_FWDNS_P100)); - /* non mono delivery time is not forwarded */ - ASSERT_EQ(dtimes[INGRESS_FWDNS_P101], 0, - dtime_cnt_str(t, INGRESS_FWDNS_P101)); for (i =3D EGRESS_FWDNS_P100; i < SET_DTIME; i++) ASSERT_GT(dtimes[i], 0, dtime_cnt_str(t, i)); =20 diff --git a/tools/testing/selftests/bpf/progs/test_tc_dtime.c b/tools/test= ing/selftests/bpf/progs/test_tc_dtime.c index 74ec09f040b7..ca8e8734d901 100644 --- a/tools/testing/selftests/bpf/progs/test_tc_dtime.c +++ b/tools/testing/selftests/bpf/progs/test_tc_dtime.c @@ -222,17 +222,21 @@ int egress_host(struct __sk_buff *skb) return TC_ACT_OK; =20 if (skb_proto(skb_type) =3D=3D IPPROTO_TCP) { - if (skb->tstamp_type =3D=3D BPF_SKB_TSTAMP_DELIVERY_MONO && + if (skb->tstamp_type =3D=3D BPF_SKB_CLOCK_MONOTONIC && skb->tstamp) inc_dtimes(EGRESS_ENDHOST); else inc_errs(EGRESS_ENDHOST); - } else { - if (skb->tstamp_type =3D=3D BPF_SKB_TSTAMP_UNSPEC && + } else if (skb_proto(skb_type) =3D=3D IPPROTO_UDP) { + if (skb->tstamp_type =3D=3D BPF_SKB_CLOCK_TAI && skb->tstamp) inc_dtimes(EGRESS_ENDHOST); else inc_errs(EGRESS_ENDHOST); + } else { + if (skb->tstamp_type =3D=3D BPF_SKB_CLOCK_REALTIME && + skb->tstamp) + inc_errs(EGRESS_ENDHOST); } =20 skb->tstamp =3D EGRESS_ENDHOST_MAGIC; @@ -252,7 +256,7 @@ int ingress_host(struct __sk_buff *skb) if (!skb_type) return TC_ACT_OK; =20 - if (skb->tstamp_type =3D=3D BPF_SKB_TSTAMP_DELIVERY_MONO && + if (skb->tstamp_type =3D=3D BPF_SKB_CLOCK_MONOTONIC && skb->tstamp =3D=3D EGRESS_FWDNS_MAGIC) inc_dtimes(INGRESS_ENDHOST); else @@ -315,7 +319,6 @@ int egress_fwdns_prio100(struct __sk_buff *skb) SEC("tc") int ingress_fwdns_prio101(struct __sk_buff *skb) { - __u64 expected_dtime =3D EGRESS_ENDHOST_MAGIC; int skb_type; =20 skb_type =3D skb_get_type(skb); @@ -323,29 +326,24 @@ int ingress_fwdns_prio101(struct __sk_buff *skb) /* Should have handled in prio100 */ return TC_ACT_SHOT; =20 - if (skb_proto(skb_type) =3D=3D IPPROTO_UDP) - expected_dtime =3D 0; - if (skb->tstamp_type) { if (fwdns_clear_dtime() || - skb->tstamp_type !=3D BPF_SKB_TSTAMP_DELIVERY_MONO || - skb->tstamp !=3D expected_dtime) + (skb->tstamp_type !=3D BPF_SKB_CLOCK_MONOTONIC && + skb->tstamp_type !=3D BPF_SKB_CLOCK_TAI) || + skb->tstamp !=3D EGRESS_ENDHOST_MAGIC) inc_errs(INGRESS_FWDNS_P101); else inc_dtimes(INGRESS_FWDNS_P101); } else { - if (!fwdns_clear_dtime() && expected_dtime) + if (!fwdns_clear_dtime()) inc_errs(INGRESS_FWDNS_P101); } =20 - if (skb->tstamp_type =3D=3D BPF_SKB_TSTAMP_DELIVERY_MONO) { + if (skb->tstamp_type =3D=3D BPF_SKB_CLOCK_MONOTONIC) { skb->tstamp =3D INGRESS_FWDNS_MAGIC; } else { if (bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC, - BPF_SKB_TSTAMP_DELIVERY_MONO)) - inc_errs(SET_DTIME); - if (!bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC, - BPF_SKB_TSTAMP_UNSPEC)) + BPF_SKB_CLOCK_MONOTONIC)) inc_errs(SET_DTIME); } =20 @@ -370,7 +368,7 @@ int egress_fwdns_prio101(struct __sk_buff *skb) =20 if (skb->tstamp_type) { if (fwdns_clear_dtime() || - skb->tstamp_type !=3D BPF_SKB_TSTAMP_DELIVERY_MONO || + skb->tstamp_type !=3D BPF_SKB_CLOCK_MONOTONIC || skb->tstamp !=3D INGRESS_FWDNS_MAGIC) inc_errs(EGRESS_FWDNS_P101); else @@ -380,14 +378,11 @@ int egress_fwdns_prio101(struct __sk_buff *skb) inc_errs(EGRESS_FWDNS_P101); } =20 - if (skb->tstamp_type =3D=3D BPF_SKB_TSTAMP_DELIVERY_MONO) { + if (skb->tstamp_type =3D=3D BPF_SKB_CLOCK_MONOTONIC) { skb->tstamp =3D EGRESS_FWDNS_MAGIC; } else { if (bpf_skb_set_tstamp(skb, EGRESS_FWDNS_MAGIC, - BPF_SKB_TSTAMP_DELIVERY_MONO)) - inc_errs(SET_DTIME); - if (!bpf_skb_set_tstamp(skb, INGRESS_FWDNS_MAGIC, - BPF_SKB_TSTAMP_UNSPEC)) + BPF_SKB_CLOCK_MONOTONIC)) inc_errs(SET_DTIME); } =20 --=20 2.25.1