Peilin Ye 024ee930cb bpf: Fix dev's rx stats for bpf_redirect_peer traffic ... Traffic redirected by bpf_redirect_peer() (used by recent CNIs like Cilium) is not accounted for in the RX stats of supported devices (that is, veth and netkit), confusing user space metrics collectors such as cAdvisor [0], as reported by Youlun. Fix it by calling dev_sw_netstats_rx_add() in skb_do_redirect(), to update RX traffic counters. Devices that support ndo_get_peer_dev _must_ use the @tstats per-CPU counters (instead of @lstats, or @dstats). To make this more fool-proof, error out when ndo_get_peer_dev is set but @tstats are not selected. [0] Specifically, the "container_network_receive_{byte,packet}s_total" counters are affected. Fixes: 9aa1206e8f ("bpf: Add redirect_peer helper") Reported-by: Youlun Zhang <zhangyoulun@bytedance.com> Signed-off-by: Peilin Ye <peilin.ye@bytedance.com> Co-developed-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org> Link: https://lore.kernel.org/r/20231114004220.6495-6-daniel@iogearbox.net Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>		2023-11-20 10:15:16 -08:00
..
6lowpan
9p	9p/net: fix possible memory leak in p9_check_errors()	2023-10-27 12:44:13 +09:00
802	net: fill in MODULE_DESCRIPTION()s under net/802*	2023-10-28 11:29:28 +01:00
8021q	net: fill in MODULE_DESCRIPTION()s under net/802*	2023-10-28 11:29:28 +01:00
appletalk	appletalk: remove special handling code for ipddp	2023-10-13 17:59:32 -07:00
atm	net: atm: Remove redundant check.	2023-10-23 08:45:25 +01:00
ax25	net: implement lockless SO_PRIORITY	2023-10-01 19:09:54 +01:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-24 10:51:39 -07:00
bluetooth	This update includes the following changes:	2023-11-02 16:15:30 -10:00
bpf	bpf: Add __bpf_kfunc_{start,end}_defs macros	2023-11-01 22:33:53 -07:00
bpfilter
bridge	netfilter: nf_conntrack_bridge: initialize err to 0	2023-11-14 16:16:21 +01:00
caif
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-10-12 17:07:34 -07:00
ceph	This update includes the following changes:	2023-11-02 16:15:30 -10:00
core	bpf: Fix dev's rx stats for bpf_redirect_peer traffic	2023-11-20 10:15:16 -08:00
dcb
dccp	dccp/tcp: Call security_inet_conn_request() after setting IPv6 addresses.	2023-11-02 12:56:03 +01:00
devlink	netlink: specs: devlink: add forgotten port function caps enum values	2023-11-01 22:13:43 -07:00
dns_resolver
dsa	net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT	2023-10-24 13:08:14 -07:00
ethernet
ethtool	ethtool: untangle the linkmode and ethtool headers	2023-10-20 12:47:33 +01:00
handshake	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-10-26 13:46:28 -07:00
hsr	hsr: Prevent use after free in prp_create_tagged_frame()	2023-11-01 22:26:04 -07:00
ieee802154	sysctl-6.6-rc1	2023-08-29 17:39:15 -07:00
ife
ipv4	net: set SOCK_RCU_FREE before inserting socket into hashtable	2023-11-10 08:37:09 +00:00
ipv6	Including fixes from netfilter and bpf.	2023-11-09 17:09:35 -08:00
iucv	s390: use control register bit defines	2023-09-19 13:26:57 +02:00
kcm	net: kcm: fill in MODULE_DESCRIPTION()	2023-11-08 18:17:44 -08:00
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-18 12:44:56 -07:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-10-05 13:16:47 -07:00
l3mdev
lapb
llc	llc: verify mac len before reading mac header	2023-11-01 22:21:32 -07:00
mac80211	wireless-next patches for v6.7	2023-10-26 20:27:58 -07:00
mac802154
mctp	mctp: perform route lookups under a RCU read-side lock	2023-10-10 19:43:22 -07:00
mpls	networking: Update to register_net_sysctl_sz	2023-08-15 15:26:18 -07:00
mptcp	mptcp: fix setsockopt(IP_TOS) subflow locking	2023-11-14 20:10:20 -08:00
ncsi	Revert ncsi: Propagate carrier gain/loss events to the NCSI controller	2023-11-15 09:59:44 +00:00
netfilter	netfilter: nf_tables: split async and sync catchall in two functions	2023-11-14 16:16:21 +01:00
netlabel
netlink	netlink: fill in missing MODULE_DESCRIPTION()	2023-11-03 11:42:48 +00:00
netrom	net: implement lockless SO_PRIORITY	2023-10-01 19:09:54 +01:00
nfc	nfc: nci: fix possible NULL pointer dereference in send_acknowledge()	2023-10-16 17:34:53 -07:00
nsh
openvswitch	net/sched: act_ct: Always fill offloading tuple iifidx	2023-11-08 17:47:08 -08:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-10-12 17:07:34 -07:00
phonet
psample
qrtr
rds	net: prevent address rewrite in kernel_bind()	2023-10-01 19:31:29 +01:00
rfkill	net: rfkill: reduce data->mtx scope in rfkill_fop_open	2023-10-11 16:55:10 +02:00
rose	net: implement lockless SO_PRIORITY	2023-10-01 19:09:54 +01:00
rxrpc	rxrpc: Defer the response to a PING ACK until we've parsed it	2023-11-17 02:50:33 +00:00
sched	net: sched: do not offload flows with a helper in act_ct	2023-11-16 10:10:51 +01:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-10-05 13:16:47 -07:00
smc	net/smc: put sk reference if close work was canceled	2023-11-06 10:01:07 +00:00
strparser
sunrpc	NFS client updates for Linux 6.7	2023-11-08 13:39:16 -08:00
switchdev
tipc	tipc: Fix kernel-infoleak due to uninitialized TLV value	2023-11-13 11:05:47 +00:00
tls	tls: don't reset prot->aad_size and prot->tail_size for TLS_HW	2023-10-23 10:15:09 -07:00
unix	af_unix: fix use-after-free in unix_stream_read_actor()	2023-11-14 10:51:13 +01:00
vmw_vsock	virtio/vsock: Fix uninit-value in virtio_transport_recv_pkt()	2023-11-07 18:56:06 -08:00
wireless	wireless-next patches for v6.7	2023-10-26 20:27:58 -07:00
x25	net: implement lockless SO_PRIORITY	2023-10-01 19:09:54 +01:00
xdp	xsk: Avoid starving the xsk further down the list	2023-10-24 11:55:36 +02:00
xfrm	Including fixes from netfilter and bpf.	2023-11-09 17:09:35 -08:00
compat.c
devres.c
Kconfig	net: add skb_segment kunit test	2023-10-11 10:39:01 +01:00
Kconfig.debug
Makefile
socket.c	bpf: Add __bpf_hook_{start,end} macros	2023-11-01 22:33:53 -07:00
sysctl_net.c	sysctl: Add size to register_net_sysctl function	2023-08-15 15:26:17 -07:00