Recent changes (master)
The following changes since commit c99c81adb3510a8dc34d47fd40b19ef657e32192:
Correct F_FULLSYNC -> F_FULLFSYNC (2022-02-17 12:53:59 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 933651ec130ce4d27a5c249d649d20afeb2bdf38:
Merge branch 'rpma-update-RPMA-engines-with-new-librpma-completions-API' of https://github.com/ldorau/fio (2022-02-18 09:02:03 -0700)
----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'rpma-update-RPMA-engines-with-new-librpma-completions-API' of https://github.com/ldorau/fio
Lukasz Dorau (1):
rpma: RPMA engines require librpma>=v0.11.0 with rpma_cq_get_wc()
Oksana Salyk (1):
rpma: update RPMA engines with new librpma completions API
configure | 4 ++-- engines/librpma_apm.c | 8 +++----- engines/librpma_fio.c | 46 +++++++++++++++++++++++++++++----------------- engines/librpma_fio.h | 16 +++++++++------- engines/librpma_gpspm.c | 39 ++++++++++++++++++--------------------- 5 files changed, 61 insertions(+), 52 deletions(-)
---
Diff of recent changes:
configure +2 -2
@@ -974,7 +974,7 @@ print_config "rdmacm" "$rdmacm" ########################################## # librpma probe -# The librpma engine requires librpma>=v0.10.0 with rpma_mr_advise(). +# The librpma engines require librpma>=v0.11.0 with rpma_cq_get_wc(). if test "$librpma" != "yes" ; then librpma="no" fi
@@ -982,7 +982,7 @@ cat > $TMPC << EOF #include <librpma.h> int main(void) { - void *ptr = rpma_mr_advise; + void *ptr = rpma_cq_get_wc; (void) ptr; /* unused */ return 0; }
engines/librpma_apm.c +3 -5
@@ -22,8 +22,7 @@ static inline int client_io_flush(struct thread_data *td, struct io_u *first_io_u, struct io_u *last_io_u, unsigned long long int len); -static int client_get_io_u_index (struct rpma_completion *cmpl, -unsigned int *io_u_index); +static int client_get_io_u_index (struct ibv_wc *wc,unsigned int *io_u_index);static int client_init (struct thread_data *td) {
@@ -188,10 +187,9 @@ static inline int client_io_flush(struct thread_data *td,return 0 ; } -static int client_get_io_u_index (struct rpma_completion *cmpl, -unsigned int *io_u_index) +static int client_get_io_u_index (struct ibv_wc *wc,unsigned int *io_u_index) { -memcpy (io_u_index, &cmpl->op_context,sizeof (*io_u_index)); +memcpy (io_u_index, &wc->wr_id,sizeof (*io_u_index));return 1 ; }
engines/librpma_fio.c +29 -17
123 lines not on this page · raw message
engines/librpma_fio.h +9 -7
@@ -94,12 +94,13 @@ typedef int (*librpma_fio_flush_t)(struct thread_data *td,* - ( 0) - skip * - (-1) - on error */ -typedef int (*librpma_fio_get_io_u_index_t )(struct rpma_completion *cmpl, +typedef int (*librpma_fio_get_io_u_index_t )(struct ibv_wc *wc,unsigned int *io_u_index);struct librpma_fio_client_data {struct rpma_peer *peer;struct rpma_conn *conn; +struct rpma_cq *cq;/* aligned td->orig_buffer */ char *orig_buffer_aligned;
@@ -199,29 +200,29 @@ static inline int librpma_fio_client_io_complete_all_sends( struct thread_data *td) {struct librpma_fio_client_data *ccd = td->io_ops_data; -struct rpma_completion cmpl; +struct ibv_wc wc;int ret;while (ccd->op_send_posted != ccd->op_send_completed) {/* get a completion */ - ret =rpma_conn_completion_get (ccd->conn, &cmpl); + ret =rpma_cq_get_wc (ccd->cq,1 , &wc,NULL );if (ret ==RPMA_E_NO_COMPLETION ) {/* lack of completion is not an error */ continue ; }else if (ret !=0 ) {/* an error occurred */ -librpma_td_verror (td, ret,"rpma_conn_completion_get" ); +librpma_td_verror (td, ret,"rpma_cq_get_wc" );break ; } -if (cmpl.op_status !=IBV_WC_SUCCESS ) +if (wc.status !=IBV_WC_SUCCESS )return -1 ; -if (cmpl.op ==RPMA_OP_SEND ) +if (wc.opcode ==IBV_WC_SEND ) ++ccd->op_send_completed;else {log_err ( -"A completion other than RPMA_OP_SEND got during cleaning up the CQ from SENDs\n" ); +"A completion other than IBV_WC_SEND got during cleaning up the CQ from SENDs\n" );return -1 ; } }
@@ -251,6 +252,7 @@ struct librpma_fio_server_data {/* resources of an incoming connection */ struct rpma_conn *conn; +struct rpma_cq *cq;char *ws_ptr;struct rpma_mr_local *ws_mr;
engines/librpma_gpspm.c +18 -21
@@ -60,8 +60,7 @@ static inline int client_io_flush(struct thread_data *td, struct io_u *first_io_u, struct io_u *last_io_u, unsigned long long int len); -static int client_get_io_u_index (struct rpma_completion *cmpl, -unsigned int *io_u_index); +static int client_get_io_u_index (struct ibv_wc *wc,unsigned int *io_u_index);static int client_init (struct thread_data *td) {
@@ -317,17 +316,16 @@ static inline int client_io_flush(struct thread_data *td,return 0 ; } -static int client_get_io_u_index (struct rpma_completion *cmpl, -unsigned int *io_u_index) +static int client_get_io_u_index (struct ibv_wc *wc,unsigned int *io_u_index) {GPSPMFlushResponse *flush_resp; -if (cmpl->op !=RPMA_OP_RECV ) +if (wc->opcode !=IBV_WC_RECV )return 0 ;/* unpack a response from the received buffer */ flush_resp =gpspm_flush_response__unpack (NULL , - cmpl->byte_len, cmpl->op_context); + wc->byte_len, (void *)wc->wr_id);if (flush_resp ==NULL ) {log_err ("Cannot unpack the flush response buffer\n" );return -1 ;
@@ -373,7 +371,7 @@ struct server_data {uint32_t msg_sqe_available;/* # of free SQ slots */ /* in-memory queues */ -struct rpma_completion *msgs_queued; +struct ibv_wc *msgs_queued;uint32_t msg_queued_nr; };
@@ -562,8 +560,7 @@ err_cfg_delete:return ret; } -static int server_qe_process (struct thread_data *td, -struct rpma_completion *cmpl) +static int server_qe_process (struct thread_data *td,struct ibv_wc *wc) {struct librpma_fio_server_data *csd = td->io_ops_data;struct server_data *sd = csd->server_data;
@@ -580,7 +577,7 @@ static int server_qe_process(struct thread_data *td,int ret;/* calculate SEND/RECV pair parameters */ - msg_index = (int )(uintptr_t )cmpl->op_context; + msg_index = (int )(uintptr_t )wc->wr_id; io_u_buff_offset =IO_U_BUFF_OFF_SERVER (msg_index); send_buff_offset = io_u_buff_offset +SEND_OFFSET ; recv_buff_offset = io_u_buff_offset +RECV_OFFSET ;
@@ -588,7 +585,7 @@ static int server_qe_process(struct thread_data *td, recv_buff_ptr = sd->orig_buffer_aligned + recv_buff_offset;/* unpack a flush request from the received buffer */ - flush_req =gpspm_flush_request__unpack (NULL , cmpl->byte_len, + flush_req =gpspm_flush_request__unpack (NULL , wc->byte_len, recv_buff_ptr);if (flush_req ==NULL ) {log_err ("cannot unpack the flush request buffer\n" );
@@ -682,28 +679,28 @@ static int server_cmpl_process(struct thread_data *td) {struct librpma_fio_server_data *csd = td->io_ops_data;struct server_data *sd = csd->server_data; -struct rpma_completion *cmpl = &sd->msgs_queued[sd->msg_queued_nr]; +struct ibv_wc *wc = &sd->msgs_queued[sd->msg_queued_nr];struct librpma_fio_options_values *o = td->eo;int ret; - ret =rpma_conn_completion_get (csd->conn, cmpl); + ret =rpma_cq_get_wc (csd->cq,1 , wc,NULL );if (ret ==RPMA_E_NO_COMPLETION ) {if (o->busy_wait_polling ==0 ) { - ret =rpma_conn_completion_wait (csd->conn); + ret =rpma_cq_wait (csd->cq);if (ret ==RPMA_E_NO_COMPLETION ) {/* lack of completion is not an error */ return 0 ; }else if (ret !=0 ) { -librpma_td_verror (td, ret,"rpma_conn_completion_wait" ); +librpma_td_verror (td, ret,"rpma_cq_wait" ); goto err_terminate; } - ret =rpma_conn_completion_get (csd->conn, cmpl); + ret =rpma_cq_get_wc (csd->cq,1 , wc,NULL );if (ret ==RPMA_E_NO_COMPLETION ) {/* lack of completion is not an error */ return 0 ; }else if (ret !=0 ) { -librpma_td_verror (td, ret,"rpma_conn_completion_get" ); +librpma_td_verror (td, ret,"rpma_cq_get_wc" ); goto err_terminate; } }else {
@@ -711,17 +708,17 @@ static int server_cmpl_process(struct thread_data *td)return 0 ; } }else if (ret !=0 ) { -librpma_td_verror (td, ret,"rpma_conn_completion_get" ); +librpma_td_verror (td, ret,"rpma_cq_get_wc" ); goto err_terminate; }/* validate the completion */ -if (cmpl->op_status !=IBV_WC_SUCCESS ) +if (wc->status !=IBV_WC_SUCCESS ) goto err_terminate; -if (cmpl->op ==RPMA_OP_RECV ) +if (wc->opcode ==IBV_WC_RECV ) ++sd->msg_queued_nr; -else if (cmpl->op ==RPMA_OP_SEND ) +else if (wc->opcode ==IBV_WC_SEND ) ++sd->msg_sqe_available;return 0 ;