mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-27 15:18:06 +00:00
Code Issues Releases Wiki Activity

datapath: Move is_frag out of struct ovs_skb_cb.

Browse Source 
is_frag is only used for communication between two functions, which
means that it doesn't really need to be in the SKB CB.  This wouldn't
necessarily be a problem except that there are also a number of other
paths that lead to this being uninitialized.  This isn't a problem
now but uninitialized memory seems dangerous and there isn't much
upside.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Reviewed-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Jesse Gross
2010-08-29 14:28:58 -07:00
parent 3976f6d57b
commit b7a31ec13d
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
datapath/datapath.c
View File

@@ -552,15 +552,16 @@ void dp_process_received_packet(struct dp_port *p, struct sk_buff *skb)
if (!OVS_CB(skb)->flow) { if (!OVS_CB(skb)->flow) {
struct odp_flow_key key; struct odp_flow_key key;
struct tbl_node *flow_node; struct tbl_node *flow_node;
bool is_frag;
/* Extract flow from 'skb' into 'key'. */ /* Extract flow from 'skb' into 'key'. */
error = flow_extract(skb, p ? p->port_no : ODPP_NONE, &key); error = flow_extract(skb, p ? p->port_no : ODPP_NONE, &key, &is_frag);
if (unlikely(error)) { if (unlikely(error)) {
kfree_skb(skb); kfree_skb(skb);
return; return;
} }
if (OVS_CB(skb)->is_frag && dp->drop_frags) { if (is_frag && dp->drop_frags) {
kfree_skb(skb); kfree_skb(skb);
stats_counter_off = offsetof(struct dp_stats_percpu, n_frags); stats_counter_off = offsetof(struct dp_stats_percpu, n_frags);
goto out; goto out;
@@ -1325,6 +1326,7 @@ static int do_execute(struct datapath *dp, const struct odp_execute *execute)
struct sk_buff *skb; struct sk_buff *skb;
struct sw_flow_actions *actions; struct sw_flow_actions *actions;
struct ethhdr *eth; struct ethhdr *eth;
bool is_frag;
int err; int err;
err = -EINVAL; err = -EINVAL;
@@ -1372,7 +1374,7 @@ static int do_execute(struct datapath *dp, const struct odp_execute *execute)
else else
skb->protocol = htons(ETH_P_802_2); skb->protocol = htons(ETH_P_802_2);
err = flow_extract(skb, execute->in_port, &key); err = flow_extract(skb, execute->in_port, &key, &is_frag);
if (err) if (err)
goto error_free_skb; goto error_free_skb;

2
datapath/datapath.h
View File

@@ -147,7 +147,6 @@ enum csum_type {
* struct ovs_skb_cb - OVS data in skb CB * struct ovs_skb_cb - OVS data in skb CB
* @dp_port: The datapath port on which the skb entered the switch. * @dp_port: The datapath port on which the skb entered the switch.
* @flow: The flow associated with this packet. May be %NULL if no flow. * @flow: The flow associated with this packet. May be %NULL if no flow.
* @is_frag: %true if this packet is an IPv4 fragment, %false otherwise.
* @ip_summed: Consistently stores L4 checksumming status across different * @ip_summed: Consistently stores L4 checksumming status across different
* kernel versions. * kernel versions.
* @tun_id: ID (in network byte order) of the tunnel that encapsulated this * @tun_id: ID (in network byte order) of the tunnel that encapsulated this
@@ -156,7 +155,6 @@ enum csum_type {
struct ovs_skb_cb { struct ovs_skb_cb {
struct dp_port *dp_port; struct dp_port *dp_port;
struct sw_flow *flow; struct sw_flow *flow;
bool is_frag;
enum csum_type ip_summed; enum csum_type ip_summed;
__be32 tun_id; __be32 tun_id;
}; };

14
datapath/flow.c
View File

@@ -267,7 +267,8 @@ static __be16 parse_ethertype(struct sk_buff *skb)
* Sets OVS_CB(skb)->is_frag to %true if @skb is an IPv4 fragment, otherwise to * Sets OVS_CB(skb)->is_frag to %true if @skb is an IPv4 fragment, otherwise to
* %false. * %false.
*/ */
int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key) int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key,
bool *is_frag)
{ {
struct ethhdr *eth; struct ethhdr *eth;
@@ -275,7 +276,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
key->tun_id = OVS_CB(skb)->tun_id; key->tun_id = OVS_CB(skb)->tun_id;
key->in_port = in_port; key->in_port = in_port;
key->dl_vlan = htons(ODP_VLAN_NONE); key->dl_vlan = htons(ODP_VLAN_NONE);
OVS_CB(skb)->is_frag = false; *is_frag = false;
/* /*
* We would really like to pull as many bytes as we could possibly * We would really like to pull as many bytes as we could possibly
@@ -356,9 +357,9 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
key->tp_dst = htons(icmp->code); key->tp_dst = htons(icmp->code);
} }
} }
} else { } else
OVS_CB(skb)->is_frag = true; *is_frag = true;
}
} else if (key->dl_type == htons(ETH_P_ARP) && arphdr_ok(skb)) { } else if (key->dl_type == htons(ETH_P_ARP) && arphdr_ok(skb)) {
struct arp_eth_header *arp; struct arp_eth_header *arp;
@@ -370,9 +371,8 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
&& arp->ar_pln == 4) { && arp->ar_pln == 4) {
/* We only match on the lower 8 bits of the opcode. */ /* We only match on the lower 8 bits of the opcode. */
if (ntohs(arp->ar_op) <= 0xff) { if (ntohs(arp->ar_op) <= 0xff)
key->nw_proto = ntohs(arp->ar_op); key->nw_proto = ntohs(arp->ar_op);
}
if (key->nw_proto == ARPOP_REQUEST if (key->nw_proto == ARPOP_REQUEST
|| key->nw_proto == ARPOP_REPLY) { || key->nw_proto == ARPOP_REPLY) {

2
datapath/flow.h
View File

@@ -74,7 +74,7 @@ void flow_deferred_free_acts(struct sw_flow_actions *);
void flow_hold(struct sw_flow *); void flow_hold(struct sw_flow *);
void flow_put(struct sw_flow *); void flow_put(struct sw_flow *);
int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *); int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *, bool *is_frag);
void flow_used(struct sw_flow *, struct sk_buff *); void flow_used(struct sw_flow *, struct sk_buff *);
u32 flow_hash(const struct odp_flow_key *key); u32 flow_hash(const struct odp_flow_key *key);