From: Xin Long <lucien.xin@gmail.com>
To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
davem@davemloft.net, Jakub Kicinski <kuba@kernel.org>,
Alexander Duyck <alexander.duyck@gmail.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
intel-wired-lan@lists.osuosl.org
Subject: [PATCH net-next 5/6] net: ixgbe: use skb_csum_is_sctp instead of protocol check
Date: Sat, 16 Jan 2021 14:13:41 +0800 [thread overview]
Message-ID: <f58d50ef96eb1504f4a952cc75a19d21dcf85827.1610777159.git.lucien.xin@gmail.com> (raw)
In-Reply-To: <7b4d84fe32d588884fcd75c2f6f84eb8cd052622.1610777159.git.lucien.xin@gmail.com>
In-Reply-To: <cover.1610777159.git.lucien.xin@gmail.com>
Using skb_csum_is_sctp is a easier way to validate it's a SCTP CRC
checksum offload packet, and yet it also makes ixgbe support SCTP
CRC checksum offload for UDP and GRE encapped packets, just as it
does in igb driver.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6cbbe09..2973c54 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8040,15 +8040,6 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
return 1;
}
-static inline bool ixgbe_ipv6_csum_is_sctp(struct sk_buff *skb)
-{
- unsigned int offset = 0;
-
- ipv6_find_hdr(skb, &offset, IPPROTO_SCTP, NULL, NULL);
-
- return offset == skb_checksum_start_offset(skb);
-}
-
static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
struct ixgbe_tx_buffer *first,
struct ixgbe_ipsec_tx_data *itd)
@@ -8074,10 +8065,7 @@ static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
break;
case offsetof(struct sctphdr, checksum):
/* validate that this is actually an SCTP request */
- if (((first->protocol == htons(ETH_P_IP)) &&
- (ip_hdr(skb)->protocol == IPPROTO_SCTP)) ||
- ((first->protocol == htons(ETH_P_IPV6)) &&
- ixgbe_ipv6_csum_is_sctp(skb))) {
+ if (skb_csum_is_sctp(skb)) {
type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_SCTP;
break;
}
--
2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: Xin Long <lucien.xin@gmail.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH net-next 5/6] net: ixgbe: use skb_csum_is_sctp instead of protocol check
Date: Sat, 16 Jan 2021 14:13:41 +0800 [thread overview]
Message-ID: <f58d50ef96eb1504f4a952cc75a19d21dcf85827.1610777159.git.lucien.xin@gmail.com> (raw)
In-Reply-To: <7b4d84fe32d588884fcd75c2f6f84eb8cd052622.1610777159.git.lucien.xin@gmail.com>
Using skb_csum_is_sctp is a easier way to validate it's a SCTP CRC
checksum offload packet, and yet it also makes ixgbe support SCTP
CRC checksum offload for UDP and GRE encapped packets, just as it
does in igb driver.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6cbbe09..2973c54 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8040,15 +8040,6 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
return 1;
}
-static inline bool ixgbe_ipv6_csum_is_sctp(struct sk_buff *skb)
-{
- unsigned int offset = 0;
-
- ipv6_find_hdr(skb, &offset, IPPROTO_SCTP, NULL, NULL);
-
- return offset == skb_checksum_start_offset(skb);
-}
-
static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
struct ixgbe_tx_buffer *first,
struct ixgbe_ipsec_tx_data *itd)
@@ -8074,10 +8065,7 @@ static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
break;
case offsetof(struct sctphdr, checksum):
/* validate that this is actually an SCTP request */
- if (((first->protocol == htons(ETH_P_IP)) &&
- (ip_hdr(skb)->protocol == IPPROTO_SCTP)) ||
- ((first->protocol == htons(ETH_P_IPV6)) &&
- ixgbe_ipv6_csum_is_sctp(skb))) {
+ if (skb_csum_is_sctp(skb)) {
type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_SCTP;
break;
}
--
2.1.0
next prev parent reply other threads:[~2021-01-16 6:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-16 6:13 [PATCH net-next 0/6] net: support SCTP CRC csum offload for tunneling packets in some drivers Xin Long
2021-01-16 6:13 ` [Intel-wired-lan] " Xin Long
2021-01-16 6:13 ` [PATCH net-next 1/6] net: add inline function skb_csum_is_sctp Xin Long
2021-01-16 6:13 ` [Intel-wired-lan] " Xin Long
2021-01-16 6:13 ` [PATCH net-next 2/6] net: igb: use skb_csum_is_sctp instead of protocol check Xin Long
2021-01-16 6:13 ` [Intel-wired-lan] " Xin Long
2021-01-16 6:13 ` [PATCH net-next 3/6] net: igbvf: " Xin Long
2021-01-16 6:13 ` [Intel-wired-lan] " Xin Long
2021-01-16 6:13 ` [PATCH net-next 4/6] net: igc: " Xin Long
2021-01-16 6:13 ` [Intel-wired-lan] " Xin Long
2021-01-16 6:13 ` Xin Long [this message]
2021-01-16 6:13 ` [Intel-wired-lan] [PATCH net-next 5/6] net: ixgbe: " Xin Long
2021-01-16 6:13 ` [PATCH net-next 6/6] net: ixgbevf: " Xin Long
2021-01-16 6:13 ` [Intel-wired-lan] " Xin Long
2021-01-19 22:25 ` Alexander Duyck
2021-01-19 22:25 ` [Intel-wired-lan] " Alexander Duyck
2021-01-19 22:25 ` [PATCH net-next 5/6] net: ixgbe: " Alexander Duyck
2021-01-19 22:25 ` [Intel-wired-lan] " Alexander Duyck
2021-01-19 22:24 ` [PATCH net-next 4/6] net: igc: " Alexander Duyck
2021-01-19 22:24 ` [Intel-wired-lan] " Alexander Duyck
2021-01-19 22:24 ` [PATCH net-next 3/6] net: igbvf: " Alexander Duyck
2021-01-19 22:24 ` [Intel-wired-lan] " Alexander Duyck
2021-01-19 22:24 ` [PATCH net-next 2/6] net: igb: " Alexander Duyck
2021-01-19 22:24 ` [Intel-wired-lan] " Alexander Duyck
2021-01-19 22:23 ` [PATCH net-next 1/6] net: add inline function skb_csum_is_sctp Alexander Duyck
2021-01-19 22:23 ` [Intel-wired-lan] " Alexander Duyck
2021-01-19 23:35 ` Shannon Nelson
2021-01-19 23:35 ` [Intel-wired-lan] " Shannon Nelson
2021-01-19 23:40 ` [PATCH net-next 0/6] net: support SCTP CRC csum offload for tunneling packets in some drivers patchwork-bot+netdevbpf
2021-01-19 23:40 ` [Intel-wired-lan] " patchwork-bot+netdevbpf
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=f58d50ef96eb1504f4a952cc75a19d21dcf85827.1610777159.git.lucien.xin@gmail.com \
--to=lucien.xin@gmail.com \
--cc=alexander.duyck@gmail.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
/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: link
Be 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.