1 files changed, 52 insertions, 8 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 9f0a780aa916..683da7065886 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -181,6 +181,7 @@
 #define F_MPLS_RND    (1<<8)    /* Random MPLS labels */
 #define F_VID_RND     (1<<9)    /* Random VLAN ID */
 #define F_SVID_RND    (1<<10)   /* Random SVLAN ID */
+#define F_FLOW_SEQ    (1<<11)   /* Sequential flows */
 
 /* Thread control flag bits */
 #define T_TERMINATE   (1<<0)
@@ -207,8 +208,12 @@ static struct proc_dir_entry *pg_proc_dir = NULL;
 struct flow_state {
         __be32 cur_daddr;
         int count;
+        __u32 flags;
 };
 
+/* flow flag bits */
+#define F_INIT   (1<<0)         /* flow has been initialized */
+
 struct pktgen_dev {
         /*
          * Try to keep frequent/infrequent used vars. separated.
@@ -342,6 +347,7 @@ struct pktgen_dev {
         unsigned cflows;        /* Concurrent flows (config) */
         unsigned lflow;         /* Flow length  (config) */
         unsigned nflows;        /* accumulated flows (stats) */
+        unsigned curfl;         /* current sequenced flow (state)*/
 
         char result[512];
 };
@@ -691,6 +697,13 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
         if (pkt_dev->flags & F_MPLS_RND)
                 seq_printf(seq,  "MPLS_RND  ");
 
+        if (pkt_dev->cflows) {
+                if (pkt_dev->flags & F_FLOW_SEQ)
+                        seq_printf(seq,  "FLOW_SEQ  "); /*in sequence flows*/
+                else
+                        seq_printf(seq,  "FLOW_RND  ");
+        }
+
         if (pkt_dev->flags & F_MACSRC_RND)
                 seq_printf(seq, "MACSRC_RND  ");
 
@@ -1182,6 +1195,9 @@ static ssize_t pktgen_if_write(struct file *file,
                 else if (strcmp(f, "!SVID_RND") == 0)
                         pkt_dev->flags &= ~F_SVID_RND;
 
+                else if (strcmp(f, "FLOW_SEQ") == 0)
+                        pkt_dev->flags |= F_FLOW_SEQ;
+
                 else if (strcmp(f, "!IPV6") == 0)
                         pkt_dev->flags &= ~F_IPV6;
 
@@ -1190,7 +1206,7 @@ static ssize_t pktgen_if_write(struct file *file,
                                 "Flag -:%s:- unknown\nAvailable flags, (prepend ! to un-set flag):\n%s",
                                 f,
                                 "IPSRC_RND, IPDST_RND, UDPSRC_RND, UDPDST_RND, "
-                                "MACSRC_RND, MACDST_RND, TXSIZE_RND, IPV6, MPLS_RND, VID_RND, SVID_RND\n");
+                                "MACSRC_RND, MACDST_RND, TXSIZE_RND, IPV6, MPLS_RND, VID_RND, SVID_RND, FLOW_SEQ\n");
                         return count;
                 }
                 sprintf(pg_result, "OK: flags=0x%x", pkt_dev->flags);
@@ -2083,6 +2099,37 @@ static inline void set_pkt_overhead(struct pktgen_dev *pkt_dev)
         pkt_dev->pkt_overhead += SVLAN_TAG_SIZE(pkt_dev);
 }
 
+static inline int f_seen(struct pktgen_dev *pkt_dev, int flow)
+{
+
+        if (pkt_dev->flows[flow].flags & F_INIT)
+                return 1;
+        else
+                return 0;
+}
+
+static inline int f_pick(struct pktgen_dev *pkt_dev)
+{
+        int flow = pkt_dev->curfl;
+
+        if (pkt_dev->flags & F_FLOW_SEQ) {
+                if (pkt_dev->flows[flow].count >= pkt_dev->lflow) {
+                        /* reset time */
+                        pkt_dev->flows[flow].count = 0;
+                        pkt_dev->curfl += 1;
+                        if (pkt_dev->curfl >= pkt_dev->cflows)
+                                pkt_dev->curfl = 0; /*reset */
+                }
+        } else {
+                flow = random32() % pkt_dev->cflows;
+
+                if (pkt_dev->flows[flow].count > pkt_dev->lflow)
+                        pkt_dev->flows[flow].count = 0;
+        }
+
+        return pkt_dev->curfl;
+}
+
 /* Increment/randomize headers according to flags and current values
  * for IP src/dest, UDP src/dst port, MAC-Addr src/dst
  */
@@ -2092,12 +2139,8 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
         __u32 imx;
         int flow = 0;
 
-        if (pkt_dev->cflows) {
-                flow = random32() % pkt_dev->cflows;
-
-                if (pkt_dev->flows[flow].count > pkt_dev->lflow)
-                        pkt_dev->flows[flow].count = 0;
-        }
+        if (pkt_dev->cflows)
+                flow = f_pick(pkt_dev);
 
         /*  Deal with source MAC */
         if (pkt_dev->src_mac_count > 1) {
@@ -2213,7 +2256,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                         pkt_dev->cur_saddr = htonl(t);
                 }
 
-                if (pkt_dev->cflows && pkt_dev->flows[flow].count != 0) {
+                if (pkt_dev->cflows && f_seen(pkt_dev, flow)) {
                         pkt_dev->cur_daddr = pkt_dev->flows[flow].cur_daddr;
                 } else {
                         imn = ntohl(pkt_dev->daddr_min);
@@ -2243,6 +2286,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev)
                                 }
                         }
                         if (pkt_dev->cflows) {
+                                pkt_dev->flows[flow].flags |= F_INIT;
                                 pkt_dev->flows[flow].cur_daddr =
                                     pkt_dev->cur_daddr;
                                 pkt_dev->nflows++;