Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ff095ec authored by Eli Cohen's avatar Eli Cohen Committed by Roland Dreier
Browse files

IB/mlx4: Add IPoIB checksum offload support 



ConnectX devices support checksum generation and verification of TCP
and UDP packets for UD IPoIB messages.  This patch checks if the HCA
supports this and sets the IB_DEVICE_UD_IP_CSUM capability flag if it
does.  It implements support for handling the IB_SEND_IP_CSUM send
flag and setting the csum_ok field in receive work completions.

Signed-off-by: default avatarEli Cohen <eli@mellanox.co.il>
Signed-off-by: default avatarAli Ayub <ali@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 6046136c

drivers/infiniband/hw/mlx4/cq.c

+16 −0
Original line number Diff line number Diff line
@@ -297,6 +297,20 @@ static void mlx4_ib_handle_error_cqe(struct mlx4_err_cqe *cqe, 
	wc->vendor_err = cqe->vendor_err_syndrome;

}



static int mlx4_ib_ipoib_csum_ok(__be32 status, __be16 checksum)

{

	return ((status & cpu_to_be32(MLX4_CQE_IPOIB_STATUS_IPV4	|

				      MLX4_CQE_IPOIB_STATUS_IPV4F	|

				      MLX4_CQE_IPOIB_STATUS_IPV4OPT	|

				      MLX4_CQE_IPOIB_STATUS_IPV6	|

				      MLX4_CQE_IPOIB_STATUS_IPOK)) ==

		cpu_to_be32(MLX4_CQE_IPOIB_STATUS_IPV4	|

			    MLX4_CQE_IPOIB_STATUS_IPOK))		&&

		(status & cpu_to_be32(MLX4_CQE_IPOIB_STATUS_UDP	|

				      MLX4_CQE_IPOIB_STATUS_TCP))	&&

		checksum == cpu_to_be16(0xffff);

}



static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,

			    struct mlx4_ib_qp **cur_qp,

			    struct ib_wc *wc)
@@ -434,6 +448,8 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, 
		wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f;

		wc->wc_flags	  |= g_mlpath_rqpn & 0x80000000 ? IB_WC_GRH : 0;

		wc->pkey_index     = be32_to_cpu(cqe->immed_rss_invalid) & 0x7f;

		wc->csum_ok	   = mlx4_ib_ipoib_csum_ok(cqe->ipoib_status,

							   cqe->checksum);

	}



	return 0;

drivers/infiniband/hw/mlx4/main.c

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ static int mlx4_ib_query_device(struct ib_device *ibdev, 
		props->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;

	if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_UD_AV_PORT)

		props->device_cap_flags |= IB_DEVICE_UD_AV_PORT_ENFORCE;

	if (dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_IPOIB_CSUM)

		props->device_cap_flags |= IB_DEVICE_UD_IP_CSUM;



	props->vendor_id	   = be32_to_cpup((__be32 *) (out_mad->data + 36)) &

		0xffffff;

drivers/infiniband/hw/mlx4/qp.c

+3 −0
Original line number Diff line number Diff line
@@ -1436,6 +1436,9 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
			 cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE) : 0) |

			(wr->send_flags & IB_SEND_SOLICITED ?

			 cpu_to_be32(MLX4_WQE_CTRL_SOLICITED) : 0) |

			((wr->send_flags & IB_SEND_IP_CSUM) ?

			 cpu_to_be32(MLX4_WQE_CTRL_IP_CSUM |

				     MLX4_WQE_CTRL_TCP_UDP_CSUM) : 0) |

			qp->sq_signal_bits;



		if (wr->opcode == IB_WR_SEND_WITH_IMM ||

drivers/net/mlx4/fw.c

+4 −0
Original line number Diff line number Diff line
@@ -696,6 +696,10 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param) 
	/* Check port for UD address vector: */

	*(inbox + INIT_HCA_FLAGS_OFFSET / 4) |= cpu_to_be32(1);



	/* Enable IPoIB checksumming if we can: */

	if (dev->caps.flags & MLX4_DEV_CAP_FLAG_IPOIB_CSUM)

		*(inbox + INIT_HCA_FLAGS_OFFSET / 4) |= cpu_to_be32(1 << 3);



	/* QPC/EEC/CQC/EQC/RDMARC attributes */



	MLX4_PUT(inbox, param->qpc_base,      INIT_HCA_QPC_BASE_OFFSET);

include/linux/mlx4/cq.h

+12 −2
Original line number Diff line number Diff line
@@ -45,11 +45,11 @@ struct mlx4_cqe { 
	u8			sl;

	u8			reserved1;

	__be16			rlid;

	u32			reserved2;

	__be32			ipoib_status;

	__be32			byte_cnt;

	__be16			wqe_index;

	__be16			checksum;

	u8			reserved3[3];

	u8			reserved2[3];

	u8			owner_sr_opcode;

};
@@ -85,6 +85,16 @@ enum { 
	MLX4_CQE_SYNDROME_REMOTE_ABORTED_ERR		= 0x22,

};



enum {

	MLX4_CQE_IPOIB_STATUS_IPV4			= 1 << 22,

	MLX4_CQE_IPOIB_STATUS_IPV4F			= 1 << 23,

	MLX4_CQE_IPOIB_STATUS_IPV6			= 1 << 24,

	MLX4_CQE_IPOIB_STATUS_IPV4OPT			= 1 << 25,

	MLX4_CQE_IPOIB_STATUS_TCP			= 1 << 26,

	MLX4_CQE_IPOIB_STATUS_UDP			= 1 << 27,

	MLX4_CQE_IPOIB_STATUS_IPOK			= 1 << 28,

};



static inline void mlx4_cq_arm(struct mlx4_cq *cq, u32 cmd,

			       void __iomem *uar_page,

			       spinlock_t *doorbell_lock)