From patchwork Sat Feb 23 14:16:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 10827543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A4B4917E9 for ; Sat, 23 Feb 2019 14:18:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B77F2AC1A for ; Sat, 23 Feb 2019 14:18:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C70F2EC75; Sat, 23 Feb 2019 14:18:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 205582AC1A for ; Sat, 23 Feb 2019 14:18:45 +0000 (UTC) Received: from localhost ([127.0.0.1]:38520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxY8a-0007kP-Bi for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Feb 2019 09:18:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxY71-0006Zj-3v for qemu-devel@nongnu.org; Sat, 23 Feb 2019 09:17:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxY6y-0002Ph-Op for qemu-devel@nongnu.org; Sat, 23 Feb 2019 09:17:07 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxY6x-0002O6-4R for qemu-devel@nongnu.org; Sat, 23 Feb 2019 09:17:03 -0500 Received: by mail-wm1-x341.google.com with SMTP id n19so4326189wmi.1 for ; Sat, 23 Feb 2019 06:17:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Hi3u5rmWueKSV4/uDc3OvQ4XKdwpNgqhrP+D3fd096U=; b=N/7X5JYAPdDomxRbLo1cUn2T3SwssbYsEQxuHHJciUBGENx6TOjLDpG1nyioF6dxqn yp5MYyFf9mzG8C7u6vdDsb2Zbk8fRWU6B5EstBoQmWbZksh/Tpu22wBkXKeaEAofoBQB OiDwCA5kSoxUIU6bfqohlHSU2n8sBgVKtBPNtxkmHtFpEu8d97NhH13sZPLHltHPjqxC reDi3Jn6AcynrYRiKPzSQmBK+pH6f2ih3bsg5e0hmiHLo5rfo1fKoHgRuYuu2WiX/+mg u10qLxJmbad6seji1Cxp5nC8K3jYggKJ66Ltvtmpi2hofDC4uKf6+/LMpje7YXoMFON/ llqQ== 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=Hi3u5rmWueKSV4/uDc3OvQ4XKdwpNgqhrP+D3fd096U=; b=M6gv1rO2ru0h/39sd8xeiuSu+Jd5OXVibMq3wgw4kwKg5q23xHLimbqz9mJ+o44N3X nIO0WJJWKo65WO+tl1jox5UmxcGb2MmoSPxGJ+iAjkYfvyiEqpI18ldfBk8Hg9xDPVs9 Nf0G7QrQnr8+SeC/ncoox7um1WZAPlxK3ELe3Mt/iy1BUTgpiWOJg7TMjdixc/x3KXEM 2HRzhE2qkGiHwCrHZ9ffq48XTgR6oS/avc2BNBRoIWB2gv8ygFdzQS/yCLEfKQSukY0+ hMfdRiNJNurgfcCJgMtlJOFkezllWQ1bXjbBSDFayddx0mpYbCnI3VnkMq6p+Dp0LuAn X1xA== X-Gm-Message-State: AHQUAuYgNJ2x9ew2CJgUzvoLKfeCW6p9eGd5+rgzPU9oXUUbkmGi6zWF 2xkSS7Lhmvs7Swafu+oTFWwqCLNq X-Google-Smtp-Source: AHgI3IYlO30A8FRCyZ/fYm5ppzMhkdebAdgbLCOtIV2tJbLYUiRaEuH9bxLv6AkF6U5gotDogSXqcg== X-Received: by 2002:a05:600c:210b:: with SMTP id u11mr5625595wml.11.1550931418613; Sat, 23 Feb 2019 06:16:58 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id x3sm3310506wru.76.2019.02.23.06.16.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Feb 2019 06:16:57 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 23 Feb 2019 16:16:39 +0200 Message-Id: <20190223141644.6609-7-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190223141644.6609-1-marcel.apfelbaum@gmail.com> References: <20190223141644.6609-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::341 Subject: [Qemu-devel] [PATCH PULL 06/11] hw/rdma: Free all MAD receive buffers when device is closed 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: philmd@redhat.com, kamalheib1@gmail.com, yuval.shaia@oracle.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Yuval Shaia When device is going down free all saved MAD buffers. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20190213065357.16076-7-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 34 +++++++++++++++++++++++++++++++++- hw/rdma/vmw/pvrdma_main.c | 2 ++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 0fb4842970..e8ee205b5f 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -64,6 +64,33 @@ static inline void complete_work(enum ibv_wc_status status, uint32_t vendor_err, comp_handler(ctx, &wc); } +static void free_cqe_ctx(gpointer data, gpointer user_data) +{ + BackendCtx *bctx; + RdmaDeviceResources *rdma_dev_res = user_data; + unsigned long cqe_ctx_id = GPOINTER_TO_INT(data); + + bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, cqe_ctx_id); + if (bctx) { + rdma_rm_dealloc_cqe_ctx(rdma_dev_res, cqe_ctx_id); + } + g_free(bctx); +} + +static void clean_recv_mads(RdmaBackendDev *backend_dev) +{ + unsigned long cqe_ctx_id; + + do { + cqe_ctx_id = rdma_protected_qlist_pop_int64(&backend_dev-> + recv_mads_list); + if (cqe_ctx_id != -ENOENT) { + free_cqe_ctx(GINT_TO_POINTER(cqe_ctx_id), + backend_dev->rdma_dev_res); + } + } while (cqe_ctx_id != -ENOENT); +} + static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq) { int i, ne, total_ne = 0; @@ -1037,6 +1064,11 @@ static int mad_init(RdmaBackendDev *backend_dev, CharBackend *mad_chr_be) return 0; } +static void mad_stop(RdmaBackendDev *backend_dev) +{ + clean_recv_mads(backend_dev); +} + static void mad_fini(RdmaBackendDev *backend_dev) { disable_rdmacm_mux_async(backend_dev); @@ -1224,12 +1256,12 @@ void rdma_backend_start(RdmaBackendDev *backend_dev) void rdma_backend_stop(RdmaBackendDev *backend_dev) { + mad_stop(backend_dev); stop_backend_thread(&backend_dev->comp_thread); } void rdma_backend_fini(RdmaBackendDev *backend_dev) { - rdma_backend_stop(backend_dev); mad_fini(backend_dev); g_hash_table_destroy(ah_hash); ibv_destroy_comp_channel(backend_dev->channel); diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 8ffe79ceca..90dc9b191b 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -361,6 +361,8 @@ static void pvrdma_fini(PCIDevice *pdev) pvrdma_qp_ops_fini(); + rdma_backend_stop(&dev->backend_dev); + rdma_rm_fini(&dev->rdma_dev_res, &dev->backend_dev, dev->backend_eth_device_name);