Commit 68622d07 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by David S. Miller

hv_netvsc: Sync offloading features to VF NIC

VF NIC may go down then come up during host servicing events. This
causes the VF NIC offloading feature settings to roll back to the
defaults. This patch can synchronize features from synthetic NIC to
the VF NIC during ndo_set_features (ethtool -K),
and netvsc_register_vf when VF comes back after host events.
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Cc: Mark Bloch <markb@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b441f795
...@@ -1785,13 +1785,15 @@ static int netvsc_set_features(struct net_device *ndev, ...@@ -1785,13 +1785,15 @@ static int netvsc_set_features(struct net_device *ndev,
netdev_features_t change = features ^ ndev->features; netdev_features_t change = features ^ ndev->features;
struct net_device_context *ndevctx = netdev_priv(ndev); struct net_device_context *ndevctx = netdev_priv(ndev);
struct netvsc_device *nvdev = rtnl_dereference(ndevctx->nvdev); struct netvsc_device *nvdev = rtnl_dereference(ndevctx->nvdev);
struct net_device *vf_netdev = rtnl_dereference(ndevctx->vf_netdev);
struct ndis_offload_params offloads; struct ndis_offload_params offloads;
int ret = 0;
if (!nvdev || nvdev->destroy) if (!nvdev || nvdev->destroy)
return -ENODEV; return -ENODEV;
if (!(change & NETIF_F_LRO)) if (!(change & NETIF_F_LRO))
return 0; goto syncvf;
memset(&offloads, 0, sizeof(struct ndis_offload_params)); memset(&offloads, 0, sizeof(struct ndis_offload_params));
...@@ -1803,7 +1805,19 @@ static int netvsc_set_features(struct net_device *ndev, ...@@ -1803,7 +1805,19 @@ static int netvsc_set_features(struct net_device *ndev,
offloads.rsc_ip_v6 = NDIS_OFFLOAD_PARAMETERS_RSC_DISABLED; offloads.rsc_ip_v6 = NDIS_OFFLOAD_PARAMETERS_RSC_DISABLED;
} }
return rndis_filter_set_offload_params(ndev, nvdev, &offloads); ret = rndis_filter_set_offload_params(ndev, nvdev, &offloads);
if (ret)
features ^= NETIF_F_LRO;
syncvf:
if (!vf_netdev)
return ret;
vf_netdev->wanted_features = features;
netdev_update_features(vf_netdev);
return ret;
} }
static u32 netvsc_get_msglevel(struct net_device *ndev) static u32 netvsc_get_msglevel(struct net_device *ndev)
...@@ -2181,6 +2195,10 @@ static int netvsc_register_vf(struct net_device *vf_netdev) ...@@ -2181,6 +2195,10 @@ static int netvsc_register_vf(struct net_device *vf_netdev)
dev_hold(vf_netdev); dev_hold(vf_netdev);
rcu_assign_pointer(net_device_ctx->vf_netdev, vf_netdev); rcu_assign_pointer(net_device_ctx->vf_netdev, vf_netdev);
vf_netdev->wanted_features = ndev->features;
netdev_update_features(vf_netdev);
return NOTIFY_OK; return NOTIFY_OK;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment