From patchwork Sat Jan 19 10:03:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="F+2r+Ny5"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYM06hkJz9sBQ for ; Sat, 19 Jan 2019 21:04:28 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknUI-0001NS-KO for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:04:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTZ-0001Ls-Nf for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00082M-06 for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTW-0007pC-VR for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:40 -0500 Received: by mail-wr1-x444.google.com with SMTP id v13so17926606wrw.5 for ; Sat, 19 Jan 2019 02:03:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tYJSBD3uuQ0qALZnBTZUqb8xxIhvAinDhje5pEbgHfE=; b=F+2r+Ny5eDnYLvGEWuBki7N0qtYqpoyPwFH2WOMl1VcoJfHmafLUv2tq/5b2z57Pp1 hF+BHzMhjcdqhxPmEzn4A0skJruCNyI+at+4NuUSON8IzA9/NIinCZP4pLQZzXvqj6/8 pGZsGzxUTneSHNJFAfS5jpjwtl61Yw/KYMbDPKMOU1Rb82kReQe12MF5JLuKoLWqn6vC jDVJdenCpcOOSzsTnh2Pc6myU4mFaFjfsu47xnZzDOjN+u5a5bD5YxOijq3TgpWp0Znr fulrjSlrYnOJWqf+mdKF2ijAUcBmcVnB06k9Zs562U+LOIcPjAHf4ttNAq/J8KtojfHN nfvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tYJSBD3uuQ0qALZnBTZUqb8xxIhvAinDhje5pEbgHfE=; b=txBNfFSkMc3Xt77evzyuZpHpychhoVofbTvARqDNPQ2kmyK88VIwZ4KOgdCPFGZqOd SzVziyQ3UckrG4x5yXBja+vd90B4fSG5bNbJqXVXkaU+a1tNWuh2lTMYL1MSPjUFKZRq tQuT6PtDV7tp4y6CgeZyjkNI6tvaULRZYpw3auTE4bBDnGVex0D+CIbBRj17AqZu3DXq uR+Yaz/fmDylUK8KxW0PXSDgPPAoXt2JqSHOnLhfwGXIBIRV9gU8jD6FNaHsmmT/4IHt pUrBpMUNCZIC5Cft28274x1LzRW8DV4tAJ8jPQpcWrjzsiM4asJIOIcnid+ba6vuhffD Odnw== X-Gm-Message-State: AJcUukeRg/GgVE+jaIrm52G1KvQgxJ6ED7YiFfV7Oz5o7LZgN+ptKIlc ichkyE4UHf3F4san0E/SPltkkc9b X-Google-Smtp-Source: ALg8bN71JT82q4Va9tDbYzrjMNVI+6yVvv66uTk5cHwXXjKBL2VzVKz4M/XCyXPlp9ltC+wsuM10+Q== X-Received: by 2002:adf:f052:: with SMTP id t18mr20928251wro.112.1547892200382; Sat, 19 Jan 2019 02:03:20 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:19 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:06 +0200 Message-Id: <20190119100315.23985-2-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH PULL 01/10] docs/pvrdma: Update rdmacm-mux documentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Kamal Heib Before running the rdmacm-mux need to make sure that both the ib_cm and rdma_cm kernel modules are unloaded. Reviewed-by: Yuval Shaia Signed-off-by: Kamal Heib Message-Id: <20190109132829.19164-1-kamalheib1@gmail.com> Signed-off-by: Marcel Apfelbaum --- docs/pvrdma.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/pvrdma.txt b/docs/pvrdma.txt index 5175251b47..81959378b1 100644 --- a/docs/pvrdma.txt +++ b/docs/pvrdma.txt @@ -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 From patchwork Sat Jan 19 10:03:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MGzaIeD7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYTl55p3z9s2P for ; Sat, 19 Jan 2019 21:10:18 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknZv-0006SL-Ge for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:10:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTb-0001N9-8D for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00083B-GK for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:43 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:50644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007qx-5V for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wm1-x342.google.com with SMTP id n190so6683569wmd.0 for ; Sat, 19 Jan 2019 02:03:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rpvk67SOKANBS4Yvg060Izb+4UTq2jlqpeTx8nVQIjg=; b=MGzaIeD7wJKaKwvWm/Qqq1w+3SeAt+VR2vJGvl/1X9k2atgGaOWvK5B1GUPuGfjO5N uI4r/OiAVXoChCCBN5oEFKP51WEAkswgsl0mRijtyAs8MABrrfYCs75dcCnZ8I3zDnO3 689trkwS2EfIAmEXE6Jdpo2xmAv8zkfhc3EetaL+osna9UZPbyeJUALBmWKPGRRLeQ1S D3BmnKSk48fnTcppDRPIAyYb2IZLt2BRVBa+Zaf6T/M4Kvmg0hn60Ek45HuY8nIRkgYS 1faq+l4InhbmXuW4q98nPLNAh9DOhfjfbB1PVdab7bsX15fiyXJmM4FW/fabhrv9LN6+ oX6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rpvk67SOKANBS4Yvg060Izb+4UTq2jlqpeTx8nVQIjg=; b=qQfMNKuoTf1BGmLQgd/nlcjn2xDrSrio+yZzzRN5UlmCtD6mzuOvjIMD+qrThfeJni dRZmZhFKmAMyy2+BEsGyxaPjeeJUeG50nUcuNXRhmxCC7g/mgaTSdVV7UeEphQfq3oR/ Y8utue7HE9eKDb8TC4NtqL45BpTPFB8rnvl5eM12BHc8ATgsIN75g32GjBQNQJP8IOeD YbGPYf+b/kIGUSYbTDWOzCiA2alT5Eas+gRch3T7MW63G/mN8F+3SCaMwRfnqfy+4NDG 2dCQfZRmfEYo8c4s9h3ozppYYyYSi1ggl48HbHxEKMScZ5M6Kcb0MiNop/FxgG+drnOk U5JQ== X-Gm-Message-State: AJcUukeCU3ITip2dsCmmulXBIbxZYOHcvj8O0T2KLoelA/StrEZAtHLe Wznbs7fesLjgIKfFJIm8eldj/31A X-Google-Smtp-Source: ALg8bN6E3gyJAiQmy0qub8dveGEH/Uhbzaenr4uqhTj2vSGkejet8b1Gg4U8jYtPqYA1OlX2izudRQ== X-Received: by 2002:a1c:dc86:: with SMTP id t128mr19417174wmg.42.1547892202105; Sat, 19 Jan 2019 02:03:22 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:21 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:07 +0200 Message-Id: <20190119100315.23985-3-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH PULL 02/10] hw/pvrdma: Remove max-sge command-line param X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia This parameter has no effect, fix it. The function init_dev_caps sets the front-end's max-sge to MAX_SGE. Then it checks backend's max-sge and adjust it accordingly (we can't send more than what the device supports). On send and recv we need to make sure the num_sge in the WQE does not exceeds the backend device capability. This check is done in pvrdma level so check on rdma level is deleted. Signed-off-by: Yuval Shaia Message-Id: <20190109194123.3468-1-yuval.shaia@oracle.com> Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- docs/pvrdma.txt | 1 - hw/rdma/rdma_backend.c | 23 ++--------------------- hw/rdma/rdma_backend.h | 11 +++++++++++ hw/rdma/vmw/pvrdma_main.c | 10 +++++----- hw/rdma/vmw/pvrdma_qp_ops.c | 24 ++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 27 deletions(-) diff --git a/docs/pvrdma.txt b/docs/pvrdma.txt index 81959378b1..0f0dd8a7e5 100644 --- a/docs/pvrdma.txt +++ b/docs/pvrdma.txt @@ -156,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. diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index c28bfbd44d..16dca69ee9 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -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 @@ -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; @@ -942,6 +921,8 @@ static int init_device_caps(RdmaBackendDev *backend_dev, return -EIO; } + dev_attr->max_sge = MAX_SGE; + 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"); diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 8cae40f827..a9ba40ae48 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -22,6 +22,17 @@ #include "rdma_rm_defs.h" #include "rdma_backend_defs.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 + /* Add definition for QP0 and QP1 as there is no userspace enums for them */ enum ibv_special_qp_type { IBV_QPT_SMI = 0, diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 838ad8a949..d2bdb5ba8c 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -43,7 +43,6 @@ static Property pvrdma_dev_properties[] = { DEFINE_PROP_UINT64("dev-caps-max-mr-size", PVRDMADev, dev_attr.max_mr_size, MAX_MR_SIZE), DEFINE_PROP_INT32("dev-caps-max-qp", PVRDMADev, dev_attr.max_qp, MAX_QP), - DEFINE_PROP_INT32("dev-caps-max-sge", PVRDMADev, dev_attr.max_sge, MAX_SGE), DEFINE_PROP_INT32("dev-caps-max-cq", PVRDMADev, dev_attr.max_cq, MAX_CQ), DEFINE_PROP_INT32("dev-caps-max-mr", PVRDMADev, dev_attr.max_mr, MAX_MR), DEFINE_PROP_INT32("dev-caps-max-pd", PVRDMADev, dev_attr.max_pd, MAX_PD), @@ -549,8 +548,9 @@ static void init_dev_caps(PVRDMADev *dev) sizeof(struct pvrdma_rq_wqe_hdr)); dev->dev_attr.max_qp_wr = pg_tbl_bytes / - (wr_sz + sizeof(struct pvrdma_sge) * MAX_SGE) - - TARGET_PAGE_SIZE; /* First page is ring state */ + (wr_sz + sizeof(struct pvrdma_sge) * + dev->dev_attr.max_sge) - TARGET_PAGE_SIZE; + /* First page is ring state ^^^^ */ pr_dbg("max_qp_wr=%d\n", dev->dev_attr.max_qp_wr); dev->dev_attr.max_cqe = pg_tbl_bytes / sizeof(struct pvrdma_cqe) - @@ -626,8 +626,6 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) init_regs(pdev); - init_dev_caps(dev); - rc = init_msix(pdev, errp); if (rc) { goto out; @@ -640,6 +638,8 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) goto out; } + init_dev_caps(dev); + rc = rdma_rm_init(&dev->rdma_dev_res, &dev->dev_attr, errp); if (rc) { goto out; diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index 300471a4c9..465bee8641 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -121,6 +121,16 @@ static void pvrdma_qp_ops_comp_handler(void *ctx, struct ibv_wc *wc) g_free(ctx); } +static void complete_with_error(uint32_t vendor_err, void *ctx) +{ + struct ibv_wc wc = {0}; + + wc.status = IBV_WC_GENERAL_ERR; + wc.vendor_err = vendor_err; + + pvrdma_qp_ops_comp_handler(ctx, &wc); +} + void pvrdma_qp_ops_fini(void) { rdma_backend_unregister_comp_handler(); @@ -182,6 +192,13 @@ int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) return -EIO; } + if (wqe->hdr.num_sge > dev->dev_attr.max_sge) { + pr_dbg("Invalid num_sge=%d (max %d)\n", wqe->hdr.num_sge, + dev->dev_attr.max_sge); + complete_with_error(VENDOR_ERR_INV_NUM_SGE, comp_ctx); + continue; + } + rdma_backend_post_send(&dev->backend_dev, &qp->backend_qp, qp->qp_type, (struct ibv_sge *)&wqe->sge[0], wqe->hdr.num_sge, sgid_idx, sgid, @@ -227,6 +244,13 @@ int pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) comp_ctx->cqe.qp = qp_handle; comp_ctx->cqe.opcode = IBV_WC_RECV; + if (wqe->hdr.num_sge > dev->dev_attr.max_sge) { + pr_dbg("Invalid num_sge=%d (max %d)\n", wqe->hdr.num_sge, + dev->dev_attr.max_sge); + complete_with_error(VENDOR_ERR_INV_NUM_SGE, comp_ctx); + continue; + } + rdma_backend_post_recv(&dev->backend_dev, &dev->rdma_dev_res, &qp->backend_qp, qp->qp_type, (struct ibv_sge *)&wqe->sge[0], wqe->hdr.num_sge, From patchwork Sat Jan 19 10:03:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g5WeXleL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYWf6GwNz9s2P for ; Sat, 19 Jan 2019 21:11:58 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknbY-00085C-TK for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:11:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTa-0001MS-H9 for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00082i-FN for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:33498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007ry-3R for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wm1-x343.google.com with SMTP id r24so2638911wmh.0 for ; Sat, 19 Jan 2019 02:03:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=taMlslyGH8YAoOO9e/T4VryOWswhKcy2nPy5LB3Jymk=; b=g5WeXleLou4jFx/m+r8Zef8IeZmBtGsOUu7wr16MtsAzCeluK7hbXHemH+EdSlndFe g9K+Od6FOec6uldspAbX9DAfJptQxl8Rh36J0BhJrFKZMAWWQU2faeTo3DS0opRluKeq XiM18lmWkbEhTiYEysY+9gM9cGzrEKJ6CpkAQrOKh3SFRjFyVibpxEEG5xXSqIYxI4xc dHzqfHOmoXJ+xaKMrb6ITR2Z6wMQ+Ady/MpmYNadIIDCUG7VdpZUU7aLDecOXhRgqYCy 3df4yTU7dJyTLnxGpCeZPdbNCoQQeGj6fs+EfvgXbOCwUsF080KzHug5PGhC+zuGJVDq Vnug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=taMlslyGH8YAoOO9e/T4VryOWswhKcy2nPy5LB3Jymk=; b=s3OFUMMB62Zr5OKxEOZldgybnyqyYDIvsEwIptTg0rJoC9v20SHOWblfv8edLYGP0f ZDUJFETtC2yshkRSylveXyP/lIXwDlG3kw64UwlQ2bxR3kNLNfpi2Bb4KzHc+Kpl9li8 eYVWDUE9lWyDHr7kFtGeuW4nuoXQZBAquIePSbkDVMX2CYeJu6PZzgNhFTfrKQRnWGIf LhxvCNfKp8cm5xoDhyWao8/+e5W2Q9frebL4Wt4KbvRLPVz02x3PZvdQ3nWCxqGi+z72 F1zi5SoRW7E7Fgq3lFRswqML18reMHiCEkgVbAS6U9RUDaWhv8Phz7pw1NcZ4CaDYhOs kIKw== X-Gm-Message-State: AJcUukfdpHeHxmgu4N/eboNWfLYVRecB/Kfl1peOIYbUdl4Fv5vXZKMy GWFGIczCt3XhjvqrI7A4x7FhqkOh X-Google-Smtp-Source: ALg8bN55Q3TaDDe46QA6QqpYJI6GF3xapWi4w1wEgBL9lti/dE+0AToHoUNF6HlAymfXRau5p+guyA== X-Received: by 2002:a1c:bdc5:: with SMTP id n188mr19431337wmf.69.1547892203724; Sat, 19 Jan 2019 02:03:23 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:23 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:08 +0200 Message-Id: <20190119100315.23985-4-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH PULL 03/10] hw/rdma: Delete unused struct member X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia This member is used only in init_device_caps function, make it local. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 26 ++++++++++++++------------ hw/rdma/rdma_backend_defs.h | 1 - 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 16dca69ee9..b49edaacaf 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -917,23 +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; } dev_attr->max_sge = MAX_SGE; - 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"); + 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; } diff --git a/hw/rdma/rdma_backend_defs.h b/hw/rdma/rdma_backend_defs.h index 1e5c3dd3bf..15ae8b970e 100644 --- a/hw/rdma/rdma_backend_defs.h +++ b/hw/rdma/rdma_backend_defs.h @@ -41,7 +41,6 @@ typedef struct RdmaCmMux { } RdmaCmMux; typedef struct RdmaBackendDev { - struct ibv_device_attr dev_attr; RdmaBackendThread comp_thread; PCIDevice *dev; RdmaDeviceResources *rdma_dev_res; From patchwork Sat Jan 19 10:03:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S9XmUjCv"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYTl55pnz9s9G for ; Sat, 19 Jan 2019 21:10:18 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknZu-0006T3-JG for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:10:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTa-0001Mg-Pt for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00083Q-Nt for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33739) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007tZ-Ge for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wr1-x444.google.com with SMTP id c14so17960877wrr.0 for ; Sat, 19 Jan 2019 02:03:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LCVOGzUYrR6148m8WdfYBWlea+KS1E6E2RI4GN4WWkk=; b=S9XmUjCvlj6Vu0gLRwNH8HpDDKcOOUwy2GuXGzfiG0GxCQbkiDDgEEVnTzFZXw5Wlw rosT4jxqxZEATE5gMAXWgbsx87Bqd5as4jL4wErItytlQrOq+/vxK6h/adosuKiNCC9i fAorDMgeZv/pLa2Ho+uG1WOe1qFeDx7OVLBh92B03k0Yv2I2oCyBSxhAi93+0SG7VF6T X8dn6LncAFjU5tIp/N9m8Zd5g++PtpZ53GsUsttyZVLhPcZWnxdHg15PpNkbWqgJfy33 gAqD7y/j4whjkJjVk0KErOqkJSBXn84otlLD2/1ba+0wr+mXUxbpSRB6KUmZJhHC93kL Yq1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LCVOGzUYrR6148m8WdfYBWlea+KS1E6E2RI4GN4WWkk=; b=NjU3L+yQsC/fBU4w8sLE5cmVU8L2RNYh/9Tajm/GDAbYIDjqLksvFrHdaF1dF6jF5l ty1UBlMz1Ik7vNoPuP3O4joaIKRkMSJnL7H8LFmf7Ks3A31TRdF4RnjeVkEEwPpZDYlR KoGSY2J8Zh9tods08txgi3WrlvwJI6F96hGDNKeO4AkkMDzQJ8EK/a3vGWLtNKNCxbEa IyUM6JpTiQrhNiUdr5r62URdqLlGwcwqFN+0SnEXaRp2eHL3OlY3Ag+Bf9tQfdJ6zF/Q IJxf+3JgEsyNy3neYj/sWvPxQNyTrUOmC2OpPz/PDdyKct2OgCeL572kUmtr8huEQL8E 3sUw== X-Gm-Message-State: AJcUukdDpf0hotkATDLByqPa2S0KVGlKey5NNFaRBF12WP0W7ZPIE25A SnbUbyN1uqu4LudEXTR4JP8WNuU5 X-Google-Smtp-Source: ALg8bN4aO+xEIfuiOISbiD6UYYbnNDXApWLoYiIyT0A34lhUG3ZHBtIytGLSLQs2623VGo3WVdM5jw== X-Received: by 2002:adf:dd06:: with SMTP id a6mr20899551wrm.2.1547892205399; Sat, 19 Jan 2019 02:03:25 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:24 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:09 +0200 Message-Id: <20190119100315.23985-5-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH PULL 04/10] hw/pvrdma: Post CQE when receive invalid gid index X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia This error should propagate back to guest. Spotted by Coverity: CID 1398595 Fixes: 2b05705dc8 Reported-by: Li Qiang Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.h | 1 + hw/rdma/vmw/pvrdma_qp_ops.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index a9ba40ae48..5114c90e67 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -32,6 +32,7 @@ #define VENDOR_ERR_INVLKEY 0x207 #define VENDOR_ERR_MR_SMALL 0x208 #define VENDOR_ERR_INV_MAD_BUFF 0x209 +#define VENDOR_ERR_INV_GID_IDX 0x210 /* Add definition for QP0 and QP1 as there is no userspace enums for them */ enum ibv_special_qp_type { diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index 465bee8641..0565eba981 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -178,7 +178,8 @@ int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) sgid = rdma_rm_get_gid(&dev->rdma_dev_res, wqe->hdr.wr.ud.av.gid_index); if (!sgid) { pr_dbg("Fail to get gid for idx %d\n", wqe->hdr.wr.ud.av.gid_index); - return -EIO; + complete_with_error(VENDOR_ERR_INV_GID_IDX, comp_ctx); + continue; } pr_dbg("sgid_id=%d, sgid=0x%llx\n", wqe->hdr.wr.ud.av.gid_index, sgid->global.interface_id); @@ -189,7 +190,8 @@ int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) if (sgid_idx <= 0) { pr_dbg("Fail to get bk sgid_idx for sgid_idx %d\n", wqe->hdr.wr.ud.av.gid_index); - return -EIO; + complete_with_error(VENDOR_ERR_INV_GID_IDX, comp_ctx); + continue; } if (wqe->hdr.num_sge > dev->dev_attr.max_sge) { From patchwork Sat Jan 19 10:03:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SFg7ILCY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYQM2w5tz9sBQ for ; Sat, 19 Jan 2019 21:07:23 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknX7-0003yp-A6 for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:07:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTa-0001MR-Go for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-000832-GO for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:37955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007un-5M for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wr1-x441.google.com with SMTP id v13so17926835wrw.5 for ; Sat, 19 Jan 2019 02:03:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JdRyIjz11gpJSpvkLHp0MjuG5v+9KC0pq8K+iFDQ4sk=; b=SFg7ILCYOH4XoKcx8w31cTit/IYkDbJk3CIFmpsW7y5GbtgPolYlFakH3ruNIthhdd qMHMLhqr6Kvw6YFbRDbvEi0Phi/6NKDjD0w3toLlUOl1O12ayaq3aQN6uSC5Tu0vykqm tfGSd5v6MjaZpVGXCVz3diNzIrmEtnE2vtuDtmDsINgST9peOrT++kS+hOIF4Fb8CRsb D2Ajh/xobtc7pOTqQW5o5TJx5xmLmUNU7q+aTIRLswqwuNYCVKLLutMxJnO6sjYDwdHg 8eD8HVMuWCoUSyzMlnxgIm1DfJal5Jv1WOvL20RR/3NyTE4bMtxxspZrgtR59p3dfeWb Kj7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JdRyIjz11gpJSpvkLHp0MjuG5v+9KC0pq8K+iFDQ4sk=; b=R2HYfs/6ENpj+w7xLWMReZsfagwbisnjp71Nwk5UbRO7b1nWlpk0sX7lpBMpyeGZFG JJWHgIutW3dkmN0zv1IKuIhD7XCrmtViPxJrGngBXcXnrDrGEzeueiXvKzNC0ew1d5Pc +kXUBVLLC1ZzzMu1psGYqFwN6XM+5lo7kQXAO4OSzq38gFLi56npY6tOs/UHBPWVSuIp 3qA9LX8ekiMSb5cihvRqmKDYC3gZahmJVGBMt1niALgtFBQIpLzEMVE9SZsVu/mrtcIE GRdtWSnXvSZPwtX+P7NfA/WYkl/zyhMki2w4L5zfG/WXpsufUEVd1vkaV3QKIbgJCbla Z0MA== X-Gm-Message-State: AJcUukcPbeLT9nhZl9pJxhcSAjhkABzcxnxBzY394FsvbaQcAXsTntpx x4U4YlgFrOMo/9OhQTAzf6/OENp6 X-Google-Smtp-Source: ALg8bN5TqIQ685qKpz5usjqqy/riF8nB8LMybmZgFASMvX4VHh6udLS/SeeCG/cFPOxWLw2O4ge2GQ== X-Received: by 2002:adf:f5d1:: with SMTP id k17mr21426719wrp.59.1547892207122; Sat, 19 Jan 2019 02:03:27 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:26 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:10 +0200 Message-Id: <20190119100315.23985-6-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH PULL 05/10] hw/pvrdma: Make function pvrdma_qp_send/recv return void. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia The functions handles errors internaly, callers have nothing to do with the return value. Signed-off-by: Yuval Shaia Message-Id: <20190109202140.4051-1-yuval.shaia@oracle.com> Reviewed-by: Marcel Apfelbaum Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_qp_ops.c | 14 ++++++-------- hw/rdma/vmw/pvrdma_qp_ops.h | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index 0565eba981..ce5a60e184 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -143,7 +143,7 @@ int pvrdma_qp_ops_init(void) return 0; } -int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) +void pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) { RdmaRmQP *qp; PvrdmaSqWqe *wqe; @@ -155,7 +155,8 @@ int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) qp = rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { - return -EINVAL; + pr_dbg("Invalid qpn\n"); + return; } ring = (PvrdmaRing *)qp->opaque; @@ -212,11 +213,9 @@ int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) wqe = pvrdma_ring_next_elem_read(ring); } - - return 0; } -int pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) +void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) { RdmaRmQP *qp; PvrdmaRqWqe *wqe; @@ -226,7 +225,8 @@ int pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) qp = rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { - return -EINVAL; + pr_dbg("Invalid qpn\n"); + return; } ring = &((PvrdmaRing *)qp->opaque)[1]; @@ -262,8 +262,6 @@ int pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) wqe = pvrdma_ring_next_elem_read(ring); } - - return 0; } void pvrdma_cq_poll(RdmaDeviceResources *dev_res, uint32_t cq_handle) diff --git a/hw/rdma/vmw/pvrdma_qp_ops.h b/hw/rdma/vmw/pvrdma_qp_ops.h index ac46bf7fdf..31cb48ba29 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.h +++ b/hw/rdma/vmw/pvrdma_qp_ops.h @@ -20,8 +20,8 @@ int pvrdma_qp_ops_init(void); void pvrdma_qp_ops_fini(void); -int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle); -int pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle); +void pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle); +void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle); void pvrdma_cq_poll(RdmaDeviceResources *dev_res, uint32_t cq_handle); #endif From patchwork Sat Jan 19 10:03:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dgU9SyGJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYQK3m9Sz9s9G for ; Sat, 19 Jan 2019 21:07:21 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknX5-0003xV-Cg for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:07:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTa-0001MM-GR for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00082x-GA for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41305) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007ve-4o for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wr1-x443.google.com with SMTP id x10so17872128wrs.8 for ; Sat, 19 Jan 2019 02:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bG5cUfd2eVTyoes7wh2AGtQRcKHR5KJhjZcxtKUpV0E=; b=dgU9SyGJSGBSlcyxQ8m9u0yzNTp2IedqlBxtz6dnuNEx6KxkaS/4QI+j4Qh0fKiN/d 8DElF5DadGc5394UZvggr1KDPrpAzwRIi1moq4tM+JXudqxn3fJQToz3fmuLwwAaUCPK F6IdZqNqxVjK7Nb8bZIcn9WYEo4lgWBc5/UObV3fq0y/TtxKhqf3gb08rRFBoEM/bX4f 5T903ifpKs7IEU23Va4CsufylA4wSUZHkhmJzucgVfEt3d/Wtr0LcEQfnVt//4nTJ7Is Ley329BUeBnw0fQspXk3BFiw2Ua9KGfgvXwDjL9epRAYnlKZCGDHMoN1zIJtHfPtobq4 7GKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bG5cUfd2eVTyoes7wh2AGtQRcKHR5KJhjZcxtKUpV0E=; b=pe/MLiobfW7l09/65UkWUONuHC+s0EkK01H67scH9qHbjpEfxB1qz4i+CwL7dYAL/p SysYQXc4ZEpTWzTnul7JmSsB/RROagXGurQzXx3SrtmQJb/35SExJwbmx4N42viLxCyO FzeNNnKcbYsDgzG2RE66Vk892QqgsSgVKzWfBRIWuVAFNRyGZQXL0KOp4Xa7/g4XaIVi 6vuSFBEvm0pVagSR3goIqKXYB6fEXhphYo/NZGmSEA6Gna540x678WmS0bDfSxAJI6se l7vOlDEJeilpYvuaEn6C749ZJjyTUlMaAqoEXv4f+O8TeOht6gTyTnAl7BSdtIrUo9AZ 9VcQ== X-Gm-Message-State: AJcUukfl/KhCy3hGxev5sEU1WfhDFviscu+9y98V4BfVBx+lHe4J0y3a 0Ru2Mf1BLh4T1aMBX3cS4wJ6ggZ5 X-Google-Smtp-Source: ALg8bN5wRxPpTNHukwj1NsBy1fxWVPxtmeD4fuXSXiJFfmvQCcO+JkOUlFMnQUiN/h3EZtdH76E9+A== X-Received: by 2002:adf:f149:: with SMTP id y9mr21578734wro.284.1547892208753; Sat, 19 Jan 2019 02:03:28 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:28 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:11 +0200 Message-Id: <20190119100315.23985-7-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH PULL 06/10] hw/rdma: Verify that ptr is not NULL before freeing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia To cover the case where fini() was called even when init() fails make sure objects are not NULL before calling to non-null-safe destructors. Signed-off-by: Yuval Shaia Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190116151538.14088-1-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 6 ++++-- hw/rdma/rdma_rm.c | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index b49edaacaf..3ee5172c96 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -1066,8 +1066,10 @@ 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); - qlist_destroy_obj(QOBJECT(backend_dev->recv_mads_list.list)); - qemu_mutex_destroy(&backend_dev->recv_mads_list.lock); + 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, diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index f5b1295890..8bf241e91f 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -41,6 +41,9 @@ static inline void res_tbl_init(const char *name, RdmaRmResTbl *tbl, static inline void res_tbl_free(RdmaRmResTbl *tbl) { + if (!tbl->bitmap) { + return; + } qemu_mutex_destroy(&tbl->lock); g_free(tbl->tbl); g_free(tbl->bitmap); @@ -655,5 +658,7 @@ void rdma_rm_fini(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, res_tbl_free(&dev_res->cq_tbl); res_tbl_free(&dev_res->pd_tbl); - g_hash_table_destroy(dev_res->qp_hash); + if (dev_res->qp_hash) { + g_hash_table_destroy(dev_res->qp_hash); + } } From patchwork Sat Jan 19 10:03:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n8n7l/0l"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYR30hB3z9s9G for ; Sat, 19 Jan 2019 21:07:59 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknXh-0004SM-0C for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:07:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTb-0001NL-Fp for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00082m-FM for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:43 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:37957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007wT-2u for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wr1-x443.google.com with SMTP id v13so17926965wrw.5 for ; Sat, 19 Jan 2019 02:03:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DjY5u1tA0CXcT1bVZvYnIiD+NeHhUiM9nMhxIpSLSg0=; b=n8n7l/0l/Zqa4eF0RA7/4PNGfUi9QHUO3SctSfBOC176rP9NugpS4aTkA06mRqiDgy IYgtx8DDcDCRA+XfflIKdraBlwUls0NPuXeO+u5X2C0AZb3E6xphzIDx4uInGzuE+ifI H06057ktV1Xy7MG0VfE8vslvOoQyOvTvawEd5w+0YzqsycNSRFfQOp+HE8wPpcN5b7Ev /0OxuJUHzSp1gFw59TqcLy7ox0q625nCDw51hLfb9EksalY0iIz6woW+GDY9oXR925nb KEfy9r5GfkBDOkL+FlhF0/lT/ooqWv2knIHb3CnmTQ5fTYHDmPPvxUiQnll70L/o2wIX A72w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DjY5u1tA0CXcT1bVZvYnIiD+NeHhUiM9nMhxIpSLSg0=; b=D3nW0B0SpqqNqyDJwfrwcsf76wKsrmBLU24slLinKk6b4gx0NHqcX+WAxiftLwEUpx z5n5AyPyRHShM5BrKZVkgUgM0FUuzgpkkFGNsvAvFj8Ep6eQNZJvAI+E+y15jXtrRzUS 5895LKiY58xIY8DUdFjY6Kbqqr7MCG+fRLKdLayTsdiNMHjjKt14zTHobsGVzTGeALm1 0NRp7jqPaytZqwdDgtn+nWDkrBB9vewL+xDFKqVfpZorzlp21GbOWQ1GwQq5d2dfPqiO /+lT+duCS5u7dSWzHJIgCf4YLYZlzGlunjDjibmxRiT8LV35YP/dLUhMM1e3uuwlLqTQ kcRg== X-Gm-Message-State: AJcUukfOXQqpXErkS84P9ig7ByxF0YQIEnyRY6/EtyeJ1TQPqnLF/BEZ 0FKzn3sdDkynfXehpyw5XQgiIlSN X-Google-Smtp-Source: ALg8bN7eok4KKlLLUxM7/pw1VV3aLRLO6OvkJKqRif4gF4jNG4Ixh8/0HLk1XPG2XDi1p2CZR58Iig== X-Received: by 2002:adf:f903:: with SMTP id b3mr20877662wrr.82.1547892210474; Sat, 19 Jan 2019 02:03:30 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:29 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:12 +0200 Message-Id: <20190119100315.23985-8-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH PULL 07/10] hw: rdma: fix an off-by-one issue X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang In rdma_rm_get_backend_gid_index(), the 'sgid_idx' is used to index the array 'dev_res->port.gid_tbl' which size is MAX_PORT_GIDS. Current the 'sgid_idx' may be MAX_PORT_GIDS thus cause an off-by-one issue. Spotted by Coverity: CID 1398594 Signed-off-by: Li Qiang Message-Id: <20190103131251.49271-1-liq3ea@163.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_rm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 8bf241e91f..268ff633a4 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -579,7 +579,7 @@ int rdma_rm_del_gid(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, int rdma_rm_get_backend_gid_index(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, int sgid_idx) { - if (unlikely(sgid_idx < 0 || sgid_idx > MAX_PORT_GIDS)) { + if (unlikely(sgid_idx < 0 || sgid_idx >= MAX_PORT_GIDS)) { pr_dbg("Got invalid sgid_idx %d\n", sgid_idx); return -EINVAL; } From patchwork Sat Jan 19 10:03:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qQIQWv0V"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYM603gFz9s9G for ; Sat, 19 Jan 2019 21:04:34 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknUO-0001QQ-06 for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:04:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTb-0001Mw-2w for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00083a-Pu for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007xI-HI for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wr1-x442.google.com with SMTP id t27so17911906wra.6 for ; Sat, 19 Jan 2019 02:03:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=38uBQMnzVhKMSVsXc4IUmypAMk+DIDMExaJvPDNuuKg=; b=qQIQWv0VYJlKATFbzfZehPS1ePjy+9UMxjNTYo7KSZAm3PQnSsQOnhows952VX9GIs Jr8Y0yk/3DivT0s2RMG6gLCLKUQ6piGAGO1nxVlwxBcjtAT+PE/gQB/bMBB3LLz4rfwG fVm+PiVUl17wWzHy4+ypa/VnFpdijb/AV0i5FrJMfJG3I6GUr1qDfz6yRlLk64UP/yVn woMQHFw+LKk2Xqge5KMn74gKDJoOgn3OzSHITiHHCAWLs+N+tLQmGaPJEzNA9XkZXjjX h4Q0ypl14KQ+Y4xHAs71WVgPTeCHqFB/leA9hOPf3cJFRhmefguIBHYeh/F8hMjvLG17 1msA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=38uBQMnzVhKMSVsXc4IUmypAMk+DIDMExaJvPDNuuKg=; b=tutt6CMfARHJvZwifOp3jsyU6oi+ACrL1FB5LXK7BchougRmZhgxZGWs5AedttO+ir 5xX3dqbISleCJ51LSvdfaEXpgdNYBOsCQXfp7Jh8nwEnRNw4jDIJpBmOV+NxxACmA62Y AH9QYQn+3mOetJEv4n44a40z5KgYLgXv60WYkvgJn/ytcz9o38xLk/rN4iBWHD2ASVbN L18YQVMsU9kpO1ukvgiPB1E2Ls7dAQlDIySjAB7/Nkg4khoGl/RhSHgNoZioIhRHynks rZMyZFT2NGSTFw/8BcitzRZf82xcVcixGfRkt2Y9oJ1rHnB/SFMNqEmC4GTyMm+P9N+2 ayFg== X-Gm-Message-State: AJcUuke3GA4NuppyhUu1371d5g2gXYyb2Hfq4EYA1pKnlI/1ivnHshoy sshGAgcY1uHBJ6NhXyBOHgB1rllH X-Google-Smtp-Source: ALg8bN5mK4azQOnARTCHg0YKwlkn3bQ/wtmwVaWLdrs/OvyYxIVYwDYrk/vfygfH6heEwARA6RFyag== X-Received: by 2002:a5d:4046:: with SMTP id w6mr20843629wrp.92.1547892212095; Sat, 19 Jan 2019 02:03:32 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:31 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:13 +0200 Message-Id: <20190119100315.23985-9-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH PULL 08/10] contrib/rdmacm-mux: remove Wno-format-truncation flag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The flag is not recognized by some CLANG versions. Add proper constraints in code instead. Reviewed-by: Yuval Shaia Tested-by: Cornelia Huck Message-Id: <20190118124614.24548-2-marcel.apfelbaum@gmail.com> Signed-off-by: Marcel Apfelbaum --- contrib/rdmacm-mux/Makefile.objs | 2 +- contrib/rdmacm-mux/main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs index be3eacb6f7..e1ff4fe569 100644 --- a/contrib/rdmacm-mux/Makefile.objs +++ b/contrib/rdmacm-mux/Makefile.objs @@ -1,4 +1,4 @@ ifdef CONFIG_PVRDMA -CFLAGS += -libumad -Wno-format-truncation +CFLAGS += -libumad rdmacm-mux-obj-y = main.o endif diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c index 835a7f9214..64676030c5 100644 --- a/contrib/rdmacm-mux/main.c +++ b/contrib/rdmacm-mux/main.c @@ -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" -- */ +#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': From patchwork Sat Jan 19 10:03:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SXanBCl3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYMk4631z9s9G for ; Sat, 19 Jan 2019 21:05:06 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknUu-000226-9F for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:05:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTa-0001MW-Ip for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00082z-G7 for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:33738) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007yC-51 for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wr1-x442.google.com with SMTP id c14so17961119wrr.0 for ; Sat, 19 Jan 2019 02:03:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RWpm4s6suXUULHYYxvCe5wmy7oSHrp2mtLdgHvw2SbE=; b=SXanBCl3fNKjC5gM/xRAjzQKK68R2YAVEKL6yViLmJnNxAtK1arkc+uY3VjBYY+f1c n9Dfu8L64nAwPD28dub9R4MHKPGgWLYsuQbu+IIzNnW0wwixGsFcUKOjGLkEM18R3kFW uSq5UX6G5ut4bvBi8KP67mwJBd8aGDXFitBDMOMYuaSd+/eibjrzDCjIvXg4JjcXLXAF j1SmRB/q3rAPEG8ikbMDBEWbvgrvdGRHl25vvsWKyO1+flwNKfL8rKREg6R84IfkT3Pt qGiMx6kv8G0hGqTJXX1gtkNJ0gvEBfCYu+vCtUknAUT4L77SoNffG5MNfjaDsg43+HhO jTig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RWpm4s6suXUULHYYxvCe5wmy7oSHrp2mtLdgHvw2SbE=; b=RBcMhQRhvPwolmv1SdvUB9Cg5xn58EW3Xj1OrmZHH3w0BVjAXp6vV2jfpvMozBtPhw xmdOWUm269cZGzTIgENKMjViawOVHiTWG2RiyaKQjyDqN7dZWIYhjA64E3JQsyihFO7E bVVtROa60yAU515mK3Y/0eZhGnPwnyG7ofcsaDbwLOJGcyAn/vS7HORe2xFkjT7iRrou zCq/OHgo7dWFKW5C/eFFIXKOmBrQkHkE3uYuvS+TWEV8uyM2f7DhS81mhO/szVzg+wEH xE9uM/fvfuqTwhv4zascQI5sZdCTXt4PBher+bPhRPHboKcn9o/TWjjNpLAZZFdgAkZ7 B9lQ== X-Gm-Message-State: AJcUukc4bF7/ojqudKS+ujZAuwnPJpummNoil5bpzefELgg4FQyOucQc rUcwwKSnZLsStiz0Ns3pIA0M7+Mw X-Google-Smtp-Source: ALg8bN5bUuX1T6GjIGJVW5vkOsKWs3WrylDs52tI2FUBghWXs5k4sOx8iiAvrVpsmsQXxRhk58j2fg== X-Received: by 2002:a5d:454f:: with SMTP id p15mr21059555wrr.39.1547892213840; Sat, 19 Jan 2019 02:03:33 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:33 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:14 +0200 Message-Id: <20190119100315.23985-10-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH PULL 09/10] hw/rdma: modify struct initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Do not initialize structs with {0} since some CLANG versions do not support it. Use {} construct instead. Reviewed-by: Yuval Shaia Tested-by: Cornelia Huck Message-Id: <20190118124614.24548-3-marcel.apfelbaum@gmail.com> Reviewed-by: Cornelia Huck Signed-off-by: Marcel Apfelbaum --- contrib/rdmacm-mux/main.c | 6 +++--- hw/rdma/rdma_backend.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c index 64676030c5..ae88c77a1e 100644 --- a/contrib/rdmacm-mux/main.c +++ b/contrib/rdmacm-mux/main.c @@ -350,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; @@ -387,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; @@ -744,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) { diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 3ee5172c96..fd571f21e5 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -179,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"); @@ -376,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; @@ -1097,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", @@ -1123,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", From patchwork Sat Jan 19 10:03:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027923 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LXd2y+SB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYQY3wc4z9s9G for ; Sat, 19 Jan 2019 21:07:33 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknXH-00043w-Az for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:07:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTa-0001Ms-Vg for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00083f-Qt for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37939) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007zX-Hp for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wm1-x342.google.com with SMTP id m22so6695110wml.3 for ; Sat, 19 Jan 2019 02:03:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OQrqr2gLUtmzIts8s0R9nbH6Ym0uVxAGylIoGaGD+cs=; b=LXd2y+SBDHAO0yhB4TzPjcfeq+SBShKzFB3wFcCo3yxWyDjf7/PuRgJMOj3TjOThZj LPuJRq8qGUiEIZe0Ew/wwV2VjBCwU5tCGjgDCtzKFYKIrncJq46LBTtej6i8tSY27EEL L+SvkRxJkvD6C9cFxXig7Mq/driy28H/MJzZIfBSDnkNOZHIHVSLGrzNvyGw6gb+C5HV 2pXd6jDaiV7tsuAaqnm+6g6El1tzdOG3O9n7XkdadwAHbLeiFu5zeWzs9/LAmoPIA6K6 WefPkF1C10bm6JXp7lSg2XQ68bkAHr2SIfDtEstFJ16QFx7kaAV7yT/QXNpl4MRbP9qB EkGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OQrqr2gLUtmzIts8s0R9nbH6Ym0uVxAGylIoGaGD+cs=; b=lEnWTd785v0MPdlsyNZJzXqVbvhjBsm46KFcpstsms8ZOe15qpUglFnddT9JzWlsld qTgTx9ESXu8PBTBIUg251UM91x9E8LtM13YT60UVrtUQn9htOkQnOe0J6V096XLAgW/B wPB9Xvh2GFj6RHZge68xywPaJkI8JcnETPxAQtspguJa70cS/PM4ZT3aas6g5oNm5MsC Dn2Wd7qWO2Xn1GM2kKHJsskejmvbfXE5d5g01B20r9b6+plsFVSaYf0GjwuipBYmycTA v5siFv6ILU5riOYSI+gC5yYmYBVF27IGgDWOhB2JivVs03WW7wSrLyoC/0lIN9Ncg/Ku WHTg== X-Gm-Message-State: AJcUukebF2JBZiZ4jN3PDZacY8PYbOGD7Hj4kDnbqIMSSOjigYqo022n iRkc0/ksqQ9FkF6shCZiOb+c1MuI X-Google-Smtp-Source: ALg8bN7XsHSA5GBUdq7dT+HjeRycTzOjAhxOquKai7rAcz2tmveRcSZIeh+/msdDLhFL1FDGaPe9/w== X-Received: by 2002:a1c:c58d:: with SMTP id v135mr19070937wmf.88.1547892216165; Sat, 19 Jan 2019 02:03:36 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:34 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:15 +0200 Message-Id: <20190119100315.23985-11-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH PULL 10/10] contrib/rdmacm-mux: fix clang compilation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fix Commit a5d2f6f877 (contrib/rdmacm-mux: Add implementation of RDMA User MAD multiplexer). The above commit introduces a new contrib target, adding a global dependency to libumad library in case pvrdma configuration option is enabled. Clang forbids it: clang-6.0: error: -libumad: 'linker' input unused [-Werror,-Wunused-command-line-argument] Fix by limiting the scope to the rdmacm-mux target itself. Reported-by: Cornelia Huck Reviewed-by: Yuval Shaia Tested-by: Cornelia Huck Message-Id: <20190118124614.24548-4-marcel.apfelbaum@gmail.com> Signed-off-by: Marcel Apfelbaum --- Makefile | 2 ++ contrib/rdmacm-mux/Makefile.objs | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dccba1dca2..c9bdb67274 100644 --- a/Makefile +++ b/Makefile @@ -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, $^) diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs index e1ff4fe569..3df744af89 100644 --- a/contrib/rdmacm-mux/Makefile.objs +++ b/contrib/rdmacm-mux/Makefile.objs @@ -1,4 +1,3 @@ ifdef CONFIG_PVRDMA -CFLAGS += -libumad rdmacm-mux-obj-y = main.o endif