Skip to content

Commit 531094d

Browse files
YonatanNachumjgunthorpe
authored andcommitted
RDMA/efa: Add rdma write capability to device caps
Add rdma write capability that is propagated from the device to rdma-core. Enable MR creation with remote write permissions according to this device capability. Link: https://lore.kernel.org/r/20230404154313.35194-1-ynachum@amazon.com Reviewed-by: Firas Jahjah <firasj@amazon.com> Reviewed-by: Michael Margolin <mrgolin@amazon.com> Signed-off-by: Yonatan Nachum <ynachum@amazon.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent 746aa3c commit 531094d

4 files changed

Lines changed: 44 additions & 17 deletions

File tree

drivers/infiniband/hw/efa/efa_admin_cmds_defs.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,9 @@ struct efa_admin_reg_mr_cmd {
376376
* 0 : local_write_enable - Local write permissions:
377377
* must be set for RQ buffers and buffers posted for
378378
* RDMA Read requests
379-
* 1 : reserved1 - MBZ
379+
* 1 : remote_write_enable - Remote write
380+
* permissions: must be set to enable RDMA write to
381+
* the region
380382
* 2 : remote_read_enable - Remote read permissions:
381383
* must be set to enable RDMA read from the region
382384
* 7:3 : reserved2 - MBZ
@@ -620,7 +622,9 @@ struct efa_admin_feature_device_attr_desc {
620622
* modify QP command
621623
* 2 : data_polling_128 - If set, 128 bytes data
622624
* polling is supported
623-
* 31:3 : reserved - MBZ
625+
* 3 : rdma_write - If set, RDMA Write is supported
626+
* on TX queues
627+
* 31:4 : reserved - MBZ
624628
*/
625629
u32 device_caps;
626630

@@ -674,7 +678,7 @@ struct efa_admin_feature_queue_attr_desc {
674678
/* The maximum size of LLQ in bytes */
675679
u32 max_llq_size;
676680

677-
/* Maximum number of SGEs for a single RDMA read WQE */
681+
/* Maximum number of SGEs for a single RDMA read/write WQE */
678682
u16 max_wr_rdma_sges;
679683

680684
/*
@@ -979,6 +983,7 @@ struct efa_admin_host_info {
979983
#define EFA_ADMIN_REG_MR_CMD_PHYS_PAGE_SIZE_SHIFT_MASK GENMASK(4, 0)
980984
#define EFA_ADMIN_REG_MR_CMD_MEM_ADDR_PHY_MODE_EN_MASK BIT(7)
981985
#define EFA_ADMIN_REG_MR_CMD_LOCAL_WRITE_ENABLE_MASK BIT(0)
986+
#define EFA_ADMIN_REG_MR_CMD_REMOTE_WRITE_ENABLE_MASK BIT(1)
982987
#define EFA_ADMIN_REG_MR_CMD_REMOTE_READ_ENABLE_MASK BIT(2)
983988

984989
/* create_cq_cmd */
@@ -994,6 +999,7 @@ struct efa_admin_host_info {
994999
#define EFA_ADMIN_FEATURE_DEVICE_ATTR_DESC_RDMA_READ_MASK BIT(0)
9951000
#define EFA_ADMIN_FEATURE_DEVICE_ATTR_DESC_RNR_RETRY_MASK BIT(1)
9961001
#define EFA_ADMIN_FEATURE_DEVICE_ATTR_DESC_DATA_POLLING_128_MASK BIT(2)
1002+
#define EFA_ADMIN_FEATURE_DEVICE_ATTR_DESC_RDMA_WRITE_MASK BIT(3)
9971003

9981004
/* create_eq_cmd */
9991005
#define EFA_ADMIN_CREATE_EQ_CMD_ENTRY_SIZE_WORDS_MASK GENMASK(4, 0)

drivers/infiniband/hw/efa/efa_io_defs.h

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
22
/*
3-
* Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All rights reserved.
3+
* Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All rights reserved.
44
*/
55

66
#ifndef _EFA_IO_H_
@@ -23,6 +23,8 @@ enum efa_io_send_op_type {
2323
EFA_IO_SEND = 0,
2424
/* RDMA read */
2525
EFA_IO_RDMA_READ = 1,
26+
/* RDMA write */
27+
EFA_IO_RDMA_WRITE = 2,
2628
};
2729

2830
enum efa_io_comp_status {
@@ -62,8 +64,7 @@ struct efa_io_tx_meta_desc {
6264

6365
/*
6466
* control flags
65-
* 3:0 : op_type - operation type: send/rdma/fast mem
66-
* ops/etc
67+
* 3:0 : op_type - enum efa_io_send_op_type
6768
* 4 : has_imm - immediate_data field carries valid
6869
* data.
6970
* 5 : inline_msg - inline mode - inline message data
@@ -219,28 +220,32 @@ struct efa_io_cdesc_common {
219220
* 2:1 : q_type - enum efa_io_queue_type: send/recv
220221
* 3 : has_imm - indicates that immediate data is
221222
* present - for RX completions only
222-
* 7:4 : reserved28 - MBZ
223+
* 6:4 : op_type - enum efa_io_send_op_type
224+
* 7 : reserved31 - MBZ
223225
*/
224226
u8 flags;
225227

226228
/* local QP number */
227229
u16 qp_num;
228-
229-
/* Transferred length */
230-
u16 length;
231230
};
232231

233232
/* Tx completion descriptor */
234233
struct efa_io_tx_cdesc {
235234
/* Common completion info */
236235
struct efa_io_cdesc_common common;
236+
237+
/* MBZ */
238+
u16 reserved16;
237239
};
238240

239241
/* Rx Completion Descriptor */
240242
struct efa_io_rx_cdesc {
241243
/* Common completion info */
242244
struct efa_io_cdesc_common common;
243245

246+
/* Transferred length bits[15:0] */
247+
u16 length;
248+
244249
/* Remote Address Handle FW index, 0xFFFF indicates invalid ah */
245250
u16 ah;
246251

@@ -250,16 +255,26 @@ struct efa_io_rx_cdesc {
250255
u32 imm;
251256
};
252257

258+
/* Rx Completion Descriptor RDMA write info */
259+
struct efa_io_rx_cdesc_rdma_write {
260+
/* Transferred length bits[31:16] */
261+
u16 length_hi;
262+
};
263+
253264
/* Extended Rx Completion Descriptor */
254265
struct efa_io_rx_cdesc_ex {
255266
/* Base RX completion info */
256-
struct efa_io_rx_cdesc rx_cdesc_base;
267+
struct efa_io_rx_cdesc base;
257268

258-
/*
259-
* Valid only in case of unknown AH (0xFFFF) and CQ set_src_addr is
260-
* enabled.
261-
*/
262-
u8 src_addr[16];
269+
union {
270+
struct efa_io_rx_cdesc_rdma_write rdma_write;
271+
272+
/*
273+
* Valid only in case of unknown AH (0xFFFF) and CQ
274+
* set_src_addr is enabled.
275+
*/
276+
u8 src_addr[16];
277+
} u;
263278
};
264279

265280
/* tx_meta_desc */
@@ -285,5 +300,6 @@ struct efa_io_rx_cdesc_ex {
285300
#define EFA_IO_CDESC_COMMON_PHASE_MASK BIT(0)
286301
#define EFA_IO_CDESC_COMMON_Q_TYPE_MASK GENMASK(2, 1)
287302
#define EFA_IO_CDESC_COMMON_HAS_IMM_MASK BIT(3)
303+
#define EFA_IO_CDESC_COMMON_OP_TYPE_MASK GENMASK(6, 4)
288304

289305
#endif /* _EFA_IO_H_ */

drivers/infiniband/hw/efa/efa_verbs.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,9 @@ int efa_query_device(struct ib_device *ibdev,
253253
if (EFA_DEV_CAP(dev, DATA_POLLING_128))
254254
resp.device_caps |= EFA_QUERY_DEVICE_CAPS_DATA_POLLING_128;
255255

256+
if (EFA_DEV_CAP(dev, RDMA_WRITE))
257+
resp.device_caps |= EFA_QUERY_DEVICE_CAPS_RDMA_WRITE;
258+
256259
if (dev->neqs)
257260
resp.device_caps |= EFA_QUERY_DEVICE_CAPS_CQ_NOTIFICATIONS;
258261

@@ -1572,7 +1575,8 @@ static struct efa_mr *efa_alloc_mr(struct ib_pd *ibpd, int access_flags,
15721575

15731576
supp_access_flags =
15741577
IB_ACCESS_LOCAL_WRITE |
1575-
(EFA_DEV_CAP(dev, RDMA_READ) ? IB_ACCESS_REMOTE_READ : 0);
1578+
(EFA_DEV_CAP(dev, RDMA_READ) ? IB_ACCESS_REMOTE_READ : 0) |
1579+
(EFA_DEV_CAP(dev, RDMA_WRITE) ? IB_ACCESS_REMOTE_WRITE : 0);
15761580

15771581
access_flags &= ~IB_ACCESS_OPTIONAL;
15781582
if (access_flags & ~supp_access_flags) {

include/uapi/rdma/efa-abi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ enum {
121121
EFA_QUERY_DEVICE_CAPS_CQ_NOTIFICATIONS = 1 << 2,
122122
EFA_QUERY_DEVICE_CAPS_CQ_WITH_SGID = 1 << 3,
123123
EFA_QUERY_DEVICE_CAPS_DATA_POLLING_128 = 1 << 4,
124+
EFA_QUERY_DEVICE_CAPS_RDMA_WRITE = 1 << 5,
124125
};
125126

126127
struct efa_ibv_ex_query_device_resp {

0 commit comments

Comments
 (0)