Skip to content

Commit e095405

Browse files
Konstantin Taranovrleon
authored andcommitted
RDMA/mana_ib: Modify QP state
Implement modify QP state for RC QPs. Signed-off-by: Konstantin Taranov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Long Li <[email protected]> Reviewed-by: Zhu Yanjun <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]>
1 parent fdefb91 commit e095405

File tree

2 files changed

+107
-2
lines changed

2 files changed

+107
-2
lines changed

drivers/infiniband/hw/mana/mana_ib.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ enum mana_ib_command_code {
140140
MANA_IB_DESTROY_CQ = 0x30009,
141141
MANA_IB_CREATE_RC_QP = 0x3000a,
142142
MANA_IB_DESTROY_RC_QP = 0x3000b,
143+
MANA_IB_SET_QP_STATE = 0x3000d,
143144
};
144145

145146
struct mana_ib_query_adapter_caps_req {
@@ -286,6 +287,42 @@ struct mana_rnic_destroy_rc_qp_resp {
286287
struct gdma_resp_hdr hdr;
287288
}; /* HW Data */
288289

290+
struct mana_ib_ah_attr {
291+
u8 src_addr[16];
292+
u8 dest_addr[16];
293+
u8 src_mac[ETH_ALEN];
294+
u8 dest_mac[ETH_ALEN];
295+
u8 src_addr_type;
296+
u8 dest_addr_type;
297+
u8 hop_limit;
298+
u8 traffic_class;
299+
u16 src_port;
300+
u16 dest_port;
301+
u32 reserved;
302+
};
303+
304+
struct mana_rnic_set_qp_state_req {
305+
struct gdma_req_hdr hdr;
306+
mana_handle_t adapter;
307+
mana_handle_t qp_handle;
308+
u64 attr_mask;
309+
u32 qp_state;
310+
u32 path_mtu;
311+
u32 rq_psn;
312+
u32 sq_psn;
313+
u32 dest_qpn;
314+
u32 max_dest_rd_atomic;
315+
u32 retry_cnt;
316+
u32 rnr_retry;
317+
u32 min_rnr_timer;
318+
u32 reserved;
319+
struct mana_ib_ah_attr ah_attr;
320+
}; /* HW Data */
321+
322+
struct mana_rnic_set_qp_state_resp {
323+
struct gdma_resp_hdr hdr;
324+
}; /* HW Data */
325+
289326
static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev)
290327
{
291328
return mdev->gdma_dev->gdma_context;

drivers/infiniband/hw/mana/qp.c

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,79 @@ int mana_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
491491
return -EINVAL;
492492
}
493493

494+
static int mana_ib_gd_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
495+
int attr_mask, struct ib_udata *udata)
496+
{
497+
struct mana_ib_dev *mdev = container_of(ibqp->device, struct mana_ib_dev, ib_dev);
498+
struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);
499+
struct mana_rnic_set_qp_state_resp resp = {};
500+
struct mana_rnic_set_qp_state_req req = {};
501+
struct gdma_context *gc = mdev_to_gc(mdev);
502+
struct mana_port_context *mpc;
503+
struct net_device *ndev;
504+
int err;
505+
506+
mana_gd_init_req_hdr(&req.hdr, MANA_IB_SET_QP_STATE, sizeof(req), sizeof(resp));
507+
req.hdr.dev_id = gc->mana_ib.dev_id;
508+
req.adapter = mdev->adapter_handle;
509+
req.qp_handle = qp->qp_handle;
510+
req.qp_state = attr->qp_state;
511+
req.attr_mask = attr_mask;
512+
req.path_mtu = attr->path_mtu;
513+
req.rq_psn = attr->rq_psn;
514+
req.sq_psn = attr->sq_psn;
515+
req.dest_qpn = attr->dest_qp_num;
516+
req.max_dest_rd_atomic = attr->max_dest_rd_atomic;
517+
req.retry_cnt = attr->retry_cnt;
518+
req.rnr_retry = attr->rnr_retry;
519+
req.min_rnr_timer = attr->min_rnr_timer;
520+
if (attr_mask & IB_QP_AV) {
521+
ndev = mana_ib_get_netdev(&mdev->ib_dev, ibqp->port);
522+
if (!ndev) {
523+
ibdev_dbg(&mdev->ib_dev, "Invalid port %u in QP %u\n",
524+
ibqp->port, ibqp->qp_num);
525+
return -EINVAL;
526+
}
527+
mpc = netdev_priv(ndev);
528+
copy_in_reverse(req.ah_attr.src_mac, mpc->mac_addr, ETH_ALEN);
529+
copy_in_reverse(req.ah_attr.dest_mac, attr->ah_attr.roce.dmac, ETH_ALEN);
530+
copy_in_reverse(req.ah_attr.src_addr, attr->ah_attr.grh.sgid_attr->gid.raw,
531+
sizeof(union ib_gid));
532+
copy_in_reverse(req.ah_attr.dest_addr, attr->ah_attr.grh.dgid.raw,
533+
sizeof(union ib_gid));
534+
if (rdma_gid_attr_network_type(attr->ah_attr.grh.sgid_attr) == RDMA_NETWORK_IPV4) {
535+
req.ah_attr.src_addr_type = SGID_TYPE_IPV4;
536+
req.ah_attr.dest_addr_type = SGID_TYPE_IPV4;
537+
} else {
538+
req.ah_attr.src_addr_type = SGID_TYPE_IPV6;
539+
req.ah_attr.dest_addr_type = SGID_TYPE_IPV6;
540+
}
541+
req.ah_attr.dest_port = ROCE_V2_UDP_DPORT;
542+
req.ah_attr.src_port = rdma_get_udp_sport(attr->ah_attr.grh.flow_label,
543+
ibqp->qp_num, attr->dest_qp_num);
544+
req.ah_attr.traffic_class = attr->ah_attr.grh.traffic_class;
545+
req.ah_attr.hop_limit = attr->ah_attr.grh.hop_limit;
546+
}
547+
548+
err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
549+
if (err) {
550+
ibdev_err(&mdev->ib_dev, "Failed modify qp err %d", err);
551+
return err;
552+
}
553+
554+
return 0;
555+
}
556+
494557
int mana_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
495558
int attr_mask, struct ib_udata *udata)
496559
{
497-
/* modify_qp is not supported by this version of the driver */
498-
return -EOPNOTSUPP;
560+
switch (ibqp->qp_type) {
561+
case IB_QPT_RC:
562+
return mana_ib_gd_modify_qp(ibqp, attr, attr_mask, udata);
563+
default:
564+
ibdev_dbg(ibqp->device, "Modify QP type %u not supported", ibqp->qp_type);
565+
return -EOPNOTSUPP;
566+
}
499567
}
500568

501569
static int mana_ib_destroy_qp_rss(struct mana_ib_qp *qp,

0 commit comments

Comments
 (0)