From: Jacob Keller <jacob.e.keller@intel.com>
To: Daniel Vacek <neelx@redhat.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
"Richard Cochran" <richardcochran@gmail.com>
Cc: <intel-wired-lan@lists.osuosl.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3] ice/ptp: fix the PTP worker retrying indefinitely if the link went down
Date: Mon, 23 Jan 2023 11:15:04 -0800 [thread overview]
Message-ID: <db713b6b-cee4-5163-c081-4d7c0c4ebd4b@intel.com> (raw)
In-Reply-To: <20230119202317.2741092-1-neelx@redhat.com>
On 1/19/2023 12:23 PM, Daniel Vacek wrote:
> When the link goes down the ice_ptp_tx_tstamp() may loop re-trying to
> process the packets till the 2 seconds timeout finally drops them.
> In such a case it makes sense to just drop them right away.
>
> Signed-off-by: Daniel Vacek <neelx@redhat.com>
This version looks fine to me, thanks for responding to feedback.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_ptp.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
> index d63161d73eb16..3c39ae3ed2426 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -680,6 +680,7 @@ static bool ice_ptp_tx_tstamp(struct ice_ptp_tx *tx)
> struct ice_pf *pf;
> struct ice_hw *hw;
> u64 tstamp_ready;
> + bool link_up;
> int err;
> u8 idx;
>
> @@ -695,11 +696,14 @@ static bool ice_ptp_tx_tstamp(struct ice_ptp_tx *tx)
> if (err)
> return false;
>
> + /* Drop packets if the link went down */
> + link_up = ptp_port->link_up;
> +
> for_each_set_bit(idx, tx->in_use, tx->len) {
> struct skb_shared_hwtstamps shhwtstamps = {};
> u8 phy_idx = idx + tx->offset;
> u64 raw_tstamp = 0, tstamp;
> - bool drop_ts = false;
> + bool drop_ts = !link_up;
> struct sk_buff *skb;
>
> /* Drop packets which have waited for more than 2 seconds */
> @@ -728,7 +732,7 @@ static bool ice_ptp_tx_tstamp(struct ice_ptp_tx *tx)
> ice_trace(tx_tstamp_fw_req, tx->tstamps[idx].skb, idx);
>
> err = ice_read_phy_tstamp(hw, tx->block, phy_idx, &raw_tstamp);
> - if (err)
> + if (err && !drop_ts)
> continue;
>
> ice_trace(tx_tstamp_fw_done, tx->tstamps[idx].skb, idx);
next prev parent reply other threads:[~2023-01-23 19:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-17 18:15 [PATCH] ice/ptp: fix the PTP worker retrying indefinitely if the link went down Daniel Vacek
2023-01-17 18:46 ` [Intel-wired-lan] " Jacob Keller
2023-01-18 15:14 ` Daniel Vacek
2023-01-18 20:59 ` Jacob Keller
2023-01-18 22:11 ` Daniel Vacek
2023-01-18 22:22 ` Jacob Keller
2023-01-19 9:38 ` Daniel Vacek
2023-01-19 19:24 ` Jacob Keller
2023-01-19 20:08 ` Daniel Vacek
2023-01-22 17:44 ` D H, Siddaraju
2023-01-19 20:23 ` [PATCH v3] " Daniel Vacek
2023-01-23 19:15 ` Jacob Keller [this message]
2023-01-31 4:20 ` [Intel-wired-lan] " G, GurucharanX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=db713b6b-cee4-5163-c081-4d7c0c4ebd4b@intel.com \
--to=jacob.e.keller@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neelx@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).