From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (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 49E5F8634C for ; Tue, 4 Feb 2025 01:22:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738632152; cv=none; b=BospW1YPRXKSlySqD5qItZSupGjR3ePEr6cx/ozpDsjZQ77m9lTgLEAH1rspjQONrA4ueYdSHO5VYQqJIR4x9CV7pGhFzZOY1aglK6scFqjrhCoaoTqMwOa7uuS1nO6dD+YrwCvs6WiH27Rp7w4F08QSifHYQY4bIUk8fLYcvkg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738632152; c=relaxed/simple; bh=sLSXWZSYc/3bcZ6OcpKrj87pJYAu9qQli2k+lYpavSU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=UpT/qofH6JfxqgvvhPrC21HLXmXRXlSftq4OfTT3pyoMlzc2G+iGaPIwWxri64xMNxl3LKmChiovpoXSqFEu6o8QjjyodJJ0BL1YBoxLAd1xqIUTcWCmy4j+jRCH3Fobv9gm3O7Jh5eQxu9cfxe4EK7nEdgxvLbR7of77xLLe9U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=LjSES1OB; arc=none smtp.client-ip=95.215.58.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="LjSES1OB" Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1738632138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7KP5eJUX1J228pXqtIx2euWql/OgbFixny58dO4sSOE=; b=LjSES1OBXaEMSnNuCEHpu+FV87ErXFmFqBzDRTucPhrEOsFXanC/HiqxoC9pw7eIi2S8ZJ Lkqx+BRIX/WXvku7X1q9fJ65wbnNrQOk/wPz9uCFiqCDlyBl33aC6Og3OsSgUsYII7JyaY tVhS4vibCCC2qp6CQ6kuPTRUREqGeRc= Date: Mon, 3 Feb 2025 17:21:51 -0800 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v7 12/13] net-timestamp: introduce cgroup lock to avoid affecting non-bpf cases To: Jason Xing Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, willemdebruijn.kernel@gmail.com, willemb@google.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, horms@kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org References: <20250128084620.57547-1-kerneljasonxing@gmail.com> <20250128084620.57547-13-kerneljasonxing@gmail.com> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau In-Reply-To: <20250128084620.57547-13-kerneljasonxing@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT On 1/28/25 12:46 AM, Jason Xing wrote: > Introducing the lock to avoid affecting the applications which s/lock/static key/ Unless it needs more static-key guards in the next re-spin, I would squash this one liner with patch 10. > are not using timestamping bpf feature. > > Signed-off-by: Jason Xing > --- > net/ipv4/tcp.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c > index b2f1fd216df1..a2ac57543b6d 100644 > --- a/net/ipv4/tcp.c > +++ b/net/ipv4/tcp.c > @@ -493,7 +493,8 @@ static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc) > shinfo->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1; > } > > - if (SK_BPF_CB_FLAG_TEST(sk, SK_BPF_CB_TX_TIMESTAMPING) && skb) { > + if (cgroup_bpf_enabled(CGROUP_SOCK_OPS) && > + SK_BPF_CB_FLAG_TEST(sk, SK_BPF_CB_TX_TIMESTAMPING) && skb) { > struct skb_shared_info *shinfo = skb_shinfo(skb); > struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); >