From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 450EDA0C47 for ; Tue, 10 Aug 2021 17:45:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3ED414014F; Tue, 10 Aug 2021 17:45:17 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 0D625411C3 for ; Tue, 10 Aug 2021 17:45:16 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 189CE3F0FD for ; Tue, 10 Aug 2021 15:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610315; bh=F0tMNu/G/jhwiJ01t0/iyAZj1NWw70/loXjToFCtOF4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aULhtjyKLeJsA7tgQf3RxKMAKfCqmB4k+sq80rk+ip4Fk7wSl1y+Q2JJ8FGOaYwy4 LRadpnQIoT0PXsF75ur///tFtlI0HRLgwhenZSoqPTLxrxKFYs5T6LQmurry2iqfzo PTEib430n3IDzyfqdci7/B7XJou6MWh6gg1Y3uSNRjzgMsmAmrfpoxEqlRn4oM21HV Zf8l4jVz5u7YzCycvRrY350uuJxSIx0I/gk5sUYocjVzmu87T6ezFiHtq9l+1cqCDF vh//3sc6tEdtWXjYeUNgR4ju4kh4KkmQ+e3tpeQdYa+oNbwUHOsPzZFYVLtGW/oulY mWc4lW98GN8yQ== Received: by mail-ed1-f72.google.com with SMTP id l3-20020aa7c3030000b02903bccf1897f9so10934778edq.19 for ; Tue, 10 Aug 2021 08:45:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F0tMNu/G/jhwiJ01t0/iyAZj1NWw70/loXjToFCtOF4=; b=ooyXotE3nwwR6TQKBkivf0+MTNfgSWRvVqc5qwDuLN3IPY52Gvl50WI3bwySMKQrWu 1Wrroyw8KzFrOdwYCnhD6vZiSne+baBsuyahzbXng5hzQZaHxDaOZnT00UxQ90rnBJjA n4BOh7t2lNo5lb7ppUpBSuBUa4a+27XsszzXpJpbQH+x+y+zOGr1aU+Vj7Jrq9ShG3p0 MzifWu/j2pwxlfGnRxGkN7zd1HrZMu9rvHi1q+ZJxey8ehlfkec8j7mSA54EvfL9NHSH 01oU0YvjmLf9gQmcCgP21T9uIiLWLdiX4ENkJnm9oq/7bGlXxbVchLFFwMwROhGSQmpr S7wA== X-Gm-Message-State: AOAM532pJq2tHD5/yOfkyOsYTqA0SJVUDRYFtPrDw3TAh7cNkVAkewYF rHIlhTzx1EVpbfn/9Od3tZnRSOcNGmujfLtzFIrq8C9e/eisCraDR+BAxgbmQdHe70oV4Vq3wmu +8jnhKraq2QLmKixoGFNtcIOd X-Received: by 2002:a17:906:3716:: with SMTP id d22mr15141534ejc.376.1628610314315; Tue, 10 Aug 2021 08:45:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwN29FpFGHex/tGR2v9sEp9gGsakL4dZN5KHkDLWdKCllSyZleX6O5D3qi2E1c6B7V8ClpsYw== X-Received: by 2002:a17:906:3716:: with SMTP id d22mr15141516ejc.376.1628610314149; Tue, 10 Aug 2021 08:45:14 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id cb4sm7008642ejb.72.2021.08.10.08.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:45:13 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Gaoxiang Liu Cc: Chenbo Xia , Maxime Coquelin , dpdk stable Date: Tue, 10 Aug 2021 17:40:14 +0200 Message-Id: <20210810154022.749358-94-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: fix interrupt handle leak' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a3b51a8b34b382717a2bab9681135b034ae872e0 Thanks. Christian Ehrhardt --- >From a3b51a8b34b382717a2bab9681135b034ae872e0 Mon Sep 17 00:00:00 2001 From: Gaoxiang Liu Date: Mon, 26 Jul 2021 22:42:05 +0800 Subject: [PATCH] net/virtio: fix interrupt handle leak [ upstream commit 7b9195154926b808e3ae23750eaff3e81cd5f529 ] Free memory of interrupt handle in virtio_user_dev_uninit() to avoid memory leak. when virtio user dev closes, memory of interrupt handle is not freed that is allocated in virtio_user_fill_intr_handle(). Fixes: 3d4fb6fd2505 ("net/virtio-user: support Rx interrupt") Signed-off-by: Gaoxiang Liu Reviewed-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index ad5d2f3bf8..1277dbe038 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -528,6 +528,12 @@ void virtio_user_dev_uninit(struct virtio_user_dev *dev) { uint32_t i; + struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->hw.port_id]; + + if (eth_dev->intr_handle) { + free(eth_dev->intr_handle); + eth_dev->intr_handle = NULL; + } virtio_user_stop_device(dev); -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:16.635100829 +0200 +++ 0094-net-virtio-fix-interrupt-handle-leak.patch 2021-08-10 15:11:13.126638878 +0200 @@ -1 +1 @@ -From 7b9195154926b808e3ae23750eaff3e81cd5f529 Mon Sep 17 00:00:00 2001 +From a3b51a8b34b382717a2bab9681135b034ae872e0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7b9195154926b808e3ae23750eaff3e81cd5f529 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - drivers/net/virtio/virtio_user/virtio_user_dev.c | 7 +++++++ - 1 file changed, 7 insertions(+) + drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 ++++++ + 1 file changed, 6 insertions(+) @@ -22 +23 @@ -index 1cd1e95f45..16c58710d7 100644 +index ad5d2f3bf8..1277dbe038 100644 @@ -25,2 +26 @@ -@@ -654,6 +654,13 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, - void +@@ -528,6 +528,12 @@ void @@ -28,0 +29 @@ + uint32_t i; @@ -35 +36 @@ -+ + @@ -38 +38,0 @@ - rte_mem_event_callback_unregister(VIRTIO_USER_MEM_EVENT_CLB_NAME, dev);