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 B8374A0C41 for ; Tue, 30 Nov 2021 17:44:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B03A441170; Tue, 30 Nov 2021 17:44:01 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id C0F0741190 for ; Tue, 30 Nov 2021 17:44:00 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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-internal-1.canonical.com (Postfix) with ESMTPS id A65B83F044 for ; Tue, 30 Nov 2021 16:44:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290640; bh=ESjm7pJpICSy3+t+19MB6SPyPQ1OwD1O/UKwdhOw1ik=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LoG71lWzvFCesoKHxWLNGklZSLSp6gkufJlqBtzxmc4xT6MuXPnEeHrexMLOkPKfZ H0GAHRUI/NcdBBpCDxSCRgfy5pF4glFM5Be+3AfSMszTOgHVxC4x5sIST7UTTljhQp 2g9LCi0wxg6r3CgITwVZ94ro6kIzx4I9PSNzeaIuR+pLU+ARmmEFVBlAkbcHFV2FdB j1EI8iZgIC/P9gh1Fm/DxV3Je1zUstVNp4lO3Hfr/CyuZhMHewoKaIM/0r6PDEhgq/ +mRCXNWFG7pZhrBTLeATbEdi3bPJMxmPfGQaL0tkRZyV6eJBL8bM/WEcyD4IS5IKiV 2rdm2leJmHIvA== Received: by mail-ed1-f69.google.com with SMTP id b15-20020aa7c6cf000000b003e7cf0f73daso17419935eds.22 for ; Tue, 30 Nov 2021 08:44:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ESjm7pJpICSy3+t+19MB6SPyPQ1OwD1O/UKwdhOw1ik=; b=3LO7hxtNAldpmYQdOXbv5QB2UT5mMytP6fY43pCeHEIX/GosL6s8dwsa9YYNzbJS9s zjRtN+cewvlELfUdBOG2TfqI6MG2EWlqv6IM3AYH7dFNFwjahoY6CXsDkeyJ0eRzbeST 3b5Au1X/5Vy4DWECgrFiDuJayo5azGjl5xRg4sAo4GjFzE0B5T6QbMpAlZTCecExvOBa g+AgC7/NzLyE6NKje3ua8WX4nlPMHSh7S97bwJi5G64FMUcqMQ9HSprxck/tAgFE9x2T zoklp72IURk2tGF6h6Vw3e5bwUIwR9lfBIiAsZiMe73f2vYbtnueqyShlDLijnpQYXID As0A== X-Gm-Message-State: AOAM530oi9Ise8NXf5w0NVIs+QAjgUugq9+EwEezg84srzt4MDvZ6mD8 MYq9SxEgwpMTz7U9XVxYbIep94tpH2rRvWfIAWij20GJFOaGTvfYqdXROdeOA8+1zGX3xgQ4t8G 5R0Bvu9DVQM5deKFpauIZ+Rv1 X-Received: by 2002:aa7:d794:: with SMTP id s20mr51630edq.305.1638290639897; Tue, 30 Nov 2021 08:43:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQ8Ko3f16zFsf6JAWdIIm0fMwjvCg4Ri3JLqJxOJLPewoG7vFA46KgZ9l4a90wJWgA+G3xJw== X-Received: by 2002:aa7:d794:: with SMTP id s20mr51603edq.305.1638290639714; Tue, 30 Nov 2021 08:43:59 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id f16sm12779083edd.37.2021.11.30.08.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:43:59 -0800 (PST) From: christian.ehrhardt@canonical.com To: Alexander Bechikov Cc: Olivier Matz , dpdk stable Subject: patch 'mbuf: fix dump of dynamic fields and flags' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:57 +0100 Message-Id: <20211130163605.2460997-153-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/667dfb1e82602210afd50b3bcd83945a12e2f384 Thanks. Christian Ehrhardt --- >From 667dfb1e82602210afd50b3bcd83945a12e2f384 Mon Sep 17 00:00:00 2001 From: Alexander Bechikov Date: Wed, 24 Nov 2021 13:57:04 +0100 Subject: [PATCH] mbuf: fix dump of dynamic fields and flags [ upstream commit c0b48da45c151987f660b897c247132dac81021f ] The dump of dynamic fields and flags fails if the shm is already allocated. Add a check to fix the issue. Fixes: d4902ed31c63 ("mbuf: check shared memory before dumping dynamic space") Signed-off-by: Alexander Bechikov Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf_dyn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c index 4ef50d3f82..27e117c2be 100644 --- a/lib/librte_mbuf/rte_mbuf_dyn.c +++ b/lib/librte_mbuf/rte_mbuf_dyn.c @@ -530,7 +530,7 @@ void rte_mbuf_dyn_dump(FILE *out) size_t i; rte_mcfg_tailq_write_lock(); - if (init_shared_mem() < 0) { + if (shm == NULL && init_shared_mem() < 0) { rte_mcfg_tailq_write_unlock(); return; } -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:14.751544180 +0100 +++ 0153-mbuf-fix-dump-of-dynamic-fields-and-flags.patch 2021-11-30 16:50:06.130876025 +0100 @@ -1 +1 @@ -From c0b48da45c151987f660b897c247132dac81021f Mon Sep 17 00:00:00 2001 +From 667dfb1e82602210afd50b3bcd83945a12e2f384 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c0b48da45c151987f660b897c247132dac81021f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/mbuf/rte_mbuf_dyn.c | 2 +- + lib/librte_mbuf/rte_mbuf_dyn.c | 2 +- @@ -18,5 +19,5 @@ -diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c -index db8e020665..4ae79383b5 100644 ---- a/lib/mbuf/rte_mbuf_dyn.c -+++ b/lib/mbuf/rte_mbuf_dyn.c -@@ -531,7 +531,7 @@ void rte_mbuf_dyn_dump(FILE *out) +diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c +index 4ef50d3f82..27e117c2be 100644 +--- a/lib/librte_mbuf/rte_mbuf_dyn.c ++++ b/lib/librte_mbuf/rte_mbuf_dyn.c +@@ -530,7 +530,7 @@ void rte_mbuf_dyn_dump(FILE *out)