openvswitch: Add recirc_id to recirc warning

When hitting the recirculation limit, the kernel would currently log
something like this:

[   58.586597] openvswitch: ovs-system: deferred action limit reached, drop recirc action

Which isn't all that useful to debug as we only have the interface name
to go on but can't track it down to a specific flow.

With this change, we now instead get:

[   58.586597] openvswitch: ovs-system: deferred action limit reached, drop recirc action (recirc_id=0x9e)

Which can now be correlated with the flow entries from OVS.

Suggested-by: Frode Nordahl <frode.nordahl@canonical.com>
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Tested-by: Stephane Graber <stgraber@ubuntu.com>
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Link: https://lore.kernel.org/r/20220330194244.3476544-1-stgraber@ubuntu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 780d9e2246f394df72016892dcdfdbd55f15a37e..7056cb1b8ba0f2f2bd930500eb1e0c934663c17a 100644 (file)
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -1539,8 +1539,8 @@ static int clone_execute(struct datapath *dp, struct sk_buff *skb,
                                pr_warn("%s: deferred action limit reached, drop sample action\n",
                                        ovs_dp_name(dp));
                        } else {  /* Recirc action */
-                               pr_warn("%s: deferred action limit reached, drop recirc action\n",
-                                       ovs_dp_name(dp));
+                               pr_warn("%s: deferred action limit reached, drop recirc action (recirc_id=%#x)\n",
+                                       ovs_dp_name(dp), recirc_id);
                        }
                }
        }