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 942C7A0C41 for ; Tue, 30 Nov 2021 17:41:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89EFD41170; Tue, 30 Nov 2021 17:41:43 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 0ADF2411A7 for ; Tue, 30 Nov 2021 17:41:43 +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-0.canonical.com (Postfix) with ESMTPS id CD2EE3F1B1 for ; Tue, 30 Nov 2021 16:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290502; bh=YNDspK0n9qHqP2XwmW6D+WEhh5b34pyhGn21vF9yy4I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iewYpRSeBiqVvk8/j0sCCc+ve8mk0Zf8lDJQOIdcQ5V0HS/bGYDJ94t8wFjxyjCEC qSwWqLQRANCwygKi2HpoxLSla+3Wbb6NnwSGGPsxWFe9WTtFva7bVn+11yDFmqlfx0 Jy8vMB2JE7M1rja2l8Gy672HM0PKhsYMcmC/3xPGP5qzBahQ8hylcfmCzbL3mVTn1z lAxqQihE3lFzTutGZg2BeqQhAiGZ4vbFtkCHwpia8jJr2sQ2WoEKTwZHJi3HGsrzaV kDv/PbPvlAekSqWaI+KTwZz2JX50GIWEyPo3DXPZIET/RhLgEpDq01eBQCyT5u4Z5G ibyTAcPdwKdyg== Received: by mail-ed1-f69.google.com with SMTP id m12-20020a056402430c00b003e9f10bbb7dso17443301edc.18 for ; Tue, 30 Nov 2021 08:41:42 -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=YNDspK0n9qHqP2XwmW6D+WEhh5b34pyhGn21vF9yy4I=; b=1XJAq02tb7m5ANyHT7Vf4aVWfZMOp06IfHOrNaP/NVu4O96Y4YKjAeU8/G1FFvgjPA CbmB5/FCOy7UK0R389VP2yIRqFPfQ+FcA4XceUnH7paKdosWgHRxagizQPxX2m+rPS/j 5lHGec1iIXuI6037vuyE2pgVoP89jookiCZdYBRK5MDFom6dXCp7DwP4mXTDPDX/GIPT dPmJtzB/6SMjWkFmvQaPGnvri9l7oq9DJ7oowdRwy/eGggpjRUUuHI+BoiEhSoU+Z2sY yupbsxJT6opCzMyHbadHeFs00FsBnl+BTFiJoDCfzLFOi32Hfcp1fZSgApnFY5xcaSkP 6AFg== X-Gm-Message-State: AOAM532ZsZcAVkQwOMlrJ25SdZ2OKOKfd16j5RFOQhhbYfPVJ5q+fOok 7rreilNvFd00DqeQDS9xs1jdsuOQ6aDe+SjdC4b9IGcoqqyLWKS48vd4zCfEMnF/LtFKrwCnmSx JKGq4FrWDIvgLocegNBbNlRiF X-Received: by 2002:a17:906:1613:: with SMTP id m19mr283747ejd.136.1638290502328; Tue, 30 Nov 2021 08:41:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0LEaDY/KxMPDMaOHJKNblNB8B42z0eYAQHLXf1d8+ysxQU52rnAp7aHRhD36ejEVtyiYjzg== X-Received: by 2002:a17:906:1613:: with SMTP id m19mr283732ejd.136.1638290502156; Tue, 30 Nov 2021 08:41:42 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id mp9sm9690411ejc.106.2021.11.30.08.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:41:41 -0800 (PST) From: christian.ehrhardt@canonical.com To: Jim Harris Cc: David Marchand , dpdk stable Subject: patch 'eal/linux: remove unused variable for socket memory' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:12 +0100 Message-Id: <20211130163605.2460997-108-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/6c135cfbe7d80baaa45ed45b82660445b93c7a23 Thanks. Christian Ehrhardt --- >From 6c135cfbe7d80baaa45ed45b82660445b93c7a23 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 29 Oct 2021 17:14:10 +0000 Subject: [PATCH] eal/linux: remove unused variable for socket memory [ upstream commit 628bac7df18904c7083c8ad04669c69688f352de ] clang-13 rightfully complains that the total_mem variable in eal_parse_socket_arg is set but not used, since the final accumulated total_mem result isn't used anywhere. So just remove the total_mem variable. Fixes: 0a703f0f36c1 ("eal/linux: fix parsing zero socket memory and limits") Signed-off-by: Jim Harris Reviewed-by: David Marchand --- lib/librte_eal/linux/eal/eal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c index 8f1bcab390..a2898705b6 100644 --- a/lib/librte_eal/linux/eal/eal.c +++ b/lib/librte_eal/linux/eal/eal.c @@ -587,7 +587,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg) char * arg[RTE_MAX_NUMA_NODES]; char *end; int arg_num, i, len; - uint64_t total_mem = 0; len = strnlen(strval, SOCKET_MEM_STRLEN); if (len == SOCKET_MEM_STRLEN) { @@ -619,7 +618,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg) (arg[i][0] == '\0') || (end == NULL) || (*end != '\0')) return -1; val <<= 20; - total_mem += val; socket_arg[i] = val; } -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:12.098582095 +0100 +++ 0108-eal-linux-remove-unused-variable-for-socket-memory.patch 2021-11-30 16:50:05.914874440 +0100 @@ -1 +1 @@ -From 628bac7df18904c7083c8ad04669c69688f352de Mon Sep 17 00:00:00 2001 +From 6c135cfbe7d80baaa45ed45b82660445b93c7a23 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 628bac7df18904c7083c8ad04669c69688f352de ] + @@ -16 +18 @@ - lib/eal/linux/eal.c | 2 -- + lib/librte_eal/linux/eal/eal.c | 2 -- @@ -19,5 +21,5 @@ -diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c -index 81fdebc6a0..60b4924838 100644 ---- a/lib/eal/linux/eal.c -+++ b/lib/eal/linux/eal.c -@@ -562,7 +562,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg) +diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c +index 8f1bcab390..a2898705b6 100644 +--- a/lib/librte_eal/linux/eal/eal.c ++++ b/lib/librte_eal/linux/eal/eal.c +@@ -587,7 +587,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg) @@ -31 +33 @@ -@@ -594,7 +593,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg) +@@ -619,7 +618,6 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)