From: Ido Schimmel <idosch@nvidia.com>
To: <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <kuba@kernel.org>, <pabeni@redhat.com>,
<edumazet@google.com>, <dsahern@kernel.org>, <gnault@redhat.com>,
<razor@blackwall.org>, <pablo@netfilter.org>,
<kadlec@netfilter.org>, <marcelo.leitner@gmail.com>,
<lucien.xin@gmail.com>, <bridge@lists.linux.dev>,
<netfilter-devel@vger.kernel.org>, <coreteam@netfilter.org>,
<linux-sctp@vger.kernel.org>, <bpf@vger.kernel.org>,
Ido Schimmel <idosch@nvidia.com>
Subject: [PATCH net-next 05/12] ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_bind_dev()
Date: Thu, 5 Sep 2024 19:51:33 +0300 [thread overview]
Message-ID: <20240905165140.3105140-6-idosch@nvidia.com> (raw)
In-Reply-To: <20240905165140.3105140-1-idosch@nvidia.com>
Unmask the upper DSCP bits when initializing an IPv4 flow key via
ip_tunnel_init_flow() before passing it to ip_route_output_key() so that
in the future we could perform the FIB lookup according to the full DSCP
value.
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
net/ipv4/ip_tunnel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 18964394d6bd..b632c128ecb7 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -293,7 +293,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev)
ip_tunnel_init_flow(&fl4, iph->protocol, iph->daddr,
iph->saddr, tunnel->parms.o_key,
- RT_TOS(iph->tos), dev_net(dev),
+ iph->tos & INET_DSCP_MASK, dev_net(dev),
tunnel->parms.link, tunnel->fwmark, 0, 0);
rt = ip_route_output_key(tunnel->net, &fl4);
--
2.46.0
next prev parent reply other threads:[~2024-09-05 16:53 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 16:51 [PATCH net-next 00/12] Unmask upper DSCP bits - part 4 (last) Ido Schimmel
2024-09-05 16:51 ` [PATCH net-next 01/12] netfilter: br_netfilter: Unmask upper DSCP bits in br_nf_pre_routing_finish() Ido Schimmel
2024-09-06 11:15 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 02/12] ipv4: ip_gre: Unmask upper DSCP bits in ipgre_open() Ido Schimmel
2024-09-06 11:16 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 03/12] bpf: lwtunnel: Unmask upper DSCP bits in bpf_lwt_xmit_reroute() Ido Schimmel
2024-09-06 11:21 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 04/12] ipv4: icmp: Unmask upper DSCP bits in icmp_reply() Ido Schimmel
2024-09-06 11:23 ` Guillaume Nault
2024-09-05 16:51 ` Ido Schimmel [this message]
2024-09-06 11:36 ` [PATCH net-next 05/12] ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_bind_dev() Guillaume Nault
2024-09-06 13:45 ` Ido Schimmel
2024-09-06 13:52 ` Guillaume Nault
2024-09-06 13:52 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 06/12] ipv4: ip_tunnel: Unmask upper DSCP bits in ip_md_tunnel_xmit() Ido Schimmel
2024-09-06 14:01 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 07/12] ipv4: ip_tunnel: Unmask upper DSCP bits in ip_tunnel_xmit() Ido Schimmel
2024-09-06 14:04 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 08/12] ipv4: netfilter: Unmask upper DSCP bits in ip_route_me_harder() Ido Schimmel
2024-09-06 11:38 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 09/12] netfilter: nft_flow_offload: Unmask upper DSCP bits in nft_flow_route() Ido Schimmel
2024-09-06 11:57 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 10/12] netfilter: nf_dup4: Unmask upper DSCP bits in nf_dup_ipv4_route() Ido Schimmel
2024-09-06 11:59 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 11/12] ipv4: udp_tunnel: Unmask upper DSCP bits in udp_tunnel_dst_lookup() Ido Schimmel
2024-09-06 12:02 ` Guillaume Nault
2024-09-05 16:51 ` [PATCH net-next 12/12] sctp: Unmask upper DSCP bits in sctp_v4_get_dst() Ido Schimmel
2024-09-06 12:04 ` Guillaume Nault
2024-09-06 14:43 ` Xin Long
2024-09-06 17:13 ` [PATCH net-next 00/12] Unmask upper DSCP bits - part 4 (last) David Ahern
2024-09-09 13:20 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240905165140.3105140-6-idosch@nvidia.com \
--to=idosch@nvidia.com \
--cc=bpf@vger.kernel.org \
--cc=bridge@lists.linux.dev \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=gnault@redhat.com \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=lucien.xin@gmail.com \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pablo@netfilter.org \
--cc=razor@blackwall.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox