RDMA/efa: Support CQ receive entries with source GID
Subsystems (2)
Michael Margolin
maintainerPATCH v2 1/1 RDMA/efa: Support CQ receive entries with source GID
Add a parameter for create CQ admin command to set source address on receive completion descriptors. Report capability for this feature through query device verb.
---
v1 -> v2:
- Add check for CQE size request correctness in efa_create_cq() (comment from Gal Pressman)
- Use bitfields for bool struct members
(comment from Leon Romanovsky and Jason Gunthorpe)
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +- drivers/infiniband/hw/efa/efa_com_cmd.c | 5 +- drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +- drivers/infiniband/hw/efa/efa_io_defs.h | 289 ++++++++++++++++++ drivers/infiniband/hw/efa/efa_verbs.c | 10 +- include/uapi/rdma/efa-abi.h | 4 +- 6 files changed, 311 insertions(+), 6 deletions(-) create mode 100644 drivers/infiniband/hw/efa/efa_io_defs.h
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h +5 -1
@@ -444,7 +444,10 @@ struct efa_admin_create_cq_cmd {/* * 4:0 : cq_entry_size_words - size of CQ entry in * 32-bit words, valid values: 4, 8. -* 7:5 : reserved7 - MBZ +* 5 : set_src_addr - If set, source address will be +* filled on RX completions from unknown senders. +* Requires 8 words CQ entry size. +* 7:6 : reserved7 - MBZ */ u8 cq_caps_2;
@@ -980,6 +983,7 @@ struct efa_admin_host_info {#define EFA_ADMIN_CREATE_CQ_CMD_INTERRUPT_MODE_ENABLED_MASK BIT(5)#define EFA_ADMIN_CREATE_CQ_CMD_VIRT_MASK BIT(6)#define EFA_ADMIN_CREATE_CQ_CMD_CQ_ENTRY_SIZE_WORDS_MASK GENMASK(4, 0) +#define EFA_ADMIN_CREATE_CQ_CMD_SET_SRC_ADDR_MASK BIT(5)/* create_cq_resp */ #define EFA_ADMIN_CREATE_CQ_RESP_DB_VALID_MASK BIT(0)
drivers/infiniband/hw/efa/efa_com_cmd.c +4 -1
@@ -168,7 +168,10 @@ int efa_com_create_cq(struct efa_com_dev *edev, EFA_ADMIN_CREATE_CQ_CMD_INTERRUPT_MODE_ENABLED, 1); create_cmd.eqn = params->eqn; } - +if (params->set_src_addr) { +EFA_SET (&create_cmd.cq_caps_2, +EFA_ADMIN_CREATE_CQ_CMD_SET_SRC_ADDR ,1 ); + }efa_com_set_dma_addr (params->dma_addr, &create_cmd.cq_ba.mem_addr_high, &create_cmd.cq_ba.mem_addr_low);
drivers/infiniband/hw/efa/efa_com_cmd.h +2 -1
@@ -75,7 +75,8 @@ struct efa_com_create_cq_params {u16 uarn;u16 eqn;u8 entry_size_in_bytes; -bool interrupt_mode_enabled; + bool interrupt_mode_enabled : 1; + bool set_src_addr : 1; };struct efa_com_create_cq_result {
drivers/infiniband/hw/efa/efa_io_defs.h new file +289 -0
289 lines not on this page · raw message
drivers/infiniband/hw/efa/efa_verbs.c +8 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB /* -* Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All rights reserved. +* Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All rights reserved. */ #include <linux/dma-buf.h>
@@ -15,6 +15,7 @@#include <rdma/uverbs_ioctl.h> #include "efa.h" +#include "efa_io_defs.h" enum {EFA_MMAP_DMA_PAGE =0 ,
@@ -242,6 +243,7 @@ int efa_query_device(struct ib_device *ibdev, resp.max_rq_wr = dev_attr->max_rq_depth; resp.max_rdma_size = dev_attr->max_rdma_size; + resp.device_caps |=EFA_QUERY_DEVICE_CAPS_CQ_WITH_SGID ;if (EFA_DEV_CAP (dev,RDMA_READ )) resp.device_caps |=EFA_QUERY_DEVICE_CAPS_RDMA_READ ;
@@ -1064,6 +1066,7 @@ int efa_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,struct efa_ibv_create_cq cmd = {};struct efa_cq *cq =to_ecq (ibcq);int entries = attr->cqe; +bool set_src_addr;int err;ibdev_dbg (ibdev,"create_cq entries %d\n" , entries);
@@ -1109,7 +1112,9 @@ int efa_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, goto err_out; } -if (!cmd.cq_entry_size) { + set_src_addr = !!(cmd.flags &EFA_CREATE_CQ_WITH_SGID ); +if ((cmd.cq_entry_size !=sizeof (struct efa_io_rx_cdesc_ex )) && + (set_src_addr || cmd.cq_entry_size !=sizeof (struct efa_io_rx_cdesc ))) {ibdev_dbg (ibdev,"Invalid entry size [%u]\n" , cmd.cq_entry_size); err = -EINVAL ;
@@ -1138,6 +1143,7 @@ int efa_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, params.dma_addr = cq->dma_addr; params.entry_size_in_bytes = cmd.cq_entry_size; params.num_sub_cqs = cmd.num_sub_cqs; + params.set_src_addr = set_src_addr;if (cmd.flags &EFA_CREATE_CQ_WITH_COMPLETION_CHANNEL ) { cq->eq =efa_vec2eq (dev, attr->comp_vector); params.eqn = cq->eq->eeq.eqn;
include/uapi/rdma/efa-abi.h +3 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */ /* -* Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All rights reserved. +* Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All rights reserved. */ #ifndef EFA_ABI_USER_H
@@ -54,6 +54,7 @@ struct efa_ibv_alloc_pd_resp {enum {EFA_CREATE_CQ_WITH_COMPLETION_CHANNEL =1 <<0 , +EFA_CREATE_CQ_WITH_SGID =1 <<1 , };struct efa_ibv_create_cq {
@@ -118,6 +119,7 @@ enum {EFA_QUERY_DEVICE_CAPS_RDMA_READ =1 <<0 ,EFA_QUERY_DEVICE_CAPS_RNR_RETRY =1 <<1 ,EFA_QUERY_DEVICE_CAPS_CQ_NOTIFICATIONS =1 <<2 , + EFA_QUERY_DEVICE_CAPS_CQ_WITH_SGID = 1 << 3, }; struct efa_ibv_ex_query_device_resp {
Signature · 1 line
2.34.1
Quoted 69 lines · Michael Margolin
Add a parameter for create CQ admin command to set source address on receive completion descriptors. Report capability for this feature through query device verb.
Reviewed-by Firas Jahjah <[email protected]>Reviewed-by Yossi Leybovich <[email protected]>Signed-off-by Daniel Kranzdorf <[email protected]>Signed-off-by Michael Margolin <[email protected]>---
v1 -> v2:
- Add check for CQE size request correctness inefa_create_cq()(comment from Gal Pressman)
- Use bitfields for bool struct members
(comment from Leon Romanovsky and Jason Gunthorpe)drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +- drivers/infiniband/hw/efa/efa_com_cmd.c | 5 +- drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +- drivers/infiniband/hw/efa/efa_io_defs.h | 289 ++++++++++++++++++ drivers/infiniband/hw/efa/efa_verbs.c | 10 +- include/uapi/rdma/efa-abi.h | 4 +- 6 files changed, 311 insertions(+), 6 deletions(-) create mode 100644 drivers/infiniband/hw/efa/efa_io_defs.hdrivers/infiniband/hw/efa/efa_admin_cmds_defs.h +5
-1@@ -444,7 +444,10 @@ struct efa_admin_create_cq_cmd {/* * 4:0 : cq_entry_size_words - size of CQ entry in * 32-bit words, valid values: 4, 8. -* 7:5 : reserved7 - MBZ +* 5 : set_src_addr - If set, source address will be +* filled on RX completions from unknown senders. +* Requires 8 words CQ entry size. +* 7:6 : reserved7 - MBZ */ u8 cq_caps_2;@@ -980,6 +983,7 @@ struct efa_admin_host_info {#define EFA_ADMIN_CREATE_CQ_CMD_INTERRUPT_MODE_ENABLED_MASK BIT(5)#define EFA_ADMIN_CREATE_CQ_CMD_VIRT_MASK BIT(6)#define EFA_ADMIN_CREATE_CQ_CMD_CQ_ENTRY_SIZE_WORDS_MASK GENMASK(4, 0) +#define EFA_ADMIN_CREATE_CQ_CMD_SET_SRC_ADDR_MASK BIT(5)/* create_cq_resp */ #define EFA_ADMIN_CREATE_CQ_RESP_DB_VALID_MASK BIT(0)drivers/infiniband/hw/efa/efa_com_cmd.c +4
-1@@ -168,7 +168,10 @@ int efa_com_create_cq(struct efa_com_dev *edev, EFA_ADMIN_CREATE_CQ_CMD_INTERRUPT_MODE_ENABLED, 1); create_cmd.eqn = params->eqn; } - +if (params->set_src_addr) { +EFA_SET (&create_cmd.cq_caps_2, +EFA_ADMIN_CREATE_CQ_CMD_SET_SRC_ADDR ,1 ); + }efa_com_set_dma_addr (params->dma_addr, &create_cmd.cq_ba.mem_addr_high, &create_cmd.cq_ba.mem_addr_low);drivers/infiniband/hw/efa/efa_com_cmd.h +0
-0
drivers/infiniband/hw/efa/efa_com_cmd.h struct efa_com_create_cq_params { · line 79
Quoted 6 lines
drivers/infiniband/hw/efa/efa_com_cmd.h +2
-1@@ -75,7 +75,8 @@ struct efa_com_create_cq_params {u16 uarn;u16 eqn;u8 entry_size_in_bytes; -bool interrupt_mode_enabled; + bool interrupt_mode_enabled : 1; + bool set_src_addr : 1;
It should be u8 xxx : 1 and not bool ...
Fixes locally and applied.
Thanks