1 files changed, 17 insertions, 4 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 6cfb44f3a7f0..c2ac340e19fb 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -274,6 +274,7 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
                 upcall.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, &upcall);
                 if (unlikely(error))
                         kfree_skb(skb);
@@ -375,7 +376,7 @@ static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb,
         return err;
 }
 
-static size_t upcall_msg_size(const struct nlattr *userdata,
+static size_t upcall_msg_size(const struct dp_upcall_info *upcall_info,
                               unsigned int hdrlen)
 {
         size_t size = NLMSG_ALIGN(sizeof(struct ovs_header))
@@ -383,8 +384,12 @@ static size_t upcall_msg_size(const struct nlattr *userdata,
                 + nla_total_size(ovs_key_attr_size()); /* OVS_PACKET_ATTR_KEY */
 
         /* OVS_PACKET_ATTR_USERDATA */
-        if (userdata)
-                size += NLA_ALIGN(userdata->nla_len);
+        if (upcall_info->userdata)
+                size += NLA_ALIGN(upcall_info->userdata->nla_len);
+
+        /* OVS_PACKET_ATTR_EGRESS_TUN_KEY */
+        if (upcall_info->egress_tun_info)
+                size += nla_total_size(ovs_tun_key_attr_size());
 
         return size;
 }
@@ -440,7 +445,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
         else
                 hlen = skb->len;
 
-        len = upcall_msg_size(upcall_info->userdata, hlen);
+        len = upcall_msg_size(upcall_info, hlen);
         user_skb = genlmsg_new_unicast(len, &info, GFP_ATOMIC);
         if (!user_skb) {
                 err = -ENOMEM;
@@ -461,6 +466,14 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
                           nla_len(upcall_info->userdata),
                           nla_data(upcall_info->userdata));
 
+        if (upcall_info->egress_tun_info) {
+                nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_EGRESS_TUN_KEY);
+                err = ovs_nla_put_egress_tunnel_key(user_skb,
+                                                    upcall_info->egress_tun_info);
+                BUG_ON(err);
+                nla_nest_end(user_skb, nla);
+        }
+
         /* Only reserve room for attribute header, packet data is added
          * in skb_zerocopy() */
         if (!(nla = nla_reserve(user_skb, OVS_PACKET_ATTR_PACKET, 0))) {