dpif: Maintain upcall_pid, mtu and hash.

The commit in the fixes tag extended struct dpif_execute with an
upcall_pid member.

This member was left uninitialized in dpif_execute_helper_cb(),
leading to Open vSwitch providing the kernel with a PID for which
it does not have a listener, we fix this by extending the
execute_helper_aux struct to include the previous dpif_execute struct
which we use to carry over various values such as the mtu, hash and
upcall_pid.

This condition is caught by one of the existing system-traffic
tests which is extended to explicitly check for presence of lost
upcalls in the datapath, however only with linux kernel >= 6.17.0-5.5
and gcc < 15.

Fixes: 0d9dc8e ("dpif-netlink: Provide original upcall pid in 'execute' commands.")
Fixes: 2713022 ("dpif-netlink: Allow MRU packet attribute.")
Fixes: 0442bfb ("ofproto-dpif-upcall: Echo HASH attribute back to datapath.")
Fixes: f9d3039 ("dpif: Fix use of uninitialized execute hash.")
Signed-off-by: MJ Ponsonby <[email protected]>
Signed-off-by: Ilya Maximets <[email protected]>

Author: crypticC0der

lib/dpif.c

@@ -1160,9 +1160,9 @@ dpif_flow_dump_next(struct dpif_flow_dump_thread *thread,
 
 struct dpif_execute_helper_aux {
     struct dpif *dpif;
-    const struct flow *flow;
     int error;
     struct ofpbuf meter_actions;
+    struct dpif_execute orig_execute;
 };
 
 /* This is called for actions that need the context of the datapath to be
@@ -1196,7 +1196,7 @@ dpif_execute_helper_cb(void *aux_, struct dp_packet_batch *packets_,
     case OVS_ACTION_ATTR_TUNNEL_POP:
     case OVS_ACTION_ATTR_USERSPACE:
     case OVS_ACTION_ATTR_RECIRC: {
-        struct dpif_execute execute;
+        struct dpif_execute execute = aux->orig_execute;
         struct pkt_metadata *md = &packet->md;
 
         if (flow_tnl_dst_is_set(&md->tunnel) || aux->meter_actions.size) {
@@ -1232,11 +1232,8 @@ dpif_execute_helper_cb(void *aux_, struct dp_packet_batch *packets_,
         }
 
         execute.packet = packet;
-        execute.flow = aux->flow;
         execute.needs_help = false;
-        execute.probe = false;
-        execute.mtu = 0;
-        execute.hash = 0;
+
         aux->error = dpif_execute(aux->dpif, &execute);
         log_execute_message(aux->dpif, &this_module, &execute,
                             true, aux->error);
@@ -1284,8 +1281,8 @@ dpif_execute_with_help(struct dpif *dpif, struct dpif_execute *execute)
 {
     struct dpif_execute_helper_aux aux = {
         .dpif = dpif,
-        .flow = execute->flow,
         .error = 0,
+        .orig_execute = *execute,
     };
     struct dp_packet_batch pb;