From: Or Gerlitz <ogerlitz@mellanox.com>
To: Tom Herbert <tom@herbertland.com>
Cc: <davem@davemloft.net>, <netdev@vger.kernel.org>,
<kernel-team@fb.com>, <dwmw2@infradead.org>
Subject: Re: [PATCH RFC 3/3] mlx4: Call skb_csum_offload_check to check offloadability
Date: Wed, 7 Oct 2015 18:41:58 +0300 [thread overview]
Message-ID: <56153D46.2080606@mellanox.com> (raw)
In-Reply-To: <1444088364-2839440-4-git-send-email-tom@herbertland.com>
On 10/6/2015 2:39 AM, Tom Herbert wrote:
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> index 494e776..f364ffd 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
> @@ -702,6 +702,14 @@ static void mlx4_bf_copy(void __iomem *dst, const void *src,
> __iowrite64_copy(dst, src, bytecnt / 8);
> }
>
> +static const struct skb_csum_offl_spec csum_offl_spec = {
> + .ipv4_okay = 1,
> + .ipv6_okay = 1,
> + .encap_okay = 1,
> + .tcp_okay = 1,
> + .udp_okay = 1,
> +};
> +
> netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
> {
> struct skb_shared_info *shinfo = skb_shinfo(skb);
> @@ -727,6 +735,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
> bool stop_queue;
> bool inline_ok;
> u32 ring_cons;
> + struct skb_csum_offl_params offl_params;
>
> if (!priv->port_up)
> goto tx_drop;
> @@ -853,8 +862,9 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
> /* Prepare ctrl segement apart opcode+ownership, which depends on
> * whether LSO is used */
> tx_desc->ctrl.srcrb_flags = priv->ctrl_flags;
> - if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
> - if (!skb->encapsulation)
> + if (skb_csum_offload_chk(skb, &csum_offl_spec,
> + &offl_params, true)) {
> + if (!offl_params.encapped_csum)
> tx_desc->ctrl.srcrb_flags |= cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM |
> MLX4_WQE_CTRL_TCP_UDP_CSUM);
> else
> @@ -912,9 +922,9 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
> build_inline_wqe(tx_desc, skb, shinfo, real_size, &vlan_tag,
> tx_ind, fragptr);
>
> - if (skb->encapsulation) {
> - struct iphdr *ipv4 = (struct iphdr *)skb_inner_network_header(skb);
> - if (ipv4->protocol == IPPROTO_TCP || ipv4->protocol == IPPROTO_UDP)
> + if (!offl_params.encapped_csum) {
> + if (offl_params.ip_proto == IPPROTO_TCP ||
> + offl_params.ip_proto == IPPROTO_UDP)
> op_own |= cpu_to_be32(MLX4_WQE_CTRL_IIP | MLX4_WQE_CTRL_ILP);
> else
> op_own |= cpu_to_be32(MLX4_WQE_CTRL_IIP);
> -- 2.4.6
few quick comments
not all mlx4 devices support offloading checksum for tunneled traffic,
only ConnectX3-pro -- this translates for the mlx4 EN driver
logic that determines that on startup, e.g only when
mdev->dev->caps.tunnel_offload_mode == MLX4_TUNNEL_OFFLOAD_MODE_VXLAN
we set hw_enc_features and friends -- in that respect, I wasn't sure if
it's okay to blindly set .encap_oka = 1 here.
Another constraint, is that when the device does support (say) TCP TX
checksum offload for the inner packet they don't support UDP
checksum offload for the outer packet.
next prev parent reply other threads:[~2015-10-07 15:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-05 23:39 [PATCH RFC 0/3] net: Add driver helper function to determine if checksum is offloadable Tom Herbert
2015-10-05 23:39 ` [PATCH RFC 1/3] net: Add skb_inner_transport_offset function Tom Herbert
2015-10-05 23:39 ` [PATCH RFC 2/3] net: Add driver helper function to determine checksum offloadability Tom Herbert
2015-10-06 3:52 ` Alexander Duyck
2015-10-06 16:31 ` Tom Herbert
2015-10-05 23:39 ` [PATCH RFC 3/3] mlx4: Call skb_csum_offload_check to check offloadability Tom Herbert
2015-10-06 4:03 ` Alexander Duyck
2015-10-06 16:22 ` Tom Herbert
2015-10-06 16:54 ` Alexander Duyck
2015-10-07 15:41 ` Or Gerlitz [this message]
2015-10-07 18:07 ` Tom Herbert
2015-10-08 21:39 ` Or Gerlitz
2015-10-06 10:51 ` [PATCH RFC 0/3] net: Add driver helper function to determine if checksum is offloadable David Woodhouse
2015-10-08 15:09 ` David Woodhouse
2015-10-08 15:48 ` Tom Herbert
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=56153D46.2080606@mellanox.com \
--to=ogerlitz@mellanox.com \
--cc=davem@davemloft.net \
--cc=dwmw2@infradead.org \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
--cc=tom@herbertland.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.