From patchwork Fri Jul 7 04:39:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Babrou X-Patchwork-Id: 116950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3022850vqx; Thu, 6 Jul 2023 21:53:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlGIEk2noUt1T1r5SxOBmd0Nj2SdJNGkTf9L0mGZMvuB1axjrDBPhlXxVWKo0ah2ahzOA5ZX X-Received: by 2002:a05:6a00:c83:b0:680:fa5f:4ed6 with SMTP id a3-20020a056a000c8300b00680fa5f4ed6mr3841981pfv.27.1688705612039; Thu, 06 Jul 2023 21:53:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688705612; cv=none; d=google.com; s=arc-20160816; b=l3oLuDovd7znjMDV4N6fjjACfRUQ5Zo+lFH1TPN+Ozvf2JDwUDIBJX3aiwY5w0LCSk VQVClgYbVE8VcodrI72fN+QNyp/b0tiA4DAf3ScpJK7sr3tJeyRg5A9Jf961kkADgGrp 1Swqnls0uffZcM6bCMr5JZP7MOxZVcdknyulJEswjfwF4uHLDzzbEF+bJb1idVXyv15H 2H529f5hhO/GlNS5zSAfJE/A9RDv/XUgiQVF7XBnUAwxuhA+U0AjmkEaAx/8/9j8wmEU 3iozf/Qlm6XVYlr0oDwgDrlbmp+S+l3FQ/qBFXfDemXIbapJ8iJb3Q5AFOuLvXHm4Q+r diWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=9UWYQqOrYqkxR5XpwKp6R22GVBVnnsxJZJsmiNrkFSw=; fh=Jit3/+MNaJerjt38yCWTN25TuxJI1aMV89w/B7oZ294=; b=WnCooUyqFr8DDYkv3bBbGE8oMJoB4MrK1/8MpXRkAU15baI+DQ5NB8C6IPyohn8IIQ q/NvDn4voe2g2RMHQO9XFDeiQEOUuR2X2axUegZjI+zRf2wgbQcF2L8ScDsDgOK6NDe6 SSblmWbcSFpJXYLxCXU8iqeqbYjTgQhkdYpLd9GX3dgCdXxpoNTnov0WgxGj31rc02CR /rWb6OjiRzLHNHb53DKp6STQeDuGkSj4xLdE8VVmlerOsEIxn4jM0Y+JOX6Yt33f4o8K XoEfnoAj1sxzynYH3YMZb/gUFl6AywahWNDCjpZMfujggaCRrP6kNS+3pnacdkCtYN2x a5eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b="W0t5g/B1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bq25-20020a056a000e1900b00674311392f7si2891732pfb.31.2023.07.06.21.53.17; Thu, 06 Jul 2023 21:53:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b="W0t5g/B1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231773AbjGGEjo (ORCPT + 99 others); Fri, 7 Jul 2023 00:39:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231743AbjGGEjm (ORCPT ); Fri, 7 Jul 2023 00:39:42 -0400 Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DDC51BF8 for ; Thu, 6 Jul 2023 21:39:41 -0700 (PDT) Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1b3f722fdafso1448873fac.3 for ; Thu, 06 Jul 2023 21:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; t=1688704779; x=1691296779; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9UWYQqOrYqkxR5XpwKp6R22GVBVnnsxJZJsmiNrkFSw=; b=W0t5g/B1oy0yWoS9I4G0cGXHdlj4SznvVg7lqL2NZauZ7JCHiUBrbWDFm5zuVLIBct NYyiqasx+mGmFapxdlx7IvBBfH+l0yeOsdcDVTQc6r8ykfBeseb8UeARhrrX4JEAGV6Y GMr4VR8b6MIs9LYlKiMoNmSb6/eCC4N5QZG3E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688704779; x=1691296779; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9UWYQqOrYqkxR5XpwKp6R22GVBVnnsxJZJsmiNrkFSw=; b=NWg9nr9JPGePpYc81lSDjox8QOGV2PTvZOmTXsoLpy9UPMggNrtK9ZOkF7DSCHee8a 7jOMY6q8GPzww3BZTLC1X2UHhTqOMLLTdfxkoVm7+jH3ccu0hTMlM46O0Z9161Jz1Kxp 9v2srcm4XXCJkqvhU7F40l1kAXEn9UUUzPFCiDrfrQB1y6MZZUdHpxLUXPuxlKwjbo4X 7qgiek3+jLL9l2sxgsN1qT/F7kC4KvluHKPNXHvK2DRm5F4v3xWz8nAYjTEpXPY/lgHZ 5vbulY6sYivxnuwZGRjrbu6R5sgh7ZWzUh7/eMgKTpVXiUTRZWQm6jW+bQ0SqkoyYiEi wLEw== X-Gm-Message-State: ABy/qLb5fpFkVmE5R60jE1ZTHOxQOiUUcWhXsDpPRpruCd+Ij7hvsDJT BOJQF8Nrwimq7zXrgTWZ4GBOaw== X-Received: by 2002:a05:6870:2215:b0:1b0:3637:2bbe with SMTP id i21-20020a056870221500b001b036372bbemr4848122oaf.54.1688704779673; Thu, 06 Jul 2023 21:39:39 -0700 (PDT) Received: from localhost ([2601:644:200:aea:502d:5846:fd1f:55e7]) by smtp.gmail.com with ESMTPSA id n2-20020a17090a670200b0025c1cfdb93esm576569pjj.13.2023.07.06.21.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 21:39:39 -0700 (PDT) From: Ivan Babrou To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@cloudflare.com, Ivan Babrou , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Peilin Ye , "Steven Rostedt (Google)" , Petr Machata , Neil Horman , Satoru Moriya Subject: [PATCH v2] udp6: add a missing call into udp_fail_queue_rcv_skb tracepoint Date: Thu, 6 Jul 2023 21:39:20 -0700 Message-ID: <20230707043923.35578-1-ivan@cloudflare.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770736175797375336?= X-GMAIL-MSGID: =?utf-8?q?1770736175797375336?= The tracepoint has existed for 12 years, but it only covered udp over the legacy IPv4 protocol. Having it enabled for udp6 removes the unnecessary difference in error visibility. Signed-off-by: Ivan Babrou Fixes: 296f7ea75b45 ("udp: add tracepoints for queueing skb to rcvbuf") Acked-by: Paolo Abeni --- v2: added tracepoint export to make it build with IPV6=m (thanks Jakub!) --- net/core/net-traces.c | 2 ++ net/ipv6/udp.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/net/core/net-traces.c b/net/core/net-traces.c index 805b7385dd8d..6aef976bc1da 100644 --- a/net/core/net-traces.c +++ b/net/core/net-traces.c @@ -63,4 +63,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll); EXPORT_TRACEPOINT_SYMBOL_GPL(tcp_send_reset); EXPORT_TRACEPOINT_SYMBOL_GPL(tcp_bad_csum); +EXPORT_TRACEPOINT_SYMBOL_GPL(udp_fail_queue_rcv_skb); + EXPORT_TRACEPOINT_SYMBOL_GPL(sk_data_ready); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index e5a337e6b970..debb98fb23c0 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -680,6 +681,7 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) } UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite); kfree_skb_reason(skb, drop_reason); + trace_udp_fail_queue_rcv_skb(rc, sk); return -1; }