Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d927d505c59a0c7353343174e6225c43c61fba6d

Authored by Or Gerlitz
Committed by Roland Dreier
1 parent 3eae7c9f97
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

IB: Change CQE "csum_ok" field to a bit flag 

Use a bit in wc_flags rather then a whole integer to hold the
"checksum OK" flag.  By itself, this change doesn't reduce the size of
struct ib_wc on 64bit machines -- it stays on 56 bytes because of
padding.  However, it will allow to add more fields in the future
without enlarging the struct.  Also, it will let us have a unified
approach with future libibverbs checksum offload reporting, because a
bit flag doesn't break the library ABI.

This patch was suggested during conversation with Liran Liss
<liranl@mellanox.com>.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

Showing 6 changed files with 7 additions and 6 deletions Side-by-side Diff

drivers/infiniband/hw/mlx4/cq.c
Diff comments   View file @ d927d50
... ... @@ -720,7 +720,8 @@
720 720 wc->dlid_path_bits = (g_mlpath_rqpn >> 24) & 0x7f;
721 721 wc->wc_flags |= g_mlpath_rqpn & 0x80000000 ? IB_WC_GRH : 0;
722 722 wc->pkey_index = be32_to_cpu(cqe->immed_rss_invalid) & 0x7f;
723   - wc->csum_ok = mlx4_ib_ipoib_csum_ok(cqe->status, cqe->checksum);
  723 + wc->wc_flags |= mlx4_ib_ipoib_csum_ok(cqe->status,
  724 + cqe->checksum) ? IB_WC_IP_CSUM_OK : 0;
724 725 if (rdma_port_get_link_layer(wc->qp->device,
725 726 (*cur_qp)->port) == IB_LINK_LAYER_ETHERNET)
726 727 wc->sl = be16_to_cpu(cqe->sl_vid) >> 13;
drivers/infiniband/hw/mthca/mthca_cq.c
Diff comments   View file @ d927d50
... ... @@ -643,7 +643,8 @@
643 643 entry->wc_flags |= cqe->g_mlpath & 0x80 ? IB_WC_GRH : 0;
644 644 checksum = (be32_to_cpu(cqe->rqpn) >> 24) |
645 645 ((be32_to_cpu(cqe->my_ee) >> 16) & 0xff00);
646   - entry->csum_ok = (cqe->sl_ipok & 1 && checksum == 0xffff);
  646 + entry->wc_flags |= (cqe->sl_ipok & 1 && checksum == 0xffff) ?
  647 + IB_WC_IP_CSUM_OK : 0;
647 648 }
648 649  
649 650 entry->status = IB_WC_SUCCESS;
drivers/infiniband/hw/qib/qib_rc.c
Diff comments   View file @ d927d50
... ... @@ -2048,7 +2048,6 @@
2048 2048 wc.pkey_index = 0;
2049 2049 wc.dlid_path_bits = 0;
2050 2050 wc.port_num = 0;
2051   - wc.csum_ok = 0;
2052 2051 /* Signal completion event if the solicited bit is set. */
2053 2052 qib_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
2054 2053 (ohdr->bth[0] &
drivers/infiniband/hw/qib/qib_uc.c
Diff comments   View file @ d927d50
... ... @@ -422,7 +422,6 @@
422 422 wc.pkey_index = 0;
423 423 wc.dlid_path_bits = 0;
424 424 wc.port_num = 0;
425   - wc.csum_ok = 0;
426 425 /* Signal completion event if the solicited bit is set. */
427 426 qib_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
428 427 (ohdr->bth[0] &
drivers/infiniband/ulp/ipoib/ipoib_ib.c
Diff comments   View file @ d927d50
... ... @@ -296,7 +296,8 @@
296 296 dev->stats.rx_bytes += skb->len;
297 297  
298 298 skb->dev = dev;
299   - if ((dev->features & NETIF_F_RXCSUM) && likely(wc->csum_ok))
  299 + if ((dev->features & NETIF_F_RXCSUM) &&
  300 + likely(wc->wc_flags & IB_WC_IP_CSUM_OK))
300 301 skb->ip_summed = CHECKSUM_UNNECESSARY;
301 302  
302 303 napi_gro_receive(&priv->napi, skb);
include/rdma/ib_verbs.h
Diff comments   View file @ d927d50
... ... @@ -518,6 +518,7 @@
518 518 IB_WC_GRH = 1,
519 519 IB_WC_WITH_IMM = (1<<1),
520 520 IB_WC_WITH_INVALIDATE = (1<<2),
  521 + IB_WC_IP_CSUM_OK = (1<<3),
521 522 };
522 523  
523 524 struct ib_wc {
... ... @@ -538,7 +539,6 @@
538 539 u8 sl;
539 540 u8 dlid_path_bits;
540 541 u8 port_num; /* valid only for DR SMPs on switches */
541   - int csum_ok;
542 542 };
543 543  
544 544 enum ib_cq_notify_flags {