RDMA/efa: Add EFA query MR support
Subsystems (2)
Michael Margolin
maintainerPATCH 1/1 RDMA/efa: Add EFA query MR support
Add EFA driver uapi definitions and register a new query MR method that currently returns the physical PCI buses' IDs the device is using to reach the MR. Update admin definitions and efa-abi accordingly.
--- drivers/infiniband/hw/efa/efa.h | 5 +- .../infiniband/hw/efa/efa_admin_cmds_defs.h | 31 ++++++++ drivers/infiniband/hw/efa/efa_com_cmd.c | 6 ++ drivers/infiniband/hw/efa/efa_com_cmd.h | 4 + drivers/infiniband/hw/efa/efa_main.c | 6 ++ drivers/infiniband/hw/efa/efa_verbs.c | 77 +++++++++++++++++++ include/uapi/rdma/efa-abi.h | 19 +++++ 7 files changed, 147 insertions(+), 1 deletion(-)
drivers/infiniband/hw/efa/efa.h +4 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ /* -* Copyright 2018-2021 Amazon.com, Inc. or its affiliates. All rights reserved. +* Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All rights reserved. */ #ifndef _EFA_H_
@@ -83,6 +83,9 @@ struct efa_pd {struct efa_mr {struct ib_mr ibmr;struct ib_umem *umem; +u16 recv_pci_bus_id; +u16 rdma_read_pci_bus_id; +u16 rdma_recv_pci_bus_id; };struct efa_cq {
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h +31 -0
@@ -415,6 +415,32 @@ struct efa_admin_reg_mr_resp {* memory region */ u32 r_key; + +/* +* Mask indicating which fields have valid values +* 0 : recv_pci_bus_id +* 1 : rdma_read_pci_bus_id +* 2 : rdma_recv_pci_bus_id +*/ +u8 validity; + +/* +* Physical PCIe bus used by the device to reach the MR for receive +* operation +*/ +u8 recv_pci_bus_id; + +/* +* Physical PCIe bus used by the device to reach the MR for RDMA read +* operation +*/ +u8 rdma_read_pci_bus_id; + +/* +* Physical PCIe bus used by the device to reach the MR for RDMA write +* receive +*/ +u8 rdma_recv_pci_bus_id; };struct efa_admin_dereg_mr_cmd {
@@ -999,6 +1025,11 @@ struct efa_admin_host_info {#define EFA_ADMIN_REG_MR_CMD_REMOTE_WRITE_ENABLE_MASK BIT(1)#define EFA_ADMIN_REG_MR_CMD_REMOTE_READ_ENABLE_MASK BIT(2) +/* reg_mr_resp */ +#define EFA_ADMIN_REG_MR_RESP_RECV_PCI_BUS_ID_MASK BIT(0) +#define EFA_ADMIN_REG_MR_RESP_RDMA_READ_PCI_BUS_ID_MASK BIT(1) +#define EFA_ADMIN_REG_MR_RESP_RDMA_RECV_PCI_BUS_ID_MASK BIT(2) +/* create_cq_cmd */ #define EFA_ADMIN_CREATE_CQ_CMD_INTERRUPT_MODE_ENABLED_MASK BIT(5)#define EFA_ADMIN_CREATE_CQ_CMD_VIRT_MASK BIT(6)
drivers/infiniband/hw/efa/efa_com_cmd.c +6 -0
@@ -270,6 +270,12 @@ int efa_com_register_mr(struct efa_com_dev *edev, result->l_key = cmd_completion.l_key; result->r_key = cmd_completion.r_key; + result->recv_pci_bus_id =EFA_GET (&cmd_completion.validity,EFA_ADMIN_REG_MR_RESP_RECV_PCI_BUS_ID ) ? + cmd_completion.recv_pci_bus_id :EFA_INVALID_PCI_BUS_ID ; + result->rdma_read_pci_bus_id =EFA_GET (&cmd_completion.validity,EFA_ADMIN_REG_MR_RESP_RDMA_READ_PCI_BUS_ID ) ? + cmd_completion.rdma_read_pci_bus_id :EFA_INVALID_PCI_BUS_ID ; + result->rdma_recv_pci_bus_id =EFA_GET (&cmd_completion.validity,EFA_ADMIN_REG_MR_RESP_RDMA_RECV_PCI_BUS_ID ) ? + cmd_completion.rdma_recv_pci_bus_id :EFA_INVALID_PCI_BUS_ID ;return 0 ; }
drivers/infiniband/hw/efa/efa_com_cmd.h +4 -0
@@ -9,6 +9,7 @@#include "efa_com.h" #define EFA_GID_SIZE 16 +#define EFA_INVALID_PCI_BUS_ID 0xffffstruct efa_com_create_qp_params {u64 rq_base_addr;
@@ -210,6 +211,9 @@ struct efa_com_reg_mr_result {* accessed memory region */ u32 r_key; +u16 recv_pci_bus_id; +u16 rdma_read_pci_bus_id; +u16 rdma_recv_pci_bus_id; };struct efa_com_dereg_mr_params {
drivers/infiniband/hw/efa/efa_main.c +6 -0
@@ -9,6 +9,7 @@#include <linux/version.h> #include <rdma/ib_user_verbs.h> +#include <rdma/uverbs_ioctl.h> #include "efa.h"
@@ -36,6 +37,8 @@ MODULE_DEVICE_TABLE(pci, efa_pci_tbl); (BIT (EFA_ADMIN_FATAL_ERROR ) |BIT (EFA_ADMIN_WARNING ) | \ BIT(EFA_ADMIN_NOTIFICATION) | BIT(EFA_ADMIN_KEEP_ALIVE)) +extern const struct uapi_definition efa_uapi_defs[]; +/* This handler will called for unknown event group or unimplemented handlers */ static void unimplemented_aenq_handler (void *data,struct efa_admin_aenq_entry *aenq_e)
@@ -432,6 +435,9 @@ static int efa_ib_device_add(struct efa_dev *dev)ib_set_device_ops (&dev->ibdev, &efa_dev_ops); +if (IS_ENABLED (CONFIG_INFINIBAND_USER_ACCESS )) + dev->ibdev.driver_def = efa_uapi_defs; + err =ib_register_device (&dev->ibdev,"efa_%d" , &pdev->dev);if (err) goto err_destroy_eqs;
drivers/infiniband/hw/efa/efa_verbs.c +77 -0
98 lines not on this page · raw message
include/uapi/rdma/efa-abi.h +19 -0
@@ -7,6 +7,7 @@#define EFA_ABI_USER_H #include <linux/types.h> +#include <rdma/ib_user_ioctl_cmds.h> /* * Increment this value if any changes that break userspace ABI
@@ -134,4 +135,22 @@ struct efa_ibv_ex_query_device_resp { __u32 device_caps; }; +enum { +EFA_QUERY_MR_VALIDITY_RECV_PCI_BUS_ID =1 <<0 , +EFA_QUERY_MR_VALIDITY_RDMA_READ_PCI_BUS_ID =1 <<1 , +EFA_QUERY_MR_VALIDITY_RDMA_RECV_PCI_BUS_ID =1 <<2 , +}; + +enum efa_query_mr_attrs { +EFA_IB_ATTR_QUERY_MR_HANDLE = (1U <<UVERBS_ID_NS_SHIFT ), +EFA_IB_ATTR_QUERY_MR_RESP_PCI_BUS_ID_VALIDITY , +EFA_IB_ATTR_QUERY_MR_RESP_RECV_PCI_BUS_ID , +EFA_IB_ATTR_QUERY_MR_RESP_RDMA_READ_PCI_BUS_ID , +EFA_IB_ATTR_QUERY_MR_RESP_RDMA_RECV_PCI_BUS_ID , +}; + +enum efa_mr_methods { +EFA_IB_METHOD_MR_QUERY = (1U <<UVERBS_ID_NS_SHIFT ), +}; +#endif /* EFA_ABI_USER_H */
Signature · 1 line
2.40.1
Gal Pressman
reviewerHi Michael,
drivers/infiniband/hw/efa/efa_main.c static int efa_ib_device_add(struct efa_dev *dev) · line 438
Quoted 5 lines · Michael Margolin
drivers/infiniband/hw/efa/efa_main.c +1
-0@@ -432,6 +435,9 @@ static int efa_ib_device_add(struct efa_dev *dev)ib_set_device_ops (&dev->ibdev, &efa_dev_ops); +if (IS_ENABLED (CONFIG_INFINIBAND_USER_ACCESS ))
EFA depends on CONFIG_INFINIBAND_USER_ACCESS:
7 config INFINIBAND_EFA
8 tristate "Amazon Elastic Fabric Adapter (EFA) support"
9 depends on PCI_MSI && 64BIT && !CPU_BIG_ENDIAN
10 depends on INFINIBAND_USER_ACCESS
Quoted 20 lines
drivers/infiniband/hw/efa/efa_main.c +2
-0+ dev->ibdev.driver_def = efa_uapi_defs; + err =ib_register_device (&dev->ibdev,"efa_%d" , &pdev->dev);if (err) goto err_destroy_eqs;drivers/infiniband/hw/efa/efa_verbs.c +3
-0@@ -13,6 +13,9 @@#include <rdma/ib_user_verbs.h> #include <rdma/ib_verbs.h> #include <rdma/uverbs_ioctl.h> +#define UVERBS_MODULE_NAME efa_ib +#include <rdma/uverbs_named_ioctl.h> +#include <rdma/ib_user_ioctl_cmds.h> #include "efa.h" #include "efa_io_defs.h"
drivers/infiniband/hw/efa/efa_verbs.c static int efa_register_mr(struct ib_pd *ibpd, struct efa_mr *mr, u64 start, · line 1661
Quoted 6 lines
drivers/infiniband/hw/efa/efa_verbs.c +3
-0@@ -1653,6 +1656,9 @@ static int efa_register_mr(struct ib_pd *ibpd, struct efa_mr *mr, u64 start, mr->ibmr.lkey = result.l_key; mr->ibmr.rkey = result.r_key; mr->ibmr.length = length; + mr->recv_pci_bus_id = result.recv_pci_bus_id; + mr->rdma_read_pci_bus_id = result.rdma_read_pci_bus_id; + mr->rdma_recv_pci_bus_id = result.rdma_recv_pci_bus_id;
Why is a query_mr ioctl better than returning this data through udata on MR creation?
Margolin, Michael
maintainerHey Gal,
Thanks for your comments.
Quoted 7 lines · Gal Pressman
Hi Michael,
Quoted 4 lines · Michael Margolin
drivers/infiniband/hw/efa/efa_main.c +0
-0@@ -432,6 +435,9 @@ static int efa_ib_device_add(struct efa_dev *dev)ib_set_device_ops (&dev->ibdev, &efa_dev_ops);
Quoted 7 lines
drivers/infiniband/hw/efa/efa_main.c static int efa_ib_device_add(struct efa_dev *dev) · line 438
Quoted 1 line
drivers/infiniband/hw/efa/efa_main.c +1
-0+if (IS_ENABLED (CONFIG_INFINIBAND_USER_ACCESS ))EFA depends on
CONFIG_INFINIBAND_USER_ACCESS:7 config
INFINIBAND_EFA
8 tristate "Amazon Elastic Fabric Adapter (EFA) support"
9 depends onPCI_MSI&& 64BIT && !CPU_BIG_ENDIAN
10 depends onINFINIBAND_USER_ACCESS
I'll remove this if statement.
Quoted 17 lines
Quoted 17 lines
drivers/infiniband/hw/efa/efa_main.c +2
-0+ dev->ibdev.driver_def = efa_uapi_defs; + err =ib_register_device (&dev->ibdev,"efa_%d" , &pdev->dev);if (err) goto err_destroy_eqs;drivers/infiniband/hw/efa/efa_verbs.c +3
-0@@ -13,6 +13,9 @@#include <rdma/ib_user_verbs.h> #include <rdma/ib_verbs.h> #include <rdma/uverbs_ioctl.h> +#define UVERBS_MODULE_NAME efa_ib +#include <rdma/uverbs_named_ioctl.h> +#include <rdma/ib_user_ioctl_cmds.h>
Quoted 11 lines
drivers/infiniband/hw/efa/efa_verbs.c static int efa_register_mr(struct ib_pd *ibpd, struct efa_mr *mr, u64 start, · line 1661
Quoted 9 lines
drivers/infiniband/hw/efa/efa_verbs.c +3
-0#include "efa.h" #include "efa_io_defs.h" @@ -1653,6 +1656,9 @@ static int efa_register_mr(struct ib_pd *ibpd, struct efa_mr *mr, u64 start, mr->ibmr.lkey = result.l_key; mr->ibmr.rkey = result.r_key; mr->ibmr.length = length; + mr->recv_pci_bus_id = result.recv_pci_bus_id; + mr->rdma_read_pci_bus_id = result.rdma_read_pci_bus_id; + mr->rdma_recv_pci_bus_id = result.rdma_recv_pci_bus_id;Why is a
query_mrioctl better than returning this data through udata on MR creation?
We need this for both reg_user_mr and reg_user_mr_dmabuf and it doesn't make sense to implement it twice. In addition, those two verbs are using different mechanisms (write and ioctl) and extending dmabuf reg_mr will require more extensive changes on rdma-core side.
Michael
Quoted 51 lines · Michael
Hey Gal,
Thanks for your comments.
Quoted 7 lines · Gal Pressman
Hi Michael,
Quoted 4 lines · Michael Margolin
drivers/infiniband/hw/efa/efa_main.c +0
-0@@ -432,6 +435,9 @@ static int efa_ib_device_add(struct efa_dev *dev)ib_set_device_ops (&dev->ibdev, &efa_dev_ops);Quoted 7 lines
drivers/infiniband/hw/efa/efa_main.c static int efa_ib_device_add(struct efa_dev *dev) · line 438
Quoted 1 line
drivers/infiniband/hw/efa/efa_main.c +1
-0+if (IS_ENABLED (CONFIG_INFINIBAND_USER_ACCESS ))EFA depends on
CONFIG_INFINIBAND_USER_ACCESS:7 config
INFINIBAND_EFA
8 tristate "Amazon Elastic Fabric Adapter (EFA) support"
9 depends onPCI_MSI&& 64BIT && !CPU_BIG_ENDIAN
10 depends onINFINIBAND_USER_ACCESSI'll remove this if statement.
Quoted 17 lines
Quoted 17 lines
drivers/infiniband/hw/efa/efa_main.c +2
-0+ dev->ibdev.driver_def = efa_uapi_defs; + err =ib_register_device (&dev->ibdev,"efa_%d" , &pdev->dev);if (err) goto err_destroy_eqs;drivers/infiniband/hw/efa/efa_verbs.c +3
-0@@ -13,6 +13,9 @@#include <rdma/ib_user_verbs.h> #include <rdma/ib_verbs.h> #include <rdma/uverbs_ioctl.h> +#define UVERBS_MODULE_NAME efa_ib +#include <rdma/uverbs_named_ioctl.h> +#include <rdma/ib_user_ioctl_cmds.h> Quoted 11 lines
drivers/infiniband/hw/efa/efa_verbs.c static int efa_register_mr(struct ib_pd *ibpd, struct efa_mr *mr, u64 start, · line 1661
Quoted 9 lines
drivers/infiniband/hw/efa/efa_verbs.c +3
-0#include "efa.h" #include "efa_io_defs.h" @@ -1653,6 +1656,9 @@ static int efa_register_mr(struct ib_pd *ibpd, struct efa_mr *mr, u64 start, mr->ibmr.lkey = result.l_key; mr->ibmr.rkey = result.r_key; mr->ibmr.length = length; + mr->recv_pci_bus_id = result.recv_pci_bus_id; + mr->rdma_read_pci_bus_id = result.rdma_read_pci_bus_id; + mr->rdma_recv_pci_bus_id = result.rdma_recv_pci_bus_id;Why is a
query_mrioctl better than returning this data through udata on MR creation?
Quoted 4 lines
We need this for both
reg_user_mrandreg_user_mr_dmabufand it doesn't make sense to implement it twice. In addition, those two verbs are using different mechanisms (write and ioctl) and extending dmabufreg_mrwill require more extensive changes on rdma-core side.
Both of these callbacks use ioctl() interface. We keep write() interface for legacy systems which won't and/or shouldn't use any new API.
Thanks
Quoted 3 lines
Michael