[PATCH net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type

[PATCH net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type

[Simon Horman]

From: Baowen Zheng <baowen.zheng@corigine.com>

We need to return EOPNOTSUPP for the unsupported mpls action type when
setup the flow action.

In the original implement, we will return 0 for the unsupported mpls
action type, actually we do not setup it and the following actions
to the flow action entry.

Fixes: 9838b20a7fb2 ("net: sched: take rtnl lock in tc_setup_flow_action()")
Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 net/sched/cls_api.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 2ef8f5a6205a..e54f0a42270c 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3687,6 +3687,7 @@ int tc_setup_flow_action(struct flow_action *flow_action,
 				entry->mpls_mangle.ttl = tcf_mpls_ttl(act);
 				break;
 			default:
+				err = -EOPNOTSUPP;
 				goto err_out_locked;
 			}
 		} else if (is_tcf_skbedit_ptype(act)) {
-- 
2.20.1

Re: [PATCH net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Mon, 13 Dec 2021 15:46:04 +0100 you wrote:
> From: Baowen Zheng <baowen.zheng@corigine.com>
> 
> We need to return EOPNOTSUPP for the unsupported mpls action type when
> setup the flow action.
> 
> In the original implement, we will return 0 for the unsupported mpls
> action type, actually we do not setup it and the following actions
> to the flow action entry.
> 
> [...]

Here is the summary with links:
  - [net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type
    https://git.kernel.org/netdev/net/c/166b6a46b78b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type

[Simon Horman]

On Tue, Dec 14, 2021 at 12:40:10PM +0000, patchwork-bot+netdevbpf@kernel.org wrote:
> Hello:
> 
> This patch was applied to netdev/net.git (master)
> by David S. Miller <davem@davemloft.net>:
> 
> On Mon, 13 Dec 2021 15:46:04 +0100 you wrote:
> > From: Baowen Zheng <baowen.zheng@corigine.com>
> > 
> > We need to return EOPNOTSUPP for the unsupported mpls action type when
> > setup the flow action.
> > 
> > In the original implement, we will return 0 for the unsupported mpls
> > action type, actually we do not setup it and the following actions
> > to the flow action entry.
> > 
> > [...]
> 
> Here is the summary with links:
>   - [net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type
>     https://git.kernel.org/netdev/net/c/166b6a46b78b

Thanks!

Could I ask for a merge of net into net-next?

The patch above will be a dependency for v7 of our metering offload
patchset.

Ref: 
- [PATCH v6 net-next 00/12] allow user to offload tc action to net device
  https://lore.kernel.org/netdev/20211209092806.12336-1-simon.horman@corigine.com/

Re: [PATCH net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type

[Jakub Kicinski]

On Tue, 14 Dec 2021 15:34:29 +0100 Simon Horman wrote:
> Could I ask for a merge of net into net-next?
> 
> The patch above will be a dependency for v7 of our metering offload
> patchset.
> 
> Ref: 
> - [PATCH v6 net-next 00/12] allow user to offload tc action to net device
>   https://lore.kernel.org/netdev/20211209092806.12336-1-simon.horman@corigine.com/

Can it wait until Thu? We send PRs and merge every Thu these days.

Re: [PATCH net] flow_offload: return EOPNOTSUPP for the unsupported mpls action type

[Simon Horman]

On Tue, Dec 14, 2021 at 08:33:55AM -0800, Jakub Kicinski wrote:
> On Tue, 14 Dec 2021 15:34:29 +0100 Simon Horman wrote:
> > Could I ask for a merge of net into net-next?
> > 
> > The patch above will be a dependency for v7 of our metering offload
> > patchset.
> > 
> > Ref: 
> > - [PATCH v6 net-next 00/12] allow user to offload tc action to net device
> >   https://lore.kernel.org/netdev/20211209092806.12336-1-simon.horman@corigine.com/
> 
> Can it wait until Thu? We send PRs and merge every Thu these days.

Sure, no problem.