Commit 6f559013 authored by Yuval Shaia's avatar Yuval Shaia Committed by Marcel Apfelbaum
Browse files

hw/rdma: Fix 32-bit compilation 



Use the correct printf formats, so that a 32-bit compile doesn't spit
out lots of warnings about %lx being incompatible with uint64_t.

Suggested-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Tested-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180322095220.9976-4-yuval.shaia@oracle.com>
Signed-off-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
parent 94f480b8

hw/rdma/rdma_backend.c

+11 −10
Original line number Diff line number Diff line
@@ -62,12 +62,13 @@ static void poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq) 
        pr_dbg("Got %d completion(s) from cq %p\n", ne, ibcq);



        for (i = 0; i < ne; i++) {

            pr_dbg("wr_id=0x%lx\n", wc[i].wr_id);

            pr_dbg("wr_id=0x%" PRIx64 "\n", wc[i].wr_id);

            pr_dbg("status=%d\n", wc[i].status);



            bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);

            if (unlikely(!bctx)) {

                pr_dbg("Error: Failed to find ctx for req %ld\n", wc[i].wr_id);

                pr_dbg("Error: Failed to find ctx for req %" PRId64 "\n",

                       wc[i].wr_id);

                continue;

            }

            pr_dbg("Processing %s CQE\n", bctx->is_tx_req ? "send" : "recv");
@@ -176,7 +177,7 @@ static struct ibv_ah *create_ah(RdmaBackendDev *backend_dev, struct ibv_pd *pd, 
            g_hash_table_insert(ah_hash, ah_key, ah);

        } else {

            g_bytes_unref(ah_key);

            pr_dbg("ibv_create_ah failed for gid <%lx %lx>\n",

            pr_dbg("Fail to create AH for gid <0x%" PRIx64 ", 0x%" PRIx64 ">\n",

                    be64_to_cpu(dgid->global.subnet_prefix),

                    be64_to_cpu(dgid->global.interface_id));

        }
@@ -227,8 +228,8 @@ static int build_host_sge_array(RdmaDeviceResources *rdma_dev_res, 
        dsge->length = ssge[ssge_idx].length;

        dsge->lkey = rdma_backend_mr_lkey(&mr->backend_mr);



        pr_dbg("ssge->addr=0x%lx\n", (uint64_t)ssge[ssge_idx].addr);

        pr_dbg("dsge->addr=0x%lx\n", dsge->addr);

        pr_dbg("ssge->addr=0x%" PRIx64 "\n", ssge[ssge_idx].addr);

        pr_dbg("dsge->addr=0x%" PRIx64 "\n", dsge->addr);

        pr_dbg("dsge->length=%d\n", dsge->length);

        pr_dbg("dsge->lkey=0x%x\n", dsge->lkey);
@@ -405,7 +406,7 @@ int rdma_backend_create_mr(RdmaBackendMR *mr, RdmaBackendPD *pd, void *addr, 
                           size_t length, int access)

{

    pr_dbg("addr=0x%p\n", addr);

    pr_dbg("len=%ld\n", length);

    pr_dbg("len=%zu\n", length);

    mr->ibmr = ibv_reg_mr(pd->ibpd, addr, length, access);

    if (mr->ibmr) {

        pr_dbg("lkey=0x%x\n", mr->ibmr->lkey);
@@ -562,7 +563,7 @@ int rdma_backend_qp_state_rtr(RdmaBackendDev *backend_dev, RdmaBackendQP *qp, 


    switch (qp_type) {

    case IBV_QPT_RC:

        pr_dbg("dgid=0x%lx,%lx\n",

        pr_dbg("dgid=0x%" PRIx64 ",%" PRIx64 "\n",

               be64_to_cpu(ibv_gid.global.subnet_prefix),

               be64_to_cpu(ibv_gid.global.interface_id));

        pr_dbg("dqpn=0x%x\n", dqpn);
@@ -681,7 +682,7 @@ static int init_device_caps(RdmaBackendDev *backend_dev, 
        return -EIO;

    }



    CHK_ATTR(dev_attr, backend_dev->dev_attr, max_mr_size, "%ld");

    CHK_ATTR(dev_attr, backend_dev->dev_attr, max_mr_size, "%" PRId64);

    CHK_ATTR(dev_attr, backend_dev->dev_attr, max_qp, "%d");

    CHK_ATTR(dev_attr, backend_dev->dev_attr, max_sge, "%d");

    CHK_ATTR(dev_attr, backend_dev->dev_attr, max_qp_wr, "%d");
@@ -794,9 +795,9 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, 
        ret = -EIO;

        goto out_destroy_comm_channel;

    }

    pr_dbg("subnet_prefix=0x%lx\n",

    pr_dbg("subnet_prefix=0x%" PRIx64 "\n",

           be64_to_cpu(backend_dev->gid.global.subnet_prefix));

    pr_dbg("interface_id=0x%lx\n",

    pr_dbg("interface_id=0x%" PRIx64 "\n",

           be64_to_cpu(backend_dev->gid.global.interface_id));



    snprintf(thread_name, sizeof(thread_name), "rdma_comp_%s",

hw/rdma/rdma_rm.c

+2 −2
Original line number Diff line number Diff line
@@ -170,9 +170,9 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint32_t pd_handle, 
        mr->user_mr.host_virt = host_virt;

        pr_dbg("host_virt=0x%p\n", mr->user_mr.host_virt);

        mr->user_mr.length = guest_length;

        pr_dbg("length=0x%lx\n", guest_length);

        pr_dbg("length=%zu\n", guest_length);

        mr->user_mr.guest_start = guest_start;

        pr_dbg("guest_start=0x%lx\n", mr->user_mr.guest_start);

        pr_dbg("guest_start=0x%" PRIx64 "\n", mr->user_mr.guest_start);



        length = mr->user_mr.length;

        addr = mr->user_mr.host_virt;

hw/rdma/rdma_utils.c

+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) 


    p = pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE);

    if (!p) {

        pr_dbg("Fail in pci_dma_map, addr=0x%llx, len=%ld\n",

               (long long unsigned int)addr, len);

        pr_dbg("Fail in pci_dma_map, addr=0x%" PRIx64 ", len=%" PRId64 "\n",

               addr, len);

        return NULL;

    }
@@ -37,7 +37,7 @@ void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) 
        return NULL;

    }



    pr_dbg("0x%llx -> %p (len=%ld)\n", (long long unsigned int)addr, p, len);

    pr_dbg("0x%" PRIx64 " -> %p (len=% " PRId64 ")\n", addr, p, len);



    return p;

}

hw/rdma/vmw/pvrdma_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma, 
            }

        }



        pr_dbg("guest_dma[%d]=0x%lx\n", addr_idx, tbl[tbl_idx]);

        pr_dbg("guest_dma[%d]=0x%" PRIx64 "\n", addr_idx, tbl[tbl_idx]);



        curr_page = rdma_pci_dma_map(pdev, (dma_addr_t)tbl[tbl_idx],

                                     TARGET_PAGE_SIZE);
@@ -285,7 +285,7 @@ static int create_cq_ring(PCIDevice *pci_dev , PvrdmaRing **ring, 
        goto out_free_ring;

    }



    sprintf(ring_name, "cq_ring_%lx", pdir_dma);

    sprintf(ring_name, "cq_ring_%" PRIx64, pdir_dma);

    rc = pvrdma_ring_init(r, ring_name, pci_dev, &r->ring_state[1],

                          cqe, sizeof(struct pvrdma_cqe),

                          /* first page is ring state */
@@ -415,7 +415,7 @@ static int create_qp_rings(PCIDevice *pci_dev, uint64_t pdir_dma, 
    wqe_sz = pow2ceil(sizeof(struct pvrdma_sq_wqe_hdr) +

                      sizeof(struct pvrdma_sge) * smax_sge - 1);



    sprintf(ring_name, "qp_sring_%lx", pdir_dma);

    sprintf(ring_name, "qp_sring_%" PRIx64, pdir_dma);

    rc = pvrdma_ring_init(sr, ring_name, pci_dev, sr->ring_state,

                          scqe, wqe_sz, (dma_addr_t *)&tbl[1], spages);

    if (rc) {
@@ -426,7 +426,7 @@ static int create_qp_rings(PCIDevice *pci_dev, uint64_t pdir_dma, 
    rr->ring_state = &sr->ring_state[1];

    wqe_sz = pow2ceil(sizeof(struct pvrdma_rq_wqe_hdr) +

                      sizeof(struct pvrdma_sge) * rmax_sge - 1);

    sprintf(ring_name, "qp_rring_%lx", pdir_dma);

    sprintf(ring_name, "qp_rring_%" PRIx64, pdir_dma);

    rc = pvrdma_ring_init(rr, ring_name, pci_dev, rr->ring_state,

                          rcqe, wqe_sz, (dma_addr_t *)&tbl[1 + spages], rpages);

    if (rc) {

hw/rdma/vmw/pvrdma_dev_ring.c

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


int pvrdma_ring_init(PvrdmaRing *ring, const char *name, PCIDevice *dev,

                     struct pvrdma_ring *ring_state, uint32_t max_elems,

                     size_t elem_sz, dma_addr_t *tbl, dma_addr_t npages)

                     size_t elem_sz, dma_addr_t *tbl, uint32_t npages)

{

    int i;

    int rc = 0;
@@ -35,8 +35,8 @@ int pvrdma_ring_init(PvrdmaRing *ring, const char *name, PCIDevice *dev, 
    ring->ring_state = ring_state;

    ring->max_elems = max_elems;

    ring->elem_sz = elem_sz;

    pr_dbg("ring->elem_sz=%ld\n", ring->elem_sz);

    pr_dbg("npages=%ld\n", npages);

    pr_dbg("ring->elem_sz=%zu\n", ring->elem_sz);

    pr_dbg("npages=%d\n", npages);

    /* TODO: Give a moment to think if we want to redo driver settings

    atomic_set(&ring->ring_state->prod_tail, 0);

    atomic_set(&ring->ring_state->cons_head, 0);