Commit c8cd0989 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller

net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM

These netif flags are unnecessary convolutions. It is more
straightforward to just use NETIF_F_HW_CSUM, NETIF_F_IP_CSUM,
and NETIF_F_IPV6_CSUM directly.

This patch also:
    - Cleans up can_checksum_protocol
    - Simplifies netdev_intersect_features
Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a188222b
...@@ -3128,7 +3128,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev, ...@@ -3128,7 +3128,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
net_dev->features |= (efx->type->offload_features | NETIF_F_SG | net_dev->features |= (efx->type->offload_features | NETIF_F_SG |
NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_HIGHDMA | NETIF_F_TSO |
NETIF_F_RXCSUM); NETIF_F_RXCSUM);
if (efx->type->offload_features & NETIF_F_V6_CSUM) if (efx->type->offload_features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM))
net_dev->features |= NETIF_F_TSO6; net_dev->features |= NETIF_F_TSO6;
/* Mask for features that also apply to VLAN devices */ /* Mask for features that also apply to VLAN devices */
net_dev->vlan_features |= (NETIF_F_HW_CSUM | NETIF_F_SG | net_dev->vlan_features |= (NETIF_F_HW_CSUM | NETIF_F_SG |
......
...@@ -758,7 +758,7 @@ static struct lock_class_key macvlan_netdev_xmit_lock_key; ...@@ -758,7 +758,7 @@ static struct lock_class_key macvlan_netdev_xmit_lock_key;
static struct lock_class_key macvlan_netdev_addr_lock_key; static struct lock_class_key macvlan_netdev_addr_lock_key;
#define ALWAYS_ON_FEATURES \ #define ALWAYS_ON_FEATURES \
(NETIF_F_SG | NETIF_F_GEN_CSUM | NETIF_F_GSO_SOFTWARE | NETIF_F_LLTX | \ (NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_GSO_SOFTWARE | NETIF_F_LLTX | \
NETIF_F_GSO_ROBUST) NETIF_F_GSO_ROBUST)
#define MACVLAN_FEATURES \ #define MACVLAN_FEATURES \
......
...@@ -621,7 +621,7 @@ static inline netdev_features_t vlan_features_check(const struct sk_buff *skb, ...@@ -621,7 +621,7 @@ static inline netdev_features_t vlan_features_check(const struct sk_buff *skb,
NETIF_F_SG | NETIF_F_SG |
NETIF_F_HIGHDMA | NETIF_F_HIGHDMA |
NETIF_F_FRAGLIST | NETIF_F_FRAGLIST |
NETIF_F_GEN_CSUM | NETIF_F_HW_CSUM |
NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_TX |
NETIF_F_HW_VLAN_STAG_TX); NETIF_F_HW_VLAN_STAG_TX);
......
...@@ -146,15 +146,12 @@ enum { ...@@ -146,15 +146,12 @@ enum {
#define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN | \ #define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN | \
NETIF_F_TSO6 | NETIF_F_UFO) NETIF_F_TSO6 | NETIF_F_UFO)
#define NETIF_F_GEN_CSUM NETIF_F_HW_CSUM /* List of IP checksum features. Note that NETIF_F_ HW_CSUM should not be
#define NETIF_F_V4_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IP_CSUM)
#define NETIF_F_V6_CSUM (NETIF_F_GEN_CSUM | NETIF_F_IPV6_CSUM)
/* List of IP checksum features. Note that NETIF_HW_CSUM should not be
* set in features when NETIF_F_IP_CSUM or NETIF_F_IPV6_CSUM are set-- * set in features when NETIF_F_IP_CSUM or NETIF_F_IPV6_CSUM are set--
* this would be contradictory * this would be contradictory
*/ */
#define NETIF_F_CSUM_MASK (NETIF_F_V4_CSUM | NETIF_F_V6_CSUM) #define NETIF_F_CSUM_MASK (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \
NETIF_F_HW_CSUM)
#define NETIF_F_ALL_TSO (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN) #define NETIF_F_ALL_TSO (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
......
...@@ -3691,13 +3691,24 @@ __be16 skb_network_protocol(struct sk_buff *skb, int *depth); ...@@ -3691,13 +3691,24 @@ __be16 skb_network_protocol(struct sk_buff *skb, int *depth);
static inline bool can_checksum_protocol(netdev_features_t features, static inline bool can_checksum_protocol(netdev_features_t features,
__be16 protocol) __be16 protocol)
{ {
return ((features & NETIF_F_GEN_CSUM) || if (protocol == htons(ETH_P_FCOE))
((features & NETIF_F_V4_CSUM) && return !!(features & NETIF_F_FCOE_CRC);
protocol == htons(ETH_P_IP)) ||
((features & NETIF_F_V6_CSUM) && /* Assume this is an IP checksum (not SCTP CRC) */
protocol == htons(ETH_P_IPV6)) ||
((features & NETIF_F_FCOE_CRC) && if (features & NETIF_F_HW_CSUM) {
protocol == htons(ETH_P_FCOE))); /* Can checksum everything */
return true;
}
switch (protocol) {
case htons(ETH_P_IP):
return !!(features & NETIF_F_IP_CSUM);
case htons(ETH_P_IPV6):
return !!(features & NETIF_F_IPV6_CSUM);
default:
return false;
}
} }
#ifdef CONFIG_BUG #ifdef CONFIG_BUG
...@@ -3762,15 +3773,14 @@ void linkwatch_run_queue(void); ...@@ -3762,15 +3773,14 @@ void linkwatch_run_queue(void);
static inline netdev_features_t netdev_intersect_features(netdev_features_t f1, static inline netdev_features_t netdev_intersect_features(netdev_features_t f1,
netdev_features_t f2) netdev_features_t f2)
{ {
if (f1 & NETIF_F_GEN_CSUM) if ((f1 ^ f2) & NETIF_F_HW_CSUM) {
f1 |= (NETIF_F_CSUM_MASK & ~NETIF_F_GEN_CSUM); if (f1 & NETIF_F_HW_CSUM)
if (f2 & NETIF_F_GEN_CSUM) f1 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
f2 |= (NETIF_F_CSUM_MASK & ~NETIF_F_GEN_CSUM); else
f1 &= f2; f2 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
if (f1 & NETIF_F_GEN_CSUM) }
f1 &= ~(NETIF_F_CSUM_MASK & ~NETIF_F_GEN_CSUM);
return f1; return f1 & f2;
} }
static inline netdev_features_t netdev_get_wanted_features( static inline netdev_features_t netdev_get_wanted_features(
......
...@@ -6467,9 +6467,9 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, ...@@ -6467,9 +6467,9 @@ static netdev_features_t netdev_fix_features(struct net_device *dev,
/* UFO needs SG and checksumming */ /* UFO needs SG and checksumming */
if (features & NETIF_F_UFO) { if (features & NETIF_F_UFO) {
/* maybe split UFO into V4 and V6? */ /* maybe split UFO into V4 and V6? */
if (!((features & NETIF_F_GEN_CSUM) || if (!(features & NETIF_F_HW_CSUM) &&
(features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM)) ((features & (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)) !=
== (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))) { (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM))) {
netdev_dbg(dev, netdev_dbg(dev,
"Dropping NETIF_F_UFO since no checksum offload features.\n"); "Dropping NETIF_F_UFO since no checksum offload features.\n");
features &= ~NETIF_F_UFO; features &= ~NETIF_F_UFO;
...@@ -7571,7 +7571,7 @@ static int dev_cpu_callback(struct notifier_block *nfb, ...@@ -7571,7 +7571,7 @@ static int dev_cpu_callback(struct notifier_block *nfb,
netdev_features_t netdev_increment_features(netdev_features_t all, netdev_features_t netdev_increment_features(netdev_features_t all,
netdev_features_t one, netdev_features_t mask) netdev_features_t one, netdev_features_t mask)
{ {
if (mask & NETIF_F_GEN_CSUM) if (mask & NETIF_F_HW_CSUM)
mask |= NETIF_F_CSUM_MASK; mask |= NETIF_F_CSUM_MASK;
mask |= NETIF_F_VLAN_CHALLENGED; mask |= NETIF_F_VLAN_CHALLENGED;
...@@ -7579,8 +7579,8 @@ netdev_features_t netdev_increment_features(netdev_features_t all, ...@@ -7579,8 +7579,8 @@ netdev_features_t netdev_increment_features(netdev_features_t all,
all &= one | ~NETIF_F_ALL_FOR_ALL; all &= one | ~NETIF_F_ALL_FOR_ALL;
/* If one device supports hw checksumming, set for all. */ /* If one device supports hw checksumming, set for all. */
if (all & NETIF_F_GEN_CSUM) if (all & NETIF_F_HW_CSUM)
all &= ~(NETIF_F_CSUM_MASK & ~NETIF_F_GEN_CSUM); all &= ~(NETIF_F_CSUM_MASK & ~NETIF_F_HW_CSUM);
return all; return all;
} }
......
...@@ -2898,7 +2898,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, ...@@ -2898,7 +2898,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
if (!(pkt_dev->flags & F_UDPCSUM)) { if (!(pkt_dev->flags & F_UDPCSUM)) {
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
} else if (odev->features & NETIF_F_V4_CSUM) { } else if (odev->features & (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM)) {
skb->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL;
skb->csum = 0; skb->csum = 0;
udp4_hwcsum(skb, iph->saddr, iph->daddr); udp4_hwcsum(skb, iph->saddr, iph->daddr);
...@@ -3032,7 +3032,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev, ...@@ -3032,7 +3032,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
if (!(pkt_dev->flags & F_UDPCSUM)) { if (!(pkt_dev->flags & F_UDPCSUM)) {
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
} else if (odev->features & NETIF_F_V6_CSUM) { } else if (odev->features & (NETIF_F_HW_CSUM | NETIF_F_IPV6_CSUM)) {
skb->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL;
skb->csum_start = skb_transport_header(skb) - skb->head; skb->csum_start = skb_transport_header(skb) - skb->head;
skb->csum_offset = offsetof(struct udphdr, check); skb->csum_offset = offsetof(struct udphdr, check);
......
...@@ -911,7 +911,7 @@ static int __ip_append_data(struct sock *sk, ...@@ -911,7 +911,7 @@ static int __ip_append_data(struct sock *sk,
*/ */
if (transhdrlen && if (transhdrlen &&
length + fragheaderlen <= mtu && length + fragheaderlen <= mtu &&
rt->dst.dev->features & NETIF_F_V4_CSUM && rt->dst.dev->features & (NETIF_F_HW_CSUM | NETIF_F_IP_CSUM) &&
!(flags & MSG_MORE) && !(flags & MSG_MORE) &&
!exthdrlen) !exthdrlen)
csummode = CHECKSUM_PARTIAL; csummode = CHECKSUM_PARTIAL;
......
...@@ -132,7 +132,8 @@ static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb, ...@@ -132,7 +132,8 @@ static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb,
if (skb->ip_summed != CHECKSUM_PARTIAL) { if (skb->ip_summed != CHECKSUM_PARTIAL) {
if (!(rt->rt_flags & RTCF_LOCAL) && if (!(rt->rt_flags & RTCF_LOCAL) &&
(!skb->dev || skb->dev->features & NETIF_F_V4_CSUM)) { (!skb->dev || skb->dev->features &
(NETIF_F_IP_CSUM | NETIF_F_HW_CSUM))) {
skb->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL;
skb->csum_start = skb_headroom(skb) + skb->csum_start = skb_headroom(skb) +
skb_network_offset(skb) + skb_network_offset(skb) +
......
...@@ -772,7 +772,8 @@ void udp_set_csum(bool nocheck, struct sk_buff *skb, ...@@ -772,7 +772,8 @@ void udp_set_csum(bool nocheck, struct sk_buff *skb,
else if (skb_is_gso(skb)) else if (skb_is_gso(skb))
uh->check = ~udp_v4_check(len, saddr, daddr, 0); uh->check = ~udp_v4_check(len, saddr, daddr, 0);
else if (skb_dst(skb) && skb_dst(skb)->dev && else if (skb_dst(skb) && skb_dst(skb)->dev &&
(skb_dst(skb)->dev->features & NETIF_F_V4_CSUM)) { (skb_dst(skb)->dev->features &
(NETIF_F_IP_CSUM | NETIF_F_HW_CSUM))) {
BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL); BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
......
...@@ -60,8 +60,9 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, ...@@ -60,8 +60,9 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,
/* Try to offload checksum if possible */ /* Try to offload checksum if possible */
offload_csum = !!(need_csum && offload_csum = !!(need_csum &&
(skb->dev->features & ((skb->dev->features & NETIF_F_HW_CSUM) ||
(is_ipv6 ? NETIF_F_V6_CSUM : NETIF_F_V4_CSUM))); (skb->dev->features & (is_ipv6 ?
NETIF_F_IPV6_CSUM : NETIF_F_IP_CSUM))));
/* segment inner packet. */ /* segment inner packet. */
enc_features = skb->dev->hw_enc_features & features; enc_features = skb->dev->hw_enc_features & features;
......
...@@ -1322,7 +1322,7 @@ static int __ip6_append_data(struct sock *sk, ...@@ -1322,7 +1322,7 @@ static int __ip6_append_data(struct sock *sk,
headersize == sizeof(struct ipv6hdr) && headersize == sizeof(struct ipv6hdr) &&
length < mtu - headersize && length < mtu - headersize &&
!(flags & MSG_MORE) && !(flags & MSG_MORE) &&
rt->dst.dev->features & NETIF_F_V6_CSUM) rt->dst.dev->features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM))
csummode = CHECKSUM_PARTIAL; csummode = CHECKSUM_PARTIAL;
if (sk->sk_type == SOCK_DGRAM || sk->sk_type == SOCK_RAW) { if (sk->sk_type == SOCK_DGRAM || sk->sk_type == SOCK_RAW) {
......
...@@ -136,7 +136,8 @@ static void nf_nat_ipv6_csum_recalc(struct sk_buff *skb, ...@@ -136,7 +136,8 @@ static void nf_nat_ipv6_csum_recalc(struct sk_buff *skb,
if (skb->ip_summed != CHECKSUM_PARTIAL) { if (skb->ip_summed != CHECKSUM_PARTIAL) {
if (!(rt->rt6i_flags & RTF_LOCAL) && if (!(rt->rt6i_flags & RTF_LOCAL) &&
(!skb->dev || skb->dev->features & NETIF_F_V6_CSUM)) { (!skb->dev || skb->dev->features &
(NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM))) {
skb->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL;
skb->csum_start = skb_headroom(skb) + skb->csum_start = skb_headroom(skb) +
skb_network_offset(skb) + skb_network_offset(skb) +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment