All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers
@ 2023-12-23 14:01 Jamal Hadi Salim
  2023-12-23 14:01 ` [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier Jamal Hadi Salim
                   ` (6 more replies)
  0 siblings, 7 replies; 11+ messages in thread
From: Jamal Hadi Salim @ 2023-12-23 14:01 UTC (permalink / raw)
  To: davem, kuba, edumazet, pabeni
  Cc: jiri, xiyou.wangcong, netdev, stephen, dsahern, pctammela,
	victor, Jamal Hadi Salim

Classifiers RSVP and tcindex as well as qdiscs dsmark, CBQ and ATM have already
been deleted. This patchset removes their UAPI support.

User space - with a focus on iproute2 - typically copies these UAPI headers for
different kernels.
These deletion patches are coordinated with the iproute2 maintainers to make
sure that they delete any user space code referencing removed objects at their
leisure.

Jamal Hadi Salim (5):
  net/sched: Remove uapi support for rsvp classifier
  net/sched: Remove uapi support for tcindex classifier
  net/sched: Remove uapi support for dsmark qdisc
  net/sched: Remove uapi support for ATM qdisc
  net/sched: Remove uapi support for CBQ qdisc

 include/uapi/linux/pkt_cls.h         |  47 ------------
 include/uapi/linux/pkt_sched.h       | 109 ---------------------------
 tools/include/uapi/linux/pkt_cls.h   |  47 ------------
 tools/include/uapi/linux/pkt_sched.h | 109 ---------------------------
 4 files changed, 312 deletions(-)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier
  2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
@ 2023-12-23 14:01 ` Jamal Hadi Salim
  2023-12-23 17:16   ` Stephen Hemminger
  2023-12-23 14:01 ` [PATCH net-next 2/5] net/sched: Remove uapi support for tcindex classifier Jamal Hadi Salim
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 11+ messages in thread
From: Jamal Hadi Salim @ 2023-12-23 14:01 UTC (permalink / raw)
  To: davem, kuba, edumazet, pabeni
  Cc: jiri, xiyou.wangcong, netdev, stephen, dsahern, pctammela,
	victor, Jamal Hadi Salim

commit 265b4da82dbf ("net/sched: Retire rsvp classifier") retired the TC RSVP
classifier.
Remove UAPI for it. Iproute2 will sync by equally removing it from user space.

Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 include/uapi/linux/pkt_cls.h       | 31 ------------------------------
 tools/include/uapi/linux/pkt_cls.h | 31 ------------------------------
 2 files changed, 62 deletions(-)

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index c7082cc60d21..0d85f7faad53 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -280,37 +280,6 @@ struct tc_u32_pcnt {
 
 #define TC_U32_MAXDEPTH 8
 
-
-/* RSVP filter */
-
-enum {
-	TCA_RSVP_UNSPEC,
-	TCA_RSVP_CLASSID,
-	TCA_RSVP_DST,
-	TCA_RSVP_SRC,
-	TCA_RSVP_PINFO,
-	TCA_RSVP_POLICE,
-	TCA_RSVP_ACT,
-	__TCA_RSVP_MAX
-};
-
-#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
-
-struct tc_rsvp_gpi {
-	__u32	key;
-	__u32	mask;
-	int	offset;
-};
-
-struct tc_rsvp_pinfo {
-	struct tc_rsvp_gpi dpi;
-	struct tc_rsvp_gpi spi;
-	__u8	protocol;
-	__u8	tunnelid;
-	__u8	tunnelhdr;
-	__u8	pad;
-};
-
 /* ROUTE filter */
 
 enum {
diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h
index 3faee0199a9b..82eccb6a4994 100644
--- a/tools/include/uapi/linux/pkt_cls.h
+++ b/tools/include/uapi/linux/pkt_cls.h
@@ -204,37 +204,6 @@ struct tc_u32_pcnt {
 
 #define TC_U32_MAXDEPTH 8
 
-
-/* RSVP filter */
-
-enum {
-	TCA_RSVP_UNSPEC,
-	TCA_RSVP_CLASSID,
-	TCA_RSVP_DST,
-	TCA_RSVP_SRC,
-	TCA_RSVP_PINFO,
-	TCA_RSVP_POLICE,
-	TCA_RSVP_ACT,
-	__TCA_RSVP_MAX
-};
-
-#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
-
-struct tc_rsvp_gpi {
-	__u32	key;
-	__u32	mask;
-	int	offset;
-};
-
-struct tc_rsvp_pinfo {
-	struct tc_rsvp_gpi dpi;
-	struct tc_rsvp_gpi spi;
-	__u8	protocol;
-	__u8	tunnelid;
-	__u8	tunnelhdr;
-	__u8	pad;
-};
-
 /* ROUTE filter */
 
 enum {
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH net-next 2/5] net/sched: Remove uapi support for tcindex classifier
  2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
  2023-12-23 14:01 ` [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier Jamal Hadi Salim
@ 2023-12-23 14:01 ` Jamal Hadi Salim
  2023-12-23 14:01 ` [PATCH net-next 3/5] net/sched: Remove uapi support for dsmark qdisc Jamal Hadi Salim
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 11+ messages in thread
From: Jamal Hadi Salim @ 2023-12-23 14:01 UTC (permalink / raw)
  To: davem, kuba, edumazet, pabeni
  Cc: jiri, xiyou.wangcong, netdev, stephen, dsahern, pctammela,
	victor, Jamal Hadi Salim

commit 8c710f75256b ("net/sched: Retire tcindex classifier") retired the TC
tcindex classifier.
Remove UAPI for it.  Iproute2 will sync by equally removing it from user space.

Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 include/uapi/linux/pkt_cls.h       | 16 ----------------
 tools/include/uapi/linux/pkt_cls.h | 16 ----------------
 2 files changed, 32 deletions(-)

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 0d85f7faad53..c474cf53fa84 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -310,22 +310,6 @@ enum {
 
 #define TCA_FW_MAX (__TCA_FW_MAX - 1)
 
-/* TC index filter */
-
-enum {
-	TCA_TCINDEX_UNSPEC,
-	TCA_TCINDEX_HASH,
-	TCA_TCINDEX_MASK,
-	TCA_TCINDEX_SHIFT,
-	TCA_TCINDEX_FALL_THROUGH,
-	TCA_TCINDEX_CLASSID,
-	TCA_TCINDEX_POLICE,
-	TCA_TCINDEX_ACT,
-	__TCA_TCINDEX_MAX
-};
-
-#define TCA_TCINDEX_MAX     (__TCA_TCINDEX_MAX - 1)
-
 /* Flow filter */
 
 enum {
diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h
index 82eccb6a4994..bd4b227ab4ba 100644
--- a/tools/include/uapi/linux/pkt_cls.h
+++ b/tools/include/uapi/linux/pkt_cls.h
@@ -234,22 +234,6 @@ enum {
 
 #define TCA_FW_MAX (__TCA_FW_MAX - 1)
 
-/* TC index filter */
-
-enum {
-	TCA_TCINDEX_UNSPEC,
-	TCA_TCINDEX_HASH,
-	TCA_TCINDEX_MASK,
-	TCA_TCINDEX_SHIFT,
-	TCA_TCINDEX_FALL_THROUGH,
-	TCA_TCINDEX_CLASSID,
-	TCA_TCINDEX_POLICE,
-	TCA_TCINDEX_ACT,
-	__TCA_TCINDEX_MAX
-};
-
-#define TCA_TCINDEX_MAX     (__TCA_TCINDEX_MAX - 1)
-
 /* Flow filter */
 
 enum {
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH net-next 3/5] net/sched: Remove uapi support for dsmark qdisc
  2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
  2023-12-23 14:01 ` [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier Jamal Hadi Salim
  2023-12-23 14:01 ` [PATCH net-next 2/5] net/sched: Remove uapi support for tcindex classifier Jamal Hadi Salim
@ 2023-12-23 14:01 ` Jamal Hadi Salim
  2023-12-23 14:01 ` [PATCH net-next 4/5] net/sched: Remove uapi support for ATM qdisc Jamal Hadi Salim
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 11+ messages in thread
From: Jamal Hadi Salim @ 2023-12-23 14:01 UTC (permalink / raw)
  To: davem, kuba, edumazet, pabeni
  Cc: jiri, xiyou.wangcong, netdev, stephen, dsahern, pctammela,
	victor, Jamal Hadi Salim

Commit bbe77c14ee61 ("net/sched: Retire dsmark qdisc") retired the dsmark
classifier. Remove UAPI support for it.
Iproute2 will sync by equally removing it from user space.

Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 include/uapi/linux/pkt_sched.h       | 14 --------------
 tools/include/uapi/linux/pkt_sched.h | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index f762a10bfb78..1e3a2b9ddf7e 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -557,20 +557,6 @@ enum {
 
 #define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
 
-/* dsmark section */
-
-enum {
-	TCA_DSMARK_UNSPEC,
-	TCA_DSMARK_INDICES,
-	TCA_DSMARK_DEFAULT_INDEX,
-	TCA_DSMARK_SET_TC_INDEX,
-	TCA_DSMARK_MASK,
-	TCA_DSMARK_VALUE,
-	__TCA_DSMARK_MAX,
-};
-
-#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
-
 /* ATM  section */
 
 enum {
diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h
index 5c903abc9fa5..0f164f1458fd 100644
--- a/tools/include/uapi/linux/pkt_sched.h
+++ b/tools/include/uapi/linux/pkt_sched.h
@@ -537,20 +537,6 @@ enum {
 
 #define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
 
-/* dsmark section */
-
-enum {
-	TCA_DSMARK_UNSPEC,
-	TCA_DSMARK_INDICES,
-	TCA_DSMARK_DEFAULT_INDEX,
-	TCA_DSMARK_SET_TC_INDEX,
-	TCA_DSMARK_MASK,
-	TCA_DSMARK_VALUE,
-	__TCA_DSMARK_MAX,
-};
-
-#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
-
 /* ATM  section */
 
 enum {
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH net-next 4/5] net/sched: Remove uapi support for ATM qdisc
  2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
                   ` (2 preceding siblings ...)
  2023-12-23 14:01 ` [PATCH net-next 3/5] net/sched: Remove uapi support for dsmark qdisc Jamal Hadi Salim
@ 2023-12-23 14:01 ` Jamal Hadi Salim
  2023-12-23 14:01 ` [PATCH net-next 5/5] net/sched: Remove uapi support for CBQ qdisc Jamal Hadi Salim
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 11+ messages in thread
From: Jamal Hadi Salim @ 2023-12-23 14:01 UTC (permalink / raw)
  To: davem, kuba, edumazet, pabeni
  Cc: jiri, xiyou.wangcong, netdev, stephen, dsahern, pctammela,
	victor, Jamal Hadi Salim

Commit fb38306ceb9e ("net/sched: Retire ATM qdisc") retired the ATM qdisc.
Remove UAPI for it. Iproute2 will sync by equally removing it from user space.

Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 include/uapi/linux/pkt_sched.h       | 15 ---------------
 tools/include/uapi/linux/pkt_sched.h | 15 ---------------
 2 files changed, 30 deletions(-)

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 1e3a2b9ddf7e..28f08acdad52 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -557,21 +557,6 @@ enum {
 
 #define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
 
-/* ATM  section */
-
-enum {
-	TCA_ATM_UNSPEC,
-	TCA_ATM_FD,		/* file/socket descriptor */
-	TCA_ATM_PTR,		/* pointer to descriptor - later */
-	TCA_ATM_HDR,		/* LL header */
-	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */
-	TCA_ATM_ADDR,		/* PVC address (for output only) */
-	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */
-	__TCA_ATM_MAX,
-};
-
-#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)
-
 /* Network emulator */
 
 enum {
diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h
index 0f164f1458fd..fc695429bc59 100644
--- a/tools/include/uapi/linux/pkt_sched.h
+++ b/tools/include/uapi/linux/pkt_sched.h
@@ -537,21 +537,6 @@ enum {
 
 #define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
 
-/* ATM  section */
-
-enum {
-	TCA_ATM_UNSPEC,
-	TCA_ATM_FD,		/* file/socket descriptor */
-	TCA_ATM_PTR,		/* pointer to descriptor - later */
-	TCA_ATM_HDR,		/* LL header */
-	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */
-	TCA_ATM_ADDR,		/* PVC address (for output only) */
-	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */
-	__TCA_ATM_MAX,
-};
-
-#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)
-
 /* Network emulator */
 
 enum {
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH net-next 5/5] net/sched: Remove uapi support for CBQ qdisc
  2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
                   ` (3 preceding siblings ...)
  2023-12-23 14:01 ` [PATCH net-next 4/5] net/sched: Remove uapi support for ATM qdisc Jamal Hadi Salim
@ 2023-12-23 14:01 ` Jamal Hadi Salim
  2024-01-01 18:58 ` [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Cong Wang
  2024-01-02 14:30 ` patchwork-bot+netdevbpf
  6 siblings, 0 replies; 11+ messages in thread
From: Jamal Hadi Salim @ 2023-12-23 14:01 UTC (permalink / raw)
  To: davem, kuba, edumazet, pabeni
  Cc: jiri, xiyou.wangcong, netdev, stephen, dsahern, pctammela,
	victor, Jamal Hadi Salim

Commit 051d44209842 ("net/sched: Retire CBQ qdisc") retired the CBQ qdisc.
Remove UAPI for it. Iproute2 will sync by equally removing it from user space.

Reviewed-by: Victor Nogueira <victor@mojatatu.com>
Reviewed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 include/uapi/linux/pkt_sched.h       | 80 ----------------------------
 tools/include/uapi/linux/pkt_sched.h | 80 ----------------------------
 2 files changed, 160 deletions(-)

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 28f08acdad52..a3cd0c2dc995 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -477,86 +477,6 @@ enum {
 
 #define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
 
-
-/* CBQ section */
-
-#define TC_CBQ_MAXPRIO		8
-#define TC_CBQ_MAXLEVEL		8
-#define TC_CBQ_DEF_EWMA		5
-
-struct tc_cbq_lssopt {
-	unsigned char	change;
-	unsigned char	flags;
-#define TCF_CBQ_LSS_BOUNDED	1
-#define TCF_CBQ_LSS_ISOLATED	2
-	unsigned char  	ewma_log;
-	unsigned char  	level;
-#define TCF_CBQ_LSS_FLAGS	1
-#define TCF_CBQ_LSS_EWMA	2
-#define TCF_CBQ_LSS_MAXIDLE	4
-#define TCF_CBQ_LSS_MINIDLE	8
-#define TCF_CBQ_LSS_OFFTIME	0x10
-#define TCF_CBQ_LSS_AVPKT	0x20
-	__u32		maxidle;
-	__u32		minidle;
-	__u32		offtime;
-	__u32		avpkt;
-};
-
-struct tc_cbq_wrropt {
-	unsigned char	flags;
-	unsigned char	priority;
-	unsigned char	cpriority;
-	unsigned char	__reserved;
-	__u32		allot;
-	__u32		weight;
-};
-
-struct tc_cbq_ovl {
-	unsigned char	strategy;
-#define	TC_CBQ_OVL_CLASSIC	0
-#define	TC_CBQ_OVL_DELAY	1
-#define	TC_CBQ_OVL_LOWPRIO	2
-#define	TC_CBQ_OVL_DROP		3
-#define	TC_CBQ_OVL_RCLASSIC	4
-	unsigned char	priority2;
-	__u16		pad;
-	__u32		penalty;
-};
-
-struct tc_cbq_police {
-	unsigned char	police;
-	unsigned char	__res1;
-	unsigned short	__res2;
-};
-
-struct tc_cbq_fopt {
-	__u32		split;
-	__u32		defmap;
-	__u32		defchange;
-};
-
-struct tc_cbq_xstats {
-	__u32		borrows;
-	__u32		overactions;
-	__s32		avgidle;
-	__s32		undertime;
-};
-
-enum {
-	TCA_CBQ_UNSPEC,
-	TCA_CBQ_LSSOPT,
-	TCA_CBQ_WRROPT,
-	TCA_CBQ_FOPT,
-	TCA_CBQ_OVL_STRATEGY,
-	TCA_CBQ_RATE,
-	TCA_CBQ_RTAB,
-	TCA_CBQ_POLICE,
-	__TCA_CBQ_MAX,
-};
-
-#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
-
 /* Network emulator */
 
 enum {
diff --git a/tools/include/uapi/linux/pkt_sched.h b/tools/include/uapi/linux/pkt_sched.h
index fc695429bc59..587481a19433 100644
--- a/tools/include/uapi/linux/pkt_sched.h
+++ b/tools/include/uapi/linux/pkt_sched.h
@@ -457,86 +457,6 @@ enum {
 
 #define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)
 
-
-/* CBQ section */
-
-#define TC_CBQ_MAXPRIO		8
-#define TC_CBQ_MAXLEVEL		8
-#define TC_CBQ_DEF_EWMA		5
-
-struct tc_cbq_lssopt {
-	unsigned char	change;
-	unsigned char	flags;
-#define TCF_CBQ_LSS_BOUNDED	1
-#define TCF_CBQ_LSS_ISOLATED	2
-	unsigned char  	ewma_log;
-	unsigned char  	level;
-#define TCF_CBQ_LSS_FLAGS	1
-#define TCF_CBQ_LSS_EWMA	2
-#define TCF_CBQ_LSS_MAXIDLE	4
-#define TCF_CBQ_LSS_MINIDLE	8
-#define TCF_CBQ_LSS_OFFTIME	0x10
-#define TCF_CBQ_LSS_AVPKT	0x20
-	__u32		maxidle;
-	__u32		minidle;
-	__u32		offtime;
-	__u32		avpkt;
-};
-
-struct tc_cbq_wrropt {
-	unsigned char	flags;
-	unsigned char	priority;
-	unsigned char	cpriority;
-	unsigned char	__reserved;
-	__u32		allot;
-	__u32		weight;
-};
-
-struct tc_cbq_ovl {
-	unsigned char	strategy;
-#define	TC_CBQ_OVL_CLASSIC	0
-#define	TC_CBQ_OVL_DELAY	1
-#define	TC_CBQ_OVL_LOWPRIO	2
-#define	TC_CBQ_OVL_DROP		3
-#define	TC_CBQ_OVL_RCLASSIC	4
-	unsigned char	priority2;
-	__u16		pad;
-	__u32		penalty;
-};
-
-struct tc_cbq_police {
-	unsigned char	police;
-	unsigned char	__res1;
-	unsigned short	__res2;
-};
-
-struct tc_cbq_fopt {
-	__u32		split;
-	__u32		defmap;
-	__u32		defchange;
-};
-
-struct tc_cbq_xstats {
-	__u32		borrows;
-	__u32		overactions;
-	__s32		avgidle;
-	__s32		undertime;
-};
-
-enum {
-	TCA_CBQ_UNSPEC,
-	TCA_CBQ_LSSOPT,
-	TCA_CBQ_WRROPT,
-	TCA_CBQ_FOPT,
-	TCA_CBQ_OVL_STRATEGY,
-	TCA_CBQ_RATE,
-	TCA_CBQ_RTAB,
-	TCA_CBQ_POLICE,
-	__TCA_CBQ_MAX,
-};
-
-#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
-
 /* Network emulator */
 
 enum {
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier
  2023-12-23 14:01 ` [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier Jamal Hadi Salim
@ 2023-12-23 17:16   ` Stephen Hemminger
  2023-12-23 21:15     ` Jamal Hadi Salim
  2024-01-01 18:56     ` Cong Wang
  0 siblings, 2 replies; 11+ messages in thread
From: Stephen Hemminger @ 2023-12-23 17:16 UTC (permalink / raw)
  To: Jamal Hadi Salim
  Cc: davem, kuba, edumazet, pabeni, jiri, xiyou.wangcong, netdev,
	dsahern, pctammela, victor

On Sat, 23 Dec 2023 09:01:50 -0500
Jamal Hadi Salim <jhs@mojatatu.com> wrote:

> diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h
> index 3faee0199a9b..82eccb6a4994 100644
> --- a/tools/include/uapi/linux/pkt_cls.h
> +++ b/tools/include/uapi/linux/pkt_cls.h
> @@ -204,37 +204,6 @@ struct tc_u32_pcnt {
>  

Seems like a mistake for kernel source tree to include two copies of same file.
Shouldn't there be an automated make rule to update?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier
  2023-12-23 17:16   ` Stephen Hemminger
@ 2023-12-23 21:15     ` Jamal Hadi Salim
  2024-01-01 18:56     ` Cong Wang
  1 sibling, 0 replies; 11+ messages in thread
From: Jamal Hadi Salim @ 2023-12-23 21:15 UTC (permalink / raw)
  To: Stephen Hemminger
  Cc: davem, kuba, edumazet, pabeni, jiri, xiyou.wangcong, netdev,
	dsahern, pctammela, victor

On Sat, Dec 23, 2023 at 12:17 PM Stephen Hemminger
<stephen@networkplumber.org> wrote:
>
> On Sat, 23 Dec 2023 09:01:50 -0500
> Jamal Hadi Salim <jhs@mojatatu.com> wrote:
>
> > diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h
> > index 3faee0199a9b..82eccb6a4994 100644
> > --- a/tools/include/uapi/linux/pkt_cls.h
> > +++ b/tools/include/uapi/linux/pkt_cls.h
> > @@ -204,37 +204,6 @@ struct tc_u32_pcnt {
> >
>
> Seems like a mistake for kernel source tree to include two copies of same file.
> Shouldn't there be an automated make rule to update?

Probably there is - but if you pull a fresh net-next those files are
present in both those two dirs, so it seemed rational to patch both.

cheers,
jamal

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier
  2023-12-23 17:16   ` Stephen Hemminger
  2023-12-23 21:15     ` Jamal Hadi Salim
@ 2024-01-01 18:56     ` Cong Wang
  1 sibling, 0 replies; 11+ messages in thread
From: Cong Wang @ 2024-01-01 18:56 UTC (permalink / raw)
  To: Stephen Hemminger
  Cc: Jamal Hadi Salim, davem, kuba, edumazet, pabeni, jiri, netdev,
	dsahern, pctammela, victor

On Sat, Dec 23, 2023 at 09:16:57AM -0800, Stephen Hemminger wrote:
> On Sat, 23 Dec 2023 09:01:50 -0500
> Jamal Hadi Salim <jhs@mojatatu.com> wrote:
> 
> > diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h
> > index 3faee0199a9b..82eccb6a4994 100644
> > --- a/tools/include/uapi/linux/pkt_cls.h
> > +++ b/tools/include/uapi/linux/pkt_cls.h
> > @@ -204,37 +204,6 @@ struct tc_u32_pcnt {
> >  
> 
> Seems like a mistake for kernel source tree to include two copies of same file.
> Shouldn't there be an automated make rule to update?

It is intentional, based on the initial commit which created this file:

commit 49a249c387268882e8393dd1fafc51e3b21cb7a2
Author: Yonghong Song <yhs@fb.com>
Date:   Wed Nov 7 19:55:36 2018 -0800

    tools/bpftool: copy a few net uapi headers to tools directory

    Commit f6f3bac08ff9 ("tools/bpf: bpftool: add net support")
    added certain networking support to bpftool.
    The implementation relies on a relatively recent uapi header file
    linux/tc_act/tc_bpf.h on the host which contains the marco
    definition of TCA_ACT_BPF_ID.

    Unfortunately, this is not the case for all distributions.
    See the email message below where rhel-7.2 does not have
    an up-to-date linux/tc_act/tc_bpf.h.
      https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1799211.html
    Further investigation found that linux/pkt_cls.h is also needed for macro
    TCA_BPF_TAG.

    This patch fixed the issue by copying linux/tc_act/tc_bpf.h
    and linux/pkt_cls.h from kernel include/uapi directory to
    tools/include/uapi directory so building the bpftool does not depend
    on host system for these files.

    Fixes: f6f3bac08ff9 ("tools/bpf: bpftool: add net support")
    Reported-by: kernel test robot <rong.a.chen@intel.com>
    Cc: Li Zhijian <zhijianx.li@intel.com>
    Signed-off-by: Yonghong Song <yhs@fb.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers
  2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
                   ` (4 preceding siblings ...)
  2023-12-23 14:01 ` [PATCH net-next 5/5] net/sched: Remove uapi support for CBQ qdisc Jamal Hadi Salim
@ 2024-01-01 18:58 ` Cong Wang
  2024-01-02 14:30 ` patchwork-bot+netdevbpf
  6 siblings, 0 replies; 11+ messages in thread
From: Cong Wang @ 2024-01-01 18:58 UTC (permalink / raw)
  To: Jamal Hadi Salim
  Cc: davem, kuba, edumazet, pabeni, jiri, netdev, stephen, dsahern,
	pctammela, victor

On Sat, Dec 23, 2023 at 09:01:49AM -0500, Jamal Hadi Salim wrote:
> Classifiers RSVP and tcindex as well as qdiscs dsmark, CBQ and ATM have already
> been deleted. This patchset removes their UAPI support.
> 
> User space - with a focus on iproute2 - typically copies these UAPI headers for
> different kernels.
> These deletion patches are coordinated with the iproute2 maintainers to make
> sure that they delete any user space code referencing removed objects at their
> leisure.
> 
> Jamal Hadi Salim (5):
>   net/sched: Remove uapi support for rsvp classifier
>   net/sched: Remove uapi support for tcindex classifier
>   net/sched: Remove uapi support for dsmark qdisc
>   net/sched: Remove uapi support for ATM qdisc
>   net/sched: Remove uapi support for CBQ qdisc
> 

All look good to me.

Acked-by: Cong Wang <xiyou.wangcong@gmail.com>

Thanks.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers
  2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
                   ` (5 preceding siblings ...)
  2024-01-01 18:58 ` [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Cong Wang
@ 2024-01-02 14:30 ` patchwork-bot+netdevbpf
  6 siblings, 0 replies; 11+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-01-02 14:30 UTC (permalink / raw)
  To: Jamal Hadi Salim
  Cc: davem, kuba, edumazet, pabeni, jiri, xiyou.wangcong, netdev,
	stephen, dsahern, pctammela, victor

Hello:

This series was applied to netdev/net-next.git (main)
by David S. Miller <davem@davemloft.net>:

On Sat, 23 Dec 2023 09:01:49 -0500 you wrote:
> Classifiers RSVP and tcindex as well as qdiscs dsmark, CBQ and ATM have already
> been deleted. This patchset removes their UAPI support.
> 
> User space - with a focus on iproute2 - typically copies these UAPI headers for
> different kernels.
> These deletion patches are coordinated with the iproute2 maintainers to make
> sure that they delete any user space code referencing removed objects at their
> leisure.
> 
> [...]

Here is the summary with links:
  - [net-next,1/5] net/sched: Remove uapi support for rsvp classifier
    https://git.kernel.org/netdev/net-next/c/41bc3e8fc1f7
  - [net-next,2/5] net/sched: Remove uapi support for tcindex classifier
    https://git.kernel.org/netdev/net-next/c/82b2545ed9a4
  - [net-next,3/5] net/sched: Remove uapi support for dsmark qdisc
    https://git.kernel.org/netdev/net-next/c/fe3b739a5472
  - [net-next,4/5] net/sched: Remove uapi support for ATM qdisc
    https://git.kernel.org/netdev/net-next/c/26cc8714fc7f
  - [net-next,5/5] net/sched: Remove uapi support for CBQ qdisc
    https://git.kernel.org/netdev/net-next/c/33241dca4862

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



^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2024-01-02 14:30 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-23 14:01 [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Jamal Hadi Salim
2023-12-23 14:01 ` [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp classifier Jamal Hadi Salim
2023-12-23 17:16   ` Stephen Hemminger
2023-12-23 21:15     ` Jamal Hadi Salim
2024-01-01 18:56     ` Cong Wang
2023-12-23 14:01 ` [PATCH net-next 2/5] net/sched: Remove uapi support for tcindex classifier Jamal Hadi Salim
2023-12-23 14:01 ` [PATCH net-next 3/5] net/sched: Remove uapi support for dsmark qdisc Jamal Hadi Salim
2023-12-23 14:01 ` [PATCH net-next 4/5] net/sched: Remove uapi support for ATM qdisc Jamal Hadi Salim
2023-12-23 14:01 ` [PATCH net-next 5/5] net/sched: Remove uapi support for CBQ qdisc Jamal Hadi Salim
2024-01-01 18:58 ` [PATCH net-next 0/5] net/sched: Remove UAPI support for retired TC qdiscs and classifiers Cong Wang
2024-01-02 14:30 ` patchwork-bot+netdevbpf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.