| Message ID | 20220404104150.2865736-1-i.maximets@ovn.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3f2a3050b4a3e7f32fc0ea3c9b0183090ae00522 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: openvswitch: don't send internal clone attribute to the userspace. | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/fixes_present | success | Fixes tag present in non-next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Single patches do not need cover letters |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/cc_maintainers | success | CCed 8 of 8 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/checkpatch | warning | WARNING: line length of 82 exceeds 80 columns |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
Ilya Maximets <i.maximets@ovn.org> writes: > 'OVS_CLONE_ATTR_EXEC' is an internal attribute that is used for > performance optimization inside the kernel. It's added by the kernel > while parsing user-provided actions and should not be sent during the > flow dump as it's not part of the uAPI. > > The issue doesn't cause any significant problems to the ovs-vswitchd > process, because reported actions are not really used in the > application lifecycle and only supposed to be shown to a human via > ovs-dpctl flow dump. However, the action list is still incorrect > and causes the following error if the user wants to look at the > datapath flows: > > # ovs-dpctl add-dp system@ovs-system > # ovs-dpctl add-flow "<flow match>" "clone(ct(commit),0)" > # ovs-dpctl dump-flows > <flow match>, packets:0, bytes:0, used:never, > actions:clone(bad length 4, expected -1 for: action0(01 00 00 00), > ct(commit),0) > > With the fix: > > # ovs-dpctl dump-flows > <flow match>, packets:0, bytes:0, used:never, > actions:clone(ct(commit),0) > > Additionally fixed an incorrect attribute name in the comment. > > Fixes: b233504033db ("openvswitch: kernel datapath clone action") > Signed-off-by: Ilya Maximets <i.maximets@ovn.org> > --- Acked-by: Aaron Conole <aconole@redhat.com>
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 4 Apr 2022 12:41:50 +0200 you wrote: > 'OVS_CLONE_ATTR_EXEC' is an internal attribute that is used for > performance optimization inside the kernel. It's added by the kernel > while parsing user-provided actions and should not be sent during the > flow dump as it's not part of the uAPI. > > The issue doesn't cause any significant problems to the ovs-vswitchd > process, because reported actions are not really used in the > application lifecycle and only supposed to be shown to a human via > ovs-dpctl flow dump. However, the action list is still incorrect > and causes the following error if the user wants to look at the > datapath flows: > > [...] Here is the summary with links: - [net] net: openvswitch: don't send internal clone attribute to the userspace. https://git.kernel.org/netdev/net/c/3f2a3050b4a3 You are awesome, thank you!
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 7056cb1b8ba0..1b5d73079dc9 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -1051,7 +1051,7 @@ static int clone(struct datapath *dp, struct sk_buff *skb, int rem = nla_len(attr); bool dont_clone_flow_key; - /* The first action is always 'OVS_CLONE_ATTR_ARG'. */ + /* The first action is always 'OVS_CLONE_ATTR_EXEC'. */ clone_arg = nla_data(attr); dont_clone_flow_key = nla_get_u32(clone_arg); actions = nla_next(clone_arg, &rem); diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index cc282a58b75b..dbdcaaa27f5b 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -3458,7 +3458,9 @@ static int clone_action_to_attr(const struct nlattr *attr, if (!start) return -EMSGSIZE; - err = ovs_nla_put_actions(nla_data(attr), rem, skb); + /* Skipping the OVS_CLONE_ATTR_EXEC that is always the first attribute. */ + attr = nla_next(nla_data(attr), &rem); + err = ovs_nla_put_actions(attr, rem, skb); if (err) nla_nest_cancel(skb, start);
'OVS_CLONE_ATTR_EXEC' is an internal attribute that is used for performance optimization inside the kernel. It's added by the kernel while parsing user-provided actions and should not be sent during the flow dump as it's not part of the uAPI. The issue doesn't cause any significant problems to the ovs-vswitchd process, because reported actions are not really used in the application lifecycle and only supposed to be shown to a human via ovs-dpctl flow dump. However, the action list is still incorrect and causes the following error if the user wants to look at the datapath flows: # ovs-dpctl add-dp system@ovs-system # ovs-dpctl add-flow "<flow match>" "clone(ct(commit),0)" # ovs-dpctl dump-flows <flow match>, packets:0, bytes:0, used:never, actions:clone(bad length 4, expected -1 for: action0(01 00 00 00), ct(commit),0) With the fix: # ovs-dpctl dump-flows <flow match>, packets:0, bytes:0, used:never, actions:clone(ct(commit),0) Additionally fixed an incorrect attribute name in the comment. Fixes: b233504033db ("openvswitch: kernel datapath clone action") Signed-off-by: Ilya Maximets <i.maximets@ovn.org> --- net/openvswitch/actions.c | 2 +- net/openvswitch/flow_netlink.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)