1 files changed, 28 insertions, 15 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 6e79e96cb4f2..43923811bd6a 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -250,8 +250,7 @@ struct pktgen_dev {
         __u64 count;            /* Default No packets to send */
         __u64 sofar;            /* How many pkts we've sent so far */
         __u64 tx_bytes;         /* How many bytes we've transmitted */
-        __u64 errors;           /* Errors when trying to transmit,
-                                   pkts will be re-sent */
+        __u64 errors;           /* Errors when trying to transmit, */
 
         /* runtime counters relating to clone_skb */
 
@@ -340,6 +339,7 @@ struct pktgen_dev {
         __u16 cur_udp_src;
         __u16 cur_queue_map;
         __u32 cur_pkt_size;
+        __u32 last_pkt_size;
 
         __u8 hh[14];
         /* = {
@@ -2051,9 +2051,8 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
                                 read_lock_bh(&idev->lock);
                                 for (ifp = idev->addr_list; ifp;
                                      ifp = ifp->if_next) {
-                                        if (ifp->scope == IFA_LINK
-                                            && !(ifp->
-                                                 flags & IFA_F_TENTATIVE)) {
+                                        if (ifp->scope == IFA_LINK &&
+                                            !(ifp->flags & IFA_F_TENTATIVE)) {
                                                 ipv6_addr_copy(&pkt_dev->
                                                                cur_in6_saddr,
                                                                &ifp->addr);
@@ -2189,12 +2188,13 @@ static inline int f_pick(struct pktgen_dev *pkt_dev)
 /* If there was already an IPSEC SA, we keep it as is, else
  * we go look for it ...
 */
+#define DUMMY_MARK 0
 static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
 {
         struct xfrm_state *x = pkt_dev->flows[flow].x;
         if (!x) {
                 /*slow path: we dont already have xfrm_state*/
-                x = xfrm_stateonly_find(&init_net,
+                x = xfrm_stateonly_find(&init_net, DUMMY_MARK,
                                         (xfrm_address_t *)&pkt_dev->cur_daddr,
                                         (xfrm_address_t *)&pkt_dev->cur_saddr,
                                         AF_INET,
@@ -3436,7 +3436,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                         pkt_dev->clone_count--; /* back out increment, OOM */
                         return;
                 }
-
+                pkt_dev->last_pkt_size = pkt_dev->skb->len;
                 pkt_dev->allocated_skbs++;
                 pkt_dev->clone_count = 0;       /* reset counter */
         }
@@ -3448,12 +3448,14 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
         txq = netdev_get_tx_queue(odev, queue_map);
 
         __netif_tx_lock_bh(txq);
-        atomic_inc(&(pkt_dev->skb->users));
 
-        if (unlikely(netif_tx_queue_stopped(txq) || netif_tx_queue_frozen(txq)))
+        if (unlikely(netif_tx_queue_stopped(txq) || netif_tx_queue_frozen(txq))) {
                 ret = NETDEV_TX_BUSY;
-        else
-                ret = (*xmit)(pkt_dev->skb, odev);
+                pkt_dev->last_ok = 0;
+                goto unlock;
+        }
+        atomic_inc(&(pkt_dev->skb->users));
+        ret = (*xmit)(pkt_dev->skb, odev);
 
         switch (ret) {
         case NETDEV_TX_OK:
@@ -3461,7 +3463,13 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                 pkt_dev->last_ok = 1;
                 pkt_dev->sofar++;
                 pkt_dev->seq_num++;
-                pkt_dev->tx_bytes += pkt_dev->cur_pkt_size;
+                pkt_dev->tx_bytes += pkt_dev->last_pkt_size;
+                break;
+        case NET_XMIT_DROP:
+        case NET_XMIT_CN:
+        case NET_XMIT_POLICED:
+                /* skb has been consumed */
+                pkt_dev->errors++;
                 break;
         default: /* Drivers are not supposed to return other values! */
                 if (net_ratelimit())
@@ -3475,6 +3483,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                 atomic_dec(&(pkt_dev->skb->users));
                 pkt_dev->last_ok = 0;
         }
+unlock:
         __netif_tx_unlock_bh(txq);
 
         /* If pkt_dev->count is zero, then run forever */
@@ -3516,6 +3525,7 @@ static int pktgen_thread_worker(void *arg)
                         wait_event_interruptible_timeout(t->queue,
                                                          t->control != 0,
                                                          HZ/10);
+                        try_to_freeze();
                         continue;
                 }
 
@@ -3622,6 +3632,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
 {
         struct pktgen_dev *pkt_dev;
         int err;
+        int node = cpu_to_node(t->cpu);
 
         /* We don't allow a device to be on several threads */
 
@@ -3631,12 +3642,13 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
                 return -EBUSY;
         }
 
-        pkt_dev = kzalloc(sizeof(struct pktgen_dev), GFP_KERNEL);
+        pkt_dev = kzalloc_node(sizeof(struct pktgen_dev), GFP_KERNEL, node);
         if (!pkt_dev)
                 return -ENOMEM;
 
         strcpy(pkt_dev->odevname, ifname);
-        pkt_dev->flows = vmalloc(MAX_CFLOWS * sizeof(struct flow_state));
+        pkt_dev->flows = vmalloc_node(MAX_CFLOWS * sizeof(struct flow_state),
+                                      node);
         if (pkt_dev->flows == NULL) {
                 kfree(pkt_dev);
                 return -ENOMEM;
@@ -3698,7 +3710,8 @@ static int __init pktgen_create_thread(int cpu)
         struct proc_dir_entry *pe;
         struct task_struct *p;
 
-        t = kzalloc(sizeof(struct pktgen_thread), GFP_KERNEL);
+        t = kzalloc_node(sizeof(struct pktgen_thread), GFP_KERNEL,
+                         cpu_to_node(cpu));
         if (!t) {
                 printk(KERN_ERR "pktgen: ERROR: out of memory, can't "
                        "create new thread.\n");