From patchwork Fri Feb 14 01:00:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974251 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C06825776; Fri, 14 Feb 2025 01:00:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494855; cv=none; b=hlqgb6zN48zH61OGchvQ4r02dPc8Ss07boRh3N9o5XEzoxCnJCuoj7mA8l0W3LRhmK6kygR74KdlrykT484aMikeLsLLIjkzeVUtZKbm3lEJr83jIEnnu/fIOI/+lKp+53hMKFcrJQn1qEN+wLwP4znp/6wrXexSbt5Hn5dEtKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494855; c=relaxed/simple; bh=DDtM+vZerkMryfJ9Kp2UIWhKVpj3cuPoaYpevaSK4/E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VkB5uN+eO5RKjOObnNuqDqWLz2hHLnth5OMtoxMINNSlu6Z+cEhgyg6z0ibtu33qB6oAN1uazzqxIIJmYodS6+Vk+BYiZ3XXA6cxZDTJOlRKJBkjLObQ1BSZkGQks83w+s0AhWZM8/bvjwkcUCK0E3dsD2kfsiGjIVY1ZM6XKPs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XG6lZ5Wm; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XG6lZ5Wm" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-220ca204d04so19744365ad.0; Thu, 13 Feb 2025 17:00:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494853; x=1740099653; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Kfb9GI6feOAbgYzfRSzf+rdXBFIMELjuaFO2C7wE51E=; b=XG6lZ5WmFezJqitLS+VXrDGDmqQRdjkDcLN4n6AQZ8hjnhmwrlOxUL+5JhghpzzJNl UoxBFUzSMgDi1O4Zu+1Q5aA9o1R9oUG3TmG2QnzyusBoXZRd5gsV82YpOMkFk2aSAkev zOfUDtIPd4SrkqX63zzAr85sXI6dHtB53ongq5hD4Que+9KA5CWSkIo+Jkv+hfCU3kVT 9it3dSHNPOmredP9H/mDSl7CQaVeLdlZm82ksENy1by6lSbeGK77Z0iFPLl+eKLYiT0J l1i+jxrdaAsCK9G133QCHgTzhDn85rQUhsDBXmlHlfwnLSYENp/vv6eqfMcuanWkbK8s raqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494853; x=1740099653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kfb9GI6feOAbgYzfRSzf+rdXBFIMELjuaFO2C7wE51E=; b=VrslZUtrUgYEWT6KpfdixewQH4aUacvFC85P3ga0g69vLzkybcFmIIfqH5kyQFRF9A hsa6pfjjhBUWpmDwAgVkXUklqjfHHT8rOxsT8sijyyYGbCiVGf+LxHJByQZ3Gr/b23fG IVOaAeyFhu7F2rd81eCPHjufy32YDox6C3sAqrC+MaCYNayHPyecQK0GcTzTyX2SHnQU 3vZanQTVQmy7dGnZ5SyYIcRS39qayNiokdfTPPLrFO/vSSyMrS+gjB8thuCksQNsv9jC Tw91e+LA54I9jjQ3TBihb9geogNVS/a3vF3eIHPIEbemehHtRf0+mcuO+8N6hjuCitHf lb5A== X-Forwarded-Encrypted: i=1; AJvYcCXrmmGzRVv6Tt/nEr2V68oBbM35dWojAxbXb4XNgWjSoEhdtkPezo7nNiPAWeTtV+O3o+WGkII=@vger.kernel.org X-Gm-Message-State: AOJu0YwLeUT41iWMH2/7Zo2LUXrk0BkJizlEJQXHSYmPoQ5+Y45AIhu9 KJtgRbXf0FCrPKYIlyt8A2JRl/nFYnNN0bvHhBkSRwfwgKBXTi3v X-Gm-Gg: ASbGncvy/WiJj6BFnIQ+S9YSc387nEgj7o9fz8ox1ltlskIiI1f63RZ1KaDp/7mQcte BzhQDx6o4LV8GRMfelhfZS1uRW2iuVzrIrDsh8Da1dTE2OP+qD90qXOSc7d1NWN2r3zVMDsVy4d t5XfouJaH2OAhq/vbm7BV5tqMelOG+v4WcdtK+oag3ahREd41hiegRAsZ5wgzQH0CPgrMeTKMXM KpU4hphilAb7UHBP/mG6d6yTdcRr0/b2Dm1aWWtDrOzUy21lmXtIzB50rjsg9q5FBwzQ3bG0KCB XX7rA6/5Nd+cLw4XrY2l2MH20KrU1l7GqUJ4v2e5CFI9tD/zFzhIEw== X-Google-Smtp-Source: AGHT+IHKaJyEf3iewG7Zn/TBw4ZB4yeBRF9Ka637mBFAvVKkNBi7xb7XsFHJqY1Ldr9pVYZROMYm5Q== X-Received: by 2002:a17:903:950:b0:220:e63c:5b08 with SMTP id d9443c01a7336-220e63c5e07mr44086105ad.11.1739494853115; Thu, 13 Feb 2025 17:00:53 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:00:52 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 01/12] bpf: add networking timestamping support to bpf_get/setsockopt() Date: Fri, 14 Feb 2025 09:00:27 +0800 Message-Id: <20250214010038.54131-2-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net The new SK_BPF_CB_FLAGS and new SK_BPF_CB_TX_TIMESTAMPING are added to bpf_get/setsockopt. The later patches will implement the BPF networking timestamping. The BPF program will use bpf_setsockopt(SK_BPF_CB_FLAGS, SK_BPF_CB_TX_TIMESTAMPING) to enable the BPF networking timestamping on a socket. Signed-off-by: Jason Xing --- include/net/sock.h | 3 +++ include/uapi/linux/bpf.h | 8 ++++++++ net/core/filter.c | 23 +++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 1 + 4 files changed, 35 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 8036b3b79cd8..7916982343c6 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -303,6 +303,7 @@ struct sk_filter; * @sk_stamp: time stamp of last packet received * @sk_stamp_seq: lock for accessing sk_stamp on 32 bit architectures only * @sk_tsflags: SO_TIMESTAMPING flags + * @sk_bpf_cb_flags: used in bpf_setsockopt() * @sk_use_task_frag: allow sk_page_frag() to use current->task_frag. * Sockets that can be used under memory reclaim should * set this to false. @@ -445,6 +446,8 @@ struct sock { u32 sk_reserved_mem; int sk_forward_alloc; u32 sk_tsflags; +#define SK_BPF_CB_FLAG_TEST(SK, FLAG) ((SK)->sk_bpf_cb_flags & (FLAG)) + u32 sk_bpf_cb_flags; __cacheline_group_end(sock_write_rxtx); __cacheline_group_begin(sock_write_tx); diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index fff6cdb8d11a..fa666d51dffe 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -6916,6 +6916,13 @@ enum { BPF_SOCK_OPS_ALL_CB_FLAGS = 0x7F, }; +/* Definitions for bpf_sk_cb_flags */ +enum { + SK_BPF_CB_TX_TIMESTAMPING = 1<<0, + SK_BPF_CB_MASK = (SK_BPF_CB_TX_TIMESTAMPING - 1) | + SK_BPF_CB_TX_TIMESTAMPING +}; + /* List of known BPF sock_ops operators. * New entries can only be added at the end */ @@ -7094,6 +7101,7 @@ enum { TCP_BPF_SYN_IP = 1006, /* Copy the IP[46] and TCP header */ TCP_BPF_SYN_MAC = 1007, /* Copy the MAC, IP[46], and TCP header */ TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */ + SK_BPF_CB_FLAGS = 1009, /* Used to set socket bpf flags */ }; enum { diff --git a/net/core/filter.c b/net/core/filter.c index 2ec162dd83c4..1c6c07507a78 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5222,6 +5222,25 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = { .arg1_type = ARG_PTR_TO_CTX, }; +static int sk_bpf_set_get_cb_flags(struct sock *sk, char *optval, bool getopt) +{ + u32 sk_bpf_cb_flags; + + if (getopt) { + *(u32 *)optval = sk->sk_bpf_cb_flags; + return 0; + } + + sk_bpf_cb_flags = *(u32 *)optval; + + if (sk_bpf_cb_flags & ~SK_BPF_CB_MASK) + return -EINVAL; + + sk->sk_bpf_cb_flags = sk_bpf_cb_flags; + + return 0; +} + static int sol_socket_sockopt(struct sock *sk, int optname, char *optval, int *optlen, bool getopt) @@ -5238,6 +5257,7 @@ static int sol_socket_sockopt(struct sock *sk, int optname, case SO_MAX_PACING_RATE: case SO_BINDTOIFINDEX: case SO_TXREHASH: + case SK_BPF_CB_FLAGS: if (*optlen != sizeof(int)) return -EINVAL; break; @@ -5247,6 +5267,9 @@ static int sol_socket_sockopt(struct sock *sk, int optname, return -EINVAL; } + if (optname == SK_BPF_CB_FLAGS) + return sk_bpf_set_get_cb_flags(sk, optval, getopt); + if (getopt) { if (optname == SO_BINDTODEVICE) return -EINVAL; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 2acf9b336371..70366f74ef4e 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -7091,6 +7091,7 @@ enum { TCP_BPF_SYN_IP = 1006, /* Copy the IP[46] and TCP header */ TCP_BPF_SYN_MAC = 1007, /* Copy the MAC, IP[46], and TCP header */ TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */ + SK_BPF_CB_FLAGS = 1009, /* Used to set socket bpf flags */ }; enum { From patchwork Fri Feb 14 01:00:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974252 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FFB5CA64; Fri, 14 Feb 2025 01:00:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494860; cv=none; b=rb8ianNOcBcCRajeQ2tIXPjT/UhDextVqXuB4kREzsfplmz86rmmt4TeyzM4/2bDEhP5sR+JyfCddWsb+ZjGaFSVV9Hn8833v10tJsbD/ogpPvO1wqNnz2ZMMzK5r1Azff/439VQdJbxZ0muwtdo90GBrH0oJR5/pDvd2aPSCDQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494860; c=relaxed/simple; bh=xKbudb0FUrth0r9fVulR0YQSW9YlrDYUxAjIB9W3r94=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FbhQp0s937KFm13xnPGJFozlEOhExw5huPgAOzMk+dLRRQXQMuGNo29fuH4D62HqGilOVT+NJE96Nu8mVQlWU2vk1ISQFiYmQkygptw+HfxalTXVDfel3kmhbAMQtlmWgSZQrNRFkDHLxeCBXWqA3ZSzfEly7I6Pp/Fe6xlnw9M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IlXBNi+x; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IlXBNi+x" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21f48ebaadfso30440745ad.2; Thu, 13 Feb 2025 17:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494858; x=1740099658; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nCClYBX4dv1juFzLnShvLFoS82zgt+5gs+BbDuAzfbU=; b=IlXBNi+x1zTqvEsL9BbQmbiC2H5eS5KMrEAXeHEtIcap29tgiPLE8mqLbBhMs6LMWK LO7LbPzrNUCxVXQxi0Hb39jawlcAd6I8uQy2uNX/01vHE5Snzi8lHIy8trh9xUxVAP6Z HbsQlFT7N8VnuV4dSDtdsxHjGqxbpXRuJF/Hajt11GgbKrmwwg22FAg5oRJMBuSmKzPY NlfbrlbkQJcccc0qQF2HT4EfzImLe2897wplkkWTntJHY34fXsYDjPAKMKgQdilWv5A+ e1bMKtxC8QNxSOI6WT3IBXgqDf1mNO/lHP1QxV8NWqaLJkGzNor5vja1VXjhpXxQHmWw OAPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494858; x=1740099658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nCClYBX4dv1juFzLnShvLFoS82zgt+5gs+BbDuAzfbU=; b=qweyYz31IUc8dIwkbBtClaANFJr1jcgELnE4Wa9jIL/S915yLpt4yn7zj1FedjaXQh t7IylFDGnUNGPFe6InBBcB/RXK1wYteUWNFkvYg/45Izr8qQ+UcEOenszMtOJyprVuFB hS/oc0d2alImj+5QG91xPT4NwVZLgtt7o0jynLWebkgo0JGA0oPv3O2d7f5bIr9Yz9ur zdfdnuxakA4ijn2WqTdNXC4ij0xUILcpv4B3F7ochCw0Vw3XI3xHWhTgFHuml8LTOh5q yUEtWaLcGB3NUy5CKGh+pbEmJgADMAhydNS1OuA2GT11IDMyqtvy5KIk1FqiXHBExMZo g4+w== X-Forwarded-Encrypted: i=1; AJvYcCVLJYMaiQ+dA+8Sfqrj7ZVz4v2NEXmUo/qNxso+qcD2d2YFlIjLBrx6ZRywkPXSd245w+Vmz7w=@vger.kernel.org X-Gm-Message-State: AOJu0YxEGSfe8YroM4xJE5q/4hGvHpEfpafF03eTCEJ9bC0ojlOQr5eP INUOwzdVBehJWXsziD2INTiqSUo0MX/ewcO1Djjh6avNcyGdVqw5 X-Gm-Gg: ASbGncv6YdE2MVUZO1Sh9vq5nZUwqi+PIIy8WEIusrxN90dzFrP8X57uylYX+Dm0yNQ rw3PUs6epkJiXqhaB3XjqKYDnatIkJ9qW1gZrFcLSsXJWcu41o6BVzd1qvyoCeGad+ydNpuYpLE 0QlOcijHYnzMKmM3HMg89wGh1Q6oSc1QTb2tMkSZFbaCnUiIXdVz1aJmFHnNnNOZ4rd01qZc5bG M2LElWYkJJYA0CZS8wSoicqHadbYmKXjl7OOU+2g6/ThAxcBPQL/zsUEoBl8FNnkIMy5pjCACs7 xlmbyzKQpEchIFxCU7bZ+CJzMLLxHL40JkrdqRP0u2QRIr60ntq4kQ== X-Google-Smtp-Source: AGHT+IEmS11KJO6MagPx5ppvE64ZxX7FB3Nz/gEwyW1xlu+HMmuy1LexlAi7TmmBzp+4x8x7KT0lAw== X-Received: by 2002:a17:902:d502:b0:206:9a3f:15e5 with SMTP id d9443c01a7336-220bbc67fbemr159852775ad.32.1739494858580; Thu, 13 Feb 2025 17:00:58 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:00:58 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 02/12] bpf: prepare the sock_ops ctx and call bpf prog for TX timestamping Date: Fri, 14 Feb 2025 09:00:28 +0800 Message-Id: <20250214010038.54131-3-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net This patch introduces a new bpf_skops_tx_timestamping() function that prepares the "struct bpf_sock_ops" ctx and then executes the sockops BPF program. The subsequent patch will utilize bpf_skops_tx_timestamping() at the existing TX timestamping kernel callbacks (__sk_tstamp_tx specifically) to call the sockops BPF program. Later, four callback points to report information to user space based on this patch will be introduced. Signed-off-by: Jason Xing --- include/net/sock.h | 7 +++++++ net/core/sock.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 7916982343c6..6f4d54faba92 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2923,6 +2923,13 @@ int sock_set_timestamping(struct sock *sk, int optname, struct so_timestamping timestamping); void sock_enable_timestamps(struct sock *sk); +#if defined(CONFIG_CGROUP_BPF) +void bpf_skops_tx_timestamping(struct sock *sk, struct sk_buff *skb, int op); +#else +static inline void bpf_skops_tx_timestamping(struct sock *sk, struct sk_buff *skb, int op) +{ +} +#endif void sock_no_linger(struct sock *sk); void sock_set_keepalive(struct sock *sk); void sock_set_priority(struct sock *sk, u32 priority); diff --git a/net/core/sock.c b/net/core/sock.c index eae2ae70a2e0..bde45569d4da 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -948,6 +948,20 @@ int sock_set_timestamping(struct sock *sk, int optname, return 0; } +#if defined(CONFIG_CGROUP_BPF) +void bpf_skops_tx_timestamping(struct sock *sk, struct sk_buff *skb, int op) +{ + struct bpf_sock_ops_kern sock_ops; + + memset(&sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp)); + sock_ops.op = op; + sock_ops.is_fullsock = 1; + sock_ops.sk = sk; + bpf_skops_init_skb(&sock_ops, skb, 0); + __cgroup_bpf_run_filter_sock_ops(sk, &sock_ops, CGROUP_SOCK_OPS); +} +#endif + void sock_set_keepalive(struct sock *sk) { lock_sock(sk); From patchwork Fri Feb 14 01:00:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974253 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1D37CA64; Fri, 14 Feb 2025 01:01:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494866; cv=none; b=PVIShaR3yMIiq3ZnihfMKZJc+vEfZq62KhE6SY8pAfwVZWj8iMpPL0/VwthrqsY4jfXmhAKwrb50qfhz14dyWB8sdLhqjgq4VQv2T0dseXLBPtz/zeO/ghe0ZgZCMIU7EQEDK3ZdrPhRXowJkipktNGP7EdKJ3nijsnOXekIEJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494866; c=relaxed/simple; bh=bKrm1hiTC/nINgvY+o1Fo1gLAQbsMuznKHX0Uw3gAzY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JdV/+LQ6It9vb2FFuxbV7ayWSXV57waw7sFXaX5FR3aZ3Mt3BCxQRWiDw8K2F1Irf/pdb/3gEuC0aoL7MKkcXXbAq6f8eTnE7DGL3x608ckcdOeeptsQaXREjhA51rWbAnlblDV2sDPExxF6p3gYL8fZDwzpmpc6oJk9x5ETiQc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JyC26Fko; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JyC26Fko" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-220e83d65e5so13857475ad.1; Thu, 13 Feb 2025 17:01:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494864; x=1740099664; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7Alr0Cy5SCB+CgKRZoduXfthZLgwnrJQ/3rmN5eLpq4=; b=JyC26FkodYCdv3HUuWo1ZKXqqeaoF28UI2KFdQoAFVxA0BL42jwl9LTZxwhBy9mO0G x1jlfWNaKrVRL/1G0EXrHp7BSkAnCB2iRcuVUcJk4LJ5DyOOaOHgekPYs2lPX0k/6GMz pZKCRdj9CBvQXaDIk0ERitPG+WmvXiOrjhEjOMLYnYtzwZwkyoA2mfPniRjyJaN+U6Kw cJv5ULcxf6ajh3xV+qlfd9h84A4rjcxjaE0Pb2yc+/JXGVbO6faSfAkzdFIylxk6xptw USXn//hpGPPOy/PAGKC38YPliOdzd/xXqC/JPGlXvh+gZxiM+htj1k/remHXLrtriwD4 ucHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494864; x=1740099664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7Alr0Cy5SCB+CgKRZoduXfthZLgwnrJQ/3rmN5eLpq4=; b=k2i21Vpgzg8CqQ0Y3fAWlG0zpfpqNAjyBWo/cBe9u2ohafA5PZAQb8v8BeesQ2cVWq EXe463D8yFZGbeb7hy1xyy2S/FK90XBp4ty/A0hAt1UWWubF0Z86b3lexrujTirLq8cD YWBIg5smAQ+CLhjyG2N6yi1hdsFu6nMKOiEacRJpNLK6DQAS2/ZvBsdJsweeQOkjvv0Y RxhV8sccUX9usVRdhoQBNJhQIrVZpx1ePFJWEBr+P064Rd3MVN7igDqHbokyoyNewZpP v7+RjDimI2hDLusUR5dnfZnzDk82tq+iavAGzKYc+yTHLi7rzNfj9i9GgM12sgn+3BU5 CKXA== X-Forwarded-Encrypted: i=1; AJvYcCUI8NnBI58VIk8tOH71G+rpcNnHEYbXJjMrpt55xAT7PKjIn8DA3Va82u1mNEv4b9IlDFqg2B4=@vger.kernel.org X-Gm-Message-State: AOJu0YwEBAUNbHscYjBgn4LinKUs60dt2drI0qLMfWGIWuUJacFStGWC YEldCBY9Q5vzO6anVIsownCUPbBDoRlbZdORYUa0qJtEmo8bpFjs X-Gm-Gg: ASbGncs67V8cy6/R+IzZl26nrJtUdmrW9H2c9MlNS/ULi7p7eQ2NCHDUebK3yajMjk2 LvC0QekgoFyH9odaifEtXn7wAM+0npG26hwP4pT6vPI+enE/ExOQKZvRUvx7ewnhJITI0p/yY3I phdgsZcK2rgnSDlsDMCEJYUzgR0ZQegrSgvgIjsMMzNQOVbE2o6zCPncxnE95LudlXr+QqGFzcx Mu7wP/8gcUFJDty1PXQ/ztmqg+XFrZTUA6q0iCOWRxyPoU4rXfIs0/LDzzkK+wsFvHXC4i17zEA yEnwTqrD+U5MoOKw3qWWANf4Q79n4yiISDTels02ZMc0cz68vY0IKA== X-Google-Smtp-Source: AGHT+IHWxFAE42zfVksUmAwqklSodiqbmsiv5SWUoCRrl3vqWza/iZQq7H6+SoJgcp/MOSyPgd/8Qg== X-Received: by 2002:a17:902:dac6:b0:220:da88:2009 with SMTP id d9443c01a7336-220da8820d6mr59346725ad.45.1739494863937; Thu, 13 Feb 2025 17:01:03 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:03 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 03/12] bpf: prevent unsafe access to the sock fields in the BPF timestamping callback Date: Fri, 14 Feb 2025 09:00:29 +0800 Message-Id: <20250214010038.54131-4-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net The subsequent patch will implement BPF TX timestamping. It will call the sockops BPF program without holding the sock lock. This breaks the current assumption that all sock ops programs will hold the sock lock. The sock's fields of the uapi's bpf_sock_ops requires this assumption. To address this, a new "u8 is_locked_tcp_sock;" field is added. This patch sets it in the current sock_ops callbacks. The "is_fullsock" test is then replaced by the "is_locked_tcp_sock" test during sock_ops_convert_ctx_access(). The new TX timestamping callbacks added in the subsequent patch will not have this set. This will prevent unsafe access from the new timestamping callbacks. Potentially, we could allow read-only access. However, this would require identifying which callback is read-safe-only and also requires additional BPF instruction rewrites in the covert_ctx. Since the BPF program can always read everything from a socket (e.g., by using bpf_core_cast), this patch keeps it simple and disables all read and write access to any socket fields through the bpf_sock_ops UAPI from the new TX timestamping callback. Moreover, note that some of the fields in bpf_sock_ops are specific to tcp_sock, and sock_ops currently only supports tcp_sock. In the future, UDP timestamping will be added, which will also break this assumption. The same idea used in this patch will be reused. Considering that the current sock_ops only supports tcp_sock, the variable is named is_locked_"tcp"_sock. Signed-off-by: Jason Xing --- include/linux/filter.h | 1 + include/net/tcp.h | 1 + net/core/filter.c | 8 ++++---- net/ipv4/tcp_input.c | 2 ++ net/ipv4/tcp_output.c | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index a3ea46281595..d36d5d5180b1 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -1508,6 +1508,7 @@ struct bpf_sock_ops_kern { void *skb_data_end; u8 op; u8 is_fullsock; + u8 is_locked_tcp_sock; u8 remaining_opt_len; u64 temp; /* temp and everything after is not * initialized to 0 before calling diff --git a/include/net/tcp.h b/include/net/tcp.h index 5b2b04835688..4c4dca59352b 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2649,6 +2649,7 @@ static inline int tcp_call_bpf(struct sock *sk, int op, u32 nargs, u32 *args) memset(&sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp)); if (sk_fullsock(sk)) { sock_ops.is_fullsock = 1; + sock_ops.is_locked_tcp_sock = 1; sock_owned_by_me(sk); } diff --git a/net/core/filter.c b/net/core/filter.c index 1c6c07507a78..8631036f6b64 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -10381,10 +10381,10 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, } \ *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ struct bpf_sock_ops_kern, \ - is_fullsock), \ + is_locked_tcp_sock), \ fullsock_reg, si->src_reg, \ offsetof(struct bpf_sock_ops_kern, \ - is_fullsock)); \ + is_locked_tcp_sock)); \ *insn++ = BPF_JMP_IMM(BPF_JEQ, fullsock_reg, 0, jmp); \ if (si->dst_reg == si->src_reg) \ *insn++ = BPF_LDX_MEM(BPF_DW, reg, si->src_reg, \ @@ -10469,10 +10469,10 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, temp)); \ *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ struct bpf_sock_ops_kern, \ - is_fullsock), \ + is_locked_tcp_sock), \ reg, si->dst_reg, \ offsetof(struct bpf_sock_ops_kern, \ - is_fullsock)); \ + is_locked_tcp_sock)); \ *insn++ = BPF_JMP_IMM(BPF_JEQ, reg, 0, 2); \ *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( \ struct bpf_sock_ops_kern, sk),\ diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index eb82e01da911..95733dcdfb4b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -169,6 +169,7 @@ static void bpf_skops_parse_hdr(struct sock *sk, struct sk_buff *skb) memset(&sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp)); sock_ops.op = BPF_SOCK_OPS_PARSE_HDR_OPT_CB; sock_ops.is_fullsock = 1; + sock_ops.is_locked_tcp_sock = 1; sock_ops.sk = sk; bpf_skops_init_skb(&sock_ops, skb, tcp_hdrlen(skb)); @@ -185,6 +186,7 @@ static void bpf_skops_established(struct sock *sk, int bpf_op, memset(&sock_ops, 0, offsetof(struct bpf_sock_ops_kern, temp)); sock_ops.op = bpf_op; sock_ops.is_fullsock = 1; + sock_ops.is_locked_tcp_sock = 1; sock_ops.sk = sk; /* sk with TCP_REPAIR_ON does not have skb in tcp_finish_connect */ if (skb) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index bc95d2a5924f..a0e779bdbc6b 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -525,6 +525,7 @@ static void bpf_skops_hdr_opt_len(struct sock *sk, struct sk_buff *skb, sock_owned_by_me(sk); sock_ops.is_fullsock = 1; + sock_ops.is_locked_tcp_sock = 1; sock_ops.sk = sk; } @@ -570,6 +571,7 @@ static void bpf_skops_write_hdr_opt(struct sock *sk, struct sk_buff *skb, sock_owned_by_me(sk); sock_ops.is_fullsock = 1; + sock_ops.is_locked_tcp_sock = 1; sock_ops.sk = sk; } From patchwork Fri Feb 14 01:00:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974254 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27A95275419; Fri, 14 Feb 2025 01:01:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494872; cv=none; b=UX369ssVpPvmy1exr8OUXliudvdZiXMhUFx2o05rG7D3DjZbDgG99aDEKP0sws/ilUzWjg8egYmPBSuseqpZWRC5r+58HpVLbBWjklxEOWOyNd2BReMdnH2wVQOTbnUPf3nN2rMWYx7ji9fnr+ksH7NmGQ/SaFStEV1oxpvssSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494872; c=relaxed/simple; bh=3f4fr3wEVqOkIsOc+1STd0Ns5iBgLGFkFca2uJbMweM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gYNR8NsMlEQq1DKJDqsFm4vyIMN9slggErU4r0sQbfqpEx6Up33rlPyO0VU3iLK74mGrXbnGgHP5SJdAWF3IgovEHUWzjWOsuAVozBqJa+URMLsx5DqTOCTUMqkMhKFdShghqkb9xZzqx+VRyK8vLjLzZ8rj2GWHtTEw77mTLG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PDHqlUuV; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PDHqlUuV" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fc11834404so1892691a91.0; Thu, 13 Feb 2025 17:01:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494869; x=1740099669; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/jcgdad4TkftRTh1q65WudnE3mEROlme3+Pzdel+ZVs=; b=PDHqlUuVp+Wry6F4NUYFLJulhroZDy6sPz7NQkvY6haWDvs8Xi8YVQlqBURTvtBWM/ 7LNhWT5DrRdcnrJihfzrKRDkGuvdkVSxfNWTXe0hHCDpZI7ZN5EepBZ/Xo95iGO//6V8 jlRxJmoJtRHFjLG5tni/OEi6Iy6rqK73P7jQl4Bn04CECQfXDcB9SK7V0OJ+6CMx+Geq zOsoiK8tEF6tBK6PygmTypgKwRNwSIuiewHvTbGjhZxqg6KiILj+AbbWHVqWUNQ2Dtzv VzhGw3XBkchsQL4Ow55DvJSQcIlEQ338TEbAL0rFipDY2vUWlMrGMMOjAVYpcy2sYRKC JFuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494869; x=1740099669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jcgdad4TkftRTh1q65WudnE3mEROlme3+Pzdel+ZVs=; b=Ykl6QkhNCYedUUGROQCidbwo9ojh0Q15ttOUbEuNDRDea094Hg4XBnVNnALhRxBXea Ela8GYwPiW174aXviqRe+geF3DKPCjJgtH2L5at6KQUrJiopZCFBX+GB9Nd7Z4DRT7gt fe/dSuMwDQHr7ivekuCYumhbAsX336NbFOD0BVaxgz7JUZ6yG9etVn+ELfUYSMlecL9U nTf7AAp282qdIDEBHVeRmWPhoDdUf0lYH7zTH0IwM+fy64gbrPgmQqeUtj/hCDFkhVpL pJ+c+pXJxqubFNuYUqrftRn75kgv/cplZ3scLj7WE77Wep/yFfe/9qZiOms3oWWEfXUZ /YOg== X-Forwarded-Encrypted: i=1; AJvYcCXwvVS7x5iwaLWhiA/Uj4R2VntpDPGqBQyl4jvHrFfaG0/KdjFuDhTYtvo/w02shh8ii+6nzUk=@vger.kernel.org X-Gm-Message-State: AOJu0YxZ6vnnPaaZHtOozvlayQQlGvSXIqkOE5uFkV/cNlINhRYiSujH T55QR7HehJJpsd1sblpo3yh07tg0y5B54oJs0yVLF9teJyWqCA4t X-Gm-Gg: ASbGncs3r6Ekv5RuGPP8naBkTEZiRsHQoZGpZYtCh++WHZ8ekTVIWp1aVeW4AWusRHm F0szimlTRP3j/q1ezfKusA6owkVsn7RDigDMUx+aZQ58zFEXc2iTRy9VMxwILCQxAFPiy5eadZ7 8WdeB3aYgx7Hw6YRkiIaQjZHS2oHof1bNpfKKGKDcdt9nhgoGD9KAGNvDrCgPczhFI6EPIs/TqF bP+IW1qewJAnL0gPckmL0wuLCfXTmmp9K6x4aA29oARvnCXIYklF5tg/zet1rdswmR6TDqAPr9l 96tu9n1YtL+Hi7eIAUFQZpfqyoa0IZW++q0zhr0gVa6pY00/F7mMvg== X-Google-Smtp-Source: AGHT+IF4LSiImQXxMrZls32LhmR+tuDFoVzv02aP2ZUjJGRvwSuXck+6lsKTCO9YvjSpNcYG4PoyyA== X-Received: by 2002:a17:90a:d88c:b0:2ee:a6f0:f54 with SMTP id 98e67ed59e1d1-2fbf5bf82e9mr13684752a91.13.1739494869350; Thu, 13 Feb 2025 17:01:09 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:08 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 04/12] bpf: disable unsafe helpers in TX timestamping callbacks Date: Fri, 14 Feb 2025 09:00:30 +0800 Message-Id: <20250214010038.54131-5-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net New TX timestamping sock_ops callbacks will be added in the subsequent patch. Some of the existing BPF helpers will not be safe to be used in the TX timestamping callbacks. The bpf_sock_ops_setsockopt, bpf_sock_ops_getsockopt, and bpf_sock_ops_cb_flags_set require owning the sock lock. TX timestamping callbacks will not own the lock. The bpf_sock_ops_load_hdr_opt needs the skb->data pointing to the TCP header. This will not be true in the TX timestamping callbacks. At the beginning of these helpers, this patch checks the bpf_sock->op to ensure these helpers are used by the existing sock_ops callbacks only. Signed-off-by: Jason Xing --- net/core/filter.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index 8631036f6b64..7f56d0bbeb00 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5523,6 +5523,11 @@ static int __bpf_setsockopt(struct sock *sk, int level, int optname, return -EINVAL; } +static bool is_locked_tcp_sock_ops(struct bpf_sock_ops_kern *bpf_sock) +{ + return bpf_sock->op <= BPF_SOCK_OPS_WRITE_HDR_OPT_CB; +} + static int _bpf_setsockopt(struct sock *sk, int level, int optname, char *optval, int optlen) { @@ -5673,6 +5678,9 @@ static const struct bpf_func_proto bpf_sock_addr_getsockopt_proto = { BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock, int, level, int, optname, char *, optval, int, optlen) { + if (!is_locked_tcp_sock_ops(bpf_sock)) + return -EOPNOTSUPP; + return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen); } @@ -5758,6 +5766,9 @@ static int bpf_sock_ops_get_syn(struct bpf_sock_ops_kern *bpf_sock, BPF_CALL_5(bpf_sock_ops_getsockopt, struct bpf_sock_ops_kern *, bpf_sock, int, level, int, optname, char *, optval, int, optlen) { + if (!is_locked_tcp_sock_ops(bpf_sock)) + return -EOPNOTSUPP; + if (IS_ENABLED(CONFIG_INET) && level == SOL_TCP && optname >= TCP_BPF_SYN && optname <= TCP_BPF_SYN_MAC) { int ret, copy_len = 0; @@ -5800,6 +5811,9 @@ BPF_CALL_2(bpf_sock_ops_cb_flags_set, struct bpf_sock_ops_kern *, bpf_sock, struct sock *sk = bpf_sock->sk; int val = argval & BPF_SOCK_OPS_ALL_CB_FLAGS; + if (!is_locked_tcp_sock_ops(bpf_sock)) + return -EOPNOTSUPP; + if (!IS_ENABLED(CONFIG_INET) || !sk_fullsock(sk)) return -EINVAL; @@ -7609,6 +7623,9 @@ BPF_CALL_4(bpf_sock_ops_load_hdr_opt, struct bpf_sock_ops_kern *, bpf_sock, u8 search_kind, search_len, copy_len, magic_len; int ret; + if (!is_locked_tcp_sock_ops(bpf_sock)) + return -EOPNOTSUPP; + /* 2 byte is the minimal option len except TCPOPT_NOP and * TCPOPT_EOL which are useless for the bpf prog to learn * and this helper disallow loading them also. From patchwork Fri Feb 14 01:00:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974255 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E24C275419; Fri, 14 Feb 2025 01:01:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494877; cv=none; b=EltX+VtLrZ0zZZDJ8t5VcNixwm3JDF2z9xpF9AoKXSVRHuEtQBt6bo3/Zng7A/4hybv7/auVEUUirGOSevsLMINytDJCVV6HmnpeEPQb96kmvzaQHrWIZ0dofIb/mRg/CtmumFbuPPDF7UfZitQV8Sa/uktCrFW+WxA7sg5UHCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494877; c=relaxed/simple; bh=eTHtJrLTgKPapbvhe7qwd0kLWB4F9Df0+/dv2qnCE3o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RI1D+Zwb6iCIr3AOIjSt7zmVZp+PFplFFgaRZFhAkP/HVflQMDbAnQqoApdITOiDAbuxtDyn22x+7Me372SdhxQLxFReJhNqZ5e3WsY93UztFrCoEncmZVNtcCjBuDtMriLG+8IRbaC/9SfOa9HLE2wXGQCv5X/vyoleKrJ9WXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L6bi+v9y; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L6bi+v9y" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2fc0026eb79so2765824a91.0; Thu, 13 Feb 2025 17:01:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494875; x=1740099675; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MJ9F212PtsSHKIVUZOrPA2mk84naWjg27j0jUX3VDVs=; b=L6bi+v9ydRw9GKY9iu583FWBYWK4WDwqK60Z+/srU1QUk9KWBgLn2QXf/r2ZlZlI4i oMotp0Y4Aqo6Xohs4MMAqNXuUDqIaEsPXwq/Zx+DAChHcXKFz7XC7IgoS8FU6PLIlz/M 3zN3hqE/N2UR+GnSslotf3AEGpAsD/kIlAZf3DGVC/M7rD4oiGLferewPB96InN5/cTO eHN6va5Il5KmH6JYhIsZqUh56a1dbSBkSgnKpYb0xnmEVZ3+2UDFimaSzHPlN33QdCIk TUyn0zvfkSMN2Zkz+KDCqeDDiA3XsFqerPVTH4MDmR6mhfUjDlFMg5LG3OWd2wE5xMhk 5Q3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494875; x=1740099675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MJ9F212PtsSHKIVUZOrPA2mk84naWjg27j0jUX3VDVs=; b=bgBRxwqMuQWfhfkRxI1gTBjWQsvM5+8RFtAcq5ygr8isNAuUvnnMv3Uw9WUQyELqDi gbzL8YqH0AwJQydTWGp9NjamxyFuEiYArXyngUBsbx4GOnjSb5n94bogJjodD9+XddxN 8Vj4kANKz7f2vlv9t30gLEmvL5kkeCYiDS0G/J+PRPv8XIgw4HOP+zd5wjo6FMBPgIPd wfcgfld2mKCNMxTqVNAWwl9R4wRJWMeKrOs0raroInS6n5uFGHN/Wz44oqaZAQacaCEC 1NEWf/N4fXXbxpR6raWwBwedcJrYmDePPAicJ24Z6GtDJ9kasxYJTWjZo9tovxIjKvTn E/lQ== X-Forwarded-Encrypted: i=1; AJvYcCVRkVWQpcPbaU+ess6S54Ow3+fAyBZURry5m6nk5L5d23yIRkV+iJ/1wa1VRrjRI5BGLlzoByk=@vger.kernel.org X-Gm-Message-State: AOJu0YyyC40QYlZ62Z6tw1C2K4oCiTX1pbGD1nO/aBPkO1ujLwa+NWQU fAqbJDZmAQYTWc6bdR5+N8vQ2B1RGcry1nEEN5wIIBvc3TVf/nCy X-Gm-Gg: ASbGncthGNN1YBzVIne9jXEqFH+m0wmuohTSFInHTaGPcgUy4KLQXcUyuxCIUFMNll8 m4wH73e+wcGRaf5IsBZ1XRxNu8YUon2csmumgADjZt31tNGL1iCD77Q9rzu4aflTThzk4f49m5b QrgWh9ZwjmNdCem+I4JwSCfGASkofF5bz4m1i7bHpR/B1QhrrYGvN/h04t04DUG61WPmg5Q4bRw GLcge7u/go054B5cxPbYcOnSCIzOQhfi8LH9Fl/ZzcOsJBuRLo8MGvH05e5RV1pFwRZaL2wE8Bc iHd2t2JlcQTaud9QVePeIRDVifVESOsr38MVgnIpO7Gy7FmE/OJ4lg== X-Google-Smtp-Source: AGHT+IFJkXtGtlbYlTo7BOxFd3do8Sy1/TssN6e9klcEaS9pO0vQIqdBMR7K1ewXllgQBIw92QSlqQ== X-Received: by 2002:a17:90b:2f06:b0:2ee:53b3:3f1c with SMTP id 98e67ed59e1d1-2fbf5bc1a9dmr13807382a91.5.1739494874794; Thu, 13 Feb 2025 17:01:14 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:14 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 05/12] net-timestamp: prepare for isolating two modes of SO_TIMESTAMPING Date: Fri, 14 Feb 2025 09:00:31 +0800 Message-Id: <20250214010038.54131-6-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net No functional changes here. Only add test to see if the orig_skb matches the usage of application SO_TIMESTAMPING. In this series, bpf timestamping and previous socket timestamping are implemented in the same function __skb_tstamp_tx(). To test the socket enables socket timestamping feature, this function skb_tstamp_tx_report_so_timestamping() is added. In the next patch, another check for bpf timestamping feature will be introduced just like the above report function, namely, skb_tstamp_tx_report_bpf_timestamping(). Then users will be able to know the socket enables either or both of features. Signed-off-by: Jason Xing --- net/core/skbuff.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index a441613a1e6c..341a3290e898 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5539,6 +5539,23 @@ void skb_complete_tx_timestamp(struct sk_buff *skb, } EXPORT_SYMBOL_GPL(skb_complete_tx_timestamp); +static bool skb_tstamp_tx_report_so_timestamping(struct sk_buff *skb, + struct skb_shared_hwtstamps *hwtstamps, + int tstype) +{ + switch (tstype) { + case SCM_TSTAMP_SCHED: + return skb_shinfo(skb)->tx_flags & SKBTX_SCHED_TSTAMP; + case SCM_TSTAMP_SND: + return skb_shinfo(skb)->tx_flags & (hwtstamps ? SKBTX_HW_TSTAMP : + SKBTX_SW_TSTAMP); + case SCM_TSTAMP_ACK: + return TCP_SKB_CB(skb)->txstamp_ack; + } + + return false; +} + void __skb_tstamp_tx(struct sk_buff *orig_skb, const struct sk_buff *ack_skb, struct skb_shared_hwtstamps *hwtstamps, @@ -5551,6 +5568,9 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, if (!sk) return; + if (!skb_tstamp_tx_report_so_timestamping(orig_skb, hwtstamps, tstype)) + return; + tsflags = READ_ONCE(sk->sk_tsflags); if (!hwtstamps && !(tsflags & SOF_TIMESTAMPING_OPT_TX_SWHW) && skb_shinfo(orig_skb)->tx_flags & SKBTX_IN_PROGRESS) From patchwork Fri Feb 14 01:00:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974256 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D214275419; Fri, 14 Feb 2025 01:01:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494882; cv=none; b=ElKkNfHw2FSDM7GrXhWynQMJSX4zOw49nYqyEY2HfM13SrIRCZAcZmHPc2bxalpc3IARiXMxaNmULiZfA/2eFbRa+6BmN1QwGxeFWzEa9FyyVqB3gd/WWMn1UPQEow7j6gBXpUwGBh+eGwbcIplgBEYL9aa3NcWpIJ9BFTRQ4fI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494882; c=relaxed/simple; bh=MwnhAchlDNKve5J+/cAJpVlmx6+Xk3aqDL+WS1Pv+Mk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cPLUknv7ISJvAjPwegOFgDLHe5KAPJzS/XkGJqznWsVT/mxdkVC2f8fkLHc2LGatEu9Ns55HZ6z6v6yMRYzHrPxRTS/MrVtp8TLvTjaqV1BKmPAIinHVrEdkIOF9Ek4vAKg56ERz5pFemDe493PBFplZt/43/aNCbHpC5ZIh/jo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kzKWddX9; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kzKWddX9" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-220d28c215eso20477605ad.1; Thu, 13 Feb 2025 17:01:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494881; x=1740099681; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FeqW566o5arTPjVwkcb4h3wmjpR1zsB/qZsvzlvgmI4=; b=kzKWddX9WCmuBOUoo6bT6MQ4CwgAqIYBU5MXrT1q3dGETrxwVGu+Kt24FZ7T4Ae18+ YQHMXRvL3ffrglwF7RqyJxSDd81gD7suzTG8iS+lr7totzKNerLzvyIuZiLxNW9X2EFC lLFPTIu9moIhKR8Fr2PfybfKST8n7WkE4WrNdJh7HfVeBDuA0fz/lnKXM4S+aAmRsK01 Gi8utYPea1pzU/jArEU+abkI3ZLPkwFYSVwtgFUodaMppERTZV0aUqL/XdGDTOyZDEZR dsZytJMzPY2BceZtXpBTfuaYPS/O5RzKzMTUPzMQ75+gaX2z0G5E9HwNbum4IWwlFhhw kmGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494881; x=1740099681; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FeqW566o5arTPjVwkcb4h3wmjpR1zsB/qZsvzlvgmI4=; b=FtxVPUEw2IhpNhwuuP8uWzirPHhQNZ4MPDO9ohyElbJs0KcBDxajInTLitRFoNuKt3 b3Q0aLW4Xtl19zbs74/N1cZiK/FoUh4LO+6fF2X+WWY1JLhuUYnWIcQIPJN6plCUw+uI NVtvsVcs3yYZoYN9lTdMqnAawWK0bOqRUfhOGTqJhtKCH+2F0RkiyUu6EX3kv1I2igIB NSnjyCm4bq2zHXkUS0/BLL5o25fc4KnGbyhivED5p++V5XiZEwoych7tBu4NhDgNQCtY mRu5LHkeax3lgv1Ap4DJEGD41zlSgv4K5ylodaIPU9PEHcLjPkogyP2zqFCoJnJmBMih n4Ww== X-Forwarded-Encrypted: i=1; AJvYcCWUMHUzrS3c0dxuRfB2w1HVGHepXQVpWKBVjzNHRWGCVaNwph1UYg4NWQNPzGPt9hmGUJ5TQoI=@vger.kernel.org X-Gm-Message-State: AOJu0YzxEytbsB+wQ9UviCGH8fdY+IrjAgEUh5PIe7nJNYSTuo9yQ5Ng Fp9VorWl9FbdujhLSN1PWtC3dh2O7y5F1X8pHZIN+99AEqwalcIp X-Gm-Gg: ASbGnctbtzaRJLw3CejQMeM8vyAU2O1h15UA/uWve5NVcoJ6RucRV8oVZZUs0Gwi+tC CccLx0Zi35djzl8pIJpijp+eQ6h/ioOybKilG7C4iY5LiGGDIRH4Qs0pns0GVkizQMFid2aZPMO ZpJLqhzsHBP60zOyDCqayHaZ2vFA5Ckg8VeSuHBjLPES7r0AnnBH7Hg5o8iUIyjeF0tX96uvHHt N681zlSm1NMEODYzP1TFmOnhVHs5pE0XnWwCatITkAllrHW/mI71ntsW8LJcUlxPQptV/Nzw7Ng g0gzwSSU63UQ2wDQNUoF4rBfZxNubYzjo7vK1pNQNiN21jTCEecVWQ== X-Google-Smtp-Source: AGHT+IGoCHPP4536o+gtGftFX/OumVM4i5ntXF3ulveRA/xroiyGPEk+Om4BAd99OuBfMgJL8xjSjA== X-Received: by 2002:a17:903:1d0:b0:21f:7821:55b6 with SMTP id d9443c01a7336-220d1ed1ca9mr76075975ad.13.1739494880197; Thu, 13 Feb 2025 17:01:20 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:19 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 06/12] bpf: add BPF_SOCK_OPS_TS_SCHED_OPT_CB callback Date: Fri, 14 Feb 2025 09:00:32 +0800 Message-Id: <20250214010038.54131-7-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Support SCM_TSTAMP_SCHED case for bpf timestamping. Add a new sock_ops callback, BPF_SOCK_OPS_TS_SCHED_OPT_CB. This callback will occur at the same timestamping point as the user space's SCM_TSTAMP_SCHED. The BPF program can use it to get the same SCM_TSTAMP_SCHED timestamp without modifying the user-space application. A new SKBTX_BPF flag is added to mark skb_shinfo(skb)->tx_flags, ensuring that the new BPF timestamping and the current user space's SO_TIMESTAMPING do not interfere with each other. Signed-off-by: Jason Xing --- include/linux/skbuff.h | 6 +++++- include/uapi/linux/bpf.h | 4 ++++ net/core/dev.c | 3 ++- net/core/skbuff.c | 20 ++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 4 ++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index bb2b751d274a..52f6e033e704 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -489,10 +489,14 @@ enum { /* generate software time stamp when entering packet scheduling */ SKBTX_SCHED_TSTAMP = 1 << 6, + + /* used for bpf extension when a bpf program is loaded */ + SKBTX_BPF = 1 << 7, }; #define SKBTX_ANY_SW_TSTAMP (SKBTX_SW_TSTAMP | \ - SKBTX_SCHED_TSTAMP) + SKBTX_SCHED_TSTAMP | \ + SKBTX_BPF) #define SKBTX_ANY_TSTAMP (SKBTX_HW_TSTAMP | \ SKBTX_HW_TSTAMP_USE_CYCLES | \ SKBTX_ANY_SW_TSTAMP) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index fa666d51dffe..68664ececdc0 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -7035,6 +7035,10 @@ enum { * by the kernel or the * earlier bpf-progs. */ + BPF_SOCK_OPS_TS_SCHED_OPT_CB, /* Called when skb is passing through + * dev layer when SK_BPF_CB_TX_TIMESTAMPING + * feature is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect diff --git a/net/core/dev.c b/net/core/dev.c index c0021cbd28fc..cbbde68c17cb 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4500,7 +4500,8 @@ int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev) skb_reset_mac_header(skb); skb_assert_len(skb); - if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_SCHED_TSTAMP)) + if (unlikely(skb_shinfo(skb)->tx_flags & + (SKBTX_SCHED_TSTAMP | SKBTX_BPF))) __skb_tstamp_tx(skb, NULL, NULL, skb->sk, SCM_TSTAMP_SCHED); /* Disable soft irqs for various locks below. Also diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 341a3290e898..0aa54d102624 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5556,6 +5556,23 @@ static bool skb_tstamp_tx_report_so_timestamping(struct sk_buff *skb, return false; } +static void skb_tstamp_tx_report_bpf_timestamping(struct sk_buff *skb, + struct sock *sk, + int tstype) +{ + int op; + + switch (tstype) { + case SCM_TSTAMP_SCHED: + op = BPF_SOCK_OPS_TS_SCHED_OPT_CB; + break; + default: + return; + } + + bpf_skops_tx_timestamping(sk, skb, op); +} + void __skb_tstamp_tx(struct sk_buff *orig_skb, const struct sk_buff *ack_skb, struct skb_shared_hwtstamps *hwtstamps, @@ -5568,6 +5585,9 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, if (!sk) return; + if (skb_shinfo(orig_skb)->tx_flags & SKBTX_BPF) + skb_tstamp_tx_report_bpf_timestamping(orig_skb, sk, tstype); + if (!skb_tstamp_tx_report_so_timestamping(orig_skb, hwtstamps, tstype)) return; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 70366f74ef4e..eed91b7296b7 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -7025,6 +7025,10 @@ enum { * by the kernel or the * earlier bpf-progs. */ + BPF_SOCK_OPS_TS_SCHED_OPT_CB, /* Called when skb is passing through + * dev layer when SK_BPF_CB_TX_TIMESTAMPING + * feature is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect From patchwork Fri Feb 14 01:00:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974257 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 486631BC3C; Fri, 14 Feb 2025 01:01:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494887; cv=none; b=STvMNpEv6qFv470zYkzDzXpELxoDMIgoVTwGZjNU6dP7mQiNYtpbbci/C8BO3MYKMpRkfFCd8vbdlQU9wSNj2XGwuREXALKd3xxMBLYNu/Pmk0HQLXAbEHAvl2bZOjxRFDAaaTixDYI0THBaSTCxu2suLeK7C8Mp/sb5kMtAxx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494887; c=relaxed/simple; bh=IXLUCYhCNHZgztCruzDU0ZGKFctaGuPZNEaKlMrXO4I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SNqXxB4wqfNyL8FCCkiiik0wwNPMqNppaLBdXwPaz1JEKeszs+Tkgex1t6vnWXrQDTYTsNl/SL55e47kQZ6dRB+XSFDn5tjvwyS/mLLy5zh/96etzetGGBPCNGm3vI4/cS1GZ66OyQX0yhKeUQK7FHYObHRBv11M47sfoAnEfqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bGD2WMYf; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bGD2WMYf" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2fbfc9ff0b9so2458650a91.2; Thu, 13 Feb 2025 17:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494885; x=1740099685; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mVlgz+q5Bkt8Btds59rDLuHiYriySzR73dW98PkMWw0=; b=bGD2WMYf0P6vfsxDb2wlhNSRUpyDgNwvItMV6ZrsoonIfjJHfpsF6cwrGQdHWkxgAq Lp1JTjw5X+DSIStYECYObR+Nq6ezVNkN6WPbSbmVsWANmya4iObFQLChTVv0eoBpqe5L A8oFAuTd+AfY10NV/00lL3QrG60yPLItgv9wBJO6+dpg8mwVAEguw1CxzYiF50Z5+swp lhXtdphRIIxNQUVheRAy9nlViKmOw2KRNXcNnXfNRAIweozlMwSYSrn7DjX0mvyMmuNa i0JqMH5Ce6z2UYABQnS59tZx98QScuZHV/D+xUBPIAXAkGYtvNqu78Fv3Il9/J03LRTS QYwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494885; x=1740099685; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mVlgz+q5Bkt8Btds59rDLuHiYriySzR73dW98PkMWw0=; b=bIM/RM8uu89lAtrn5clg+OLfk7WGnAw/Ll/FKSAWv5pblKIg52Nv5vpFlA89i8FBJB mZZa9zsGNauB3gXfB3rxz51HEnJW59SR4RyuWWDD9QBay5CCBRIa0cF13xJNH0rLM1Fw 0XcdIGHZXmGoM7tpanCIyl0Ktysn3BG8iSwcE+4ZcWHuIHVItKvjXSxzAGafV5Jiv/2q 6n9SlcH9IqkXydgn5u8hx2IYKJxfn8NKf/adzsXO8oM3xUv1LT58pTQG1XWZ5H9+T8Wx 7KCMDUWX+p5Pn+oQw8i5fEzYw7yYi523SiHRNf2/Fpm/8o4tP45jAvxazQIiMKXcd2iV eeqw== X-Forwarded-Encrypted: i=1; AJvYcCUVnhe4dAMo8il9axezdtL2CH0WZSjPIuw+ymQE2XFUj2Otn1viZJEFXE27iTRRHGfZbEwENo0=@vger.kernel.org X-Gm-Message-State: AOJu0YyC3Pdh0WiMXxW6HPftrz+WJukaq14MUPvlDx0gEPEzcM4E+u3E MM9zjfWeKjATnXjmtPt0xPfxUbLUFikX0sXmP4XOlJm7D0YdmDOb X-Gm-Gg: ASbGncvbEI2QlvbXKqKjKVOvly/StbA2W1UgP61Wdl6eGbiAXD09RqNcdnO/R3yzkw+ yGbB1nFr9Kt0FQNAZNkn0LBezJg/Q2chga148VT9jxIsBLcWKWfb21nNfaWm/nl9zGvpf8fKJzW +/j2/zhgqA5EKLcKTkM5ewieg1Id7raYM77Oo1nNrW+zZS3pThbwGhRkt7e18KM4OMZigGvEJmf a6hsey2E03ge6E5gVusgsePFs3O45S5rI0K2QvS4jfaY/W7ViYz1uatn2q/LKjwJ/Dk68VOMzq7 YbidhoHbNVY08p9u2jjKIYOIrJp/zJnGhV2nT7/bGVy7XM9/JxAEpA== X-Google-Smtp-Source: AGHT+IHgaZLK4BCkk9FVWm5O3Kbvrv9kTyPfnGwVN/FFkHEYQwBzfrg0xyEcS64+QUVFDHY8Tx73iA== X-Received: by 2002:a17:90b:17c1:b0:2ee:8e75:4aeb with SMTP id 98e67ed59e1d1-2fc0e7a219fmr8458655a91.17.1739494885591; Thu, 13 Feb 2025 17:01:25 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:25 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 07/12] bpf: add BPF_SOCK_OPS_TS_SW_OPT_CB callback Date: Fri, 14 Feb 2025 09:00:33 +0800 Message-Id: <20250214010038.54131-8-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Support sw SCM_TSTAMP_SND case for bpf timestamping. Add a new sock_ops callback, BPF_SOCK_OPS_TS_SW_OPT_CB. This callback will occur at the same timestamping point as the user space's software SCM_TSTAMP_SND. The BPF program can use it to get the same SCM_TSTAMP_SND timestamp without modifying the user-space application. Based on this patch, BPF program will get the software timestamp when the driver is ready to send the skb. In the sebsequent patch, the hardware timestamp will be supported. Signed-off-by: Jason Xing --- include/linux/skbuff.h | 2 +- include/uapi/linux/bpf.h | 4 ++++ net/core/skbuff.c | 9 ++++++++- tools/include/uapi/linux/bpf.h | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 52f6e033e704..76582500c5ea 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -4568,7 +4568,7 @@ void skb_tstamp_tx(struct sk_buff *orig_skb, static inline void skb_tx_timestamp(struct sk_buff *skb) { skb_clone_tx_timestamp(skb); - if (skb_shinfo(skb)->tx_flags & SKBTX_SW_TSTAMP) + if (skb_shinfo(skb)->tx_flags & (SKBTX_SW_TSTAMP | SKBTX_BPF)) skb_tstamp_tx(skb, NULL); } diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 68664ececdc0..b3bd92281084 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -7039,6 +7039,10 @@ enum { * dev layer when SK_BPF_CB_TX_TIMESTAMPING * feature is on. */ + BPF_SOCK_OPS_TS_SW_OPT_CB, /* Called when skb is about to send + * to the nic when SK_BPF_CB_TX_TIMESTAMPING + * feature is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 0aa54d102624..03b90f04d0b0 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5557,6 +5557,7 @@ static bool skb_tstamp_tx_report_so_timestamping(struct sk_buff *skb, } static void skb_tstamp_tx_report_bpf_timestamping(struct sk_buff *skb, + struct skb_shared_hwtstamps *hwtstamps, struct sock *sk, int tstype) { @@ -5566,6 +5567,11 @@ static void skb_tstamp_tx_report_bpf_timestamping(struct sk_buff *skb, case SCM_TSTAMP_SCHED: op = BPF_SOCK_OPS_TS_SCHED_OPT_CB; break; + case SCM_TSTAMP_SND: + if (hwtstamps) + return; + op = BPF_SOCK_OPS_TS_SW_OPT_CB; + break; default: return; } @@ -5586,7 +5592,8 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, return; if (skb_shinfo(orig_skb)->tx_flags & SKBTX_BPF) - skb_tstamp_tx_report_bpf_timestamping(orig_skb, sk, tstype); + skb_tstamp_tx_report_bpf_timestamping(orig_skb, hwtstamps, + sk, tstype); if (!skb_tstamp_tx_report_so_timestamping(orig_skb, hwtstamps, tstype)) return; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index eed91b7296b7..9bd1c7c77b17 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -7029,6 +7029,10 @@ enum { * dev layer when SK_BPF_CB_TX_TIMESTAMPING * feature is on. */ + BPF_SOCK_OPS_TS_SW_OPT_CB, /* Called when skb is about to send + * to the nic when SK_BPF_CB_TX_TIMESTAMPING + * feature is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect From patchwork Fri Feb 14 01:00:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974258 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B29F1134AB; Fri, 14 Feb 2025 01:01:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494894; cv=none; b=mJXZ0A/vUdfQVF/CXsunBzhKbkGHJ7AP1SmV3UnE1WwmdMYhKYLEEx4hDEUHg1DqkxGgl0VqNG5509/MifUsCvfImXKSfjnKOnWXdMu7bpJ8og/U7+Pt7T5B+/x6DGmsz7mVlArje+r6PjYmJKIIaKI8CMlTJUsR6gRkeINixsc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494894; c=relaxed/simple; bh=CiBuHwmFJE+tYlNMQfksDimJ22d/UNrckF/sMdvmVJQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FhqlOyeCCAHWTa04PladbVB5X/2HprZzRlVxqboXA2ZPpM+6vFPWPUQDX+z6J3X/C88OP0ZB84ikorJY8YzlOn6c6rnq5mFdtTPGsqGJgOwnl7E3yfJk+SF6kks+T9XwJGLTwPr4/a1UD4/c5ZKHu192vCwXND9lI1ZRm40AdSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VjaRDfKz; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VjaRDfKz" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-220bfdfb3f4so31093895ad.2; Thu, 13 Feb 2025 17:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494891; x=1740099691; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+eIXDtgolwHKU8f8SVw7JvRUwqk6inDRww5sm41aIxo=; b=VjaRDfKzL5wmgzWt0vfpVcvi9lm00B0XShCS+uShXSaAeMMSSk/ftpQSOLzIvSDaMx +FQZdkzbXfbuRQeU6Gw5YS2nzcWKJR5ekz3wyYL04V6YxKCAtxk1kItnQMx6XQwYD60v ad1zDp35U+gta6WcLyP7VnSn5BseYDqZ15uPj0+4AmJiuU4w5y0CQH0t0wvYe3oeMVc7 8c63gHGGwCmeqPGLVKZCZjtnzYBHaoNMdQRq2CRH4PxQU5DmR2bGvK4ff+seCnQ17Pon tw3DQ53Nsi55MI/xzIJINsl40G1LZjNiFfHT8AMNChp9EGhMVhm5JRyFKTmOWfHvtr/i ZHHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494891; x=1740099691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+eIXDtgolwHKU8f8SVw7JvRUwqk6inDRww5sm41aIxo=; b=t2UgrknN5fWLZpV94L7mVx56K7b81Z0B7L6t7F/jFRiyADydG4YHNAWvxB6IKcUmN5 877RA983oKP8OQquaW5FtwzgXqaXXZ6aPdeqB2vgaz43ufVxwJfLCEFMrhEXHm87aZcA vvUsheVYxHU0jIBfZxKZIymqIUDq4afmdFIqO6D/hEfsu6OlcEKB9vMqc+Y9FfwFe9RE WtmxY02lCaYMt3+nfs0foBdB7qDLxl1Mz92SLmjK0o0yj0/l97l8s/gsAtiUqfpptuGk EOgSSpkoU3AH3sF0MBUI8cD1IjwzTy0VWY2eZ1+kpEtp1IKUucen6YWIBjukwu3CuZkb EZxA== X-Forwarded-Encrypted: i=1; AJvYcCVReINOxH6MgkBn/iTuBvfZotDcdz47dszklKO53zAWZ91r8sM+rHNabsq95lMf2zhGW6gdTZ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+zBRCZSQpeZCK/vYW7/pzrhewlWhIyXa2Xk2DCY10p2VQ7fq/ iSo7Os6QP6yIMotnektNA5uSqFovcW2mPNxIg0cCYYeFcytOdk3p X-Gm-Gg: ASbGncvvgnRDtSZ825uh88BS473RwIFU04h7OI3l5drw/QzGd8V5vlGNveSLcRouY9/ 943dot+wMDIe41TFKLIsPjg5S8tAn3881b+KBCrd/wT1Hcegq4/PnJZltuUx6Bz/V7Vg/8jEwJk H2yMTffznpsHS7jU+esXIe0n0MAr2gy4a06p2clhaCHUIEu2c2FP+MZ+ANFg0xgwzl+U+uwfzNO yl9xoZHoyla88FfymWaOVvkF5lTDd+frxfHFe7/q8p2kthHEFO/yN3ztDq9572aHs2HG10IsUcZ VuWK+fGe4zv5bxcifpjcb3lm1O8AMgl6cqQVKh2BnIfdKG1sb52XdA== X-Google-Smtp-Source: AGHT+IEz8lGNospW3jKU3YDlc4O7+c51k1gg9BewZAqX4/s3okd+B4hWxvzz20e8IBW9QjTrw9yIMw== X-Received: by 2002:a17:903:985:b0:21f:6584:208d with SMTP id d9443c01a7336-220bbc729d6mr167290385ad.43.1739494890936; Thu, 13 Feb 2025 17:01:30 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:30 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 08/12] bpf: add BPF_SOCK_OPS_TS_HW_OPT_CB callback Date: Fri, 14 Feb 2025 09:00:34 +0800 Message-Id: <20250214010038.54131-9-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Support hw SCM_TSTAMP_SND case for bpf timestamping. Add a new sock_ops callback, BPF_SOCK_OPS_TS_HW_OPT_CB. This callback will occur at the same timestamping point as the user space's hardware SCM_TSTAMP_SND. The BPF program can use it to get the same SCM_TSTAMP_SND timestamp without modifying the user-space application. To avoid increasing the code complexity, replace SKBTX_HW_TSTAMP with SKBTX_HW_TSTAMP_NOBPF instead of changing numerous callers from driver side using SKBTX_HW_TSTAMP. The new definition of SKBTX_HW_TSTAMP means the combination tests of socket timestamping and bpf timestamping. After this patch, drivers can work under the bpf timestamping. Considering some drivers doesn't assign the skb with hardware timestamp, this patch do the assignment and then BPF program can acquire the hwstamp from skb directly. Signed-off-by: Jason Xing --- include/linux/skbuff.h | 4 +++- include/uapi/linux/bpf.h | 4 ++++ net/core/skbuff.c | 11 +++++++---- tools/include/uapi/linux/bpf.h | 4 ++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 76582500c5ea..0b4f1889500d 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -470,7 +470,7 @@ struct skb_shared_hwtstamps { /* Definitions for tx_flags in struct skb_shared_info */ enum { /* generate hardware time stamp */ - SKBTX_HW_TSTAMP = 1 << 0, + SKBTX_HW_TSTAMP_NOBPF = 1 << 0, /* generate software time stamp when queueing packet to NIC */ SKBTX_SW_TSTAMP = 1 << 1, @@ -494,6 +494,8 @@ enum { SKBTX_BPF = 1 << 7, }; +#define SKBTX_HW_TSTAMP (SKBTX_HW_TSTAMP_NOBPF | SKBTX_BPF) + #define SKBTX_ANY_SW_TSTAMP (SKBTX_SW_TSTAMP | \ SKBTX_SCHED_TSTAMP | \ SKBTX_BPF) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index b3bd92281084..f70edd067edf 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -7043,6 +7043,10 @@ enum { * to the nic when SK_BPF_CB_TX_TIMESTAMPING * feature is on. */ + BPF_SOCK_OPS_TS_HW_OPT_CB, /* Called in hardware phase when + * SK_BPF_CB_TX_TIMESTAMPING feature + * is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 03b90f04d0b0..acafa05f7f58 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5547,7 +5547,7 @@ static bool skb_tstamp_tx_report_so_timestamping(struct sk_buff *skb, case SCM_TSTAMP_SCHED: return skb_shinfo(skb)->tx_flags & SKBTX_SCHED_TSTAMP; case SCM_TSTAMP_SND: - return skb_shinfo(skb)->tx_flags & (hwtstamps ? SKBTX_HW_TSTAMP : + return skb_shinfo(skb)->tx_flags & (hwtstamps ? SKBTX_HW_TSTAMP_NOBPF : SKBTX_SW_TSTAMP); case SCM_TSTAMP_ACK: return TCP_SKB_CB(skb)->txstamp_ack; @@ -5568,9 +5568,12 @@ static void skb_tstamp_tx_report_bpf_timestamping(struct sk_buff *skb, op = BPF_SOCK_OPS_TS_SCHED_OPT_CB; break; case SCM_TSTAMP_SND: - if (hwtstamps) - return; - op = BPF_SOCK_OPS_TS_SW_OPT_CB; + if (hwtstamps) { + op = BPF_SOCK_OPS_TS_HW_OPT_CB; + *skb_hwtstamps(skb) = *hwtstamps; + } else { + op = BPF_SOCK_OPS_TS_SW_OPT_CB; + } break; default: return; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 9bd1c7c77b17..7b9652ce7e3c 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -7033,6 +7033,10 @@ enum { * to the nic when SK_BPF_CB_TX_TIMESTAMPING * feature is on. */ + BPF_SOCK_OPS_TS_HW_OPT_CB, /* Called in hardware phase when + * SK_BPF_CB_TX_TIMESTAMPING feature + * is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect From patchwork Fri Feb 14 01:00:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974259 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0033225776; Fri, 14 Feb 2025 01:01:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494898; cv=none; b=cAtRMFPi1ZRgLvkDyMZYfe+6mwDUuaVbVtXtnWb2Biz8KUcUNuZaRtRGyC/sNo9xoSfhXCJVzXhvoxBVrPKW3if1XOt1fCsRQuSsJHJYasW2ZonIzQXPk5FrN/DRN8tixS8UNBPF07gbFtO1J/XrRVyg70len8v8+tGeM+Qxbno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494898; c=relaxed/simple; bh=E8UHKud99Fu9f2BVbg9Pcd7DJcoCLPzksMrcw2+5VVk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YBh/bVRiUfJfRFrNwNiKC/neI+y+UKsusxv7U36IPamVDfqBgHQL1IqqLE5D1fsooXgALLSGee/q3zCojDNfc4IMGkOMoc8jjPraN1seA87iRPw0MFK0YC9zB/ElqAYQc6/TH8YLCsKwPmZOjtBddXhRWSmU4FJmc0V3hLq7E7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bVBL3xls; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bVBL3xls" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21f44e7eae4so27728075ad.2; Thu, 13 Feb 2025 17:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494896; x=1740099696; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XY6onKURQRdrENgrbc1FwSconAR3JFw0QnOfThCUE3o=; b=bVBL3xls1gXGo5rmWn8jDHVl9w3OlDOrcEzCu5J+YTHss7aXw3l9dg2DH2T3rUx6AT WumeWEwAu0Nl/+hhH/24US8gJrGeRlcwmatWcUYV36dOHSBGMicup/b+H+f5UV9R+O50 d+/qJZYb2x4q7257jfMqeKJ620WfTrSGB5ywbtQtGTUuuIk92P+fIxB2n2rQ7wiVcHf2 q1p82W3MbZtdwQxJoBfKSay2hhl4gE0SpxxbuAqSi/++U7XVjPkw9p5ozPNpIVbB3lWq GaVW7VynkpU10TmMiTKPFaklWnY2v7WDc704Ca/3il6Fsw/uvioMN98vZfjzL2hJ/VzO zs5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494896; x=1740099696; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XY6onKURQRdrENgrbc1FwSconAR3JFw0QnOfThCUE3o=; b=w45GllCVz1y9Zah7h9m5LYbqgZ6AOUF7if7buMN6I+aU6NfddfKBTVvNaM04JFrZU6 s7k33dujyKagiera+MVfz4Vz7f0BIipLp06H267dn23d0xUzHq2wYyYt7y83eMTidKQ5 1maTCAj4R8HzDzfk/99RwFHjEXHs2eAyPcXN+wrpkHQMTxHT2ZIbjGS3AnvD0oUBiQfZ uw0JB8mMlg4zH/4r41/fcn5hRJcd5o2NXUTZYmJA/nOkyz0XYlG+T438WHZO8ZvaDFIN KoZQhFriHOjb509EJMLvr3S+m7p4G7RwMHzRdcL2mIHLyPf0z8VGyy0AG9ZgnGTLKRgI TPVQ== X-Forwarded-Encrypted: i=1; AJvYcCVujPZXjLvdxEIzq5CzjZpCyPmtveLNdoXV2jnRuYDuCoVVvDa86pMI0LCIdKUdeltYgjUmMow=@vger.kernel.org X-Gm-Message-State: AOJu0YxBHq8gJ9N1/mY79MSUKA21AYFTLnyzJIM342NhWH0bdBjW5rnQ 5Mhit9ceT3Ri2mYvRtbS6qRAVYBEIzlg9UaellJvKd6AeH8n5OnU X-Gm-Gg: ASbGnctha4E3ZIhFWuvB5vGIDJzXHsPCHCdcYyUwEO95rCSNTW0vF/AawEsXL4ykwqt mphJSf4t+jOHGGv5gHJltFyNyJmOwzIbtovCl0RKKV9CSvexsOMX8Y/soXQ5I/yDBJbY+AlyaVI Adr70tCBmL0owOwkFz6T3ftrWu605/Tu5vu6BMMDJ5B58DDDP/4EesbhtpUIqLY1cb+4okXy1Eb gvvYblOY+mvRv7WBHMf1vxPviZl3jr5/EN6fpB43Tdobznf5Eu5MKdDr88vbSIJBB6U98r3QHdR BSXdEn60gz/o642KAKeqM3+7rgJ21SlERMoVxN9yPE3jova0yr8rkQ== X-Google-Smtp-Source: AGHT+IF3cPIV2DMGGMpvlgsnfIdoHH1G/fd1WhZT+7ZGbRNeqrzK7zh6RLRaNVny25+rsDBmzdgrgQ== X-Received: by 2002:a17:903:1a03:b0:21f:8453:7484 with SMTP id d9443c01a7336-220bbb24afemr143707025ad.30.1739494896251; Thu, 13 Feb 2025 17:01:36 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:35 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 09/12] bpf: add BPF_SOCK_OPS_TS_ACK_OPT_CB callback Date: Fri, 14 Feb 2025 09:00:35 +0800 Message-Id: <20250214010038.54131-10-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Support the ACK case for bpf timestamping. Add a new sock_ops callback, BPF_SOCK_OPS_TS_ACK_OPT_CB. This callback will occur at the same timestamping point as the user space's SCM_TSTAMP_ACK. The BPF program can use it to get the same SCM_TSTAMP_ACK timestamp without modifying the user-space application. This patch extends txstamp_ack to two bits: 1 stands for SO_TIMESTAMPING mode, 2 bpf extension. Signed-off-by: Jason Xing --- include/net/tcp.h | 6 ++++-- include/uapi/linux/bpf.h | 5 +++++ net/core/skbuff.c | 5 ++++- net/dsa/user.c | 2 +- net/ipv4/tcp.c | 2 +- net/socket.c | 2 +- tools/include/uapi/linux/bpf.h | 5 +++++ 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 4c4dca59352b..2e2fc72e115b 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -958,10 +958,12 @@ struct tcp_skb_cb { __u8 sacked; /* State flags for SACK. */ __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */ - __u8 txstamp_ack:1, /* Record TX timestamp for ack? */ +#define TSTAMP_ACK_SK 0x1 +#define TSTAMP_ACK_BPF 0x2 + __u8 txstamp_ack:2, /* Record TX timestamp for ack? */ eor:1, /* Is skb MSG_EOR marked? */ has_rxtstamp:1, /* SKB has a RX timestamp */ - unused:5; + unused:4; __u32 ack_seq; /* Sequence number ACK'd */ union { struct { diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index f70edd067edf..9355d617767f 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -7047,6 +7047,11 @@ enum { * SK_BPF_CB_TX_TIMESTAMPING feature * is on. */ + BPF_SOCK_OPS_TS_ACK_OPT_CB, /* Called when all the skbs in the + * same sendmsg call are acked + * when SK_BPF_CB_TX_TIMESTAMPING + * feature is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect diff --git a/net/core/skbuff.c b/net/core/skbuff.c index acafa05f7f58..f096ca6c2ced 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5550,7 +5550,7 @@ static bool skb_tstamp_tx_report_so_timestamping(struct sk_buff *skb, return skb_shinfo(skb)->tx_flags & (hwtstamps ? SKBTX_HW_TSTAMP_NOBPF : SKBTX_SW_TSTAMP); case SCM_TSTAMP_ACK: - return TCP_SKB_CB(skb)->txstamp_ack; + return TCP_SKB_CB(skb)->txstamp_ack & TSTAMP_ACK_SK; } return false; @@ -5575,6 +5575,9 @@ static void skb_tstamp_tx_report_bpf_timestamping(struct sk_buff *skb, op = BPF_SOCK_OPS_TS_SW_OPT_CB; } break; + case SCM_TSTAMP_ACK: + op = BPF_SOCK_OPS_TS_ACK_OPT_CB; + break; default: return; } diff --git a/net/dsa/user.c b/net/dsa/user.c index 291ab1b4acc4..794fe553dd77 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -897,7 +897,7 @@ static void dsa_skb_tx_timestamp(struct dsa_user_priv *p, { struct dsa_switch *ds = p->dp->ds; - if (!(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) + if (!(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP_NOBPF)) return; if (!ds->ops->port_txtstamp) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 0d704bda6c41..12b9c4f9c151 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -488,7 +488,7 @@ static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc) sock_tx_timestamp(sk, sockc, &shinfo->tx_flags); if (tsflags & SOF_TIMESTAMPING_TX_ACK) - tcb->txstamp_ack = 1; + tcb->txstamp_ack |= TSTAMP_ACK_SK; if (tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK) shinfo->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1; } diff --git a/net/socket.c b/net/socket.c index 262a28b59c7f..517de433d4bb 100644 --- a/net/socket.c +++ b/net/socket.c @@ -676,7 +676,7 @@ void __sock_tx_timestamp(__u32 tsflags, __u8 *tx_flags) u8 flags = *tx_flags; if (tsflags & SOF_TIMESTAMPING_TX_HARDWARE) { - flags |= SKBTX_HW_TSTAMP; + flags |= SKBTX_HW_TSTAMP_NOBPF; /* PTP hardware clocks can provide a free running cycle counter * as a time base for virtual clocks. Tell driver to use the diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 7b9652ce7e3c..d3e2988b3b4c 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -7037,6 +7037,11 @@ enum { * SK_BPF_CB_TX_TIMESTAMPING feature * is on. */ + BPF_SOCK_OPS_TS_ACK_OPT_CB, /* Called when all the skbs in the + * same sendmsg call are acked + * when SK_BPF_CB_TX_TIMESTAMPING + * feature is on. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect From patchwork Fri Feb 14 01:00:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974260 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5796A25776; Fri, 14 Feb 2025 01:01:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494904; cv=none; b=EMw18+BCvvobPZaSVkxO26JGtowHzXBC/GkgqiCUIpEk2KCFt3+5Ks1MWfKC57wcBvaNe9gge6o/Y7I76+Qgsgf+7CNY3gAUQmgY75n+X26Hqpqh3Pdc9cYZyhb8tOT3lnQ3tIjpoX3giwdNWeAG8c3BP91bGg8E/laNDf7Y+yI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494904; c=relaxed/simple; bh=JPoQgaS/t3HFTd09aBUhh/TgXSHh06+b57Va1cSIE4c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PCYGAPPdFq/x0hSMs6mmw7gpSlSDzmIAkOtbfnwpocyBtdaYVciKDTs73tXv6H5U+eG4F+tpdsW0uXxZnn2NextjGSXzXCBRpvPbfVaYGazHQik468WjeXvpVdkn5bYtMiaeS4FzmbKImseansqP0j4BJMZS35DyGQXdrDLSWs0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nY6DuX30; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nY6DuX30" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-220d398bea9so20688305ad.3; Thu, 13 Feb 2025 17:01:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494901; x=1740099701; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LS3SgII/6U7/5mkIGtNBNd4qXYAT6zWaOxbAl9i5SRo=; b=nY6DuX30GtAn626d7Jt7rCkl1rxASy9DEuFdxplbQNGnR3uXYfc1F775D01sgpJ8ga AW5oq+rqwgn032SIW+xsRuF75YeFm1tVATDCsYoZlur3+CkRy/Q0feCTQNyIAZOOf3UZ uDK62QXBBL5P4V1HdxncxFh2gzGQPV2VJdAIkoM8n9rwIW1zC+gYhz1IhD78ZbkiiheO 2x7PS94xMEdw6EpTFjz4OhjATMHUZhcxX7HX2KktHC0ks/8nP8+dCqnFzt1qA/qrD5hX 2xEOI98Ii+fI8nE84daVl6Pd1KmJi/6vGO4AATV1n1VPgJmmCTBmsHqngXevVc9DII8P jrnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494901; x=1740099701; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LS3SgII/6U7/5mkIGtNBNd4qXYAT6zWaOxbAl9i5SRo=; b=ekrRlECweWh8D5/wmpdH7M637Hn4PnGidCGwNKr3snUVZR1t0K2WlljgKHb/A1Hety mYgDEQlAI1qqkEVML6amUrr7OTSJXM5g1F9NOGAzlF5cxj6iXvhc+0YAl11VlROErE19 OWBeivlcPM4c07qOhxM3km4aMebEioGCKZrQrHifPASSqPsHKpnz2iDyaXq+gcJFlqKX 4GeXmmxN0S+tQUdDJQzqOs4v3XZmk55c8WwWcw9zVI55AvTHuEkjS/OtyH1HKXPzswqO Gy5dkLLyUFYx4PdCnm2M5bYs/XCeFBkBWoc80jcNZ6kMhx2mPDAYxN5Usm9yhIhg/cfT Y4GQ== X-Forwarded-Encrypted: i=1; AJvYcCWV5b7VUB61hyP/PUiP+3WG7vGD8vGpV1jLc4fdW6rOun/4Pait7EFwhNAUnKVjzDvAYeL+zk0=@vger.kernel.org X-Gm-Message-State: AOJu0YwNdGp/DtUJf7fwxz1CIqmpVZBTOvE0yRBTDDQsdvEuWB8iI0tL bwat/BopgXbg8bF1sMVC18Eylg/BAY0aPIJhoLxE78pz1jjKKUu4 X-Gm-Gg: ASbGncs46euDmtFC7yI9ysR8nhy8ICZmFoDJ2ZcyjfqcU8IwZoiLypj/olpaCOkoLZq 2PyiNCZuYPftgAR2Zj+WjwdMuF5hzu1q+GbZZBSLObaec9hvXJS2KiETv6YYuoS1wGy/8Y7V43e WN8fqV4oQsdAtAu/W+ZL2xaYlot4MZ5KVgpr1vgOorhOncRwtdJReV5aNEFns6NBX6W/Xc+xrPA NLQIBjiuV77kZ2OtXP1HNnsA3v2+REJ8hL10U3fm4WPRRSKQsVKV8yvtP2jfT1J/xajCOsH2eJe MEMbq44XpduDxHz8r6U2LM0w3W3fQHmlqG5QFz3kXBmEP5uyqeUx0A== X-Google-Smtp-Source: AGHT+IEFbNMCJ9tJN7JZpdtkegqlod6l4NWrg6046wPrniAzlwccv9e7vcGf9aaIMyqkjVJVbhrXPg== X-Received: by 2002:a17:902:e881:b0:220:dff2:18ee with SMTP id d9443c01a7336-220dff21baamr57366275ad.14.1739494901604; Thu, 13 Feb 2025 17:01:41 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:41 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 10/12] bpf: add BPF_SOCK_OPS_TS_SND_CB callback Date: Fri, 14 Feb 2025 09:00:36 +0800 Message-Id: <20250214010038.54131-11-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net This patch introduces a new callback in tcp_tx_timestamp() to correlate tcp_sendmsg timestamp with timestamps from other tx timestamping callbacks (e.g., SND/SW/ACK). Without this patch, BPF program wouldn't know which timestamps belong to which flow because of no socket lock protection. This new callback is inserted in tcp_tx_timestamp() to address this issue because tcp_tx_timestamp() still owns the same socket lock with tcp_sendmsg_locked() in the meanwhile tcp_tx_timestamp() initializes the timestamping related fields for the skb, especially tskey. The tskey is the bridge to do the correlation. For TCP, BPF program hooks the beginning of tcp_sendmsg_locked() and then stores the sendmsg timestamp at the bpf_sk_storage, correlating this timestamp with its tskey that are later used in other sending timestamping callbacks. Signed-off-by: Jason Xing --- include/uapi/linux/bpf.h | 5 +++++ net/ipv4/tcp.c | 4 ++++ tools/include/uapi/linux/bpf.h | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 9355d617767f..86fca729fbd8 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -7052,6 +7052,11 @@ enum { * when SK_BPF_CB_TX_TIMESTAMPING * feature is on. */ + BPF_SOCK_OPS_TS_SND_CB, /* Called when every sendmsg syscall + * is triggered. It's used to correlate + * sendmsg timestamp with corresponding + * tskey. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 12b9c4f9c151..4b9739cd3bc5 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -492,6 +492,10 @@ static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc) if (tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK) shinfo->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1; } + + if (cgroup_bpf_enabled(CGROUP_SOCK_OPS) && + SK_BPF_CB_FLAG_TEST(sk, SK_BPF_CB_TX_TIMESTAMPING) && skb) + bpf_skops_tx_timestamping(sk, skb, BPF_SOCK_OPS_TS_SND_CB); } static bool tcp_stream_is_readable(struct sock *sk, int target) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index d3e2988b3b4c..2739ee0154a0 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -7042,6 +7042,11 @@ enum { * when SK_BPF_CB_TX_TIMESTAMPING * feature is on. */ + BPF_SOCK_OPS_TS_SND_CB, /* Called when every sendmsg syscall + * is triggered. It's used to correlate + * sendmsg timestamp with corresponding + * tskey. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect From patchwork Fri Feb 14 01:00:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974261 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0B3D2D052; Fri, 14 Feb 2025 01:01:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494909; cv=none; b=qGiNmGSAvuJ/LKG8VjPD4XwwbnTRU0qr4hVWLhHSLydO/Q16i0x2yep0294XMRSIRSk3+F8tkQrzumJbX0iHR/q9pTRx36qANMheKsiqByejG1pmD8ZdFH6gpjj+pMNQFuOm85FCmsA2TR3taOlFDGoxwpTtW0cnOcyHZFaqjC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494909; c=relaxed/simple; bh=0tRHgcuwiwPX1DOW4gmLwwqaVyB3BLfzuCpbj6vjQg4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iRt6nTkRnncxKRWQcM0ybDQ0RUrp6MOGRdPhPVK7CMGEqiWwJ4qlmPR8802ItH8RnHRLZGvi7+hxyKb9SuUAm1VgAyh8/pLodxg1JkoHiiZefb58aRh+xnftWMbfeLmWWN0R9O83y1RzK/9dv27R3cdIelvX4GScE+1uM4LZd58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P7ez1te+; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P7ez1te+" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-220c92c857aso23934375ad.0; Thu, 13 Feb 2025 17:01:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494907; x=1740099707; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B4jU+6ZSmakS6zteNg0p1kJWMAaqHIPHqfUuFCQFa8U=; b=P7ez1te+RDn3wprr7BODAzIGeyYRcpSOTESoBNode1TkCY88GdSMO+relOjt9n7JC9 XHp+kvAKgs0svoD2+EB3edOntnk7MN+5Ho/MahXYizqc2Xjpq8n/kTpcAyw+WZ8XHMcd SbgDw/o7w2krjMIRfPLprm9PMFq5cypRypQ1slxlFEnLklwmZhu3RtLQHiUx5uNhD++i A/CnRgUTKLuly8H7+NLbgv4a4dTs7Cs7tT7rv5QJy8i68rIkKBcS3nyBuFl+m5tk5xkj VnnHIG+xqgRa4Auu96MrYx+Iw4Lqau3KkYU9ubDz8RCnaocuJssGCG0tCi+0xxHQN29j NxAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494907; x=1740099707; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B4jU+6ZSmakS6zteNg0p1kJWMAaqHIPHqfUuFCQFa8U=; b=urNHZYd1xfHGEvEapkRE8kgbA2OQVCqNddBeP3+c6u1lvDzmJO7ygL/SecugkYbmb2 I4AzwdZc17tvCx4aUuF5MdpnbsWM93nn7Zq4l6VrUBuf48fXMWoaWJMCy8xVJI+eumrS sePTIiPCG3aP+EDuNwdRh3YGFEL6KQ2HdYf99iKeWkIL80gTvEOI8uMOuvbYM3PYaemS mlNoPFFjAHpOnqFcsCHtgOXH/yCckl2m0ACQA5A/RqG79WkUwxJpKLjxOHaYFWF8yBpO ovLdF7Q5e8sZbbI06cSu4wL8VTVtoewieISjXyjO4KeHA6EshkHJzNKIk85L+6cUwK9j MAwg== X-Forwarded-Encrypted: i=1; AJvYcCXCXRrl3Wg/lyWAm8w/IiVUBnvr/EyKxF/0k8J7b/yPd49wWzbDxe73EkAfBN8NZpVWF71V+kc=@vger.kernel.org X-Gm-Message-State: AOJu0YzVF9Cz7xftoCr56WtTvmyfU7faildf54VKFH638dTF0SHpeGub ykWtYzdpH2ucXD7Z1iGf/sNhlLblTtr1KbnOotLIXbt4EMzZlkrqSd/ccZ/mloM= X-Gm-Gg: ASbGncseEPDRpOstZEb3QaBDZpyA7slUfQwsM04YsftIBvCvDAtPaaBLQd6fxaY1v5+ 4ilxJs+9IGkUxyq/ru7MFxBRvlSnz9u4ar8NONi0IgbxHqmKVvhzVywvGow2Gl3sEUAhshbO74Y /32dsNYTdOZ0qxTPKHmp5A8DrzAItzZJ9AlR1XvRNwnMpCVx5b12oZ+TgZAJSPd69BwnBvgRKx+ B4Msv/v63fCCC/3ew1muuFHZnrLEPifoInAjYxe/JkTOYh070k/eOaRKlNcAJ9/3x/6toJU5Dq0 EqnDnwPWwBAtI7Zh7SOzMIXakjFJHtH8K+ssH3luoycrDeFAgshVug== X-Google-Smtp-Source: AGHT+IGtbXf337tlvnRIkA+MN2in6MRMsplA6IcKu3MyOEC1Z4R2UyGhgG8KCCl4gofq2nSq03SrrQ== X-Received: by 2002:a17:902:ce88:b0:21f:3823:482b with SMTP id d9443c01a7336-220d35e098dmr73238205ad.25.1739494907100; Thu, 13 Feb 2025 17:01:47 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:46 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 11/12] bpf: support selective sampling for bpf timestamping Date: Fri, 14 Feb 2025 09:00:37 +0800 Message-Id: <20250214010038.54131-12-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net Add the bpf_sock_ops_enable_tx_tstamp kfunc to allow BPF programs to selectively enable TX timestamping on a skb during tcp_sendmsg(). For example, BPF program will limit tracking X numbers of packets and then will stop there instead of tracing all the sendmsgs of matched flow all along. It would be helpful for users who cannot afford to calculate latencies from every sendmsg call probably due to the performance or storage space consideration. Signed-off-by: Jason Xing --- kernel/bpf/btf.c | 1 + net/core/filter.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 9433b6467bbe..740210f883dc 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8522,6 +8522,7 @@ static int bpf_prog_type_to_kfunc_hook(enum bpf_prog_type prog_type) case BPF_PROG_TYPE_CGROUP_SOCK_ADDR: case BPF_PROG_TYPE_CGROUP_SOCKOPT: case BPF_PROG_TYPE_CGROUP_SYSCTL: + case BPF_PROG_TYPE_SOCK_OPS: return BTF_KFUNC_HOOK_CGROUP; case BPF_PROG_TYPE_SCHED_ACT: return BTF_KFUNC_HOOK_SCHED_ACT; diff --git a/net/core/filter.c b/net/core/filter.c index 7f56d0bbeb00..3b4c1e7b1470 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -12102,6 +12102,27 @@ __bpf_kfunc int bpf_sk_assign_tcp_reqsk(struct __sk_buff *s, struct sock *sk, #endif } +__bpf_kfunc int bpf_sock_ops_enable_tx_tstamp(struct bpf_sock_ops_kern *skops, + u64 flags) +{ + struct sk_buff *skb; + struct sock *sk; + + if (skops->op != BPF_SOCK_OPS_TS_SND_CB) + return -EOPNOTSUPP; + + if (flags) + return -EINVAL; + + skb = skops->skb; + sk = skops->sk; + skb_shinfo(skb)->tx_flags |= SKBTX_BPF; + TCP_SKB_CB(skb)->txstamp_ack |= TSTAMP_ACK_BPF; + skb_shinfo(skb)->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1; + + return 0; +} + __bpf_kfunc_end_defs(); int bpf_dynptr_from_skb_rdonly(struct __sk_buff *skb, u64 flags, @@ -12135,6 +12156,10 @@ BTF_KFUNCS_START(bpf_kfunc_check_set_tcp_reqsk) BTF_ID_FLAGS(func, bpf_sk_assign_tcp_reqsk, KF_TRUSTED_ARGS) BTF_KFUNCS_END(bpf_kfunc_check_set_tcp_reqsk) +BTF_KFUNCS_START(bpf_kfunc_check_set_sock_ops) +BTF_ID_FLAGS(func, bpf_sock_ops_enable_tx_tstamp, KF_TRUSTED_ARGS) +BTF_KFUNCS_END(bpf_kfunc_check_set_sock_ops) + static const struct btf_kfunc_id_set bpf_kfunc_set_skb = { .owner = THIS_MODULE, .set = &bpf_kfunc_check_set_skb, @@ -12155,6 +12180,11 @@ static const struct btf_kfunc_id_set bpf_kfunc_set_tcp_reqsk = { .set = &bpf_kfunc_check_set_tcp_reqsk, }; +static const struct btf_kfunc_id_set bpf_kfunc_set_sock_ops = { + .owner = THIS_MODULE, + .set = &bpf_kfunc_check_set_sock_ops, +}; + static int __init bpf_kfunc_init(void) { int ret; @@ -12173,7 +12203,8 @@ static int __init bpf_kfunc_init(void) ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_XDP, &bpf_kfunc_set_xdp); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SOCK_ADDR, &bpf_kfunc_set_sock_addr); - return ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &bpf_kfunc_set_tcp_reqsk); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &bpf_kfunc_set_tcp_reqsk); + return ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SOCK_OPS, &bpf_kfunc_set_sock_ops); } late_initcall(bpf_kfunc_init); From patchwork Fri Feb 14 01:00:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13974262 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90A603596D; Fri, 14 Feb 2025 01:01:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494915; cv=none; b=f1rX2OGeslNvNOGGjLVUAi1S9zHyb/XUETl2uXbJBAc3lRMddh/72uZrRzADv9l5kIfDGEfGyp8knQ8l1FlwIiDFNtS5awTI47fU0hbogd9Snj1by9RqE00lXTzmAvWrDZFgeVfQ5CG8CNmUsBq7wf0Bprlp8Kqi5EEa1JylOls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739494915; c=relaxed/simple; bh=8wVc8kQACvuH7dpMqmuA9pYOlwEvpcbGJRrrHijufWM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=L1+KQgpRHBpG8DKG6Nqi/ueqZSNnQ1otGMYVMuFclJZ6MA6DLuSA/dX5YRj12pMDSJIll6uQmTYSPjFd+SKlWUURWfgyPKly6AJpD8ClVe7VrDkXK7Jb0cd0iqndigwoq52bS89gjfvI3pr9b1xvzTmJaFVMTSfbRvO/1jW2Qy8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FGT1kpi/; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FGT1kpi/" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-220e6028214so16620075ad.0; Thu, 13 Feb 2025 17:01:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739494913; x=1740099713; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UI4DNKaq4drIljj+cCqk5+/yFYwlzlF9id7t8XUb57Y=; b=FGT1kpi/7B694/kL7XJrpIfDZvvx8tHsaihDVFz0v6LnaGFa3Zdv1CfoFDkDy08G47 KSBmu67LVQsIKLzpGZthmIYuXhC6Chaxxc6Ngw6kAyT+CxoMrJ/ORvodLgcVBNJ0x0UG 1gqEvSlRjzwdfkmpKrIkLiebkmidcNByQQC9lVhTANqOVq5//B0vrqpWH4rSwiCKXQFt cI++HILY2hGZGIuaZGeWNZ993gDTShm75ZjFbWLCaTpNXGLGBYI65xotuc4sUVmowBlj B27AoFEaXmvPBnVkBXxs7BfmBe5kpDk8D9k/tzgC/T/FAW87rSF+aOsrbJ961BVgbsiV I3+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739494913; x=1740099713; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UI4DNKaq4drIljj+cCqk5+/yFYwlzlF9id7t8XUb57Y=; b=RV6sZ1pLTzFae707o6J4gihqI23dRy9kR5CRR/BeRkrzOOkZouaIeE5C7Sb58PE1IR 6X6Bc6kX4EkKfopNEtMNjvQUZavZY0EBoq17e+0RYUWVB8QuIat6dlkjYma4OvHSh8uC xh1VKhzciJYRVnd/V6pL7+Gcm4c7mV2Ckca1HM1ig1QS4eH9Pb7x/1bcDBoGQeIe1K/3 ChvwdkJ+xl87tF+PskSRHEDZk6Wrn8TXAd3eHpvieOj557b6lHIsd+uLhOOdsMWadZWx qRIR4GTHKypCrBnFIzH4X0p3W2Q6ADBMnNfY+x5TsYzGU40bkyAe7cxfe2IeT5M1mnP0 9CtA== X-Forwarded-Encrypted: i=1; AJvYcCWLxvMYAoEW2SN7suJQa1UDcmVE4L0ox9a9gj55LsXufNprBxpYn6/4BkXCASEJwq/BBDDhTjg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyfgn2T6HKHB5evTKg1YB8OxZDB89QeSE4TiIV/DDdqXI7mXR/Y NCcBHoMyG63sNuf2yfWU+CvCeVNC+QJxUs1OfGqGWPeAendb6P0i X-Gm-Gg: ASbGncvVynmvzFmVqQ9++FrtcsYeHRGsEOS2H6nUf16JrS0T6CVfdsDvxk0G/VPS4He Z5m2/3io//4IkJ+0wloISjRhtCHkBnAyotVYHIulwS4bDfr4QXH+7DoXWyGb5YbZJiTN2TzjH7k TfSb1LjqYuqB096Ve0kJrrSIY8zhdv3qRyALSgTCjioFiHvT8jTazNYPGq786KicrWAFAQQcLoj cHbIUmkQFxFRHnKnn08lLF5hiWaMtT6K0XHbRTlwWo16y2Udhuo6QFfOtDrrQR8ONUtkOjdKa8d q4zIrQyvZbnzCRz5k6aONQyRGqlvoIFcSnNuLToBPx8z+J3ws184/g== X-Google-Smtp-Source: AGHT+IF/Q8gX13l5rclhEopD7zyCpCPmWIBISJk81/YhcZwiFLQGQo0j6p5gSOUBjWfY7VIA7Q34ow== X-Received: by 2002:a17:902:ef09:b0:215:a028:4ed with SMTP id d9443c01a7336-220bdf13ba4mr135620255ad.20.1739494912701; Thu, 13 Feb 2025 17:01:52 -0800 (PST) Received: from KERNELXING-MC1.tencent.com ([111.201.25.167]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d534db68sm18629565ad.39.2025.02.13.17.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 17:01:52 -0800 (PST) From: Jason Xing To: 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, martin.lau@linux.dev, 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 Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH bpf-next v11 12/12] selftests/bpf: add simple bpf tests in the tx path for timestamping feature Date: Fri, 14 Feb 2025 09:00:38 +0800 Message-Id: <20250214010038.54131-13-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250214010038.54131-1-kerneljasonxing@gmail.com> References: <20250214010038.54131-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net BPF program calculates a couple of latency deltas between each tx timestamping callbacks. It can be used in the real world to diagnose the kernel behaviour in the tx path. Check the safety issues by accessing a few bpf calls in bpf_test_access_bpf_calls() which are implemented in the patch 3 and 4. Check if the bpf timestamping can co-exist with socket timestamping. There remains a few realistic things[1][2] to highlight: 1. in general a packet may pass through multiple qdiscs. For instance with bonding or tunnel virtual devices in the egress path. 2. packets may be resent, in which case an ACK might precede a repeat SCHED and SND. 3. erroneous or malicious peers may also just never send an ACK. [1]: https://lore.kernel.org/all/67a389af981b0_14e0832949d@willemb.c.googlers.com.notmuch/ [2]: https://lore.kernel.org/all/c329a0c1-239b-4ca1-91f2-cb30b8dd2f6a@linux.dev/ Signed-off-by: Jason Xing --- .../bpf/prog_tests/net_timestamping.c | 239 +++++++++++++++++ .../selftests/bpf/progs/net_timestamping.c | 248 ++++++++++++++++++ 2 files changed, 487 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/net_timestamping.c create mode 100644 tools/testing/selftests/bpf/progs/net_timestamping.c diff --git a/tools/testing/selftests/bpf/prog_tests/net_timestamping.c b/tools/testing/selftests/bpf/prog_tests/net_timestamping.c new file mode 100644 index 000000000000..dbfd87499b6b --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/net_timestamping.c @@ -0,0 +1,239 @@ +#include +#include +#include +#include "test_progs.h" +#include "network_helpers.h" +#include "net_timestamping.skel.h" + +#define CG_NAME "/net-timestamping-test" +#define NSEC_PER_SEC 1000000000LL + +static const char addr4_str[] = "127.0.0.1"; +static const char addr6_str[] = "::1"; +static struct net_timestamping *skel; +static const int cfg_payload_len = 30; +static struct timespec usr_ts; +static u64 delay_tolerance_nsec = 10000000000; /* 10 seconds */ +int SK_TS_SCHED; +int SK_TS_TXSW; +int SK_TS_ACK; + +static int64_t timespec_to_ns64(struct timespec *ts) +{ + return ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec; +} + +static void validate_key(int tskey, int tstype) +{ + static int expected_tskey = -1; + + if (tstype == SCM_TSTAMP_SCHED) + expected_tskey = cfg_payload_len - 1; + + ASSERT_EQ(expected_tskey, tskey, "tskey mismatch"); + + expected_tskey = tskey; +} + +static void validate_timestamp(struct timespec *cur, struct timespec *prev) +{ + int64_t cur_ns, prev_ns; + + cur_ns = timespec_to_ns64(cur); + prev_ns = timespec_to_ns64(prev); + + ASSERT_LT(cur_ns - prev_ns, delay_tolerance_nsec, "latency"); +} + +static void test_socket_timestamp(struct scm_timestamping *tss, int tstype, + int tskey) +{ + static struct timespec prev_ts; + + validate_key(tskey, tstype); + + switch (tstype) { + case SCM_TSTAMP_SCHED: + validate_timestamp(&tss->ts[0], &usr_ts); + SK_TS_SCHED += 1; + break; + case SCM_TSTAMP_SND: + validate_timestamp(&tss->ts[0], &prev_ts); + SK_TS_TXSW += 1; + break; + case SCM_TSTAMP_ACK: + validate_timestamp(&tss->ts[0], &prev_ts); + SK_TS_ACK += 1; + break; + } + + prev_ts = tss->ts[0]; +} + +static void test_recv_errmsg_cmsg(struct msghdr *msg) +{ + struct sock_extended_err *serr = NULL; + struct scm_timestamping *tss = NULL; + struct cmsghdr *cm; + + for (cm = CMSG_FIRSTHDR(msg); + cm && cm->cmsg_len; + cm = CMSG_NXTHDR(msg, cm)) { + if (cm->cmsg_level == SOL_SOCKET && + cm->cmsg_type == SCM_TIMESTAMPING) { + tss = (void *)CMSG_DATA(cm); + } else if ((cm->cmsg_level == SOL_IP && + cm->cmsg_type == IP_RECVERR) || + (cm->cmsg_level == SOL_IPV6 && + cm->cmsg_type == IPV6_RECVERR) || + (cm->cmsg_level == SOL_PACKET && + cm->cmsg_type == PACKET_TX_TIMESTAMP)) { + serr = (void *)CMSG_DATA(cm); + ASSERT_EQ(serr->ee_origin, SO_EE_ORIGIN_TIMESTAMPING, + "cmsg type"); + } + + if (serr && tss) + test_socket_timestamp(tss, serr->ee_info, + serr->ee_data); + } +} + +static bool socket_recv_errmsg(int fd) +{ + static char ctrl[1024 /* overprovision*/]; + char data[cfg_payload_len]; + static struct msghdr msg; + struct iovec entry; + int n = 0; + + memset(&msg, 0, sizeof(msg)); + memset(&entry, 0, sizeof(entry)); + memset(ctrl, 0, sizeof(ctrl)); + + entry.iov_base = data; + entry.iov_len = cfg_payload_len; + msg.msg_iov = &entry; + msg.msg_iovlen = 1; + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_control = ctrl; + msg.msg_controllen = sizeof(ctrl); + + n = recvmsg(fd, &msg, MSG_ERRQUEUE); + if (n == -1) + ASSERT_EQ(errno, EAGAIN, "recvmsg MSG_ERRQUEUE"); + + if (n >= 0) + test_recv_errmsg_cmsg(&msg); + + return n == -1; +} + +static void test_socket_timestamping(int fd) +{ + while (!socket_recv_errmsg(fd)); + + ASSERT_EQ(SK_TS_SCHED, 1, "SCM_TSTAMP_SCHED"); + ASSERT_EQ(SK_TS_TXSW, 1, "SCM_TSTAMP_SND"); + ASSERT_EQ(SK_TS_ACK, 1, "SCM_TSTAMP_ACK"); + + SK_TS_SCHED = 0; + SK_TS_TXSW = 0; + SK_TS_ACK = 0; +} + +static void test_tcp(int family, bool enable_socket_timestamping) +{ + struct net_timestamping__bss *bss; + char buf[cfg_payload_len]; + int sfd = -1, cfd = -1; + unsigned int sock_opt; + struct netns_obj *ns; + int cg_fd; + int ret; + + cg_fd = test__join_cgroup(CG_NAME); + if (!ASSERT_OK_FD(cg_fd, "join cgroup")) + return; + + ns = netns_new("net_timestamping_ns", true); + if (!ASSERT_OK_PTR(ns, "create ns")) + goto out; + + skel = net_timestamping__open_and_load(); + if (!ASSERT_OK_PTR(skel, "open and load skel")) + goto out; + + if (!ASSERT_OK(net_timestamping__attach(skel), "attach skel")) + goto out; + + skel->links.skops_sockopt = + bpf_program__attach_cgroup(skel->progs.skops_sockopt, cg_fd); + if (!ASSERT_OK_PTR(skel->links.skops_sockopt, "attach cgroup")) + goto out; + + bss = skel->bss; + memset(bss, 0, sizeof(*bss)); + + skel->bss->monitored_pid = getpid(); + + sfd = start_server(family, SOCK_STREAM, + family == AF_INET6 ? addr6_str : addr4_str, 0, 0); + if (!ASSERT_OK_FD(sfd, "start_server")) + goto out; + + cfd = connect_to_fd(sfd, 0); + if (!ASSERT_OK_FD(cfd, "connect_to_fd_server")) + goto out; + + if (enable_socket_timestamping) { + sock_opt = SOF_TIMESTAMPING_SOFTWARE | + SOF_TIMESTAMPING_OPT_ID | + SOF_TIMESTAMPING_TX_SCHED | + SOF_TIMESTAMPING_TX_SOFTWARE | + SOF_TIMESTAMPING_TX_ACK; + ret = setsockopt(cfd, SOL_SOCKET, SO_TIMESTAMPING, + (char *) &sock_opt, sizeof(sock_opt)); + if (!ASSERT_OK(ret, "setsockopt SO_TIMESTAMPING")) + goto out; + + ret = clock_gettime(CLOCK_REALTIME, &usr_ts); + if (!ASSERT_OK(ret, "get user time")) + goto out; + } + + ret = write(cfd, buf, sizeof(buf)); + if (!ASSERT_EQ(ret, sizeof(buf), "send to server")) + goto out; + + if (enable_socket_timestamping) + test_socket_timestamping(cfd); + + ASSERT_EQ(bss->nr_active, 1, "nr_active"); + ASSERT_EQ(bss->nr_snd, 2, "nr_snd"); + ASSERT_EQ(bss->nr_sched, 1, "nr_sched"); + ASSERT_EQ(bss->nr_txsw, 1, "nr_txsw"); + ASSERT_EQ(bss->nr_ack, 1, "nr_ack"); + +out: + if (sfd >= 0) + close(sfd); + if (cfd >= 0) + close(cfd); + net_timestamping__destroy(skel); + netns_free(ns); + close(cg_fd); +} + +void test_net_timestamping(void) +{ + if (test__start_subtest("INET4: bpf timestamping")) + test_tcp(AF_INET, false); + if (test__start_subtest("INET4: bpf and socket timestamping")) + test_tcp(AF_INET, true); + if (test__start_subtest("INET6: bpf timestamping")) + test_tcp(AF_INET6, false); + if (test__start_subtest("INET6: bpf and socket timestamping")) + test_tcp(AF_INET6, true); +} diff --git a/tools/testing/selftests/bpf/progs/net_timestamping.c b/tools/testing/selftests/bpf/progs/net_timestamping.c new file mode 100644 index 000000000000..ab2ed2ea5822 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/net_timestamping.c @@ -0,0 +1,248 @@ +#include "vmlinux.h" +#include "bpf_tracing_net.h" +#include +#include +#include "bpf_misc.h" +#include "bpf_kfuncs.h" +#include + +__u32 monitored_pid = 0; + +int nr_active; +int nr_snd; +int nr_passive; +int nr_sched; +int nr_txsw; +int nr_ack; + +struct sk_stg { + __u64 sendmsg_ns; /* record ts when sendmsg is called */ +}; + +struct sk_tskey { + u64 cookie; + u32 tskey; +}; + +struct delay_info { + u64 sendmsg_ns; /* record ts when sendmsg is called */ + u32 sched_delay; /* SCHED_OPT_CB - sendmsg_ns */ + u32 sw_snd_delay; /* SW_OPT_CB - SCHED_OPT_CB */ + u32 ack_delay; /* ACK_OPT_CB - SW_OPT_CB */ +}; + +struct { + __uint(type, BPF_MAP_TYPE_SK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, struct sk_stg); +} sk_stg_map SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __type(key, struct sk_tskey); + __type(value, struct delay_info); + __uint(max_entries, 1024); +} time_map SEC(".maps"); + +static u64 delay_tolerance_nsec = 10000000000; /* 10 second as an example */ + +extern int bpf_sock_ops_enable_tx_tstamp(struct bpf_sock_ops_kern *skops, u64 flags) __ksym; + +static int bpf_test_sockopt(void *ctx, const struct sock *sk, int expected) +{ + int tmp, new = SK_BPF_CB_TX_TIMESTAMPING; + int opt = SK_BPF_CB_FLAGS; + int level = SOL_SOCKET; + + if (bpf_setsockopt(ctx, level, opt, &new, sizeof(new)) != expected) + return 1; + + if (bpf_getsockopt(ctx, level, opt, &tmp, sizeof(tmp)) != expected || + (!expected && tmp != new)) + return 1; + + return 0; +} + +static bool bpf_test_access_sockopt(void *ctx, const struct sock *sk) +{ + if (bpf_test_sockopt(ctx, sk, -EOPNOTSUPP)) + return true; + return false; +} + +static bool bpf_test_access_load_hdr_opt(struct bpf_sock_ops *skops) +{ + u8 opt[3] = {0}; + int load_flags = 0; + int ret; + + ret = bpf_load_hdr_opt(skops, opt, sizeof(opt), load_flags); + if (ret != -EOPNOTSUPP) + return true; + + return false; +} + +static bool bpf_test_access_cb_flags_set(struct bpf_sock_ops *skops) +{ + int ret; + + ret = bpf_sock_ops_cb_flags_set(skops, 0); + if (ret != -EOPNOTSUPP) + return true; + + return false; +} + +/* In the timestamping callbacks, we're not allowed to call the following + * BPF CALLs for the safety concern. Return false if expected. + */ +static bool bpf_test_access_bpf_calls(struct bpf_sock_ops *skops, + const struct sock *sk) +{ + if (bpf_test_access_sockopt(skops, sk)) + return true; + + if (bpf_test_access_load_hdr_opt(skops)) + return true; + + if (bpf_test_access_cb_flags_set(skops)) + return true; + + return false; +} + +static bool bpf_test_delay(struct bpf_sock_ops *skops, const struct sock *sk) +{ + struct bpf_sock_ops_kern *skops_kern; + u64 timestamp = bpf_ktime_get_ns(); + struct skb_shared_info *shinfo; + struct delay_info dinfo = {0}; + struct sk_tskey key = {0}; + struct delay_info *val; + struct sk_buff *skb; + struct sk_stg *stg; + u64 prior_ts, delay; + + if (bpf_test_access_bpf_calls(skops, sk)) + return false; + + skops_kern = bpf_cast_to_kern_ctx(skops); + skb = skops_kern->skb; + shinfo = bpf_core_cast(skb->head + skb->end, struct skb_shared_info); + + key.cookie = bpf_get_socket_cookie(skops); + if (!key.cookie) + return false; + + if (skops->op == BPF_SOCK_OPS_TS_SND_CB) { + stg = bpf_sk_storage_get(&sk_stg_map, (void *)sk, 0, 0); + if (!stg) + return false; + dinfo.sendmsg_ns = stg->sendmsg_ns; + bpf_sock_ops_enable_tx_tstamp(skops_kern, 0); + key.tskey = shinfo->tskey; + if (!key.tskey) + return false; + bpf_map_update_elem(&time_map, &key, &dinfo, BPF_ANY); + return true; + } + + key.tskey = shinfo->tskey; + if (!key.tskey) + return false; + + val = bpf_map_lookup_elem(&time_map, &key); + if (!val) + return false; + + switch (skops->op) { + case BPF_SOCK_OPS_TS_SCHED_OPT_CB: + val->sched_delay = timestamp - val->sendmsg_ns; + delay = val->sched_delay; + break; + case BPF_SOCK_OPS_TS_SW_OPT_CB: + prior_ts = val->sched_delay + val->sendmsg_ns; + val->sw_snd_delay = timestamp - prior_ts; + delay = val->sw_snd_delay; + break; + case BPF_SOCK_OPS_TS_ACK_OPT_CB: + prior_ts = val->sw_snd_delay + val->sched_delay + val->sendmsg_ns; + val->ack_delay = timestamp - prior_ts; + delay = val->ack_delay; + break; + } + + if (delay >= delay_tolerance_nsec) + return false; + + /* Since it's the last one, remove from the map after latency check */ + if (skops->op == BPF_SOCK_OPS_TS_ACK_OPT_CB) + bpf_map_delete_elem(&time_map, &key); + + return true; +} + +SEC("fentry/tcp_sendmsg_locked") +int BPF_PROG(trace_tcp_sendmsg_locked, struct sock *sk, struct msghdr *msg, + size_t size) +{ + __u32 pid = bpf_get_current_pid_tgid() >> 32; + u64 timestamp = bpf_ktime_get_ns(); + u32 flag = sk->sk_bpf_cb_flags; + struct sk_stg *stg; + + if (pid != monitored_pid || !flag) + return 0; + + stg = bpf_sk_storage_get(&sk_stg_map, sk, 0, + BPF_SK_STORAGE_GET_F_CREATE); + if (!stg) + return 0; + + stg->sendmsg_ns = timestamp; + nr_snd += 1; + return 0; +} + +SEC("sockops") +int skops_sockopt(struct bpf_sock_ops *skops) +{ + struct bpf_sock *bpf_sk = skops->sk; + const struct sock *sk; + + if (!bpf_sk) + return 1; + + sk = (struct sock *)bpf_skc_to_tcp_sock(bpf_sk); + if (!sk) + return 1; + + switch (skops->op) { + case BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB: + nr_active += !bpf_test_sockopt(skops, sk, 0); + break; + case BPF_SOCK_OPS_TS_SND_CB: + if (bpf_test_delay(skops, sk)) + nr_snd += 1; + break; + case BPF_SOCK_OPS_TS_SCHED_OPT_CB: + if (bpf_test_delay(skops, sk)) + nr_sched += 1; + break; + case BPF_SOCK_OPS_TS_SW_OPT_CB: + if (bpf_test_delay(skops, sk)) + nr_txsw += 1; + break; + case BPF_SOCK_OPS_TS_ACK_OPT_CB: + if (bpf_test_delay(skops, sk)) + nr_ack += 1; + break; + } + + return 1; +} + +char _license[] SEC("license") = "GPL";