mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-27 18:55:09 +03:00
Merge pull request #5534 from ssahani/vxlan-label
networkd: vxlan support setting IPv6 flow label
This commit is contained in:
commit
510cb1ce89
@ -360,7 +360,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
|
|||||||
IFLA_PHYS_PORT_ID,
|
IFLA_PHYS_PORT_ID,
|
||||||
IFLA_BOND_AD_INFO,
|
IFLA_BOND_AD_INFO,
|
||||||
IFLA_VLAN_PROTOCOL,
|
IFLA_VLAN_PROTOCOL,
|
||||||
IFLA_VXLAN_REMCSUM_NOPARTIAL,
|
IFLA_VXLAN_GPE,
|
||||||
IFLA_IPTUN_ENCAP_DPORT,
|
IFLA_IPTUN_ENCAP_DPORT,
|
||||||
IFLA_GRE_ENCAP_DPORT,
|
IFLA_GRE_ENCAP_DPORT,
|
||||||
IFLA_BRIDGE_VLAN_INFO,
|
IFLA_BRIDGE_VLAN_INFO,
|
||||||
|
@ -604,6 +604,14 @@
|
|||||||
ports, and allows overriding via configuration.</para>
|
ports, and allows overriding via configuration.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>FlowLabel=</varname></term>
|
||||||
|
<listitem>
|
||||||
|
<para>Specifies the flow label to use in outgoing packets.
|
||||||
|
The valid range is 0-1048575.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
</variablelist>
|
</variablelist>
|
||||||
</refsect1>
|
</refsect1>
|
||||||
<refsect1>
|
<refsect1>
|
||||||
|
@ -726,7 +726,7 @@ struct btrfs_ioctl_quota_ctl_args {
|
|||||||
#define IFLA_VLAN_MAX (__IFLA_VLAN_MAX - 1)
|
#define IFLA_VLAN_MAX (__IFLA_VLAN_MAX - 1)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !HAVE_DECL_IFLA_VXLAN_REMCSUM_NOPARTIAL
|
#if !HAVE_DECL_IFLA_VXLAN_GPE
|
||||||
#define IFLA_VXLAN_UNSPEC 0
|
#define IFLA_VXLAN_UNSPEC 0
|
||||||
#define IFLA_VXLAN_ID 1
|
#define IFLA_VXLAN_ID 1
|
||||||
#define IFLA_VXLAN_GROUP 2
|
#define IFLA_VXLAN_GROUP 2
|
||||||
@ -752,7 +752,11 @@ struct btrfs_ioctl_quota_ctl_args {
|
|||||||
#define IFLA_VXLAN_REMCSUM_RX 22
|
#define IFLA_VXLAN_REMCSUM_RX 22
|
||||||
#define IFLA_VXLAN_GBP 23
|
#define IFLA_VXLAN_GBP 23
|
||||||
#define IFLA_VXLAN_REMCSUM_NOPARTIAL 24
|
#define IFLA_VXLAN_REMCSUM_NOPARTIAL 24
|
||||||
#define __IFLA_VXLAN_MAX 25
|
#define IFLA_VXLAN_COLLECT_METADATA 25
|
||||||
|
#define IFLA_VXLAN_LABEL 26
|
||||||
|
#define IFLA_VXLAN_GPE 27
|
||||||
|
|
||||||
|
#define __IFLA_VXLAN_MAX 28
|
||||||
|
|
||||||
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
|
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
|
||||||
#endif
|
#endif
|
||||||
|
@ -170,6 +170,9 @@ static const NLType rtnl_link_info_data_vxlan_types[] = {
|
|||||||
[IFLA_VXLAN_REMCSUM_RX] = { .type = NETLINK_TYPE_U8 },
|
[IFLA_VXLAN_REMCSUM_RX] = { .type = NETLINK_TYPE_U8 },
|
||||||
[IFLA_VXLAN_GBP] = { .type = NETLINK_TYPE_FLAG },
|
[IFLA_VXLAN_GBP] = { .type = NETLINK_TYPE_FLAG },
|
||||||
[IFLA_VXLAN_REMCSUM_NOPARTIAL] = { .type = NETLINK_TYPE_FLAG },
|
[IFLA_VXLAN_REMCSUM_NOPARTIAL] = { .type = NETLINK_TYPE_FLAG },
|
||||||
|
[IFLA_VXLAN_COLLECT_METADATA] = { .type = NETLINK_TYPE_U8 },
|
||||||
|
[IFLA_VXLAN_LABEL] = { .type = NETLINK_TYPE_U32 },
|
||||||
|
[IFLA_VXLAN_GPE] = { .type = NETLINK_TYPE_FLAG },
|
||||||
};
|
};
|
||||||
|
|
||||||
static const NLType rtnl_bond_arp_target_types[] = {
|
static const NLType rtnl_bond_arp_target_types[] = {
|
||||||
|
@ -78,6 +78,7 @@ VXLAN.GroupPolicyExtension, config_parse_bool, 0,
|
|||||||
VXLAN.MaximumFDBEntries, config_parse_unsigned, 0, offsetof(VxLan, max_fdb)
|
VXLAN.MaximumFDBEntries, config_parse_unsigned, 0, offsetof(VxLan, max_fdb)
|
||||||
VXLAN.PortRange, config_parse_port_range, 0, 0
|
VXLAN.PortRange, config_parse_port_range, 0, 0
|
||||||
VXLAN.DestinationPort, config_parse_destination_port, 0, offsetof(VxLan, dest_port)
|
VXLAN.DestinationPort, config_parse_destination_port, 0, offsetof(VxLan, dest_port)
|
||||||
|
VXLAN.FlowLabel, config_parse_flow_label, 0, 0
|
||||||
Tun.OneQueue, config_parse_bool, 0, offsetof(TunTap, one_queue)
|
Tun.OneQueue, config_parse_bool, 0, offsetof(TunTap, one_queue)
|
||||||
Tun.MultiQueue, config_parse_bool, 0, offsetof(TunTap, multi_queue)
|
Tun.MultiQueue, config_parse_bool, 0, offsetof(TunTap, multi_queue)
|
||||||
Tun.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info)
|
Tun.PacketInfo, config_parse_bool, 0, offsetof(TunTap, packet_info)
|
||||||
|
@ -157,6 +157,10 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli
|
|||||||
return log_netdev_error_errno(netdev, r, "Could not append IFLA_VXLAN_PORT_RANGE attribute: %m");
|
return log_netdev_error_errno(netdev, r, "Could not append IFLA_VXLAN_PORT_RANGE attribute: %m");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_LABEL, htobe32(v->flow_label));
|
||||||
|
if (r < 0)
|
||||||
|
return log_netdev_error_errno(netdev, r, "Could not append IFLA_VXLAN_LABEL attribute: %m");
|
||||||
|
|
||||||
if (v->group_policy) {
|
if (v->group_policy) {
|
||||||
r = sd_netlink_message_append_flag(m, IFLA_VXLAN_GBP);
|
r = sd_netlink_message_append_flag(m, IFLA_VXLAN_GBP);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
@ -297,6 +301,42 @@ int config_parse_destination_port(const char *unit,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int config_parse_flow_label(const char *unit,
|
||||||
|
const char *filename,
|
||||||
|
unsigned line,
|
||||||
|
const char *section,
|
||||||
|
unsigned section_line,
|
||||||
|
const char *lvalue,
|
||||||
|
int ltype,
|
||||||
|
const char *rvalue,
|
||||||
|
void *data,
|
||||||
|
void *userdata) {
|
||||||
|
VxLan *v = userdata;
|
||||||
|
unsigned f;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
assert(filename);
|
||||||
|
assert(lvalue);
|
||||||
|
assert(rvalue);
|
||||||
|
assert(data);
|
||||||
|
|
||||||
|
r = safe_atou(rvalue, &f);
|
||||||
|
if (r < 0) {
|
||||||
|
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse VXLAN flow label '%s'.", rvalue);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (f & ~VXLAN_FLOW_LABEL_MAX_MASK) {
|
||||||
|
log_syntax(unit, LOG_ERR, filename, line, r,
|
||||||
|
"VXLAN flow label '%s' not valid. Flow label range should be [0-1048575].", rvalue);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
v->flow_label = f;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int netdev_vxlan_verify(NetDev *netdev, const char *filename) {
|
static int netdev_vxlan_verify(NetDev *netdev, const char *filename) {
|
||||||
VxLan *v = VXLAN(netdev);
|
VxLan *v = VXLAN(netdev);
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@ typedef struct VxLan VxLan;
|
|||||||
#include "netdev/netdev.h"
|
#include "netdev/netdev.h"
|
||||||
|
|
||||||
#define VXLAN_VID_MAX (1u << 24) - 1
|
#define VXLAN_VID_MAX (1u << 24) - 1
|
||||||
|
#define VXLAN_FLOW_LABEL_MAX_MASK 0xFFFFFU
|
||||||
|
|
||||||
struct VxLan {
|
struct VxLan {
|
||||||
NetDev meta;
|
NetDev meta;
|
||||||
@ -40,6 +41,7 @@ struct VxLan {
|
|||||||
unsigned tos;
|
unsigned tos;
|
||||||
unsigned ttl;
|
unsigned ttl;
|
||||||
unsigned max_fdb;
|
unsigned max_fdb;
|
||||||
|
unsigned flow_label;
|
||||||
|
|
||||||
uint16_t dest_port;
|
uint16_t dest_port;
|
||||||
|
|
||||||
@ -94,3 +96,14 @@ int config_parse_destination_port(const char *unit,
|
|||||||
const char *rvalue,
|
const char *rvalue,
|
||||||
void *data,
|
void *data,
|
||||||
void *userdata);
|
void *userdata);
|
||||||
|
|
||||||
|
int config_parse_flow_label(const char *unit,
|
||||||
|
const char *filename,
|
||||||
|
unsigned line,
|
||||||
|
const char *section,
|
||||||
|
unsigned section_line,
|
||||||
|
const char *lvalue,
|
||||||
|
int ltype,
|
||||||
|
const char *rvalue,
|
||||||
|
void *data,
|
||||||
|
void *userdata);
|
||||||
|
Loading…
Reference in New Issue
Block a user