| Message ID | 20240821125251.1571445-7-idosch@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2bc9778b6696337f1e0b38f07522319296b39d83 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Unmask upper DSCP bits - part 1 | expand |
On Wed, Aug 21, 2024 at 03:52:45PM +0300, Ido Schimmel wrote: > Unmask the upper DSCP bits when calling ipmr_fib_lookup() so that in the > future it could perform the FIB lookup according to the full DSCP value. > > Note that ipmr_fib_lookup() performs a FIB rule lookup (returning the > relevant routing table) and that IPv4 multicast FIB rules do not support > matching on TOS / DSCP. However, it is still worth unmasking the upper > DSCP bits in case support for DSCP matching is ever added. Indeed, Reviewed-by: Guillaume Nault <gnault@redhat.com>
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 6c750bd13dd8..d5295b69bc0a 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -62,6 +62,7 @@ #include <net/fib_rules.h> #include <linux/netconf.h> #include <net/rtnh.h> +#include <net/inet_dscp.h> #include <linux/nospec.h> @@ -2080,7 +2081,7 @@ static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb) struct flowi4 fl4 = { .daddr = iph->daddr, .saddr = iph->saddr, - .flowi4_tos = RT_TOS(iph->tos), + .flowi4_tos = iph->tos & INET_DSCP_MASK, .flowi4_oif = (rt_is_output_route(rt) ? skb->dev->ifindex : 0), .flowi4_iif = (rt_is_output_route(rt) ?
Unmask the upper DSCP bits when calling ipmr_fib_lookup() so that in the future it could perform the FIB lookup according to the full DSCP value. Note that ipmr_fib_lookup() performs a FIB rule lookup (returning the relevant routing table) and that IPv4 multicast FIB rules do not support matching on TOS / DSCP. However, it is still worth unmasking the upper DSCP bits in case support for DSCP matching is ever added. Signed-off-by: Ido Schimmel <idosch@nvidia.com> --- net/ipv4/ipmr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)