[PATCH net-next v3] openvswitch: Make 100 percents packets sampled when sampling rate is 1.

[PATCH net-next v3] openvswitch: Make 100 percents packets sampled when sampling rate is 1.

[Wenyu Zhang]

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>
---
 net/openvswitch/actions.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index cf04c2f..a0ac410 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -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;
 
-- 
1.7.9.5

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Re: [ovs-dev] [PATCH net-next v3] openvswitch: Make 100 percents packets sampled when sampling rate is 1.

[Pravin Shelar]

On Wed, Aug 5, 2015 at 12:30 AM, Wenyu Zhang <wenyuz@vmware.com> wrote:
> 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>

Thanks.

Re: [PATCH net-next v3] openvswitch: Make 100 percents packets sampled when sampling rate is 1.

[David Miller]

From: Wenyu Zhang <wenyuz@vmware.com>
Date: Wed, 5 Aug 2015 00:30:47 -0700

> 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>

Applied.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev