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: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
b6202f9789
Коммит
7d36a991e8
|
@ -2622,6 +2622,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,
|
||||||
} else {
|
} else {
|
||||||
int frags = pkt_dev->nfrags;
|
int frags = pkt_dev->nfrags;
|
||||||
int i, len;
|
int i, len;
|
||||||
|
int frag_len;
|
||||||
|
|
||||||
|
|
||||||
if (frags > MAX_SKB_FRAGS)
|
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;
|
i = 0;
|
||||||
|
frag_len = (datalen/frags) < PAGE_SIZE ?
|
||||||
|
(datalen/frags) : PAGE_SIZE;
|
||||||
while (datalen > 0) {
|
while (datalen > 0) {
|
||||||
if (unlikely(!pkt_dev->page)) {
|
if (unlikely(!pkt_dev->page)) {
|
||||||
int node = numa_node_id();
|
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;
|
skb_shinfo(skb)->frags[i].page = pkt_dev->page;
|
||||||
get_page(pkt_dev->page);
|
get_page(pkt_dev->page);
|
||||||
skb_shinfo(skb)->frags[i].page_offset = 0;
|
skb_shinfo(skb)->frags[i].page_offset = 0;
|
||||||
skb_shinfo(skb)->frags[i].size =
|
/*last fragment, fill rest of data*/
|
||||||
(datalen < PAGE_SIZE ? datalen : PAGE_SIZE);
|
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;
|
datalen -= skb_shinfo(skb)->frags[i].size;
|
||||||
skb->len += skb_shinfo(skb)->frags[i].size;
|
skb->len += skb_shinfo(skb)->frags[i].size;
|
||||||
skb->data_len += skb_shinfo(skb)->frags[i].size;
|
skb->data_len += skb_shinfo(skb)->frags[i].size;
|
||||||
i++;
|
i++;
|
||||||
skb_shinfo(skb)->nr_frags = 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,
|
/* Stamp the time, and sequence number,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче