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 5ABC2A04DD for ; Wed, 28 Oct 2020 11:53:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 50AD9C9F6; Wed, 28 Oct 2020 11:53:31 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id D7855C9F6 for ; Wed, 28 Oct 2020 11:53:28 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id i1so5199668wro.1 for ; Wed, 28 Oct 2020 03:53:28 -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=TOz/exxWbNYXhykq6Ombi92N5q6PeObxaNWn6udXu7k=; b=sStfvnpX7RI+Ma9OHHqUMaI8Sb9uP+2/8hUzxZzkwDS8cSy60ljSyrypPJv2e54SY9 mxzHT6i0wQRWd7WZl4K4051FhyyGocpNiIoHbOGqRzXRDSCM0DQ4eYtdUkIOhKj0KI2l G4f4ydC6fY5Oel5GNYb9uDFE32IshqagQ03PW5QwbidP1Vlx8pJHt9CWFmqyzPngRfDz lhgGoQBGNnJO2IcHaFleto5UcBmJs/Bjlw4TM8Mujc7ajbUyH+QIgwAa3L9sVcUjBt6h U6BUwJiKV5yuoimh7Z5idlN/39vEtLyU4IL1RhjE32+vTyI+oJoasjZuRJEH41WUvYKO RKog== 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=TOz/exxWbNYXhykq6Ombi92N5q6PeObxaNWn6udXu7k=; b=bYAQt4dMwv6z5j19ZRD3Pld5gdlgi5iA0la9cdd9b//O/QaPGXwvRd78lJAj6/e+Lv 9EU0w0dl3u5UCSPJdJo/qP8xnCVawaiwbbfieAszU7cRsaQRpKfO7AxK5QA6QpsjoBRH Px/BFasOFyeg696jvLdEoId7EMZN3UZ6bzwPJ8ErD5PIImabg7WteDW0ePmB6jy6fLp7 esPGRT3AHDQVzIOQrs55sL014lAFEUTC6sAkJI5a9DRVGfyVoMXgkrb4GfqtBz9XbLAA E28WEgAH+cbhb5k8OnPNhFpTUX3iDYWYvgb5GiYTbW1/tg1xmfuMkvad+mySSRljOerX o9ZQ== X-Gm-Message-State: AOAM531jjo8DUY9ina+NlBlqwln0Q1IfBfJ/hTGIj4suVkcvcyApHGbA M/0lSwe0NZFLa0uAHY9fDVidJ4fAvcv6rAT0 X-Google-Smtp-Source: ABdhPJzirgCvG7LRvK2O55dwkNt73YmNF4lbQ1IrH4frBq7fYZ91I4rPBXLxWvz2NQYG/3Ugn+XBaA== X-Received: by 2002:a5d:4c4f:: with SMTP id n15mr7908530wrt.137.1603882408553; Wed, 28 Oct 2020 03:53:28 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x81sm5795059wmb.11.2020.10.28.03.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:53:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Konstantin Ananyev Cc: David Marchand , dpdk stable Date: Wed, 28 Oct 2020 10:44:57 +0000 Message-Id: <20201028104606.3504127-138-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'acl: fix x86 build for compiler without AVX2' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 eb7f3f43bcb3dcf02d266795bebf8d77d8fe0fa9 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Tue, 6 Oct 2020 16:03:03 +0100 Subject: [PATCH] acl: fix x86 build for compiler without AVX2 [ upstream commit 85348c3e7dd5019e4d2f738c7492bc4c9d4bf9d2 ] Right now we define dummy version of rte_acl_classify_avx2() when both X86 and AVX2 are not detected, though it should be for non-AVX2 case only. Fixes: e53ce4e41379 ("acl: remove use of weak functions") Signed-off-by: Konstantin Ananyev Reviewed-by: David Marchand --- lib/librte_acl/rte_acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c index 777ec4d340..715b023592 100644 --- a/lib/librte_acl/rte_acl.c +++ b/lib/librte_acl/rte_acl.c @@ -16,7 +16,6 @@ static struct rte_tailq_elem rte_acl_tailq = { }; EAL_REGISTER_TAILQ(rte_acl_tailq) -#ifndef RTE_ARCH_X86 #ifndef CC_AVX2_SUPPORT /* * If the compiler doesn't support AVX2 instructions, @@ -33,6 +32,7 @@ rte_acl_classify_avx2(__rte_unused const struct rte_acl_ctx *ctx, } #endif +#ifndef RTE_ARCH_X86 int rte_acl_classify_sse(__rte_unused const struct rte_acl_ctx *ctx, __rte_unused const uint8_t **data, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.024790640 +0000 +++ 0138-acl-fix-x86-build-for-compiler-without-AVX2.patch 2020-10-28 10:35:11.708833026 +0000 @@ -1,14 +1,15 @@ -From 85348c3e7dd5019e4d2f738c7492bc4c9d4bf9d2 Mon Sep 17 00:00:00 2001 +From eb7f3f43bcb3dcf02d266795bebf8d77d8fe0fa9 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Tue, 6 Oct 2020 16:03:03 +0100 Subject: [PATCH] acl: fix x86 build for compiler without AVX2 +[ upstream commit 85348c3e7dd5019e4d2f738c7492bc4c9d4bf9d2 ] + Right now we define dummy version of rte_acl_classify_avx2() when both X86 and AVX2 are not detected, though it should be for non-AVX2 case only. Fixes: e53ce4e41379 ("acl: remove use of weak functions") -Cc: stable@dpdk.org Signed-off-by: Konstantin Ananyev Reviewed-by: David Marchand @@ -17,7 +18,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c -index e2c1ed4ad0..aa430a378d 100644 +index 777ec4d340..715b023592 100644 --- a/lib/librte_acl/rte_acl.c +++ b/lib/librte_acl/rte_acl.c @@ -16,7 +16,6 @@ static struct rte_tailq_elem rte_acl_tailq = {