From patchwork Tue Jun 11 20:11:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Zhai X-Patchwork-Id: 13694189 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.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 CDA07152533 for ; Tue, 11 Jun 2024 20:11:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136690; cv=none; b=ggevW1/nFzkH9Q2Rtpo6oK7v+naGU2XwB524DSYgjJelzEIn9J6vn5L3CLxiEYjHX/YSS0K2n+6/z6GtZnQroYo4IVYpg+RGTBfSHY5sIPUgcv5gZmObJqm1lg85F0krj2+OB8TVlhtYvszD2lEKlikhemClkuLhmZQq5bgbmIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136690; c=relaxed/simple; bh=hhH8GnZMFKtdtvPLm83V032mx4PN8otdUOGCLKtSSSI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=lwEexqVdycXCx/zAZTOimEpfdz7BT99AS/MG7vvzbwOtmXzlT7NMad4Th8VfSLYUEG+RAaxySZ0pgFsdxW1+N4OiJ1ZOIZU9pFKm9Yvo3GT9oHnEJRGiS09yyIv927ySTSRGJPPxNsP7/29hVaU67ruPkCae2CvSg8k5FqvGOys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=XeXz8YVw; arc=none smtp.client-ip=209.85.222.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="XeXz8YVw" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-797f2d8b408so15154785a.1 for ; Tue, 11 Jun 2024 13:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136688; x=1718741488; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=NI1bBF93UkH74xgerslgPDj8Tvu8cKRQYZFS9ZEoK6U=; b=XeXz8YVwwNsm4V9N2OydCvUdaTUWhiv+1HCm8ewAW8N5uPnZCOcNTgzLBCqWrccEN6 lV1TAKct/USCsYd0VIY6q/h+Dl6wZ7yCOZNXN/KC8Y1549cbKiThQWimsVssXxdEWFDO 6fvy77lAm7mkhoF8bTNSkVUw9LCV3hkccy+0tuSOybL3dLEJAuPcQygfbr+YaMezSbZl uxeUku5Ub8kcNq8s2DbIsSY71IuxcjtS0rkqI86uNJ5DO04OfTRa+mO3sPJgR4lSkTPo 6O+OKJ8xtKCs+RxZ/5YDsVSxDdfs8ZQL5crNdVX/9Q077OLf3oZOzrjKisKoFzLs6Nae EDtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136688; x=1718741488; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NI1bBF93UkH74xgerslgPDj8Tvu8cKRQYZFS9ZEoK6U=; b=K6bJk7fms52Vio6SxOx8HcWEPKU2IGvYdLDznXtjUX7fn316VY3pNu6rmzxb04Hlop nKanc3ctTOQ8znyAhLzL7Y0BrjKkM3oSSF+965U8e08ONX/4SsgChLou+xQNtKC2VPjd iBaUwMpFpbO/jE9haSrHFq/RMaaos/+Z/Usb2qQL1ztJD8NCJ/6tiSD8qmDsI5em65H3 wet+X48dfFBvUP0TqFSe3qXC/MY5Sgm0XE4id1sAEbfae8rbZ05/insAY7mQbTPaKA9l tZvqHr/z5/XOKniXM0R6tt4CJGJ0r7buxR8Ij5j2FKL2jYb7WDNiQhngqf0Mb9gwPV1H DAqA== X-Forwarded-Encrypted: i=1; AJvYcCXuYzdW/xCtkRu4rmdeZ/HokzOfaTWbami5GCYUYP4wZcAXGwQtObyZQRg/WMZf7byuMecRrohSaWN4HxKh4Dh/aeM+Y567AAKBbIrovkPCDhok X-Gm-Message-State: AOJu0Yy0Os/tGsZLYJ0/N2SVs77WytIjTE7W/8aazB00k01HpbsAe/um yxc/N6HB0S1yvW9XpCz3wWHXmMzbRyq+9hGCWJTWBjYBMamVnbJ8di12tOWX4cc= X-Google-Smtp-Source: AGHT+IHiCzXvs8wyuKiOi6CTgYFKRuCBKiteO6ebBtGe09HeJsKeBaIOxV5PinkxLBs8LosS3k2Uhw== X-Received: by 2002:a05:620a:2685:b0:796:a392:a2c5 with SMTP id af79cd13be357-796a392a48fmr691845885a.53.1718136687680; Tue, 11 Jun 2024 13:11:27 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7955de5594dsm268565785a.54.2024.06.11.13.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:26 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11:24 -0700 From: Yan Zhai To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , Abhishek Chauhan , Mina Almasry , Florian Westphal , Alexander Lobakin , David Howells , Jiri Pirko , Daniel Borkmann , Sebastian Andrzej Siewior , Lorenzo Bianconi , Pavel Begunkov , linux-kernel@vger.kernel.org, kernel-team@cloudflare.com, Jesper Dangaard Brouer , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Neil Horman , linux-trace-kernel@vger.kernel.org, Dan Carpenter Subject: [PATCH v4 net-next 1/7] net: add rx_sk to trace_kfree_skb Message-ID: References: Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: skb does not include enough information to find out receiving sockets/services and netns/containers on packet drops. In theory skb->dev tells about netns, but it can get cleared/reused, e.g. by TCP stack for OOO packet lookup. Similarly, skb->sk often identifies a local sender, and tells nothing about a receiver. Allow passing an extra receiving socket to the tracepoint to improve the visibility on receiving drops. Signed-off-by: Yan Zhai --- v3->v4: adjusted the TP_STRUCT field order to be consistent v2->v3: fixed drop_monitor function prototype --- include/trace/events/skb.h | 11 +++++++---- net/core/dev.c | 2 +- net/core/drop_monitor.c | 9 ++++++--- net/core/skbuff.c | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index 07e0715628ec..3e9ea1cca6f2 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h @@ -24,13 +24,14 @@ DEFINE_DROP_REASON(FN, FN) TRACE_EVENT(kfree_skb, TP_PROTO(struct sk_buff *skb, void *location, - enum skb_drop_reason reason), + enum skb_drop_reason reason, struct sock *rx_sk), - TP_ARGS(skb, location, reason), + TP_ARGS(skb, location, reason, rx_sk), TP_STRUCT__entry( __field(void *, skbaddr) __field(void *, location) + __field(void *, rx_skaddr) __field(unsigned short, protocol) __field(enum skb_drop_reason, reason) ), @@ -38,12 +39,14 @@ TRACE_EVENT(kfree_skb, TP_fast_assign( __entry->skbaddr = skb; __entry->location = location; + __entry->rx_skaddr = rx_sk; __entry->protocol = ntohs(skb->protocol); __entry->reason = reason; ), - TP_printk("skbaddr=%p protocol=%u location=%pS reason: %s", - __entry->skbaddr, __entry->protocol, __entry->location, + TP_printk("skbaddr=%p rx_skaddr=%p protocol=%u location=%pS reason: %s", + __entry->skbaddr, __entry->rx_skaddr, __entry->protocol, + __entry->location, __print_symbolic(__entry->reason, DEFINE_DROP_REASON(FN, FNe))) ); diff --git a/net/core/dev.c b/net/core/dev.c index 85fe8138f3e4..7844227ecbfd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5233,7 +5233,7 @@ static __latent_entropy void net_tx_action(struct softirq_action *h) trace_consume_skb(skb, net_tx_action); else trace_kfree_skb(skb, net_tx_action, - get_kfree_skb_cb(skb)->reason); + get_kfree_skb_cb(skb)->reason, NULL); if (skb->fclone != SKB_FCLONE_UNAVAILABLE) __kfree_skb(skb); diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 430ed18f8584..2e0ae3328232 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -109,7 +109,8 @@ static u32 net_dm_queue_len = 1000; struct net_dm_alert_ops { void (*kfree_skb_probe)(void *ignore, struct sk_buff *skb, void *location, - enum skb_drop_reason reason); + enum skb_drop_reason reason, + struct sock *rx_sk); void (*napi_poll_probe)(void *ignore, struct napi_struct *napi, int work, int budget); void (*work_item_func)(struct work_struct *work); @@ -264,7 +265,8 @@ static void trace_drop_common(struct sk_buff *skb, void *location) static void trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, void *location, - enum skb_drop_reason reason) + enum skb_drop_reason reason, + struct sock *rx_sk) { trace_drop_common(skb, location); } @@ -491,7 +493,8 @@ static const struct net_dm_alert_ops net_dm_alert_summary_ops = { static void net_dm_packet_trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, void *location, - enum skb_drop_reason reason) + enum skb_drop_reason reason, + struct sock *rx_sk) { ktime_t tstamp = ktime_get_real(); struct per_cpu_dm_data *data; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 466999a7515e..2854afdd713f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1203,7 +1203,7 @@ bool __kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason) if (reason == SKB_CONSUMED) trace_consume_skb(skb, __builtin_return_address(0)); else - trace_kfree_skb(skb, __builtin_return_address(0), reason); + trace_kfree_skb(skb, __builtin_return_address(0), reason, NULL); return true; }