RE: [Intel-wired-lan] [PATCH iwl-next 2/7] i40e: Change argument of several client notification functions

[Loktionov, Aleksandr]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@xxxxxxxxxx> On
> Behalf Of Ivan Vecera
> Sent: Monday, March 18, 2024 3:31 PM
> To: intel-wired-lan@xxxxxxxxxxxxxxxx
> Cc: open list:NETWORKING DRIVERS <netdev@xxxxxxxxxxxxxxx>; open
> list <linux-kernel@xxxxxxxxxxxxxxx>; Eric Dumazet
> <edumazet@xxxxxxxxxx>; Nguyen, Anthony L
> <anthony.l.nguyen@xxxxxxxxx>; Jakub Kicinski <kuba@xxxxxxxxxx>;
> Paolo Abeni <pabeni@xxxxxxxxxx>; David S. Miller
> <davem@xxxxxxxxxxxxx>
> Subject: [Intel-wired-lan] [PATCH iwl-next 2/7] i40e: Change
> argument of several client notification functions
> 
Can you rename the title of the commit change -> refactor?
To make it obvious that there is no functionality change, just refactor?


> Commit 0ef2d5afb12d ("i40e: KISS the client interface") simplified
> the client interface so in practice it supports only one client per
> i40e netdev. But we have still 2 notification functions that uses
> as parameter a pointer to VSI of netdevice associated with the
> client. After the mentioned commit only possible and used VSI is
> the main (LAN) VSI.
> So change these functions so they are called with PF pointer
> argument and the associated VSI (LAN) is taken inside them.
> 
> Signed-off-by: Ivan Vecera <ivecera@xxxxxxxxxx>
> ---
>  drivers/net/ethernet/intel/i40e/i40e.h        |  4 ++--
>  drivers/net/ethernet/intel/i40e/i40e_client.c | 20 +++++++++------
> ----
>  drivers/net/ethernet/intel/i40e/i40e_main.c   | 12 +++++------
>  3 files changed, 17 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e.h
> b/drivers/net/ethernet/intel/i40e/i40e.h
> index 5248e78f7849..0792c7324527 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e.h
> @@ -1236,8 +1236,8 @@ static inline void i40e_dbg_exit(void) {}
> int i40e_lan_add_device(struct i40e_pf *pf);  int
> i40e_lan_del_device(struct i40e_pf *pf);  void
> i40e_client_subtask(struct i40e_pf *pf); -void
> i40e_notify_client_of_l2_param_changes(struct i40e_vsi *vsi); -void
> i40e_notify_client_of_netdev_close(struct i40e_vsi *vsi, bool
> reset);
> +void i40e_notify_client_of_l2_param_changes(struct i40e_pf *pf);
> void
> +i40e_notify_client_of_netdev_close(struct i40e_pf *pf, bool
> reset);
>  void i40e_notify_client_of_vf_enable(struct i40e_pf *pf, u32
> num_vfs);  void i40e_notify_client_of_vf_reset(struct i40e_pf *pf,
> u32 vf_id);  void i40e_client_update_msix_info(struct i40e_pf *pf);
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c
> b/drivers/net/ethernet/intel/i40e/i40e_client.c
> index b32071ee84af..93e52138826e 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_client.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_client.c
> @@ -101,25 +101,26 @@ i40e_notify_client_of_vf_msg(struct i40e_vsi
> *vsi, u32 vf_id, u8 *msg, u16 len)
> 
>  /**
>   * i40e_notify_client_of_l2_param_changes - call the client notify
> callback
> - * @vsi: the VSI with l2 param changes
> + * @pf: PF device pointer
>   *
> - * If there is a client to this VSI, call the client
> + * If there is a client, call its callback
>   **/
> -void i40e_notify_client_of_l2_param_changes(struct i40e_vsi *vsi)
> +void i40e_notify_client_of_l2_param_changes(struct i40e_pf *pf)
>  {
> -	struct i40e_pf *pf = vsi->back;
>  	struct i40e_client_instance *cdev = pf->cinst;
> +	struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
>  	struct i40e_params params;
> 
>  	if (!cdev || !cdev->client)
>  		return;
>  	if (!cdev->client->ops || !cdev->client->ops-
> >l2_param_change) {
> -		dev_dbg(&vsi->back->pdev->dev,
> +		dev_dbg(&pf->pdev->dev,
>  			"Cannot locate client instance l2_param_change
> routine\n");
>  		return;
>  	}
>  	if (!test_bit(__I40E_CLIENT_INSTANCE_OPENED, &cdev->state)) {
> -		dev_dbg(&vsi->back->pdev->dev, "Client is not open,
> abort l2 param change\n");
> +		dev_dbg(&pf->pdev->dev,
> +			"Client is not open, abort l2 param change\n");
>  		return;
>  	}
>  	memset(&params, 0, sizeof(params));
> @@ -157,20 +158,19 @@ static void i40e_client_release_qvlist(struct
> i40e_info *ldev)
> 
>  /**
>   * i40e_notify_client_of_netdev_close - call the client close
> callback
> - * @vsi: the VSI with netdev closed
> + * @pf: PF device pointer
>   * @reset: true when close called due to a reset pending
>   *
>   * If there is a client to this netdev, call the client with close
>   **/
> -void i40e_notify_client_of_netdev_close(struct i40e_vsi *vsi, bool
> reset)
> +void i40e_notify_client_of_netdev_close(struct i40e_pf *pf, bool
> reset)
>  {
> -	struct i40e_pf *pf = vsi->back;
>  	struct i40e_client_instance *cdev = pf->cinst;
> 
>  	if (!cdev || !cdev->client)
>  		return;
>  	if (!cdev->client->ops || !cdev->client->ops->close) {
> -		dev_dbg(&vsi->back->pdev->dev,
> +		dev_dbg(&pf->pdev->dev,
>  			"Cannot locate client instance close routine\n");
>  		return;
>  	}
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
> b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 2f1604ae78c7..7fed7fb69d4e 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -11283,14 +11283,12 @@ static void i40e_service_task(struct
> work_struct *work)
>  		i40e_fdir_reinit_subtask(pf);
>  		if (test_and_clear_bit(__I40E_CLIENT_RESET, pf->state))
> {
>  			/* Client subtask will reopen next time through.
> */
> -			i40e_notify_client_of_netdev_close(pf->vsi[pf-
> >lan_vsi],
> -							   true);
> +			i40e_notify_client_of_netdev_close(pf, true);
>  		} else {
>  			i40e_client_subtask(pf);
>  			if (test_and_clear_bit(__I40E_CLIENT_L2_CHANGE,
>  					       pf->state))
> -				i40e_notify_client_of_l2_param_changes(
> -								pf->vsi[pf-
> >lan_vsi]);
> +				i40e_notify_client_of_l2_param_changes(pf);
>  		}
>  		i40e_sync_filters_subtask(pf);
>  	} else {
> @@ -16228,7 +16226,7 @@ static void i40e_remove(struct pci_dev
> *pdev)
>  	/* Client close must be called explicitly here because the
> timer
>  	 * has been stopped.
>  	 */
> -	i40e_notify_client_of_netdev_close(pf->vsi[pf->lan_vsi],
> false);
> +	i40e_notify_client_of_netdev_close(pf, false);
> 
>  	i40e_fdir_teardown(pf);
> 
> @@ -16487,7 +16485,7 @@ static void i40e_shutdown(struct pci_dev
> *pdev)
>  	/* Client close must be called explicitly here because the
> timer
>  	 * has been stopped.
>  	 */
> -	i40e_notify_client_of_netdev_close(pf->vsi[pf->lan_vsi],
> false);
> +	i40e_notify_client_of_netdev_close(pf, false);
> 
>  	if (test_bit(I40E_HW_CAP_WOL_MC_MAGIC_PKT_WAKE, pf->hw.caps)
> &&
>  	    pf->wol_en)
> @@ -16541,7 +16539,7 @@ static int i40e_suspend(struct device *dev)
>  	/* Client close must be called explicitly here because the
> timer
>  	 * has been stopped.
>  	 */
> -	i40e_notify_client_of_netdev_close(pf->vsi[pf->lan_vsi],
> false);
> +	i40e_notify_client_of_netdev_close(pf, false);
> 
>  	if (test_bit(I40E_HW_CAP_WOL_MC_MAGIC_PKT_WAKE, pf->hw.caps)
> &&
>  	    pf->wol_en)
> --
> 2.43.0