All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH net] sch_cake: revise Diffserv docs
@ 2022-01-05 20:35 Kevin Bracey
  2022-01-06 20:58 ` Toke Høiland-Jørgensen
  0 siblings, 1 reply; 5+ messages in thread
From: Kevin Bracey @ 2022-01-05 20:35 UTC (permalink / raw)
  To: netdev; +Cc: toke, Kevin Bracey

Documentation incorrectly stated that CS1 is equivalent to LE for
diffserv8. But when LE was added to the table, CS1 was pushed into tin
1, leaving only LE in tin 0.

Also "TOS1" no longer exists, as that is the same codepoint as LE.

Make other tweaks properly distinguishing codepoints from classes and
putting current Diffserve codepoints ahead of legacy ones.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
---
 net/sched/sch_cake.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 857aaebd49f4..64692414c0e5 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -2342,9 +2342,7 @@ static int cake_config_precedence(struct Qdisc *sch)
 
 /*	List of known Diffserv codepoints:
  *
- *	Least Effort (CS1, LE)
- *	Best Effort (CS0)
- *	Max Reliability & LLT "Lo" (TOS1)
+ *	Default Forwarding (DF/CS0)
  *	Max Throughput (TOS2)
  *	Min Delay (TOS4)
  *	LLT "La" (TOS5)
@@ -2352,6 +2350,7 @@ static int cake_config_precedence(struct Qdisc *sch)
  *	Assured Forwarding 2 (AF2x) - x3
  *	Assured Forwarding 3 (AF3x) - x3
  *	Assured Forwarding 4 (AF4x) - x3
+ *	Precedence Class 1 (CS1)
  *	Precedence Class 2 (CS2)
  *	Precedence Class 3 (CS3)
  *	Precedence Class 4 (CS4)
@@ -2360,8 +2359,9 @@ static int cake_config_precedence(struct Qdisc *sch)
  *	Precedence Class 7 (CS7)
  *	Voice Admit (VA)
  *	Expedited Forwarding (EF)
-
- *	Total 25 codepoints.
+ *	Lower Effort (LE)
+ *
+ *	Total 26 codepoints.
  */
 
 /*	List of traffic classes in RFC 4594, updated by RFC 8622:
@@ -2375,12 +2375,12 @@ static int cake_config_precedence(struct Qdisc *sch)
  *	Realtime Interactive (CS4)     - eg. games
  *	Multimedia Streaming (AF3x)    - eg. YouTube, NetFlix, Twitch
  *	Broadcast Video (CS3)
- *	Low Latency Data (AF2x,TOS4)      - eg. database
- *	Ops, Admin, Management (CS2,TOS1) - eg. ssh
- *	Standard Service (CS0 & unrecognised codepoints)
- *	High Throughput Data (AF1x,TOS2)  - eg. web traffic
- *	Low Priority Data (CS1,LE)        - eg. BitTorrent
-
+ *	Low-Latency Data (AF2x,TOS4)      - eg. database
+ *	Ops, Admin, Management (CS2)      - eg. ssh
+ *	Standard Service (DF & unrecognised codepoints)
+ *	High-Throughput Data (AF1x,TOS2)  - eg. web traffic
+ *	Low-Priority Data (LE,CS1)        - eg. BitTorrent
+ *
  *	Total 12 traffic classes.
  */
 
@@ -2390,12 +2390,12 @@ static int cake_config_diffserv8(struct Qdisc *sch)
  *
  *		Network Control          (CS6, CS7)
  *		Minimum Latency          (EF, VA, CS5, CS4)
- *		Interactive Shell        (CS2, TOS1)
+ *		Interactive Shell        (CS2)
  *		Low Latency Transactions (AF2x, TOS4)
  *		Video Streaming          (AF4x, AF3x, CS3)
- *		Bog Standard             (CS0 etc.)
- *		High Throughput          (AF1x, TOS2)
- *		Background Traffic       (CS1, LE)
+ *		Bog Standard             (DF etc.)
+ *		High Throughput          (AF1x, TOS2, CS1)
+ *		Background Traffic       (LE)
  *
  *		Total 8 traffic classes.
  */
@@ -2437,9 +2437,9 @@ static int cake_config_diffserv4(struct Qdisc *sch)
 /*  Further pruned list of traffic classes for four-class system:
  *
  *	    Latency Sensitive  (CS7, CS6, EF, VA, CS5, CS4)
- *	    Streaming Media    (AF4x, AF3x, CS3, AF2x, TOS4, CS2, TOS1)
- *	    Best Effort        (CS0, AF1x, TOS2, and those not specified)
- *	    Background Traffic (CS1, LE)
+ *	    Streaming Media    (AF4x, AF3x, CS3, AF2x, TOS4, CS2)
+ *	    Best Effort        (DF, AF1x, TOS2, and those not specified)
+ *	    Background Traffic (LE, CS1)
  *
  *		Total 4 traffic classes.
  */
@@ -2477,9 +2477,9 @@ static int cake_config_diffserv4(struct Qdisc *sch)
 static int cake_config_diffserv3(struct Qdisc *sch)
 {
 /*  Simplified Diffserv structure with 3 tins.
- *		Low Priority		(CS1, LE)
+ *		Low Priority		(LE, CS1)
  *		Best Effort
- *		Latency Sensitive	(TOS4, VA, EF, CS6, CS7)
+ *		Latency Sensitive	(CS7, CS6, EF, VA, TOS4)
  */
 	struct cake_sched_data *q = qdisc_priv(sch);
 	u32 mtu = psched_mtu(qdisc_dev(sch));
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH net] sch_cake: revise Diffserv docs
  2022-01-05 20:35 [PATCH net] sch_cake: revise Diffserv docs Kevin Bracey
@ 2022-01-06 20:58 ` Toke Høiland-Jørgensen
  2022-01-06 21:56   ` [PATCH net-next v2] " Kevin Bracey
  0 siblings, 1 reply; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2022-01-06 20:58 UTC (permalink / raw)
  To: Kevin Bracey, netdev

Kevin Bracey <kevin@bracey.fi> writes:

> Documentation incorrectly stated that CS1 is equivalent to LE for
> diffserv8. But when LE was added to the table, CS1 was pushed into tin
> 1, leaving only LE in tin 0.
>
> Also "TOS1" no longer exists, as that is the same codepoint as LE.
>
> Make other tweaks properly distinguishing codepoints from classes and
> putting current Diffserve codepoints ahead of legacy ones.
>
> Signed-off-by: Kevin Bracey <kevin@bracey.fi>

Thank you for the fix. A few comments below. I'm on the fence as to
whether this should be a fix against -net, or if it's better to just
target net-next. If you do think it should go into -net as a fix, please
add an appropriate Fixes tag, probably:

Fixes: b8392808eb3f ("sch_cake: add RFC 8622 LE PHB support to CAKE diffserv handling")

> ---
>  net/sched/sch_cake.c | 40 ++++++++++++++++++++--------------------
>  1 file changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
> index 857aaebd49f4..64692414c0e5 100644
> --- a/net/sched/sch_cake.c
> +++ b/net/sched/sch_cake.c
> @@ -2342,9 +2342,7 @@ static int cake_config_precedence(struct Qdisc *sch)
>  
>  /*	List of known Diffserv codepoints:
>   *
> - *	Least Effort (CS1, LE)
> - *	Best Effort (CS0)
> - *	Max Reliability & LLT "Lo" (TOS1)
> + *	Default Forwarding (DF/CS0)

I'm fine with adding the Default Forwarding designation, but please keep
the "Best Effort" moniker as well; it's commonly used in colloquial
speech, so I'd like to keep it here for people who go looking.

>   *	Max Throughput (TOS2)
>   *	Min Delay (TOS4)
>   *	LLT "La" (TOS5)
> @@ -2352,6 +2350,7 @@ static int cake_config_precedence(struct Qdisc *sch)
>   *	Assured Forwarding 2 (AF2x) - x3
>   *	Assured Forwarding 3 (AF3x) - x3
>   *	Assured Forwarding 4 (AF4x) - x3
> + *	Precedence Class 1 (CS1)
>   *	Precedence Class 2 (CS2)
>   *	Precedence Class 3 (CS3)
>   *	Precedence Class 4 (CS4)
> @@ -2360,8 +2359,9 @@ static int cake_config_precedence(struct Qdisc *sch)
>   *	Precedence Class 7 (CS7)
>   *	Voice Admit (VA)
>   *	Expedited Forwarding (EF)
> -
> - *	Total 25 codepoints.
> + *	Lower Effort (LE)
> + *
> + *	Total 26 codepoints.
>   */
>  
>  /*	List of traffic classes in RFC 4594, updated by RFC 8622:
> @@ -2375,12 +2375,12 @@ static int cake_config_precedence(struct Qdisc *sch)
>   *	Realtime Interactive (CS4)     - eg. games
>   *	Multimedia Streaming (AF3x)    - eg. YouTube, NetFlix, Twitch
>   *	Broadcast Video (CS3)
> - *	Low Latency Data (AF2x,TOS4)      - eg. database
> - *	Ops, Admin, Management (CS2,TOS1) - eg. ssh
> - *	Standard Service (CS0 & unrecognised codepoints)
> - *	High Throughput Data (AF1x,TOS2)  - eg. web traffic
> - *	Low Priority Data (CS1,LE)        - eg. BitTorrent
> -
> + *	Low-Latency Data (AF2x,TOS4)      - eg. database
> + *	Ops, Admin, Management (CS2)      - eg. ssh
> + *	Standard Service (DF & unrecognised codepoints)
> + *	High-Throughput Data (AF1x,TOS2)  - eg. web traffic
> + *	Low-Priority Data (LE,CS1)        - eg. BitTorrent
> + *
>   *	Total 12 traffic classes.
>   */
>  
> @@ -2390,12 +2390,12 @@ static int cake_config_diffserv8(struct Qdisc *sch)
>   *
>   *		Network Control          (CS6, CS7)
>   *		Minimum Latency          (EF, VA, CS5, CS4)
> - *		Interactive Shell        (CS2, TOS1)
> + *		Interactive Shell        (CS2)
>   *		Low Latency Transactions (AF2x, TOS4)
>   *		Video Streaming          (AF4x, AF3x, CS3)
> - *		Bog Standard             (CS0 etc.)
> - *		High Throughput          (AF1x, TOS2)
> - *		Background Traffic       (CS1, LE)
> + *		Bog Standard             (DF etc.)
> + *		High Throughput          (AF1x, TOS2, CS1)
> + *		Background Traffic       (LE)
>   *
>   *		Total 8 traffic classes.
>   */
> @@ -2437,9 +2437,9 @@ static int cake_config_diffserv4(struct Qdisc *sch)
>  /*  Further pruned list of traffic classes for four-class system:
>   *
>   *	    Latency Sensitive  (CS7, CS6, EF, VA, CS5, CS4)
> - *	    Streaming Media    (AF4x, AF3x, CS3, AF2x, TOS4, CS2, TOS1)
> - *	    Best Effort        (CS0, AF1x, TOS2, and those not specified)
> - *	    Background Traffic (CS1, LE)
> + *	    Streaming Media    (AF4x, AF3x, CS3, AF2x, TOS4, CS2)
> + *	    Best Effort        (DF, AF1x, TOS2, and those not specified)
> + *	    Background Traffic (LE, CS1)
>   *
>   *		Total 4 traffic classes.
>   */
> @@ -2477,9 +2477,9 @@ static int cake_config_diffserv4(struct Qdisc *sch)
>  static int cake_config_diffserv3(struct Qdisc *sch)
>  {
>  /*  Simplified Diffserv structure with 3 tins.
> - *		Low Priority		(CS1, LE)
> + *		Low Priority		(LE, CS1)
>   *		Best Effort
> - *		Latency Sensitive	(TOS4, VA, EF, CS6, CS7)
> + *		Latency Sensitive	(CS7, CS6, EF, VA, TOS4)

While you're fixing things up, could you please also swap the order of
the lines here, so it goes from high-to-low priority like the others?

-Toke

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH net-next v2] sch_cake: revise Diffserv docs
  2022-01-06 20:58 ` Toke Høiland-Jørgensen
@ 2022-01-06 21:56   ` Kevin Bracey
  2022-01-07 12:25     ` Toke Høiland-Jørgensen
  2022-01-07 17:00     ` patchwork-bot+netdevbpf
  0 siblings, 2 replies; 5+ messages in thread
From: Kevin Bracey @ 2022-01-06 21:56 UTC (permalink / raw)
  To: toke; +Cc: netdev, Kevin Bracey

Documentation incorrectly stated that CS1 is equivalent to LE for
diffserv8. But when LE was added to the table, CS1 was pushed into tin
1, leaving only LE in tin 0.

Also "TOS1" no longer exists, as that is the same codepoint as LE.

Make other tweaks properly distinguishing codepoints from classes and
putting current Diffserve codepoints ahead of legacy ones.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
---
 net/sched/sch_cake.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 857aaebd49f4..a43a58a73d09 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -2342,9 +2342,7 @@ static int cake_config_precedence(struct Qdisc *sch)
 
 /*	List of known Diffserv codepoints:
  *
- *	Least Effort (CS1, LE)
- *	Best Effort (CS0)
- *	Max Reliability & LLT "Lo" (TOS1)
+ *	Default Forwarding (DF/CS0) - Best Effort
  *	Max Throughput (TOS2)
  *	Min Delay (TOS4)
  *	LLT "La" (TOS5)
@@ -2352,6 +2350,7 @@ static int cake_config_precedence(struct Qdisc *sch)
  *	Assured Forwarding 2 (AF2x) - x3
  *	Assured Forwarding 3 (AF3x) - x3
  *	Assured Forwarding 4 (AF4x) - x3
+ *	Precedence Class 1 (CS1)
  *	Precedence Class 2 (CS2)
  *	Precedence Class 3 (CS3)
  *	Precedence Class 4 (CS4)
@@ -2360,8 +2359,9 @@ static int cake_config_precedence(struct Qdisc *sch)
  *	Precedence Class 7 (CS7)
  *	Voice Admit (VA)
  *	Expedited Forwarding (EF)
-
- *	Total 25 codepoints.
+ *	Lower Effort (LE)
+ *
+ *	Total 26 codepoints.
  */
 
 /*	List of traffic classes in RFC 4594, updated by RFC 8622:
@@ -2375,12 +2375,12 @@ static int cake_config_precedence(struct Qdisc *sch)
  *	Realtime Interactive (CS4)     - eg. games
  *	Multimedia Streaming (AF3x)    - eg. YouTube, NetFlix, Twitch
  *	Broadcast Video (CS3)
- *	Low Latency Data (AF2x,TOS4)      - eg. database
- *	Ops, Admin, Management (CS2,TOS1) - eg. ssh
- *	Standard Service (CS0 & unrecognised codepoints)
- *	High Throughput Data (AF1x,TOS2)  - eg. web traffic
- *	Low Priority Data (CS1,LE)        - eg. BitTorrent
-
+ *	Low-Latency Data (AF2x,TOS4)      - eg. database
+ *	Ops, Admin, Management (CS2)      - eg. ssh
+ *	Standard Service (DF & unrecognised codepoints)
+ *	High-Throughput Data (AF1x,TOS2)  - eg. web traffic
+ *	Low-Priority Data (LE,CS1)        - eg. BitTorrent
+ *
  *	Total 12 traffic classes.
  */
 
@@ -2390,12 +2390,12 @@ static int cake_config_diffserv8(struct Qdisc *sch)
  *
  *		Network Control          (CS6, CS7)
  *		Minimum Latency          (EF, VA, CS5, CS4)
- *		Interactive Shell        (CS2, TOS1)
+ *		Interactive Shell        (CS2)
  *		Low Latency Transactions (AF2x, TOS4)
  *		Video Streaming          (AF4x, AF3x, CS3)
- *		Bog Standard             (CS0 etc.)
- *		High Throughput          (AF1x, TOS2)
- *		Background Traffic       (CS1, LE)
+ *		Bog Standard             (DF etc.)
+ *		High Throughput          (AF1x, TOS2, CS1)
+ *		Background Traffic       (LE)
  *
  *		Total 8 traffic classes.
  */
@@ -2437,9 +2437,9 @@ static int cake_config_diffserv4(struct Qdisc *sch)
 /*  Further pruned list of traffic classes for four-class system:
  *
  *	    Latency Sensitive  (CS7, CS6, EF, VA, CS5, CS4)
- *	    Streaming Media    (AF4x, AF3x, CS3, AF2x, TOS4, CS2, TOS1)
- *	    Best Effort        (CS0, AF1x, TOS2, and those not specified)
- *	    Background Traffic (CS1, LE)
+ *	    Streaming Media    (AF4x, AF3x, CS3, AF2x, TOS4, CS2)
+ *	    Best Effort        (DF, AF1x, TOS2, and those not specified)
+ *	    Background Traffic (LE, CS1)
  *
  *		Total 4 traffic classes.
  */
@@ -2477,9 +2477,9 @@ static int cake_config_diffserv4(struct Qdisc *sch)
 static int cake_config_diffserv3(struct Qdisc *sch)
 {
 /*  Simplified Diffserv structure with 3 tins.
- *		Low Priority		(CS1, LE)
+ *		Latency Sensitive	(CS7, CS6, EF, VA, TOS4)
  *		Best Effort
- *		Latency Sensitive	(TOS4, VA, EF, CS6, CS7)
+ *		Low Priority		(LE, CS1)
  */
 	struct cake_sched_data *q = qdisc_priv(sch);
 	u32 mtu = psched_mtu(qdisc_dev(sch));
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH net-next v2] sch_cake: revise Diffserv docs
  2022-01-06 21:56   ` [PATCH net-next v2] " Kevin Bracey
@ 2022-01-07 12:25     ` Toke Høiland-Jørgensen
  2022-01-07 17:00     ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2022-01-07 12:25 UTC (permalink / raw)
  To: Kevin Bracey; +Cc: netdev, Kevin Bracey

Kevin Bracey <kevin@bracey.fi> writes:

> Documentation incorrectly stated that CS1 is equivalent to LE for
> diffserv8. But when LE was added to the table, CS1 was pushed into tin
> 1, leaving only LE in tin 0.
>
> Also "TOS1" no longer exists, as that is the same codepoint as LE.
>
> Make other tweaks properly distinguishing codepoints from classes and
> putting current Diffserve codepoints ahead of legacy ones.
>
> Signed-off-by: Kevin Bracey <kevin@bracey.fi>

That's better; thank you for the patch! :)

Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH net-next v2] sch_cake: revise Diffserv docs
  2022-01-06 21:56   ` [PATCH net-next v2] " Kevin Bracey
  2022-01-07 12:25     ` Toke Høiland-Jørgensen
@ 2022-01-07 17:00     ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-01-07 17:00 UTC (permalink / raw)
  To: Kevin Bracey; +Cc: toke, netdev

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 6 Jan 2022 23:56:37 +0200 you wrote:
> Documentation incorrectly stated that CS1 is equivalent to LE for
> diffserv8. But when LE was added to the table, CS1 was pushed into tin
> 1, leaving only LE in tin 0.
> 
> Also "TOS1" no longer exists, as that is the same codepoint as LE.
> 
> Make other tweaks properly distinguishing codepoints from classes and
> putting current Diffserve codepoints ahead of legacy ones.
> 
> [...]

Here is the summary with links:
  - [net-next,v2] sch_cake: revise Diffserv docs
    https://git.kernel.org/netdev/net-next/c/c25af830ab26

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] 5+ messages in thread
end of thread, other threads:[~2022-01-07 17:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-05 20:35 [PATCH net] sch_cake: revise Diffserv docs Kevin Bracey
2022-01-06 20:58 ` Toke Høiland-Jørgensen
2022-01-06 21:56   ` [PATCH net-next v2] " Kevin Bracey
2022-01-07 12:25     ` Toke Høiland-Jørgensen
2022-01-07 17:00     ` 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.