| Message ID | 20210621092429.10043-1-boris.sukholitko@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6d5516177d3b723fe9701b89e69db18cf0ca0421 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] Revert "net/sched: cls_flower: Remove match on n_proto" | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 15 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Mon, Jun 21, 2021 at 12:24:29PM +0300, Boris Sukholitko wrote: > This reverts commit 0dca2c7404a938cb10c85d0515cee40ed5348788. > > The commit in question breaks hardware offload of flower filters. > > Quoting Vladimir Oltean <olteanv@gmail.com>: > > fl_hw_replace_filter() and fl_reoffload() create a struct > flow_cls_offload with a rule->match.mask member derived from the mask > of the software classifier: &f->mask->key - that same mask that is used > for initializing the flow dissector keys, and the one from which Boris > removed the basic.n_proto member because it was bothering him. > > Reported-by: Vadym Kochan <vadym.kochan@plvision.eu> > Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com> > --- Perhaps not the most relevant crop from the quote, but anyway: Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Mon, 21 Jun 2021 12:24:29 +0300 you wrote: > This reverts commit 0dca2c7404a938cb10c85d0515cee40ed5348788. > > The commit in question breaks hardware offload of flower filters. > > Quoting Vladimir Oltean <olteanv@gmail.com>: > > fl_hw_replace_filter() and fl_reoffload() create a struct > flow_cls_offload with a rule->match.mask member derived from the mask > of the software classifier: &f->mask->key - that same mask that is used > for initializing the flow dissector keys, and the one from which Boris > removed the basic.n_proto member because it was bothering him. > > [...] Here is the summary with links: - [net-next] Revert "net/sched: cls_flower: Remove match on n_proto" https://git.kernel.org/netdev/net-next/c/6d5516177d3b You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 2e704c7a105a..d7869a984881 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1531,13 +1531,14 @@ static int fl_set_key(struct net *net, struct nlattr **tb, &mask->basic.n_proto, TCA_FLOWER_UNSPEC, sizeof(key->basic.n_proto)); - mask->basic.n_proto = cpu_to_be16(0); } else { key->basic.n_proto = ethertype; + mask->basic.n_proto = cpu_to_be16(~0); } } } else { key->basic.n_proto = ethertype; + mask->basic.n_proto = cpu_to_be16(~0); } }
This reverts commit 0dca2c7404a938cb10c85d0515cee40ed5348788. The commit in question breaks hardware offload of flower filters. Quoting Vladimir Oltean <olteanv@gmail.com>: fl_hw_replace_filter() and fl_reoffload() create a struct flow_cls_offload with a rule->match.mask member derived from the mask of the software classifier: &f->mask->key - that same mask that is used for initializing the flow dissector keys, and the one from which Boris removed the basic.n_proto member because it was bothering him. Reported-by: Vadym Kochan <vadym.kochan@plvision.eu> Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com> --- net/sched/cls_flower.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)