From: Davide Caratti <dcaratti@redhat.com> To: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org, linux-sctp@vger.kernel.org, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Subject: [RFC PATCH net-next 4/5] net: more accurate checksumming in validate_xmit_skb Date: Mon, 23 Jan 2017 17:52:45 +0100 [thread overview] Message-ID: <330fd75699b574ca577b884f0c57a763a33ef538.1485177252.git.dcaratti@redhat.com> (raw) In-Reply-To: <cover.1485177252.git.dcaratti@redhat.com> introduce skb_csum_hwoffload_help and use it as a replacement for skb_checksum_help in validate_xmit_skb, to compute checksum using crc32c or 2-complement Internet Checksum (or leave the packet unchanged and let the NIC do the checksum), depending on netdev checksum offloading capabilities and on presence of IPPROTO_SCTP as protocol number in IPv4/IPv6 header. Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: Davide Caratti <dcaratti@redhat.com> --- net/core/dev.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 45cee84..f8cb3ba 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -140,6 +140,7 @@ #include <linux/hrtimer.h> #include <linux/netfilter_ingress.h> #include <linux/crash_dump.h> +#include <linux/sctp.h> #include "net-sysfs.h" @@ -2960,6 +2961,54 @@ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, return skb; } +static int skb_csum_hwoffload_help(struct sk_buff *skb, + netdev_features_t features) +{ + bool encap = skb->encapsulation; + unsigned int offset = 0; + __be16 protocol; + + if (likely((features & (NETIF_F_SCTP_CRC | NETIF_F_CSUM_MASK)) == + (NETIF_F_SCTP_CRC | NETIF_F_CSUM_MASK))) + return 0; + + if (skb->csum_offset != offsetof(struct sctphdr, checksum)) + goto inet_csum; + + if (encap) { + protocol = skb->inner_protocol; + if (skb->inner_protocol_type == ENCAP_TYPE_IPPROTO) + switch (protocol) { + case IPPROTO_IPV6: + protocol = ntohs(ETH_P_IPV6); + break; + case IPPROTO_IP: + protocol = ntohs(ETH_P_IP); + break; + default: + goto inet_csum; + } + } else { + protocol = vlan_get_protocol(skb); + } + switch (protocol) { + case ntohs(ETH_P_IP): + if ((encap ? inner_ip_hdr(skb) : ip_hdr(skb))->protocol == + IPPROTO_SCTP) + goto sctp_csum; + break; + case ntohs(ETH_P_IPV6): + if (ipv6_find_hdr(skb, &offset, IPPROTO_SCTP, NULL, NULL) == + IPPROTO_SCTP) + goto sctp_csum; + break; + } +inet_csum: + return !(features & NETIF_F_CSUM_MASK) ? skb_checksum_help(skb) : 0; +sctp_csum: + return !(features & NETIF_F_SCTP_CRC) ? skb_sctp_csum_help(skb) : 0; +} + static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev) { netdev_features_t features; @@ -2995,8 +3044,7 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device else skb_set_transport_header(skb, skb_checksum_start_offset(skb)); - if (!(features & NETIF_F_CSUM_MASK) && - skb_checksum_help(skb)) + if (skb_csum_hwoffload_help(skb, features)) goto out_kfree_skb; } } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Davide Caratti <dcaratti@redhat.com> To: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org, linux-sctp@vger.kernel.org, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Subject: [RFC PATCH net-next 4/5] net: more accurate checksumming in validate_xmit_skb Date: Mon, 23 Jan 2017 16:52:45 +0000 [thread overview] Message-ID: <330fd75699b574ca577b884f0c57a763a33ef538.1485177252.git.dcaratti@redhat.com> (raw) In-Reply-To: <cover.1485177252.git.dcaratti@redhat.com> introduce skb_csum_hwoffload_help and use it as a replacement for skb_checksum_help in validate_xmit_skb, to compute checksum using crc32c or 2-complement Internet Checksum (or leave the packet unchanged and let the NIC do the checksum), depending on netdev checksum offloading capabilities and on presence of IPPROTO_SCTP as protocol number in IPv4/IPv6 header. Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: Davide Caratti <dcaratti@redhat.com> --- net/core/dev.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 45cee84..f8cb3ba 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -140,6 +140,7 @@ #include <linux/hrtimer.h> #include <linux/netfilter_ingress.h> #include <linux/crash_dump.h> +#include <linux/sctp.h> #include "net-sysfs.h" @@ -2960,6 +2961,54 @@ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, return skb; } +static int skb_csum_hwoffload_help(struct sk_buff *skb, + netdev_features_t features) +{ + bool encap = skb->encapsulation; + unsigned int offset = 0; + __be16 protocol; + + if (likely((features & (NETIF_F_SCTP_CRC | NETIF_F_CSUM_MASK)) = + (NETIF_F_SCTP_CRC | NETIF_F_CSUM_MASK))) + return 0; + + if (skb->csum_offset != offsetof(struct sctphdr, checksum)) + goto inet_csum; + + if (encap) { + protocol = skb->inner_protocol; + if (skb->inner_protocol_type = ENCAP_TYPE_IPPROTO) + switch (protocol) { + case IPPROTO_IPV6: + protocol = ntohs(ETH_P_IPV6); + break; + case IPPROTO_IP: + protocol = ntohs(ETH_P_IP); + break; + default: + goto inet_csum; + } + } else { + protocol = vlan_get_protocol(skb); + } + switch (protocol) { + case ntohs(ETH_P_IP): + if ((encap ? inner_ip_hdr(skb) : ip_hdr(skb))->protocol = + IPPROTO_SCTP) + goto sctp_csum; + break; + case ntohs(ETH_P_IPV6): + if (ipv6_find_hdr(skb, &offset, IPPROTO_SCTP, NULL, NULL) = + IPPROTO_SCTP) + goto sctp_csum; + break; + } +inet_csum: + return !(features & NETIF_F_CSUM_MASK) ? skb_checksum_help(skb) : 0; +sctp_csum: + return !(features & NETIF_F_SCTP_CRC) ? skb_sctp_csum_help(skb) : 0; +} + static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev) { netdev_features_t features; @@ -2995,8 +3044,7 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device else skb_set_transport_header(skb, skb_checksum_start_offset(skb)); - if (!(features & NETIF_F_CSUM_MASK) && - skb_checksum_help(skb)) + if (skb_csum_hwoffload_help(skb, features)) goto out_kfree_skb; } } -- 2.7.4
next prev parent reply other threads:[~2017-01-23 16:59 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-23 16:52 [RFC PATCH net-next 0/5] net: improve support for SCTP checksums Davide Caratti 2017-01-23 16:52 ` Davide Caratti 2017-01-23 16:52 ` [RFC PATCH net-next 1/5] skbuff: add stub to help computing crc32c on SCTP packets Davide Caratti 2017-01-23 16:52 ` Davide Caratti 2017-01-23 16:52 ` [RFC PATCH net-next 2/5] net: split skb_checksum_help Davide Caratti 2017-01-23 16:52 ` Davide Caratti 2017-01-23 20:59 ` Tom Herbert 2017-01-23 20:59 ` Tom Herbert 2017-01-24 16:35 ` David Laight 2017-01-24 16:35 ` David Laight 2017-02-02 15:07 ` Davide Caratti 2017-02-02 15:07 ` Davide Caratti 2017-02-02 16:55 ` David Laight 2017-02-02 16:55 ` David Laight 2017-02-02 18:08 ` Tom Herbert 2017-02-02 18:08 ` Tom Herbert 2017-02-27 13:39 ` Davide Caratti 2017-02-27 13:39 ` Davide Caratti 2017-02-27 15:11 ` Tom Herbert 2017-02-27 15:11 ` Tom Herbert 2017-02-28 10:31 ` Davide Caratti 2017-02-28 10:31 ` Davide Caratti 2017-02-28 10:32 ` [PATCH RFC net-next v2 1/4] skbuff: add stub to help computing crc32c on SCTP packets Davide Caratti 2017-02-28 10:32 ` Davide Caratti 2017-02-28 10:32 ` [PATCH RFC net-next v2 2/4] net: introduce skb_sctp_csum_help Davide Caratti 2017-02-28 10:32 ` Davide Caratti 2017-02-28 10:32 ` [PATCH RFC net-next v2 3/4] net: more accurate checksumming in validate_xmit_skb Davide Caratti 2017-02-28 10:32 ` Davide Caratti 2017-02-28 19:50 ` Tom Herbert 2017-02-28 19:50 ` Tom Herbert 2017-02-28 10:32 ` [PATCH RFC net-next v2 4/4] Documentation: update notes on checksum offloading Davide Caratti 2017-02-28 10:32 ` Davide Caratti 2017-02-28 22:46 ` [PATCH RFC net-next v2 1/4] skbuff: add stub to help computing crc32c on SCTP packets Alexander Duyck 2017-02-28 22:46 ` Alexander Duyck 2017-03-01 3:17 ` Tom Herbert 2017-03-01 3:17 ` Tom Herbert 2017-03-01 10:53 ` David Laight 2017-03-01 10:53 ` David Laight 2017-03-06 21:51 ` Davide Caratti 2017-03-06 21:51 ` Davide Caratti 2017-03-07 18:06 ` Alexander Duyck 2017-03-07 18:06 ` Alexander Duyck 2017-03-18 13:17 ` Davide Caratti 2017-03-18 13:17 ` Davide Caratti 2017-03-18 22:35 ` Tom Herbert 2017-03-18 22:35 ` Tom Herbert 2017-04-07 14:16 ` [PATCH RFC net-next v3 0/7] improve CRC32c in the forwarding path Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-04-07 14:16 ` [PATCH RFC net-next v3 1/7] skbuff: add stub to help computing crc32c on SCTP packets Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-04-07 14:16 ` [PATCH RFC net-next v3 2/7] net: introduce skb_crc32c_csum_help Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-04-07 14:16 ` [PATCH RFC net-next v3 3/7] sk_buff: remove support for csum_bad in sk_buff Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-04-07 14:16 ` [PATCH RFC net-next v3 4/7] net: use skb->csum_algo to identify packets needing crc32c Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-04-07 15:43 ` Tom Herbert 2017-04-07 15:43 ` Tom Herbert 2017-04-07 17:29 ` Davide Caratti 2017-04-07 17:29 ` Davide Caratti 2017-04-07 18:11 ` Tom Herbert 2017-04-07 18:11 ` Tom Herbert 2017-04-13 10:36 ` Davide Caratti 2017-04-13 10:36 ` Davide Caratti 2017-04-20 13:38 ` [PATCH RFC net-next v4 0/7] net: improve support for SCTP checksums Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-20 13:38 ` [PATCH RFC net-next v4 1/7] skbuff: add stub to help computing crc32c on SCTP packets Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-20 13:38 ` [PATCH RFC net-next v4 2/7] net: introduce skb_crc32c_csum_help Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-27 12:29 ` Marcelo Ricardo Leitner 2017-04-27 12:29 ` Marcelo Ricardo Leitner 2017-04-20 13:38 ` [PATCH RFC net-next v4 3/7] sk_buff: remove support for csum_bad in sk_buff Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-27 1:34 ` [sk_buff] 95510aef27: BUG:Bad_page_state_in_process kernel test robot 2017-04-27 1:34 ` kernel test robot 2017-04-29 20:21 ` [PATCH RFC net-next v4 3/7] sk_buff: remove support for csum_bad in sk_buff Tom Herbert 2017-04-29 20:21 ` Tom Herbert 2017-04-20 13:38 ` [PATCH RFC net-next v4 4/7] net: use skb->csum_not_inet to identify packets needing crc32c Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-29 20:18 ` Tom Herbert 2017-04-29 20:18 ` Tom Herbert 2017-04-20 13:38 ` [PATCH RFC net-next v4 5/7] net: more accurate checksumming in validate_xmit_skb() Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-20 13:38 ` [PATCH RFC net-next v4 6/7] openvswitch: more accurate checksumming in queue_userspace_packet() Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-20 13:38 ` [PATCH RFC net-next v4 7/7] sk_buff.h: improve description of CHECKSUM_{COMPLETE,UNNECESSARY} Davide Caratti 2017-04-20 13:38 ` Davide Caratti 2017-04-29 20:20 ` Tom Herbert 2017-04-29 20:20 ` Tom Herbert 2017-04-27 12:41 ` [PATCH RFC net-next v4 0/7] net: improve support for SCTP checksums Marcelo Ricardo Leitner 2017-04-27 12:41 ` Marcelo Ricardo Leitner 2017-04-07 14:16 ` [PATCH RFC net-next v3 5/7] net: more accurate checksumming in validate_xmit_skb() Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-04-07 14:16 ` [PATCH RFC net-next v3 6/7] openvswitch: more accurate checksumming in queue_userspace_packet() Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-04-07 14:16 ` [PATCH RFC net-next v3 7/7] sk_buff.h: improve description of CHECKSUM_{COMPLETE,UNNECESSARY} Davide Caratti 2017-04-07 14:16 ` Davide Caratti 2017-01-23 16:52 ` [RFC PATCH net-next 3/5] net: introduce skb_sctp_csum_help Davide Caratti 2017-01-23 16:52 ` Davide Caratti 2017-01-23 16:52 ` Davide Caratti [this message] 2017-01-23 16:52 ` [RFC PATCH net-next 4/5] net: more accurate checksumming in validate_xmit_skb Davide Caratti 2017-01-23 16:52 ` [RFC PATCH net-next 5/5] Documentation: add description of skb_sctp_csum_help Davide Caratti 2017-01-23 16:52 ` Davide Caratti
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=330fd75699b574ca577b884f0c57a763a33ef538.1485177252.git.dcaratti@redhat.com \ --to=dcaratti@redhat.com \ --cc=davem@davemloft.net \ --cc=linux-sctp@vger.kernel.org \ --cc=marcelo.leitner@gmail.com \ --cc=netdev@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.