From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 496C0A0518 for ; Fri, 24 Jul 2020 14:03:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 40E9D1C01E; Fri, 24 Jul 2020 14:03:40 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 2D44E1C01E for ; Fri, 24 Jul 2020 14:03:39 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f7so8096011wrw.1 for ; Fri, 24 Jul 2020 05:03:39 -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 :mime-version:content-transfer-encoding; bh=qi5veN1kl88YxRiiRfXjIO0Dq0bnQf6fSu9XCY8IRYU=; b=KaBnY5dgY90o0+0YFFfm3ktwJFl3fD/oQ2cBU2yZb/VlyCGTvFSnkaHEeJ9gAuGc9Q DHMGHO/AAzW03/RYVuqCxNRF6w8EGJtXzWl0eZnA065yCIP8ZHhpjv/nv9iJjWrLjXix 2MDAOJESgK4WqtGvpUiplxGpas/mWbN7n79kRExrrIPBNnQ5tiKM6D8a9kN5aOn0mW7C 2RhUA364cz2yCnYtxnxclYEoL7vOCNHQsS/J2xcbG0spbxFZQYJ4KONFzJ7p0MsurMhy mMxYOHh6wzrAVKUpN6xK6z+BdVYYBt9h6F/DaYKnWKgAMy1ML/0ItrHXiZgwZCu6Kok8 O6Dw== 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=qi5veN1kl88YxRiiRfXjIO0Dq0bnQf6fSu9XCY8IRYU=; b=gC0SwAX8Ii0f0cQSBLwEUvt8wxbNQ6fZfriFUsieTm+mQOiSeEKB7DK9GTIfbuX/ln g9Zcv6ydnP17CQX+nX1yy8H2Wo1EK5euD15Ld2U8jHZjezjKCoDcW/eRNp7wZKQZmznY zO0Lgsn7cduWhhK2wupaepF8FcplRfxI8D2wANE1NraRZSNsQU3RuQ3Ixg7adLyY5A/3 QEtDURgBdwo+F4dBwLbIZ9v5MyErXdtbD2n/LRs8HuUqJJUqKf+rdy4wneiBYONAn17u oW7lYZr7Scg7LmXj42I5krf9V8HCAv0VAd3vwFsCPWCsczL4mdvvHiQBFE7mexp+XgeI HKhA== X-Gm-Message-State: AOAM532ZspBsorf4pos1J8YCe8nYeY/SumtYPH9+5DN8r6OerZeUV4K/ JWVwcZRvjG7QrFCFw/BEZhzZr+RhjX3csQ== X-Google-Smtp-Source: ABdhPJws0yGNJivNpXwVTeOA44tuiYs5XXfbi20LH3s5xElCM3hQCEXGeqASWUfrM04J5uzkZPDxnQ== X-Received: by 2002:a5d:4d8b:: with SMTP id b11mr8374992wru.341.1595592218907; Fri, 24 Jul 2020 05:03:38 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l81sm4086379wmf.4.2020.07.24.05.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:03:38 -0700 (PDT) From: luca.boccassi@gmail.com To: Hrvoje Habjanic Cc: Stephen Hemminger , Jasvinder Singh , dpdk stable Date: Fri, 24 Jul 2020 12:58:05 +0100 Message-Id: <20200724120030.1863487-47-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'sched: fix subport freeing' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. Thanks. Luca Boccassi --- >From 748d2e4c16a67f83ae67ffaa35c2b6ec7b17f286 Mon Sep 17 00:00:00 2001 From: Hrvoje Habjanic Date: Tue, 26 May 2020 19:24:55 +0200 Subject: [PATCH] sched: fix subport freeing [ upstream commit fbd8981cddf9ea558d5480cc3b02d3334482210f ] In function rte_sched_subport_free, there is code to free all allocated stuff related to scheduler subport. First there are some checks, and in the end, rte_bitmap_free is called. Now, rte_bitmap_free is a dummy function, and it just checks if provided pointer to bitmap is valid or not. So, actual memory for subport is not freed. This patch fixes this by removing call to rte_bitmap_free, and instead calling rte_free. Fixes: d9213b829a31 ("sched: remove pipe params config from port level") Signed-off-by: Hrvoje Habjanic Acked-by: Stephen Hemminger Acked-by: Jasvinder Singh --- lib/librte_sched/rte_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index c0983ddda..f15a3b515 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -888,7 +888,7 @@ rte_sched_subport_free(struct rte_sched_port *port, } } - rte_bitmap_free(subport->bmp); + rte_free(subport); } void -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.429674275 +0100 +++ 0047-sched-fix-subport-freeing.patch 2020-07-24 12:53:48.267006087 +0100 @@ -1,8 +1,10 @@ -From fbd8981cddf9ea558d5480cc3b02d3334482210f Mon Sep 17 00:00:00 2001 +From 748d2e4c16a67f83ae67ffaa35c2b6ec7b17f286 Mon Sep 17 00:00:00 2001 From: Hrvoje Habjanic Date: Tue, 26 May 2020 19:24:55 +0200 Subject: [PATCH] sched: fix subport freeing +[ upstream commit fbd8981cddf9ea558d5480cc3b02d3334482210f ] + In function rte_sched_subport_free, there is code to free all allocated stuff related to scheduler subport. First there are some checks, and in the end, rte_bitmap_free is called. @@ -15,7 +17,6 @@ instead calling rte_free. Fixes: d9213b829a31 ("sched: remove pipe params config from port level") -Cc: stable@dpdk.org Signed-off-by: Hrvoje Habjanic Acked-by: Stephen Hemminger