Re: [PATCH 05/52] migration/rdma: Consistently use uint64_t for work request IDs

[Zhijian Li (Fujitsu)]

On 18/09/2023 22:41, Markus Armbruster wrote:
> We use int instead of uint64_t in a few places.  Change them to
> uint64_t.
> 
> This cleans up a comparison of signed qemu_rdma_block_for_wrid()
> parameter @wrid_requested with unsigned @wr_id.  Harmless, because the
> actual arguments are non-negative enumeration constants.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>


Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>

Thanks


> ---
>   migration/rdma.c       | 7 ++++---
>   migration/trace-events | 8 ++++----
>   2 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/migration/rdma.c b/migration/rdma.c
> index cda22be3f7..4328610a4c 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -1599,13 +1599,13 @@ static int qemu_rdma_wait_comp_channel(RDMAContext 
> *rdma,
>       return rdma->error_state;
>   }
>   
> -static struct ibv_comp_channel *to_channel(RDMAContext *rdma, int wrid)
> +static struct ibv_comp_channel *to_channel(RDMAContext *rdma, uint64_t wrid)
>   {
>       return wrid < RDMA_WRID_RECV_CONTROL ? rdma->send_comp_channel :
>              rdma->recv_comp_channel;
>   }
>   
> -static struct ibv_cq *to_cq(RDMAContext *rdma, int wrid)
> +static struct ibv_cq *to_cq(RDMAContext *rdma, uint64_t wrid)
>   {
>       return wrid < RDMA_WRID_RECV_CONTROL ? rdma->send_cq : rdma->recv_cq;
>   }
> @@ -1623,7 +1623,8 @@ static struct ibv_cq *to_cq(RDMAContext *rdma, int wrid)
>    * completions only need to be recorded, but do not actually
>    * need further processing.
>    */
> -static int qemu_rdma_block_for_wrid(RDMAContext *rdma, int wrid_requested,
> +static int qemu_rdma_block_for_wrid(RDMAContext *rdma,
> +                                    uint64_t wrid_requested,
>                                       uint32_t *byte_len)
>   {
>       int num_cq_events = 0, ret = 0;
> diff --git a/migration/trace-events b/migration/trace-events
> index b78808f28b..d733107ec6 100644
> --- a/migration/trace-events
> +++ b/migration/trace-events
> @@ -207,7 +207,7 @@ qemu_rdma_accept_incoming_migration(void) ""
>   qemu_rdma_accept_incoming_migration_accepted(void) ""
>   qemu_rdma_accept_pin_state(bool pin) "%d"
>   qemu_rdma_accept_pin_verbsc(void *verbs) "Verbs context after listen: %p"
> -qemu_rdma_block_for_wrid_miss(int wcomp, uint64_t req) "A Wanted wrid %d but 
> got %" PRIu64
> +qemu_rdma_block_for_wrid_miss(uint64_t wcomp, uint64_t req) "A Wanted wrid 
> %" PRIu64 " but got %" PRIu64
>   qemu_rdma_cleanup_disconnect(void) ""
>   qemu_rdma_close(void) ""
>   qemu_rdma_connect_pin_all_requested(void) ""
> @@ -221,9 +221,9 @@ qemu_rdma_exchange_send_waiting(const char *desc) 
> "Waiting for response %s"
>   qemu_rdma_exchange_send_received(const char *desc) "Response %s received."
>   qemu_rdma_fill(size_t control_len, size_t size) "RDMA %zd of %zd bytes 
> already in buffer"
>   qemu_rdma_init_ram_blocks(int blocks) "Allocated %d local ram block 
> structures"
> -qemu_rdma_poll_recv(int64_t comp, int64_t id, int sent) "completion %" 
> PRId64 " received (%" PRId64 ") left %d"
> -qemu_rdma_poll_write(int64_t comp, int left, uint64_t block, uint64_t chunk, 
> void *local, void *remote) "completions %" PRId64 " left %d, block %" PRIu64 
> ", chunk: %" PRIu64 " %p %p"
> -qemu_rdma_poll_other(int64_t comp, int left) "other completion %" PRId64 " 
> received left %d"
> +qemu_rdma_poll_recv(uint64_t comp, int64_t id, int sent) "completion %" 
> PRIu64 " received (%" PRId64 ") left %d"
> +qemu_rdma_poll_write(uint64_t comp, int left, uint64_t block, uint64_t 
> chunk, void *local, void *remote) "completions %" PRIu64 " left %d, block %" 
> PRIu64 ", chunk: %" PRIu64 " %p %p"
> +qemu_rdma_poll_other(uint64_t comp, int left) "other completion %" PRIu64 " 
> received left %d"
>   qemu_rdma_post_send_control(const char *desc) "CONTROL: sending %s.."
>   qemu_rdma_register_and_get_keys(uint64_t len, void *start) "Registering %" 
> PRIu64 " bytes @ %p"
>   qemu_rdma_register_odp_mr(const char *name) "Try to register On-Demand 
> Paging memory region: %s"