OVS keeps pointer to packet key in skb->cb, but the packet key is
store on stack. This could make code bit tricky. So it is better to
get rid of the pointer.
Signed-off-by: Pravin B Shelar <pshe...@nicira.com>
---
datapath/actions.c | 294 +++++++++++++++++++-------------------------------
datapath/datapath.c | 35 +++---
datapath/datapath.h | 8 +-
datapath/flow.c | 1 -
datapath/vport-lisp.c | 22 ++--
datapath/vport.c | 2 +-
6 files changed, 144 insertions(+), 218 deletions(-)
diff --git a/datapath/actions.c b/datapath/actions.c
index 8d18848..0fc32d6 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -40,6 +40,10 @@
#include "vlan.h"
#include "vport.h"
+static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
+ struct sw_flow_key *key,
+ const struct nlattr *attr, int len);
+
struct deferred_action {
struct sk_buff *skb;
const struct nlattr *actions;
@@ -72,8 +76,7 @@ static bool action_fifo_is_empty(struct action_fifo *fifo)
return (fifo->head == fifo->tail);
}
-static struct deferred_action *
-action_fifo_get(struct action_fifo *fifo)
+static struct deferred_action *action_fifo_get(struct action_fifo *fifo)
{
if (action_fifo_is_empty(fifo))
return NULL;
@@ -81,8 +84,7 @@ action_fifo_get(struct action_fifo *fifo)
return &fifo->fifo[fifo->tail++];
}
-static struct deferred_action *
-action_fifo_put(struct action_fifo *fifo)
+static struct deferred_action *action_fifo_put(struct action_fifo *fifo)
{
if (fifo->head >= DEFERRED_ACTION_FIFO_SIZE - 1)
return NULL;
@@ -90,15 +92,10 @@ action_fifo_put(struct action_fifo *fifo)
return &fifo->fifo[fifo->head++];
}
-static void flow_key_clone(struct sk_buff *skb, struct sw_flow_key *new_key)
-{
- *new_key = *OVS_CB(skb)->pkt_key;
- OVS_CB(skb)->pkt_key = new_key;
-}
-
/* Return true if fifo is not full */
-static bool add_deferred_actions(struct sk_buff *skb,
- const struct nlattr *attr)
+static struct deferred_action *add_deferred_actions(struct sk_buff *skb,
+ struct sw_flow_key *key,
+ const struct nlattr *attr)
{
struct action_fifo *fifo;
struct deferred_action *da;
@@ -108,109 +105,22 @@ static bool add_deferred_actions(struct sk_buff *skb,
if (da) {
da->skb = skb;
da->actions = attr;
- flow_key_clone(skb, &da->pkt_key);
+ da->pkt_key = *key;
}
- return (da != NULL);
-}
-
-static void flow_key_set_recirc_id(struct sk_buff *skb, u32 recirc_id)
-{
- OVS_CB(skb)->pkt_key->recirc_id = recirc_id;
-}
-
-static void flow_key_set_priority(struct sk_buff *skb, u32 priority)
-{
- OVS_CB(skb)->pkt_key->phy.priority = priority;
-}
-
-static void flow_key_set_skb_mark(struct sk_buff *skb, u32 skb_mark)
-{
- OVS_CB(skb)->pkt_key->phy.skb_mark = skb_mark;
-}
-
-static void flow_key_set_eth_src(struct sk_buff *skb, const u8 addr[])
-{
- ether_addr_copy(OVS_CB(skb)->pkt_key->eth.src, addr);
-}
-
-static void flow_key_set_eth_dst(struct sk_buff *skb, const u8 addr[])
-{
- ether_addr_copy(OVS_CB(skb)->pkt_key->eth.dst, addr);
-}
-
-static void flow_key_set_vlan_tci(struct sk_buff *skb, __be16 tci)
-{
- OVS_CB(skb)->pkt_key->eth.tci = tci;
-}
-
-static void flow_key_set_mpls_top_lse(struct sk_buff *skb, __be32 top_lse)
-{
- OVS_CB(skb)->pkt_key->mpls.top_lse = top_lse;
-}
-
-static void flow_key_set_ipv4_src(struct sk_buff *skb, __be32 addr)
-{
- OVS_CB(skb)->pkt_key->ipv4.addr.src = addr;
-}
-
-static void flow_key_set_ipv4_dst(struct sk_buff *skb, __be32 addr)
-{
- OVS_CB(skb)->pkt_key->ipv4.addr.src = addr;
-}
-
-static void flow_key_set_ip_tos(struct sk_buff *skb, u8 tos)
-{
- OVS_CB(skb)->pkt_key->ip.tos = tos;
-}
-
-static void flow_key_set_ip_ttl(struct sk_buff *skb, u8 ttl)
-{
- OVS_CB(skb)->pkt_key->ip.ttl = ttl;
-}
-
-static void flow_key_set_ipv6_src(struct sk_buff *skb,
- const __be32 addr[4])
-{
- memcpy(&OVS_CB(skb)->pkt_key->ipv6.addr.src, addr, sizeof(__be32[4]));
-}
-
-static void flow_key_set_ipv6_dst(struct sk_buff *skb,
- const __be32 addr[4])
-{
- memcpy(&OVS_CB(skb)->pkt_key->ipv6.addr.dst, addr, sizeof(__be32[4]));
-}
-
-static void flow_key_set_ipv6_fl(struct sk_buff *skb,
- const struct ipv6hdr *nh)
-{
- OVS_CB(skb)->pkt_key->ipv6.label = *(__be32 *)nh &
- htonl(IPV6_FLOWINFO_FLOWLABEL);
+ return da;
}
-static void flow_key_set_tp_src(struct sk_buff *skb, __be16 port)
+static void invalidate_flow_key(struct sw_flow_key *key)
{
- OVS_CB(skb)->pkt_key->tp.src = port;
+ key->eth.type = htons(0);
}
-static void flow_key_set_tp_dst(struct sk_buff *skb, __be16 port)
+static bool is_flow_key_valid(struct sw_flow_key *key)
{
- OVS_CB(skb)->pkt_key->tp.dst = port;
+ return !!key->eth.type;
}
-static void invalidate_skb_flow_key(struct sk_buff *skb)
-{
- OVS_CB(skb)->pkt_key->eth.type = htons(0);
-}
-
-static bool is_skb_flow_key_valid(struct sk_buff *skb)
-{
- return !!OVS_CB(skb)->pkt_key->eth.type;
-}
-
-static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *attr, int len);
-
static int make_writable(struct sk_buff *skb, int write_len)
{
if (!pskb_may_pull(skb, write_len))
@@ -235,7 +145,7 @@ static unsigned char *mac_header_end(const struct sk_buff
*skb)
return skb_mac_header(skb) + skb->mac_len;
}
-static int push_mpls(struct sk_buff *skb,
+static int push_mpls(struct sk_buff *skb, struct sw_flow_key *key,
const struct ovs_action_push_mpls *mpls)
{
__be32 *new_mpls_lse;
@@ -261,11 +171,12 @@ static int push_mpls(struct sk_buff *skb,
if (!ovs_skb_get_inner_protocol(skb))
ovs_skb_set_inner_protocol(skb, skb->protocol);
skb->protocol = mpls->mpls_ethertype;
- invalidate_skb_flow_key(skb);
+ invalidate_flow_key(key);
return 0;
}
-static int pop_mpls(struct sk_buff *skb, const __be16 ethertype)
+static int pop_mpls(struct sk_buff *skb, struct sw_flow_key *key,
+ const __be16 ethertype)
{
struct ethhdr *hdr;
int err;
@@ -292,11 +203,12 @@ static int pop_mpls(struct sk_buff *skb, const __be16
ethertype)
hdr->h_proto = ethertype;
if (eth_p_mpls(skb->protocol))
skb->protocol = ethertype;
- invalidate_skb_flow_key(skb);
+ invalidate_flow_key(key);
return 0;
}
-static int set_mpls(struct sk_buff *skb, const __be32 *mpls_lse)
+static int set_mpls(struct sk_buff *skb, struct sw_flow_key *key,
+ const __be32 *mpls_lse)
{
__be32 *stack = (__be32 *)mac_header_end(skb);
int err;
@@ -312,7 +224,7 @@ static int set_mpls(struct sk_buff *skb, const __be32
*mpls_lse)
}
*stack = *mpls_lse;
- flow_key_set_mpls_top_lse(skb, *stack);
+ key->mpls.top_lse = *mpls_lse;
return 0;
}
@@ -344,7 +256,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16
*current_tci)
return 0;
}
-static int pop_vlan(struct sk_buff *skb)
+static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key)
{
__be16 tci;
int err;
@@ -363,11 +275,11 @@ static int pop_vlan(struct sk_buff *skb)
/* move next vlan tag to hw accel tag */
if (likely(skb->protocol != htons(ETH_P_8021Q) ||
skb->len < VLAN_ETH_HLEN)) {
- flow_key_set_vlan_tci(skb, 0);
+ key->eth.tci = 0;
return 0;
}
- invalidate_skb_flow_key(skb);
+ invalidate_flow_key(key);
err = __pop_vlan_tci(skb, &tci);
if (unlikely(err))
return err;
@@ -376,7 +288,8 @@ static int pop_vlan(struct sk_buff *skb)
return 0;
}
-static int push_vlan(struct sk_buff *skb, const struct ovs_action_push_vlan
*vlan)
+static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key,
+ const struct ovs_action_push_vlan *vlan)
{
if (unlikely(vlan_tx_tag_present(skb))) {
u16 current_tag;
@@ -394,15 +307,15 @@ static int push_vlan(struct sk_buff *skb, const struct
ovs_action_push_vlan *vla
skb->csum = csum_add(skb->csum, csum_partial(skb->data
+ (2 * ETH_ALEN), VLAN_HLEN, 0));
- invalidate_skb_flow_key(skb);
+ invalidate_flow_key(key);
} else {
- flow_key_set_vlan_tci(skb, vlan->vlan_tci);
+ key->eth.tci = vlan->vlan_tci;
}
__vlan_hwaccel_put_tag(skb, vlan->vlan_tpid, ntohs(vlan->vlan_tci) &
~VLAN_TAG_PRESENT);
return 0;
}
-static int set_eth_addr(struct sk_buff *skb,
+static int set_eth_addr(struct sk_buff *skb, struct sw_flow_key *key,
const struct ovs_key_ethernet *eth_key)
{
int err;
@@ -417,8 +330,8 @@ static int set_eth_addr(struct sk_buff *skb,
ovs_skb_postpush_rcsum(skb, eth_hdr(skb), ETH_ALEN * 2);
- flow_key_set_eth_src(skb, eth_key->eth_src);
- flow_key_set_eth_dst(skb, eth_key->eth_dst);
+ ether_addr_copy(key->eth.src, eth_key->eth_src);
+ ether_addr_copy(key->eth.dst, eth_key->eth_dst);
return 0;
}
@@ -506,7 +419,8 @@ static void set_ip_ttl(struct sk_buff *skb, struct iphdr
*nh, u8 new_ttl)
nh->ttl = new_ttl;
}
-static int set_ipv4(struct sk_buff *skb, const struct ovs_key_ipv4 *ipv4_key)
+static int set_ipv4(struct sk_buff *skb, struct sw_flow_key *key,
+ const struct ovs_key_ipv4 *ipv4_key)
{
struct iphdr *nh;
int err;
@@ -520,28 +434,29 @@ static int set_ipv4(struct sk_buff *skb, const struct
ovs_key_ipv4 *ipv4_key)
if (ipv4_key->ipv4_src != nh->saddr) {
set_ip_addr(skb, nh, &nh->saddr, ipv4_key->ipv4_src);
- flow_key_set_ipv4_src(skb, ipv4_key->ipv4_src);
+ key->ipv4.addr.src = ipv4_key->ipv4_src;
}
if (ipv4_key->ipv4_dst != nh->daddr) {
set_ip_addr(skb, nh, &nh->daddr, ipv4_key->ipv4_dst);
- flow_key_set_ipv4_dst(skb, ipv4_key->ipv4_dst);
+ key->ipv4.addr.dst = ipv4_key->ipv4_dst;
}
if (ipv4_key->ipv4_tos != nh->tos) {
ipv4_change_dsfield(nh, 0, ipv4_key->ipv4_tos);
- flow_key_set_ip_tos(skb, nh->tos);
+ key->ip.tos = nh->tos;
}
if (ipv4_key->ipv4_ttl != nh->ttl) {
set_ip_ttl(skb, nh, ipv4_key->ipv4_ttl);
- flow_key_set_ip_ttl(skb, ipv4_key->ipv4_ttl);
+ key->ip.ttl = ipv4_key->ipv4_ttl;
}
return 0;
}
-static int set_ipv6(struct sk_buff *skb, const struct ovs_key_ipv6 *ipv6_key)
+static int set_ipv6(struct sk_buff *skb, struct sw_flow_key *key,
+ const struct ovs_key_ipv6 *ipv6_key)
{
struct ipv6hdr *nh;
int err;
@@ -560,7 +475,7 @@ static int set_ipv6(struct sk_buff *skb, const struct
ovs_key_ipv6 *ipv6_key)
if (memcmp(ipv6_key->ipv6_src, saddr, sizeof(ipv6_key->ipv6_src))) {
set_ipv6_addr(skb, ipv6_key->ipv6_proto, saddr,
ipv6_key->ipv6_src, true);
- flow_key_set_ipv6_src(skb, ipv6_key->ipv6_src);
+ memcpy(&key->ipv6.addr.src, ipv6_key->ipv6_src,
sizeof(__be32[4]));
}
if (memcmp(ipv6_key->ipv6_dst, daddr, sizeof(ipv6_key->ipv6_dst))) {
@@ -575,17 +490,17 @@ static int set_ipv6(struct sk_buff *skb, const struct
ovs_key_ipv6 *ipv6_key)
set_ipv6_addr(skb, ipv6_key->ipv6_proto, daddr,
ipv6_key->ipv6_dst, recalc_csum);
- flow_key_set_ipv6_dst(skb, ipv6_key->ipv6_dst);
+ memcpy(&key->ipv6.addr.dst, ipv6_key->ipv6_dst,
sizeof(__be32[4]));
}
set_ipv6_tc(nh, ipv6_key->ipv6_tclass);
- flow_key_set_ip_tos(skb, ipv6_get_dsfield(nh));
+ key->ip.tos = ipv6_get_dsfield(nh);
set_ipv6_fl(nh, ntohl(ipv6_key->ipv6_label));
- flow_key_set_ipv6_fl(skb, nh);
+ key->ipv6.label = *(__be32 *)nh & htonl(IPV6_FLOWINFO_FLOWLABEL);
nh->hop_limit = ipv6_key->ipv6_hlimit;
- flow_key_set_ip_ttl(skb, ipv6_key->ipv6_hlimit);
+ key->ip.ttl = ipv6_key->ipv6_hlimit;
return 0;
}
@@ -613,7 +528,8 @@ static void set_udp_port(struct sk_buff *skb, __be16 *port,
__be16 new_port)
}
}
-static int set_udp(struct sk_buff *skb, const struct ovs_key_udp *udp_port_key)
+static int set_udp(struct sk_buff *skb, struct sw_flow_key *key,
+ const struct ovs_key_udp *udp_port_key)
{
struct udphdr *uh;
int err;
@@ -626,18 +542,19 @@ static int set_udp(struct sk_buff *skb, const struct
ovs_key_udp *udp_port_key)
uh = udp_hdr(skb);
if (udp_port_key->udp_src != uh->source) {
set_udp_port(skb, &uh->source, udp_port_key->udp_src);
- flow_key_set_tp_src(skb, udp_port_key->udp_src);
+ key->tp.src = udp_port_key->udp_src;
}
if (udp_port_key->udp_dst != uh->dest) {
set_udp_port(skb, &uh->dest, udp_port_key->udp_dst);
- flow_key_set_tp_dst(skb, udp_port_key->udp_dst);
+ key->tp.dst = udp_port_key->udp_dst;
}
return 0;
}
-static int set_tcp(struct sk_buff *skb, const struct ovs_key_tcp *tcp_port_key)
+static int set_tcp(struct sk_buff *skb, struct sw_flow_key *key,
+ const struct ovs_key_tcp *tcp_port_key)
{
struct tcphdr *th;
int err;
@@ -650,18 +567,18 @@ static int set_tcp(struct sk_buff *skb, const struct
ovs_key_tcp *tcp_port_key)
th = tcp_hdr(skb);
if (tcp_port_key->tcp_src != th->source) {
set_tp_port(skb, &th->source, tcp_port_key->tcp_src,
&th->check);
- flow_key_set_tp_src(skb, tcp_port_key->tcp_src);
+ key->tp.src = tcp_port_key->tcp_src;
}
if (tcp_port_key->tcp_dst != th->dest) {
set_tp_port(skb, &th->dest, tcp_port_key->tcp_dst, &th->check);
- flow_key_set_tp_dst(skb, tcp_port_key->tcp_dst);
+ key->tp.dst = tcp_port_key->tcp_dst;
}
return 0;
}
-static int set_sctp(struct sk_buff *skb,
+static int set_sctp(struct sk_buff *skb, struct sw_flow_key *key,
const struct ovs_key_sctp *sctp_port_key)
{
struct sctphdr *sh;
@@ -689,8 +606,8 @@ static int set_sctp(struct sk_buff *skb,
sh->checksum = old_csum ^ old_correct_csum ^ new_csum;
skb_clear_hash(skb);
- flow_key_set_tp_src(skb, sctp_port_key->sctp_src);
- flow_key_set_tp_dst(skb, sctp_port_key->sctp_dst);
+ key->tp.src = sctp_port_key->sctp_src;
+ key->tp.dst = sctp_port_key->sctp_dst;
}
return 0;
@@ -707,7 +624,7 @@ static void do_output(struct datapath *dp, struct sk_buff
*skb, int out_port)
}
static int output_userspace(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *attr)
+ struct sw_flow_key *key, const struct nlattr *attr)
{
struct dp_upcall_info upcall;
const struct nlattr *a;
@@ -749,7 +666,7 @@ static int output_userspace(struct datapath *dp, struct
sk_buff *skb,
} /* End of switch. */
}
- return ovs_dp_upcall(dp, skb, &upcall);
+ return ovs_dp_upcall(dp, skb, key, &upcall);
}
static bool last_action(const struct nlattr *a, int rem)
@@ -758,7 +675,7 @@ static bool last_action(const struct nlattr *a, int rem)
}
static int sample(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *attr)
+ struct sw_flow_key *key, const struct nlattr *attr)
{
const struct nlattr *acts_list = NULL;
const struct nlattr *a;
@@ -788,30 +705,30 @@ static int sample(struct datapath *dp, struct sk_buff
*skb,
/* The only known usage of sample action is having a single user-space
* action. Treat this usage as a special case.
* The output_userspace() should clone the skb to be sent to the
- * user space. This skb will be consumed by its caller. */
+ * user space. This skb will be consumed by its caller.
+ */
if (likely(nla_type(a) == OVS_ACTION_ATTR_USERSPACE &&
last_action(a, rem)))
- return output_userspace(dp, skb, a);
+ return output_userspace(dp, skb, key, a);
skb = skb_clone(skb, GFP_ATOMIC);
if (!skb)
/* Skip the sample action when out of memory. */
return 0;
- if (!add_deferred_actions(skb, a)) {
+ if (!add_deferred_actions(skb, key, a)) {
if (net_ratelimit())
pr_warn("%s: deferred actions limit reached, dropping
sample action\n",
ovs_dp_name(dp));
kfree_skb(skb);
}
-
return 0;
}
-static void execute_hash(struct sk_buff *skb, const struct nlattr *attr)
+static void execute_hash(struct sk_buff *skb, struct sw_flow_key *key,
+ const struct nlattr *attr)
{
- struct sw_flow_key *key = OVS_CB(skb)->pkt_key;
struct ovs_action_hash *hash_act = nla_data(attr);
u32 hash = 0;
@@ -824,7 +741,7 @@ static void execute_hash(struct sk_buff *skb, const struct
nlattr *attr)
key->ovs_flow_hash = hash;
}
-static int execute_set_action(struct sk_buff *skb,
+static int execute_set_action(struct sk_buff *skb, struct sw_flow_key *key,
const struct nlattr *nested_attr)
{
int err = 0;
@@ -832,12 +749,12 @@ static int execute_set_action(struct sk_buff *skb,
switch (nla_type(nested_attr)) {
case OVS_KEY_ATTR_PRIORITY:
skb->priority = nla_get_u32(nested_attr);
- flow_key_set_priority(skb, skb->priority);
+ key->phy.priority = skb->priority;
break;
case OVS_KEY_ATTR_SKB_MARK:
skb->mark = nla_get_u32(nested_attr);
- flow_key_set_skb_mark(skb, skb->mark);
+ key->phy.skb_mark = skb->mark;
break;
case OVS_KEY_ATTR_TUNNEL_INFO:
@@ -845,31 +762,31 @@ static int execute_set_action(struct sk_buff *skb,
break;
case OVS_KEY_ATTR_ETHERNET:
- err = set_eth_addr(skb, nla_data(nested_attr));
+ err = set_eth_addr(skb, key, nla_data(nested_attr));
break;
case OVS_KEY_ATTR_IPV4:
- err = set_ipv4(skb, nla_data(nested_attr));
+ err = set_ipv4(skb, key, nla_data(nested_attr));
break;
case OVS_KEY_ATTR_IPV6:
- err = set_ipv6(skb, nla_data(nested_attr));
+ err = set_ipv6(skb, key, nla_data(nested_attr));
break;
case OVS_KEY_ATTR_TCP:
- err = set_tcp(skb, nla_data(nested_attr));
+ err = set_tcp(skb, key, nla_data(nested_attr));
break;
case OVS_KEY_ATTR_UDP:
- err = set_udp(skb, nla_data(nested_attr));
+ err = set_udp(skb, key, nla_data(nested_attr));
break;
case OVS_KEY_ATTR_SCTP:
- err = set_sctp(skb, nla_data(nested_attr));
+ err = set_sctp(skb, key, nla_data(nested_attr));
break;
case OVS_KEY_ATTR_MPLS:
- err = set_mpls(skb, nla_data(nested_attr));
+ err = set_mpls(skb, key, nla_data(nested_attr));
break;
}
@@ -877,31 +794,36 @@ static int execute_set_action(struct sk_buff *skb,
}
static int execute_recirc(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *a, int rem)
+ struct sw_flow_key *key, const struct nlattr *a, int
rem)
{
- if (!is_skb_flow_key_valid(skb)) {
+ struct deferred_action *da;
+
+ if (!is_flow_key_valid(key)) {
int err;
- err = ovs_flow_key_update(skb, OVS_CB(skb)->pkt_key);
+ err = ovs_flow_key_update(skb, key);
if (err)
return err;
}
- BUG_ON(!is_skb_flow_key_valid(skb));
+ BUG_ON(!is_flow_key_valid(key));
if (!last_action(a, rem)) {
/* Recirc action is the not the last action
- * of the action list, need to clone the skb. */
+ * of the action list, need to clone the skb.
+ */
skb = skb_clone(skb, GFP_ATOMIC);
/* Skip the recirc action when out of memory, but
- * continue on with the rest of the action list. */
+ * continue on with the rest of the action list.
+ */
if (!skb)
return 0;
}
- if (add_deferred_actions(skb, NULL)) {
- flow_key_set_recirc_id(skb, nla_get_u32(a));
+ da = add_deferred_actions(skb, key, NULL);
+ if (da) {
+ da->pkt_key.recirc_id = nla_get_u32(a);
} else {
kfree_skb(skb);
@@ -915,12 +837,14 @@ static int execute_recirc(struct datapath *dp, struct
sk_buff *skb,
/* Execute a list of actions against 'skb'. */
static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *attr, int len)
+ struct sw_flow_key *key,
+ const struct nlattr *attr, int 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
* then freeing the original skbuff is wasteful. So the following code
- * is slightly obscure just to avoid that. */
+ * is slightly obscure just to avoid that.
+ */
int prev_port = -1;
const struct nlattr *a;
int rem;
@@ -944,47 +868,48 @@ static int do_execute_actions(struct datapath *dp, struct
sk_buff *skb,
break;
case OVS_ACTION_ATTR_USERSPACE:
- output_userspace(dp, skb, a);
+ output_userspace(dp, skb, key, a);
break;
case OVS_ACTION_ATTR_HASH:
- execute_hash(skb, a);
+ execute_hash(skb, key, a);
break;
case OVS_ACTION_ATTR_PUSH_MPLS:
- err = push_mpls(skb, nla_data(a));
+ err = push_mpls(skb, key, nla_data(a));
break;
case OVS_ACTION_ATTR_POP_MPLS:
- err = pop_mpls(skb, nla_get_be16(a));
+ err = pop_mpls(skb, key, nla_get_be16(a));
break;
case OVS_ACTION_ATTR_PUSH_VLAN:
- err = push_vlan(skb, nla_data(a));
+ err = push_vlan(skb, key, nla_data(a));
if (unlikely(err)) /* skb already freed. */
return err;
break;
case OVS_ACTION_ATTR_POP_VLAN:
- err = pop_vlan(skb);
+ err = pop_vlan(skb, key);
break;
case OVS_ACTION_ATTR_RECIRC:
- err = execute_recirc(dp, skb, a, rem);
+ err = execute_recirc(dp, skb, key, a, rem);
if (last_action(a, rem)) {
/* If this is the last action, the skb has
* been consumed or freed.
- * Return immediately. */
+ * Return immediately.
+ */
return err;
}
break;
case OVS_ACTION_ATTR_SET:
- err = execute_set_action(skb, nla_data(a));
+ err = execute_set_action(skb, key, nla_data(a));
break;
case OVS_ACTION_ATTR_SAMPLE:
- err = sample(dp, skb, a);
+ err = sample(dp, skb, key, a);
break;
}
@@ -1017,10 +942,10 @@ static void process_deferred_actions(struct datapath *dp)
const struct nlattr *actions = da->actions;
if (actions)
- do_execute_actions(dp, skb, actions,
+ do_execute_actions(dp, skb, &da->pkt_key, actions,
nla_len(actions));
else
- ovs_dp_process_packet(skb);
+ ovs_dp_process_packet(skb, &da->pkt_key);
} while (!action_fifo_is_empty(fifo));
/* Reset FIFO for the next packet. */
@@ -1029,7 +954,7 @@ static void process_deferred_actions(struct datapath *dp)
/* Execute a list of actions against 'skb'. */
int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
- struct sw_flow_actions *acts)
+ struct sw_flow_key *key, struct sw_flow_actions *acts)
{
int level = this_cpu_read(exec_actions_level);
int err;
@@ -1045,7 +970,7 @@ int ovs_execute_actions(struct datapath *dp, struct
sk_buff *skb,
this_cpu_inc(exec_actions_level);
- err = do_execute_actions(dp, skb, acts->actions, acts->actions_len);
+ err = do_execute_actions(dp, skb, key, acts->actions,
acts->actions_len);
if (!level)
process_deferred_actions(dp);
@@ -1054,7 +979,8 @@ int ovs_execute_actions(struct datapath *dp, struct
sk_buff *skb,
/* This return status currently does not reflect the errors
* encounted during deferred actions execution. Probably needs to
- * be fixed in the future. */
+ * be fixed in the future.
+ */
return err;
}
diff --git a/datapath/datapath.c b/datapath/datapath.c
index ed9d7bd..f14bfa2 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -134,8 +134,9 @@ int lockdep_ovsl_is_held(void)
#endif
static int queue_gso_packets(struct datapath *dp, struct sk_buff *,
- const struct dp_upcall_info *);
+ struct sw_flow_key *, const struct dp_upcall_info
*);
static int queue_userspace_packet(struct datapath *dp, struct sk_buff *,
+ struct sw_flow_key *key,
const struct dp_upcall_info *);
/* Must be called with rcu_read_lock. */
@@ -249,10 +250,9 @@ void ovs_dp_detach_port(struct vport *p)
}
/* Must be called with rcu_read_lock. */
-void ovs_dp_process_packet(struct sk_buff *skb)
+void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
{
const struct vport *p = OVS_CB(skb)->input_vport;
- struct sw_flow_key *pkt_key = OVS_CB(skb)->pkt_key;
struct datapath *dp = p->dp;
struct sw_flow *flow;
struct sw_flow_actions *sf_acts;
@@ -263,7 +263,7 @@ void ovs_dp_process_packet(struct sk_buff *skb)
stats = this_cpu_ptr(dp->stats_percpu);
/* Look up flow. */
- flow = ovs_flow_tbl_lookup_stats(&dp->table, pkt_key, skb_get_hash(skb),
+ flow = ovs_flow_tbl_lookup_stats(&dp->table, key, skb_get_hash(skb),
&n_mask_hit);
if (unlikely(!flow)) {
struct dp_upcall_info upcall;
@@ -274,7 +274,7 @@ void ovs_dp_process_packet(struct sk_buff *skb)
upcall.portid = ovs_vport_find_upcall_portid(p, skb);
upcall.egress_tun_info = NULL;
- error = ovs_dp_upcall(dp, skb, &upcall);
+ error = ovs_dp_upcall(dp, skb, key, &upcall);
if (unlikely(error))
kfree_skb(skb);
else
@@ -284,10 +284,10 @@ void ovs_dp_process_packet(struct sk_buff *skb)
goto out;
}
- ovs_flow_stats_update(flow, pkt_key->tp.flags, skb);
+ ovs_flow_stats_update(flow, key->tp.flags, skb);
sf_acts = rcu_dereference(flow->sf_acts);
- ovs_execute_actions(dp, skb, sf_acts);
+ ovs_execute_actions(dp, skb, key, sf_acts);
stats_counter = &stats->n_hit;
out:
@@ -299,22 +299,21 @@ out:
}
int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb,
+ struct sw_flow_key *key,
const struct dp_upcall_info *upcall_info)
{
struct dp_stats_percpu *stats;
int err;
- BUG_ON(!OVS_CB(skb)->pkt_key);
-
if (upcall_info->portid == 0) {
err = -ENOTCONN;
goto err;
}
if (!skb_is_gso(skb))
- err = queue_userspace_packet(dp, skb, upcall_info);
+ err = queue_userspace_packet(dp, skb, key, upcall_info);
else
- err = queue_gso_packets(dp, skb, upcall_info);
+ err = queue_gso_packets(dp, skb, key, upcall_info);
if (err)
goto err;
@@ -331,6 +330,7 @@ err:
}
static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb,
+ struct sw_flow_key *key,
const struct dp_upcall_info *upcall_info)
{
unsigned short gso_type = skb_shinfo(skb)->gso_type;
@@ -347,7 +347,7 @@ static int queue_gso_packets(struct datapath *dp, struct
sk_buff *skb,
* in this case is for a first fragment, so we need to
* properly mark later fragments.
*/
- later_key = *OVS_CB(skb)->pkt_key;
+ later_key = *key;
later_key.ip.frag = OVS_FRAG_TYPE_LATER;
}
@@ -355,9 +355,9 @@ static int queue_gso_packets(struct datapath *dp, struct
sk_buff *skb,
skb = segs;
do {
if (gso_type & SKB_GSO_UDP && skb != segs)
- OVS_CB(skb)->pkt_key = &later_key;
+ key = &later_key;
- err = queue_userspace_packet(dp, skb, upcall_info);
+ err = queue_userspace_packet(dp, skb, key, upcall_info);
if (err)
break;
@@ -394,12 +394,12 @@ static size_t upcall_msg_size(const struct dp_upcall_info
*upcall_info,
}
static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
+ struct sw_flow_key *key,
const struct dp_upcall_info *upcall_info)
{
struct ovs_header *upcall;
struct sk_buff *nskb = NULL;
struct sk_buff *user_skb = NULL; /* to be queued to userspace */
- struct sw_flow_key *pkt_key = OVS_CB(skb)->pkt_key;
struct nlattr *nla;
struct genl_info info = {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
@@ -460,7 +460,7 @@ static int queue_userspace_packet(struct datapath *dp,
struct sk_buff *skb,
upcall->dp_ifindex = dp_ifindex;
nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_KEY);
- err = ovs_nla_put_flow(pkt_key, pkt_key, user_skb);
+ err = ovs_nla_put_flow(key, key, user_skb);
BUG_ON(err);
nla_nest_end(user_skb, nla);
@@ -566,7 +566,6 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb,
struct genl_info *info)
goto err_flow_free;
rcu_assign_pointer(flow->sf_acts, acts);
- OVS_CB(packet)->pkt_key = &flow->key;
OVS_CB(packet)->egress_tun_info = NULL;
packet->priority = flow->key.phy.priority;
packet->mark = flow->key.phy.skb_mark;
@@ -588,7 +587,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb,
struct genl_info *info)
sf_acts = rcu_dereference(flow->sf_acts);
local_bh_disable();
- err = ovs_execute_actions(dp, packet, sf_acts);
+ err = ovs_execute_actions(dp, packet, &flow->key, sf_acts);
local_bh_enable();
rcu_read_unlock();
diff --git a/datapath/datapath.h b/datapath/datapath.h
index 23d2c18..b30a9a4 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -96,14 +96,12 @@ struct datapath {
/**
* struct ovs_skb_cb - OVS data in skb CB
- * @pkt_key: The flow information extracted from the packet. Must be nonnull.
* @egress_tun_info: Tunnel information about this packet on egress path.
* NULL if the packet is not being tunneled.
* @input_vport: The original vport packet came in on. This value is cached
* when a packet is received by OVS.
*/
struct ovs_skb_cb {
- struct sw_flow_key *pkt_key;
struct ovs_tunnel_info *egress_tun_info;
struct vport *input_vport;
};
@@ -188,17 +186,17 @@ extern struct notifier_block ovs_dp_device_notifier;
extern struct genl_family dp_vport_genl_family;
extern struct genl_multicast_group ovs_dp_vport_multicast_group;
-void ovs_dp_process_packet(struct sk_buff *c);
+void ovs_dp_process_packet(struct sk_buff *, struct sw_flow_key *key);
void ovs_dp_detach_port(struct vport *);
int ovs_dp_upcall(struct datapath *, struct sk_buff *,
- const struct dp_upcall_info *);
+ struct sw_flow_key *, const struct dp_upcall_info *);
const char *ovs_dp_name(const struct datapath *dp);
struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 portid, u32 seq,
u8 cmd);
int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
- struct sw_flow_actions *acts);
+ struct sw_flow_key *key, struct sw_flow_actions *acts);
void ovs_dp_notify_wq(struct work_struct *work);
int action_fifos_init(void);
diff --git a/datapath/flow.c b/datapath/flow.c
index af9c227..eb7df13 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -669,7 +669,6 @@ static int key_extract(struct sk_buff *skb, struct
sw_flow_key *key)
}
}
- OVS_CB(skb)->pkt_key = key;
return 0;
}
diff --git a/datapath/vport-lisp.c b/datapath/vport-lisp.c
index 3335aa5..bd4d138 100644
--- a/datapath/vport-lisp.c
+++ b/datapath/vport-lisp.c
@@ -171,17 +171,21 @@ static u16 get_src_port(struct net *net, struct sk_buff
*skb)
int low;
if (!hash) {
- struct sw_flow_key *pkt_key = OVS_CB(skb)->pkt_key;
-
- if (skb->protocol == htons(ETH_P_IP))
- hash = jhash2((const u32 *)&pkt_key->ipv4.addr,
- sizeof(pkt_key->ipv4.addr) / sizeof(u32), 0);
- else if (skb->protocol == htons(ETH_P_IPV6))
- hash = jhash2((const u32 *)&pkt_key->ipv6.addr,
- sizeof(pkt_key->ipv6.addr) / sizeof(u32), 0);
- else
+ if (skb->protocol == htons(ETH_P_IP)) {
+ struct iphdr *iph;
+
+ iph = (struct iphdr *) skb_inner_network_header(skb);
+ hash = jhash2((const u32 *)&iph->saddr, 2, 0);
+ } else if (skb->protocol == htons(ETH_P_IPV6)) {
+ struct ipv6hdr *ipv6hdr;
+
+ ipv6hdr = (struct ipv6hdr *)
skb_inner_network_header(skb);
+ hash = jhash2((const u32 *)&ipv6hdr->saddr,
+ (sizeof(struct in6_addr) * 2) /
sizeof(u32), 0);
+ } else {
pr_warn_once("LISP inner protocol is not IP when "
"calculating hash.\n");
+ }
}
inet_get_local_port_range(net, &low, &high);
diff --git a/datapath/vport.c b/datapath/vport.c
index cf7f917..07d4d41 100644
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -488,7 +488,7 @@ void ovs_vport_receive(struct vport *vport, struct sk_buff
*skb,
return;
}
- ovs_dp_process_packet(skb);
+ ovs_dp_process_packet(skb, &key);
}
/**
--
1.9.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
