#include "vlan.h"
#include "vport.h"
-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 int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
+ struct sw_flow_key *key,
+ const struct nlattr *attr, int len);
-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);
-}
+struct deferred_action {
+ struct sk_buff *skb;
+ const struct nlattr *actions;
-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);
-}
+ /* Store pkt_key clone when creating deferred action. */
+ struct sw_flow_key pkt_key;
+};
-static void flow_key_set_vlan_tci(struct sk_buff *skb, __be16 tci)
-{
- OVS_CB(skb)->pkt_key->eth.tci = tci;
-}
+#define DEFERRED_ACTION_FIFO_SIZE 10
+struct action_fifo {
+ int head;
+ int tail;
+ /* Deferred action fifo queue storage. */
+ struct deferred_action fifo[DEFERRED_ACTION_FIFO_SIZE];
+};
-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 struct action_fifo __percpu *action_fifos;
+#define EXEC_ACTIONS_LEVEL_LIMIT 4 /* limit used to detect packet
+ looping by the network stack */
+static DEFINE_PER_CPU(int, exec_actions_level);
-static void flow_key_set_ipv4_src(struct sk_buff *skb, __be32 addr)
+static void action_fifo_init(struct action_fifo *fifo)
{
- OVS_CB(skb)->pkt_key->ipv4.addr.src = addr;
+ fifo->head = 0;
+ fifo->tail = 0;
}
-static void flow_key_set_ipv4_dst(struct sk_buff *skb, __be32 addr)
+static bool action_fifo_is_empty(struct action_fifo *fifo)
{
- OVS_CB(skb)->pkt_key->ipv4.addr.src = addr;
+ return (fifo->head == fifo->tail);
}
-static void flow_key_set_ip_tos(struct sk_buff *skb, u8 tos)
+static struct deferred_action *action_fifo_get(struct action_fifo *fifo)
{
- OVS_CB(skb)->pkt_key->ip.tos = tos;
-}
+ if (action_fifo_is_empty(fifo))
+ return NULL;
-static void flow_key_set_ip_ttl(struct sk_buff *skb, u8 ttl)
-{
- OVS_CB(skb)->pkt_key->ip.ttl = ttl;
+ return &fifo->fifo[fifo->tail++];
}
-static void flow_key_set_ipv6_src(struct sk_buff *skb,
- const __be32 addr[4])
+static struct deferred_action *action_fifo_put(struct action_fifo *fifo)
{
- memcpy(&OVS_CB(skb)->pkt_key->ipv6.addr.src, addr, sizeof(__be32[4]));
-}
+ if (fifo->head >= DEFERRED_ACTION_FIFO_SIZE - 1)
+ return NULL;
-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]));
+ return &fifo->fifo[fifo->head++];
}
-static void flow_key_set_ipv6_fl(struct sk_buff *skb,
- const struct ipv6hdr *nh)
+/* Return queue entry if fifo is not full */
+static struct deferred_action *add_deferred_actions(struct sk_buff *skb,
+ struct sw_flow_key *key,
+ const struct nlattr *attr)
{
- OVS_CB(skb)->pkt_key->ipv6.label = *(__be32 *)nh &
- htonl(IPV6_FLOWINFO_FLOWLABEL);
-}
+ struct action_fifo *fifo;
+ struct deferred_action *da;
-static void flow_key_set_tp_src(struct sk_buff *skb, __be16 port)
-{
- OVS_CB(skb)->pkt_key->tp.src = port;
-}
+ fifo = this_cpu_ptr(action_fifos);
+ da = action_fifo_put(fifo);
+ if (da) {
+ da->skb = skb;
+ da->actions = attr;
+ da->pkt_key = *key;
+ }
-static void flow_key_set_tp_dst(struct sk_buff *skb, __be16 port)
-{
- OVS_CB(skb)->pkt_key->tp.dst = port;
+ return da;
}
-static void invalidate_skb_flow_key(struct sk_buff *skb)
+static void invalidate_flow_key(struct sw_flow_key *key)
{
- OVS_CB(skb)->pkt_key->eth.type = htons(0);
+ key->eth.type = htons(0);
}
-static bool is_skb_flow_key_valid(struct sk_buff *skb)
+static bool is_flow_key_valid(struct sw_flow_key *key)
{
- return !!OVS_CB(skb)->pkt_key->eth.type;
+ return !!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))
+ return -ENOMEM;
+
if (!skb_cloned(skb) || skb_clone_writable(skb, write_len))
return 0;
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;
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;
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;
}
*stack = *mpls_lse;
- flow_key_set_mpls_top_lse(skb, *stack);
+ key->mpls.top_lse = *mpls_lse;
return 0;
}
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;
/* 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;
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;
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;
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;
}
{
int transport_len = skb->len - skb_transport_offset(skb);
- if (l4_proto == IPPROTO_TCP) {
+ if (l4_proto == NEXTHDR_TCP) {
if (likely(transport_len >= sizeof(struct tcphdr)))
inet_proto_csum_replace16(&tcp_hdr(skb)->check, skb,
addr, new_addr, 1);
- } else if (l4_proto == IPPROTO_UDP) {
+ } else if (l4_proto == NEXTHDR_UDP) {
if (likely(transport_len >= sizeof(struct udphdr))) {
struct udphdr *uh = udp_hdr(skb);
uh->check = CSUM_MANGLED_0;
}
}
+ } else if (l4_proto == NEXTHDR_ICMP) {
+ if (likely(transport_len >= sizeof(struct icmp6hdr)))
+ inet_proto_csum_replace16(&icmp6_hdr(skb)->icmp6_cksum,
+ skb, addr, new_addr, 1);
}
}
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;
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;
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(ipv6_key->ipv6_src));
}
if (memcmp(ipv6_key->ipv6_dst, daddr, sizeof(ipv6_key->ipv6_dst))) {
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(ipv6_key->ipv6_dst));
}
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;
}
}
}
-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;
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;
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;
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;
}
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;
int rem;
+ struct ovs_tunnel_info info;
upcall.cmd = OVS_PACKET_CMD_ACTION;
upcall.userdata = NULL;
upcall.portid = 0;
+ upcall.egress_tun_info = NULL;
for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
a = nla_next(a, &rem)) {
case OVS_USERSPACE_ATTR_PID:
upcall.portid = nla_get_u32(a);
break;
+
+ case OVS_USERSPACE_ATTR_EGRESS_TUN_PORT: {
+ /* Get out tunnel info. */
+ struct vport *vport;
+
+ vport = ovs_vport_rcu(dp, nla_get_u32(a));
+ if (vport) {
+ int err;
+
+ err = ovs_vport_get_egress_tun_info(vport, skb,
+ &info);
+ if (!err)
+ upcall.egress_tun_info = &info;
+ }
+ break;
}
+
+ } /* 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)
}
static int sample(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *attr)
+ struct sw_flow_key *key, const struct nlattr *attr)
{
- struct sw_flow_key sample_key;
const struct nlattr *acts_list = NULL;
const struct nlattr *a;
- struct sk_buff *sample_skb;
int rem;
for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
rem = nla_len(acts_list);
a = nla_data(acts_list);
- /* Actions list is either empty or only contains a single user-space
- * action, the latter being a special case as it is the only known
- * usage of the sample action.
- * In these special cases don't clone the skb as there are no
- * side-effects in the nested actions.
- * Otherwise, clone in case the nested actions have side effects. */
- if (likely(rem == 0 ||
- (nla_type(a) == OVS_ACTION_ATTR_USERSPACE &&
- last_action(a, rem)))) {
- sample_skb = skb;
- skb_get(skb);
- } else {
- sample_skb = skb_clone(skb, GFP_ATOMIC);
- if (!sample_skb)
- /* Skip the sample action when out of memory. */
- return 0;
+ /* Actions list is empty, do nothing */
+ if (unlikely(!rem))
+ return 0;
- sample_key = *OVS_CB(skb)->pkt_key;
- OVS_CB(sample_skb)->pkt_key = &sample_key;
- }
+ /* 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.
+ */
+ if (likely(nla_type(a) == OVS_ACTION_ATTR_USERSPACE &&
+ last_action(a, rem)))
+ return output_userspace(dp, skb, key, a);
- /* Note that do_execute_actions() never consumes skb.
- * In the case where skb has been cloned above it is the clone that
- * is consumed. Otherwise the skb_get(skb) call prevents
- * consumption by do_execute_actions(). Thus, it is safe to simply
- * return the error code and let the caller (also
- * do_execute_actions()) free skb on error. */
- return do_execute_actions(dp, sample_skb, a, rem);
+ skb = skb_clone(skb, GFP_ATOMIC);
+ if (!skb)
+ /* Skip the sample action when out of memory. */
+ return 0;
+
+ 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;
key->ovs_flow_hash = hash;
}
-static int execute_set_action(struct sk_buff *skb,
- const struct nlattr *nested_attr)
+static int execute_set_action(struct sk_buff *skb, struct sw_flow_key *key,
+ const struct nlattr *nested_attr)
{
int err = 0;
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:
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;
}
return err;
}
-static void flow_key_clone_recirc(struct sk_buff *skb, u32 recirc_id,
- struct sw_flow_key *recirc_key)
+static int execute_recirc(struct datapath *dp, struct sk_buff *skb,
+ struct sw_flow_key *key, const struct nlattr *a, int rem)
{
- *recirc_key = *OVS_CB(skb)->pkt_key;
- recirc_key->recirc_id = recirc_id;
- OVS_CB(skb)->pkt_key = recirc_key;
-}
+ struct deferred_action *da;
-static void flow_key_set_recirc_id(struct sk_buff *skb, u32 recirc_id)
-{
- OVS_CB(skb)->pkt_key->recirc_id = recirc_id;
-}
+ if (!is_flow_key_valid(key)) {
+ int err;
-static int execute_recirc(struct datapath *dp, struct sk_buff *skb,
- const struct nlattr *a, int rem)
-{
- struct sw_flow_key recirc_key;
- int err;
+ err = ovs_flow_key_update(skb, key);
+ if (err)
+ return err;
+
+ }
+ BUG_ON(!is_flow_key_valid(key));
if (!last_action(a, rem)) {
/* Recirc action is the not the last action
- * of the action list. */
+ * 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 (is_skb_flow_key_valid(skb)) {
- if (!last_action(a, rem))
- flow_key_clone_recirc(skb, nla_get_u32(a), &recirc_key);
- else
- 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 {
- struct sw_flow_key *pkt_key = OVS_CB(skb)->pkt_key;
+ kfree_skb(skb);
- err = ovs_flow_key_extract_recirc(nla_get_u32(a), pkt_key,
- skb, &recirc_key);
- if (err) {
- kfree_skb(skb);
- return err;
- }
+ if (net_ratelimit())
+ pr_warn("%s: deferred action limit reached, drop recirc action\n",
+ ovs_dp_name(dp));
}
- ovs_dp_process_packet(skb, true);
return 0;
}
/* 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;
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 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;
}
return 0;
}
-/* We limit the number of times that we pass into execute_actions()
- * to avoid blowing out the stack in the event that we have a loop.
- *
- * Each loop adds some (estimated) cost to the kernel stack.
- * The loop terminates when the max cost is exceeded.
- * */
-#define RECIRC_STACK_COST 1
-#define DEFAULT_STACK_COST 4
-/* Allow up to 4 regular services, and up to 3 recirculations */
-#define MAX_STACK_COST (DEFAULT_STACK_COST * 4 + RECIRC_STACK_COST * 3)
-
-struct loop_counter {
- u8 stack_cost; /* loop stack cost. */
- bool looping; /* Loop detected? */
-};
+static void process_deferred_actions(struct datapath *dp)
+{
+ struct action_fifo *fifo = this_cpu_ptr(action_fifos);
-static DEFINE_PER_CPU(struct loop_counter, loop_counters);
+ /* Do not touch the FIFO in case there is no deferred actions. */
+ if (action_fifo_is_empty(fifo))
+ return;
-static int loop_suppress(struct datapath *dp, struct sw_flow_actions *actions)
-{
- if (net_ratelimit())
- pr_warn("%s: flow loop detected, dropping\n",
- ovs_dp_name(dp));
- actions->actions_len = 0;
- return -ELOOP;
+ /* Finishing executing all deferred actions. */
+ do {
+ struct deferred_action *da = action_fifo_get(fifo);
+ struct sk_buff *skb = da->skb;
+ const struct nlattr *actions = da->actions;
+
+ if (actions)
+ do_execute_actions(dp, skb, &da->pkt_key, actions,
+ nla_len(actions));
+ else
+ ovs_dp_process_packet(skb, &da->pkt_key);
+ } while (!action_fifo_is_empty(fifo));
+
+ /* Reset FIFO for the next packet. */
+ action_fifo_init(fifo);
}
/* Execute a list of actions against 'skb'. */
-int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, bool recirc)
-{
- struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
- const u8 stack_cost = recirc ? RECIRC_STACK_COST : DEFAULT_STACK_COST;
- struct loop_counter *loop;
- int error;
-
- /* Check whether we've looped too much. */
- loop = &__get_cpu_var(loop_counters);
- loop->stack_cost += stack_cost;
- if (unlikely(loop->stack_cost > MAX_STACK_COST))
- loop->looping = true;
- if (unlikely(loop->looping)) {
- error = loop_suppress(dp, acts);
+int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
+ struct sw_flow_key *key, struct sw_flow_actions *acts)
+{
+ int level = this_cpu_read(exec_actions_level);
+ int err;
+
+ if (unlikely(level >= EXEC_ACTIONS_LEVEL_LIMIT)) {
+ if (net_ratelimit())
+ pr_warn("%s: packet loop detected, dropping.\n",
+ ovs_dp_name(dp));
+
kfree_skb(skb);
- goto out_loop;
+ return -ELOOP;
}
- error = do_execute_actions(dp, skb, acts->actions, acts->actions_len);
+ this_cpu_inc(exec_actions_level);
+
+ err = do_execute_actions(dp, skb, key, acts->actions, acts->actions_len);
- /* Check whether sub-actions looped too much. */
- if (unlikely(loop->looping))
- error = loop_suppress(dp, acts);
+ if (!level)
+ process_deferred_actions(dp);
-out_loop:
- /* Decrement loop stack cost. */
- loop->stack_cost -= stack_cost;
- if (!loop->stack_cost)
- loop->looping = false;
+ this_cpu_dec(exec_actions_level);
- return error;
+ /* This return status currently does not reflect the errors
+ * encounted during deferred actions execution. Probably needs to
+ * be fixed in the future.
+ */
+ return err;
+}
+
+int action_fifos_init(void)
+{
+ action_fifos = alloc_percpu(struct action_fifo);
+ if (!action_fifos)
+ return -ENOMEM;
+
+ return 0;
+}
+
+void action_fifos_exit(void)
+{
+ free_percpu(action_fifos);
}
projects / cascardo / ovs.git / blobdiff