From patchwork Sun Aug 19 20:22:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959672 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=2001:4830:134:3::11; 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="F3p3kyvn"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDCS0YMsz9s9J for ; Mon, 20 Aug 2018 22:49:24 +1000 (AEST) Received: from localhost ([::1]:46896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjcX-0002Gm-No for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:49:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYX-0008Q7-AK for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYV-0000a2-JI for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:13 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40616) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYV-0000ZD-A5 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:11 -0400 Received: by mail-wr1-x443.google.com with SMTP id n2-v6so2405004wrw.7 for ; Mon, 20 Aug 2018 05:45:11 -0700 (PDT) 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=SYHAI1uYUQIcaZCMgW4YJurr8+ojE+DMhEaLfIZgZYk=; b=F3p3kyvnNqnvGSWl8rmKkcDqUFKmfUP3xHfa1gGuknHp4lxB0YSSZog6fUj/BhMeiS uhwZiQyzj0ENrWuzHL7JJ8Vub/pdr/jg+czV/7jtGjPvNg+obt36uk/FvsS2O0exdyZ3 aNKge6F1syf5JtPBgagnVxsvgKdEfqNZae/P3Ks756RcaOJ55jpKC/8V28OICLSAOZHp dqc2OzhMvGjbktz32ZpKAbt4Yljysssyk3C9bhfObSSLUk4sR5XttyRvApHB6X8YzhJ+ mhWQJjlaCpOkejGJtN1IcWnYAe3w+U01iPi72420oPRRwj1FRZ0qUzFvPeXoh2Cc0QAR jlsQ== 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=SYHAI1uYUQIcaZCMgW4YJurr8+ojE+DMhEaLfIZgZYk=; b=bfuHDDPXjtDAi2W0fKL/YlRTYyx1MfT9MUGv/1nmfMDas5b+xATGGDSOKabwMnWWzS rzsE94Sye6yKo8T9QjwVaps14EOLVIhNAvlTcx/Gf+SYWftUmlIUqitArB1+5oM25Qfh NSE48UO1Ef/YFiVl/aDzzzgh1n+7YEaQLDSU23syZ3vgZLyqYQqpIOvpVOH3p+wMv12f 72TdaV9zM+NTfTsLhb5EC32tBByZI+UG6gGRPrOWrsBr3e+uLp8uDNnhJHukg9vVnoIn izrpBAn3UtbBczUo6/IPzyY03elI7eWa50ANWzuwyHaig+sNysmeNfoqsPRcibuM+aeq 1Xog== X-Gm-Message-State: APzg51DxaQC824u25jMZQTt4CI4KEdpUxOyZip5KZ2wkcAIX4zmpHkLY HaMVUdNr04NJeA2sC3YHP0Zorlhk X-Google-Smtp-Source: ANB0VdazcvIKyuGDXOa4fX40LsGBg3+vwO9vETWKAKSCLVvXDvhbYnCEpttvcCP9aTPt+rT7WBGALA== X-Received: by 2002:adf:8504:: with SMTP id 4-v6mr2626962wrh.72.1534769109933; Mon, 20 Aug 2018 05:45:09 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:09 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:46 +0300 Message-Id: <20180819202300.10590-2-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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 01/15] hw/rdma: Make distinction between device init and start modes 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia There are certain operations that are well considered as part of device configuration while others are needed only when "start" command is triggered by the guest driver. An example of device initialization step is msix_init and example of "device start" stage is the creation of a CQ completion handler thread. Driver expects such distinction - implement it. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-2-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 96 +++++++++++++++++++++------ hw/rdma/rdma_backend.h | 2 + hw/rdma/rdma_backend_defs.h | 3 +- hw/rdma/vmw/pvrdma_main.c | 129 +++++++++++++++++++++--------------- 4 files changed, 155 insertions(+), 75 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index e9ced6f9ef..647e16399f 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -35,6 +35,7 @@ #define VENDOR_ERR_MR_SMALL 0x208 #define THR_NAME_LEN 16 +#define THR_POLL_TO 5000 typedef struct BackendCtx { uint64_t req_id; @@ -91,35 +92,82 @@ static void *comp_handler_thread(void *arg) int rc; struct ibv_cq *ev_cq; void *ev_ctx; + int flags; + GPollFD pfds[1]; + + /* Change to non-blocking mode */ + flags = fcntl(backend_dev->channel->fd, F_GETFL); + rc = fcntl(backend_dev->channel->fd, F_SETFL, flags | O_NONBLOCK); + if (rc < 0) { + pr_dbg("Fail to change to non-blocking mode\n"); + return NULL; + } pr_dbg("Starting\n"); + pfds[0].fd = backend_dev->channel->fd; + pfds[0].events = G_IO_IN | G_IO_HUP | G_IO_ERR; + + backend_dev->comp_thread.is_running = true; + while (backend_dev->comp_thread.run) { - pr_dbg("Waiting for completion on channel %p\n", backend_dev->channel); - rc = ibv_get_cq_event(backend_dev->channel, &ev_cq, &ev_ctx); - pr_dbg("ibv_get_cq_event=%d\n", rc); - if (unlikely(rc)) { - pr_dbg("---> ibv_get_cq_event (%d)\n", rc); - continue; - } + do { + rc = qemu_poll_ns(pfds, 1, THR_POLL_TO * (int64_t)SCALE_MS); + } while (!rc && backend_dev->comp_thread.run); - rc = ibv_req_notify_cq(ev_cq, 0); - if (unlikely(rc)) { - pr_dbg("Error %d from ibv_req_notify_cq\n", rc); - } + if (backend_dev->comp_thread.run) { + pr_dbg("Waiting for completion on channel %p\n", backend_dev->channel); + rc = ibv_get_cq_event(backend_dev->channel, &ev_cq, &ev_ctx); + pr_dbg("ibv_get_cq_event=%d\n", rc); + if (unlikely(rc)) { + pr_dbg("---> ibv_get_cq_event (%d)\n", rc); + continue; + } - poll_cq(backend_dev->rdma_dev_res, ev_cq); + rc = ibv_req_notify_cq(ev_cq, 0); + if (unlikely(rc)) { + pr_dbg("Error %d from ibv_req_notify_cq\n", rc); + } - ibv_ack_cq_events(ev_cq, 1); + poll_cq(backend_dev->rdma_dev_res, ev_cq); + + ibv_ack_cq_events(ev_cq, 1); + } } pr_dbg("Going down\n"); /* TODO: Post cqe for all remaining buffs that were posted */ + backend_dev->comp_thread.is_running = false; + + qemu_thread_exit(0); + return NULL; } +static void stop_comp_thread(RdmaBackendDev *backend_dev) +{ + backend_dev->comp_thread.run = false; + while (backend_dev->comp_thread.is_running) { + pr_dbg("Waiting for thread to complete\n"); + sleep(THR_POLL_TO / SCALE_US / 2); + } +} + +static void start_comp_thread(RdmaBackendDev *backend_dev) +{ + char thread_name[THR_NAME_LEN] = {0}; + + stop_comp_thread(backend_dev); + + snprintf(thread_name, sizeof(thread_name), "rdma_comp_%s", + ibv_get_device_name(backend_dev->ib_dev)); + backend_dev->comp_thread.run = true; + qemu_thread_create(&backend_dev->comp_thread.thread, thread_name, + comp_handler_thread, backend_dev, QEMU_THREAD_DETACHED); +} + void rdma_backend_register_comp_handler(void (*handler)(int status, unsigned int vendor_err, void *ctx)) { @@ -706,7 +754,6 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, int i; int ret = 0; int num_ibv_devices; - char thread_name[THR_NAME_LEN] = {0}; struct ibv_device **dev_list; struct ibv_port_attr port_attr; @@ -800,11 +847,8 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, 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", - ibv_get_device_name(backend_dev->ib_dev)); - backend_dev->comp_thread.run = true; - qemu_thread_create(&backend_dev->comp_thread.thread, thread_name, - comp_handler_thread, backend_dev, QEMU_THREAD_DETACHED); + backend_dev->comp_thread.run = false; + backend_dev->comp_thread.is_running = false; ah_cache_init(); @@ -823,8 +867,22 @@ out: return ret; } + +void rdma_backend_start(RdmaBackendDev *backend_dev) +{ + pr_dbg("Starting rdma_backend\n"); + start_comp_thread(backend_dev); +} + +void rdma_backend_stop(RdmaBackendDev *backend_dev) +{ + pr_dbg("Stopping rdma_backend\n"); + stop_comp_thread(backend_dev); +} + void rdma_backend_fini(RdmaBackendDev *backend_dev) { + rdma_backend_stop(backend_dev); g_hash_table_destroy(ah_hash); ibv_destroy_comp_channel(backend_dev->channel); ibv_close_device(backend_dev->context); diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 3cd636dd88..3049a73962 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -52,6 +52,8 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, uint8_t backend_gid_idx, struct ibv_device_attr *dev_attr, Error **errp); void rdma_backend_fini(RdmaBackendDev *backend_dev); +void rdma_backend_start(RdmaBackendDev *backend_dev); +void rdma_backend_stop(RdmaBackendDev *backend_dev); void rdma_backend_register_comp_handler(void (*handler)(int status, unsigned int vendor_err, void *ctx)); void rdma_backend_unregister_comp_handler(void); diff --git a/hw/rdma/rdma_backend_defs.h b/hw/rdma/rdma_backend_defs.h index ff5cfc26eb..7404f64002 100644 --- a/hw/rdma/rdma_backend_defs.h +++ b/hw/rdma/rdma_backend_defs.h @@ -24,7 +24,8 @@ typedef struct RdmaDeviceResources RdmaDeviceResources; typedef struct RdmaBackendThread { QemuThread thread; QemuMutex mutex; - bool run; + bool run; /* Set by thread manager to let thread know it should exit */ + bool is_running; /* Set by the thread to report its status */ } RdmaBackendThread; typedef struct RdmaBackendDev { diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 3ed7409763..6a5073974d 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -286,8 +286,78 @@ static void init_ports(PVRDMADev *dev, Error **errp) } } +static void uninit_msix(PCIDevice *pdev, int used_vectors) +{ + PVRDMADev *dev = PVRDMA_DEV(pdev); + int i; + + for (i = 0; i < used_vectors; i++) { + msix_vector_unuse(pdev, i); + } + + msix_uninit(pdev, &dev->msix, &dev->msix); +} + +static int init_msix(PCIDevice *pdev, Error **errp) +{ + PVRDMADev *dev = PVRDMA_DEV(pdev); + int i; + int rc; + + rc = msix_init(pdev, RDMA_MAX_INTRS, &dev->msix, RDMA_MSIX_BAR_IDX, + RDMA_MSIX_TABLE, &dev->msix, RDMA_MSIX_BAR_IDX, + RDMA_MSIX_PBA, 0, NULL); + + if (rc < 0) { + error_setg(errp, "Failed to initialize MSI-X"); + return rc; + } + + for (i = 0; i < RDMA_MAX_INTRS; i++) { + rc = msix_vector_use(PCI_DEVICE(dev), i); + if (rc < 0) { + error_setg(errp, "Fail mark MSI-X vector %d", i); + uninit_msix(pdev, i); + return rc; + } + } + + return 0; +} + +static void pvrdma_fini(PCIDevice *pdev) +{ + PVRDMADev *dev = PVRDMA_DEV(pdev); + + pr_dbg("Closing device %s %x.%x\n", pdev->name, PCI_SLOT(pdev->devfn), + PCI_FUNC(pdev->devfn)); + + pvrdma_qp_ops_fini(); + + rdma_rm_fini(&dev->rdma_dev_res); + + rdma_backend_fini(&dev->backend_dev); + + free_dsr(dev); + + if (msix_enabled(pdev)) { + uninit_msix(pdev, RDMA_MAX_INTRS); + } +} + +static void pvrdma_stop(PVRDMADev *dev) +{ + rdma_backend_stop(&dev->backend_dev); +} + +static void pvrdma_start(PVRDMADev *dev) +{ + rdma_backend_start(&dev->backend_dev); +} + static void activate_device(PVRDMADev *dev) { + pvrdma_start(dev); set_reg_val(dev, PVRDMA_REG_ERR, 0); pr_dbg("Device activated\n"); } @@ -300,7 +370,10 @@ static int unquiesce_device(PVRDMADev *dev) static int reset_device(PVRDMADev *dev) { + pvrdma_stop(dev); + pr_dbg("Device reset complete\n"); + return 0; } @@ -469,45 +542,6 @@ static void init_regs(PCIDevice *pdev) set_reg_val(dev, PVRDMA_REG_ERR, 0xFFFF); } -static void uninit_msix(PCIDevice *pdev, int used_vectors) -{ - PVRDMADev *dev = PVRDMA_DEV(pdev); - int i; - - for (i = 0; i < used_vectors; i++) { - msix_vector_unuse(pdev, i); - } - - msix_uninit(pdev, &dev->msix, &dev->msix); -} - -static int init_msix(PCIDevice *pdev, Error **errp) -{ - PVRDMADev *dev = PVRDMA_DEV(pdev); - int i; - int rc; - - rc = msix_init(pdev, RDMA_MAX_INTRS, &dev->msix, RDMA_MSIX_BAR_IDX, - RDMA_MSIX_TABLE, &dev->msix, RDMA_MSIX_BAR_IDX, - RDMA_MSIX_PBA, 0, NULL); - - if (rc < 0) { - error_setg(errp, "Failed to initialize MSI-X"); - return rc; - } - - for (i = 0; i < RDMA_MAX_INTRS; i++) { - rc = msix_vector_use(PCI_DEVICE(dev), i); - if (rc < 0) { - error_setg(errp, "Fail mark MSI-X vercor %d", i); - uninit_msix(pdev, i); - return rc; - } - } - - return 0; -} - static void init_dev_caps(PVRDMADev *dev) { size_t pg_tbl_bytes = TARGET_PAGE_SIZE * @@ -602,22 +636,7 @@ out: static void pvrdma_exit(PCIDevice *pdev) { - PVRDMADev *dev = PVRDMA_DEV(pdev); - - pr_dbg("Closing device %s %x.%x\n", pdev->name, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); - - pvrdma_qp_ops_fini(); - - rdma_rm_fini(&dev->rdma_dev_res); - - rdma_backend_fini(&dev->backend_dev); - - free_dsr(dev); - - if (msix_enabled(pdev)) { - uninit_msix(pdev, RDMA_MAX_INTRS); - } + pvrdma_fini(pdev); } static void pvrdma_class_init(ObjectClass *klass, void *data) From patchwork Sun Aug 19 20:22:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959668 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=2001:4830:134:3::11; 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="aAyadxKx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vD7b1r00z9s8T for ; Mon, 20 Aug 2018 22:46:03 +1000 (AEST) Received: from localhost ([::1]:46887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjZI-0008R4-L4 for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:46:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYX-0008Q9-C1 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYW-0000az-Lm for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:13 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYW-0000aU-FX for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:12 -0400 Received: by mail-wr1-x429.google.com with SMTP id n2-v6so2405048wrw.7 for ; Mon, 20 Aug 2018 05:45:12 -0700 (PDT) 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=5r/KKarbTMQgnpW2TRustIhW+heFG14NlO0AxEwya3I=; b=aAyadxKxfYHJOZSd8NJlLo4iVbKyvu43y43JzXMGXfups0MSLXF0DMLEaMI7p1RHza cjPeBh/5hME/8S2NiklF5naF2/z7eJfg3wVHPBLx12z0epkISUrDfM1QfNn5i/wJJUrA CZBz1cJWXz5AZlJPj6vwuYD9+C4VSzLYAlKvQh73PMp4fRXcCKf83DBxseVkr/uwG4tN vF9moz2D5Lrpw9094PHhtkfelM1YsZaTl9G1nKPv8nTFP3CFYI8leL5RaYqbg2rZzHUg fvhh/PUjSGzpLRNASz5AvVvGc5AeXMtGJQjJKTX5fHF194uyXWeXnvyZXwo8K3YdzlMQ JBQw== 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=5r/KKarbTMQgnpW2TRustIhW+heFG14NlO0AxEwya3I=; b=T776KsiJ/lXqTnyRzg+haqUOMupYMKS/mTZquLVOz3X0z94OB5NE6IPfHqFNwdjcRl wviYoTYX05nijZ558gZWwrw0Zd2Eh9xALaWquCwLQHvL4nDLG73OvKua9uSVQ8m5hhN0 FxHfDltoztYcru88CjSGh4yTtldxdbkuLvE6m9bx6Wdt5vCwjVKWjiPCQ31/Ni8ZA2rc oMYSoda4sNVdNASAWKuDVvQn7Ty1qNYaEjEUHCdueccytDyemZntsE/Ql2WajtEnUnEY 4uL0lln+YtnHdB9gupaxv2xhExkb0YHc8HTd+lEIANszZjsvcpAYMCwJ/J+Jo5qUYMX2 0FMA== X-Gm-Message-State: AOUpUlHJj34wofSvY4GUHDpBK9DuCchTDYlujMXe6LHR04nu7atCcBGU /7SZi1nJnF5uA4GxgcnwSi0N/qj8 X-Google-Smtp-Source: AA+uWPy3sPn9ywVYaZFfj1Kw7h0iK+yfP/poGfWaWFXHHPqoWP0CpF86PiSUxIa5pvFvMY2LEfLOmA== X-Received: by 2002:adf:f390:: with SMTP id m16-v6mr29732882wro.279.1534769111271; Mon, 20 Aug 2018 05:45:11 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:10 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:47 +0300 Message-Id: <20180819202300.10590-3-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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::429 Subject: [Qemu-devel] [PATCH PULL 02/15] hw/pvrdma: Bugfix - provide the correct attr_mask to query_qp 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia Calling rdma_rm_query_qp with attr_mask equals to -1 leads to error where backend query_qp fails to retrieve the needed QP attributes. Fix it by providing the attr_mask we got from driver. Signed-off-by: Yuval Shaia Message-Id: <20180805153518.2983-3-yuval.shaia@oracle.com> Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_cmd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index 14255d609f..e7d6589cdc 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -524,6 +524,7 @@ static int query_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, struct ibv_qp_init_attr init_attr; pr_dbg("qp_handle=%d\n", cmd->qp_handle); + pr_dbg("attr_mask=0x%x\n", cmd->attr_mask); memset(rsp, 0, sizeof(*rsp)); rsp->hdr.response = cmd->hdr.response; @@ -531,8 +532,8 @@ static int query_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, rsp->hdr.err = rdma_rm_query_qp(&dev->rdma_dev_res, &dev->backend_dev, cmd->qp_handle, - (struct ibv_qp_attr *)&resp->attrs, -1, - &init_attr); + (struct ibv_qp_attr *)&resp->attrs, + cmd->attr_mask, &init_attr); pr_dbg("ret=%d\n", rsp->hdr.err); return rsp->hdr.err; From patchwork Sun Aug 19 20:22:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959671 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=2001:4830:134:3::11; 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="VCTqKma/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDCR30FZz9s8T for ; Mon, 20 Aug 2018 22:49:23 +1000 (AEST) Received: from localhost ([::1]:46897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjcX-0002Gw-0n for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:49:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYY-0008Qq-Jo for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYX-0000bx-Sl for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:14 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:46408) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYX-0000bN-Lr for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:13 -0400 Received: by mail-wr1-x429.google.com with SMTP id a108-v6so10218754wrc.13 for ; Mon, 20 Aug 2018 05:45:13 -0700 (PDT) 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=COVrKUdiu+b7B7T5YVuZved9Toq2EZMggFhWWBzScKc=; b=VCTqKma/QWWnHb0qzFUITbEqrpbuxErQTSJ0RmiPWTujVm4K7HwwdhJ1tvr0/3zBXF Cwchb25fqeBFVR6e7UIrVHVCczauC41Q6mwSuJnpaXwSwVkRrC2Or0ejEAmqxNq0rTj8 LzoCmISmLoGgZIk7P1IvCQYw2xHuSXISEP5g3Pg1kZgPFHi5dQC/TgjJJJg3HrndOBB5 o53vbHg4jcRswacgFWXm5HIzB76OvVcOfyGGgU+JhlvUwlojAPIhaiSK40L4dwlahLyZ sO7VbxY3rAXasa0r762ktErQEi7orYCQYauFN71vc3E+PSo3NkVQJnX5YXcdPiA4SR8r OblQ== 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=COVrKUdiu+b7B7T5YVuZved9Toq2EZMggFhWWBzScKc=; b=jr8v9y4mdc41GN/7f8tdflaSWQ8DT+kchPhcLQeEvRdO7NPqHpvnK7yePPkzChVlfo M2u1jE+PVsxG0qETRRv1Lu/jNvBBS1AW2TzQkPvOVAkddOElo0PHUYEQ8gJbT8JMzDRX 3QATMv0uheY3UeTXW8l88GInAdObNIZBAvfzor4cfr27XLfNMf0Yf9LMuPRAq9GZib1D LWwAAQT+NZJKE0edbGhNwDm5dlGpm7ZepShhoq/C4nkvftb0k/c+WyW2Sc9dUuj6v0Hy r0IW/+ex4TAxwn/4gdculUti3unRd0r2hJTKXhXRRCN4dftjuZcX2xLzT1hCqIuFZACf epaA== X-Gm-Message-State: AOUpUlEorRlWyCLSCiptZ4+c0tazx91IUnNKxqPLXTUMSsecNBAUQ356 LJQbxujMNw1+CpwDqzb+VjErZYxR X-Google-Smtp-Source: AA+uWPwM9FMT/aWCIF/tmpvnQtBLxKID7dWgt655jJwgI+W7s8NWVnZSL773TpR6At8XvyM5ngsimg== X-Received: by 2002:adf:ff49:: with SMTP id u9-v6mr31202626wrs.15.1534769112528; Mon, 20 Aug 2018 05:45:12 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:12 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:48 +0300 Message-Id: <20180819202300.10590-4-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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::429 Subject: [Qemu-devel] [PATCH PULL 03/15] hw/rdma: Modify debug macros 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia - Add line counter to ease navigation in log - Print rdma instead of pvrdma Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-4-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_utils.c | 4 ++++ hw/rdma/rdma_utils.h | 16 ++++++++++++---- hw/rdma/vmw/pvrdma_main.c | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index d713f635f1..dc23f158f3 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -15,6 +15,10 @@ #include "rdma_utils.h" +#ifdef PVRDMA_DEBUG +unsigned long pr_dbg_cnt; +#endif + void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) { void *p; diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index 3dc07891bc..04c7c2ef5b 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -22,18 +22,26 @@ #include "sysemu/dma.h" #define pr_info(fmt, ...) \ - fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ + fprintf(stdout, "%s: %-20s (%3d): " fmt, "rdma", __func__, __LINE__,\ ## __VA_ARGS__) #define pr_err(fmt, ...) \ - fprintf(stderr, "%s: Error at %-20s (%3d): " fmt, "pvrdma", __func__, \ + fprintf(stderr, "%s: Error at %-20s (%3d): " fmt, "rdma", __func__, \ __LINE__, ## __VA_ARGS__) #ifdef PVRDMA_DEBUG +extern unsigned long pr_dbg_cnt; + +#define init_pr_dbg(void) \ +{ \ + pr_dbg_cnt = 0; \ +} + #define pr_dbg(fmt, ...) \ - fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ - ## __VA_ARGS__) + fprintf(stdout, "%lx %ld: %-20s (%3d): " fmt, pthread_self(), pr_dbg_cnt++, \ + __func__, __LINE__, ## __VA_ARGS__) #else +#define init_pr_dbg(void) #define pr_dbg(fmt, ...) #endif diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 6a5073974d..1b1330e113 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -577,6 +577,8 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) Object *memdev_root; bool ram_shared = false; + init_pr_dbg(); + pr_dbg("Initializing device %s %x.%x\n", pdev->name, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); From patchwork Sun Aug 19 20:22:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959675 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=2001:4830:134:3::11; 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="nVxoE5s/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDH13VKJz9s9J for ; Mon, 20 Aug 2018 22:52:29 +1000 (AEST) Received: from localhost ([::1]:46914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjfW-0005PC-WD for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:52:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYZ-0008RN-QM for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYZ-0000cp-83 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:15 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:37241) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYZ-0000cF-1T for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:15 -0400 Received: by mail-wm0-x22b.google.com with SMTP id n11-v6so13716668wmc.2 for ; Mon, 20 Aug 2018 05:45:14 -0700 (PDT) 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=yJ/1oHEh5CptOUnWjjvjIfEZS2MQ9fHbcLIUztuEOo0=; b=nVxoE5s/R9YdcpQ5Bz3t0jxbHGhyOJ3m4uvF1qpLAQPhtaiAduGfJglmL1txVFj3uG SW8nVF01K27SIwFcIiTPCWptFtiQMH7jV3pnhWqPJ4LrA8Cl+8vpDEglJW1MCqlefhzy TOehY0J5b70WgwY3dkvRcq4syr0SvKQQrYNc0U0crEJsvKkcvB70J7vY7+UqkET3HNmY crg+aAjzHuMVpMdZktzdLXpyhEKCgBTmew2B5hvHdU5YJi+q10f1VF9VlykwxIt7nq2o VTK8jTlWSIV7DsldIcbC34SrGIjwZFWTlIuQi3FmA/R3/eyQrH840a2vVk4bb/rHFDtg htCg== 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=yJ/1oHEh5CptOUnWjjvjIfEZS2MQ9fHbcLIUztuEOo0=; b=dTYBSEa8W2nApcKp0fw1Df6TC8l73aUyZ8B4vBpPb09suUyrlpscYCMLi0FKBo0j31 i2Voj31/iG4qAXxTyvkFlqN7LpHLVBRq0Bt+Kem59qN7SIV742lFAggyxbSB5J3jXMh+ 4+ONNV5zW4WHNNbBB8zDrtJMn5XTjXRjiJ75eETD5JF5KfXznV7Yab1P2DzBtpNnpmp5 52WJPKmApxY/9qxgRz1IJUAY50oc6ZSmzCJJ0wNOQy9WuIObsnJqUSMW+qL6b7LIxbWD Rde0s/3E0bE+Fq+/T9f2HUdpp5BeCRKcnzU5WqQngW1MKUVMrwFPr31h5kzWnu92eSsh SRtA== X-Gm-Message-State: AOUpUlGb+Fk6n6mZn368+NHC7woVGzx1ITHOINnWascYPdb3zyhu9ip/ +dFG7z2PpcRcH3hqehhRaMbTiugG X-Google-Smtp-Source: AA+uWPyPKaaV6mEyEcvVQrMB5U+VAEt4lD4UAiNmW4iWqRQjDeTpLRVK4kU4Ktk/Bn1q/RS+Z2763Q== X-Received: by 2002:a1c:8a04:: with SMTP id m4-v6mr24903051wmd.137.1534769113818; Mon, 20 Aug 2018 05:45:13 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:13 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:49 +0300 Message-Id: <20180819202300.10590-5-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PATCH PULL 04/15] hw/pvrdma: Clean CQE before use 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia Next CQE is fetched from CQ ring, clean it before usage as it still carries old CQE values. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-5-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_qp_ops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index 99bb51111e..a8664f40c8 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -69,6 +69,7 @@ static int pvrdma_post_cqe(PVRDMADev *dev, uint32_t cq_handle, return -EINVAL; } + memset(cqe1, 0, sizeof(*cqe1)); cqe1->wr_id = cqe->wr_id; cqe1->qp = cqe->qp; cqe1->opcode = cqe->opcode; From patchwork Sun Aug 19 20:22:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959669 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=2001:4830:134:3::11; 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="WEOzxopZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vD7q1jYDz9s8T for ; Mon, 20 Aug 2018 22:46:15 +1000 (AEST) Received: from localhost ([::1]:46888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjZU-0008VD-Rj for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:46:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYb-0008Ss-9t for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYa-0000dX-NS for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:17 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36302) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYa-0000dC-Gc for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:16 -0400 Received: by mail-wr1-x435.google.com with SMTP id m27-v6so6643074wrf.3 for ; Mon, 20 Aug 2018 05:45:16 -0700 (PDT) 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=CrQU+1G+6k2fEsa8V/oyXm5Gh1UPCm8XLUKNjzp39HU=; b=WEOzxopZjF07dq5utNoqKVpBr4SUCq8e3uEK3u3GZ1StngEBgL1gcUMJEiCUeNBcr+ 9XnC38juqhpvkFCylTRPyCMWFov82h6fUMmgDTg7Vwu6TgCvVcEdtWcsnOEsWLYLhlCJ HpTkG74zj2Ck753JX/tdotvGTODad05O2ENry8u6nTfjjQNGqKTeBO+I6Z6HJYlPsr+X QoZV7S9PAJ7INJIt9pzBkUTLCxGnBd/k4Uy0d0RMBLWa90PE5ZFlCVJ0kfZUtDCvW547 Iad/h9/1Nmy4cHjUahwd2PR1f13Bq14I4HwGKxAUCGr4Fc/r9U6o6n7Ff+3QosudNfd8 Mvlw== 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=CrQU+1G+6k2fEsa8V/oyXm5Gh1UPCm8XLUKNjzp39HU=; b=Tcb0PG9BIQsdvNf3EpnwT9DIxWeAhdAj0kgSUQd6Bk1gjcdsbZnJVp/bR3I65zl/SL e51IOFpw6XYS49okKO6JdRm3JgKNxS7i31DJv95mZuyxceNj0/L/EViAt1EH6zkLAloY WSgKCEwI9jhB7y/qWDe0GQT/5e7NhTHAyjXk6v6hYLc8rAuNAo9ZIkFdbf0Ll1EMY9fr WDK03rcqwI56XodLxyNdqzIF0iv/Ke6zSyeB8oYcF7T1f/CrYUXCiVbQ1Vp6CCvVdv6x xQVhmnjdZYhlvNIUv/dimxoyZc7F28HEv+U5rfmHruEkxEX3laV8RTwvUOoa1RDKbpoA wPyA== X-Gm-Message-State: AOUpUlHS0FGxuVCVw+vyLGvq9sDhYWcWvceGLqw+0AzT40T0OJXY0YfS Xs0uCYAaNYI7Q2q00Z5uaA3BlFET X-Google-Smtp-Source: AA+uWPw5UDUG/rLyK6XN/jnJ/z0r0yCmweXYAh59P2Ir4YsgpsXft1kxgSUgkeiiPFWD8s2V2DSCqw== X-Received: by 2002:adf:e50f:: with SMTP id j15-v6mr28159765wrm.111.1534769115145; Mon, 20 Aug 2018 05:45:15 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:14 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:50 +0300 Message-Id: <20180819202300.10590-6-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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::435 Subject: [Qemu-devel] [PATCH PULL 05/15] hw/pvrdma: Make default pkey 0xFFFF 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia 0x7FFF is not the default pkey - fix it. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-6-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma.h | 3 +++ hw/rdma/vmw/pvrdma_cmd.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/rdma/vmw/pvrdma.h b/hw/rdma/vmw/pvrdma.h index 81e0e0e99c..e2d9f93cdf 100644 --- a/hw/rdma/vmw/pvrdma.h +++ b/hw/rdma/vmw/pvrdma.h @@ -50,6 +50,9 @@ #define PVRDMA_HW_VERSION 17 #define PVRDMA_FW_VERSION 14 +/* Some defaults */ +#define PVRDMA_PKEY 0x7FFF + typedef struct DSRInfo { dma_addr_t dma; struct pvrdma_device_shared_region *dsr; diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index e7d6589cdc..4f74b29936 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -166,7 +166,7 @@ static int query_pkey(PVRDMADev *dev, union pvrdma_cmd_req *req, resp->hdr.ack = PVRDMA_CMD_QUERY_PKEY_RESP; resp->hdr.err = 0; - resp->pkey = 0x7FFF; + resp->pkey = PVRDMA_PKEY; pr_dbg("pkey=0x%x\n", resp->pkey); return 0; From patchwork Sun Aug 19 20:22:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959670 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=2001:4830:134:3::11; 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="pc+VxItX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vD7v2jN8z9s8T for ; Mon, 20 Aug 2018 22:46:19 +1000 (AEST) Received: from localhost ([::1]:46889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjZY-000054-SL for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:46:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYc-0008U8-Je for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYb-0000eB-Sr for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:18 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:40580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYb-0000df-MX for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:17 -0400 Received: by mail-wm0-x235.google.com with SMTP id y9-v6so13813068wma.5 for ; Mon, 20 Aug 2018 05:45:17 -0700 (PDT) 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=w5uYoy4cIau0f49tvCyP6EMTQ+YJwdKZYxbtRW166HU=; b=pc+VxItXvlIpQ9TRoN25IE7EekSISx4HBVpuzmjH+u5WKzD3fUROaO/tfhESj/gYFu YcLDcxzR0MZEeLVmzBtdm0XMIugmJc14zY4ohodenitDFpWVOY1YF+CEcLg94WoF06Ky hR8O0v/1zUMVO/01PoNLjY5j5jegEQnFCCR3OgFsvMR+Q+sG1rYuGeX5RsUUS5zXp3+y JaEpCfN0K2yexzrWBIw3Cnkm5vW9HgFHQkNbgZarp9t+VnLtObjXx+XdGCh/NLJ+CHUJ GhMcG7MqAWuhnG77Ke6jKg5qDR/BpwlvlVbyI5k3I4RtONb8Z05+TMQOrlmfispBDeMk LoYw== 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=w5uYoy4cIau0f49tvCyP6EMTQ+YJwdKZYxbtRW166HU=; b=DL60/l4V88C/9O7lf5KOX4OCCUrUdMvNN+LEdwEG8QDQMPuoxHGVs9CLjLCFomrAb7 yQtd8x7CB+RsI/Mp9se+XCzqxJoe5pP8A/e7jhkJZOgV1542A4sgSncePTgOiesX/Yhq jgZhMWu2wq21HLiyHdF1OnTCyaDNsBsWmPbQkV2sw68bh9B7F4Z2k9dxYaTV5PELcpiq vY3xrEIv4F9/LaKF7eSh4RjntzNtQhL7xfAP8hyMv6M7uVOtoAF+hqCaxQ6YSfMf8NBA aOHM67xutt+Pj8+ziaeGOmFpS5E9QXByjdULzN+QECyUHvPbVso5nU0wo6ogEfgJQhku ARnQ== X-Gm-Message-State: AOUpUlFBzYN8mEKJwiUvd8V5/pC2mX9iFWZ4LpgBPNo5E6jeAx2YUgsy VxRtiWh/16KAIlXUFl+HHt3gLjst X-Google-Smtp-Source: AA+uWPyO3dGxVkHPSYcE//t/blfXIxAfcdT0B5CK8FsfwJoLJ+juJ7FGUl/knDgUl6m/Ajo7We3niw== X-Received: by 2002:a1c:c1c8:: with SMTP id r191-v6mr15373700wmf.103.1534769116498; Mon, 20 Aug 2018 05:45:16 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:16 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:51 +0300 Message-Id: <20180819202300.10590-7-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH PULL 06/15] hw/rdma: Delete useless structure RdmaRmUserMR 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia The structure RdmaRmUserMR has no benefits, remove it an move all its fields to struct RdmaRmMR. Reviewed-by: Marcel Apfelbaum Signed-off-by: Yuval Shaia Message-Id: <20180805153518.2983-7-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 3 +-- hw/rdma/rdma_rm.c | 16 ++++++++-------- hw/rdma/rdma_rm_defs.h | 10 +++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 647e16399f..52981d652d 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -271,8 +271,7 @@ static int build_host_sge_array(RdmaDeviceResources *rdma_dev_res, return VENDOR_ERR_INVLKEY | ssge[ssge_idx].lkey; } - dsge->addr = (uintptr_t)mr->user_mr.host_virt + ssge[ssge_idx].addr - - mr->user_mr.guest_start; + dsge->addr = (uintptr_t)mr->virt + ssge[ssge_idx].addr - mr->start; dsge->length = ssge[ssge_idx].length; dsge->lkey = rdma_backend_mr_lkey(&mr->backend_mr); diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 415da15efe..7403d24674 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -165,15 +165,15 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint32_t pd_handle, length = TARGET_PAGE_SIZE; addr = g_malloc(length); } else { - 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; + mr->virt = host_virt; + pr_dbg("host_virt=0x%p\n", mr->virt); + mr->length = guest_length; pr_dbg("length=%zu\n", guest_length); - mr->user_mr.guest_start = guest_start; - pr_dbg("guest_start=0x%" PRIx64 "\n", mr->user_mr.guest_start); + mr->start = guest_start; + pr_dbg("guest_start=0x%" PRIx64 "\n", mr->start); - length = mr->user_mr.length; - addr = mr->user_mr.host_virt; + length = mr->length; + addr = mr->virt; } ret = rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, addr, length, @@ -214,7 +214,7 @@ void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res, uint32_t mr_handle) if (mr) { rdma_backend_destroy_mr(&mr->backend_mr); - munmap(mr->user_mr.host_virt, mr->user_mr.length); + munmap(mr->virt, mr->length); res_tbl_dealloc(&dev_res->mr_tbl, mr_handle); } } diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index 226011176d..7228151239 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -55,16 +55,12 @@ typedef struct RdmaRmCQ { bool notify; } RdmaRmCQ; -typedef struct RdmaRmUserMR { - void *host_virt; - uint64_t guest_start; - size_t length; -} RdmaRmUserMR; - /* MR (DMA region) */ typedef struct RdmaRmMR { RdmaBackendMR backend_mr; - RdmaRmUserMR user_mr; + void *virt; + uint64_t start; + size_t length; uint32_t pd_handle; uint32_t lkey; uint32_t rkey; From patchwork Sun Aug 19 20:22:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959678 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=2001:4830:134:3::11; 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="RbULvdMm"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDHB2P56z9s8T for ; Mon, 20 Aug 2018 22:52:38 +1000 (AEST) Received: from localhost ([::1]:46918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjff-0005XO-Q3 for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:52:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYj-00007o-9Z for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYd-0000ev-Ff for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:23 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:50322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYd-0000eS-0c for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:19 -0400 Received: by mail-wm0-x230.google.com with SMTP id s12-v6so14181816wmc.0 for ; Mon, 20 Aug 2018 05:45:18 -0700 (PDT) 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=6QVpTkEl5vZB8/utMCswD6LYWImXsK41NJMfgBpVSXQ=; b=RbULvdMmypz8ygKEbReYj44oq+mSteohL9isqzvzWYhWLeH0fqQZh9R7LPT6CeGUdg 55Yt5L4tx1XGHg8KLE5bdQZ9Pumbz+ypG1+n3r446a0SXqv/phwtxDUgIrUJVLk6sVUM MAG2NqIAJ9JmBiM+Q3QF9aBPx2wq5eCZhMzB+uBLdsXWhYnfncBgnxUdcyxR8Ktsqr0p kQ2Cn8rif7N30Jjt+LdGwzyVD4GI7bMxaQBcnp41ITImOeyOfZQhvfd2mOm6l3HAPDwZ sSfPiPjKOpZ9MNcW3i1VbA8ts1GPXhQ6JLxmKqfc54w0Zk8iM+o0XoXeVOJ6/4Zyv0R8 IbCA== 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=6QVpTkEl5vZB8/utMCswD6LYWImXsK41NJMfgBpVSXQ=; b=tAQPkuhUhNqRcbQOtsCUzGoAs/DjxhkNgRs4T+DRILsZNVCj404TlYO0X/xCZAwi2m /9L+Dof7VTJxIjzj0YfJXiZo+WmB0rH2U1Z8KAmdvsr9GIa2ylF/qJKwlMR27a267rXu yn3B2dKbrLl342O+reZPax8xF7BHTBc8mPJOvyirqKDGUSiUDojSUzIZkuMcavTox/tL SjJhyajwvDhRu8hbSVd8qPhNCM6tS/1rJwfcxpuJoMz9JaqW8aRgyucDU7LtLEZB+Lzs tEmfubW3DF8wx0hf4J0PrsntDUPzobjHzOMBnttmKYkptMjDFGIW/QXIGvvip8Arvy+r Ji4A== X-Gm-Message-State: AOUpUlGNhai5coQlQ2oXS4zJ1EtkjGfA+9exz0SfL0XCtFJJtpAPBU9F nI2rkQb724L6r12coSasJramdk2E X-Google-Smtp-Source: AA+uWPwYOS6uWGyBxRKhZY7S+RPmSNOG8/xQ0JoDVp3hDLj7jzxybJeRJfcJGPIWrM67PjLRYk0C8Q== X-Received: by 2002:a1c:3503:: with SMTP id c3-v6mr22872496wma.46.1534769117775; Mon, 20 Aug 2018 05:45:17 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:17 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:52 +0300 Message-Id: <20180819202300.10590-8-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::230 Subject: [Qemu-devel] [PATCH PULL 07/15] hw/rdma: Do not allocate memory for non-dma MR 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia There is no use in the memory allocated for non-dma MR. Delete the code that allocates it. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-8-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_rm.c | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 7403d24674..bf4a5c71b4 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -144,8 +144,6 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint32_t pd_handle, RdmaRmMR *mr; int ret = 0; RdmaRmPD *pd; - void *addr; - size_t length; pd = rdma_rm_get_pd(dev_res, pd_handle); if (!pd) { @@ -158,40 +156,29 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint32_t pd_handle, pr_dbg("Failed to allocate obj in table\n"); return -ENOMEM; } + pr_dbg("mr_handle=%d\n", *mr_handle); - if (!host_virt) { - /* TODO: This is my guess but not so sure that this needs to be - * done */ - length = TARGET_PAGE_SIZE; - addr = g_malloc(length); - } else { + pr_dbg("host_virt=0x%p\n", host_virt); + pr_dbg("guest_start=0x%" PRIx64 "\n", guest_start); + pr_dbg("length=%zu\n", guest_length); + + if (host_virt) { mr->virt = host_virt; - pr_dbg("host_virt=0x%p\n", mr->virt); - mr->length = guest_length; - pr_dbg("length=%zu\n", guest_length); mr->start = guest_start; - pr_dbg("guest_start=0x%" PRIx64 "\n", mr->start); + mr->length = guest_length; - length = mr->length; - addr = mr->virt; + ret = rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, mr->virt, + mr->length, access_flags); + if (ret) { + pr_dbg("Fail in rdma_backend_create_mr, err=%d\n", ret); + ret = -EIO; + goto out_dealloc_mr; + } } - ret = rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, addr, length, - access_flags); - if (ret) { - pr_dbg("Fail in rdma_backend_create_mr, err=%d\n", ret); - ret = -EIO; - goto out_dealloc_mr; - } - - if (!host_virt) { - *lkey = mr->lkey = rdma_backend_mr_lkey(&mr->backend_mr); - *rkey = mr->rkey = rdma_backend_mr_rkey(&mr->backend_mr); - } else { - /* We keep mr_handle in lkey so send and recv get get mr ptr */ - *lkey = *mr_handle; - *rkey = -1; - } + /* We keep mr_handle in lkey so send and recv get get mr ptr */ + *lkey = *mr_handle; + *rkey = -1; mr->pd_handle = pd_handle; @@ -214,7 +201,10 @@ void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res, uint32_t mr_handle) if (mr) { rdma_backend_destroy_mr(&mr->backend_mr); - munmap(mr->virt, mr->length); + pr_dbg("start=0x%" PRIx64 "\n", mr->start); + if (mr->start) { + munmap(mr->virt, mr->length); + } res_tbl_dealloc(&dev_res->mr_tbl, mr_handle); } } From patchwork Sun Aug 19 20:22:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959676 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=2001:4830:134:3::11; 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="SYJcUSDF"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDH12DGlz9s8T for ; Mon, 20 Aug 2018 22:52:27 +1000 (AEST) Received: from localhost ([::1]:46913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjfU-0005LP-Il for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:52:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYj-00007n-9Z for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYe-0000fS-Ha for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:23 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35584) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYe-0000f6-Be for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:20 -0400 Received: by mail-wr1-x442.google.com with SMTP id g1-v6so12896161wru.2 for ; Mon, 20 Aug 2018 05:45:20 -0700 (PDT) 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=Llcp7f9bGfnoG7LGvSpNjUmXvrJElWJhyQKvB/3Cb0c=; b=SYJcUSDF//VQSJL0hxR7mF3AoTxmTTwK/YY8NJwNZk8eG7b2NsYVk33dn4d/XuuGKG VJLw59eKm75ye5LFD/z+urOYkBRl/obh+FotifVQoR6ZQkiJaj3L/O8bij7b5ahDj5kS El2MSvpEdGJEaW0UW1Lk0QN0bYCCB8aNNES/GSbfnP1sxPMelg5JPFKhB0HQIfHwlCKB gybjH0r4qUBTypQtDY/PdJ8I3AMYzblKRunFsLS80PlPhT0Pptc+R5OzdxU6CQIGBL0L rACU0cqs60B38eexamQZN4QfX3sK84ZHWRkucislPijzQvqrIT3t7me4ZjaManA2HTOy Vgzg== 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=Llcp7f9bGfnoG7LGvSpNjUmXvrJElWJhyQKvB/3Cb0c=; b=UmvOmQX1xxE+9mif0Vbu5OMyzu7SccTEuPjMSOc9LX1c21U/7QybG6GIxOXyLwki0Q j+avL5IKrSvMctg6DKn3Ja/CeaxFXj1ZctMEmYNsLLYV6pXYJnQm+i7Oc9crK3noOvtq DrVol0zWjZesyzQ0hufRSFWz6VFYqrwwjyzM8kUHF7k2UQ9faW0BUz/s3H3jS6FfTnxQ GVSngGwTbA/bUQX2AGoJbc6Tk3SI8tHXeE3YAbipoEX8Gb0ikZK8JJPJaReHQZ7JffEG j8lPygdmQ1XiKHKgM6ugogngmfjDIIXoRGwHeBguLKLg6NFnBK6eSCdIJjdhh9tKP+te 0qDw== X-Gm-Message-State: AOUpUlHM0aTORM8io614N+lnOSA0HETOcTo0a/Pq6fgdeKGLi3F8IZM3 FK10NN5WoKailaV5hSqliXJfkcV8 X-Google-Smtp-Source: AA+uWPwVCXpa2DcN6AWK4RrrW2aoxfhf+mC6nEuxd0ubiiPYhTw0WftiRAYNguFI1v7GaWblHy8BMA== X-Received: by 2002:adf:e287:: with SMTP id v7-v6mr17805824wri.139.1534769119070; Mon, 20 Aug 2018 05:45:19 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:18 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:53 +0300 Message-Id: <20180819202300.10590-9-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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/15] hw/rdma: Reorder resource cleanup 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia To be consistence with allocation do the reverse order in deallocation Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-9-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_rm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index bf4a5c71b4..1f014b4ab2 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -543,8 +543,9 @@ void rdma_rm_fini(RdmaDeviceResources *dev_res) res_tbl_free(&dev_res->uc_tbl); res_tbl_free(&dev_res->cqe_ctx_tbl); res_tbl_free(&dev_res->qp_tbl); - res_tbl_free(&dev_res->cq_tbl); res_tbl_free(&dev_res->mr_tbl); + res_tbl_free(&dev_res->cq_tbl); res_tbl_free(&dev_res->pd_tbl); + g_hash_table_destroy(dev_res->qp_hash); } From patchwork Sun Aug 19 20:22:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959674 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=2001:4830:134:3::11; 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="JzT75wc7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDCg13l2z9s8T for ; Mon, 20 Aug 2018 22:49:35 +1000 (AEST) Received: from localhost ([::1]:46901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjci-0002RW-Pl for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:49:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYj-00007p-9c for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYf-0000fx-Ng for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:23 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:39468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYf-0000fh-H2 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:21 -0400 Received: by mail-wr1-x42f.google.com with SMTP id o37-v6so4009432wrf.6 for ; Mon, 20 Aug 2018 05:45:21 -0700 (PDT) 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=QCzjZF+Pw1wp5tED/Q4Ep6Y2iSWc6In7tSIupMY7uxw=; b=JzT75wc7Tju2pu2G1OwMo0tsFDcYcc7AVUgtPtTBnjs2IIzMdSwE4cOFYL853pK1bG 2CuGTogXGEH5BLAZTYix4l8gNtmB1xW8P8butcGvdJwjG+zy7ghGFi6DhmjEtG4QX+m5 ZoLj9mE/uixGUq1cun/D6XkdknZhw938+59OV/1O+DfNqWVFfWXVKiXmuJKyXI+almX4 GcKhYDqlXzyVrpa/HD6yB9dNskXp6cSsU3s63MTlI5qCjhljCuQrPEBVCf8ZsGtpyfIp 79PCFWKr+yXRDLiA62483t5vqrfpK4uZOo1OKEQss8QcCwWUZzecTPKGwcICyBFsbzfo ShBw== 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=QCzjZF+Pw1wp5tED/Q4Ep6Y2iSWc6In7tSIupMY7uxw=; b=sy/hGpfUs/9L4mBylFR78XOrNGeSGht9ETFaXju6rzSw+CR2FRaB/7jKq1v7slypkC 9STLKewq8i8xA3C9VaP2kEqnA4rEKjeRjLjWu0XYYDMqktX8QSVcnCRdTkMTyM+bezQc d/EY8AviHWFjcyyTLk9c4xTJn94/F0dZSeLVADb926ze1Gk17hSVpB1TbbM6YjrrXxXc YveG3fcFzFKwMIKq8nMVp9D65k7UU6Jdbcp6mWk0EaLdmjl9He7rAan1LlDZhfp579Ml GhRaiArMYZypQev4ej+mxoaPhiB5DzYRaKOnn0DnminH4rf4gqzQ2ZVVZS4TVQH/dkaa EGLA== X-Gm-Message-State: AOUpUlEBjn+LbgKwow/AN7Tpc63ftJLW62ykeEDqj4S4UOB9NEMMt+GL wwGew+u/535CGJpTyuul7EC4Lp3e X-Google-Smtp-Source: AA+uWPyFtGAUOrNehOPZ+cxFwXMpGwzTSZZxpXGSDlI2C7TGFr3oFq2vh2JQFxOYRgH4LRvA6LqvNg== X-Received: by 2002:adf:e50f:: with SMTP id j15-v6mr28159983wrm.111.1534769120357; Mon, 20 Aug 2018 05:45:20 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:19 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:54 +0300 Message-Id: <20180819202300.10590-10-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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::42f Subject: [Qemu-devel] [PATCH PULL 09/15] hw/pvrdma: Cosmetic change - indent right 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-10-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 1b1330e113..3d448bffc4 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -430,7 +430,7 @@ static void regs_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) reset_device(dev); break; } - break; + break; case PVRDMA_REG_IMR: pr_dbg("Interrupt mask=0x%" PRIx64 "\n", val); dev->interrupt_mask = val; @@ -439,7 +439,7 @@ static void regs_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) if (val == 0) { execute_command(dev); } - break; + break; default: break; } From patchwork Sun Aug 19 20:22:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959682 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=2001:4830:134:3::11; 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="X1tNalzB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDLk19n9z9s9J for ; Mon, 20 Aug 2018 22:55:42 +1000 (AEST) Received: from localhost ([::1]:46930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjid-0007tj-Pf for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:55:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cx-4Q for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYm-0000io-Rh for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:35765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYh-0000gE-Hh for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:23 -0400 Received: by mail-wr1-x435.google.com with SMTP id g1-v6so12896253wru.2 for ; Mon, 20 Aug 2018 05:45:22 -0700 (PDT) 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=jgv9mnSe5UFOKPEhvre7MHygguyrScAx7XFRUOWRBj0=; b=X1tNalzBeVC/wSx+vYz95hwD+K61uaJXjKj6VZlCZmGbJXxjmgDj3VWN35Z2DeZqXx czxbdvKgAhoLtNGClSTHVrBItlSn2G8ngDsA2UZLEbkglmlSIhJVSFtYN+uD3xtYXn5I J6faI/BwS3CIXJ1CotPVj/83xHlCBCuYcIhwfTlQrVGkPZrmiTbPgobKFB8YvBA/2fgu +ZNzr9MRFcdmjlPW1xeogaLz/c88U6ZttmZDofeo4wgUUdWA82yhxpgdhRohOuepLwSR YdNf6rC5GpFrwRuJEjdyqFJBDg+pxkFfD/mKAV1cpnGPgFg1UeFPePcbb+XANEHcWWBi A6IQ== 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=jgv9mnSe5UFOKPEhvre7MHygguyrScAx7XFRUOWRBj0=; b=NJoFi5yiL8AvGQNJQMkRWolPoUwWUG3oHKQuGAKIPM8qNuc4sygqeMlV26NCyKeZnA sJbfZKcdxliNJjC1e6sLOgXx7aUvrp/wzEEEljK9O0EYzIb3/qczjQIh/frVd2v68B/D wPYYvanm82wdIZ+Ep5IJbKPRcHKFbWaIdWt4zLj8GTn7a04fk7Btnuqg4huEd/9aH+YH USHmycr0kjNSqp9HuzTTph08MjJ1LUVTp8ZaKqRQxylia+Aj34DeMDooXhjKn3UabUuD OiuwaqQSTJ4fuKOVubMg6uDvNUZu8Vj1/lacYkxvrohKBYBG/av7l14Gswwr56kVcujN 2EpQ== X-Gm-Message-State: APzg51AptqXjnex/j+7Yo9mwO+HH13l7ccyANQbVw9VcNIbxbhjuRshB tA2CbHd9nQG8C24DOt0y5s4g/7vn X-Google-Smtp-Source: ANB0VdY23VmOoaCoVJF2k5xavJH+BSZ3ZJMh6HdMeVaPtn6N++II50g0F5N6yilsXnjYXnnRma17KQ== X-Received: by 2002:a5d:4410:: with SMTP id z16-v6mr6996793wrq.272.1534769121662; Mon, 20 Aug 2018 05:45:21 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:21 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:55 +0300 Message-Id: <20180819202300.10590-11-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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::435 Subject: [Qemu-devel] [PATCH PULL 10/15] hw/rdma: Cosmetic change - move to generic function 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia To ease maintenance of struct comp_thread move all related code to dedicated function. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-11-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 52981d652d..d29acc505b 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -146,10 +146,10 @@ static void *comp_handler_thread(void *arg) return NULL; } -static void stop_comp_thread(RdmaBackendDev *backend_dev) +static void stop_backend_thread(RdmaBackendThread *thread) { - backend_dev->comp_thread.run = false; - while (backend_dev->comp_thread.is_running) { + thread->run = false; + while (thread->is_running) { pr_dbg("Waiting for thread to complete\n"); sleep(THR_POLL_TO / SCALE_US / 2); } @@ -159,7 +159,7 @@ static void start_comp_thread(RdmaBackendDev *backend_dev) { char thread_name[THR_NAME_LEN] = {0}; - stop_comp_thread(backend_dev); + stop_backend_thread(&backend_dev->comp_thread); snprintf(thread_name, sizeof(thread_name), "rdma_comp_%s", ibv_get_device_name(backend_dev->ib_dev)); @@ -876,7 +876,7 @@ void rdma_backend_start(RdmaBackendDev *backend_dev) void rdma_backend_stop(RdmaBackendDev *backend_dev) { pr_dbg("Stopping rdma_backend\n"); - stop_comp_thread(backend_dev); + stop_backend_thread(&backend_dev->comp_thread); } void rdma_backend_fini(RdmaBackendDev *backend_dev) From patchwork Sun Aug 19 20:22:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959680 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=2001:4830:134:3::11; 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="o5h/KiM4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDLV2fVxz9s9J for ; Mon, 20 Aug 2018 22:55:30 +1000 (AEST) Received: from localhost ([::1]:46926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjiR-0007kq-Uo for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:55:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cw-4P for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYo-0000jS-JE for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:40044) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYj-0000ga-9c for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:27 -0400 Received: by mail-wr1-x431.google.com with SMTP id n2-v6so2405584wrw.7 for ; Mon, 20 Aug 2018 05:45:24 -0700 (PDT) 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=ljnQAI8ZwgJJDNhWILx5HKKqyVWG/v+HnXtQhD5M+gM=; b=o5h/KiM4bZmxdOFMlTX2/Kohosbe1KVg+02LocPt1DcjLrHLnUNO51npXPA2CY2T5k Kr/d1QS1RYoz8kU9/1kr5WU7XBasi+tfRlOYRZ9rTE3myvJWw98GWTXs53f6zsgNDnMu flYy1w+qDG8bvcqeA45xHrLczwZX0WfLiVkePZcsWeICqhlHHY0kPBSTAC0JGENgcrrP iZNhXviN0Eam6jhIrHfZfK/7rVM1M2mNHc+dJJWxZYnLueeDZUxXZlr5wP/gK04fOjSQ MPb/aVcX7IuGVuH2V1C7cpvCaYjiB1XQUYo9cFQpkt7HKE8e5KWAEWO6tmRK9+aTom6N fC9A== 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=ljnQAI8ZwgJJDNhWILx5HKKqyVWG/v+HnXtQhD5M+gM=; b=DLlAqU8XrXidpQmUEB0O3ThcjyAZsXOSUjC04U8fsUYWdn9SQAsKixKF5u5/0OdUx9 4pLBoiL89bx0oLEchjSh8T58YlZ0jj820AYN2E6qVTncWXuVPDbek946WJSjFk26CR6W U1oscW7CCeMJpgqQkTvCUYIWVezRsshkDW6metZkgl/AgkvvZu9iSfG67epoFVAbrQs5 0bi/7IDdAF4mp1u5UH7Zdbmurj6Bm8XiMZOZjxFSeepbw8f5GqLX5wINTQDMsCN+y1mo ok65VgSMttXf7GlB0nzaTNJyb4O/Cj9wTtoPz6p7tiSQyeMXz5PFQlsZ56c/Xld+Ss2j wbQg== X-Gm-Message-State: APzg51D76nfYIfVH95QAyAwks9xLF0YModl9wyi8N8e716qILJt4RrAE uIyP/8ddcU+kdzPbKBfUqYqRaORC X-Google-Smtp-Source: ANB0VdaCpkrghSTkXYFMTvMoRSxHH0AT3nA7gZoOb76+gWrZ8eM+orsFMCW03jqMJRcLrkOT7VqOcw== X-Received: by 2002:a5d:504b:: with SMTP id h11-v6mr1293310wrt.18.1534769122928; Mon, 20 Aug 2018 05:45:22 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:22 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:56 +0300 Message-Id: <20180819202300.10590-12-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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::431 Subject: [Qemu-devel] [PATCH PULL 11/15] hw/rdma: Print backend QP number in hex format 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia To be consistent with other prints throughout the code fix places that print it as decimal number. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-12-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_rm.c | 4 ++-- hw/rdma/vmw/pvrdma_qp_ops.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 1f014b4ab2..859c900003 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -389,7 +389,7 @@ int rdma_rm_modify_qp(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, RdmaRmQP *qp; int ret; - pr_dbg("qpn=%d\n", qp_handle); + pr_dbg("qpn=0x%x\n", qp_handle); qp = rdma_rm_get_qp(dev_res, qp_handle); if (!qp) { @@ -447,7 +447,7 @@ int rdma_rm_query_qp(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, { RdmaRmQP *qp; - pr_dbg("qpn=%d\n", qp_handle); + pr_dbg("qpn=0x%x\n", qp_handle); qp = rdma_rm_get_qp(dev_res, qp_handle); if (!qp) { diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index a8664f40c8..c668afd0ed 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -130,7 +130,7 @@ int pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) PvrdmaSqWqe *wqe; PvrdmaRing *ring; - pr_dbg("qp_handle=%d\n", qp_handle); + pr_dbg("qp_handle=0x%x\n", qp_handle); qp = rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { @@ -174,7 +174,7 @@ int pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) PvrdmaRqWqe *wqe; PvrdmaRing *ring; - pr_dbg("qp_handle=%d\n", qp_handle); + pr_dbg("qp_handle=0x%x\n", qp_handle); qp = rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { From patchwork Sun Aug 19 20:22:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959679 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=2001:4830:134:3::11; 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="V+ffYZPo"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDLR67R5z9s8T for ; Mon, 20 Aug 2018 22:55:27 +1000 (AEST) Received: from localhost ([::1]:46925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjiP-0007gY-Ex for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:55:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cv-45 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYp-0000jm-Bx for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:52368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYl-0000h8-Ns for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:29 -0400 Received: by mail-wm0-x243.google.com with SMTP id o11-v6so14084851wmh.2 for ; Mon, 20 Aug 2018 05:45:25 -0700 (PDT) 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=+VL5fahtdL/1D3QAfSdncEBv0sUBzU+7fvTRRLp/6Yc=; b=V+ffYZPoVDimsXCCMbOwb1H3McIxA4eo3u20LyCVTn2u/DFrYisDOIi9GpTIZRIRzD EVBH0v8BhpLWxsGSnTxGGpOnKcHRM7CzH4dtwrKb+wTyrEsfor2KH3JqMMsNm+jRCy3l jAPAAlNcbApC0BHpJgW001Y7gSEUwzqxE9iHknaoOVGSM32+zVkr6yU+1u5mTj2BfwBe x9uDNy6ee5cIaIOQXHt+7PaQOqvjda/irTA9goZY07ZCo69wvfiTeEBvEfmr+XvaAz2v /EBMAG4W6OnsIb+ANaSSETxVqopmJA1ZhQKc97zFE6aBHNi0tpHp6hEK9ha0YUKEDFuD E7RQ== 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=+VL5fahtdL/1D3QAfSdncEBv0sUBzU+7fvTRRLp/6Yc=; b=C0IzSOdSJ4Jho1yEC8WNrwykABc7G1ljZcF/l/1ulIhcC/pQND8PcE4tVk2EGGfwoK Ytxnym9bOAQpTWSG7Orb/FtRNwz007vIgi+9booiTN1ucLJ7F8HUfNbq1PMMM9+xwS2Q LtY/So39/riV/9SOoTv8AO/v1yIcAp/s7Xud0t3nsGQiQV9AU4f0hCBn5nNGX3YvVoEc iV8f47etZnU8tSGawLMIVbxDkOBajzoPGYey+5S88ycZQTgNw8tcQUy6mBmvftLlBgYX C9O9ykNsCqQEyUIY2UZHltQX/T9qx49aGec5JZTOw1M0CcIVzEaXoeYg63UoazlX7EoD 1UCw== X-Gm-Message-State: AOUpUlGPK9D2r66c1W7lOrOQFcNslteDhnZpVc8TG21dzwznjjM969NL y3imGYkRhiOdYHerFGCeISgnhe2c X-Google-Smtp-Source: AA+uWPxy9TEPpS5fuwO+I7gyevk/7wO7azVztANYGzOK5YDKxHj+YJV9R8pGt4ONs9u2hLafOK1ttg== X-Received: by 2002:a1c:6d1c:: with SMTP id i28-v6mr27209922wmc.97.1534769124297; Mon, 20 Aug 2018 05:45:24 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:23 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:57 +0300 Message-Id: <20180819202300.10590-13-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH PULL 12/15] hw/rdma: Bugfix - Support non-aligned buffers 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia RDMA application can provide non-aligned buffers to be registered. In such case the DMA address passed by driver is pointing to the beginning of the physical address of the mapped page so we can't distinguish between two addresses from the same page. Fix it by keeping the offset of the virtual address in mr->virt. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-13-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_rm.c | 2 ++ hw/rdma/vmw/pvrdma_cmd.c | 1 + 2 files changed, 3 insertions(+) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 859c900003..8d59a42cd1 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -166,6 +166,7 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint32_t pd_handle, mr->virt = host_virt; mr->start = guest_start; mr->length = guest_length; + mr->virt += (mr->start & (TARGET_PAGE_SIZE - 1)); ret = rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, mr->virt, mr->length, access_flags); @@ -203,6 +204,7 @@ void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res, uint32_t mr_handle) rdma_backend_destroy_mr(&mr->backend_mr); pr_dbg("start=0x%" PRIx64 "\n", mr->start); if (mr->start) { + mr->virt -= (mr->start & (TARGET_PAGE_SIZE - 1)); munmap(mr->virt, mr->length); } res_tbl_dealloc(&dev_res->mr_tbl, mr_handle); diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index 4f74b29936..b74b0b48d0 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -59,6 +59,7 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma, } host_virt = mremap(curr_page, 0, length, MREMAP_MAYMOVE); + pr_dbg("mremap %p -> %p\n", curr_page, host_virt); if (host_virt == MAP_FAILED) { host_virt = NULL; error_report("PVRDMA: Failed to remap memory for host_virt"); From patchwork Sun Aug 19 20:22:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959677 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=2001:4830:134:3::11; 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="sSiSXGKe"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDH82L7Hz9s8T for ; Mon, 20 Aug 2018 22:52:36 +1000 (AEST) Received: from localhost ([::1]:46917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjfd-0005W4-TO for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:52:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cp-3u for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYp-0000k9-HO for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:42212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYn-0000ho-92 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:31 -0400 Received: by mail-wr1-x42a.google.com with SMTP id e7-v6so12871063wrs.9 for ; Mon, 20 Aug 2018 05:45:26 -0700 (PDT) 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=FF47ysipW5bdpdJVsg+t2YDCni+3o7HkFAqkOyWgLBM=; b=sSiSXGKe4Y7jBuo6rJHeBUHlXLO0WbzY+MYcfTiXnJn11mjbOajPmmsRw3BweIzZpf KVqcG+vYtVMoPyjvd40C/L9Sp4yj6Y6XbBAAqTccv6p3vigzGfiG7ddvXse7+LmDdUYr 360difOfYETyR2yfQlPKboBwPacHjNJ6KbsJPS7+BNwSDvIEAzQIyHS3Jph/x2yBl7QZ WpxQnmAbSVsuAOmCb0G2V24fmXmE6o7x/Ae93D6F8dk07PKLU5AQgqkDdY2stLoVL0ip 27x2TKmdjcyJfXFeCM94mSuvnUEGnXJ00zPXiza9ZAbZHlHud0meb5ycYDLAFdarv55G 8oMQ== 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=FF47ysipW5bdpdJVsg+t2YDCni+3o7HkFAqkOyWgLBM=; b=YG6QJh1t8UtLxERYSPUD1uTqSQ8s3Gx+/kWbhZAD5HKJnndgmtTJhqYG7LiTrZwv5r 1DoT3c06QzSGE4EWi6/94bc2ynDCrxYjYkDx8ndylzJYp8yejyLUAcZRKntYyr4mbuev B7TXimx7BZQO2syRLDxj+a9mkNIpBvlnCmTI/5MdaOXH7YQN2IWR/xrc70HwgtjdKts3 JeIUdLpLW8i/C25lBw5f29T/jiuXJWY5LX696VLcQPG39ugJUBI6u79wsz0juxnoUbGT kgUGZOZvn6ixMo0V7sVu71PPmGEN3MLljTR0bZqkVoxhY6g2FdjflthByfC8USOvgOTv 9tyw== X-Gm-Message-State: AOUpUlHsUuroZVuO8FI/ESujIH28kZhQuiBrnsE2bGLysgFsWi46QHna UmHMAVPL64wVO5Gql9mZShu4VPwb X-Google-Smtp-Source: ANB0VdZ6s5jar1NnXnT4pEzO4nMgguLu1VIVQE4/+QGkjhmkAF0yiuWhD/UTiPW0c+GGCVbCycOApA== X-Received: by 2002:adf:a196:: with SMTP id u22-v6mr1326512wru.50.1534769125654; Mon, 20 Aug 2018 05:45:25 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:25 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:58 +0300 Message-Id: <20180819202300.10590-14-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-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::42a Subject: [Qemu-devel] [PATCH PULL 13/15] hw/rdma: Add reference to pci_dev in backend_dev 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia The field backend_dev->dev is not initialized, fix it. Signed-off-by: Yuval Shaia Message-Id: <20180805153518.2983-14-yuval.shaia@oracle.com> Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 6 +++++- hw/rdma/rdma_backend.h | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index d29acc505b..d7a4bbd91f 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -744,7 +744,7 @@ static int init_device_caps(RdmaBackendDev *backend_dev, return 0; } -int rdma_backend_init(RdmaBackendDev *backend_dev, +int rdma_backend_init(RdmaBackendDev *backend_dev, PCIDevice *pdev, RdmaDeviceResources *rdma_dev_res, const char *backend_device_name, uint8_t port_num, uint8_t backend_gid_idx, struct ibv_device_attr *dev_attr, @@ -756,6 +756,10 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, struct ibv_device **dev_list; struct ibv_port_attr port_attr; + memset(backend_dev, 0, sizeof(*backend_dev)); + + backend_dev->dev = pdev; + backend_dev->backend_gid_idx = backend_gid_idx; backend_dev->port_num = port_num; backend_dev->rdma_dev_res = rdma_dev_res; diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 3049a73962..86e8fe8ab6 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -46,7 +46,7 @@ static inline uint32_t rdma_backend_mr_rkey(const RdmaBackendMR *mr) return mr->ibmr ? mr->ibmr->rkey : 0; } -int rdma_backend_init(RdmaBackendDev *backend_dev, +int rdma_backend_init(RdmaBackendDev *backend_dev, PCIDevice *pdev, RdmaDeviceResources *rdma_dev_res, const char *backend_device_name, uint8_t port_num, uint8_t backend_gid_idx, struct ibv_device_attr *dev_attr, diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 3d448bffc4..ca5fa8d981 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -611,7 +611,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) goto out; } - rc = rdma_backend_init(&dev->backend_dev, &dev->rdma_dev_res, + rc = rdma_backend_init(&dev->backend_dev, pdev, &dev->rdma_dev_res, dev->backend_device_name, dev->backend_port_num, dev->backend_gid_idx, &dev->dev_attr, errp); if (rc) { From patchwork Sun Aug 19 20:22:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959673 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=2001:4830:134:3::11; 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="ct8EKkQg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDCd2fzbz9s8T for ; Mon, 20 Aug 2018 22:49:33 +1000 (AEST) Received: from localhost ([::1]:46900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjcg-0002OL-R5 for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:49:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cq-3r for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYp-0000kE-Hm for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:39327) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYo-0000iE-QG for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:31 -0400 Received: by mail-wm0-x235.google.com with SMTP id q8-v6so13794332wmq.4 for ; Mon, 20 Aug 2018 05:45:28 -0700 (PDT) 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=WXaIoFeno1rju22JnMElqJ3lDtuSt/5LfsT5sizMUL8=; b=ct8EKkQgxODR426kW50SW8T+hbPoQIr4NfGmSBHgXHnyxmbKAHbmvA40g8fr+Nwhtf +hFNGwLrIVgX678HVY7gykkG+UGdNglgNsEMyRCiExE/703LjcGWP3oM/rLkXCjnIkxQ z8WvnNi7wWBXZNnCZP18jChCPVlWnvGrml+j5LW7dVodH5agVWs+doAfePDxRoEAhvcm 3fG70dWcBhjk/W0wFeZ7GU7TRPhIJnV03s4LwWa5Ck4SH/H4TLmo35JdkpP6dX/D3G4d jPiQfnNnrS4qQ61g6nfamhvyxSyTevIMn7B4Hxgb9etXsA00oR0mx2wk2Bf3xO5gG9CI j41A== 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=WXaIoFeno1rju22JnMElqJ3lDtuSt/5LfsT5sizMUL8=; b=abbScztGmaZzEUu+fGKB645fzdFxb2g6ekqUbrP0IFnFJCGsaEdkCuYXg4+Kw31OkV LmkdweJWENOJHuPpvmvr15asl+1LCy8DUNCZ9gE6x3UJx2nk69Iq+tUvDtN3LYvT54O0 oUn9cC488rK7flzXkykK4l+Aps+TwiS8Y/c6+bN3sIA9G7zp6dPxnb8ahe9oG779epBh y6O/rIHQFdz2k5pkgnLeKktEhaCvOPjC7GSwHIvQ9V55oxEJuYaDmfBs5+TPGWPtl/LL LH6vok1soWXRyMWnoqFFxdVCFZqyYTX3CZyzRNVO/G+LVr7kNuM1HySEfEQH7FUCTJLT U8CA== X-Gm-Message-State: AOUpUlG1uIKsQPo2gQw2/JfaM3u/na304eG2nR5oyg4WDTfkePeA6p3S 9VBAlu2MmPGXa2fkvN0U0HYJJFpe X-Google-Smtp-Source: AA+uWPwn9k+BMxEXZcBXVUK/MUhxeuoDIxOG7TxvrwYdvH+PATA2EoLMEVmwtZBAL433tCZ2gwh9NA== X-Received: by 2002:a1c:c289:: with SMTP id s131-v6mr28215436wmf.65.1534769126930; Mon, 20 Aug 2018 05:45:26 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:26 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:59 +0300 Message-Id: <20180819202300.10590-15-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH PULL 14/15] hw/pvrdma: remove not needed include 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" No need to include linux/types.h, is empty anyway. Suggested-by: Thomas Huth Signed-off-by: Marcel Apfelbaum Message-Id: <20180811171534.11917-1-marcel.apfelbaum@gmail.com> Reviewed-by: Yuval Shaia --- hw/rdma/vmw/pvrdma_cmd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index b74b0b48d0..4faeb21631 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "cpu.h" -#include #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pci_ids.h" From patchwork Sun Aug 19 20:23:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959681 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=2001:4830:134:3::11; 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="bYyjn/zb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDLd687Zz9s9J for ; Mon, 20 Aug 2018 22:55:37 +1000 (AEST) Received: from localhost ([::1]:46929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjiZ-0007r6-Ex for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:55:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cr-3v for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYp-0000kM-JC for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:51781) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYp-0000iv-Az for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:31 -0400 Received: by mail-wm0-x234.google.com with SMTP id y2-v6so14166364wma.1 for ; Mon, 20 Aug 2018 05:45:29 -0700 (PDT) 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=RTv4NJW/VMzJ1knL+RQ90MEku8WW0+FhVI9ff4a6eeY=; b=bYyjn/zbP73Dwd8Tuh28UQLFAYsfGeh+RVzDCyZ+x74q++/42KZoy9b0143PQ/I4HT yHYkL2PAHzrnww6EAcN4M/c9cYa4LrsVshkDH0YFWWlj9NfLCxS/ry2k1lM2WuVo64CD DSnM7FwQlbN9egGxh0qoX0HYKGTA35O6FVOEeTw5apYfp5tPJuU/6klGiwwwiqU3zWHd Z8CQ3ux6ItKe5vJ0+AFN08WdQIqucHa3nfXaH/k+x1zQvcuUwV8kDUqzbqUFSRC607CI 8v5PKFzV3CuGT3Al6mN26G3ic9ByAW8DM0CED1BfAQf9Cp3B2qefFEme5C7LeIiurgS4 VMjg== 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=RTv4NJW/VMzJ1knL+RQ90MEku8WW0+FhVI9ff4a6eeY=; b=kXI9H9kJnVh3o7pSo4X3goVY54ZFYNMt857TIdEff6LL+1NzuEWg8A4QB5CanP44+i IFXFA1m1/tuWckVme4y+AWFuq2CXGERbw83tu55QeOOpxdlU4X3GS9AHXBqRd8WIyFIA ikvV2gCFITasFX92xZKBj7CAa+hhwLk7X89FcuzuT674BbUR2ZInrO7P/fN8nqsEncgv x0kx5bEYAB4OHSy5ZlcIFona5R/pDbiSeA6FbpSeYb0RYEQYiccVZuZnmZWFPAayazvs /QdrQpmMSNf1J3iyYkXrevu3+9tcZXTJCHNO66/24fvZLL4zlN7IEUetZP9rCSKd0MmS eUrg== X-Gm-Message-State: AOUpUlEU1Fg3lEDtcRJQCXwoIGUM/sFeRwP76pan7SZn9NW3KfLPZ6cq p9AD82QsBKv61f7GTKa5ezfsVSsk X-Google-Smtp-Source: AA+uWPxSK0/SvF4oAhdZhytiJlutFWd5lVC5EQjnFrBS/Hvctcpq0t0toTCT8jSr8INa9yJKcOOisw== X-Received: by 2002:a1c:8dd1:: with SMTP id p200-v6mr23720540wmd.145.1534769128353; Mon, 20 Aug 2018 05:45:28 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:27 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:23:00 +0300 Message-Id: <20180819202300.10590-16-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::234 Subject: [Qemu-devel] [PATCH PULL 15/15] config: split PVRDMA from RDMA 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: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In some BSD systems RDMA migration is possible while the pvrdma device can't be used because the mremap system call is missing. Reported-by: Rebecca Cran Signed-off-by: Marcel Apfelbaum Message-Id: <20180816151637.24553-1-marcel.apfelbaum@gmail.com> Reviewed-by: Thomas Huth --- configure | 55 ++++++++++++++++++++++++++++++++++++++++++- hw/rdma/Makefile.objs | 2 +- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/configure b/configure index db97930314..7d9a63636c 100755 --- a/configure +++ b/configure @@ -375,6 +375,7 @@ hax="no" hvf="no" whpx="no" rdma="" +pvrdma="" gprof="no" debug_tcg="no" debug="no" @@ -1363,6 +1364,10 @@ for opt do ;; --disable-rdma) rdma="no" ;; + --enable-pvrdma) pvrdma="yes" + ;; + --disable-pvrdma) pvrdma="no" + ;; --with-gtkabi=*) gtkabi="$optarg" ;; --disable-vte) vte="no" @@ -1669,7 +1674,8 @@ disabled with --disable-FEATURE, default is enabled if available: hax HAX acceleration support hvf Hypervisor.framework acceleration support whpx Windows Hypervisor Platform acceleration support - rdma Enable RDMA-based migration and PVRDMA support + rdma Enable RDMA-based migration + pvrdma Enable PVRDMA support vde support for vde network netmap support for netmap network linux-aio Linux AIO support @@ -3064,6 +3070,48 @@ EOF fi fi +########################################## +# PVRDMA detection + +cat > $TMPC < + +int +main(void) +{ + char buf = 0; + void *addr = &buf; + addr = mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED); + + return 0; +} +EOF + +if test "$rdma" = "yes" ; then + case "$pvrdma" in + "") + if compile_prog "" ""; then + pvrdma="yes" + else + pvrdma="no" + fi + ;; + "yes") + if ! compile_prog "" ""; then + error_exit "PVRDMA is not supported since mremap is not implemented" + fi + pvrdma="yes" + ;; + "no") + pvrdma="no" + ;; + esac +else + if test "$pvrdma" = "yes" ; then + error_exit "PVRDMA requires rdma suppport" + fi + pvrdma="no" +fi ########################################## # VNC SASL detection @@ -5952,6 +6000,7 @@ if test "$tcg" = "yes" ; then fi echo "malloc trim support $malloc_trim" echo "RDMA support $rdma" +echo "PVRDMA support $pvrdma" echo "fdt support $fdt" echo "membarrier $membarrier" echo "preadv support $preadv" @@ -6708,6 +6757,10 @@ if test "$rdma" = "yes" ; then echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak fi +if test "$pvrdma" = "yes" ; then + echo "CONFIG_PVRDMA=y" >> $config_host_mak +fi + if test "$have_rtnetlink" = "yes" ; then echo "CONFIG_RTNETLINK=y" >> $config_host_mak fi diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs index 3504c39d21..bd36cbf51c 100644 --- a/hw/rdma/Makefile.objs +++ b/hw/rdma/Makefile.objs @@ -1,4 +1,4 @@ -ifeq ($(CONFIG_RDMA),y) +ifeq ($(CONFIG_PVRDMA),y) obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o