#include "datapath.h"
#include "actions.h"
#include "flow.h"
+#include "loop_counter.h"
#include "odp-compat.h"
#include "table.h"
#include "vport-internal_dev.h"
#include "compat.h"
-
int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
EXPORT_SYMBOL(dp_ioctl_hook);
static struct datapath *dps[ODP_MAX];
static DEFINE_MUTEX(dp_mutex);
-/* We limit the number of times that we pass into dp_process_received_packet()
- * to avoid blowing out the stack in the event that we have a loop. */
-struct loop_counter {
- int count; /* Count. */
- bool looping; /* Loop detected? */
-};
-
-#define DP_MAX_LOOPS 5
-
-/* We use a separate counter for each CPU for both interrupt and non-interrupt
- * context in order to keep the limit deterministic for a given packet. */
-struct percpu_loop_counters {
- struct loop_counter counters[2];
-};
-
-static DEFINE_PER_CPU(struct percpu_loop_counters, dp_loop_counters);
-
static int new_dp_port(struct datapath *, struct odp_port *, int port_no);
/* Must be called with rcu_read_lock or dp_mutex. */
vport = vport_locate(odp_port->devname);
if (!vport) {
- vport_lock();
+ struct vport_parms parms;
- if (odp_port->flags & ODP_PORT_INTERNAL)
- vport = vport_add(odp_port->devname, "internal", NULL);
- else
- vport = vport_add(odp_port->devname, "netdev", NULL);
+ parms.name = odp_port->devname;
+ parms.type = odp_port->flags & ODP_PORT_INTERNAL ? "internal" : "netdev";
+ parms.config = NULL;
+ vport_lock();
+ vport = vport_add(&parms);
vport_unlock();
if (IS_ERR(vport))
return err;
}
-static void suppress_loop(struct datapath *dp, struct sw_flow_actions *actions)
-{
- if (net_ratelimit())
- pr_warn("%s: flow looped %d times, dropping\n",
- dp_name(dp), DP_MAX_LOOPS);
- actions->n_actions = 0;
-}
-
/* Must be called with rcu_read_lock. */
void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb)
{
acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
/* Check whether we've looped too much. */
- loop = &get_cpu_var(dp_loop_counters).counters[!!in_interrupt()];
- if (unlikely(++loop->count > DP_MAX_LOOPS))
+ loop = loop_get_counter();
+ if (unlikely(++loop->count > MAX_LOOPS))
loop->looping = true;
if (unlikely(loop->looping)) {
- suppress_loop(dp, acts);
+ loop_suppress(dp, acts);
goto out_loop;
}
/* Check whether sub-actions looped too much. */
if (unlikely(loop->looping))
- suppress_loop(dp, acts);
+ loop_suppress(dp, acts);
out_loop:
/* Decrement loop counter. */
if (!--loop->count)
loop->looping = false;
- put_cpu_var(dp_loop_counters);
+ loop_put_counter();
out:
/* Update datapath statistics. */
for (i = 0; i < actions->n_actions; i++) {
const union odp_action *a = &actions->actions[i];
- __be16 mask;
switch (a->type) {
case ODPAT_CONTROLLER:
break;
case ODPAT_SET_DL_TCI:
- mask = a->dl_tci.mask;
- if (mask != htons(VLAN_VID_MASK) &&
- mask != htons(VLAN_PCP_MASK) &&
- mask != htons(VLAN_VID_MASK | VLAN_PCP_MASK))
- return -EINVAL;
- if (a->dl_tci.tci & ~mask)
+ if (a->dl_tci.tci & htons(VLAN_CFI_MASK))
return -EINVAL;
break;
return ERR_PTR(error);
}
-static struct timespec get_time_offset(void)
-{
- struct timespec now_mono, now_jiffies;
-
- ktime_get_ts(&now_mono);
- jiffies_to_timespec(jiffies, &now_jiffies);
- return timespec_sub(now_mono, now_jiffies);
-}
-
-static void get_stats(struct sw_flow *flow, struct odp_flow_stats *stats,
- struct timespec time_offset)
+static void get_stats(struct sw_flow *flow, struct odp_flow_stats *stats)
{
if (flow->used) {
- struct timespec flow_ts, used;
+ struct timespec offset_ts, used, now_mono;
- jiffies_to_timespec(flow->used, &flow_ts);
- set_normalized_timespec(&used, flow_ts.tv_sec + time_offset.tv_sec,
- flow_ts.tv_nsec + time_offset.tv_nsec);
+ ktime_get_ts(&now_mono);
+ jiffies_to_timespec(jiffies - flow->used, &offset_ts);
+ set_normalized_timespec(&used, now_mono.tv_sec - offset_ts.tv_sec,
+ now_mono.tv_nsec - offset_ts.tv_nsec);
stats->used_sec = used.tv_sec;
stats->used_nsec = used.tv_nsec;
/* Fetch stats, then clear them if necessary. */
spin_lock_bh(&flow->lock);
- get_stats(flow, stats, get_time_offset());
+ get_stats(flow, stats);
if (uf->flags & ODPPF_ZERO_STATS)
clear_stats(flow);
spin_unlock_bh(&flow->lock);
}
static int do_answer_query(struct sw_flow *flow, u32 query_flags,
- struct timespec time_offset,
struct odp_flow_stats __user *ustats,
union odp_action __user *actions,
u32 __user *n_actionsp)
u32 n_actions;
spin_lock_bh(&flow->lock);
- get_stats(flow, &stats, time_offset);
+ get_stats(flow, &stats);
if (query_flags & ODPFF_ZERO_TCP_FLAGS)
flow->tcp_flags = 0;
}
static int answer_query(struct sw_flow *flow, u32 query_flags,
- struct timespec time_offset,
struct odp_flow __user *ufp)
{
union odp_action *actions;
if (get_user(actions, &ufp->actions))
return -EFAULT;
- return do_answer_query(flow, query_flags, time_offset,
+ return do_answer_query(flow, query_flags,
&ufp->stats, actions, &ufp->n_actions);
}
if (IS_ERR(flow))
return PTR_ERR(flow);
- error = answer_query(flow, 0, get_time_offset(), ufp);
+ error = answer_query(flow, 0, ufp);
flow_deferred_free(flow);
return error;
}
static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
{
struct tbl *table = rcu_dereference(dp->table);
- struct timespec time_offset;
u32 i;
- time_offset = get_time_offset();
-
for (i = 0; i < flowvec->n_flows; i++) {
struct odp_flow __user *ufp = &flowvec->flows[i];
struct odp_flow uf;
if (!flow_node)
error = put_user(ENOENT, &ufp->stats.error);
else
- error = answer_query(flow_cast(flow_node), uf.flags, time_offset, ufp);
+ error = answer_query(flow_cast(flow_node), uf.flags, ufp);
if (error)
return -EFAULT;
}
struct odp_flow __user *uflows;
u32 n_flows;
u32 listed_flows;
- struct timespec time_offset;
};
static int list_flow(struct tbl_node *node, void *cbdata_)
if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key))
return -EFAULT;
- error = answer_query(flow, 0, cbdata->time_offset, ufp);
+ error = answer_query(flow, 0, ufp);
if (error)
return error;
cbdata.uflows = flowvec->flows;
cbdata.n_flows = flowvec->n_flows;
cbdata.listed_flows = 0;
- cbdata.time_offset = get_time_offset();
error = tbl_foreach(rcu_dereference(dp->table), list_flow, &cbdata);
return error ? error : cbdata.listed_flows;
}
static int compat_answer_query(struct sw_flow *flow, u32 query_flags,
- struct timespec time_offset,
struct compat_odp_flow __user *ufp)
{
compat_uptr_t actions;
if (get_user(actions, &ufp->actions))
return -EFAULT;
- return do_answer_query(flow, query_flags, time_offset, &ufp->stats,
+ return do_answer_query(flow, query_flags, &ufp->stats,
compat_ptr(actions), &ufp->n_actions);
}
if (IS_ERR(flow))
return PTR_ERR(flow);
- error = compat_answer_query(flow, 0, get_time_offset(), ufp);
+ error = compat_answer_query(flow, 0, ufp);
flow_deferred_free(flow);
return error;
}
static int compat_query_flows(struct datapath *dp, struct compat_odp_flow *flows, u32 n_flows)
{
struct tbl *table = rcu_dereference(dp->table);
- struct timespec time_offset;
u32 i;
- time_offset = get_time_offset();
-
for (i = 0; i < n_flows; i++) {
struct compat_odp_flow __user *ufp = &flows[i];
struct odp_flow uf;
if (compat_get_flow(&uf, ufp))
return -EFAULT;
- memset(uf.key.reserved, 0, sizeof uf.key.reserved);
flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp);
if (!flow_node)
error = put_user(ENOENT, &ufp->stats.error);
else
- error = compat_answer_query(flow_cast(flow_node), uf.flags, time_offset, ufp);
+ error = compat_answer_query(flow_cast(flow_node), uf.flags, ufp);
if (error)
return -EFAULT;
}
struct compat_odp_flow __user *uflows;
u32 n_flows;
u32 listed_flows;
- struct timespec time_offset;
};
static int compat_list_flow(struct tbl_node *node, void *cbdata_)
if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key))
return -EFAULT;
- error = compat_answer_query(flow, 0, cbdata->time_offset, ufp);
+ error = compat_answer_query(flow, 0, ufp);
if (error)
return error;
cbdata.uflows = flows;
cbdata.n_flows = n_flows;
cbdata.listed_flows = 0;
- cbdata.time_offset = get_time_offset();
error = tbl_foreach(rcu_dereference(dp->table), compat_list_flow, &cbdata);
return error ? error : cbdata.listed_flows;
projects / openvswitch / blobdiff