* [PATCH v2 net-next 0/2] IPv6 NFC
@ 2016-02-05 11:12 Edward Cree
2016-02-05 11:16 ` [PATCH net-next 1/2] ethtool: add IPv6 to the NFC API Edward Cree
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Edward Cree @ 2016-02-05 11:12 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-net-drivers, Ben Hutchings
This series adds support for steering IPv6 flows using the ethtool NFC
interface, and implements it for sfc devices.
Tested using an in-development patch to the ethtool utility.
Edward Cree (2):
ethtool: add IPv6 to the NFC API
sfc: implement IPv6 NFC (and IPV4_USER_FLOW)
drivers/net/ethernet/sfc/ethtool.c | 184 +++++++++++++++++++++++++++++++++++++
include/uapi/linux/ethtool.h | 70 ++++++++++++--
2 files changed, 248 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH net-next 1/2] ethtool: add IPv6 to the NFC API 2016-02-05 11:12 [PATCH v2 net-next 0/2] IPv6 NFC Edward Cree @ 2016-02-05 11:16 ` Edward Cree 2016-02-05 16:56 ` Ben Hutchings 2016-02-05 11:16 ` [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) Edward Cree 2016-02-11 12:16 ` [PATCH v2 net-next 0/2] IPv6 NFC David Miller 2 siblings, 1 reply; 8+ messages in thread From: Edward Cree @ 2016-02-05 11:16 UTC (permalink / raw) To: David Miller; +Cc: netdev, linux-net-drivers, Ben Hutchings Signed-off-by: Edward Cree <ecree@solarflare.com> --- include/uapi/linux/ethtool.h | 70 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 57fa390..7faaf36 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -748,6 +748,56 @@ struct ethtool_usrip4_spec { __u8 proto; }; +/** + * struct ethtool_tcpip6_spec - flow specification for TCP/IPv6 etc. + * @ip6src: Source host + * @ip6dst: Destination host + * @psrc: Source port + * @pdst: Destination port + * @tclass: Traffic Class + * + * This can be used to specify a TCP/IPv6, UDP/IPv6 or SCTP/IPv6 flow. + */ +struct ethtool_tcpip6_spec { + __be32 ip6src[4]; + __be32 ip6dst[4]; + __be16 psrc; + __be16 pdst; + __u8 tclass; +}; + +/** + * struct ethtool_ah_espip6_spec - flow specification for IPsec/IPv6 + * @ip6src: Source host + * @ip6dst: Destination host + * @spi: Security parameters index + * @tclass: Traffic Class + * + * This can be used to specify an IPsec transport or tunnel over IPv6. + */ +struct ethtool_ah_espip6_spec { + __be32 ip6src[4]; + __be32 ip6dst[4]; + __be32 spi; + __u8 tclass; +}; + +/** + * struct ethtool_usrip6_spec - general flow specification for IPv6 + * @ip6src: Source host + * @ip6dst: Destination host + * @l4_4_bytes: First 4 bytes of transport (layer 4) header + * @tclass: Traffic Class + * @l4_proto: Transport protocol number (nexthdr after any Extension Headers) + */ +struct ethtool_usrip6_spec { + __be32 ip6src[4]; + __be32 ip6dst[4]; + __be32 l4_4_bytes; + __u8 tclass; + __u8 l4_proto; +}; + union ethtool_flow_union { struct ethtool_tcpip4_spec tcp_ip4_spec; struct ethtool_tcpip4_spec udp_ip4_spec; @@ -755,6 +805,12 @@ union ethtool_flow_union { struct ethtool_ah_espip4_spec ah_ip4_spec; struct ethtool_ah_espip4_spec esp_ip4_spec; struct ethtool_usrip4_spec usr_ip4_spec; + struct ethtool_tcpip6_spec tcp_ip6_spec; + struct ethtool_tcpip6_spec udp_ip6_spec; + struct ethtool_tcpip6_spec sctp_ip6_spec; + struct ethtool_ah_espip6_spec ah_ip6_spec; + struct ethtool_ah_espip6_spec esp_ip6_spec; + struct ethtool_usrip6_spec usr_ip6_spec; struct ethhdr ether_spec; __u8 hdata[52]; }; @@ -1367,15 +1423,17 @@ enum ethtool_sfeatures_retval_bits { #define UDP_V4_FLOW 0x02 /* hash or spec (udp_ip4_spec) */ #define SCTP_V4_FLOW 0x03 /* hash or spec (sctp_ip4_spec) */ #define AH_ESP_V4_FLOW 0x04 /* hash only */ -#define TCP_V6_FLOW 0x05 /* hash only */ -#define UDP_V6_FLOW 0x06 /* hash only */ -#define SCTP_V6_FLOW 0x07 /* hash only */ +#define TCP_V6_FLOW 0x05 /* hash or spec (tcp_ip6_spec; nfc only) */ +#define UDP_V6_FLOW 0x06 /* hash or spec (udp_ip6_spec; nfc only) */ +#define SCTP_V6_FLOW 0x07 /* hash or spec (sctp_ip6_spec; nfc only) */ #define AH_ESP_V6_FLOW 0x08 /* hash only */ #define AH_V4_FLOW 0x09 /* hash or spec (ah_ip4_spec) */ #define ESP_V4_FLOW 0x0a /* hash or spec (esp_ip4_spec) */ -#define AH_V6_FLOW 0x0b /* hash only */ -#define ESP_V6_FLOW 0x0c /* hash only */ -#define IP_USER_FLOW 0x0d /* spec only (usr_ip4_spec) */ +#define AH_V6_FLOW 0x0b /* hash or spec (ah_ip6_spec; nfc only) */ +#define ESP_V6_FLOW 0x0c /* hash or spec (esp_ip6_spec; nfc only) */ +#define IPV4_USER_FLOW 0x0d /* spec only (usr_ip4_spec) */ +#define IP_USER_FLOW IPV4_USER_FLOW +#define IPV6_USER_FLOW 0x0e /* spec only (usr_ip6_spec; nfc only) */ #define IPV4_FLOW 0x10 /* hash only */ #define IPV6_FLOW 0x11 /* hash only */ #define ETHER_FLOW 0x12 /* spec only (ether_spec) */ ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 1/2] ethtool: add IPv6 to the NFC API 2016-02-05 11:16 ` [PATCH net-next 1/2] ethtool: add IPv6 to the NFC API Edward Cree @ 2016-02-05 16:56 ` Ben Hutchings 0 siblings, 0 replies; 8+ messages in thread From: Ben Hutchings @ 2016-02-05 16:56 UTC (permalink / raw) To: Edward Cree, David Miller; +Cc: netdev, linux-net-drivers [-- Attachment #1: Type: text/plain, Size: 4163 bytes --] On Fri, 2016-02-05 at 11:16 +0000, Edward Cree wrote: > Signed-off-by: Edward Cree <ecree@solarflare.com> Reviewed-by: Ben Hutchings <ben@decadent.org.uk> > --- > include/uapi/linux/ethtool.h | 70 ++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 64 insertions(+), 6 deletions(-) > > diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h > index 57fa390..7faaf36 100644 > --- a/include/uapi/linux/ethtool.h > +++ b/include/uapi/linux/ethtool.h > @@ -748,6 +748,56 @@ struct ethtool_usrip4_spec { > __u8 proto; > }; > > +/** > + * struct ethtool_tcpip6_spec - flow specification for TCP/IPv6 etc. > + * @ip6src: Source host > + * @ip6dst: Destination host > + * @psrc: Source port > + * @pdst: Destination port > + * @tclass: Traffic Class > + * > + * This can be used to specify a TCP/IPv6, UDP/IPv6 or SCTP/IPv6 flow. > + */ > +struct ethtool_tcpip6_spec { > + __be32 ip6src[4]; > + __be32 ip6dst[4]; > + __be16 psrc; > + __be16 pdst; > + __u8 tclass; > +}; > + > +/** > + * struct ethtool_ah_espip6_spec - flow specification for IPsec/IPv6 > + * @ip6src: Source host > + * @ip6dst: Destination host > + * @spi: Security parameters index > + * @tclass: Traffic Class > + * > + * This can be used to specify an IPsec transport or tunnel over IPv6. > + */ > +struct ethtool_ah_espip6_spec { > + __be32 ip6src[4]; > + __be32 ip6dst[4]; > + __be32 spi; > + __u8 tclass; > +}; > + > +/** > + * struct ethtool_usrip6_spec - general flow specification for IPv6 > + * @ip6src: Source host > + * @ip6dst: Destination host > + * @l4_4_bytes: First 4 bytes of transport (layer 4) header > + * @tclass: Traffic Class > + * @l4_proto: Transport protocol number (nexthdr after any Extension Headers) > + */ > +struct ethtool_usrip6_spec { > + __be32 ip6src[4]; > + __be32 ip6dst[4]; > + __be32 l4_4_bytes; > + __u8 tclass; > + __u8 l4_proto; > +}; > + > union ethtool_flow_union { > struct ethtool_tcpip4_spec tcp_ip4_spec; > struct ethtool_tcpip4_spec udp_ip4_spec; > @@ -755,6 +805,12 @@ union ethtool_flow_union { > struct ethtool_ah_espip4_spec ah_ip4_spec; > struct ethtool_ah_espip4_spec esp_ip4_spec; > struct ethtool_usrip4_spec usr_ip4_spec; > + struct ethtool_tcpip6_spec tcp_ip6_spec; > + struct ethtool_tcpip6_spec udp_ip6_spec; > + struct ethtool_tcpip6_spec sctp_ip6_spec; > + struct ethtool_ah_espip6_spec ah_ip6_spec; > + struct ethtool_ah_espip6_spec esp_ip6_spec; > + struct ethtool_usrip6_spec usr_ip6_spec; > struct ethhdr ether_spec; > __u8 hdata[52]; > }; > @@ -1367,15 +1423,17 @@ enum ethtool_sfeatures_retval_bits { > #define UDP_V4_FLOW 0x02 /* hash or spec (udp_ip4_spec) */ > #define SCTP_V4_FLOW 0x03 /* hash or spec (sctp_ip4_spec) */ > #define AH_ESP_V4_FLOW 0x04 /* hash only */ > -#define TCP_V6_FLOW 0x05 /* hash only */ > -#define UDP_V6_FLOW 0x06 /* hash only */ > -#define SCTP_V6_FLOW 0x07 /* hash only */ > +#define TCP_V6_FLOW 0x05 /* hash or spec (tcp_ip6_spec; nfc only) */ > +#define UDP_V6_FLOW 0x06 /* hash or spec (udp_ip6_spec; nfc only) */ > +#define SCTP_V6_FLOW 0x07 /* hash or spec (sctp_ip6_spec; nfc only) */ > #define AH_ESP_V6_FLOW 0x08 /* hash only */ > #define AH_V4_FLOW 0x09 /* hash or spec (ah_ip4_spec) */ > #define ESP_V4_FLOW 0x0a /* hash or spec (esp_ip4_spec) */ > -#define AH_V6_FLOW 0x0b /* hash only */ > -#define ESP_V6_FLOW 0x0c /* hash only */ > -#define IP_USER_FLOW 0x0d /* spec only (usr_ip4_spec) */ > +#define AH_V6_FLOW 0x0b /* hash or spec (ah_ip6_spec; nfc only) */ > +#define ESP_V6_FLOW 0x0c /* hash or spec (esp_ip6_spec; nfc only) */ > +#define IPV4_USER_FLOW 0x0d /* spec only (usr_ip4_spec) */ > +#define IP_USER_FLOW IPV4_USER_FLOW > +#define IPV6_USER_FLOW 0x0e /* spec only (usr_ip6_spec; nfc only) */ > #define IPV4_FLOW 0x10 /* hash only */ > #define IPV6_FLOW 0x11 /* hash only */ > #define ETHER_FLOW 0x12 /* spec only (ether_spec) */ > -- Ben Hutchings It is a miracle that curiosity survives formal education. - Albert Einstein [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 811 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) 2016-02-05 11:12 [PATCH v2 net-next 0/2] IPv6 NFC Edward Cree 2016-02-05 11:16 ` [PATCH net-next 1/2] ethtool: add IPv6 to the NFC API Edward Cree @ 2016-02-05 11:16 ` Edward Cree 2016-02-05 16:57 ` Ben Hutchings 2016-02-11 12:16 ` [PATCH v2 net-next 0/2] IPv6 NFC David Miller 2 siblings, 1 reply; 8+ messages in thread From: Edward Cree @ 2016-02-05 11:16 UTC (permalink / raw) To: David Miller; +Cc: netdev, linux-net-drivers, Ben Hutchings Signed-off-by: Edward Cree <ecree@solarflare.com> --- drivers/net/ethernet/sfc/ethtool.c | 184 +++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c index 0347976..445ccdb 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c @@ -783,14 +783,26 @@ static int efx_ethtool_reset(struct net_device *net_dev, u32 *flags) static const u8 mac_addr_ig_mask[ETH_ALEN] __aligned(2) = {0x01, 0, 0, 0, 0, 0}; #define IP4_ADDR_FULL_MASK ((__force __be32)~0) +#define IP_PROTO_FULL_MASK 0xFF #define PORT_FULL_MASK ((__force __be16)~0) #define ETHER_TYPE_FULL_MASK ((__force __be16)~0) +static inline void ip6_fill_mask(__be32 *mask) +{ + mask[0] = mask[1] = mask[2] = mask[3] = ~(__be32)0; +} + static int efx_ethtool_get_class_rule(struct efx_nic *efx, struct ethtool_rx_flow_spec *rule) { struct ethtool_tcpip4_spec *ip_entry = &rule->h_u.tcp_ip4_spec; struct ethtool_tcpip4_spec *ip_mask = &rule->m_u.tcp_ip4_spec; + struct ethtool_usrip4_spec *uip_entry = &rule->h_u.usr_ip4_spec; + struct ethtool_usrip4_spec *uip_mask = &rule->m_u.usr_ip4_spec; + struct ethtool_tcpip6_spec *ip6_entry = &rule->h_u.tcp_ip6_spec; + struct ethtool_tcpip6_spec *ip6_mask = &rule->m_u.tcp_ip6_spec; + struct ethtool_usrip6_spec *uip6_entry = &rule->h_u.usr_ip6_spec; + struct ethtool_usrip6_spec *uip6_mask = &rule->m_u.usr_ip6_spec; struct ethhdr *mac_entry = &rule->h_u.ether_spec; struct ethhdr *mac_mask = &rule->m_u.ether_spec; struct efx_filter_spec spec; @@ -833,6 +845,35 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx, ip_entry->psrc = spec.rem_port; ip_mask->psrc = PORT_FULL_MASK; } + } else if ((spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE) && + spec.ether_type == htons(ETH_P_IPV6) && + (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) && + (spec.ip_proto == IPPROTO_TCP || spec.ip_proto == IPPROTO_UDP) && + !(spec.match_flags & + ~(EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_OUTER_VID | + EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_REM_HOST | + EFX_FILTER_MATCH_IP_PROTO | + EFX_FILTER_MATCH_LOC_PORT | EFX_FILTER_MATCH_REM_PORT))) { + rule->flow_type = ((spec.ip_proto == IPPROTO_TCP) ? + TCP_V6_FLOW : UDP_V6_FLOW); + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { + memcpy(ip6_entry->ip6dst, spec.loc_host, + sizeof(ip6_entry->ip6dst)); + ip6_fill_mask(ip6_mask->ip6dst); + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { + memcpy(ip6_entry->ip6src, spec.rem_host, + sizeof(ip6_entry->ip6src)); + ip6_fill_mask(ip6_mask->ip6src); + } + if (spec.match_flags & EFX_FILTER_MATCH_LOC_PORT) { + ip6_entry->pdst = spec.loc_port; + ip6_mask->pdst = PORT_FULL_MASK; + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_PORT) { + ip6_entry->psrc = spec.rem_port; + ip6_mask->psrc = PORT_FULL_MASK; + } } else if (!(spec.match_flags & ~(EFX_FILTER_MATCH_LOC_MAC | EFX_FILTER_MATCH_LOC_MAC_IG | EFX_FILTER_MATCH_REM_MAC | EFX_FILTER_MATCH_ETHER_TYPE | @@ -855,6 +896,47 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx, mac_entry->h_proto = spec.ether_type; mac_mask->h_proto = ETHER_TYPE_FULL_MASK; } + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && + spec.ether_type == htons(ETH_P_IP) && + !(spec.match_flags & + ~(EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_OUTER_VID | + EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_REM_HOST | + EFX_FILTER_MATCH_IP_PROTO))) { + rule->flow_type = IPV4_USER_FLOW; + uip_entry->ip_ver = ETH_RX_NFC_IP4; + if (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) { + uip_mask->proto = IP_PROTO_FULL_MASK; + uip_entry->proto = spec.ip_proto; + } + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { + uip_entry->ip4dst = spec.loc_host[0]; + uip_mask->ip4dst = IP4_ADDR_FULL_MASK; + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { + uip_entry->ip4src = spec.rem_host[0]; + uip_mask->ip4src = IP4_ADDR_FULL_MASK; + } + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && + spec.ether_type == htons(ETH_P_IPV6) && + !(spec.match_flags & + ~(EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_OUTER_VID | + EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_REM_HOST | + EFX_FILTER_MATCH_IP_PROTO))) { + rule->flow_type = IPV6_USER_FLOW; + if (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) { + uip6_mask->l4_proto = IP_PROTO_FULL_MASK; + uip6_entry->l4_proto = spec.ip_proto; + } + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { + memcpy(uip6_entry->ip6dst, spec.loc_host, + sizeof(uip6_entry->ip6dst)); + ip6_fill_mask(uip6_mask->ip6dst); + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { + memcpy(uip6_entry->ip6src, spec.rem_host, + sizeof(uip6_entry->ip6src)); + ip6_fill_mask(uip6_mask->ip6src); + } } else { /* The above should handle all filters that we insert */ WARN_ON(1); @@ -946,11 +1028,27 @@ efx_ethtool_get_rxnfc(struct net_device *net_dev, } } +static inline bool ip6_mask_is_full(__be32 mask[4]) +{ + return !~(mask[0] & mask[1] & mask[2] & mask[3]); +} + +static inline bool ip6_mask_is_empty(__be32 mask[4]) +{ + return !(mask[0] | mask[1] | mask[2] | mask[3]); +} + static int efx_ethtool_set_class_rule(struct efx_nic *efx, struct ethtool_rx_flow_spec *rule) { struct ethtool_tcpip4_spec *ip_entry = &rule->h_u.tcp_ip4_spec; struct ethtool_tcpip4_spec *ip_mask = &rule->m_u.tcp_ip4_spec; + struct ethtool_usrip4_spec *uip_entry = &rule->h_u.usr_ip4_spec; + struct ethtool_usrip4_spec *uip_mask = &rule->m_u.usr_ip4_spec; + struct ethtool_tcpip6_spec *ip6_entry = &rule->h_u.tcp_ip6_spec; + struct ethtool_tcpip6_spec *ip6_mask = &rule->m_u.tcp_ip6_spec; + struct ethtool_usrip6_spec *uip6_entry = &rule->h_u.usr_ip6_spec; + struct ethtool_usrip6_spec *uip6_mask = &rule->m_u.usr_ip6_spec; struct ethhdr *mac_entry = &rule->h_u.ether_spec; struct ethhdr *mac_mask = &rule->m_u.ether_spec; struct efx_filter_spec spec; @@ -1012,6 +1110,92 @@ static int efx_ethtool_set_class_rule(struct efx_nic *efx, return -EINVAL; break; + case TCP_V6_FLOW: + case UDP_V6_FLOW: + spec.match_flags = (EFX_FILTER_MATCH_ETHER_TYPE | + EFX_FILTER_MATCH_IP_PROTO); + spec.ether_type = htons(ETH_P_IPV6); + spec.ip_proto = ((rule->flow_type & ~FLOW_EXT) == TCP_V6_FLOW ? + IPPROTO_TCP : IPPROTO_UDP); + if (!ip6_mask_is_empty(ip6_mask->ip6dst)) { + if (!ip6_mask_is_full(ip6_mask->ip6dst)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; + memcpy(spec.loc_host, ip6_entry->ip6dst, sizeof(spec.loc_host)); + } + if (!ip6_mask_is_empty(ip6_mask->ip6src)) { + if (!ip6_mask_is_full(ip6_mask->ip6src)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; + memcpy(spec.rem_host, ip6_entry->ip6src, sizeof(spec.rem_host)); + } + if (ip6_mask->pdst) { + if (ip6_mask->pdst != PORT_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_PORT; + spec.loc_port = ip6_entry->pdst; + } + if (ip6_mask->psrc) { + if (ip6_mask->psrc != PORT_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_PORT; + spec.rem_port = ip6_entry->psrc; + } + if (ip6_mask->tclass) + return -EINVAL; + break; + + case IPV4_USER_FLOW: + if (uip_mask->l4_4_bytes || uip_mask->tos || uip_mask->ip_ver || + uip_entry->ip_ver != ETH_RX_NFC_IP4) + return -EINVAL; + spec.match_flags = EFX_FILTER_MATCH_ETHER_TYPE; + spec.ether_type = htons(ETH_P_IP); + if (uip_mask->ip4dst) { + if (uip_mask->ip4dst != IP4_ADDR_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; + spec.loc_host[0] = uip_entry->ip4dst; + } + if (uip_mask->ip4src) { + if (uip_mask->ip4src != IP4_ADDR_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; + spec.rem_host[0] = uip_entry->ip4src; + } + if (uip_mask->proto) { + if (uip_mask->proto != IP_PROTO_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_IP_PROTO; + spec.ip_proto = uip_entry->proto; + } + break; + + case IPV6_USER_FLOW: + if (uip6_mask->l4_4_bytes || uip6_mask->tclass) + return -EINVAL; + spec.match_flags = EFX_FILTER_MATCH_ETHER_TYPE; + spec.ether_type = htons(ETH_P_IPV6); + if (!ip6_mask_is_empty(uip6_mask->ip6dst)) { + if (!ip6_mask_is_full(uip6_mask->ip6dst)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; + memcpy(spec.loc_host, uip6_entry->ip6dst, sizeof(spec.loc_host)); + } + if (!ip6_mask_is_empty(uip6_mask->ip6src)) { + if (!ip6_mask_is_full(uip6_mask->ip6src)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; + memcpy(spec.rem_host, uip6_entry->ip6src, sizeof(spec.rem_host)); + } + if (uip6_mask->l4_proto) { + if (uip6_mask->l4_proto != IP_PROTO_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_IP_PROTO; + spec.ip_proto = uip6_entry->l4_proto; + } + break; + case ETHER_FLOW: if (!is_zero_ether_addr(mac_mask->h_dest)) { if (ether_addr_equal(mac_mask->h_dest, ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) 2016-02-05 11:16 ` [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) Edward Cree @ 2016-02-05 16:57 ` Ben Hutchings 0 siblings, 0 replies; 8+ messages in thread From: Ben Hutchings @ 2016-02-05 16:57 UTC (permalink / raw) To: Edward Cree, David Miller; +Cc: netdev, linux-net-drivers [-- Attachment #1: Type: text/plain, Size: 10373 bytes --] On Fri, 2016-02-05 at 11:16 +0000, Edward Cree wrote: > Signed-off-by: Edward Cree <ecree@solarflare.com> Reviewed-by: Ben Hutchings <ben@decadent.org.uk> > --- > drivers/net/ethernet/sfc/ethtool.c | 184 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 184 insertions(+) > > diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c > index 0347976..445ccdb 100644 > --- a/drivers/net/ethernet/sfc/ethtool.c > +++ b/drivers/net/ethernet/sfc/ethtool.c > @@ -783,14 +783,26 @@ static int efx_ethtool_reset(struct net_device *net_dev, u32 *flags) > static const u8 mac_addr_ig_mask[ETH_ALEN] __aligned(2) = {0x01, 0, 0, 0, 0, 0}; > > #define IP4_ADDR_FULL_MASK ((__force __be32)~0) > +#define IP_PROTO_FULL_MASK 0xFF > #define PORT_FULL_MASK ((__force __be16)~0) > #define ETHER_TYPE_FULL_MASK ((__force __be16)~0) > > +static inline void ip6_fill_mask(__be32 *mask) > +{ > + mask[0] = mask[1] = mask[2] = mask[3] = ~(__be32)0; > +} > + > static int efx_ethtool_get_class_rule(struct efx_nic *efx, > struct ethtool_rx_flow_spec *rule) > { > struct ethtool_tcpip4_spec *ip_entry = &rule->h_u.tcp_ip4_spec; > struct ethtool_tcpip4_spec *ip_mask = &rule->m_u.tcp_ip4_spec; > + struct ethtool_usrip4_spec *uip_entry = &rule->h_u.usr_ip4_spec; > + struct ethtool_usrip4_spec *uip_mask = &rule->m_u.usr_ip4_spec; > + struct ethtool_tcpip6_spec *ip6_entry = &rule->h_u.tcp_ip6_spec; > + struct ethtool_tcpip6_spec *ip6_mask = &rule->m_u.tcp_ip6_spec; > + struct ethtool_usrip6_spec *uip6_entry = &rule->h_u.usr_ip6_spec; > + struct ethtool_usrip6_spec *uip6_mask = &rule->m_u.usr_ip6_spec; > struct ethhdr *mac_entry = &rule->h_u.ether_spec; > struct ethhdr *mac_mask = &rule->m_u.ether_spec; > struct efx_filter_spec spec; > @@ -833,6 +845,35 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx, > ip_entry->psrc = spec.rem_port; > ip_mask->psrc = PORT_FULL_MASK; > } > + } else if ((spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE) && > + spec.ether_type == htons(ETH_P_IPV6) && > + (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) && > + (spec.ip_proto == IPPROTO_TCP || spec.ip_proto == IPPROTO_UDP) && > + !(spec.match_flags & > + ~(EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_OUTER_VID | > + EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_REM_HOST | > + EFX_FILTER_MATCH_IP_PROTO | > + EFX_FILTER_MATCH_LOC_PORT | EFX_FILTER_MATCH_REM_PORT))) { > + rule->flow_type = ((spec.ip_proto == IPPROTO_TCP) ? > + TCP_V6_FLOW : UDP_V6_FLOW); > + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { > + memcpy(ip6_entry->ip6dst, spec.loc_host, > + sizeof(ip6_entry->ip6dst)); > + ip6_fill_mask(ip6_mask->ip6dst); > + } > + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { > + memcpy(ip6_entry->ip6src, spec.rem_host, > + sizeof(ip6_entry->ip6src)); > + ip6_fill_mask(ip6_mask->ip6src); > + } > + if (spec.match_flags & EFX_FILTER_MATCH_LOC_PORT) { > + ip6_entry->pdst = spec.loc_port; > + ip6_mask->pdst = PORT_FULL_MASK; > + } > + if (spec.match_flags & EFX_FILTER_MATCH_REM_PORT) { > + ip6_entry->psrc = spec.rem_port; > + ip6_mask->psrc = PORT_FULL_MASK; > + } > } else if (!(spec.match_flags & > ~(EFX_FILTER_MATCH_LOC_MAC | EFX_FILTER_MATCH_LOC_MAC_IG | > EFX_FILTER_MATCH_REM_MAC | EFX_FILTER_MATCH_ETHER_TYPE | > @@ -855,6 +896,47 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx, > mac_entry->h_proto = spec.ether_type; > mac_mask->h_proto = ETHER_TYPE_FULL_MASK; > } > + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && > + spec.ether_type == htons(ETH_P_IP) && > + !(spec.match_flags & > + ~(EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_OUTER_VID | > + EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_REM_HOST | > + EFX_FILTER_MATCH_IP_PROTO))) { > + rule->flow_type = IPV4_USER_FLOW; > + uip_entry->ip_ver = ETH_RX_NFC_IP4; > + if (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) { > + uip_mask->proto = IP_PROTO_FULL_MASK; > + uip_entry->proto = spec.ip_proto; > + } > + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { > + uip_entry->ip4dst = spec.loc_host[0]; > + uip_mask->ip4dst = IP4_ADDR_FULL_MASK; > + } > + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { > + uip_entry->ip4src = spec.rem_host[0]; > + uip_mask->ip4src = IP4_ADDR_FULL_MASK; > + } > + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && > + spec.ether_type == htons(ETH_P_IPV6) && > + !(spec.match_flags & > + ~(EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_OUTER_VID | > + EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_REM_HOST | > + EFX_FILTER_MATCH_IP_PROTO))) { > + rule->flow_type = IPV6_USER_FLOW; > + if (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) { > + uip6_mask->l4_proto = IP_PROTO_FULL_MASK; > + uip6_entry->l4_proto = spec.ip_proto; > + } > + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { > + memcpy(uip6_entry->ip6dst, spec.loc_host, > + sizeof(uip6_entry->ip6dst)); > + ip6_fill_mask(uip6_mask->ip6dst); > + } > + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { > + memcpy(uip6_entry->ip6src, spec.rem_host, > + sizeof(uip6_entry->ip6src)); > + ip6_fill_mask(uip6_mask->ip6src); > + } > } else { > /* The above should handle all filters that we insert */ > WARN_ON(1); > @@ -946,11 +1028,27 @@ efx_ethtool_get_rxnfc(struct net_device *net_dev, > } > } > > +static inline bool ip6_mask_is_full(__be32 mask[4]) > +{ > + return !~(mask[0] & mask[1] & mask[2] & mask[3]); > +} > + > +static inline bool ip6_mask_is_empty(__be32 mask[4]) > +{ > + return !(mask[0] | mask[1] | mask[2] | mask[3]); > +} > + > static int efx_ethtool_set_class_rule(struct efx_nic *efx, > struct ethtool_rx_flow_spec *rule) > { > struct ethtool_tcpip4_spec *ip_entry = &rule->h_u.tcp_ip4_spec; > struct ethtool_tcpip4_spec *ip_mask = &rule->m_u.tcp_ip4_spec; > + struct ethtool_usrip4_spec *uip_entry = &rule->h_u.usr_ip4_spec; > + struct ethtool_usrip4_spec *uip_mask = &rule->m_u.usr_ip4_spec; > + struct ethtool_tcpip6_spec *ip6_entry = &rule->h_u.tcp_ip6_spec; > + struct ethtool_tcpip6_spec *ip6_mask = &rule->m_u.tcp_ip6_spec; > + struct ethtool_usrip6_spec *uip6_entry = &rule->h_u.usr_ip6_spec; > + struct ethtool_usrip6_spec *uip6_mask = &rule->m_u.usr_ip6_spec; > struct ethhdr *mac_entry = &rule->h_u.ether_spec; > struct ethhdr *mac_mask = &rule->m_u.ether_spec; > struct efx_filter_spec spec; > @@ -1012,6 +1110,92 @@ static int efx_ethtool_set_class_rule(struct efx_nic *efx, > return -EINVAL; > break; > > + case TCP_V6_FLOW: > + case UDP_V6_FLOW: > + spec.match_flags = (EFX_FILTER_MATCH_ETHER_TYPE | > + EFX_FILTER_MATCH_IP_PROTO); > + spec.ether_type = htons(ETH_P_IPV6); > + spec.ip_proto = ((rule->flow_type & ~FLOW_EXT) == TCP_V6_FLOW ? > + IPPROTO_TCP : IPPROTO_UDP); > + if (!ip6_mask_is_empty(ip6_mask->ip6dst)) { > + if (!ip6_mask_is_full(ip6_mask->ip6dst)) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; > + memcpy(spec.loc_host, ip6_entry->ip6dst, sizeof(spec.loc_host)); > + } > + if (!ip6_mask_is_empty(ip6_mask->ip6src)) { > + if (!ip6_mask_is_full(ip6_mask->ip6src)) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; > + memcpy(spec.rem_host, ip6_entry->ip6src, sizeof(spec.rem_host)); > + } > + if (ip6_mask->pdst) { > + if (ip6_mask->pdst != PORT_FULL_MASK) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_LOC_PORT; > + spec.loc_port = ip6_entry->pdst; > + } > + if (ip6_mask->psrc) { > + if (ip6_mask->psrc != PORT_FULL_MASK) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_REM_PORT; > + spec.rem_port = ip6_entry->psrc; > + } > + if (ip6_mask->tclass) > + return -EINVAL; > + break; > + > + case IPV4_USER_FLOW: > + if (uip_mask->l4_4_bytes || uip_mask->tos || uip_mask->ip_ver || > + uip_entry->ip_ver != ETH_RX_NFC_IP4) > + return -EINVAL; > + spec.match_flags = EFX_FILTER_MATCH_ETHER_TYPE; > + spec.ether_type = htons(ETH_P_IP); > + if (uip_mask->ip4dst) { > + if (uip_mask->ip4dst != IP4_ADDR_FULL_MASK) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; > + spec.loc_host[0] = uip_entry->ip4dst; > + } > + if (uip_mask->ip4src) { > + if (uip_mask->ip4src != IP4_ADDR_FULL_MASK) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; > + spec.rem_host[0] = uip_entry->ip4src; > + } > + if (uip_mask->proto) { > + if (uip_mask->proto != IP_PROTO_FULL_MASK) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_IP_PROTO; > + spec.ip_proto = uip_entry->proto; > + } > + break; > + > + case IPV6_USER_FLOW: > + if (uip6_mask->l4_4_bytes || uip6_mask->tclass) > + return -EINVAL; > + spec.match_flags = EFX_FILTER_MATCH_ETHER_TYPE; > + spec.ether_type = htons(ETH_P_IPV6); > + if (!ip6_mask_is_empty(uip6_mask->ip6dst)) { > + if (!ip6_mask_is_full(uip6_mask->ip6dst)) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; > + memcpy(spec.loc_host, uip6_entry->ip6dst, sizeof(spec.loc_host)); > + } > + if (!ip6_mask_is_empty(uip6_mask->ip6src)) { > + if (!ip6_mask_is_full(uip6_mask->ip6src)) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; > + memcpy(spec.rem_host, uip6_entry->ip6src, sizeof(spec.rem_host)); > + } > + if (uip6_mask->l4_proto) { > + if (uip6_mask->l4_proto != IP_PROTO_FULL_MASK) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_IP_PROTO; > + spec.ip_proto = uip6_entry->l4_proto; > + } > + break; > + > case ETHER_FLOW: > if (!is_zero_ether_addr(mac_mask->h_dest)) { > if (ether_addr_equal(mac_mask->h_dest, -- Ben Hutchings It is a miracle that curiosity survives formal education. - Albert Einstein [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 811 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 net-next 0/2] IPv6 NFC 2016-02-05 11:12 [PATCH v2 net-next 0/2] IPv6 NFC Edward Cree 2016-02-05 11:16 ` [PATCH net-next 1/2] ethtool: add IPv6 to the NFC API Edward Cree 2016-02-05 11:16 ` [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) Edward Cree @ 2016-02-11 12:16 ` David Miller 2 siblings, 0 replies; 8+ messages in thread From: David Miller @ 2016-02-11 12:16 UTC (permalink / raw) To: ecree; +Cc: netdev, linux-net-drivers, ben From: Edward Cree <ecree@solarflare.com> Date: Fri, 5 Feb 2016 11:12:33 +0000 > This series adds support for steering IPv6 flows using the ethtool NFC > interface, and implements it for sfc devices. > Tested using an in-development patch to the ethtool utility. Series applied, thanks. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 0/2] IPv6 NFC @ 2016-02-02 18:47 Edward Cree 2016-02-02 18:49 ` [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) Edward Cree 0 siblings, 1 reply; 8+ messages in thread From: Edward Cree @ 2016-02-02 18:47 UTC (permalink / raw) To: David Miller; +Cc: netdev, linux-net-drivers, Ben Hutchings This series adds support for steering IPv6 flows using the ethtool NFC interface, and implements it for sfc devices. Tested using an in-development patch to the ethtool utility. Edward Cree (2): ethtool: add IPv6 to the NFC API sfc: implement IPv6 NFC (and IPV4_USER_FLOW) drivers/net/ethernet/sfc/ethtool.c | 176 +++++++++++++++++++++++++++++++++++++ include/uapi/linux/ethtool.h | 70 +++++++++++++-- 2 files changed, 240 insertions(+), 6 deletions(-) ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) 2016-02-02 18:47 [PATCH " Edward Cree @ 2016-02-02 18:49 ` Edward Cree 2016-02-05 1:47 ` Ben Hutchings 0 siblings, 1 reply; 8+ messages in thread From: Edward Cree @ 2016-02-02 18:49 UTC (permalink / raw) To: David Miller; +Cc: netdev, linux-net-drivers, Ben Hutchings Signed-off-by: Edward Cree <ecree@solarflare.com> --- drivers/net/ethernet/sfc/ethtool.c | 176 +++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c index 0347976..49fac36 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c @@ -783,14 +783,26 @@ static int efx_ethtool_reset(struct net_device *net_dev, u32 *flags) static const u8 mac_addr_ig_mask[ETH_ALEN] __aligned(2) = {0x01, 0, 0, 0, 0, 0}; #define IP4_ADDR_FULL_MASK ((__force __be32)~0) +#define IP_PROTO_FULL_MASK 0xFF #define PORT_FULL_MASK ((__force __be16)~0) #define ETHER_TYPE_FULL_MASK ((__force __be16)~0) +static inline void ip6_fill_mask(__be32 *mask) +{ + mask[0] = mask[1] = mask[2] = mask[3] = ~(__be32)0; +} + static int efx_ethtool_get_class_rule(struct efx_nic *efx, struct ethtool_rx_flow_spec *rule) { struct ethtool_tcpip4_spec *ip_entry = &rule->h_u.tcp_ip4_spec; struct ethtool_tcpip4_spec *ip_mask = &rule->m_u.tcp_ip4_spec; + struct ethtool_usrip4_spec *uip_entry = &rule->h_u.usr_ip4_spec; + struct ethtool_usrip4_spec *uip_mask = &rule->m_u.usr_ip4_spec; + struct ethtool_tcpip6_spec *ip6_entry = &rule->h_u.tcp_ip6_spec; + struct ethtool_tcpip6_spec *ip6_mask = &rule->m_u.tcp_ip6_spec; + struct ethtool_usrip6_spec *uip6_entry = &rule->h_u.usr_ip6_spec; + struct ethtool_usrip6_spec *uip6_mask = &rule->m_u.usr_ip6_spec; struct ethhdr *mac_entry = &rule->h_u.ether_spec; struct ethhdr *mac_mask = &rule->m_u.ether_spec; struct efx_filter_spec spec; @@ -833,6 +845,35 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx, ip_entry->psrc = spec.rem_port; ip_mask->psrc = PORT_FULL_MASK; } + } else if ((spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE) && + spec.ether_type == htons(ETH_P_IPV6) && + (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) && + (spec.ip_proto == IPPROTO_TCP || spec.ip_proto == IPPROTO_UDP) && + !(spec.match_flags & + ~(EFX_FILTER_MATCH_ETHER_TYPE | EFX_FILTER_MATCH_OUTER_VID | + EFX_FILTER_MATCH_LOC_HOST | EFX_FILTER_MATCH_REM_HOST | + EFX_FILTER_MATCH_IP_PROTO | + EFX_FILTER_MATCH_LOC_PORT | EFX_FILTER_MATCH_REM_PORT))) { + rule->flow_type = ((spec.ip_proto == IPPROTO_TCP) ? + TCP_V6_FLOW : UDP_V6_FLOW); + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { + memcpy(ip6_entry->ip6dst, spec.loc_host, + sizeof(ip6_entry->ip6dst)); + ip6_fill_mask(ip6_mask->ip6dst); + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { + memcpy(ip6_entry->ip6src, spec.rem_host, + sizeof(ip6_entry->ip6src)); + ip6_fill_mask(ip6_mask->ip6src); + } + if (spec.match_flags & EFX_FILTER_MATCH_LOC_PORT) { + ip6_entry->pdst = spec.loc_port; + ip6_mask->pdst = PORT_FULL_MASK; + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_PORT) { + ip6_entry->psrc = spec.rem_port; + ip6_mask->psrc = PORT_FULL_MASK; + } } else if (!(spec.match_flags & ~(EFX_FILTER_MATCH_LOC_MAC | EFX_FILTER_MATCH_LOC_MAC_IG | EFX_FILTER_MATCH_REM_MAC | EFX_FILTER_MATCH_ETHER_TYPE | @@ -855,6 +896,39 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx, mac_entry->h_proto = spec.ether_type; mac_mask->h_proto = ETHER_TYPE_FULL_MASK; } + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && + spec.ether_type == htons(ETH_P_IP)) { + rule->flow_type = IPV4_USER_FLOW; + uip_entry->ip_ver = ETH_RX_NFC_IP4; + if (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) { + uip_mask->proto = IP_PROTO_FULL_MASK; + uip_entry->proto = spec.ip_proto; + } + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { + uip_entry->ip4dst = spec.loc_host[0]; + uip_mask->ip4dst = IP4_ADDR_FULL_MASK; + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { + uip_entry->ip4src = spec.rem_host[0]; + uip_mask->ip4src = IP4_ADDR_FULL_MASK; + } + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && + spec.ether_type == htons(ETH_P_IPV6)) { + rule->flow_type = IPV6_USER_FLOW; + if (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) { + uip6_mask->l4_proto = IP_PROTO_FULL_MASK; + uip6_entry->l4_proto = spec.ip_proto; + } + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { + memcpy(uip6_entry->ip6dst, spec.loc_host, + sizeof(uip6_entry->ip6dst)); + ip6_fill_mask(uip6_mask->ip6dst); + } + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { + memcpy(uip6_entry->ip6src, spec.rem_host, + sizeof(uip6_entry->ip6src)); + ip6_fill_mask(uip6_mask->ip6src); + } } else { /* The above should handle all filters that we insert */ WARN_ON(1); @@ -946,11 +1020,27 @@ efx_ethtool_get_rxnfc(struct net_device *net_dev, } } +static inline bool ip6_mask_is_full(__be32 mask[4]) +{ + return !~(mask[0] & mask[1] & mask[2] & mask[3]); +} + +static inline bool ip6_mask_is_empty(__be32 mask[4]) +{ + return !(mask[0] | mask[1] | mask[2] | mask[3]); +} + static int efx_ethtool_set_class_rule(struct efx_nic *efx, struct ethtool_rx_flow_spec *rule) { struct ethtool_tcpip4_spec *ip_entry = &rule->h_u.tcp_ip4_spec; struct ethtool_tcpip4_spec *ip_mask = &rule->m_u.tcp_ip4_spec; + struct ethtool_usrip4_spec *uip_entry = &rule->h_u.usr_ip4_spec; + struct ethtool_usrip4_spec *uip_mask = &rule->m_u.usr_ip4_spec; + struct ethtool_tcpip6_spec *ip6_entry = &rule->h_u.tcp_ip6_spec; + struct ethtool_tcpip6_spec *ip6_mask = &rule->m_u.tcp_ip6_spec; + struct ethtool_usrip6_spec *uip6_entry = &rule->h_u.usr_ip6_spec; + struct ethtool_usrip6_spec *uip6_mask = &rule->m_u.usr_ip6_spec; struct ethhdr *mac_entry = &rule->h_u.ether_spec; struct ethhdr *mac_mask = &rule->m_u.ether_spec; struct efx_filter_spec spec; @@ -1012,6 +1102,92 @@ static int efx_ethtool_set_class_rule(struct efx_nic *efx, return -EINVAL; break; + case TCP_V6_FLOW: + case UDP_V6_FLOW: + spec.match_flags = (EFX_FILTER_MATCH_ETHER_TYPE | + EFX_FILTER_MATCH_IP_PROTO); + spec.ether_type = htons(ETH_P_IPV6); + spec.ip_proto = ((rule->flow_type & ~FLOW_EXT) == TCP_V6_FLOW ? + IPPROTO_TCP : IPPROTO_UDP); + if (!ip6_mask_is_empty(ip6_mask->ip6dst)) { + if (!ip6_mask_is_full(ip6_mask->ip6dst)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; + memcpy(spec.loc_host, ip6_entry->ip6dst, sizeof(spec.loc_host)); + } + if (!ip6_mask_is_empty(ip6_mask->ip6src)) { + if (!ip6_mask_is_full(ip6_mask->ip6src)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; + memcpy(spec.rem_host, ip6_entry->ip6src, sizeof(spec.rem_host)); + } + if (ip6_mask->pdst) { + if (ip6_mask->pdst != PORT_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_PORT; + spec.loc_port = ip6_entry->pdst; + } + if (ip6_mask->psrc) { + if (ip6_mask->psrc != PORT_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_PORT; + spec.rem_port = ip6_entry->psrc; + } + if (ip6_mask->tos) + return -EINVAL; + break; + + case IPV4_USER_FLOW: + if (uip_mask->l4_4_bytes || uip_mask->tos || uip_mask->ip_ver || + uip_entry->ip_ver != ETH_RX_NFC_IP4) + return -EINVAL; + spec.match_flags = EFX_FILTER_MATCH_ETHER_TYPE; + spec.ether_type = htons(ETH_P_IP); + if (uip_mask->ip4dst) { + if (uip_mask->ip4dst != IP4_ADDR_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; + spec.loc_host[0] = uip_entry->ip4dst; + } + if (uip_mask->ip4src) { + if (uip_mask->ip4src != IP4_ADDR_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; + spec.rem_host[0] = uip_entry->ip4src; + } + if (uip_mask->proto) { + if (uip_mask->proto != IP_PROTO_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_IP_PROTO; + spec.ip_proto = uip_entry->proto; + } + break; + + case IPV6_USER_FLOW: + if (uip6_mask->l4_4_bytes || uip6_mask->tos) + return -EINVAL; + spec.match_flags = EFX_FILTER_MATCH_ETHER_TYPE; + spec.ether_type = htons(ETH_P_IPV6); + if (!ip6_mask_is_empty(ip6_mask->ip6dst)) { + if (!ip6_mask_is_full(uip6_mask->ip6dst)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; + memcpy(spec.loc_host, uip6_entry->ip6dst, sizeof(spec.loc_host)); + } + if (!ip6_mask_is_empty(ip6_mask->ip6src)) { + if (!ip6_mask_is_full(uip6_mask->ip6src)) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_REM_HOST; + memcpy(spec.rem_host, uip6_entry->ip6src, sizeof(spec.rem_host)); + } + if (uip6_mask->l4_proto) { + if (uip6_mask->l4_proto != IP_PROTO_FULL_MASK) + return -EINVAL; + spec.match_flags |= EFX_FILTER_MATCH_IP_PROTO; + spec.ip_proto = uip6_entry->l4_proto; + } + break; + case ETHER_FLOW: if (!is_zero_ether_addr(mac_mask->h_dest)) { if (ether_addr_equal(mac_mask->h_dest, ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) 2016-02-02 18:49 ` [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) Edward Cree @ 2016-02-05 1:47 ` Ben Hutchings 0 siblings, 0 replies; 8+ messages in thread From: Ben Hutchings @ 2016-02-05 1:47 UTC (permalink / raw) To: Edward Cree, David Miller; +Cc: netdev, linux-net-drivers [-- Attachment #1: Type: text/plain, Size: 2669 bytes --] On Tue, 2016-02-02 at 18:49 +0000, Edward Cree wrote: > Signed-off-by: Edward Cree <ecree@solarflare.com> > --- > drivers/net/ethernet/sfc/ethtool.c | 176 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 176 insertions(+) > > diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c > index 0347976..49fac36 100644 > --- a/drivers/net/ethernet/sfc/ethtool.c > +++ b/drivers/net/ethernet/sfc/ethtool.c [...] > static int efx_ethtool_get_class_rule(struct efx_nic *efx, > struct ethtool_rx_flow_spec *rule) > { [...] > @@ -855,6 +896,39 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx, > mac_entry->h_proto = spec.ether_type; > mac_mask->h_proto = ETHER_TYPE_FULL_MASK; > } > + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && > + spec.ether_type == htons(ETH_P_IP)) { Shouldn't this also check that no unhandled match flags are set? > + rule->flow_type = IPV4_USER_FLOW; > + uip_entry->ip_ver = ETH_RX_NFC_IP4; > + if (spec.match_flags & EFX_FILTER_MATCH_IP_PROTO) { > + uip_mask->proto = IP_PROTO_FULL_MASK; > + uip_entry->proto = spec.ip_proto; > + } > + if (spec.match_flags & EFX_FILTER_MATCH_LOC_HOST) { > + uip_entry->ip4dst = spec.loc_host[0]; > + uip_mask->ip4dst = IP4_ADDR_FULL_MASK; > + } > + if (spec.match_flags & EFX_FILTER_MATCH_REM_HOST) { > + uip_entry->ip4src = spec.rem_host[0]; > + uip_mask->ip4src = IP4_ADDR_FULL_MASK; > + } > + } else if (spec.match_flags & EFX_FILTER_MATCH_ETHER_TYPE && > + spec.ether_type == htons(ETH_P_IPV6)) { Same here. [...] > static int efx_ethtool_set_class_rule(struct efx_nic *efx, > struct ethtool_rx_flow_spec *rule) > { [...] > + case IPV6_USER_FLOW: > + if (uip6_mask->l4_4_bytes || uip6_mask->tos) > + return -EINVAL; > + spec.match_flags = EFX_FILTER_MATCH_ETHER_TYPE; > + spec.ether_type = htons(ETH_P_IPV6); > + if (!ip6_mask_is_empty(ip6_mask->ip6dst)) { This should use uip6_mask not ip6_mask. > + if (!ip6_mask_is_full(uip6_mask->ip6dst)) > + return -EINVAL; > + spec.match_flags |= EFX_FILTER_MATCH_LOC_HOST; > + memcpy(spec.loc_host, uip6_entry->ip6dst, sizeof(spec.loc_host)); > + } > + if (!ip6_mask_is_empty(ip6_mask->ip6src)) { [...] Same here. Ben. -- Ben Hutchings It is a miracle that curiosity survives formal education. - Albert Einstein [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 811 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-02-11 12:16 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-02-05 11:12 [PATCH v2 net-next 0/2] IPv6 NFC Edward Cree 2016-02-05 11:16 ` [PATCH net-next 1/2] ethtool: add IPv6 to the NFC API Edward Cree 2016-02-05 16:56 ` Ben Hutchings 2016-02-05 11:16 ` [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) Edward Cree 2016-02-05 16:57 ` Ben Hutchings 2016-02-11 12:16 ` [PATCH v2 net-next 0/2] IPv6 NFC David Miller -- strict thread matches above, loose matches on Subject: below -- 2016-02-02 18:47 [PATCH " Edward Cree 2016-02-02 18:49 ` [PATCH net-next 2/2] sfc: implement IPv6 NFC (and IPV4_USER_FLOW) Edward Cree 2016-02-05 1:47 ` Ben Hutchings
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).