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

Commit 7d36a991 authored by amit salecha's avatar amit salecha Committed by David S. Miller
Browse files

pktgen: create num frags requested 



Pktgen doesn't generate number of frags requested.
Divide packet size by number of frags and fill that in every frags.

Example:
With packet size 1470, it generate only 11 frags. Initial frags
get lenght 706, 353, 177....so on. Last frag get divided by 2.

Now with this fix, each frags will get 78 bytes.

Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6202f97

net/core/pktgen.c

+9 −26
Original line number Diff line number Diff line
@@ -2622,6 +2622,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb, 
	} else {

		int frags = pkt_dev->nfrags;

		int i, len;

		int frag_len;





		if (frags > MAX_SKB_FRAGS)
@@ -2633,6 +2634,8 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb, 
		}



		i = 0;

		frag_len = (datalen/frags) < PAGE_SIZE ?

			   (datalen/frags) : PAGE_SIZE;

		while (datalen > 0) {

			if (unlikely(!pkt_dev->page)) {

				int node = numa_node_id();
@@ -2646,38 +2649,18 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb, 
			skb_shinfo(skb)->frags[i].page = pkt_dev->page;

			get_page(pkt_dev->page);

			skb_shinfo(skb)->frags[i].page_offset = 0;

			/*last fragment, fill rest of data*/

			if (i == (frags - 1))

				skb_shinfo(skb)->frags[i].size =

				    (datalen < PAGE_SIZE ? datalen : PAGE_SIZE);

			else

				skb_shinfo(skb)->frags[i].size = frag_len;

			datalen -= skb_shinfo(skb)->frags[i].size;

			skb->len += skb_shinfo(skb)->frags[i].size;

			skb->data_len += skb_shinfo(skb)->frags[i].size;

			i++;

			skb_shinfo(skb)->nr_frags = i;

		}



		while (i < frags) {

			int rem;



			if (i == 0)

				break;



			rem = skb_shinfo(skb)->frags[i - 1].size / 2;

			if (rem == 0)

				break;



			skb_shinfo(skb)->frags[i - 1].size -= rem;



			skb_shinfo(skb)->frags[i] =

			    skb_shinfo(skb)->frags[i - 1];

			get_page(skb_shinfo(skb)->frags[i].page);

			skb_shinfo(skb)->frags[i].page =

			    skb_shinfo(skb)->frags[i - 1].page;

			skb_shinfo(skb)->frags[i].page_offset +=

			    skb_shinfo(skb)->frags[i - 1].size;

			skb_shinfo(skb)->frags[i].size = rem;

			i++;

			skb_shinfo(skb)->nr_frags = i;

		}

	}



	/* Stamp the time, and sequence number,