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 AF97F41D4F for ; Thu, 23 Feb 2023 10:37:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA79143152; Thu, 23 Feb 2023 10:37:44 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id A7B69427E9 for ; Thu, 23 Feb 2023 10:37:42 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id l25so9733185wrb.3 for ; Thu, 23 Feb 2023 01:37:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/G/BFUFyR6pIVjUPviNJg6sVGzIJ6K4bpNqDdXEXD6o=; b=QfkE9xRzps70ohBknVS5rusY4cXhWu2WKd8guWLEOB7J+g/lFB7vGCQT3PqST2Ztn8 G1mWzAkJ3p9EBjVH19bz1plCqiFXYiGx6Ld/b3xfH62Tw3TRAj9HwQGCtKR9MUUMXjyr 9qA0B0MRj7vQ7NBoVKloasYpIfOzdn58yuqxoWJApI+NJlq6A7EjFN5LYAroFxu7rx/c 6Dz6e/DUiLPRn+i9s4UZsRWbPgGmT1zzhJyfcaiOC+YF+YfegPOCZjG0cfLDjAmTjxbE v8Gk0fQusnIhgMsu4GlbYGBgJiRcwitv1EBd3YZazdFJa8/XBJ0C/4qJke4q3jK0gm0w MIaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/G/BFUFyR6pIVjUPviNJg6sVGzIJ6K4bpNqDdXEXD6o=; b=k0MizvBWlKhyzAyyGneM5eUULPLNwGWyUFFrkPbNsLqfI6SU8LDj+7Wk1NPbGjeLnG O3pftm1XLZAWbdRhQ1fMZidnKEtnCCMc5KUv/W68f0ha5sz8mTXdGg8x+ne+F+K4N3MM CziQ7gpWS2C5XxhmXa5tu+RMzdxCXbpwdJIDijfshmU2cmJnJCy86tbAGTxyXAH3fF6T 3SUQFRqW2BG2ouZgXFArkneTDWIgvgC9qnZbDk8bG9ERVAWIqvHCh+mRyizU+1p3LRDN XbALYoVoduocKQG+A4h3lcPczYZqNGMJ3q4RC73GOizbDpysC4nLkNrfrWHReWkNUtgD 5kvg== X-Gm-Message-State: AO0yUKUVG5AX5lr3fQJRk0Y+ouXc1ejJsE6ZNgQzHYrMLoTV4aEhWl3X Fi9FzZiTKvIvZpSiYmcemtEqow7orhU= X-Google-Smtp-Source: AK7set9DWsDRZc973SX9Uo2Msrhz5JNXkcw6ohxfrXV3fuXi+r1NvKTE9lEazKct3vZwcLNzYar/bA== X-Received: by 2002:adf:ea92:0:b0:2c7:b51:65ce with SMTP id s18-20020adfea92000000b002c70b5165cemr4654909wrm.12.1677145062268; Thu, 23 Feb 2023 01:37:42 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id ja13-20020a05600c556d00b003e4326a6d53sm12736296wmb.35.2023.02.23.01.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:37:41 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: dpdk stable Subject: patch 'fbarray: fix metadata dump' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:12 +0000 Message-Id: <20230223093715.3926893-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.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 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/10b9f45a293d80760bf0de4f5531ce9c83c48d29 Thanks. Luca Boccassi --- >From 10b9f45a293d80760bf0de4f5531ce9c83c48d29 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 3 Jan 2023 11:48:48 +0100 Subject: [PATCH] fbarray: fix metadata dump [ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ] If the passed fbarray is invalid, its lock was not taken before releasing. Fixes: c44d09811b40 ("eal: add shared indexed file-backed array") Signed-off-by: David Marchand --- lib/librte_eal/common/eal_common_fbarray.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/librte_eal/common/eal_common_fbarray.c index 592ec58594..1402cb521a 100644 --- a/lib/librte_eal/common/eal_common_fbarray.c +++ b/lib/librte_eal/common/eal_common_fbarray.c @@ -1485,7 +1485,7 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) if (fully_validate(arr->name, arr->elt_sz, arr->len)) { fprintf(f, "Invalid file-backed array\n"); - goto out; + return; } /* prevent array from changing under us */ @@ -1499,6 +1499,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) for (i = 0; i < msk->n_masks; i++) fprintf(f, "msk idx %i: 0x%016" PRIx64 "\n", i, msk->data[i]); -out: rte_rwlock_read_unlock(&arr->rwlock); } -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:28.633424949 +0000 +++ 0008-fbarray-fix-metadata-dump.patch 2023-02-23 09:36:28.174168983 +0000 @@ -1 +1 @@ -From 70eb4069b05c82494155a89eb8d08d8d2f57b059 Mon Sep 17 00:00:00 2001 +From 10b9f45a293d80760bf0de4f5531ce9c83c48d29 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 70eb4069b05c82494155a89eb8d08d8d2f57b059 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/eal/common/eal_common_fbarray.c | 3 +-- + lib/librte_eal/common/eal_common_fbarray.c | 3 +-- @@ -17,5 +18,5 @@ -diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c -index f11f87979f..169e66e04b 100644 ---- a/lib/eal/common/eal_common_fbarray.c -+++ b/lib/eal/common/eal_common_fbarray.c -@@ -1482,7 +1482,7 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) +diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/librte_eal/common/eal_common_fbarray.c +index 592ec58594..1402cb521a 100644 +--- a/lib/librte_eal/common/eal_common_fbarray.c ++++ b/lib/librte_eal/common/eal_common_fbarray.c +@@ -1485,7 +1485,7 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) @@ -30 +31 @@ -@@ -1496,6 +1496,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f) +@@ -1499,6 +1499,5 @@ rte_fbarray_dump_metadata(struct rte_fbarray *arr, FILE *f)