Skip to contentSkip to conversation

RDMA/efa: Add support for 0xefa4 devices

PATCH Applied Michael Margolin 2 participants 6 messages Jul 12 – Jul 14

Subsystems (2)
lore
Share & tools
lore

Michael Margolin

author maintainer
#0 lore raw

cover RDMA/efa: Add support for 0xefa4 devices

Make a minor device interface change needed for new EFA devices and enable support for 0xefa4 PCI ID.

Anas Mousa (1):
RDMA/efa: Add EFA 0xefa4 PCI ID

Michael Margolin (1):
RDMA/efa: Extend page-shift field in MR registration

 drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +++---
 drivers/infiniband/hw/efa/efa_main.c            | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
2.47.3
author maintainer
#1 lore raw

PATCH 1/2 RDMA/efa: Extend page-shift field in MR registration

Update device interface adding one more bit from reserved to enable

Quoted 1 line

4GB page sizes that can be supported on 0xefa4 devices.

---
 drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h +3 -3
index 826790ca9d83..3eb3a4de8912 100644
@@ -367,10 +367,10 @@ struct efa_admin_reg_mr_cmd {
 
 	/*
 	 * flags and page size
-	 * 4:0 : phys_page_size_shift - page size is (1 <<
+	 * 5:0 : phys_page_size_shift - page size is (1 <<
 	 *    phys_page_size_shift). Page size is used for
 	 *    building the Virtual to Physical address mapping
-	 * 6:5 : reserved - MBZ
+	 * 6 : reserved - MBZ
 	 * 7 : mem_addr_phy_mode_en - Enable bit for physical
 	 *    memory registration (no translation), can be used
 	 *    only by privileged clients. If set, PBL must
@@ -1103,7 +1103,7 @@ struct efa_admin_host_info {
 #define EFA_ADMIN_MODIFY_QP_CMD_RNR_RETRY_MASK              BIT(5)
 
 /* reg_mr_cmd */
-#define EFA_ADMIN_REG_MR_CMD_PHYS_PAGE_SIZE_SHIFT_MASK      GENMASK(4, 0)
+#define EFA_ADMIN_REG_MR_CMD_PHYS_PAGE_SIZE_SHIFT_MASK      GENMASK(5, 0)
 #define EFA_ADMIN_REG_MR_CMD_MEM_ADDR_PHY_MODE_EN_MASK      BIT(7)
 #define EFA_ADMIN_REG_MR_CMD_LOCAL_WRITE_ENABLE_MASK        BIT(0)
 #define EFA_ADMIN_REG_MR_CMD_REMOTE_WRITE_ENABLE_MASK       BIT(1)
Signature · 1 line
2.47.3
#2 lore raw

Re: [PATCH for-next 1/2] RDMA/efa: Extend page-shift field in MR registration

Quoted 27 lines · Michael Margolin

Update device interface adding one more bit from reserved to enable

Quoted 1 line

4GB page sizes that can be supported on 0xefa4 devices.

---
 drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h +2 -2
index 826790ca9d83..3eb3a4de8912 100644
@@ -367,10 +367,10 @@ struct efa_admin_reg_mr_cmd {
 
 	/*
 	 * flags and page size
-	 * 4:0 : phys_page_size_shift - page size is (1 <<
+	 * 5:0 : phys_page_size_shift - page size is (1 <<
 	 *    phys_page_size_shift). Page size is used for
 	 *    building the Virtual to Physical address mapping
-	 * 6:5 : reserved - MBZ
+	 * 6 : reserved - MBZ
 	 * 7 : mem_addr_phy_mode_en - Enable bit for physical
 	 *    memory registration (no translation), can be used
 	 *    only by privileged clients. If set, PBL must

drivers/infiniband/hw/efa/efa_admin_cmds_defs.h struct efa_admin_host_info { · line 1106

Quoted 5 lines
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h +1 -1
@@ -1103,7 +1103,7 @@ struct efa_admin_host_info {
 #define EFA_ADMIN_MODIFY_QP_CMD_RNR_RETRY_MASK              BIT(5)
 
 /* reg_mr_cmd */
-#define EFA_ADMIN_REG_MR_CMD_PHYS_PAGE_SIZE_SHIFT_MASK      GENMASK(4, 0)
+#define EFA_ADMIN_REG_MR_CMD_PHYS_PAGE_SIZE_SHIFT_MASK      GENMASK(5, 0)

How will the new kernel behave on non-0xefa4 devices? The new kernel sets one additional bit that these devices do not expect.

Thanks

author maintainer
#3 lore raw

Re: [PATCH for-next 1/2] RDMA/efa: Extend page-shift field in MR registration

Quoted 30 lines · Leon Romanovsky
Quoted 29 lines · Michael Margolin

Update device interface adding one more bit from reserved to enable

Quoted 1 line

4GB page sizes that can be supported on 0xefa4 devices.

---
 drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h +2 -2
index 826790ca9d83..3eb3a4de8912 100644
@@ -367,10 +367,10 @@ struct efa_admin_reg_mr_cmd {
 
 	/*
 	 * flags and page size
-	 * 4:0 : phys_page_size_shift - page size is (1 <<
+	 * 5:0 : phys_page_size_shift - page size is (1 <<
 	 *    phys_page_size_shift). Page size is used for
 	 *    building the Virtual to Physical address mapping
-	 * 6:5 : reserved - MBZ
+	 * 6 : reserved - MBZ
 	 * 7 : mem_addr_phy_mode_en - Enable bit for physical
 	 *    memory registration (no translation), can be used
 	 *    only by privileged clients. If set, PBL must
@@ -1103,7 +1103,7 @@ struct efa_admin_host_info {
 #define EFA_ADMIN_MODIFY_QP_CMD_RNR_RETRY_MASK              BIT(5)
 
Quoted 6 lines

drivers/infiniband/hw/efa/efa_admin_cmds_defs.h struct efa_admin_host_info { · line 1106

Quoted 3 lines
drivers/infiniband/hw/efa/efa_admin_cmds_defs.h +1 -1
 /* reg_mr_cmd */
-#define EFA_ADMIN_REG_MR_CMD_PHYS_PAGE_SIZE_SHIFT_MASK      GENMASK(4, 0)
+#define EFA_ADMIN_REG_MR_CMD_PHYS_PAGE_SIZE_SHIFT_MASK      GENMASK(5, 0)

How will the new kernel behave on non-0xefa4 devices? The new kernel sets one additional bit that these devices do not expect.

In the kernel, it is handled by using the supported page sizes mask returned by the device (page_size_cap) when calling ib_umem_find_best_pgsz(), so the kernel should never set this bit on non supporting devices. In parallel, the device validates inputs on its end.

Michael

Quoted 2 lines

Thanks

author maintainer
#4 lore raw

PATCH 2/2 RDMA/efa: Add EFA 0xefa4 PCI ID

In reply to Michael Margolin

From: Anas Mousa <[email protected]>

Add support for 0xefa4 devices.

---
 drivers/infiniband/hw/efa/efa_main.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/infiniband/hw/efa/efa_main.c +2 -0
index 97da8e828e34..ee09dc1e0b43 100644
@@ -17,12 +17,14 @@
 #define PCI_DEV_ID_EFA1_VF 0xefa1
 #define PCI_DEV_ID_EFA2_VF 0xefa2
 #define PCI_DEV_ID_EFA3_VF 0xefa3
+#define PCI_DEV_ID_EFA4_VF 0xefa4
 
 static const struct pci_device_id efa_pci_tbl[] = {
 	{ PCI_VDEVICE(AMAZON, PCI_DEV_ID_EFA0_VF) },
 	{ PCI_VDEVICE(AMAZON, PCI_DEV_ID_EFA1_VF) },
 	{ PCI_VDEVICE(AMAZON, PCI_DEV_ID_EFA2_VF) },
 	{ PCI_VDEVICE(AMAZON, PCI_DEV_ID_EFA3_VF) },
+	{ PCI_VDEVICE(AMAZON, PCI_DEV_ID_EFA4_VF) },
 	{ }
 };
 
Signature · 1 line
2.47.3
#5 lore raw
In reply to Michael Margolin
Quoted 10 lines · Michael Margolin

Make a minor device interface change needed for new EFA devices and enable support for 0xefa4 PCI ID.

Anas Mousa (1):
RDMA/efa: Add EFA 0xefa4 PCI ID

Michael Margolin (1):
RDMA/efa: Extend page-shift field in MR registration

[...]

Applied, thanks!

[1/2] RDMA/efa: Extend page-shift field in MR registration

      https://git.kernel.org/rdma/rdma/c/4266547bdce742
[2/2] RDMA/efa: Add EFA 0xefa4 PCI ID
      https://git.kernel.org/rdma/rdma/c/6a57af838b1a56

Best regards,

Signature · 1 line
Leon Romanovsky <[email protected]>