Commit bfda5a63 authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by Jakub Kicinski
Browse files

net/sched: flower: define new tunnel flags 



Define new TCA_FLOWER_KEY_FLAGS_* flags for use in struct
flow_dissector_key_control, covering the same flags as
currently exposed through TCA_FLOWER_KEY_ENC_FLAGS.

Put the new flags under FLOW_DIS_F_*. The idea is that we can
later, move the existing flags under FLOW_DIS_F_* as well.

The ynl flag names have been taken from the RFC iproute2 patch.

Signed-off-by: default avatarAsbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/20240713021911.1631517-4-ast@fiberby.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 49ba9fc1

Documentation/netlink/specs/tc.yaml

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ definitions: 
    entries:

      - frag

      - firstfrag

      - tuncsum

      - tundf

      - tunoam

      - tuncrit

  -

    name: tc-stats

    type: struct

include/net/flow_dissector.h

+6 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ struct sk_buff; 
 * struct flow_dissector_key_control:

 * @thoff:     Transport header offset

 * @addr_type: Type of key. One of FLOW_DISSECTOR_KEY_*

 * @flags:     Key flags. Any of FLOW_DIS_(IS_FRAGMENT|FIRST_FRAGENCAPSULATION)

 * @flags:     Key flags.

 *             Any of FLOW_DIS_(IS_FRAGMENT|FIRST_FRAG|ENCAPSULATION|F_*)

 */

struct flow_dissector_key_control {

	u16	thoff;
@@ -31,6 +32,10 @@ struct flow_dissector_key_control { 
enum flow_dissector_ctrl_flags {

	FLOW_DIS_IS_FRAGMENT		= TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT,

	FLOW_DIS_FIRST_FRAG		= TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST,

	FLOW_DIS_F_TUNNEL_CSUM		= TCA_FLOWER_KEY_FLAGS_TUNNEL_CSUM,

	FLOW_DIS_F_TUNNEL_DONT_FRAGMENT	= TCA_FLOWER_KEY_FLAGS_TUNNEL_DONT_FRAGMENT,

	FLOW_DIS_F_TUNNEL_OAM		= TCA_FLOWER_KEY_FLAGS_TUNNEL_OAM,

	FLOW_DIS_F_TUNNEL_CRIT_OPT	= TCA_FLOWER_KEY_FLAGS_TUNNEL_CRIT_OPT,



	/* These flags are internal to the kernel */

	FLOW_DIS_ENCAPSULATION		= (TCA_FLOWER_KEY_FLAGS_MAX << 1),

include/uapi/linux/pkt_cls.h

+4 −0
Original line number Diff line number Diff line
@@ -677,6 +677,10 @@ enum { 
enum {

	TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0),

	TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),

	TCA_FLOWER_KEY_FLAGS_TUNNEL_CSUM = (1 << 2),

	TCA_FLOWER_KEY_FLAGS_TUNNEL_DONT_FRAGMENT = (1 << 3),

	TCA_FLOWER_KEY_FLAGS_TUNNEL_OAM = (1 << 4),

	TCA_FLOWER_KEY_FLAGS_TUNNEL_CRIT_OPT = (1 << 5),

	__TCA_FLOWER_KEY_FLAGS_MAX,

};