bnx2x: remove ndo_poll_controller
As diagnosed by Song Liu, ndo_poll_controller() can be very dangerous on loaded hosts, since the cpu calling ndo_poll_controller() might steal all NAPI contexts (for all RX/TX queues of the NIC). This capture can last for unlimited amount of time, since one cpu is generally not able to drain all the queues under load. bnx2x uses NAPI for TX completions, so we better let core networking stack call the napi->poll() to avoid the capture. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Ariel Elior <ariel.elior@cavium.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9c29bcd189
commit
d8ea6a91ad
|
@ -12894,19 +12894,6 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
||||||
static void poll_bnx2x(struct net_device *dev)
|
|
||||||
{
|
|
||||||
struct bnx2x *bp = netdev_priv(dev);
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for_each_eth_queue(bp, i) {
|
|
||||||
struct bnx2x_fastpath *fp = &bp->fp[i];
|
|
||||||
napi_schedule(&bnx2x_fp(bp, fp->index, napi));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int bnx2x_validate_addr(struct net_device *dev)
|
static int bnx2x_validate_addr(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct bnx2x *bp = netdev_priv(dev);
|
struct bnx2x *bp = netdev_priv(dev);
|
||||||
|
@ -13113,9 +13100,6 @@ static const struct net_device_ops bnx2x_netdev_ops = {
|
||||||
.ndo_tx_timeout = bnx2x_tx_timeout,
|
.ndo_tx_timeout = bnx2x_tx_timeout,
|
||||||
.ndo_vlan_rx_add_vid = bnx2x_vlan_rx_add_vid,
|
.ndo_vlan_rx_add_vid = bnx2x_vlan_rx_add_vid,
|
||||||
.ndo_vlan_rx_kill_vid = bnx2x_vlan_rx_kill_vid,
|
.ndo_vlan_rx_kill_vid = bnx2x_vlan_rx_kill_vid,
|
||||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
||||||
.ndo_poll_controller = poll_bnx2x,
|
|
||||||
#endif
|
|
||||||
.ndo_setup_tc = __bnx2x_setup_tc,
|
.ndo_setup_tc = __bnx2x_setup_tc,
|
||||||
#ifdef CONFIG_BNX2X_SRIOV
|
#ifdef CONFIG_BNX2X_SRIOV
|
||||||
.ndo_set_vf_mac = bnx2x_set_vf_mac,
|
.ndo_set_vf_mac = bnx2x_set_vf_mac,
|
||||||
|
|
Loading…
Reference in New Issue