Commit e56b86bc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into staging 



RDMA queue
 * Clang compilation fix
 * Coverity fix
 * Various fixes for the pvrdma device

# gpg: Signature made Sat 19 Jan 2019 09:13:53 GMT
# gpg:                using RSA key 36D4C0F0CF2FE46D
# gpg: Good signature from "Marcel Apfelbaum <marcel.apfelbaum@zoho.com>"
# gpg:                 aka "Marcel Apfelbaum <marcel@redhat.com>"
# gpg:                 aka "Marcel Apfelbaum <marcel.apfelbaum@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: B1C6 3A57 F92E 08F2 640F  31F5 36D4 C0F0 CF2F E46D

* remotes/marcel/tags/rdma-pull-request:
  contrib/rdmacm-mux: fix clang compilation
  hw/rdma: modify struct initialization
  contrib/rdmacm-mux: remove Wno-format-truncation flag
  hw: rdma: fix an off-by-one issue
  hw/rdma: Verify that ptr is not NULL before freeing
  hw/pvrdma: Make function pvrdma_qp_send/recv return void.
  hw/pvrdma: Post CQE when receive invalid gid index
  hw/rdma: Delete unused struct member
  hw/pvrdma: Remove max-sge command-line param
  docs/pvrdma: Update rdmacm-mux documentation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 166609e6 0f645ba1

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -581,6 +581,8 @@ vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a 
	$(call LINK, $^)

vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a

	$(call LINK, $^)



rdmacm-mux$(EXESUF): LIBS += "-libumad"

rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)

contrib/rdmacm-mux/Makefile.objs

+0 −1
Original line number Diff line number Diff line 
ifdef CONFIG_PVRDMA

CFLAGS += -libumad -Wno-format-truncation

rdmacm-mux-obj-y = main.o

endif

contrib/rdmacm-mux/main.c

+7 −5
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 


/* The below can be override by command line parameter */

#define UNIX_SOCKET_PATH "/var/run/rdmacm-mux"

/* Has format %s-%s-%d" <path>-<rdma-dev--name>-<port> */

#define SOCKET_PATH_MAX (PATH_MAX - NAME_MAX - sizeof(int) - 2)

#define RDMA_PORT_NUM 1



typedef struct RdmaCmServerArgs {
@@ -95,7 +97,7 @@ static void help(const char *progname) 
static void parse_args(int argc, char *argv[])

{

    int c;

    char unix_socket_path[PATH_MAX];

    char unix_socket_path[SOCKET_PATH_MAX];



    strcpy(server.args.rdma_dev_name, "");

    strcpy(unix_socket_path, UNIX_SOCKET_PATH);
@@ -113,7 +115,7 @@ static void parse_args(int argc, char *argv[]) 


        case 's':

            /* This is temporary, final name will build below */

            strncpy(unix_socket_path, optarg, PATH_MAX);

            strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX);

            break;



        case 'p':
@@ -348,7 +350,7 @@ static int get_fd(const char *mad, int *fd, __be64 *gid_ifid) 
static void *umad_recv_thread_func(void *args)

{

    int rc;

    RdmaCmMuxMsg msg = {0};

    RdmaCmMuxMsg msg = {};

    int fd = -2;



    msg.hdr.msg_type = RDMACM_MUX_MSG_TYPE_REQ;
@@ -385,7 +387,7 @@ static void *umad_recv_thread_func(void *args) 
static int read_and_process(int fd)

{

    int rc;

    RdmaCmMuxMsg msg = {0};

    RdmaCmMuxMsg msg = {};

    struct umad_hdr *hdr;

    uint32_t *comm_id = 0;

    uint16_t attr_id;
@@ -742,7 +744,7 @@ static void signal_handler(int sig, siginfo_t *siginfo, void *context) 
static int init(void)

{

    int rc;

    struct sigaction sig = {0};

    struct sigaction sig = {};



    rc = init_listener();

    if (rc) {

docs/pvrdma.txt

+3 −1
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ MAD layer to send and receive RDMA-CM MAD packets. 
To build rdmacm-mux run

# make rdmacm-mux



Before running the rdmacm-mux make sure that both ib_cm and rdma_cm kernel

modules aren't loaded, otherwise the rdmacm-mux service will fail to start.



The application accepts 3 command line arguments and exposes a UNIX socket

to pass control and data to it.

-d rdma-device-name  Name of RDMA device to register with
@@ -153,7 +156,6 @@ Ethernet function can be used for other Ethernet purposes such as IP. 
  specify the port to use. If not set 1 will be used.

- dev-caps-max-mr-size: The maximum size of MR.

- dev-caps-max-qp:      Maximum number of QPs.

- dev-caps-max-sge:     Maximum number of SGE elements in WR.

- dev-caps-max-cq:      Maximum number of CQs.

- dev-caps-max-mr:      Maximum number of MRs.

- dev-caps-max-pd:      Maximum number of PDs.

hw/rdma/rdma_backend.c

+24 −39
Original line number Diff line number Diff line
@@ -32,17 +32,6 @@ 
#include "rdma_rm.h"

#include "rdma_backend.h"



/* Vendor Errors */

#define VENDOR_ERR_FAIL_BACKEND     0x201

#define VENDOR_ERR_TOO_MANY_SGES    0x202

#define VENDOR_ERR_NOMEM            0x203

#define VENDOR_ERR_QP0              0x204

#define VENDOR_ERR_INV_NUM_SGE      0x205

#define VENDOR_ERR_MAD_SEND         0x206

#define VENDOR_ERR_INVLKEY          0x207

#define VENDOR_ERR_MR_SMALL         0x208

#define VENDOR_ERR_INV_MAD_BUFF     0x209



#define THR_NAME_LEN 16

#define THR_POLL_TO  5000
@@ -190,7 +179,7 @@ static inline int rdmacm_mux_can_process_async(RdmaBackendDev *backend_dev) 


static int check_mux_op_status(CharBackend *mad_chr_be)

{

    RdmaCmMuxMsg msg = {0};

    RdmaCmMuxMsg msg = {};

    int ret;



    pr_dbg("Reading response\n");
@@ -387,7 +376,7 @@ static int build_host_sge_array(RdmaDeviceResources *rdma_dev_res, 
static int mad_send(RdmaBackendDev *backend_dev, uint8_t sgid_idx,

                    union ibv_gid *sgid, struct ibv_sge *sge, uint32_t num_sge)

{

    RdmaCmMuxMsg msg = {0};

    RdmaCmMuxMsg msg = {};

    char *hdr, *data;

    int ret;
@@ -475,11 +464,6 @@ void rdma_backend_post_send(RdmaBackendDev *backend_dev, 
    }



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

    if (!num_sge || num_sge > MAX_SGE) {

        pr_dbg("invalid num_sge=%d\n", num_sge);

        complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_INV_NUM_SGE, ctx);

        return;

    }



    bctx = g_malloc0(sizeof(*bctx));

    bctx->up_ctx = ctx;
@@ -602,11 +586,6 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, 
    }



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

    if (!num_sge || num_sge > MAX_SGE) {

        pr_dbg("invalid num_sge=%d\n", num_sge);

        complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_INV_NUM_SGE, ctx);

        return;

    }



    bctx = g_malloc0(sizeof(*bctx));

    bctx->up_ctx = ctx;
@@ -938,21 +917,25 @@ void rdma_backend_destroy_qp(RdmaBackendQP *qp) 
static int init_device_caps(RdmaBackendDev *backend_dev,

                            struct ibv_device_attr *dev_attr)

{

    if (ibv_query_device(backend_dev->context, &backend_dev->dev_attr)) {

    struct ibv_device_attr bk_dev_attr;



    if (ibv_query_device(backend_dev->context, &bk_dev_attr)) {

        return -EIO;

    }



    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");

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

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

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

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

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

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

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

    dev_attr->max_sge = MAX_SGE;



    CHK_ATTR(dev_attr, bk_dev_attr, max_mr_size, "%" PRId64);

    CHK_ATTR(dev_attr, bk_dev_attr, max_qp, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_sge, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_qp_wr, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_cq, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_cqe, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_mr, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_pd, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_qp_rd_atom, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_qp_init_rd_atom, "%d");

    CHK_ATTR(dev_attr, bk_dev_attr, max_ah, "%d");



    return 0;

}
@@ -1083,9 +1066,11 @@ static void mad_fini(RdmaBackendDev *backend_dev) 
    pr_dbg("Stopping MAD\n");

    disable_rdmacm_mux_async(backend_dev);

    qemu_chr_fe_disconnect(backend_dev->rdmacm_mux.chr_be);

    if (backend_dev->recv_mads_list.list) {

        qlist_destroy_obj(QOBJECT(backend_dev->recv_mads_list.list));

        qemu_mutex_destroy(&backend_dev->recv_mads_list.lock);

    }

}



int rdma_backend_get_gid_index(RdmaBackendDev *backend_dev,

                               union ibv_gid *gid)
@@ -1112,7 +1097,7 @@ int rdma_backend_get_gid_index(RdmaBackendDev *backend_dev, 
int rdma_backend_add_gid(RdmaBackendDev *backend_dev, const char *ifname,

                         union ibv_gid *gid)

{

    RdmaCmMuxMsg msg = {0};

    RdmaCmMuxMsg msg = {};

    int ret;



    pr_dbg("0x%llx, 0x%llx\n",
@@ -1138,7 +1123,7 @@ int rdma_backend_add_gid(RdmaBackendDev *backend_dev, const char *ifname, 
int rdma_backend_del_gid(RdmaBackendDev *backend_dev, const char *ifname,

                         union ibv_gid *gid)

{

    RdmaCmMuxMsg msg = {0};

    RdmaCmMuxMsg msg = {};

    int ret;



    pr_dbg("0x%llx, 0x%llx\n",