RDMA/rxe: Remove support for SMI QPs from rdma_rxe
Subsystems (2)
PATCH 1/1 RDMA/rxe: Remove support for SMI QPs from rdma_rxe
Currently the rdma_rxe driver supports SMI type QPs in a few places which is incorrect. RoCE devices never should support SMI QPs. This commit removes SMI QP support from the driver.
Signed-off-by Bob Pearson <[email protected]>
--- drivers/infiniband/sw/rxe/rxe_opcode.c | 2 -- drivers/infiniband/sw/rxe/rxe_qp.c | 14 +------------- drivers/infiniband/sw/rxe/rxe_recv.c | 1 - drivers/infiniband/sw/rxe/rxe_req.c | 1 - drivers/infiniband/sw/rxe/rxe_resp.c | 2 -- drivers/infiniband/sw/rxe/rxe_verbs.c | 1 - drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - 7 files changed, 1 insertion(+), 21 deletions(-)
drivers/infiniband/sw/rxe/rxe_opcode.c +0 -2
@@ -29,7 +29,6 @@ struct rxe_wr_opcode_info rxe_wr_opcode_info[] = { [IB_WR_SEND] = { .name = "IB_WR_SEND", .mask = { - [IB_QPT_SMI] = WR_INLINE_MASK | WR_SEND_MASK, [IB_QPT_GSI] = WR_INLINE_MASK | WR_SEND_MASK, [IB_QPT_RC] = WR_INLINE_MASK | WR_SEND_MASK, [IB_QPT_UC] = WR_INLINE_MASK | WR_SEND_MASK,
@@ -39,7 +38,6 @@ struct rxe_wr_opcode_info rxe_wr_opcode_info[] = { [IB_WR_SEND_WITH_IMM] = { .name = "IB_WR_SEND_WITH_IMM", .mask = { - [IB_QPT_SMI] = WR_INLINE_MASK | WR_SEND_MASK, [IB_QPT_GSI] = WR_INLINE_MASK | WR_SEND_MASK, [IB_QPT_RC] = WR_INLINE_MASK | WR_SEND_MASK, [IB_QPT_UC] = WR_INLINE_MASK | WR_SEND_MASK,
drivers/infiniband/sw/rxe/rxe_qp.c +1 -13
@@ -63,7 +63,6 @@ int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init)int port_num = init->port_num;switch (init->qp_type) { -case IB_QPT_SMI :case IB_QPT_GSI :case IB_QPT_RC :case IB_QPT_UC :
@@ -81,7 +80,7 @@ int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init)if (rxe_qp_chk_cap (rxe, cap, !!init->srq)) goto err1; -if (init->qp_type ==IB_QPT_SMI || init->qp_type ==IB_QPT_GSI ) { +if (init->qp_type ==IB_QPT_GSI ) {if (!rdma_is_port_valid (&rxe->ib_dev, port_num)) {pr_warn ("invalid port = %d\n" , port_num); goto err1;
@@ -89,11 +88,6 @@ int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init) port = &rxe->port; -if (init->qp_type ==IB_QPT_SMI && port->qp_smi_index) { -pr_warn ("SMI QP exists for port %d\n" , port_num); - goto err1; - } -if (init->qp_type ==IB_QPT_GSI && port->qp_gsi_index) {pr_warn ("GSI QP exists for port %d\n" , port_num); goto err1;
@@ -167,12 +161,6 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp, port = &rxe->port;switch (init->qp_type) { -case IB_QPT_SMI : - qp->ibqp.qp_num =0 ; - port->qp_smi_index = qpn; - qp->attr.port_num = init->port_num; -break ; -case IB_QPT_GSI : qp->ibqp.qp_num =1 ; port->qp_gsi_index = qpn;
drivers/infiniband/sw/rxe/rxe_recv.c +0 -1
@@ -34,7 +34,6 @@ static int check_type_state(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, }break ;case IB_QPT_UD : -case IB_QPT_SMI :case IB_QPT_GSI :if (unlikely (pkt_type !=IB_OPCODE_UD )) {pr_warn_ratelimited ("bad qp type\n" );
drivers/infiniband/sw/rxe/rxe_req.c +0 -1
@@ -308,7 +308,6 @@ static int next_opcode(struct rxe_qp *qp, struct rxe_send_wqe *wqe,case IB_QPT_UC :return next_opcode_uc (qp, opcode, fits); -case IB_QPT_SMI :case IB_QPT_UD :case IB_QPT_GSI :switch (opcode) {
drivers/infiniband/sw/rxe/rxe_resp.c +0 -2
@@ -277,7 +277,6 @@ static enum resp_states check_op_valid(struct rxe_qp *qp,break ;case IB_QPT_UD : -case IB_QPT_SMI :case IB_QPT_GSI :break ;
@@ -819,7 +818,6 @@ static enum resp_states execute(struct rxe_qp *qp, struct rxe_pkt_info *pkt)if (pkt->mask &RXE_SEND_MASK ) {if (qp_type (qp) ==IB_QPT_UD || -qp_type (qp) ==IB_QPT_SMI ||qp_type (qp) ==IB_QPT_GSI ) {if (skb->protocol ==htons (ETH_P_IP )) { memset(&hdr.reserved, 0,
drivers/infiniband/sw/rxe/rxe_verbs.c +0 -1
@@ -536,7 +536,6 @@ static void init_send_wr(struct rxe_qp *qp, struct rxe_send_wr *wr, wr->send_flags = ibwr->send_flags;if (qp_type (qp) ==IB_QPT_UD || -qp_type (qp) ==IB_QPT_SMI ||qp_type (qp) ==IB_QPT_GSI ) {struct ib_ah *ibah =ud_wr (ibwr)->ah;
drivers/infiniband/sw/rxe/rxe_verbs.h +0 -1
@@ -373,7 +373,6 @@ struct rxe_port {spinlock_t port_lock;/* guard port */ unsigned int mtu_cap;/* special QPs */ -u32 qp_smi_index;u32 qp_gsi_index; };
Signature · 1 line
2.32.0
Quoted 5 lines · Bob Pearson
Currently the
rdma_rxedriver supports SMI type QPs in a few places which is incorrect. RoCE devices never should support SMI QPs. This commit removes SMI QP support from the driver.Signed-off-by Bob Pearson <[email protected]>
Quoted 9 lines
--- drivers/infiniband/sw/rxe/rxe_opcode.c | 2 -- drivers/infiniband/sw/rxe/rxe_qp.c | 14 +------------- drivers/infiniband/sw/rxe/rxe_recv.c | 1 - drivers/infiniband/sw/rxe/rxe_req.c | 1 - drivers/infiniband/sw/rxe/rxe_resp.c | 2 -- drivers/infiniband/sw/rxe/rxe_verbs.c | 1 - drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - 7 files changed, 1 insertion(+), 21 deletions(-)
Applied to for-next, thanks
Jason