[ovs-dev] [PATCH 1/2] datapath: Don't recursively sample packets or reset their "tun_id"s.
Ben Pfaff
blp at nicira.com
Wed Dec 22 17:32:49 UTC 2010
execute_actions() is called recursively when ODPAT_SET_DL_TCI adds a VLAN
header to a GSO packet, but we don't want to re-sample the sub-packet or
re-reset its tun_id, so break those two actions into a wrapper function.
This commit mostly moves code around without modifying it.
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
datapath/actions.c | 80 ++++++++++++++++++++++++++++-----------------------
1 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/datapath/actions.c b/datapath/actions.c
index 6defd2d..f988da4 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -365,31 +365,10 @@ static int output_control(struct datapath *dp, struct sk_buff *skb, u32 arg)
return dp_output_control(dp, skb, _ODPL_ACTION_NR, arg);
}
-/* Send a copy of this packet up to the sFlow agent, along with extra
- * information about what happened to it. */
-static void sflow_sample(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *a, u32 actions_len,
- struct vport *vport)
-{
- struct odp_sflow_sample_header *hdr;
- unsigned int hdrlen = sizeof(struct odp_sflow_sample_header);
- struct sk_buff *nskb;
-
- nskb = skb_copy_expand(skb, actions_len + hdrlen, 0, GFP_ATOMIC);
- if (!nskb)
- return;
-
- memcpy(__skb_push(nskb, actions_len), a, actions_len);
- hdr = (struct odp_sflow_sample_header*)__skb_push(nskb, hdrlen);
- hdr->actions_len = actions_len;
- hdr->sample_pool = atomic_read(&vport->sflow_pool);
- dp_output_control(dp, nskb, _ODPL_SFLOW_NR, 0);
-}
-
/* Execute a list of actions against 'skb'. */
-int execute_actions(struct datapath *dp, struct sk_buff *skb,
- const struct odp_flow_key *key,
- const struct nlattr *actions, u32 actions_len)
+static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
+ const struct odp_flow_key *key,
+ const struct nlattr *actions, u32 actions_len)
{
/* Every output action needs a separate clone of 'skb', but the common
* case is just a single output action, so that doing a clone and
@@ -400,18 +379,6 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
const struct nlattr *a;
int rem, err;
- if (dp->sflow_probability) {
- struct vport *p = OVS_CB(skb)->vport;
- if (p) {
- atomic_inc(&p->sflow_pool);
- if (dp->sflow_probability == UINT_MAX ||
- net_random() < dp->sflow_probability)
- sflow_sample(dp, skb, actions, actions_len, p);
- }
- }
-
- OVS_CB(skb)->tun_id = 0;
-
for (a = actions, rem = actions_len; rem > 0; a = nla_next(a, &rem)) {
if (prev_port != -1) {
do_output(dp, skb_clone(skb, GFP_ATOMIC), prev_port);
@@ -496,3 +463,44 @@ exit:
kfree_skb(skb);
return 0;
}
+
+/* Send a copy of this packet up to the sFlow agent, along with extra
+ * information about what happened to it. */
+static void sflow_sample(struct datapath *dp, struct sk_buff *skb,
+ const struct nlattr *a, u32 actions_len,
+ struct vport *vport)
+{
+ struct odp_sflow_sample_header *hdr;
+ unsigned int hdrlen = sizeof(struct odp_sflow_sample_header);
+ struct sk_buff *nskb;
+
+ nskb = skb_copy_expand(skb, actions_len + hdrlen, 0, GFP_ATOMIC);
+ if (!nskb)
+ return;
+
+ memcpy(__skb_push(nskb, actions_len), a, actions_len);
+ hdr = (struct odp_sflow_sample_header*)__skb_push(nskb, hdrlen);
+ hdr->actions_len = actions_len;
+ hdr->sample_pool = atomic_read(&vport->sflow_pool);
+ dp_output_control(dp, nskb, _ODPL_SFLOW_NR, 0);
+}
+
+/* Execute a list of actions against 'skb'. */
+int execute_actions(struct datapath *dp, struct sk_buff *skb,
+ const struct odp_flow_key *key,
+ const struct nlattr *actions, u32 actions_len)
+{
+ if (dp->sflow_probability) {
+ struct vport *p = OVS_CB(skb)->vport;
+ if (p) {
+ atomic_inc(&p->sflow_pool);
+ if (dp->sflow_probability == UINT_MAX ||
+ net_random() < dp->sflow_probability)
+ sflow_sample(dp, skb, actions, actions_len, p);
+ }
+ }
+
+ OVS_CB(skb)->tun_id = 0;
+
+ return do_execute_actions(dp, skb, key, actions, actions_len);
+}
--
1.7.1
More information about the dev
mailing list