On Tue, Oct 31, 2017 at 06:21:32PM +0000, Matan Azrad wrote:
> Volatilize all Rx/Tx HW negotiation memories to be sure no compiler
> optimization prevents either load or store commands.
>
> Fixes: c3c977bbecbd ("net/mlx4: add Tx bypassing Verbs")
> Fixes: 9f57340a8087 ("net/mlx4: restore Rx offloads")
> Fixes: 6681b845034c ("net/mlx4: add Rx bypassing Verbs")
> Fixes: 62e96ffb93ad ("net/mlx4: fix no Rx interrupts")
>
> Signed-off-by: Matan Azrad <ma...@mellanox.com>
Since this should fix all remaining concerns:
Acked-by: Adrien Mazarguil <adrien.mazarg...@6wind.com>
A few minor comments below.
> ---
> drivers/net/mlx4/mlx4_prm.h | 18 ++++++------
> drivers/net/mlx4/mlx4_rxtx.c | 67
> ++++++++++++++++++++++++--------------------
> 2 files changed, 45 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/net/mlx4/mlx4_prm.h b/drivers/net/mlx4/mlx4_prm.h
> index b0fd982..6d10b4e 100644
> --- a/drivers/net/mlx4/mlx4_prm.h
> +++ b/drivers/net/mlx4/mlx4_prm.h
> @@ -80,14 +80,14 @@ enum {
>
> /* Send queue information. */
> struct mlx4_sq {
> - uint8_t *buf; /**< SQ buffer. */
> - uint8_t *eob; /**< End of SQ buffer */
> + volatile uint8_t *buf; /**< SQ buffer. */
> + volatile uint8_t *eob; /**< End of SQ buffer */
> uint32_t head; /**< SQ head counter in units of TXBBS. */
> uint32_t tail; /**< SQ tail counter in units of TXBBS. */
> uint32_t txbb_cnt; /**< Num of WQEBB in the Q (should be ^2). */
> uint32_t txbb_cnt_mask; /**< txbbs_cnt mask (txbb_cnt is ^2). */
> uint32_t headroom_txbbs; /**< Num of txbbs that should be kept free. */
> - uint32_t *db; /**< Pointer to the doorbell. */
> + volatile uint32_t *db; /**< Pointer to the doorbell. */
> uint32_t doorbell_qpn; /**< qp number to write to the doorbell. */
> };
>
> @@ -101,10 +101,10 @@ struct mlx4_sq {
> /* Completion queue information. */
> struct mlx4_cq {
> void *cq_uar; /**< CQ user access region. */
I'm curious why UAR isn't volatile as well?
> - void *cq_db_reg; /**< CQ doorbell register. */
> - uint32_t *set_ci_db; /**< Pointer to the completion queue doorbell. */
> - uint32_t *arm_db; /**< Pointer to doorbell for arming Rx events. */
> - uint8_t *buf; /**< Pointer to the completion queue buffer. */
> + volatile void *cq_db_reg; /**< CQ doorbell register. */
> + volatile uint32_t *set_ci_db; /**< Pointer to the CQ doorbell. */
> + volatile uint32_t *arm_db; /**< Arming Rx events doorbell. */
> + volatile uint8_t *buf; /**< Pointer to the completion queue buffer. */
> uint32_t cqe_cnt; /**< Number of entries in the queue. */
> uint32_t cqe_64:1; /**< CQ entry size is 64 bytes. */
> uint32_t cons_index; /**< Last queue entry that was handled. */
> @@ -128,10 +128,10 @@ struct mlx4_cq {
> * @return
> * Pointer to CQE entry.
> */
> -static inline struct mlx4_cqe *
> +static inline volatile struct mlx4_cqe *
> mlx4_get_cqe(struct mlx4_cq *cq, uint32_t index)
> {
> - return (struct mlx4_cqe *)(cq->buf +
> + return (volatile struct mlx4_cqe *)(cq->buf +
> ((index & (cq->cqe_cnt - 1)) <<
> (5 + cq->cqe_64)) +
> (cq->cqe_64 << 5));
> diff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c
> index 176000f..bd6d888 100644
> --- a/drivers/net/mlx4/mlx4_rxtx.c
> +++ b/drivers/net/mlx4/mlx4_rxtx.c
> @@ -70,7 +70,7 @@
> * DWORD (32 byte) of a TXBB.
> */
> struct pv {
> - struct mlx4_wqe_data_seg *dseg;
> + volatile struct mlx4_wqe_data_seg *dseg;
> uint32_t val;
> };
>
> @@ -98,14 +98,15 @@ struct pv {
> {
> uint32_t stamp = rte_cpu_to_be_32(MLX4_SQ_STAMP_VAL |
> (!!owner << MLX4_SQ_STAMP_SHIFT));
> - uint8_t *wqe = mlx4_get_send_wqe(sq, (index & sq->txbb_cnt_mask));
> - uint32_t *ptr = (uint32_t *)wqe;
> + volatile uint8_t *wqe = mlx4_get_send_wqe(sq,
> + (index & sq->txbb_cnt_mask));
> + volatile uint32_t *ptr = (volatile uint32_t *)wqe;
> int i;
> int txbbs_size;
> int num_txbbs;
>
> /* Extract the size from the control segment of the WQE. */
> - num_txbbs = MLX4_SIZE_TO_TXBBS((((struct mlx4_wqe_ctrl_seg *)
> + num_txbbs = MLX4_SIZE_TO_TXBBS((((volatile struct mlx4_wqe_ctrl_seg *)
> wqe)->fence_size & 0x3f) << 4);
> txbbs_size = num_txbbs * MLX4_TXBB_SIZE;
> /* Optimize the common case when there is no wrap-around. */
> @@ -120,8 +121,8 @@ struct pv {
> for (i = 0; i < txbbs_size; i += MLX4_SQ_STAMP_STRIDE) {
> *ptr = stamp;
> ptr += MLX4_SQ_STAMP_DWORDS;
> - if ((uint8_t *)ptr >= sq->eob) {
> - ptr = (uint32_t *)sq->buf;
> + if ((volatile uint8_t *)ptr >= sq->eob) {
> + ptr = (volatile uint32_t *)sq->buf;
> stamp ^= RTE_BE32(0x80000000);
> }
> }
> @@ -150,7 +151,7 @@ struct pv {
> unsigned int elts_comp = txq->elts_comp;
> unsigned int elts_tail = txq->elts_tail;
> struct mlx4_cq *cq = &txq->mcq;
> - struct mlx4_cqe *cqe;
> + volatile struct mlx4_cqe *cqe;
> uint32_t cons_index = cq->cons_index;
> uint16_t new_index;
> uint16_t nr_txbbs = 0;
> @@ -161,7 +162,7 @@ struct pv {
> * reported by them.
> */
> do {
> - cqe = (struct mlx4_cqe *)mlx4_get_cqe(cq, cons_index);
> + cqe = (volatile struct mlx4_cqe *)mlx4_get_cqe(cq, cons_index);
> if (unlikely(!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^
> !!(cons_index & cq->cqe_cnt)))
> break;
> @@ -172,8 +173,8 @@ struct pv {
> #ifndef NDEBUG
> if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) ==
> MLX4_CQE_OPCODE_ERROR)) {
> - struct mlx4_err_cqe *cqe_err =
> - (struct mlx4_err_cqe *)cqe;
> + volatile struct mlx4_err_cqe *cqe_err =
> + (volatile struct mlx4_err_cqe *)cqe;
> ERROR("%p CQE error - vendor syndrome: 0x%x"
> " syndrome: 0x%x\n",
> (void *)txq, cqe_err->vendor_err,
> @@ -240,15 +241,15 @@ struct pv {
>
> static int
> mlx4_tx_burst_segs(struct rte_mbuf *buf, struct txq *txq,
> - struct mlx4_wqe_ctrl_seg **pctrl)
> + volatile struct mlx4_wqe_ctrl_seg **pctrl)
Looks like an indentation issue here.
--
Adrien Mazarguil
6WIND
