android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pktgen: set different default min_pkt_size for different protocols

Browse Source 
ETH_ZLEN is too small for IPv6, so this default value is not
suitable.

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amerigo Wang 2012-10-09 17:48:17 +00:00 committed by David S. Miller
parent 5aa8b57200
commit 68bf9f0b91
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/core/pktgen.c
View File

@ -248,8 +248,8 @@ struct pktgen_dev {
int removal_mark; /* non-zero => the device is marked for int removal_mark; /* non-zero => the device is marked for
* removal by worker thread */ * removal by worker thread */
int min_pkt_size; /* = ETH_ZLEN; */ int min_pkt_size;
int max_pkt_size; /* = ETH_ZLEN; */ int max_pkt_size;
int pkt_overhead; /* overhead for MPLS, VLANs, IPSEC etc */ int pkt_overhead; /* overhead for MPLS, VLANs, IPSEC etc */
int nfrags; int nfrags;
struct page *page; struct page *page;
@ -2036,10 +2036,14 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
/* Set up Dest MAC */ /* Set up Dest MAC */
memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, ETH_ALEN); memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, ETH_ALEN);
/* Set up pkt size */
pkt_dev->cur_pkt_size = pkt_dev->min_pkt_size;
if (pkt_dev->flags & F_IPV6) { if (pkt_dev->flags & F_IPV6) {
if (pkt_dev->min_pkt_size == 0) {
pkt_dev->min_pkt_size = 14 + sizeof(struct ipv6hdr)
+ sizeof(struct udphdr)
+ sizeof(struct pktgen_hdr)
+ pkt_dev->pkt_overhead;
}
/* /*
* Skip this automatic address setting until locks or functions * Skip this automatic address setting until locks or functions
* gets exported * gets exported
@ -2086,6 +2090,13 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
} }
#endif #endif
} else { } else {
if (pkt_dev->min_pkt_size == 0) {
pkt_dev->min_pkt_size = 14 + sizeof(struct iphdr)
+ sizeof(struct udphdr)
+ sizeof(struct pktgen_hdr)
+ pkt_dev->pkt_overhead;
}
pkt_dev->saddr_min = 0; pkt_dev->saddr_min = 0;
pkt_dev->saddr_max = 0; pkt_dev->saddr_max = 0;
if (strlen(pkt_dev->src_min) == 0) { if (strlen(pkt_dev->src_min) == 0) {
@ -2111,6 +2122,10 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
pkt_dev->daddr_max = in_aton(pkt_dev->dst_max); pkt_dev->daddr_max = in_aton(pkt_dev->dst_max);
} }
/* Initialize current values. */ /* Initialize current values. */
pkt_dev->cur_pkt_size = pkt_dev->min_pkt_size;
if (pkt_dev->min_pkt_size > pkt_dev->max_pkt_size)
pkt_dev->max_pkt_size = pkt_dev->min_pkt_size;
pkt_dev->cur_dst_mac_offset = 0; pkt_dev->cur_dst_mac_offset = 0;
pkt_dev->cur_src_mac_offset = 0; pkt_dev->cur_src_mac_offset = 0;
pkt_dev->cur_saddr = pkt_dev->saddr_min; pkt_dev->cur_saddr = pkt_dev->saddr_min;
@ -3548,8 +3563,6 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
} }
pkt_dev->removal_mark = 0; pkt_dev->removal_mark = 0;
pkt_dev->min_pkt_size = ETH_ZLEN;
pkt_dev->max_pkt_size = ETH_ZLEN;
pkt_dev->nfrags = 0; pkt_dev->nfrags = 0;
pkt_dev->delay = pg_delay_d; pkt_dev->delay = pg_delay_d;
pkt_dev->count = pg_count_d; pkt_dev->count = pg_count_d;