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 536B0A034F for ; Wed, 11 Aug 2021 08:53:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4317040040; Wed, 11 Aug 2021 08:53:26 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id A429C40040 for ; Wed, 11 Aug 2021 08:53:24 +0200 (CEST) Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.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-1.canonical.com (Postfix) with ESMTPS id 7B7903F240 for ; Wed, 11 Aug 2021 06:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628664804; bh=NLF89K8WIUoMaFtYLOHSMsdP56oqrcsfYeut+Z8c2f0=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=WL0rn6Sdlpi70ZKnnvhUv8P6aNK3UX9Q2usO8Ns/D5Ugp87HtIwOQ8jGrNmcmoVw3 neQUhBOWiELzSBIQlOFPoSM9X8dcC2WTHSQfOwuYa+KvfOQiDymlsF811KyuooAfvm KM0gq2oMc1aZcR0DdJSST1dQ6U1JZzlb4Df4/VmDSkCDMYAnDpzmCvk60+mwnWQ0V8 rlwB9l6GdjXt7yYJVd5ont+cWmFrSnJnxzkL3uWZFuWEVkwAcVI82u5/HJggD6spP8 BQtoQiFh4Wrcw8X9H9qFjUtHCZQfMwwz8diBxJRQxmdmj+PgfafEH0BNGHIuGFSEv+ 5ash9sjdAlZvw== Received: by mail-qv1-f72.google.com with SMTP id u6-20020ad448660000b02903500bf28866so710957qvy.23 for ; Tue, 10 Aug 2021 23:53:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=NLF89K8WIUoMaFtYLOHSMsdP56oqrcsfYeut+Z8c2f0=; b=HMXdjOuWBN7Wkb42kfG6ZoEE+iAKUdK6NLO6zLhRkLCch/XCA45DWFgrNtAoUGJH56 eJf+d8qjefsywXGieDCmdDEdgJVVPKCrpMtcTAraGFNEx5SlKD5qq35yM5XXuYCyNbg0 YuS7R93N78w2LfGxba4WOv29wWZJPKaI7UWGgCrbuGo1ERkNriYgzTE42QQzqExfmyaK /9Lxmf6Q1SI08Zqa2EpCf9GtK7Zl6grX+cdPMEzR7k/7t2VAl8l87m63Bhg0irR9ET5B ZNbJZQMuEnR9G/Z021taidU4GkpasSJUT+JFHXndkkqGSpjF2bqRSgZEjQc2we11l4zR CA9Q== X-Gm-Message-State: AOAM531V/mLOJoVe5vXhO9ctHNhMqp9AzcdMtWnHm/q90fPXKhBTe4eM dT2HRSjmF7WlOgSL5T5blFrhBiOIePZoXGuYaf89LmbkIVLMz2EGAmyNKXSH/dVsyL+RMYocl0v Z2mtfwNmzKDj61hJ+MRUjJPtA39xSMZOlnQ/OgWwB X-Received: by 2002:a37:43d7:: with SMTP id q206mr25838775qka.114.1628664803131; Tue, 10 Aug 2021 23:53:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9APbx7Ok9EKvdMeDKD4Leq1Ra+5z4/d3ilMw70OkdSGv8kFC69EVTcaNb26XwFcYMNGwZEhbMuuSXpxRKNDE= X-Received: by 2002:a37:43d7:: with SMTP id q206mr25838769qka.114.1628664802945; Tue, 10 Aug 2021 23:53:22 -0700 (PDT) MIME-Version: 1.0 References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> <20210810154022.749358-94-christian.ehrhardt@canonical.com> In-Reply-To: <20210810154022.749358-94-christian.ehrhardt@canonical.com> From: Christian Ehrhardt Date: Wed, 11 Aug 2021 08:52:57 +0200 Message-ID: To: Gaoxiang Liu Cc: Chenbo Xia , Maxime Coquelin , dpdk stable Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [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" On Tue, Aug 10, 2021 at 5:45 PM wrote: > > Hi, > > FYI, your patch has been queued to stable release 19.11.10 Hi, while applying cleanly your patch caused build time failures like: ../drivers/net/virtio/virtio_user/virtio_user_dev.c: In function =E2=80=98virtio_user_dev_uninit=E2=80=99: ../drivers/net/virtio/virtio_user/virtio_user_dev.c:531:52: error: =E2=80=98struct virtio_user_dev=E2=80=99 has no member named =E2=80=98hw=E2= =80=99 531 | struct rte_eth_dev *eth_dev =3D &rte_eth_devices[dev->hw.port_id]; | Therefore the patch will be de-qeueud from the stable branch that shall bec= ome 19.11.10. Please consider having a look and providing a backport. A backport should contain a reference to the DPDK main branch commit in it's commit message in the following fashion: [ upstream commit ] For example: https://git.dpdk.org/dpdk-stable/commit/?h=3D18.11&id=3Dd90e6ae6f936ecd= c2fd3811ff9f26aec7f3c06eb When sending the backported patch, please indicate the target branch in the subject line, as we have multiple branches, for example: [PATCH $stable_branch] foo/bar: fix baz With git format-patch, this can be achieved by appending the parameter: --subject-prefix=3D'PATCH 19.11' Send the backported patch to "stable@dpdk.org" but not "dev@dpdk.org". FYI, branch $stable_branch is located at tree: https://git.dpdk.org/dpdk-stable Thanks in advance, Chrtistian > 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 t= he > 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 reba= sing > (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/a3b51a8b34b382717a2b= ab9681135b034ae872e0 > > 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/n= et/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 =3D &rte_eth_devices[dev->hw.port_id]= ; > + > + if (eth_dev->intr_handle) { > + free(eth_dev->intr_handle); > + eth_dev->intr_handle =3D NULL; > + } > > virtio_user_stop_device(dev); > > -- > 2.32.0 > > --- > Diff of the applied patch vs upstream commit (please double-check if no= n-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, c= har *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); --=20 Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd