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

Commit e470757d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

pktgen: use netdev_alloc_skb 



netdev_alloc_skb is NUMA node aware.
Also, don't exhaust atomic emergency pool. Don't want pktgen
to cause OOM behaviour.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d7bb1cf

net/core/pktgen.c

+6 −4
Original line number Diff line number Diff line
@@ -2539,8 +2539,9 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, 
	mod_cur_headers(pkt_dev);



	datalen = (odev->hard_header_len + 16) & ~0xf;

	skb = alloc_skb(pkt_dev->cur_pkt_size + 64 + datalen +

			pkt_dev->pkt_overhead, GFP_ATOMIC);

	skb = __netdev_alloc_skb(odev,

				 pkt_dev->cur_pkt_size + 64

				 + datalen + pkt_dev->pkt_overhead, GFP_NOWAIT);

	if (!skb) {

		sprintf(pkt_dev->result, "No memory");

		return NULL;
@@ -2878,8 +2879,9 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev, 
	queue_map = pkt_dev->cur_queue_map;

	mod_cur_headers(pkt_dev);



	skb = alloc_skb(pkt_dev->cur_pkt_size + 64 + 16 +

			pkt_dev->pkt_overhead, GFP_ATOMIC);

	skb = __netdev_alloc_skb(odev,

				 pkt_dev->cur_pkt_size + 64

				 + 16 + pkt_dev->pkt_overhead, GFP_NOWAIT);

	if (!skb) {

		sprintf(pkt_dev->result, "No memory");

		return NULL;