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 E8BFAA0093 for ; Tue, 19 May 2020 14:58:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DE2761D5E1; Tue, 19 May 2020 14:58:38 +0200 (CEST) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by dpdk.org (Postfix) with ESMTP id AF7821D5E1 for ; Tue, 19 May 2020 14:58:37 +0200 (CEST) Received: by mail-wm1-f44.google.com with SMTP id u1so2179024wmn.3 for ; Tue, 19 May 2020 05:58:37 -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=/E1z2IbkNZ8Srp8BYd09as+NO6n1jGmmXmmbCixs7aU=; b=aKyeUjs3VNKvoiJUWJVe73Yj+s95gnDnszMzSybrndbzXZAY7Hp6ctrX+fSlbtuBH7 cQvpUocy8G8FLO2iGG6lxg30XPX4VwPuJZZpWTidDtlf7T2vFCKUaxozz3hCSD6NAo9b dlNda5fPN8wARb/cTPcp/YEdYWZ+PEfQzo2OFl4HICyyPjZcdZ/GumPIYa+em3Jm2nJp f9s5tkFAdVKYW8LgmzC6X4kl2LR+PqMot2KpQDWYzh8lileeqycgl5qkUl2pW2f7Iq3u SgTNCdeJHSx4FjNMmBKGaSjWaT12t9vC7PO6hFWkq3VtmW0Ffycu2jhOmXnqSAB89AbO b0zA== 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=/E1z2IbkNZ8Srp8BYd09as+NO6n1jGmmXmmbCixs7aU=; b=QhGelZ+lV/vqiWWRqxti3teWz+UDJ5tNQjoR6g3TA4pJw2z7tcD2L4vdlO4Td0Os9p 4VKEyjj4FQP1qpEatBp/yPL+IeHFpldcwAwo+rr+Fl+Uc5VLBd4Ta/SrfQIwhAPF4OKK JHn825elHxkQdY9zHILNDz4HRgD9M3tHkp/gzjJOu2RHrLeO0zViCS06UnCZMQYFeQoG f/InTEihJQpJJfgTneqEGpsxp0GZRDQ9zHuTvfgSOuSfAPlW3t8R5hW4MOlzdnagBNhz 6UJJ3h/KblQYn3W18ZFMpXd4hrJAmMLSRcTfJv74FXFnlXUU79+/9fWkxNho8I7uLDIp A3VA== X-Gm-Message-State: AOAM533l1+94IDeUZThRMxckwMIjdW1xrRAXFLjsZsYcTd60X1I2+cXo 3JzqH+78VIoaml525FdZC9l+FPRz75PkOg== X-Google-Smtp-Source: ABdhPJwbu3BanO20dk7JEldUiaUG0bycpfDa8lwbjtT+ERk2ZaHTDrdvAP/LfVEQ4CCgb8Ix6L/uNQ== X-Received: by 2002:a1c:2702:: with SMTP id n2mr5516018wmn.107.1589893117440; Tue, 19 May 2020 05:58:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c143sm3899562wmd.43.2020.05.19.05.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Timothy Redaelli Cc: David Marchand , dpdk stable Date: Tue, 19 May 2020 13:53:16 +0100 Message-Id: <20200519125804.104349-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/qos_sched: fix build with gcc 10' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 25fe1c8b05f2dca60f95bda58ea988177964fe27 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 18:05:46 +0100 Subject: [PATCH] examples/qos_sched: fix build with gcc 10 [ upstream commit 345187bda58f2685e34a00c7bca917637395aad4 ] GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: be1e533238c0 ("examples/qos_sched: add TC and queue config flexibility") Signed-off-by: Timothy Redaelli Acked-by: David Marchand --- examples/qos_sched/cfg_file.c | 3 +++ examples/qos_sched/main.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c index 5714c3f36d..f078e4f7de 100644 --- a/examples/qos_sched/cfg_file.c +++ b/examples/qos_sched/cfg_file.c @@ -20,6 +20,9 @@ * for new entries do we add in */ #define CFG_ALLOC_ENTRY_BATCH 16 +uint32_t active_queues[RTE_SCHED_QUEUES_PER_PIPE]; +uint32_t n_active_queues; + int cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params) { diff --git a/examples/qos_sched/main.h b/examples/qos_sched/main.h index baa2b3eadc..23bc418d97 100644 --- a/examples/qos_sched/main.h +++ b/examples/qos_sched/main.h @@ -148,8 +148,8 @@ extern struct burst_conf burst_conf; extern struct ring_thresh rx_thresh; extern struct ring_thresh tx_thresh; -uint32_t active_queues[RTE_SCHED_QUEUES_PER_PIPE]; -uint32_t n_active_queues; +extern uint32_t active_queues[RTE_SCHED_QUEUES_PER_PIPE]; +extern uint32_t n_active_queues; extern struct rte_sched_port_params port_params; extern struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS]; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.093198953 +0100 +++ 0006-examples-qos_sched-fix-build-with-gcc-10.patch 2020-05-19 13:56:18.171500955 +0100 @@ -1,14 +1,15 @@ -From 345187bda58f2685e34a00c7bca917637395aad4 Mon Sep 17 00:00:00 2001 +From 25fe1c8b05f2dca60f95bda58ea988177964fe27 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 18:05:46 +0100 Subject: [PATCH] examples/qos_sched: fix build with gcc 10 +[ upstream commit 345187bda58f2685e34a00c7bca917637395aad4 ] + GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: be1e533238c0 ("examples/qos_sched: add TC and queue config flexibility") -Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Acked-by: David Marchand