From: Ahmed Abdelsalam <ahabdels@gmail.com>
To: davem@davemloft.net, kuznet@ms2.inr.ac.ru,
yoshfuji@linux-ipv6.org, kuba@kernel.org
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
andrea.mayer@uniroma2.it, Ahmed Abdelsalam <ahabdels@gmail.com>
Subject: [net-next] seg6: using DSCP of inner IPv4 packets
Date: Tue, 28 Jul 2020 12:20:44 +0000 [thread overview]
Message-ID: <20200728122044.1900-1-ahabdels@gmail.com> (raw)
This patch allows copying the DSCP from inner IPv4 header to the
outer IPv6 header, when doing SRv6 Encapsulation.
This allows forwarding packet across the SRv6 fabric based on their
original traffic class.
Signed-off-by: Ahmed Abdelsalam <ahabdels@gmail.com>
---
net/ipv6/seg6_iptunnel.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index e0e9f48ab14f..9753d10c4a51 100644
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -110,6 +110,7 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)
struct dst_entry *dst = skb_dst(skb);
struct net *net = dev_net(dst->dev);
struct ipv6hdr *hdr, *inner_hdr;
+ struct iphdr *inner_ipv4_hdr;
struct ipv6_sr_hdr *isrh;
int hdrlen, tot_len, err;
__be32 flowlabel;
@@ -121,7 +122,11 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)
if (unlikely(err))
return err;
- inner_hdr = ipv6_hdr(skb);
+ if (skb->protocol == htons(ETH_P_IPV6))
+ inner_hdr = ipv6_hdr(skb);
+ else
+ inner_ipv4_hdr = ip_hdr(skb);
+
flowlabel = seg6_make_flowlabel(net, skb, inner_hdr);
skb_push(skb, tot_len);
@@ -138,6 +143,10 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto)
ip6_flow_hdr(hdr, ip6_tclass(ip6_flowinfo(inner_hdr)),
flowlabel);
hdr->hop_limit = inner_hdr->hop_limit;
+ } else if (skb->protocol == htons(ETH_P_IP)) {
+ ip6_flow_hdr(hdr, inner_ipv4_hdr->tos, flowlabel);
+ hdr->hop_limit = inner_ipv4_hdr->ttl;
+ memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
} else {
ip6_flow_hdr(hdr, 0, flowlabel);
hdr->hop_limit = ip6_dst_hoplimit(skb_dst(skb));
--
2.17.1
next reply other threads:[~2020-07-28 12:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 12:20 Ahmed Abdelsalam [this message]
2020-07-30 23:44 ` [net-next] seg6: using DSCP of inner IPv4 packets David Miller
2020-07-31 17:31 ` Ahmed Abdelsalam
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=20200728122044.1900-1-ahabdels@gmail.com \
--to=ahabdels@gmail.com \
--cc=andrea.mayer@uniroma2.it \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.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;
as well as URLs for NNTP newsgroup(s).