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 1D802A0C41 for ; Tue, 30 Nov 2021 17:39:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F59A41186; Tue, 30 Nov 2021 17:39:26 +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 7F153410F7 for ; Tue, 30 Nov 2021 17:39:24 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 632333FFF1 for ; Tue, 30 Nov 2021 16:39:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290364; bh=3l1NWUMateJRpfh38VCY25lW3KGoLKB77fYTx2WaUHo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ktRIwmP5Cm46EQ4Jx0owAgRqnTfTJN3m/yd8AJMH/wIJiJ/PtHgXLIVb+mFXwXQKX dW0hKI21OvO64WR9iCClBg/XLA202okxtwd1sa1nB+tLUbACwlBQrIhOC29b8hf0in l9xeEfNffz6IaB91JwZKACUnHVcAXhLReq0uOaGmYCLHZ5H3OuOtjIxH7Ul9bXwGni 8NAx0UgVqAXxfYrMFqmp2NIjo4ciO1aNbqlKlZK+qa5WH5hAsXCzB4exP4aNx+k0ti +FNse88PBNWzAht3UhC6MWtQmIm7mNhjZLTBMqXrJ6N54+S7IS7lTCWgybngUKfEFj Mu6Iz7/I6h3YA== Received: by mail-ed1-f72.google.com with SMTP id p4-20020aa7d304000000b003e7ef120a37so17400783edq.16 for ; Tue, 30 Nov 2021 08:39:24 -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=3l1NWUMateJRpfh38VCY25lW3KGoLKB77fYTx2WaUHo=; b=kL/4mXf2/pyjc0he6fvSDzexvYdivDTQVJefZctRM22hI0Tqg/qL1PMqIIlosLuBea 0TO7E6hQg7NgFtRDmF5ebBgm45615oB06e0ENmvGe25Mk0Pka2ZBKMdcwmpznSw5HcBs QRlkeMxpIk/hnkB1I43UyCdkoFn5fNXW1D5qmhtznrdC6G7N2Nh+c50RZNRS+I6RD4H7 jshKyjsr/v0dXjiU98G79N13TyMek1k311iKl5LL8rriHfghPGRG8uK/xUyd6IjsRj4p I+rFdnLVPHRtaIy2am1guTKSsthTdSbd41ulAgZoIfDplfGF2qrStR5b8Xs9bFgnsMSH ih7A== X-Gm-Message-State: AOAM533mU0JLvIWL9qnprwAMQ2//BKEJSC4DpSPMcxP8K+WZrYQ0Daay lbz0MktxFLKO+xSGauL1kTfjzex9fBuFNZleqz4UAiOcIQ5CAPp+RKJGTYV7akwWCM1dmPXaoML vDhPkxa7CpdUq53r/QxsWZ7+e X-Received: by 2002:a17:906:12d0:: with SMTP id l16mr156717ejb.415.1638290364050; Tue, 30 Nov 2021 08:39:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyO2/dzcVLeRr9pZS7K6GqYsgYamR+OJaxeUBS0cUNAmlIBdqxe/mJk7UGfTynkVd8McZQWFA== X-Received: by 2002:a17:906:12d0:: with SMTP id l16mr156695ejb.415.1638290363882; Tue, 30 Nov 2021 08:39:23 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id f7sm11590549edw.44.2021.11.30.08.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:39:23 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Bruce Richardson , dpdk stable Subject: patch 'eal/x86: fix some CPU extended features definitions' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:27 +0100 Message-Id: <20211130163605.2460997-63-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/2c85290e6583f76d5425504e41d09ff91694e92e Thanks. Christian Ehrhardt --- >From 2c85290e6583f76d5425504e41d09ff91694e92e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 8 Oct 2021 14:07:14 +0200 Subject: [PATCH] eal/x86: fix some CPU extended features definitions [ upstream commit aae3037ab1e020f68fa9e662aab31321cffcdc31 ] Caught while checking CPUID related stuff in OVS. According to [1], for Structured Extended Feature Flags Enumeration Leaf (EAX = 0x07H, ECX = 0): - BMI1 is associated to EBX, bit 3 (was incorrectly 2), - SMEP is associated to EBX, bit 7 (was incorrectly 6), - BMI2 is associated to EBX, bit 8 (was incorrectly 7), - ERMS is associated to EBX, bit 9 (was incorrectly 8), 1: https://software.intel.com/sites/default/files/managed/c5/15/architecture-instruction-set-extensions-programming-reference.pdf Fixes: af75078fece3 ("first public release") Signed-off-by: David Marchand Acked-by: Bruce Richardson --- lib/librte_eal/common/arch/x86/rte_cpuflags.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/arch/x86/rte_cpuflags.c b/lib/librte_eal/common/arch/x86/rte_cpuflags.c index 6492df556c..581c9dc1a0 100644 --- a/lib/librte_eal/common/arch/x86/rte_cpuflags.c +++ b/lib/librte_eal/common/arch/x86/rte_cpuflags.c @@ -99,12 +99,12 @@ const struct feature_entry rte_cpu_feature_table[] = { FEAT_DEF(ENERGY_EFF, 0x00000006, 0, RTE_REG_ECX, 3) FEAT_DEF(FSGSBASE, 0x00000007, 0, RTE_REG_EBX, 0) - FEAT_DEF(BMI1, 0x00000007, 0, RTE_REG_EBX, 2) + FEAT_DEF(BMI1, 0x00000007, 0, RTE_REG_EBX, 3) FEAT_DEF(HLE, 0x00000007, 0, RTE_REG_EBX, 4) FEAT_DEF(AVX2, 0x00000007, 0, RTE_REG_EBX, 5) - FEAT_DEF(SMEP, 0x00000007, 0, RTE_REG_EBX, 6) - FEAT_DEF(BMI2, 0x00000007, 0, RTE_REG_EBX, 7) - FEAT_DEF(ERMS, 0x00000007, 0, RTE_REG_EBX, 8) + FEAT_DEF(SMEP, 0x00000007, 0, RTE_REG_EBX, 7) + FEAT_DEF(BMI2, 0x00000007, 0, RTE_REG_EBX, 8) + FEAT_DEF(ERMS, 0x00000007, 0, RTE_REG_EBX, 9) FEAT_DEF(INVPCID, 0x00000007, 0, RTE_REG_EBX, 10) FEAT_DEF(RTM, 0x00000007, 0, RTE_REG_EBX, 11) FEAT_DEF(AVX512F, 0x00000007, 0, RTE_REG_EBX, 16) -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:09.653024412 +0100 +++ 0063-eal-x86-fix-some-CPU-extended-features-definitions.patch 2021-11-30 16:50:05.730873089 +0100 @@ -1 +1 @@ -From aae3037ab1e020f68fa9e662aab31321cffcdc31 Mon Sep 17 00:00:00 2001 +From 2c85290e6583f76d5425504e41d09ff91694e92e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aae3037ab1e020f68fa9e662aab31321cffcdc31 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - lib/eal/x86/rte_cpuflags.c | 8 ++++---- + lib/librte_eal/common/arch/x86/rte_cpuflags.c | 8 ++++---- @@ -27,5 +28,5 @@ -diff --git a/lib/eal/x86/rte_cpuflags.c b/lib/eal/x86/rte_cpuflags.c -index d339734a8c..378fc95396 100644 ---- a/lib/eal/x86/rte_cpuflags.c -+++ b/lib/eal/x86/rte_cpuflags.c -@@ -100,12 +100,12 @@ const struct feature_entry rte_cpu_feature_table[] = { +diff --git a/lib/librte_eal/common/arch/x86/rte_cpuflags.c b/lib/librte_eal/common/arch/x86/rte_cpuflags.c +index 6492df556c..581c9dc1a0 100644 +--- a/lib/librte_eal/common/arch/x86/rte_cpuflags.c ++++ b/lib/librte_eal/common/arch/x86/rte_cpuflags.c +@@ -99,12 +99,12 @@ const struct feature_entry rte_cpu_feature_table[] = {