From patchwork Tue Jul 18 12:37:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1809215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Ysx3OWq1; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R4z5Y1g6zz20FK for ; Tue, 18 Jul 2023 22:38:39 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qLjyG-0002xf-JM; Tue, 18 Jul 2023 12:38:28 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qLjyE-0002xL-U6 for kernel-team@lists.ubuntu.com; Tue, 18 Jul 2023 12:38:26 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 905C13F0F8 for ; Tue, 18 Jul 2023 12:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1689683906; bh=MvkWATafLzU+UZiPsynsCtEIbrSNhzStrS4yyPSshzM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ysx3OWq1RYXbbKBmyQTfO2Wkoo1qKocoPbR893p9ak3AB7BM5QwrrspbliOwCZhWf Is4yX5vwuztWPU+eMNyDxNuq02g2R6KOfFRhBn/14AMRH6AvDTTcBtqQ37mFbMuV3i cQEvFnNBFBjrnde0q5wPD7ljpygxBmqFArJvp5zxw8jSHnHjxSydLh9tvDD/+rVJkR QaB+Ii4Wd/hVzYheP48I9EK8Mhq5rgkI+mWAJKrxv/Vu3/XX2AS92myNbJNosvAH37 qZ2FhljhE6tl1PZnwcSBfMmLX3IaTcULfpF7gvSoeNzkvAOFnUdueMkU9E3n8q8slU FwVdkfAFChbFQ== Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-66870a96b89so3188960b3a.3 for ; Tue, 18 Jul 2023 05:38:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689683905; x=1692275905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MvkWATafLzU+UZiPsynsCtEIbrSNhzStrS4yyPSshzM=; b=W5fRDWd0IbZkVleAZgm4aYg9GNrjraQ/R9Sp+DuYFoPsrH28dLjZfG9XVaSkD96WK3 Lop7hwJ2kl/YGop50e1MWofMqduupBFcm6cATQ21cYsXMNI3y/wzgFq1788O7pKiZcjS hJ90yRG+dq5QI07ljObJmskxySAqaHbvnyeE8gO/pclMnSSqA1lTqofDsCRECRF2DASH 3IP82ugXGZ9UtvzX/wXZcoE9nis/rPPsfDJTYYagvp9tTAlyD23i9lvy8g2mmKKxx3xe wjw62XnvouYljzxhL+S4AMzKXb+oa4wVXAUGzNfMOtzle8BqtH+B1hbPxj5xx3t38fpY hGmQ== X-Gm-Message-State: ABy/qLa+IYHUXZ8HGSaGYggWzMlAS121ML55m2HmVbEHejG78e8+7abm a9SmuPe6BbjetPxH5h5wQ/HXkpEBUmIze0f+iuY70bemj+n3A0wIeXtaRl2oVt16/Rt4Y1x7K8Z 7gQluBW41Tq5IZrCQ4kWZCAWt7wDJcgi6cO+dtoDN7IlbckgNkfdb X-Received: by 2002:a05:6a20:8408:b0:130:46ea:29cb with SMTP id c8-20020a056a20840800b0013046ea29cbmr16422791pzd.25.1689683905196; Tue, 18 Jul 2023 05:38:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlGnVfbAusrD7siv4TC6+8UGmyMM2Mn1ZOHrVb7Tr3GSK1yPaC7WJnGtBFgcnfWvNML8GF6Ijg== X-Received: by 2002:a05:6a20:8408:b0:130:46ea:29cb with SMTP id c8-20020a056a20840800b0013046ea29cbmr16422768pzd.25.1689683904904; Tue, 18 Jul 2023 05:38:24 -0700 (PDT) Received: from localhost.localdomain (125-228-254-191.hinet-ip.hinet.net. [125.228.254.191]) by smtp.gmail.com with ESMTPSA id m16-20020aa79010000000b0065da94fe917sm1470608pfo.36.2023.07.18.05.38.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 05:38:24 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH 1/2] UBUNTU: SAUCE: (no-up) net: stmmac: replace trace_printk with netif_dbg Date: Tue, 18 Jul 2023 20:37:39 +0800 Message-Id: <20230718123740.74512-2-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230718123740.74512-1-jianhui.lee@canonical.com> References: <20230718123740.74512-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2028059 in the commit 8663a87766bc ("REVERTME: net: stmmac: introduce AF_XDP ZC TX HW timestamps"") uses trace_printk for debugging. replace it with netif_dbg. Signed-off-by: Jian Hui Lee --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 7e8872d6e72d..ac243dbbad76 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2653,7 +2653,7 @@ static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue) ktime_t tx_hwtstamp = { 0 }; stmmac_get_tx_hwtstamp(priv, p, &tx_hwtstamp); - trace_printk("XDP TX HW TS %llu\n", + netif_dbg(priv, tx_done, priv->dev, "XDP TX HW TS %llu\n", tx_hwtstamp); } } From patchwork Tue Jul 18 12:37:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1809217 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=vgGnG6Si; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R4z5Y20zKz20FY for ; Tue, 18 Jul 2023 22:38:39 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qLjyJ-0002yI-PN; Tue, 18 Jul 2023 12:38:31 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qLjyG-0002xS-FJ for kernel-team@lists.ubuntu.com; Tue, 18 Jul 2023 12:38:28 +0000 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B5C793F0F7 for ; Tue, 18 Jul 2023 12:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1689683907; bh=CUZgPD4pKrwtk1B42hUzTdf912T9K9FvJjx8VhWuugw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vgGnG6SidLjaHc471uXMJp26remmLfs6Hb0ysW1bdPyBilqDOypg1l5u9TMIasyi/ BfwKXEsKpgJ5PBQQqpWro7fVh+XUn2dcUFt7NHP6IChiP3AFBiei4z7UVOIGH09IC5 /tr35FC65DtjBSEm/PGYvIej8wM8jg6MHOBOAZyuKpCut+ukICpP7zTm5A0TAZ3hCO UmBLNP/eh4ue+qQxCJIDIpVlkI9E7vdYnNeKt5n45oJ1oaslXyCP+xvo9am3NOx5WU Q6jgSYgdC/evmiQvFEmUMXQ49Gc9EH7QHl/h7UiEOIQaUbeFmg7SniHLktFEw3CqCp 7v6abkrKxHqyg== Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-55c76ff0bfeso2558098a12.2 for ; Tue, 18 Jul 2023 05:38:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689683906; x=1692275906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CUZgPD4pKrwtk1B42hUzTdf912T9K9FvJjx8VhWuugw=; b=NDCAoBbhsCfT1rIs33XO+TZssy38G2lDep8CPPf3Jfqk+YKSqsJEj87JpfMkxq823G PAMq4wA9++remQ1iZDiXL30kWCtTpnmXzqd6Dt44mST/89VYXg4+m4AncPvI+gNwQUlp Fnal5Gc0AnDbN+io6x9+8yQlJXNKkGCk2RCx3b7dbc+5lXSZ+gCNsqp+VTKn0HFl0ani 1OiHrRMAWaH1n4Dft/GkMu4nT1GdL7Q+FEr4unDNar8DFFCSDVauDF3VvrECPVWcEbRz xf8dyUYBYyVqsQwsJToxiQJoYOmBao8CMbQXqf5KsYBYYnkkdNtTaCopFJJKZfLjIucP IUFg== X-Gm-Message-State: ABy/qLbCmhwhp6eLEsncqXzAYZY6aeDUnBcmDsyYjVD8C1/2+Rswatlu yOdl65LvlVkx5MNGEa9RwMCbdu5QgY1UxlmYNmyFwwWFzrsuQXhKIKwK87auA6GgrCo6ppBZMiq zqdRppdus27YD3PxBwr4k4ibcBK5y9eipsrRqcwFqwnq9iyuW9x5J X-Received: by 2002:a05:6a20:7fa1:b0:11f:2714:f6f3 with SMTP id d33-20020a056a207fa100b0011f2714f6f3mr16103497pzj.11.1689683906329; Tue, 18 Jul 2023 05:38:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlHRTFsohOE0T2Ut4Yt190dEIVlpW//qb63cpCR+DvsegyWpr0IQnX3Z5o4FSewNDClraWDFww== X-Received: by 2002:a05:6a20:7fa1:b0:11f:2714:f6f3 with SMTP id d33-20020a056a207fa100b0011f2714f6f3mr16103484pzj.11.1689683906036; Tue, 18 Jul 2023 05:38:26 -0700 (PDT) Received: from localhost.localdomain (125-228-254-191.hinet-ip.hinet.net. [125.228.254.191]) by smtp.gmail.com with ESMTPSA id m16-20020aa79010000000b0065da94fe917sm1470608pfo.36.2023.07.18.05.38.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 05:38:25 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH 2/2] Revert "igc: Enable trace for HW TX Timestamp AF_XDP ZC" Date: Tue, 18 Jul 2023 20:37:40 +0800 Message-Id: <20230718123740.74512-3-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230718123740.74512-1-jianhui.lee@canonical.com> References: <20230718123740.74512-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2028059 trace_printk() should not be used in production code. This reverts commit 9a31ef676a8853605d50e493a97b05aaf5a2a347. Signed-off-by: Jian Hui Lee --- drivers/net/ethernet/intel/igc/igc_main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 5e3b653574e2..c74a68f3b936 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -3001,11 +3001,6 @@ static bool igc_clean_tx_irq(struct igc_q_vector *q_vector, int napi_budget) switch (tx_buffer->type) { case IGC_TX_BUFFER_TYPE_XSK: -#if defined(CONFIG_TRACING) - /* Only use for RTCP KPI Measurement on Q2 */ - if (tx_ring->queue_index == 2 && adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON) - trace_printk("TX HW TS %lld\n", timestamp); -#endif xsk_frames++; break; case IGC_TX_BUFFER_TYPE_XDP: