[Intel-wired-lan] [PATCH iwl-net v2] igc: Fix TX Hang issue when QBV Gate is close

Paul Menzel pmenzel at molgen.mpg.de
Fri Jun 2 12:03:27 UTC 2023


Dear Muhammad,


Thank you for your patch.

Am 02.06.23 um 03:28 schrieb Muhammad Husaini Zulkifli:

There is a small typo in the commit message summary/title: close*d*.

> If a user schedules a Gate Control List (GCL) to close one of
> the QBV gates while also transmitting a packet to that closed gate,
> TX Hang will be happen. HW would not drop any packet when the gate
> is close and keep queueing up in HW TX FIFO until the gate is re-open.

1.  close*d*
2.  queuing
3.  re-opened

> This patch implement the solution to drop the packet for the closed
> gate.

implement*s*

> This patch will additionally include a reset adapter to perform

Maybe: Additionally reset the adapter to …

> SW initialization for each 1st Gate Control List (GCL) to avoid hang.
> This is due to the HW design, where changing to TSN transmit mode
> requires SW initialization. Intel Discrete I225/6 transmit mode
> cannot be changed when in dynamic mode according to Software User
> Manual Section 7.5.2.1. Subsequent Gate Control List (GCL) operations
> will proceed without a reset, as they already in TSN Mode.

… they already *are*  …

> Step to reproduce:
> 
> DUT:
> 1) Configure GCL List with certain gate close.
> 2) Transmit the packet to close gate.

close*d*

Do you have the commands to do what you did?

> Fixes: ec50a9d437f0 ("igc: Add support for taprio offloading")
> Co-developed-by: Tan Tee Min <tee.min.tan at linux.intel.com>
> Signed-off-by: Tan Tee Min <tee.min.tan at linux.intel.com>
> Tested-by: Chwee Lin Choong <chwee.lin.choong at intel.com>
> Signed-off-by: Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli at intel.com>
> 
> ---
> V1 -> V2: Fix conflict and apply to net-queue tree.
> ---
> ---
>   drivers/net/ethernet/intel/igc/igc.h      |  6 +++
>   drivers/net/ethernet/intel/igc/igc_main.c | 57 +++++++++++++++++++++--
>   drivers/net/ethernet/intel/igc/igc_tsn.c  | 41 ++++++++++------
>   3 files changed, 87 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
> index 0bbd108f28939..127b248054e55 100644
> --- a/drivers/net/ethernet/intel/igc/igc.h
> +++ b/drivers/net/ethernet/intel/igc/igc.h
> @@ -13,6 +13,7 @@
>   #include <linux/ptp_clock_kernel.h>
>   #include <linux/timecounter.h>
>   #include <linux/net_tstamp.h>
> +#include <linux/hrtimer.h>
>   
>   #include "igc_hw.h"
>   
> @@ -100,6 +101,8 @@ struct igc_ring {
>   	u32 start_time;
>   	u32 end_time;
>   	u32 max_sdu;
> +	bool oper_gate_closed;

What does *oper* refer to?

> +	bool admin_gate_closed;
>   
>   	/* CBS parameters */
>   	bool cbs_enable;                /* indicates if CBS is enabled */
> @@ -159,6 +162,7 @@ struct igc_adapter {
>   	struct timer_list watchdog_timer;
>   	struct timer_list dma_err_timer;
>   	struct timer_list phy_info_timer;
> +	struct hrtimer hrtimer;
>   
>   	u32 wol;
>   	u32 en_mng_pt;
> @@ -188,6 +192,8 @@ struct igc_adapter {
>   	ktime_t cycle_time;
>   	bool qbv_enable;
>   	u32 qbv_config_change_errors;
> +	bool qbv_transition;
> +	int qbv_count;

unsigned int?

>   	/* OS defined structs */
>   	struct pci_dev *pdev;
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index 9095306323afd..1f95376f9ffda 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -1521,6 +1521,9 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
>   	u8 hdr_len = 0;
>   	int tso = 0;
>   
> +	if (adapter->qbv_transition || tx_ring->oper_gate_closed)
> +		goto out_drop;
> +
>   	/* need: 1 descriptor per page * PAGE_SIZE/IGC_MAX_DATA_PER_TXD,
>   	 *	+ 1 desc for skb_headlen/IGC_MAX_DATA_PER_TXD,
>   	 *	+ 2 desc gap to keep tail from touching head,
> @@ -2967,7 +2970,8 @@ static bool igc_clean_tx_irq(struct igc_q_vector *q_vector, int napi_budget)
>   		    (adapter->tx_timeout_factor * HZ)) &&
>   		    !(rd32(IGC_STATUS) & IGC_STATUS_TXOFF) &&
>   		    (rd32(IGC_TDH(tx_ring->reg_idx)) !=
> -		     readl(tx_ring->tail))) {
> +		    readl(tx_ring->tail)) &&
> +		    !tx_ring->oper_gate_closed) {
>   			/* detected Tx unit hang */
>   			netdev_err(tx_ring->netdev,
>   				   "Detected Tx Unit Hang\n"
> @@ -6057,6 +6061,8 @@ static int igc_tsn_clear_schedule(struct igc_adapter *adapter)
>   	adapter->base_time = 0;
>   	adapter->cycle_time = NSEC_PER_SEC;
>   	adapter->qbv_config_change_errors = 0;
> +	adapter->qbv_transition = false;
> +	adapter->qbv_count = 0;
>   
>   	for (i = 0; i < adapter->num_tx_queues; i++) {
>   		struct igc_ring *ring = adapter->tx_ring[i];
> @@ -6064,6 +6070,8 @@ static int igc_tsn_clear_schedule(struct igc_adapter *adapter)
>   		ring->start_time = 0;
>   		ring->end_time = NSEC_PER_SEC;
>   		ring->max_sdu = 0;
> +		ring->oper_gate_closed = false;
> +		ring->admin_gate_closed = false;
>   	}
>   
>   	return 0;
> @@ -6075,6 +6083,7 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
>   	bool queue_configured[IGC_MAX_TX_QUEUES] = { };
>   	struct igc_hw *hw = &adapter->hw;
>   	u32 start_time = 0, end_time = 0;
> +	struct timespec64 now;
>   	size_t n;
>   	int i;
>   
> @@ -6095,6 +6104,8 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
>   	adapter->cycle_time = qopt->cycle_time;
>   	adapter->base_time = qopt->base_time;
>   
> +	igc_ptp_read(adapter, &now);
> +
>   	for (n = 0; n < qopt->num_entries; n++) {
>   		struct tc_taprio_sched_entry *e = &qopt->entries[n];
>   
> @@ -6129,7 +6140,10 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
>   				ring->start_time = start_time;
>   			ring->end_time = end_time;
>   
> -			queue_configured[i] = true;
> +			if (ring->start_time >= adapter->cycle_time)
> +				queue_configured[i] = false;
> +			else
> +				queue_configured[i] = true;

Maybe:

     queue_configured[i] = !(ring->start_time >= adapter->cycle_time)

>   		}
>   
>   		start_time += e->interval;
> @@ -6139,8 +6153,20 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
>   	 * If not, set the start and end time to be end time.
>   	 */
>   	for (i = 0; i < adapter->num_tx_queues; i++) {
> +		struct igc_ring *ring = adapter->tx_ring[i];
> +
> +		if (!is_base_time_past(qopt->base_time, &now)) {
> +			ring->admin_gate_closed = false;
> +		} else {
> +			ring->oper_gate_closed = false;
> +			ring->admin_gate_closed = false;
> +		}
> +
>   		if (!queue_configured[i]) {
> -			struct igc_ring *ring = adapter->tx_ring[i];
> +			if (!is_base_time_past(qopt->base_time, &now))
> +				ring->admin_gate_closed = true;
> +			else
> +				ring->oper_gate_closed = true;
>   
>   			ring->start_time = end_time;
>   			ring->end_time = end_time;
> @@ -6466,6 +6492,27 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg)
>   	return value;
>   }
>   
> +static enum hrtimer_restart igc_qbv_scheduling_timer(struct hrtimer *timer)
> +{
> +	struct igc_adapter *adapter = container_of(timer, struct igc_adapter,
> +						   hrtimer);
> +	int i;

unsigned int?

> +
> +	adapter->qbv_transition = true;
> +	for (i = 0; i < adapter->num_tx_queues; i++) {
> +		struct igc_ring *tx_ring = adapter->tx_ring[i];
> +
> +		if (tx_ring->admin_gate_closed) {
> +			tx_ring->admin_gate_closed = false;
> +			tx_ring->oper_gate_closed = true;
> +		} else {
> +			tx_ring->oper_gate_closed = false;
> +		}
> +	}
> +	adapter->qbv_transition = false;
> +	return HRTIMER_NORESTART;
> +}
> +
>   /**
>    * igc_probe - Device Initialization Routine
>    * @pdev: PCI device information struct
> @@ -6642,6 +6689,9 @@ static int igc_probe(struct pci_dev *pdev,
>   	INIT_WORK(&adapter->reset_task, igc_reset_task);
>   	INIT_WORK(&adapter->watchdog_task, igc_watchdog_task);
>   
> +	hrtimer_init(&adapter->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> +	adapter->hrtimer.function = &igc_qbv_scheduling_timer;
> +
>   	/* Initialize link properties that are user-changeable */
>   	adapter->fc_autoneg = true;
>   	hw->mac.autoneg = true;
> @@ -6745,6 +6795,7 @@ static void igc_remove(struct pci_dev *pdev)
>   
>   	cancel_work_sync(&adapter->reset_task);
>   	cancel_work_sync(&adapter->watchdog_task);
> +	hrtimer_cancel(&adapter->hrtimer);
>   
>   	/* Release control of h/w to f/w.  If f/w is AMT enabled, this
>   	 * would have already happened in close and is redundant.
> diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/ethernet/intel/igc/igc_tsn.c
> index 6b299b83e7ef2..81770955029dc 100644
> --- a/drivers/net/ethernet/intel/igc/igc_tsn.c
> +++ b/drivers/net/ethernet/intel/igc/igc_tsn.c
> @@ -114,7 +114,6 @@ static int igc_tsn_disable_offload(struct igc_adapter *adapter)
>   static int igc_tsn_enable_offload(struct igc_adapter *adapter)
>   {
>   	struct igc_hw *hw = &adapter->hw;
> -	bool tsn_mode_reconfig = false;
>   	u32 tqavctrl, baset_l, baset_h;
>   	u32 sec, nsec, cycle;
>   	ktime_t base_time, systim;
> @@ -228,11 +227,10 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter)
>   
>   	tqavctrl = rd32(IGC_TQAVCTRL) & ~IGC_TQAVCTRL_FUTSCDDIS;
>   
> -	if (tqavctrl & IGC_TQAVCTRL_TRANSMIT_MODE_TSN)
> -		tsn_mode_reconfig = true;
> -
>   	tqavctrl |= IGC_TQAVCTRL_TRANSMIT_MODE_TSN | IGC_TQAVCTRL_ENHANCED_QAV;
>   
> +	adapter->qbv_count++;
> +
>   	cycle = adapter->cycle_time;
>   	base_time = adapter->base_time;
>   
> @@ -250,17 +248,28 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter)
>   		 */
>   		if ((rd32(IGC_BASET_H) || rd32(IGC_BASET_L)) &&
>   		    (adapter->tc_setup_type == TC_SETUP_QDISC_TAPRIO) &&
> -		    tsn_mode_reconfig)
> +		    (adapter->qbv_count > 1))
>   			adapter->qbv_config_change_errors++;
>   	} else {
> -		/* According to datasheet section 7.5.2.9.3.3, FutScdDis bit
> -		 * has to be configured before the cycle time and base time.
> -		 * Tx won't hang if there is a GCL is already running,
> -		 * so in this case we don't need to set FutScdDis.
> -		 */
> -		if (igc_is_device_id_i226(hw) &&
> -		    !(rd32(IGC_BASET_H) || rd32(IGC_BASET_L)))
> -			tqavctrl |= IGC_TQAVCTRL_FUTSCDDIS;
> +		if (igc_is_device_id_i226(hw)) {
> +			ktime_t adjust_time, expires_time;
> +
> +		       /* According to datasheet section 7.5.2.9.3.3, FutScdDis bit
> +			* has to be configured before the cycle time and base time.
> +			* Tx won't hang if there is a GCL is already running,

Remove second *is*?

> +			* so in this case we don't need to set FutScdDis.
> +			*/
> +			if (!(rd32(IGC_BASET_H) || rd32(IGC_BASET_L)))
> +				tqavctrl |= IGC_TQAVCTRL_FUTSCDDIS;
> +
> +			nsec = rd32(IGC_SYSTIML);
> +			sec = rd32(IGC_SYSTIMH);
> +			systim = ktime_set(sec, nsec);
> +
> +			adjust_time = adapter->base_time;
> +			expires_time = ktime_sub_ns(adjust_time, systim);
> +			hrtimer_start(&adapter->hrtimer, expires_time, HRTIMER_MODE_REL);
> +		}
>   	}
>   
>   	wr32(IGC_TQAVCTRL, tqavctrl);
> @@ -306,7 +315,11 @@ int igc_tsn_offload_apply(struct igc_adapter *adapter)
>   {
>   	struct igc_hw *hw = &adapter->hw;
>   
> -	if (netif_running(adapter->netdev) && igc_is_device_id_i225(hw)) {
> +	/* Per I225/6 HW Design Section 7.5.2.1, transmit mode
> +	 * cannot be change dynamically. Require reset the adapter.

change*d*

> +	 */
> +	if (netif_running(adapter->netdev) &&
> +	    (igc_is_device_id_i225(hw) || !adapter->qbv_count)) {
>   		schedule_work(&adapter->reset_task);
>   		return 0;
>   	}


Kind regards,

Paul


More information about the Intel-wired-lan mailing list