Commit 07d44190a389 ("i40e/i40evf: Detect and recover hung queue
scenario") changes i40e_detect_recover_hung() argument type from
i40e_pf* to i40e_vsi* to be shareable by both i40e and i40evf.
Because the i40evf does not exist anymore and the function is
exclusively used by i40e we can revert this change.
Reviewed-by: Michal Schmidt <[email protected]>
Signed-off-by: Ivan Vecera <[email protected]>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 10 ++++++----
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 7fed7fb69d4e..1ba28893f49e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11274,7 +11274,7 @@ static void i40e_service_task(struct work_struct *work)
return;
if (!test_bit(__I40E_RECOVERY_MODE, pf->state)) {
- i40e_detect_recover_hung(pf->vsi[pf->lan_vsi]);
+ i40e_detect_recover_hung(pf);
i40e_sync_filters_subtask(pf);
i40e_reset_subtask(pf);
i40e_handle_mdd_event(pf);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 1a12b732818e..e35a08de16b2 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -860,13 +860,15 @@ u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw)
/**
* i40e_detect_recover_hung - Function to detect and recover hung_queues
- * @vsi: pointer to vsi struct with tx queues
+ * @pf: pointer to PF struct
*
- * VSI has netdev and netdev has TX queues. This function is to check each of
- * those TX queues if they are hung, trigger recovery by issuing SW interrupt.
+ * LAN VSI has netdev and netdev has TX queues. This function is to check
+ * each of those TX queues if they are hung, trigger recovery by issuing
+ * SW interrupt.
**/
-void i40e_detect_recover_hung(struct i40e_vsi *vsi)
+void i40e_detect_recover_hung(struct i40e_pf *pf)
{
+ struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
struct i40e_ring *tx_ring = NULL;
struct net_device *netdev;
unsigned int i;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index 2cdc7de6301c..7c26c9a2bf65 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@ -470,7 +470,7 @@ void i40e_free_rx_resources(struct i40e_ring *rx_ring);
int i40e_napi_poll(struct napi_struct *napi, int budget);
void i40e_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector);
u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw);
-void i40e_detect_recover_hung(struct i40e_vsi *vsi);
+void i40e_detect_recover_hung(struct i40e_pf *pf);
int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);
bool __i40e_chk_linearize(struct sk_buff *skb);
int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
--
2.43.0
On Wed, Mar 27, 2024 at 08:57:29AM +0100, Ivan Vecera wrote:
> Commit 07d44190a389 ("i40e/i40evf: Detect and recover hung queue
> scenario") changes i40e_detect_recover_hung() argument type from
> i40e_pf* to i40e_vsi* to be shareable by both i40e and i40evf.
> Because the i40evf does not exist anymore and the function is
> exclusively used by i40e we can revert this change.
>
> Reviewed-by: Michal Schmidt <[email protected]>
> Signed-off-by: Ivan Vecera <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
On Wed, Mar 27, 2024 at 1:28 PM Ivan Vecera <[email protected]> wrote:
>
> Commit 07d44190a389 ("i40e/i40evf: Detect and recover hung queue
> scenario") changes i40e_detect_recover_hung() argument type from
> i40e_pf* to i40e_vsi* to be shareable by both i40e and i40evf.
> Because the i40evf does not exist anymore and the function is
> exclusively used by i40e we can revert this change.
>
> Reviewed-by: Michal Schmidt <[email protected]>
> Signed-off-by: Ivan Vecera <[email protected]>
Reviewed-by: Kalesh AP <[email protected]>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 10 ++++++----
> drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +-
> 3 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 7fed7fb69d4e..1ba28893f49e 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -11274,7 +11274,7 @@ static void i40e_service_task(struct work_struct *work)
> return;
>
> if (!test_bit(__I40E_RECOVERY_MODE, pf->state)) {
> - i40e_detect_recover_hung(pf->vsi[pf->lan_vsi]);
> + i40e_detect_recover_hung(pf);
> i40e_sync_filters_subtask(pf);
> i40e_reset_subtask(pf);
> i40e_handle_mdd_event(pf);
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> index 1a12b732818e..e35a08de16b2 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> @@ -860,13 +860,15 @@ u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw)
>
> /**
> * i40e_detect_recover_hung - Function to detect and recover hung_queues
> - * @vsi: pointer to vsi struct with tx queues
> + * @pf: pointer to PF struct
> *
> - * VSI has netdev and netdev has TX queues. This function is to check each of
> - * those TX queues if they are hung, trigger recovery by issuing SW interrupt.
> + * LAN VSI has netdev and netdev has TX queues. This function is to check
> + * each of those TX queues if they are hung, trigger recovery by issuing
> + * SW interrupt.
> **/
> -void i40e_detect_recover_hung(struct i40e_vsi *vsi)
> +void i40e_detect_recover_hung(struct i40e_pf *pf)
> {
> + struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
> struct i40e_ring *tx_ring = NULL;
> struct net_device *netdev;
> unsigned int i;
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
> index 2cdc7de6301c..7c26c9a2bf65 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
> @@ -470,7 +470,7 @@ void i40e_free_rx_resources(struct i40e_ring *rx_ring);
> int i40e_napi_poll(struct napi_struct *napi, int budget);
> void i40e_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector);
> u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw);
> -void i40e_detect_recover_hung(struct i40e_vsi *vsi);
> +void i40e_detect_recover_hung(struct i40e_pf *pf);
> int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);
> bool __i40e_chk_linearize(struct sk_buff *skb);
> int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
> --
> 2.43.0
>
>
--
Regards,
Kalesh A P
> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On
> Behalf Of Kalesh Anakkur Purayil
> Sent: Friday, March 29, 2024 5:47 AM
> To: ivecera <[email protected]>
> Cc: [email protected]; [email protected];
> Loktionov, Aleksandr <[email protected]>;
> [email protected]; [email protected];
> [email protected]; Nguyen, Anthony L <[email protected]>;
> [email protected]; [email protected]
> Subject: Re: [Intel-wired-lan] [PATCH iwl-next v2 3/7] i40e:
> Refactor argument of i40e_detect_recover_hung()
>
> On Wed, Mar 27, 2024 at 1:28 PM Ivan Vecera <[email protected]>
> wrote:
> >
> > Commit 07d44190a389 ("i40e/i40evf: Detect and recover hung queue
> > scenario") changes i40e_detect_recover_hung() argument type from
> > i40e_pf* to i40e_vsi* to be shareable by both i40e and i40evf.
> > Because the i40evf does not exist anymore and the function is
> > exclusively used by i40e we can revert this change.
> >
> > Reviewed-by: Michal Schmidt <[email protected]>
> > Signed-off-by: Ivan Vecera <[email protected]>
>
> Reviewed-by: Kalesh AP <[email protected]>
Reviewed-by: Aleksandr Loktionov <[email protected]>
> > ---
> > drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
> > drivers/net/ethernet/intel/i40e/i40e_txrx.c | 10 ++++++----
> > drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +-
> > 3 files changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
> b/drivers/net/ethernet/intel/i40e/i40e_main.c
> > index 7fed7fb69d4e..1ba28893f49e 100644
> > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> > @@ -11274,7 +11274,7 @@ static void i40e_service_task(struct
> work_struct *work)
> > return;
> >
> > if (!test_bit(__I40E_RECOVERY_MODE, pf->state)) {
> > - i40e_detect_recover_hung(pf->vsi[pf->lan_vsi]);
> > + i40e_detect_recover_hung(pf);
> > i40e_sync_filters_subtask(pf);
> > i40e_reset_subtask(pf);
> > i40e_handle_mdd_event(pf);
> > diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> > index 1a12b732818e..e35a08de16b2 100644
> > --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> > +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> > @@ -860,13 +860,15 @@ u32 i40e_get_tx_pending(struct i40e_ring
> *ring, bool in_sw)
> >
> > /**
> > * i40e_detect_recover_hung - Function to detect and recover
> hung_queues
> > - * @vsi: pointer to vsi struct with tx queues
> > + * @pf: pointer to PF struct
> > *
> > - * VSI has netdev and netdev has TX queues. This function is to
> check each of
> > - * those TX queues if they are hung, trigger recovery by issuing
> SW interrupt.
> > + * LAN VSI has netdev and netdev has TX queues. This function is
> to check
> > + * each of those TX queues if they are hung, trigger recovery by
> issuing
> > + * SW interrupt.
> > **/
> > -void i40e_detect_recover_hung(struct i40e_vsi *vsi)
> > +void i40e_detect_recover_hung(struct i40e_pf *pf)
> > {
> > + struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
> > struct i40e_ring *tx_ring = NULL;
> > struct net_device *netdev;
> > unsigned int i;
> > diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
> b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
> > index 2cdc7de6301c..7c26c9a2bf65 100644
> > --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
> > +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
> > @@ -470,7 +470,7 @@ void i40e_free_rx_resources(struct i40e_ring
> *rx_ring);
> > int i40e_napi_poll(struct napi_struct *napi, int budget);
> > void i40e_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector
> *q_vector);
> > u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw);
> > -void i40e_detect_recover_hung(struct i40e_vsi *vsi);
> > +void i40e_detect_recover_hung(struct i40e_pf *pf);
> > int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);
> > bool __i40e_chk_linearize(struct sk_buff *skb);
> > int i40e_xdp_xmit(struct net_device *dev, int n, struct
> xdp_frame **frames,
> > --
> > 2.43.0
> >
> >
>
>
> --
> Regards,
> Kalesh A P
> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf Of Ivan Vecera
> Sent: Wednesday, March 27, 2024 1:27 PM
> To: [email protected]
> Cc: [email protected]; [email protected]; Loktionov, Aleksandr <[email protected]>; [email protected]; Nguyen, Anthony L <[email protected]>; [email protected]; [email protected]; [email protected]
> Subject: [Intel-wired-lan] [PATCH iwl-next v2 3/7] i40e: Refactor argument of i40e_detect_recover_hung()
>
> Commit 07d44190a389 ("i40e/i40evf: Detect and recover hung queue
> scenario") changes i40e_detect_recover_hung() argument type from
> i40e_pf* to i40e_vsi* to be shareable by both i40e and i40evf.
> Because the i40evf does not exist anymore and the function is exclusively used by i40e we can revert this change.
>
> Reviewed-by: Michal Schmidt <[email protected]>
> Signed-off-by: Ivan Vecera <[email protected]>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 10 ++++++---- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +-
> 3 files changed, 8 insertions(+), 6 deletions(-)
>
Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel)