[Intel-wired-lan] [PATCH net-next] ice: Forbid trusted VFs in switchdev mode

Jesse Brandeburg jesse.brandeburg at intel.com
Thu Oct 14 18:16:07 UTC 2021


On 10/14/2021 9:09 AM, Wojciech Drewek wrote:
> During auto-merge, check for switchdev mode has been inserted
> in wrong place. It should be in ice_set_vf_trust not in ice_set_vf_mac.
> 
> Trusted VFs are forbidden in switchdev mode because they should
> be configured only from the host side.
> 

should have had
Fixes: 1c54c839935b ("ice: enable/disable switchdev when managing VFs")


> Signed-off-by: Wojciech Drewek <wojciech.drewek at intel.com>
> ---
>   drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
> index 3e7fdd7f2e1d..edbc417f8c7d 100644
> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
> @@ -4815,11 +4815,6 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
>   	struct ice_vf *vf;
>   	int ret;
>   
> -	if (ice_is_eswitch_mode_switchdev(pf)) {
> -		dev_info(ice_pf_to_dev(pf), "Trusted VF is forbidden in switchdev mode\n");
> -		return -EOPNOTSUPP;
> -	}
> -
>   	if (ice_validate_vf_id(pf, vf_id))
>   		return -EINVAL;
>   
> @@ -4882,6 +4877,11 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)
>   	struct ice_vf *vf;
>   	int ret;
>   
> +	if (ice_is_eswitch_mode_switchdev(pf)) {
> +		dev_info(ice_pf_to_dev(pf), "Trusted VF is forbidden in switchdev mode\n");
> +		return -EOPNOTSUPP;
> +	}
> +
>   	if (ice_validate_vf_id(pf, vf_id))
>   		return -EINVAL;
>   
> 



More information about the Intel-wired-lan mailing list