From patchwork Wed Dec 18 18:57:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guilherme G. Piccoli" X-Patchwork-Id: 1212698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dPR75ylGz9sPJ; Thu, 19 Dec 2019 05:58:11 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iheWJ-0002vv-U4; Wed, 18 Dec 2019 18:58:03 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iheWH-0002vY-Lu for kernel-team@lists.ubuntu.com; Wed, 18 Dec 2019 18:58:01 +0000 Received: from mail-qt1-f197.google.com ([209.85.160.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iheWH-0001SR-9t for kernel-team@lists.ubuntu.com; Wed, 18 Dec 2019 18:58:01 +0000 Received: by mail-qt1-f197.google.com with SMTP id l1so1990438qtp.21 for ; Wed, 18 Dec 2019 10:58:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D/CfoSG7wTRkDPAePrzi3+rDnytcgwApTRkmC8ghvTA=; b=NYs3N+O1DRok3qXG0c6LSV5g7qTO1cFQVorlWuRMdFLz0XjHe7TMWvdOy3dhSrzsnm TA2tf+Bo5H6CtUjZLHbDJUc4/fRSa8tQ6DbEcy0VCak/seys1vavjjJvdDB9di3Fmje8 XUd90wGqC2HRIIscsT/n1pD3NNLzdhndE0ex9rFIU+1ii0FuqNhG/OMi3eGrMsz0YH7e hCI37j2okd+F/hCv1D8nYUlitgart4LeyR7QVLwu8vi6kDySg8vfqsH1YhEnIlgM3FTl Zz+xGO+kWAxKkTJgBfnkLGWTBL0O8KZosBG/UH+n0RtjM+7j6ZGYrvRoXjGqHKJ4CHD2 3bdA== X-Gm-Message-State: APjAAAU/iGMF4FyRKaFabtS+PvDIZ/Qd6sgtol80n6tgiIHc1ibvJyDo HFDQlw5TTMu5ISHHb7oJ+fcG1hRhISRQUm1++KDRJfsLzWhDb0sEnDKQvnxk4PJgYMNjcbtbb2Q Fm47modLDhBZ85Fta/FOOzVQHgFs7hKIUstfbLfHRoQ== X-Received: by 2002:a05:620a:1324:: with SMTP id p4mr4250065qkj.497.1576695480106; Wed, 18 Dec 2019 10:58:00 -0800 (PST) X-Google-Smtp-Source: APXvYqw+Xqkiv+zYubriRW6Ut4J54Q//HVNH7n65FcFNffiJDDB8HrZ0eVT3Y5ell1BZ1J9zZCouTw== X-Received: by 2002:a05:620a:1324:: with SMTP id p4mr4250052qkj.497.1576695479808; Wed, 18 Dec 2019 10:57:59 -0800 (PST) Received: from localhost (200-153-216-29.dsl.telesp.net.br. [200.153.216.29]) by smtp.gmail.com with ESMTPSA id e130sm909268qkb.72.2019.12.18.10.57.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 10:57:59 -0800 (PST) From: "Guilherme G. Piccoli" To: kernel-team@lists.ubuntu.com Subject: [B][PATCH 1/1] qede: Handle infinite driver spinning for Tx timestamp. Date: Wed, 18 Dec 2019 15:57:51 -0300 Message-Id: <20191218185752.8529-2-gpiccoli@canonical.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191218185752.8529-1-gpiccoli@canonical.com> References: <20191218185752.8529-1-gpiccoli@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: , Cc: gpiccoli@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Sudarsana Reddy Kalluru BugLink: https://bugs.launchpad.net/bugs/1855409 In PTP Tx implementation, driver kept scheduling a poll thread until the timestamp is available. In the error scenarios (e.g. app requesting the timestamp for non-ptp packet), this thread kept waiting for the timestamp forever. This patch add changes to report such scenario as an error and terminate the thread. Added a timeout of 2 seconds i.e., max time to wait for Tx timestamp. Added a stat value ptp_skip_txts for reporting the number of packets for which Tx timestamping is skipped. Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Michal Kalderon Signed-off-by: David S. Miller (backported from commit 9adebac37e7d26c5cd73776a0279574afe3f410b) [gpiccoli: context adjustments due to the following missing commits: - 32d26a685c18: Added a link change statistics; - 149d3775f108: Changed ancestor to access qede-flags; - ccc67ef50b90: Added error recovery process. Due to these, small conflicts arose demanding adjustments.] Signed-off-by: Guilherme G. Piccoli --- drivers/net/ethernet/qlogic/qede/qede.h | 2 + .../net/ethernet/qlogic/qede/qede_ethtool.c | 2 + drivers/net/ethernet/qlogic/qede/qede_main.c | 4 ++ drivers/net/ethernet/qlogic/qede/qede_ptp.c | 37 +++++++++++++++---- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qede/qede.h b/drivers/net/ethernet/qlogic/qede/qede.h index a3a70ade411f..abc74df1042a 100644 --- a/drivers/net/ethernet/qlogic/qede/qede.h +++ b/drivers/net/ethernet/qlogic/qede/qede.h @@ -86,6 +86,7 @@ struct qede_stats_common { u64 coalesced_aborts_num; u64 non_coalesced_pkts; u64 coalesced_bytes; + u64 ptp_skip_txts; /* port */ u64 rx_64_byte_packets; @@ -178,6 +179,7 @@ struct qede_dev { const struct qed_eth_ops *ops; struct qede_ptp *ptp; + u64 ptp_skip_txts; struct qed_dev_eth_info dev_info; #define QEDE_MAX_RSS_CNT(edev) ((edev)->dev_info.num_queues) diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c index dae741270022..39f1d18c96eb 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c +++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c @@ -170,6 +170,8 @@ static const struct { QEDE_STAT(coalesced_aborts_num), QEDE_STAT(non_coalesced_pkts), QEDE_STAT(coalesced_bytes), + + QEDE_STAT(ptp_skip_txts), }; #define QEDE_NUM_STATS ARRAY_SIZE(qede_stats_arr) diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 552cf45ddcbb..b5b3e2f877d0 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -393,6 +393,7 @@ void qede_fill_by_demand_stats(struct qede_dev *edev) p_common->brb_truncates = stats.common.brb_truncates; p_common->brb_discards = stats.common.brb_discards; p_common->tx_mac_ctrl_frames = stats.common.tx_mac_ctrl_frames; + p_common->ptp_skip_txts = edev->ptp_skip_txts; if (QEDE_IS_BB(edev)) { struct qede_stats_bb *p_bb = &edev->stats.bb; @@ -2008,6 +2009,9 @@ static void qede_unload(struct qede_dev *edev, enum qede_unload_mode mode, out: if (!is_locked) __qede_unlock(edev); + + edev->ptp_skip_txts = 0; + DP_INFO(edev, "Ending qede unload\n"); } diff --git a/drivers/net/ethernet/qlogic/qede/qede_ptp.c b/drivers/net/ethernet/qlogic/qede/qede_ptp.c index 812e831ed250..fb74dd9f38f0 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_ptp.c +++ b/drivers/net/ethernet/qlogic/qede/qede_ptp.c @@ -30,6 +30,7 @@ * SOFTWARE. */ #include "qede_ptp.h" +#define QEDE_PTP_TX_TIMEOUT (2 * HZ) struct qede_ptp { const struct qed_eth_ptp_ops *ops; @@ -38,6 +39,7 @@ struct qede_ptp { struct timecounter tc; struct ptp_clock *clock; struct work_struct work; + unsigned long ptp_tx_start; struct qede_dev *edev; struct sk_buff *tx_skb; @@ -160,18 +162,30 @@ static void qede_ptp_task(struct work_struct *work) struct qede_dev *edev; struct qede_ptp *ptp; u64 timestamp, ns; + bool timedout; int rc; ptp = container_of(work, struct qede_ptp, work); edev = ptp->edev; + timedout = time_is_before_jiffies(ptp->ptp_tx_start + + QEDE_PTP_TX_TIMEOUT); /* Read Tx timestamp registers */ spin_lock_bh(&ptp->lock); rc = ptp->ops->read_tx_ts(edev->cdev, ×tamp); spin_unlock_bh(&ptp->lock); if (rc) { - /* Reschedule to keep checking for a valid timestamp value */ - schedule_work(&ptp->work); + if (unlikely(timedout)) { + DP_INFO(edev, "Tx timestamp is not recorded\n"); + dev_kfree_skb_any(ptp->tx_skb); + ptp->tx_skb = NULL; + clear_bit_unlock(QEDE_FLAGS_PTP_TX_IN_PRORGESS, + &edev->flags); + edev->ptp_skip_txts++; + } else { + /* Reschedule to keep checking for a valid TS value */ + schedule_work(&ptp->work); + } return; } @@ -514,19 +528,28 @@ void qede_ptp_tx_ts(struct qede_dev *edev, struct sk_buff *skb) if (!ptp) return; - if (test_and_set_bit_lock(QEDE_FLAGS_PTP_TX_IN_PRORGESS, &edev->flags)) + if (test_and_set_bit_lock(QEDE_FLAGS_PTP_TX_IN_PRORGESS, + &edev->flags)) { + DP_ERR(edev, "Timestamping in progress\n"); + edev->ptp_skip_txts++; return; + } if (unlikely(!(edev->flags & QEDE_TX_TIMESTAMPING_EN))) { - DP_NOTICE(edev, - "Tx timestamping was not enabled, this packet will not be timestamped\n"); + DP_ERR(edev, + "Tx timestamping was not enabled, this packet will not be timestamped\n"); + clear_bit_unlock(QEDE_FLAGS_PTP_TX_IN_PRORGESS, &edev->flags); + edev->ptp_skip_txts++; } else if (unlikely(ptp->tx_skb)) { - DP_NOTICE(edev, - "The device supports only a single outstanding packet to timestamp, this packet will not be timestamped\n"); + DP_ERR(edev, + "The device supports only a single outstanding packet to timestamp, this packet will not be timestamped\n"); + clear_bit_unlock(QEDE_FLAGS_PTP_TX_IN_PRORGESS, &edev->flags); + edev->ptp_skip_txts++; } else { skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; /* schedule check for Tx timestamp */ ptp->tx_skb = skb_get(skb); + ptp->ptp_tx_start = jiffies; schedule_work(&ptp->work); } }