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 2467EA0C4D; Wed, 6 Oct 2021 21:20:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D02904067A; Wed, 6 Oct 2021 21:20:24 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B701540140 for ; Wed, 6 Oct 2021 21:20:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633548023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kp0TMJgx5A1g+iAsBNCpRZGfWrVjwdsJBHt+GToMZm0=; b=HJ0gEtOOL5lJ4U71GUx/ar2U5awV9TPgv4fHaxDnArbw0pgTxA4XBvDI5H/lxfXs4jXvr+ 8vYM5EZj1yrU3Bu3M9JcBD2UDuF6X8NQF1kXRtrn1Y3z2M+Iqvw0sF58XbooCa3EJ3E0dm Gc+mb1jFYa97vsagnTRgrRG+LasbcuU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-346-hjaLVh-qNs6hAE5O01uFyg-1; Wed, 06 Oct 2021 15:20:19 -0400 X-MC-Unique: hjaLVh-qNs6hAE5O01uFyg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 947861006AA5; Wed, 6 Oct 2021 19:20:18 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3F7A17C58; Wed, 6 Oct 2021 19:20:16 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: stable@dpdk.org, Bruce Richardson , Konstantin Ananyev Date: Wed, 6 Oct 2021 21:20:08 +0200 Message-Id: <20211006192008.23369-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-dev] [PATCH] eal/x86: fix some CPU extended features X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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), This patch then sorts the rest of the extended features (leaf 0) for readability. 1: https://software.intel.com/sites/default/files/managed/c5/15/architecture-instruction-set-extensions-programming-reference.pdf Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: David Marchand --- lib/eal/x86/rte_cpuflags.c | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/eal/x86/rte_cpuflags.c b/lib/eal/x86/rte_cpuflags.c index d339734a8c..d6b518251b 100644 --- a/lib/eal/x86/rte_cpuflags.c +++ b/lib/eal/x86/rte_cpuflags.c @@ -100,18 +100,36 @@ 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) + FEAT_DEF(AVX512DQ, 0x00000007, 0, RTE_REG_EBX, 17) FEAT_DEF(RDSEED, 0x00000007, 0, RTE_REG_EBX, 18) + FEAT_DEF(AVX512IFMA, 0x00000007, 0, RTE_REG_EBX, 21) + FEAT_DEF(AVX512CD, 0x00000007, 0, RTE_REG_EBX, 28) + FEAT_DEF(AVX512BW, 0x00000007, 0, RTE_REG_EBX, 30) + FEAT_DEF(AVX512VL, 0x00000007, 0, RTE_REG_EBX, 31) + + FEAT_DEF(AVX512VBMI, 0x00000007, 0, RTE_REG_ECX, 1) + FEAT_DEF(WAITPKG, 0x00000007, 0, RTE_REG_ECX, 5) + FEAT_DEF(AVX512VBMI2, 0x00000007, 0, RTE_REG_ECX, 6) + FEAT_DEF(GFNI, 0x00000007, 0, RTE_REG_ECX, 8) + FEAT_DEF(VAES, 0x00000007, 0, RTE_REG_ECX, 9) + FEAT_DEF(VPCLMULQDQ, 0x00000007, 0, RTE_REG_ECX, 10) + FEAT_DEF(AVX512VNNI, 0x00000007, 0, RTE_REG_ECX, 11) + FEAT_DEF(AVX512BITALG, 0x00000007, 0, RTE_REG_ECX, 12) + FEAT_DEF(AVX512VPOPCNTDQ, 0x00000007, 0, RTE_REG_ECX, 14) + FEAT_DEF(CLDEMOTE, 0x00000007, 0, RTE_REG_ECX, 25) + FEAT_DEF(MOVDIRI, 0x00000007, 0, RTE_REG_ECX, 27) + FEAT_DEF(MOVDIR64B, 0x00000007, 0, RTE_REG_ECX, 28) - FEAT_DEF(WAITPKG, 0x00000007, 0, RTE_REG_ECX, 5) + FEAT_DEF(AVX512VP2INTERSECT, 0x00000007, 0, RTE_REG_EDX, 8) FEAT_DEF(LAHF_SAHF, 0x80000001, 0, RTE_REG_ECX, 0) FEAT_DEF(LZCNT, 0x80000001, 0, RTE_REG_ECX, 4) @@ -123,24 +141,6 @@ const struct feature_entry rte_cpu_feature_table[] = { FEAT_DEF(EM64T, 0x80000001, 0, RTE_REG_EDX, 29) FEAT_DEF(INVTSC, 0x80000007, 0, RTE_REG_EDX, 8) - - FEAT_DEF(AVX512DQ, 0x00000007, 0, RTE_REG_EBX, 17) - FEAT_DEF(AVX512IFMA, 0x00000007, 0, RTE_REG_EBX, 21) - FEAT_DEF(AVX512CD, 0x00000007, 0, RTE_REG_EBX, 28) - FEAT_DEF(AVX512BW, 0x00000007, 0, RTE_REG_EBX, 30) - FEAT_DEF(AVX512VL, 0x00000007, 0, RTE_REG_EBX, 31) - FEAT_DEF(AVX512VBMI, 0x00000007, 0, RTE_REG_ECX, 1) - FEAT_DEF(AVX512VBMI2, 0x00000007, 0, RTE_REG_ECX, 6) - FEAT_DEF(GFNI, 0x00000007, 0, RTE_REG_ECX, 8) - FEAT_DEF(VAES, 0x00000007, 0, RTE_REG_ECX, 9) - FEAT_DEF(VPCLMULQDQ, 0x00000007, 0, RTE_REG_ECX, 10) - FEAT_DEF(AVX512VNNI, 0x00000007, 0, RTE_REG_ECX, 11) - FEAT_DEF(AVX512BITALG, 0x00000007, 0, RTE_REG_ECX, 12) - FEAT_DEF(AVX512VPOPCNTDQ, 0x00000007, 0, RTE_REG_ECX, 14) - FEAT_DEF(CLDEMOTE, 0x00000007, 0, RTE_REG_ECX, 25) - FEAT_DEF(MOVDIRI, 0x00000007, 0, RTE_REG_ECX, 27) - FEAT_DEF(MOVDIR64B, 0x00000007, 0, RTE_REG_ECX, 28) - FEAT_DEF(AVX512VP2INTERSECT, 0x00000007, 0, RTE_REG_EDX, 8) }; int -- 2.23.0