Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8779ec1 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

netpoll: Remove gfp parameter from __netpoll_setup 



The gfp parameter was added in:
commit 47be03a2
Author: Amerigo Wang <amwang@redhat.com>
Date:   Fri Aug 10 01:24:37 2012 +0000

    netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup()

    slave_enable_netpoll() and __netpoll_setup() may be called
    with read_lock() held, so should use GFP_ATOMIC to allocate
    memory. Eric suggested to pass gfp flags to __netpoll_setup().

    Cc: Eric Dumazet <eric.dumazet@gmail.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
    Signed-off-by: default avatarCong Wang <amwang@redhat.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>

The reason for the gfp parameter was removed in:
commit c4cdef9b
Author: dingtianhong <dingtianhong@huawei.com>
Date:   Tue Jul 23 15:25:27 2013 +0800

    bonding: don't call slave_xxx_netpoll under spinlocks

    The slave_xxx_netpoll will call synchronize_rcu_bh(),
    so the function may schedule and sleep, it should't be
    called under spinlocks.

    bond_netpoll_setup() and bond_netpoll_cleanup() are always
    protected by rtnl lock, it is no need to take the read lock,
    as the slave list couldn't be changed outside rtnl lock.

    Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
    Cc: Jay Vosburgh <fubar@us.ibm.com>
    Cc: Andy Gospodarek <andy@greyhouse.net>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>

Nothing else that calls __netpoll_setup or ndo_netpoll_setup
requires a gfp paramter, so remove the gfp parameter from both
of these functions making the code clearer.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f705f73

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -922,12 +922,12 @@ static inline int slave_enable_netpoll(struct slave *slave) 
	struct netpoll *np;

	int err = 0;



	np = kzalloc(sizeof(*np), GFP_ATOMIC);

	np = kzalloc(sizeof(*np), GFP_KERNEL);

	err = -ENOMEM;

	if (!np)

		goto out;



	err = __netpoll_setup(np, slave->dev, GFP_ATOMIC);

	err = __netpoll_setup(np, slave->dev);

	if (err) {

		kfree(np);

		goto out;
@@ -962,7 +962,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev) 
			slave_disable_netpoll(slave);

}



static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp)

static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)

{

	struct bonding *bond = netdev_priv(dev);

	struct list_head *iter;

drivers/net/team/team.c

+7 −9
Original line number Diff line number Diff line
@@ -1031,8 +1031,7 @@ static void team_port_leave(struct team *team, struct team_port *port) 
}



#ifdef CONFIG_NET_POLL_CONTROLLER

static int team_port_enable_netpoll(struct team *team, struct team_port *port,

				    gfp_t gfp)

static int team_port_enable_netpoll(struct team *team, struct team_port *port)

{

	struct netpoll *np;

	int err;
@@ -1040,11 +1039,11 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port, 
	if (!team->dev->npinfo)

		return 0;



	np = kzalloc(sizeof(*np), gfp);

	np = kzalloc(sizeof(*np), GFP_KERNEL);

	if (!np)

		return -ENOMEM;



	err = __netpoll_setup(np, port->dev, gfp);

	err = __netpoll_setup(np, port->dev);

	if (err) {

		kfree(np);

		return err;
@@ -1067,8 +1066,7 @@ static void team_port_disable_netpoll(struct team_port *port) 
	kfree(np);

}

#else

static int team_port_enable_netpoll(struct team *team, struct team_port *port,

				    gfp_t gfp)

static int team_port_enable_netpoll(struct team *team, struct team_port *port)

{

	return 0;

}
@@ -1156,7 +1154,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev) 
		goto err_vids_add;

	}



	err = team_port_enable_netpoll(team, port, GFP_KERNEL);

	err = team_port_enable_netpoll(team, port);

	if (err) {

		netdev_err(dev, "Failed to enable netpoll on device %s\n",

			   portname);
@@ -1850,7 +1848,7 @@ static void team_netpoll_cleanup(struct net_device *dev) 
}



static int team_netpoll_setup(struct net_device *dev,

			      struct netpoll_info *npifo, gfp_t gfp)

			      struct netpoll_info *npifo)

{

	struct team *team = netdev_priv(dev);

	struct team_port *port;
@@ -1858,7 +1856,7 @@ static int team_netpoll_setup(struct net_device *dev, 


	mutex_lock(&team->lock);

	list_for_each_entry(port, &team->port_list, list) {

		err = team_port_enable_netpoll(team, port, gfp);

		err = team_port_enable_netpoll(team, port);

		if (err) {

			__team_netpoll_cleanup(team);

			break;

include/linux/netdevice.h

+1 −2
Original line number Diff line number Diff line
@@ -1037,8 +1037,7 @@ struct net_device_ops { 
#ifdef CONFIG_NET_POLL_CONTROLLER

	void                    (*ndo_poll_controller)(struct net_device *dev);

	int			(*ndo_netpoll_setup)(struct net_device *dev,

						     struct netpoll_info *info,

						     gfp_t gfp);

						     struct netpoll_info *info);

	void			(*ndo_netpoll_cleanup)(struct net_device *dev);

#endif

#ifdef CONFIG_NET_RX_BUSY_POLL

include/linux/netpoll.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static inline void netpoll_rx_enable(struct net_device *dev) { return; } 
void netpoll_send_udp(struct netpoll *np, const char *msg, int len);

void netpoll_print_options(struct netpoll *np);

int netpoll_parse_options(struct netpoll *np, char *opt);

int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp);

int __netpoll_setup(struct netpoll *np, struct net_device *ndev);

int netpoll_setup(struct netpoll *np);

void __netpoll_cleanup(struct netpoll *np);

void __netpoll_free_async(struct netpoll *np);

net/8021q/vlan_dev.c

+3 −4
Original line number Diff line number Diff line
@@ -707,20 +707,19 @@ static void vlan_dev_poll_controller(struct net_device *dev) 
	return;

}



static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo,

				  gfp_t gfp)

static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)

{

	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);

	struct net_device *real_dev = vlan->real_dev;

	struct netpoll *netpoll;

	int err = 0;



	netpoll = kzalloc(sizeof(*netpoll), gfp);

	netpoll = kzalloc(sizeof(*netpoll), GFP_KERNEL);

	err = -ENOMEM;

	if (!netpoll)

		goto out;



	err = __netpoll_setup(netpoll, real_dev, gfp);

	err = __netpoll_setup(netpoll, real_dev);

	if (err) {

		kfree(netpoll);

		goto out;