| Message ID | 20240611235355.177667-1-ast@fiberby.net (mailing list archive) |
|---|---|
| Headers | show |
| Series | flower: rework TCA_FLOWER_KEY_ENC_FLAGS usage | expand |
hi Asbjørn, thanks for the patch! On Tue, Jun 11, 2024 at 11:53:33PM +0000, Asbjørn Sloth Tønnesen wrote: > This series reworks the recently added TCA_FLOWER_KEY_ENC_FLAGS > attribute, to be more like TCA_FLOWER_KEY_FLAGS, and use > the unused u32 flags field in TCA_FLOWER_KEY_ENC_CONTROL, > instead of adding another u32 in FLOW_DISSECTOR_KEY_ENC_FLAGS. > > I have defined the new FLOW_DIS_F_* and TCA_FLOWER_KEY_FLAGS_* > flags to coexists for now, so the meaning of the flags field > in struct flow_dissector_key_control is not depending on the > context that it is used in. If we run out of bits then we can > always make split them up later, if we really want to. > > Davide and Ilya would this work for you? If you are ok with this, I can adjust the iproute code I keep locally, and the kselftest, re-test, and than report back to the series total reviewed-by. It's going a take some days though; and of course, those bit will be upstreamed as well. WDYT? > Currently this series is only compile-tested. > thanks,
Hi Davide, On 6/12/24 3:06 PM, Davide Caratti wrote: > On Tue, Jun 11, 2024 at 11:53:33PM +0000, Asbjørn Sloth Tønnesen wrote: >> This series reworks the recently added TCA_FLOWER_KEY_ENC_FLAGS >> attribute, to be more like TCA_FLOWER_KEY_FLAGS, and use >> the unused u32 flags field in TCA_FLOWER_KEY_ENC_CONTROL, >> instead of adding another u32 in FLOW_DISSECTOR_KEY_ENC_FLAGS. s/TCA_FLOWER_KEY_ENC_CONTROL/FLOW_DISSECTOR_KEY_ENC_CONTROL/ >> I have defined the new FLOW_DIS_F_* and TCA_FLOWER_KEY_FLAGS_* >> flags to coexists for now, so the meaning of the flags field >> in struct flow_dissector_key_control is not depending on the >> context that it is used in. If we run out of bits then we can >> always make split them up later, if we really want to. s/always make split/always split/ >> Davide and Ilya would this work for you? > > If you are ok with this, I can adjust the iproute code I keep locally, > and the kselftest, re-test, and than report back to the series total > reviewed-by. > It's going a take some days though; and of course, those bit will be > upstreamed as well. > > WDYT? That would be great, there is still quite some time left before net-next closes, I just wanted to get the ball rolling, with some code, so it is easier to discuss the implementation details.
This series reworks the recently added TCA_FLOWER_KEY_ENC_FLAGS attribute, to be more like TCA_FLOWER_KEY_FLAGS, and use the unused u32 flags field in TCA_FLOWER_KEY_ENC_CONTROL, instead of adding another u32 in FLOW_DISSECTOR_KEY_ENC_FLAGS. I have defined the new FLOW_DIS_F_* and TCA_FLOWER_KEY_FLAGS_* flags to coexists for now, so the meaning of the flags field in struct flow_dissector_key_control is not depending on the context that it is used in. If we run out of bits then we can always make split them up later, if we really want to. Davide and Ilya would this work for you? Currently this series is only compile-tested. Preliminary discussion about these changes: https://lore.kernel.org/netdev/ZmFuxElwZiYJzBkh@dcaratti.users.ipa.redhat.com/ --- If this series is put directly on top of: 668b6a2ef832 ("flow_dissector: add support for tunnel control flags") and 1d17568e74de ("net/sched: cls_flower: add support for matching tunnel control flags") as can be done by reverting them, cherry-picking them, and then applying this series. Then it gives this combined diffstat: $ git diff --stat ... include/net/flow_dissector.h | 17 ++++- include/uapi/linux/pkt_cls.h | 8 ++ net/core/flow_dissector.c | 34 +++++--- net/sched/cls_flower.c | 103 ++++++++++++++++++++++---- 4 files changed, 136 insertions(+), 26 deletions(-) Normal shortlog and diffstat below: Asbjørn Sloth Tønnesen (9): net/sched: flower: define new tunnel flags net/sched: cls_flower: prepare fl_{set,dump}_key_flags() for ENC_FLAGS net/sched: cls_flower: add policy for TCA_FLOWER_KEY_FLAGS flow_dissector: prepare for encapsulated control flags flow_dissector: set encapsulated control flags from tun_flags net/sched: cls_flower: add tunnel flags to fl_{set,dump}_key_flags() net/sched: cls_flower: rework TCA_FLOWER_KEY_ENC_FLAGS usage flow_dissector: cleanup FLOW_DISSECTOR_KEY_ENC_FLAGS flow_dissector: set encapsulation control flags for non-IP include/net/flow_dissector.h | 26 +++---- include/net/ip_tunnels.h | 12 ---- include/uapi/linux/pkt_cls.h | 5 ++ net/core/flow_dissector.c | 50 ++++++------- net/sched/cls_flower.c | 135 ++++++++++++++++++++--------------- 5 files changed, 123 insertions(+), 105 deletions(-)