X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=ba32e37fae9dbb91797e7de4af6266b0724f5d12;hb=0a6f55420508c31af9fe41aafdd26ce8462cc1be;hp=babe63c07a93a3e81a80867aec224499773db480;hpb=ec58547a81246c0f3f7a03ab28ba1a78f1988235;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index babe63c0..ba32e37f 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -773,6 +773,8 @@ int dp_min_mtu(const struct datapath *dp)
 			continue;
 
 		dev_mtu = vport_get_mtu(p);
+		if (!dev_mtu)
+			continue;
 		if (!mtu || dev_mtu < mtu)
 			mtu = dev_mtu;
 	}
@@ -827,7 +829,6 @@ static int odp_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
 	struct nlattr *nla;
 	unsigned long used;
 	u8 tcp_flags;
-	int nla_len;
 	int err;
 
 	sf_acts = rcu_dereference_protected(flow->sf_acts,
@@ -863,23 +864,20 @@ static int odp_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
 	if (tcp_flags)
 		NLA_PUT_U8(skb, ODP_FLOW_ATTR_TCP_FLAGS, tcp_flags);
 
-	/* If ODP_FLOW_ATTR_ACTIONS doesn't fit, and this is the first flow to
-	 * be dumped into 'skb', then expand the skb.  This is unusual for
-	 * Netlink but individual action lists can be longer than a page and
-	 * thus entirely undumpable if we didn't do this. */
-	nla_len = nla_total_size(sf_acts->actions_len);
-	if (nla_len > skb_tailroom(skb) && !skb_orig_len) {
-		int hdr_off = (unsigned char *)odp_header - skb->data;
-
-		err = pskb_expand_head(skb, 0, nla_len - skb_tailroom(skb), GFP_KERNEL);
-		if (err)
-			goto error;
-
-		odp_header = (struct odp_header *)(skb->data + hdr_off);
-	}
-	nla = nla_nest_start(skb, ODP_FLOW_ATTR_ACTIONS);
-	memcpy(__skb_put(skb, sf_acts->actions_len), sf_acts->actions, sf_acts->actions_len);
-	nla_nest_end(skb, nla);
+	/* If ODP_FLOW_ATTR_ACTIONS doesn't fit, skip dumping the actions if
+	 * this is the first flow to be dumped into 'skb'.  This is unusual for
+	 * Netlink but individual action lists can be longer than
+	 * NLMSG_GOODSIZE and thus entirely undumpable if we didn't do this.
+	 * The userspace caller can always fetch the actions separately if it
+	 * really wants them.  (Most userspace callers in fact don't care.)
+	 *
+	 * This can only fail for dump operations because the skb is always
+	 * properly sized for single flows.
+	 */
+	err = nla_put(skb, ODP_FLOW_ATTR_ACTIONS, sf_acts->actions_len,
+		      sf_acts->actions);
+	if (err < 0 && skb_orig_len)
+		goto error;
 
 	return genlmsg_end(skb, odp_header);
 
@@ -1586,6 +1584,7 @@ static int odp_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
 	struct odp_header *odp_header;
 	struct nlattr *nla;
 	int ifindex, iflink;
+	int mtu;
 	int err;
 
 	odp_header = genlmsg_put(skb, pid, seq, &dp_vport_genl_family,
@@ -1607,7 +1606,9 @@ static int odp_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
 
 	NLA_PUT(skb, ODP_VPORT_ATTR_ADDRESS, ETH_ALEN, vport_get_addr(vport));
 
-	NLA_PUT_U32(skb, ODP_VPORT_ATTR_MTU, vport_get_mtu(vport));
+	mtu = vport_get_mtu(vport);
+	if (mtu)
+		NLA_PUT_U32(skb, ODP_VPORT_ATTR_MTU, mtu);
 
 	err = vport_get_options(vport, skb);
 	if (err == -EMSGSIZE)