From mboxrd@z Thu Jan 1 00:00:00 1970 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 871445231; Thu, 18 Apr 2024 20:52:18 +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=1713473540; cv=none; b=C7kX+4uKXyaTgsfxt1FxK+sh1BnBP3GsvqG4q18uJyzc0s8tPMdvsAtyVglBcvanyl8y1JCt66YQ9cs9fksukHRJcnzjtYf0ReaX5fbYtSisNL2WOeYkpErvr3brHXLkY0tquc/ZWXIkhpfn6J4Lp3n083ILiyW3mWqztlw6WzI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473540; c=relaxed/simple; bh=Trzex6r7WZmJsjrQomymuH/d9/iiXcmPI02D/9z7YnE=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=XBJ3MzviT4zivUFw3uolKiz0epGzKfXtCdEd5fb44Xy4bXGarO7ryfysq322e0PoOlHYd778oZio1kvac3VyG4SZ+m3TyA1/1bq9WbUqp/RB+KWjdR3wRPLkGfTl4lmd0863MojBdnvTg1ROjbc84pBzwg9DZcP6T0/LQaMXyWQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=By6e/dit; 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=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="By6e/dit" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 43IKJUMg020446; Thu, 18 Apr 2024 20:51:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= message-id:date:mime-version:subject:to:cc:references:from :in-reply-to:content-type:content-transfer-encoding; s= qcppdkim1; bh=EZinXa1rUdLhTAeVNDUVuJM4q1wRofjb33lmzAZf17I=; b=By 6e/diticmo+uNUtC7Gd2Dj6ryv1GbUVi7/mPb7OdzA9Xd0vVJqgT4JqbOavXnkAo coFt/xHVXnJER45k3dw95oIO006RdmOqhq5TH5o4R9Kp0F4vhAuVS8EkfW3w8QPv NOfbtVryD1CGGMnKraFVsye5hUN5MBw+yKPK1mY0FCiULBDusxRPycTme1+T80To oGYAijt+vBzfSIanC2DokKvU4OP6JEqmPx1XSN6JE68br04PbxgyLAE37MKZR7f4 qtuSm5sV1THrPunjbezb3G+PUDd/uMD9OIxPjEewkAmENzhsSaFAMijYJS6kWvcS MAn8Q3vHppSHVMQgiDsg== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3xjx54hxfw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Apr 2024 20:51:48 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 43IKplXv005148 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Apr 2024 20:51:48 GMT Received: from [10.110.72.56] (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 18 Apr 2024 13:51:43 -0700 Message-ID: Date: Thu, 18 Apr 2024 13:51:43 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH bpf-next v4 1/2] net: Rename mono_delivery_time to tstamp_type for scalabilty Content-Language: en-US To: Willem de Bruijn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , Andrew Halaney , "Martin KaFai Lau" , Martin KaFai Lau , Daniel Borkmann , bpf CC: References: <20240418004308.1009262-1-quic_abchauha@quicinc.com> <20240418004308.1009262-2-quic_abchauha@quicinc.com> <66216adc8677c_f648a294aa@willemb.c.googlers.com.notmuch> <9a1f8011-2156-4855-8724-fea89d73df11@quicinc.com> <66217e7ccb46b_f9d5d294b0@willemb.c.googlers.com.notmuch> <6621874d772a9_fb2e029467@willemb.c.googlers.com.notmuch> From: "Abhishek Chauhan (ABC)" In-Reply-To: <6621874d772a9_fb2e029467@willemb.c.googlers.com.notmuch> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: bXLwP36pBQ3aMGd4ykuLCIMq-1RlSRvA X-Proofpoint-ORIG-GUID: bXLwP36pBQ3aMGd4ykuLCIMq-1RlSRvA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-18_19,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 bulkscore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2404010003 definitions=main-2404180152 On 4/18/2024 1:49 PM, Willem de Bruijn wrote: > Abhishek Chauhan (ABC) wrote: >> >> >> On 4/18/2024 1:11 PM, Willem de Bruijn wrote: >>> Abhishek Chauhan (ABC) wrote: >>>> >>>> >>>> On 4/18/2024 11:47 AM, Willem de Bruijn wrote: >>>>> Abhishek Chauhan wrote: >>>>>> 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. >>>>>> >>>>>> 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@linux.dev/ >>>>>> Signed-off-by: Abhishek Chauhan >>>>> >>>>>> +/** >>>>>> + * tstamp_type:1 can take 2 values each >>>>>> + * represented by time base in skb >>>>>> + * 0x0 => real timestamp_type >>>>>> + * 0x1 => mono timestamp_type >>>>>> + */ >>>>>> +enum skb_tstamp_type { >>>>>> + SKB_CLOCK_REAL, /* Time base is skb is REALTIME */ >>>>>> + SKB_CLOCK_MONO, /* Time base is skb is MONOTONIC */ >>>>>> +}; >>>>>> + >>>>> >>>>> Can drop the comments. These names are self documenting. >>>> >>>> Noted! . I will take care of this >>>>> >>>>>> /** >>>>>> * DOC: Basic sk_buff geometry >>>>>> * >>>>>> @@ -819,7 +830,7 @@ 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 >>>>>> + * @tstamp_type: 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. >>>>> >>>>> Is this still correct? I think all egress does now annotate correctly >>>>> as SKB_CLOCK_MONO. So when not set it always is SKB_CLOCK_REAL. >>>>> >>>> That is correct. >>>> >>>>>> diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c >>>>>> index 61119d42b0fd..a062f88c47c3 100644 >>>>>> --- a/net/ipv4/tcp_output.c >>>>>> +++ b/net/ipv4/tcp_output.c >>>>>> @@ -1300,7 +1300,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, >>>>>> tp = tcp_sk(sk); >>>>>> prior_wstamp = tp->tcp_wstamp_ns; >>>>>> tp->tcp_wstamp_ns = 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, CLOCK_MONOTONIC); >>>>> >>>>> Multiple references to CLOCK_MONOTONIC left >>>>> >>>> I think i took care of all the references. Apologies if i didn't understand your comment here. >>> >>> On closer read, there is a type issue here. >>> >>> skb_set_delivery_time takes a u8 tstamp_type. But it is often passed >>> a clockid_t, and that is also what the switch expects. >>> >>> But it does also get called with a tstamp_type in code like the >>> following: >>> >>> + u8 tstamp_type = skb->tstamp_type; >>> unsigned int hlen, ll_rs, mtu; >>> ktime_t tstamp = 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); >>> >>> - skb_set_delivery_time(skb, tstamp, mono_delivery_time); >>> + skb_set_delivery_time(skb, tstamp, tstamp_type); >>> >>> So maybe we need two variants, one that takes a tstamp_type and one >>> that tames a clockid_t? >>> >>> The first can be simple, not switch needed. Just apply the two stores. >> I agree to what you are saying but clockid_t => points to int itself. >> >> For example :- >> void qdisc_watchdog_init_clockid(struct qdisc_watchdog *wd, struct Qdisc *qdisc, >> clockid_t clockid) >> >> qdisc_watchdog_init_clockid(wd, qdisc, CLOCK_MONOTONIC); => sch_api.c >> qdisc_watchdog_init_clockid(&q->watchdog, sch, q->clockid); =>sch_etf.c (q->clockid is int) > > My concern is more that we use CLOCK_MONOTONIC and SKB_CLOCK_MONO > (and other clocks) interchangeably, without invariant checks to make > sure that they map onto the same integer value. Ah i see. I got it . I will make two APIs . Makes sense. 1. One can check for clockid => switch => set 2. One can set it directly.