iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openvswitch: Make 100 percents packets sampled when sampling rate is 1.

Browse Source 
When sampling rate is 1, the sampling probability is UINT32_MAX. The packet
should be sampled even the prandom32() generate the number of UINT32_MAX.
And none packet need be sampled when the probability is 0.

Signed-off-by: Wenyu Zhang <wenyuz@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wenyu Zhang 2015-08-05 00:30:47 -07:00 committed by David S. Miller
parent da8b43c0e1
commit e05176a328
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/openvswitch/actions.c
View File

@ -669,9 +669,12 @@ static int sample(struct datapath *dp, struct sk_buff *skb,
for (a = nla_data(attr), rem = nla_len(attr); rem > 0; for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
a = nla_next(a, &rem)) { a = nla_next(a, &rem)) {
u32 probability;
switch (nla_type(a)) { switch (nla_type(a)) {
case OVS_SAMPLE_ATTR_PROBABILITY: case OVS_SAMPLE_ATTR_PROBABILITY:
if (prandom_u32() >= nla_get_u32(a)) probability = nla_get_u32(a);
if (!probability || prandom_u32() > probability)
return 0; return 0;
break; break;