Commit e05176a3 authored Aug 05, 2015 by Wenyu Zhang Committed by David S. Miller Aug 07, 2015

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



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>

parent da8b43c0

net/openvswitch/actions.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;
		a = nla_next(a, &rem)) {
		u32 probability;

		switch (nla_type(a)) {
		case OVS_SAMPLE_ATTR_PROBABILITY:
		if (prandom_u32() >= nla_get_u32(a))
		probability = nla_get_u32(a);
		if (!probability \|\| prandom_u32() > probability)
		return 0;
		break;