vti: remove GRE_KEY flag for vti tunnel
Subsystems (4)
PATCH 1/1 vti: remove GRE_KEY flag for vti tunnel
vti tunnel use IPPROTO_IPIP instead of IPPROTO_GRE, and keys are not allowed with ipip tunnel. So there is no reason to set GRE_KEY flag for vti.
--- net/ipv4/ip_vti.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/ipv4/ip_vti.c +2 -4
@@ -185,10 +185,8 @@ vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (err)return err; -if (cmd !=SIOCDELTUNNEL ) { - p.i_flags |=GRE_KEY |VTI_ISVTI ; - p.o_flags |=GRE_KEY ; - } +if (cmd !=SIOCDELTUNNEL ) + p.i_flags |=VTI_ISVTI ;if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p)))return -EFAULT ;
Signature · 1 line
1.8.1.4
Hello Hangbin,
vti interfaces precisely need an o_key to be configured (it must be set to the mark of ipsec policies attached to this interface). Consequently, this flag must not be removed.
Best Regards,
Christophe
Quoted 26 lines · Hangbin Liu
vti tunnel use
IPPROTO_IPIPinstead ofIPPROTO_GRE, and keys are not allowed with ipip tunnel. So there is no reason to setGRE_KEYflag for vti.Signed-off-by Hangbin Liu <[email protected]>--- net/ipv4/ip_vti.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)net/ipv4/ip_vti.c +2
-4@@ -185,10 +185,8 @@ vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (err)return err; -if (cmd !=SIOCDELTUNNEL ) { - p.i_flags |=GRE_KEY |VTI_ISVTI ; - p.o_flags |=GRE_KEY ; - } +if (cmd !=SIOCDELTUNNEL ) + p.i_flags |=VTI_ISVTI ;if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p)))return -EFAULT ;
Steffen Klassert
maintainerQuoted 6 lines · Christophe Gouault
Hello Hangbin,
vti interfaces precisely need an
o_keyto be configured (it must be set to the mark of ipsec policies attached to this interface). Consequently, this flag must not be removed.
Why do we need to set these flags in vti_tunnel_ioctl()? All we do here, is to cheat userspace. The userspace should set these flags to configure the tunnel. Please note that we completely ignore the flags from userspace, instead we set our own flags.
I think the only reason why we set these flags here, is to make iproute2 to print the i_key/o_key.
I've already metntioned that I'am a bit disappointed on how the gre keys and flags are used with vti. But I fear we need to keep it as it is for now, because it would at least change the behaviour of iproute2 if we remove the flags.
Quoted 13 lines · Steffen Klassert
Quoted 6 lines · Christophe Gouault
Hello Hangbin,
vti interfaces precisely need an
o_keyto be configured (it must be set to the mark of ipsec policies attached to this interface). Consequently, this flag must not be removed.Why do we need to set these flags in
vti_tunnel_ioctl()? All we do here, is to cheat userspace. The userspace should set these flags to configure the tunnel. Please note that we completely ignore the flags from userspace, instead we set our own flags.
Quoted 7 lines
I think the only reason why we set these flags here, is to make iproute2 to print the i_key/o_key.
I've already metntioned that I'am a bit disappointed on how the gre keys and flags are used with vti. But I fear we need to keep it as it is for now, because it would at least change the behaviour of iproute2 if we remove the flags.
I submit this patch just beacuse iproute2 will return fail when we modify vti parameters. Code here
ip/iptunnel.c#L226:
if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
fprintf(stderr, "Keys are not allowed with ipip and sit tunnels\n");
return -1;
}
}So should we modify iproute2 or kernel code?
Signature · 2 lines
Thanks & Best Regards Hangbin Liu <[email protected]>
Steffen Klassert
maintainerQuoted 11 lines · Hangbin Liu
Quoted 5 lines · Steffen Klassert
I've already metntioned that I'am a bit disappointed on how the gre keys and flags are used with vti. But I fear we need to keep it as it is for now, because it would at least change the behaviour of iproute2 if we remove the flags.
I submit this patch just beacuse iproute2 will return fail when we modify vti parameters. Code here
ip/iptunnel.c#L226:
Quoted 8 lines
if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) { if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) { fprintf(stderr, "Keys are not allowed with ipip and sit tunnels\n"); return -1; } }So should we modify iproute2 or kernel code?
Update iproute2 to allow GRE_KEY if the VTI_ISVTI flag is set.
The handling of vti keys inside the kernel needs to be redesigned too, but this requires a concept such that the existing userspace API still works.
Quoted 19 lines · Steffen Klassert
Quoted 18 lines · Hangbin Liu
Quoted 5 lines · Steffen Klassert
I've already metntioned that I'am a bit disappointed on how the gre keys and flags are used with vti. But I fear we need to keep it as it is for now, because it would at least change the behaviour of iproute2 if we remove the flags.
I submit this patch just beacuse iproute2 will return fail when we modify vti parameters. Code here
ip/iptunnel.c#L226:
if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) { if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) { fprintf(stderr, "Keys are not allowed with ipip and sit tunnels\n"); return -1; } }
Quoted 3 lines
Quoted 1 line
So should we modify iproute2 or kernel code?
Update iproute2 to allow
GRE_KEYif theVTI_ISVTIflag is set.
OK, I will resubmit a patch for iproute2
Quoted 4 lines
The handling of vti keys inside the kernel needs to be redesigned too, but this requires a concept such that the existing userspace API still works.
Signature · 2 lines
Thanks & Best Regards Hangbin Liu <[email protected]>
Quoted 5 lines · Christophe Gouault
Hello Hangbin,
vti interfaces precisely need an
o_keyto be configured (it must be set to the mark of ipsec policies attached to this interface). Consequently, this flag must not be removed.
I saw the o_key was used here, do you mean this? I'm not clearly understand xfrm4_policy_check(), does it really need GRE_KEY? or any value is ok?
static int vti_rcv(struct sk_buff *skb)
{
struct ip_tunnel *tunnel;
const struct iphdr *iph = ip_hdr(skb);
struct net *net = dev_net(skb->dev);
struct ip_tunnel_net *itn = net_generic(net, vti_net_id);
tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, TUNNEL_NO_KEY,
iph->saddr, iph->daddr, 0);
if (tunnel != NULL) {
struct pcpu_tstats *tstats;
u32 oldmark = skb->mark;
int ret;
/* temporarily mark the skb with the tunnel o_key, to
* only match policies with this mark.
*/
skb->mark = be32_to_cpu(tunnel->parms.o_key);
ret = xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb);
skb->mark = oldmark;Quoted 31 lines
Best Regards,
ChristopheQuoted 26 lines · Hangbin Liu
vti tunnel use
IPPROTO_IPIPinstead ofIPPROTO_GRE, and keys are not allowed with ipip tunnel. So there is no reason to setGRE_KEYflag for vti.Signed-off-by Hangbin Liu <[email protected]>--- net/ipv4/ip_vti.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)net/ipv4/ip_vti.c +2
-4@@ -185,10 +185,8 @@ vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (err)return err; -if (cmd !=SIOCDELTUNNEL ) { - p.i_flags |=GRE_KEY |VTI_ISVTI ; - p.o_flags |=GRE_KEY ; - } +if (cmd !=SIOCDELTUNNEL ) + p.i_flags |=VTI_ISVTI ;if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p)))return -EFAULT ;
Signature · 2 lines
Thanks & Best Regards Hangbin Liu <[email protected]>
Steffen Klassert
maintainerQuoted 9 lines · Hangbin Liu
Quoted 5 lines · Christophe Gouault
Hello Hangbin,
vti interfaces precisely need an
o_keyto be configured (it must be set to the mark of ipsec policies attached to this interface). Consequently, this flag must not be removed.I saw the
o_keywas used here, do you mean this? I'm not clearly understandxfrm4_policy_check(), does it really needGRE_KEY? or any value is ok?
It does not need GRE_KEY at all, this flag is not even set on vti tunnels. The vti key is just a mark that will be set on the skb. It is used to match the right policy for that tunnel, so the policy that should match must be configured to have the same mark.