Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Dongli Zhang <dongli.zhang@oracle.com>
To:     netdev@vger.kernel.org, bpf@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
        rostedt@goodmis.org, mingo@redhat.com, ast@kernel.org,
        daniel@iogearbox.net, andrii@kernel.org, imagedong@tencent.com,
        joao.m.martins@oracle.com, joe.jin@oracle.com, dsahern@gmail.com,
        edumazet@google.com
Subject: [PATCH 1/2] net: tap: track dropped skb via kfree_skb_reason()
Date:   Mon,  7 Feb 2022 19:55:09 -0800
Message-Id: <20220208035510.1200-2-dongli.zhang@oracle.com>
In-Reply-To: <20220208035510.1200-1-dongli.zhang@oracle.com>
References: <20220208035510.1200-1-dongli.zhang@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BjqBzQcEYdVQVlvAEY3CKCnlPsZoTSeb+qGPmEjxdnf5PUD2ZC5bBQ4oUEFD?=
 =?us-ascii?Q?N2HFeapbe8rbMOqWipIy39aqPqfB42ySdBcLBGoCV2tclLXvTeMW+qsedIdV?=
 =?us-ascii?Q?PZKHQZzA3WDExswWVOKYe7QlaqnYquqNxaNpcazX9AMFdUlRxrROcXvm9hYB?=
 =?us-ascii?Q?g3mL0j7ymcEy2TTrgM1hNL8tMDas/7BlfOIHfL9nKp9i+TFi+pSRTbJiptqo?=
 =?us-ascii?Q?tnJDEsKNru/14iDGcYoAbrTQQCoNwTE+cJVd68kr3bVyQjFTB1y820ht9gtl?=
 =?us-ascii?Q?5SYbRFeZxgND6oeZBjx8DiFeVt61ZJGUseR8zaznVMagz/DoaDUbt4CVJ1Gj?=
 =?us-ascii?Q?RMJpvglVXVEdNM3ewF1dCa0IYZcd14zNTXBkNENDmtkAsghWVVvrLBLub4xl?=
 =?us-ascii?Q?lZuJXgaV3yV9nW000R3A8Omwm+4jFdHOx49mzEdavySZPa2H7oXguv7NQ9Dx?=
 =?us-ascii?Q?wcF9p0JJsUQhSQ43JpQ357qgdyoUr1ySqNiPEvGaYiaQep/Kxuj2k1Ktysi0?=
 =?us-ascii?Q?LnQl3nGVDO2wofqFLXKIVBJJdDtcJ4L5p1q2DBX5yU38KIbWBiAx+JBeHqmn?=
 =?us-ascii?Q?FTK8HZKgjnjrmeIyRDQZKZM7yyp6AcdkSWTZhJqKIUmtHL27IlflMC/3sXjC?=
 =?us-ascii?Q?XvXjrm/3wL8cmg5eEDBkp/5tee7fWknGjyjv25Szpd0T22G3Cbj1VTEOosf1?=
 =?us-ascii?Q?NhLVDr+L2LhgaXpYKi++MTspziWJQFo/WYWsS4tjGN7be5puy+tKQNaSRa4z?=
 =?us-ascii?Q?WNPSaUwJNcG/0yUuVztkraNrWAtTeJW2YqCikSNNMhezd0dd/9ntwDhsZB5S?=
 =?us-ascii?Q?qAAuVm4YVMnoqlltJIjHpKU0O/1AyqsRjn0wHw3W226NbBnR7+C9UvHjHVS3?=
 =?us-ascii?Q?DKxvcvN2u4eiiP4wlXLBhSwule98k7JJwu7t3xw+ZZ6ZGo+pbYUQ+lEGc9BI?=
 =?us-ascii?Q?ThQAqL9jL4R+veUeezvs1IsafDA+/iOqTDHC1/vTDMscijYCHSVPNiQMc59d?=
 =?us-ascii?Q?9bKhaM5rdk1qJlswXmGsakpKMW8e0/VsEGQ4uDEj9EK0M8EPqZrQUghi+l0X?=
 =?us-ascii?Q?12EOdz3JUfbP7YqAcLEoHYdcs13YP3gZauIzf/Pd8lb/m/4ROpZlWaW4OLeH?=
 =?us-ascii?Q?Up5J92kle2y7vPEflht4zs5qeDjET1gz4Zo94geWZk48Df3F33pCFpu+5CzE?=
 =?us-ascii?Q?UkBnyl3jbHMrS0WPZGcjWKcnOmJDNRq7dB+zRhhSm3KKmC3cPQq7ZSPGS55w?=
 =?us-ascii?Q?RGtKMVVr/QdvSuVB9DVb51ZSdjGruFTN9PWVfiT/XFc32QWYnXhYZk1GT5xZ?=
 =?us-ascii?Q?aXwvcZJS2Yheg88TXkMWZxuodw5J1QONAAsdFCufsLsjNBDUK5kkNKI6x2YH?=
 =?us-ascii?Q?7VkDpeOZcG6Od4kWE0s284vB7I7/EadsRiWYDX2q5ZS2H+X8BYpjpZNoybh0?=
 =?us-ascii?Q?wnYe9at7+dmSprFy24rDIKbYzqtQm3ywZBeze0umqvmBtOdIoKeJw2ov4+IP?=
 =?us-ascii?Q?8hStGUCFDnjrUGuxtFYDbjcltxEG5v5pEVqwI+gYFcEO2uE2puOlXk2a1Su/?=
 =?us-ascii?Q?xduQMgGRTg1S5ONaOyZiwMC3Kot9cFxUfq6wanB7GuhEmdGRSAPMLBDMUO1r?=
 =?us-ascii?Q?cnD5PMhYQ8IkaYY5itUEVLc=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 71018ff7-9931-44cf-562e-08d9eab6db5b
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2663.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 03:55:33.7279
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /d0quLaGOYCqSFuyMXa2ATJkdKIQmmvnVNRrxTI9lSZdVyP/yr9hbYmnrlfzEOicmA2LXd/vD4dlkAXm70z0dg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR10MB1352
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10251 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 bulkscore=0
 phishscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202080019
X-Proofpoint-GUID: 9ut66aZSMiMZd6sg0Pu2kreK320tH9zK
X-Proofpoint-ORIG-GUID: 9ut66aZSMiMZd6sg0Pu2kreK320tH9zK
X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS,
	T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The TAP can be used as vhost-net backend. E.g., the tap_handle_frame() is
the interface to forward the skb from TAP to vhost-net/virtio-net.

However, there are many "goto drop" in the TAP driver. Therefore, the
kfree_skb_reason() is involved at each "goto drop" to help userspace
ftrace/ebpf to track the reason for the loss of packets

Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Joe Jin <joe.jin@oracle.com>
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
---
 drivers/net/tap.c          | 30 ++++++++++++++++++++++--------
 include/linux/skbuff.h     |  5 +++++
 include/trace/events/skb.h |  5 +++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 8e3a28ba6b28..232572289e63 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -322,6 +322,7 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb)
 	struct tap_dev *tap;
 	struct tap_queue *q;
 	netdev_features_t features = TAP_FEATURES;
+	int drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;
 
 	tap = tap_dev_get_rcu(dev);
 	if (!tap)
@@ -343,12 +344,16 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb)
 		struct sk_buff *segs = __skb_gso_segment(skb, features, false);
 		struct sk_buff *next;
 
-		if (IS_ERR(segs))
+		if (IS_ERR(segs)) {
+			drop_reason = SKB_DROP_REASON_SKB_GSO_SEGMENT;
 			goto drop;
+		}
 
 		if (!segs) {
-			if (ptr_ring_produce(&q->ring, skb))
+			if (ptr_ring_produce(&q->ring, skb)) {
+				drop_reason = SKB_DROP_REASON_PTR_FULL;
 				goto drop;
+			}
 			goto wake_up;
 		}
 
@@ -369,10 +374,14 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb)
 		 */
 		if (skb->ip_summed == CHECKSUM_PARTIAL &&
 		    !(features & NETIF_F_CSUM_MASK) &&
-		    skb_checksum_help(skb))
+		    skb_checksum_help(skb)) {
+			drop_reason = SKB_DROP_REASON_SKB_CHECKSUM;
 			goto drop;
-		if (ptr_ring_produce(&q->ring, skb))
+		}
+		if (ptr_ring_produce(&q->ring, skb)) {
+			drop_reason = SKB_DROP_REASON_PTR_FULL;
 			goto drop;
+		}
 	}
 
 wake_up:
@@ -383,7 +392,7 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb)
 	/* Count errors/drops only here, thus don't care about args. */
 	if (tap->count_rx_dropped)
 		tap->count_rx_dropped(tap);
-	kfree_skb(skb);
+	kfree_skb_reason(skb, drop_reason);
 	return RX_HANDLER_CONSUMED;
 }
 EXPORT_SYMBOL_GPL(tap_handle_frame);
@@ -632,6 +641,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
 	int depth;
 	bool zerocopy = false;
 	size_t linear;
+	int drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;
 
 	if (q->flags & IFF_VNET_HDR) {
 		vnet_hdr_len = READ_ONCE(q->vnet_hdr_sz);
@@ -696,8 +706,10 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
 	else
 		err = skb_copy_datagram_from_iter(skb, 0, from, len);
 
-	if (err)
+	if (err) {
+		drop_reason = SKB_DROP_REASON_SKB_COPY_DATA;
 		goto err_kfree;
+	}
 
 	skb_set_network_header(skb, ETH_HLEN);
 	skb_reset_mac_header(skb);
@@ -706,8 +718,10 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
 	if (vnet_hdr_len) {
 		err = virtio_net_hdr_to_skb(skb, &vnet_hdr,
 					    tap_is_little_endian(q));
-		if (err)
+		if (err) {
+			drop_reason = SKB_DROP_REASON_VIRTNET_HDR;
 			goto err_kfree;
+		}
 	}
 
 	skb_probe_transport_header(skb);
@@ -738,7 +752,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
 	return total_len;
 
 err_kfree:
-	kfree_skb(skb);
+	kfree_skb_reason(skb, drop_reason);
 
 err:
 	rcu_read_lock();
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 8a636e678902..16c30d2e20dc 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -320,6 +320,11 @@ enum skb_drop_reason {
 	SKB_DROP_REASON_TCP_CSUM,
 	SKB_DROP_REASON_SOCKET_FILTER,
 	SKB_DROP_REASON_UDP_CSUM,
+	SKB_DROP_REASON_SKB_GSO_SEGMENT,
+	SKB_DROP_REASON_SKB_CHECKSUM,
+	SKB_DROP_REASON_SKB_COPY_DATA,
+	SKB_DROP_REASON_PTR_FULL,
+	SKB_DROP_REASON_VIRTNET_HDR,
 	SKB_DROP_REASON_MAX,
 };
 
diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index a8a64b97504d..bf1509c31cea 100644
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -16,6 +16,11 @@
 	EM(SKB_DROP_REASON_TCP_CSUM, TCP_CSUM)			\
 	EM(SKB_DROP_REASON_SOCKET_FILTER, SOCKET_FILTER)	\
 	EM(SKB_DROP_REASON_UDP_CSUM, UDP_CSUM)			\
+	EM(SKB_DROP_REASON_SKB_GSO_SEGMENT, SKB_GSO_SEGMENT)	\
+	EM(SKB_DROP_REASON_SKB_CHECKSUM, SKB_CHECKSUM)		\
+	EM(SKB_DROP_REASON_SKB_COPY_DATA, SKB_COPY_DATA)	\
+	EM(SKB_DROP_REASON_PTR_FULL, PTR_FULL)			\
+	EM(SKB_DROP_REASON_VIRTNET_HDR, VIRTNET_HDR)		\
 	EMe(SKB_DROP_REASON_MAX, MAX)
 
 #undef EM
-- 
2.17.1