[ovs-dev,net-next] net: openvswitch: don't call pad_packet if not necessary
diff mbox series

Message ID 1573746668-6920-1-git-send-email-xiangxia.m.yue@gmail.com
State New
Headers show
Series
  • [ovs-dev,net-next] net: openvswitch: don't call pad_packet if not necessary
Related show

Commit Message

Tonghao Zhang Nov. 14, 2019, 3:51 p.m. UTC
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

The nla_put_u16/nla_put_u32 makes sure that
*attrlen is align. The call tree is that:

nla_put_u16/nla_put_u32
  -> nla_put		attrlen = sizeof(u16) or sizeof(u32)
  -> __nla_put		attrlen
  -> __nla_reserve	attrlen
  -> skb_put(skb, nla_total_size(attrlen))

nla_total_size returns the total length of attribute
including padding.

Cc: Joe Stringer <joe@ovn.org>
Cc: William Tu <u9012063@gmail.com>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
 net/openvswitch/datapath.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

Comments

David Miller Nov. 15, 2019, 8:43 p.m. UTC | #1
From: xiangxia.m.yue@gmail.com
Date: Thu, 14 Nov 2019 23:51:08 +0800

> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> 
> The nla_put_u16/nla_put_u32 makes sure that
> *attrlen is align. The call tree is that:
> 
> nla_put_u16/nla_put_u32
>   -> nla_put		attrlen = sizeof(u16) or sizeof(u32)
>   -> __nla_put		attrlen
>   -> __nla_reserve	attrlen
>   -> skb_put(skb, nla_total_size(attrlen))
> 
> nla_total_size returns the total length of attribute
> including padding.
> 
> Cc: Joe Stringer <joe@ovn.org>
> Cc: William Tu <u9012063@gmail.com>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>

Applied, thanks.

Patch
diff mbox series

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 8ce1f773378d..93d4991ddc1f 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -487,23 +487,17 @@  static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
 	}
 
 	/* Add OVS_PACKET_ATTR_MRU */
-	if (upcall_info->mru) {
-		if (nla_put_u16(user_skb, OVS_PACKET_ATTR_MRU,
-				upcall_info->mru)) {
-			err = -ENOBUFS;
-			goto out;
-		}
-		pad_packet(dp, user_skb);
+	if (upcall_info->mru &&
+	    nla_put_u16(user_skb, OVS_PACKET_ATTR_MRU, upcall_info->mru)) {
+		err = -ENOBUFS;
+		goto out;
 	}
 
 	/* Add OVS_PACKET_ATTR_LEN when packet is truncated */
-	if (cutlen > 0) {
-		if (nla_put_u32(user_skb, OVS_PACKET_ATTR_LEN,
-				skb->len)) {
-			err = -ENOBUFS;
-			goto out;
-		}
-		pad_packet(dp, user_skb);
+	if (cutlen > 0 &&
+	    nla_put_u32(user_skb, OVS_PACKET_ATTR_LEN, skb->len)) {
+		err = -ENOBUFS;
+		goto out;
 	}
 
 	/* Add OVS_PACKET_ATTR_HASH */