mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-28 16:56:26 +00:00
net: add IEEE 802.1q specific helpers
IEEE 802.1q specification provides recommendation and examples which can be used as good default values for different drivers. This patch implements mapping examples documented in IEEE 802.1Q-2022 in Annex I "I.3 Traffic type to traffic class mapping" and IETF DSCP naming and mapping DSCP to Traffic Type inspired by RFC8325. This helpers will be used in followup patches for dsa/microchip DCB implementation. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Oleksij Rempel
David S. Miller
parent
97278f8f10
commit
768cf84138
76
include/net/dscp.h
Normal file
76
include/net/dscp.h
Normal file
@ -0,0 +1,76 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/* Copyright (c) 2024 Pengutronix, Oleksij Rempel <kernel@pengutronix.de> */
|
||||
|
||||
#ifndef __DSCP_H__
|
||||
#define __DSCP_H__
|
||||
|
||||
/*
|
||||
* DSCP Pools and Codepoint Space Division:
|
||||
*
|
||||
* The Differentiated Services (Diffserv) architecture defines a method for
|
||||
* classifying and managing network traffic using the DS field in IPv4 and IPv6
|
||||
* packet headers. This field can carry one of 64 distinct DSCP (Differentiated
|
||||
* Services Code Point) values, which are divided into three pools based on
|
||||
* their Least Significant Bits (LSB) patterns and intended usage. Each pool has
|
||||
* a specific registration procedure for assigning DSCP values:
|
||||
*
|
||||
* Pool 1 (Standards Action Pool):
|
||||
* - Codepoint Space: xxxxx0
|
||||
* This pool includes DSCP values ending in '0' (binary), allocated via
|
||||
* Standards Action. It is intended for globally recognized traffic classes,
|
||||
* ensuring interoperability across the internet. This pool encompasses
|
||||
* well-known DSCP values such as CS0-CS7, AFxx, EF, and VOICE-ADMIT.
|
||||
*
|
||||
* Pool 2 (Experimental/Local Use Pool):
|
||||
* - Codepoint Space: xxxx11
|
||||
* Reserved for DSCP values ending in '11' (binary), this pool is designated
|
||||
* for Experimental or Local Use. It allows for private or temporary traffic
|
||||
* marking schemes not intended for standardized global use, facilitating
|
||||
* testing and network-specific configurations without impacting
|
||||
* interoperability.
|
||||
*
|
||||
* Pool 3 (Preferential Standardization Pool):
|
||||
* - Codepoint Space: xxxx01
|
||||
* Initially reserved for experimental or local use, this pool now serves as
|
||||
* a secondary standardization resource should Pool 1 become exhausted. DSCP
|
||||
* values ending in '01' (binary) are assigned via Standards Action, with a
|
||||
* focus on adopting new, standardized traffic classes as the need arises.
|
||||
*
|
||||
* For pool updates see:
|
||||
* https://www.iana.org/assignments/dscp-registry/dscp-registry.xhtml
|
||||
*/
|
||||
|
||||
/* Pool 1: Standardized DSCP values as per [RFC8126] */
|
||||
#define DSCP_CS0 0 /* 000000, [RFC2474] */
|
||||
/* CS0 is some times called default (DF) */
|
||||
#define DSCP_DF 0 /* 000000, [RFC2474] */
|
||||
#define DSCP_CS1 8 /* 001000, [RFC2474] */
|
||||
#define DSCP_CS2 16 /* 010000, [RFC2474] */
|
||||
#define DSCP_CS3 24 /* 011000, [RFC2474] */
|
||||
#define DSCP_CS4 32 /* 100000, [RFC2474] */
|
||||
#define DSCP_CS5 40 /* 101000, [RFC2474] */
|
||||
#define DSCP_CS6 48 /* 110000, [RFC2474] */
|
||||
#define DSCP_CS7 56 /* 111000, [RFC2474] */
|
||||
#define DSCP_AF11 10 /* 001010, [RFC2597] */
|
||||
#define DSCP_AF12 12 /* 001100, [RFC2597] */
|
||||
#define DSCP_AF13 14 /* 001110, [RFC2597] */
|
||||
#define DSCP_AF21 18 /* 010010, [RFC2597] */
|
||||
#define DSCP_AF22 20 /* 010100, [RFC2597] */
|
||||
#define DSCP_AF23 22 /* 010110, [RFC2597] */
|
||||
#define DSCP_AF31 26 /* 011010, [RFC2597] */
|
||||
#define DSCP_AF32 28 /* 011100, [RFC2597] */
|
||||
#define DSCP_AF33 30 /* 011110, [RFC2597] */
|
||||
#define DSCP_AF41 34 /* 100010, [RFC2597] */
|
||||
#define DSCP_AF42 36 /* 100100, [RFC2597] */
|
||||
#define DSCP_AF43 38 /* 100110, [RFC2597] */
|
||||
#define DSCP_EF 46 /* 101110, [RFC3246] */
|
||||
#define DSCP_VOICE_ADMIT 44 /* 101100, [RFC5865] */
|
||||
|
||||
/* Pool 3: Standardized assignments, previously available for experimental/local
|
||||
* use
|
||||
*/
|
||||
#define DSCP_LE 1 /* 000001, [RFC8622] */
|
||||
|
||||
#define DSCP_MAX 64
|
||||
|
||||
#endif /* __DSCP_H__ */
|
||||
57
include/net/ieee8021q.h
Normal file
57
include/net/ieee8021q.h
Normal file
@ -0,0 +1,57 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/* Copyright (c) 2024 Pengutronix, Oleksij Rempel <kernel@pengutronix.de> */
|
||||
|
||||
#ifndef _NET_IEEE8021Q_H
|
||||
#define _NET_IEEE8021Q_H
|
||||
|
||||
#include <linux/errno.h>
|
||||
|
||||
/**
|
||||
* enum ieee8021q_traffic_type - 802.1Q traffic type priority values (802.1Q-2022)
|
||||
*
|
||||
* @IEEE8021Q_TT_BK: Background
|
||||
* @IEEE8021Q_TT_BE: Best Effort (default). According to 802.1Q-2022, BE is 0
|
||||
* but has higher priority than BK which is 1.
|
||||
* @IEEE8021Q_TT_EE: Excellent Effort
|
||||
* @IEEE8021Q_TT_CA: Critical Applications
|
||||
* @IEEE8021Q_TT_VI: Video, < 100 ms latency and jitter
|
||||
* @IEEE8021Q_TT_VO: Voice, < 10 ms latency and jitter
|
||||
* @IEEE8021Q_TT_IC: Internetwork Control
|
||||
* @IEEE8021Q_TT_NC: Network Control
|
||||
*/
|
||||
enum ieee8021q_traffic_type {
|
||||
IEEE8021Q_TT_BK = 0,
|
||||
IEEE8021Q_TT_BE = 1,
|
||||
IEEE8021Q_TT_EE = 2,
|
||||
IEEE8021Q_TT_CA = 3,
|
||||
IEEE8021Q_TT_VI = 4,
|
||||
IEEE8021Q_TT_VO = 5,
|
||||
IEEE8021Q_TT_IC = 6,
|
||||
IEEE8021Q_TT_NC = 7,
|
||||
|
||||
/* private: */
|
||||
IEEE8021Q_TT_MAX,
|
||||
};
|
||||
|
||||
#define SIMPLE_IETF_DSCP_TO_IEEE8021Q_TT(dscp) ((dscp >> 3) & 0x7)
|
||||
|
||||
#if IS_ENABLED(CONFIG_NET_IEEE8021Q_HELPERS)
|
||||
|
||||
int ietf_dscp_to_ieee8021q_tt(u8 dscp);
|
||||
int ieee8021q_tt_to_tc(enum ieee8021q_traffic_type tt, unsigned int num_queues);
|
||||
|
||||
#else
|
||||
|
||||
static inline int ietf_dscp_to_ieee8021q_tt(u8 dscp)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline int ieee8021q_tt_to_tc(enum ieee8021q_traffic_type tt,
|
||||
unsigned int num_queues)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* _NET_IEEE8021Q_H */
|
||||
@ -452,6 +452,9 @@ config GRO_CELLS
|
||||
config SOCK_VALIDATE_XMIT
|
||||
bool
|
||||
|
||||
config NET_IEEE8021Q_HELPERS
|
||||
bool
|
||||
|
||||
config NET_SELFTESTS
|
||||
def_tristate PHYLIB
|
||||
depends on PHYLIB && INET
|
||||
|
||||
@ -26,6 +26,7 @@ obj-$(CONFIG_NETPOLL) += netpoll.o
|
||||
obj-$(CONFIG_FIB_RULES) += fib_rules.o
|
||||
obj-$(CONFIG_TRACEPOINTS) += net-traces.o
|
||||
obj-$(CONFIG_NET_DROP_MONITOR) += drop_monitor.o
|
||||
obj-$(CONFIG_NET_IEEE8021Q_HELPERS) += ieee8021q_helpers.o
|
||||
obj-$(CONFIG_NET_SELFTESTS) += selftests.o
|
||||
obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += timestamping.o
|
||||
obj-$(CONFIG_NET_PTP_CLASSIFY) += ptp_classifier.o
|
||||
|
||||
242
net/core/ieee8021q_helpers.c
Normal file
242
net/core/ieee8021q_helpers.c
Normal file
@ -0,0 +1,242 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2024 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
|
||||
|
||||
#include <linux/array_size.h>
|
||||
#include <linux/printk.h>
|
||||
#include <linux/types.h>
|
||||
#include <net/dscp.h>
|
||||
#include <net/ieee8021q.h>
|
||||
|
||||
/* The following arrays map Traffic Types (TT) to traffic classes (TC) for
|
||||
* different number of queues as shown in the example provided by
|
||||
* IEEE 802.1Q-2022 in Annex I "I.3 Traffic type to traffic class mapping" and
|
||||
* Table I-1 "Traffic type to traffic class mapping".
|
||||
*/
|
||||
static const u8 ieee8021q_8queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0,
|
||||
[IEEE8021Q_TT_BE] = 1,
|
||||
[IEEE8021Q_TT_EE] = 2,
|
||||
[IEEE8021Q_TT_CA] = 3,
|
||||
[IEEE8021Q_TT_VI] = 4,
|
||||
[IEEE8021Q_TT_VO] = 5,
|
||||
[IEEE8021Q_TT_IC] = 6,
|
||||
[IEEE8021Q_TT_NC] = 7,
|
||||
};
|
||||
|
||||
static const u8 ieee8021q_7queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0,
|
||||
[IEEE8021Q_TT_BE] = 1,
|
||||
[IEEE8021Q_TT_EE] = 2,
|
||||
[IEEE8021Q_TT_CA] = 3,
|
||||
[IEEE8021Q_TT_VI] = 4, [IEEE8021Q_TT_VO] = 4,
|
||||
[IEEE8021Q_TT_IC] = 5,
|
||||
[IEEE8021Q_TT_NC] = 6,
|
||||
};
|
||||
|
||||
static const u8 ieee8021q_6queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0,
|
||||
[IEEE8021Q_TT_BE] = 1,
|
||||
[IEEE8021Q_TT_EE] = 2, [IEEE8021Q_TT_CA] = 2,
|
||||
[IEEE8021Q_TT_VI] = 3, [IEEE8021Q_TT_VO] = 3,
|
||||
[IEEE8021Q_TT_IC] = 4,
|
||||
[IEEE8021Q_TT_NC] = 5,
|
||||
};
|
||||
|
||||
static const u8 ieee8021q_5queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,
|
||||
[IEEE8021Q_TT_EE] = 1, [IEEE8021Q_TT_CA] = 1,
|
||||
[IEEE8021Q_TT_VI] = 2, [IEEE8021Q_TT_VO] = 2,
|
||||
[IEEE8021Q_TT_IC] = 3,
|
||||
[IEEE8021Q_TT_NC] = 4,
|
||||
};
|
||||
|
||||
static const u8 ieee8021q_4queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,
|
||||
[IEEE8021Q_TT_EE] = 1, [IEEE8021Q_TT_CA] = 1,
|
||||
[IEEE8021Q_TT_VI] = 2, [IEEE8021Q_TT_VO] = 2,
|
||||
[IEEE8021Q_TT_IC] = 3, [IEEE8021Q_TT_NC] = 3,
|
||||
};
|
||||
|
||||
static const u8 ieee8021q_3queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,
|
||||
[IEEE8021Q_TT_EE] = 0, [IEEE8021Q_TT_CA] = 0,
|
||||
[IEEE8021Q_TT_VI] = 1, [IEEE8021Q_TT_VO] = 1,
|
||||
[IEEE8021Q_TT_IC] = 2, [IEEE8021Q_TT_NC] = 2,
|
||||
};
|
||||
|
||||
static const u8 ieee8021q_2queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,
|
||||
[IEEE8021Q_TT_EE] = 0, [IEEE8021Q_TT_CA] = 0,
|
||||
[IEEE8021Q_TT_VI] = 1, [IEEE8021Q_TT_VO] = 1,
|
||||
[IEEE8021Q_TT_IC] = 1, [IEEE8021Q_TT_NC] = 1,
|
||||
};
|
||||
|
||||
static const u8 ieee8021q_1queue_tt_tc_map[] = {
|
||||
[IEEE8021Q_TT_BK] = 0, [IEEE8021Q_TT_BE] = 0,
|
||||
[IEEE8021Q_TT_EE] = 0, [IEEE8021Q_TT_CA] = 0,
|
||||
[IEEE8021Q_TT_VI] = 0, [IEEE8021Q_TT_VO] = 0,
|
||||
[IEEE8021Q_TT_IC] = 0, [IEEE8021Q_TT_NC] = 0,
|
||||
};
|
||||
|
||||
/**
|
||||
* ieee8021q_tt_to_tc - Map IEEE 802.1Q Traffic Type to Traffic Class
|
||||
* @tt: IEEE 802.1Q Traffic Type
|
||||
* @num_queues: Number of queues
|
||||
*
|
||||
* This function maps an IEEE 802.1Q Traffic Type to a Traffic Class (TC) based
|
||||
* on the number of queues configured on the NIC. The mapping is based on the
|
||||
* example provided by IEEE 802.1Q-2022 in Annex I "I.3 Traffic type to traffic
|
||||
* class mapping" and Table I-1 "Traffic type to traffic class mapping".
|
||||
*
|
||||
* Return: Traffic Class corresponding to the given Traffic Type or negative
|
||||
* value in case of error.
|
||||
*/
|
||||
int ieee8021q_tt_to_tc(enum ieee8021q_traffic_type tt, unsigned int num_queues)
|
||||
{
|
||||
if (tt < 0 || tt >= IEEE8021Q_TT_MAX) {
|
||||
pr_err("Requested Traffic Type (%d) is out of range (%d)\n", tt,
|
||||
IEEE8021Q_TT_MAX);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (num_queues) {
|
||||
case 8:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_8queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_8queue_tt_tc_map != max - 1");
|
||||
return ieee8021q_8queue_tt_tc_map[tt];
|
||||
case 7:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_7queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_7queue_tt_tc_map != max - 1");
|
||||
|
||||
return ieee8021q_7queue_tt_tc_map[tt];
|
||||
case 6:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_6queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_6queue_tt_tc_map != max - 1");
|
||||
|
||||
return ieee8021q_6queue_tt_tc_map[tt];
|
||||
case 5:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_5queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_5queue_tt_tc_map != max - 1");
|
||||
|
||||
return ieee8021q_5queue_tt_tc_map[tt];
|
||||
case 4:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_4queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_4queue_tt_tc_map != max - 1");
|
||||
|
||||
return ieee8021q_4queue_tt_tc_map[tt];
|
||||
case 3:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_3queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_3queue_tt_tc_map != max - 1");
|
||||
|
||||
return ieee8021q_3queue_tt_tc_map[tt];
|
||||
case 2:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_2queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_2queue_tt_tc_map != max - 1");
|
||||
|
||||
return ieee8021q_2queue_tt_tc_map[tt];
|
||||
case 1:
|
||||
compiletime_assert(ARRAY_SIZE(ieee8021q_1queue_tt_tc_map) !=
|
||||
IEEE8021Q_TT_MAX - 1,
|
||||
"ieee8021q_1queue_tt_tc_map != max - 1");
|
||||
|
||||
return ieee8021q_1queue_tt_tc_map[tt];
|
||||
}
|
||||
|
||||
pr_err("Invalid number of queues %d\n", num_queues);
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ieee8021q_tt_to_tc);
|
||||
|
||||
/**
|
||||
* ietf_dscp_to_ieee8021q_tt - Map IETF DSCP to IEEE 802.1Q Traffic Type
|
||||
* @dscp: IETF DSCP value
|
||||
*
|
||||
* This function maps an IETF DSCP value to an IEEE 802.1Q Traffic Type (TT).
|
||||
* Since there is no corresponding mapping between DSCP and IEEE 802.1Q Traffic
|
||||
* Type, this function is inspired by the RFC8325 documentation which describe
|
||||
* the mapping between DSCP and 802.11 User Priority (UP) values.
|
||||
*
|
||||
* Return: IEEE 802.1Q Traffic Type corresponding to the given DSCP value
|
||||
*/
|
||||
int ietf_dscp_to_ieee8021q_tt(u8 dscp)
|
||||
{
|
||||
switch (dscp) {
|
||||
case DSCP_CS0:
|
||||
/* Comment from RFC8325:
|
||||
* [RFC4594], Section 4.8, recommends High-Throughput Data be marked
|
||||
* AF1x (that is, AF11, AF12, and AF13, according to the rules defined
|
||||
* in [RFC2475]).
|
||||
*
|
||||
* By default (as described in Section 2.3), High-Throughput Data will
|
||||
* map to UP 1 and, thus, to the Background Access Category (AC_BK),
|
||||
* which is contrary to the intent expressed in [RFC4594].
|
||||
|
||||
* Unfortunately, there really is no corresponding fit for the High-
|
||||
* Throughput Data service class within the constrained 4 Access
|
||||
* Category [IEEE.802.11-2016] model. If the High-Throughput Data
|
||||
* service class is assigned to the Best Effort Access Category (AC_BE),
|
||||
* then it would contend with Low-Latency Data (while [RFC4594]
|
||||
* recommends a distinction in servicing between these service classes)
|
||||
* as well as with the default service class; alternatively, if it is
|
||||
* assigned to the Background Access Category (AC_BK), then it would
|
||||
* receive a less-then-best-effort service and contend with Low-Priority
|
||||
* Data (as discussed in Section 4.2.10).
|
||||
*
|
||||
* As such, since there is no directly corresponding fit for the High-
|
||||
* Throughout Data service class within the [IEEE.802.11-2016] model, it
|
||||
* is generally RECOMMENDED to map High-Throughput Data to UP 0, thereby
|
||||
* admitting it to the Best Effort Access Category (AC_BE).
|
||||
*
|
||||
* Note: The above text is from RFC8325 which is describing the mapping
|
||||
* between DSCP and 802.11 User Priority (UP) values. The mapping
|
||||
* between UP and IEEE 802.1Q Traffic Type is not defined in the RFC but
|
||||
* the 802.11 AC_BK and AC_BE are closely related to the IEEE 802.1Q
|
||||
* Traffic Types BE and BK.
|
||||
*/
|
||||
case DSCP_AF11:
|
||||
case DSCP_AF12:
|
||||
case DSCP_AF13:
|
||||
return IEEE8021Q_TT_BE;
|
||||
/* Comment from RFC8325:
|
||||
* RFC3662 and RFC4594 both recommend Low-Priority Data be marked
|
||||
* with DSCP CS1. The Low-Priority Data service class loosely
|
||||
* corresponds to the [IEEE.802.11-2016] Background Access Category
|
||||
*/
|
||||
case DSCP_CS1:
|
||||
return IEEE8021Q_TT_BK;
|
||||
case DSCP_CS2:
|
||||
case DSCP_AF21:
|
||||
case DSCP_AF22:
|
||||
case DSCP_AF23:
|
||||
return IEEE8021Q_TT_EE;
|
||||
case DSCP_CS3:
|
||||
case DSCP_AF31:
|
||||
case DSCP_AF32:
|
||||
case DSCP_AF33:
|
||||
return IEEE8021Q_TT_CA;
|
||||
case DSCP_CS4:
|
||||
case DSCP_AF41:
|
||||
case DSCP_AF42:
|
||||
case DSCP_AF43:
|
||||
return IEEE8021Q_TT_VI;
|
||||
case DSCP_CS5:
|
||||
case DSCP_EF:
|
||||
case DSCP_VOICE_ADMIT:
|
||||
return IEEE8021Q_TT_VO;
|
||||
case DSCP_CS6:
|
||||
return IEEE8021Q_TT_IC;
|
||||
case DSCP_CS7:
|
||||
return IEEE8021Q_TT_NC;
|
||||
}
|
||||
|
||||
return SIMPLE_IETF_DSCP_TO_IEEE8021Q_TT(dscp);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ietf_dscp_to_ieee8021q_tt);
|
||||
Loading…
Reference in New Issue
Block a user