Skip to content

Commit

Permalink
datapath: fix coding style.
Browse files Browse the repository at this point in the history 
Kernel datapath code has diverged from upstream code.  This
makes porting patches between these two code bases harder
than it needs to be. Following patch fixes this by fixing
coding style issues on this branch.

Signed-off-by: Pravin B Shelar <[email protected]>
  • Loading branch information
Pravin B Shelar committed Nov 10, 2014
1 parent 2baf0e0 commit 7d16c84
Show file tree
Hide file tree
Showing 9 changed files with 198 additions and 216 deletions.
17 changes: 9 additions & 8 deletions datapath/actions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,8 @@ static int execute_set_action(struct sk_buff *skb, struct sw_flow_key *key,
}

static int execute_recirc(struct datapath *dp, struct sk_buff *skb,
struct sw_flow_key *key, const struct nlattr *a, int rem)
struct sw_flow_key *key,
const struct nlattr *a, int rem)
{
struct deferred_action *da;

Expand All @@ -795,7 +796,6 @@ static int execute_recirc(struct datapath *dp, struct sk_buff *skb,
err = ovs_flow_key_update(skb, key);
if (err)
return err;

}
BUG_ON(!is_flow_key_valid(key));

Expand Down Expand Up @@ -930,13 +930,14 @@ static void process_deferred_actions(struct datapath *dp)
do {
struct deferred_action *da = action_fifo_get(fifo);
struct sk_buff *skb = da->skb;
struct sw_flow_key *key = &da->pkt_key;
const struct nlattr *actions = da->actions;

if (actions)
do_execute_actions(dp, skb, &da->pkt_key, actions,
do_execute_actions(dp, skb, key, actions,
nla_len(actions));
else
ovs_dp_process_packet(skb, &da->pkt_key);
ovs_dp_process_packet(skb, key);
} while (!action_fifo_is_empty(fifo));

/* Reset FIFO for the next packet. */
Expand All @@ -945,8 +946,8 @@ 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_key *key,
const struct sw_flow_actions *acts)
const struct sw_flow_actions *acts,
struct sw_flow_key *key)
{
int level = this_cpu_read(exec_actions_level);
int err;
Expand All @@ -961,8 +962,8 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
}

this_cpu_inc(exec_actions_level);

err = do_execute_actions(dp, skb, key, acts->actions, acts->actions_len);
err = do_execute_actions(dp, skb, key,
acts->actions, acts->actions_len);

if (!level)
process_deferred_actions(dp);
Expand Down
60 changes: 27 additions & 33 deletions datapath/datapath.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *,
const struct sw_flow_key *,
const struct dp_upcall_info *);
static int queue_userspace_packet(struct datapath *dp, struct sk_buff *,
const struct sw_flow_key *key,
const struct sw_flow_key *,
const struct dp_upcall_info *);

/* Must be called with rcu_read_lock. */
Expand Down Expand Up @@ -277,21 +277,19 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
upcall.userdata = NULL;
upcall.portid = ovs_vport_find_upcall_portid(p, skb);
upcall.egress_tun_info = NULL;

error = ovs_dp_upcall(dp, skb, key, &upcall);
if (unlikely(error))
kfree_skb(skb);
else
consume_skb(skb);

stats_counter = &stats->n_missed;
goto out;
}

ovs_flow_stats_update(flow, key->tp.flags, skb);

sf_acts = rcu_dereference(flow->sf_acts);
ovs_execute_actions(dp, skb, key, sf_acts);
ovs_execute_actions(dp, skb, sf_acts, key);

stats_counter = &stats->n_hit;

out:
Expand Down Expand Up @@ -515,7 +513,6 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
out:
if (err)
skb_tx_error(skb);

kfree_skb(user_skb);
kfree_skb(nskb);
return err;
Expand Down Expand Up @@ -600,7 +597,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, &flow->key, sf_acts);
err = ovs_execute_actions(dp, packet, sf_acts, &flow->key);
local_bh_enable();
rcu_read_unlock();

Expand Down Expand Up @@ -697,10 +694,10 @@ static int ovs_flow_cmd_fill_match(const struct sw_flow *flow,
if (!nla)
return -EMSGSIZE;

err = ovs_nla_put_flow(&flow->unmasked_key,
&flow->unmasked_key, skb);
err = ovs_nla_put_flow(&flow->unmasked_key, &flow->unmasked_key, skb);
if (err)
return err;

nla_nest_end(skb, nla);

/* Fill flow mask. */
Expand All @@ -711,8 +708,8 @@ static int ovs_flow_cmd_fill_match(const struct sw_flow *flow,
err = ovs_nla_put_flow(&flow->key, &flow->mask->key, skb);
if (err)
return err;
nla_nest_end(skb, nla);

nla_nest_end(skb, nla);
return 0;
}

Expand Down Expand Up @@ -790,9 +787,11 @@ static int ovs_flow_cmd_fill_info(const struct sw_flow *flow, int dp_ifindex,
struct ovs_header *ovs_header;
int err;

ovs_header = genlmsg_put(skb, portid, seq, &dp_flow_genl_family, flags, cmd);
ovs_header = genlmsg_put(skb, portid, seq, &dp_flow_genl_family,
flags, cmd);
if (!ovs_header)
return -EMSGSIZE;

ovs_header->dp_ifindex = dp_ifindex;

err = ovs_flow_cmd_fill_match(flow, skb);
Expand Down Expand Up @@ -826,16 +825,14 @@ static struct sk_buff *ovs_flow_cmd_alloc_info(const struct sw_flow_actions *act
return NULL;

skb = genlmsg_new_unicast(ovs_flow_cmd_msg_size(acts), info, GFP_KERNEL);

if (!skb)
return ERR_PTR(-ENOMEM);

return skb;
}

/* Called with ovs_mutex. */
static struct sk_buff *ovs_flow_cmd_build_info(struct datapath *dp,
const struct sw_flow *flow,
static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow,
int dp_ifindex,
struct genl_info *info, u8 cmd,
bool always)
Expand Down Expand Up @@ -871,12 +868,11 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
/* Must have key and actions. */
error = -EINVAL;
if (!a[OVS_FLOW_ATTR_KEY]) {
OVS_NLERR(log, "Flow key attribute not present in new flow.");
OVS_NLERR(log, "Flow key attr not present in new flow.");
goto error;
}
if (!a[OVS_FLOW_ATTR_ACTIONS]) {
OVS_NLERR(log,
"Flow actions attribute not present in new flow.");
OVS_NLERR(log, "Flow actions attr not present in new flow.");
goto error;
}

Expand All @@ -902,10 +898,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
error = ovs_nla_copy_actions(a[OVS_FLOW_ATTR_ACTIONS], &new_flow->key,
&acts, log);
if (error) {
OVS_NLERR(
log,
"Flow actions may not be safe on all matching packets."
);
OVS_NLERR(log, "Flow actions may not be safe on all matching packets.");
goto err_kfree_flow;
}

Expand Down Expand Up @@ -1012,7 +1005,7 @@ static struct sw_flow_actions *get_flow_actions(const struct nlattr *a,
error = ovs_nla_copy_actions(a, &masked_key, &acts, log);
if (error) {
OVS_NLERR(log,
"Actions may not be safe on all matching packets.");
"Actions may not be safe on all matching packets");
return ERR_PTR(error);
}

Expand Down Expand Up @@ -1091,8 +1084,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
}
} else {
/* Could not alloc without acts before locking. */
reply = ovs_flow_cmd_build_info(dp, flow,
ovs_header->dp_ifindex,
reply = ovs_flow_cmd_build_info(flow, ovs_header->dp_ifindex,
info, OVS_FLOW_CMD_NEW, false);
if (unlikely(IS_ERR(reply))) {
error = PTR_ERR(reply);
Expand All @@ -1109,6 +1101,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
if (old_acts)
ovs_nla_free_flow_actions(old_acts);

return 0;

err_unlock_ovs:
Expand Down Expand Up @@ -1156,7 +1149,7 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
goto unlock;
}

reply = ovs_flow_cmd_build_info(dp, flow, ovs_header->dp_ifindex, info,
reply = ovs_flow_cmd_build_info(flow, ovs_header->dp_ifindex, info,
OVS_FLOW_CMD_NEW, true);
if (IS_ERR(reply)) {
err = PTR_ERR(reply);
Expand Down Expand Up @@ -1196,10 +1189,12 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
err = -ENODEV;
goto unlock;
}

if (unlikely(!a[OVS_FLOW_ATTR_KEY])) {
err = ovs_flow_tbl_flush(&dp->table);
goto unlock;
}

flow = ovs_flow_tbl_lookup_exact(&dp->table, &match);
if (unlikely(!flow)) {
err = -ENOENT;
Expand All @@ -1214,9 +1209,8 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)

if (likely(reply)) {
if (likely(!IS_ERR(reply))) {
rcu_read_lock(); /* Keep RCU checker happy. */
err = ovs_flow_cmd_fill_info(flow,
ovs_header->dp_ifindex,
rcu_read_lock(); /*To keep RCU checker happy. */
err = ovs_flow_cmd_fill_info(flow, ovs_header->dp_ifindex,
reply, info->snd_portid,
info->snd_seq, 0,
OVS_FLOW_CMD_DEL);
Expand Down Expand Up @@ -1497,7 +1491,6 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)

ovs_net = net_generic(ovs_dp_get_net(dp), ovs_net_id);
list_add_tail_rcu(&dp->list_node, &ovs_net->dps);

ovs_unlock();

ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
Expand Down Expand Up @@ -1565,8 +1558,8 @@ static int ovs_dp_cmd_del(struct sk_buff *skb, struct genl_info *info)
BUG_ON(err < 0);

__dp_destroy(dp);

ovs_unlock();

ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
return 0;

Expand Down Expand Up @@ -1597,8 +1590,8 @@ static int ovs_dp_cmd_set(struct sk_buff *skb, struct genl_info *info)
err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
info->snd_seq, 0, OVS_DP_CMD_NEW);
BUG_ON(err < 0);

ovs_unlock();

ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
return 0;

Expand Down Expand Up @@ -1904,8 +1897,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
}

if (a[OVS_VPORT_ATTR_UPCALL_PID]) {
err = ovs_vport_set_upcall_portids(vport,
a[OVS_VPORT_ATTR_UPCALL_PID]);
struct nlattr *ids = a[OVS_VPORT_ATTR_UPCALL_PID];

err = ovs_vport_set_upcall_portids(vport, ids);
if (err)
goto exit_unlock_free;
}
Expand Down
20 changes: 10 additions & 10 deletions datapath/datapath.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#include "vlan.h"
#include "vport.h"

#define DP_MAX_PORTS USHRT_MAX
#define DP_VPORT_HASH_BUCKETS 1024
#define DP_MAX_PORTS USHRT_MAX
#define DP_VPORT_HASH_BUCKETS 1024

#define SAMPLE_ACTION_DEPTH 3

Expand Down Expand Up @@ -112,16 +112,16 @@ struct ovs_skb_cb {
* @cmd: One of %OVS_PACKET_CMD_*.
* @userdata: If nonnull, its variable-length value is passed to userspace as
* %OVS_PACKET_ATTR_USERDATA.
* @portid: Netlink PID to which packet should be sent. If @portid is 0 then no
* packet is sent and the packet is accounted in the datapath's @n_lost
* @portid: Netlink portid to which packet should be sent. If @portid is 0
* then no packet is sent and the packet is accounted in the datapath's @n_lost
* counter.
* @egress_tun_info: If nonnull, becomes %OVS_PACKET_ATTR_EGRESS_TUN_KEY.
*/
struct dp_upcall_info {
const struct ovs_tunnel_info *egress_tun_info;
const struct nlattr *userdata;
u32 portid;
u8 cmd;
const struct ovs_tunnel_info *egress_tun_info;
};

/**
Expand All @@ -132,8 +132,8 @@ struct dp_upcall_info {
*/
struct ovs_net {
struct list_head dps;
struct vport_net vport_net;
struct work_struct dp_notify_work;
struct vport_net vport_net;
};

extern int ovs_net_id;
Expand Down Expand Up @@ -186,18 +186,18 @@ 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 *, struct sw_flow_key *key);
void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key);
void ovs_dp_detach_port(struct vport *);
int ovs_dp_upcall(struct datapath *, struct sk_buff *,
const 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,
struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
u8 cmd);

int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,
struct sw_flow_key *key,
const struct sw_flow_actions *acts);
const struct sw_flow_actions *, struct sw_flow_key *);

void ovs_dp_notify_wq(struct work_struct *work);

int action_fifos_init(void);
Expand Down
Loading

0 comments on commit 7d16c84

Please sign in to comment.