Message-ID: <db713b6b-cee4-5163-c081-4d7c0c4ebd4b@intel.com>
Date:   Mon, 23 Jan 2023 11:15:04 -0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH v3] ice/ptp: fix the PTP worker retrying indefinitely if
 the link went down
Content-Language: en-US
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>
References: <20230117181533.2350335-1-neelx@redhat.com>
 <20230119202317.2741092-1-neelx@redhat.com>
From:   Jacob Keller <jacob.e.keller@intel.com>
In-Reply-To: <20230119202317.2741092-1-neelx@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q1h5UStOL24rdGFZUm56STNzUjJNY0lUSUl0M3I0cHFTYTA4YlRWeHBQRkgx?=
 =?utf-8?B?K0R0YTNRcDJFdGx6ajR5d09uWU9ScHZTSlhhckVjU2xMV3pob2lpK2VGRDdv?=
 =?utf-8?B?anVTc0swcG1VcGNxV1N6ZWVLNU1vWmM5Y3NWT0wybUdwUGJPaldaK2pwMzEr?=
 =?utf-8?B?eHhNdVVMVjBkaWNwVDdoM1pJcFNOMmkvbDRnZzgzZ2RlRXZTdHFXTUlTQ3lr?=
 =?utf-8?B?TGZIUzVqcis3SUZIK1QrTjBRczJQOUZPY2hMODFpUldMOElybnVwc1VOM1FD?=
 =?utf-8?B?UTN5blhySmpHWllKSHc1R0lKWEtvNlpoN2RZTGRUK0hLSHhZVjJOdlhwVyty?=
 =?utf-8?B?VmZEZTVwcnFZSjdYMzNjdWE2MUZNWW9FQWpxUmtlc3BETDJaVFNhS2NVc2pS?=
 =?utf-8?B?aXgrSGF6THlyV1ZFc1JYNUdoS2pua2xZNWY5UzIyWUpidGFqNXdkTG45bDB4?=
 =?utf-8?B?eUFJY2NjVE5JNlZLa1RYV3d6WGxzL2RtK3B4cFZqY2dFcWQ5K05xejNNRFAx?=
 =?utf-8?B?cXMxUWxIWmcxTTdaNHA5YWQ4MnhvNGZvYytYZDdvMzVqNFRLNFE0VkZuZzZa?=
 =?utf-8?B?dlFxdmVKc1d2bzNLRFpqckJTVEZkU0RCMlF0T250WVlxSDBlS3hBN0NrYzlx?=
 =?utf-8?B?NjhWcjlQTVlZeTZLOFVZNkhTQldaUTdaTGJQQmQzUzhKdjZtRnAzOVM2YWxZ?=
 =?utf-8?B?TTlPUithWWs0eDVuMEF4cXJEdFJxUXVIQnRoNG5DSTdTN1Vla3BJK1FqaTVm?=
 =?utf-8?B?YWFnY0pIZ2gvK0c4b1JlZ1A2SmRCRllySmE3a0Z0c3pIMko5SzR1Rmg3dDJu?=
 =?utf-8?B?cUVLd1A1a1JkbERLQkxRUDZWbFYyZCtpL2lQV090UXAyaElXQ256czhwbnIw?=
 =?utf-8?B?WUxJNy9DbEZ1UDVqa3VUSkw5Yk5WUnBQeWE1dDF3Rk5pbG5icjFYLzVyeW4v?=
 =?utf-8?B?MG1SOEhSUWozTTBCQlFMbHdjMmREdEEwa2tadlhiZDVTS1lnQVZoN3JBMjl2?=
 =?utf-8?B?dlo0TDZSSVFVaWhTNjV1UUVZdS9mSFc0U21nMzkxdTIyY2d6WjlDT05TOEdj?=
 =?utf-8?B?TGQ2cUx6RnVKZTM5L004a2NjNzlhWTlxUnYwSExBS0dET2phRnZlMklHT3pL?=
 =?utf-8?B?TGl3KzVrbGt3SUV3TzJ2YW54dlZLVWF2UmIyb21uc0F3ZEhyRmZaL1V0dXdU?=
 =?utf-8?B?THFZZlI2b3BFTTVETEFCbWdKZHB5UXRxck1JVUE5anJkZldZcmk0d0huSnNh?=
 =?utf-8?B?bnlJSExCSEFmWFRJa1B1UTRWLzR0cFpFblljTjJ3WlVjc1lZZ0hKNlplTkNX?=
 =?utf-8?B?bFQ5M3kvVWxGUVcwSHdndVFXZ1RtNVdnaFA3YW95OGdlN2Y1U0xwVFZYNGJL?=
 =?utf-8?B?MU1sWGoyaE5zRWk3S1dhZHZ1N1lQYjRjc2R4bTV4UTVVV2VQTVhYMlhjWWlG?=
 =?utf-8?B?MXJvL1JOS1RETmxaN0JndjR2eG93bndpSGU4SExvQXJFUXdkQlVLVVZRUVBT?=
 =?utf-8?B?YWNJVjVRNkVDb0oxMFZRQzRDM09lM3RqREQwajdVT1d4d0U3d21SNC95cFRQ?=
 =?utf-8?B?Z3N0Qlh4RkJvV0dPdHhYWHpZb0pnVUQrVXdReSt5OVhDenBvR0xQS3R4RUVP?=
 =?utf-8?B?bmkyOXE1b3hNdFg0d1RpN01QU25wRCt2QytIUE1RNGl5SE83eXc5dWd1NmtM?=
 =?utf-8?B?VVhQQVRPRFBWTTMybFQ1UmxHVUtvTkhTY21pOTNXWFZQVTFxdXI5c09pUDgz?=
 =?utf-8?B?S0tqekJOd1lsU29xTE95K0k0WnJ4bDc0QnZ3c1F1REV5MlY2NVlwa21Hc05k?=
 =?utf-8?B?SE8xWERkZWJ1dGNndHJYRUlFU3UvU1lZUCs2Ri9zc29pUXJKek41RDdCdExJ?=
 =?utf-8?B?UjJRZWtLUDF3TE81VEMvUDRYekhONUI2Sk9ZYTV0T3ZqT2g2aEtyMC9zcWJI?=
 =?utf-8?B?UHF2TVVyazVQTkVreTlHczk0SytNVEozOFdXc09ucEJ6c1lvSzlmQXd2aVU4?=
 =?utf-8?B?aHpYM0VOU08wdTJaMFJSbWR0R0tVaW5RMTZ3TVFpSjFQQmlFOVdlY2hIb1pi?=
 =?utf-8?B?SVd0dDZSU0J2L2JxYWc5VGtzV0xsRlh4RVVBbktrRmkreEZ3bkVDdHFJY0NL?=
 =?utf-8?B?WS9CMzF5OVhTNGxJN3IrOVB2eFIzcWFqMzhKUUdvNE9rSWowMjQrQk1nODF5?=
 =?utf-8?B?VEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 4451a2e3-900f-4968-2d74-08dafd7622dc
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5089.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2023 19:15:06.0589
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: iXYb20im5NEI7E3aa1iIJGRHGrUX0ZaqTHD/ps79EC3V5rFcIKOn3UsB4ECXNkTXE0sLH0UJZSjoJs/IeIF/B1hhMu8cSwP5gwCCbpD1LNU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6680
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


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);