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 03D06A0C53 for ; Wed, 1 Sep 2021 08:24:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1DFE40041; Wed, 1 Sep 2021 08:24:07 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id DD6E340041; Wed, 1 Sep 2021 08:24:05 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10093"; a="282361345" X-IronPort-AV: E=Sophos;i="5.84,368,1620716400"; d="scan'208";a="282361345" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 23:24:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,368,1620716400"; d="scan'208";a="688139932" Received: from irsmsx602.ger.corp.intel.com ([163.33.146.8]) by fmsmga006.fm.intel.com with ESMTP; 31 Aug 2021 23:24:03 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by irsmsx602.ger.corp.intel.com (163.33.146.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Wed, 1 Sep 2021 07:24:01 +0100 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.2242.010; Wed, 1 Sep 2021 14:23:58 +0800 From: "Zhang, Qi Z" To: "Richardson, Bruce" , "dev@dpdk.org" CC: "brian90013@gmail.com" , "Richardson, Bruce" , "Lu, Wenzhuo" , "stable@dpdk.org" , "Xing, Beilei" Thread-Topic: [dpdk-dev] [PATCH 1/2] net/i40e: fix generic build on FreeBSD Thread-Index: AQHXlE+OrDCbKBXEH0KhZ1mp6BHVuquOyzFQ Date: Wed, 1 Sep 2021 06:23:58 +0000 Message-ID: <28de2a803f8949bc882315119fe1c0c9@intel.com> References: <20210818163816.19143-1-bruce.richardson@intel.com> In-Reply-To: <20210818163816.19143-1-bruce.richardson@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH 1/2] net/i40e: fix generic build on FreeBSD 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 Sender: "stable" > -----Original Message----- > From: dev On Behalf Of Bruce Richardson > Sent: Thursday, August 19, 2021 12:38 AM > To: dev@dpdk.org > Cc: brian90013@gmail.com; Richardson, Bruce ; > Lu, Wenzhuo ; stable@dpdk.org; Xing, Beilei > > Subject: [dpdk-dev] [PATCH 1/2] net/i40e: fix generic build on FreeBSD >=20 > The common header file for vectorization is included in multiple files, a= nd so > must use macros for the current compilation unit, rather than the > compiler-capability flag set for the whole driver. With the current, inco= rrect, > macro, the AVX512 or AVX2 flags may be set when compiling up SSE code, > leading to compilation errors. Changing from "CC_AVX*_SUPPORT" > to the compiler-defined "__AVX*__" macros fixes this issue. >=20 > Bugzilla ID: 788 > Fixes: 0604b1f2208f ("net/i40e: fix crash in AVX512") > Cc: wenzhuo.lu@intel.com > Cc: stable@dpdk.org >=20 > Signed-off-by: Bruce Richardson > --- > drivers/net/i40e/i40e_rxtx_vec_common.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h > b/drivers/net/i40e/i40e_rxtx_vec_common.h > index f52ed98d62..65715ed1ce 100644 > --- a/drivers/net/i40e/i40e_rxtx_vec_common.h > +++ b/drivers/net/i40e/i40e_rxtx_vec_common.h > @@ -268,7 +268,7 @@ > i40e_rx_vec_dev_conf_condition_check_default(struct rte_eth_dev *dev) > #endif } >=20 > -#ifdef CC_AVX2_SUPPORT > +#ifdef __AVX2__ > static __rte_always_inline void > i40e_rxq_rearm_common(struct i40e_rx_queue *rxq, __rte_unused bool > avx512) { @@ -329,7 +329,7 @@ i40e_rxq_rearm_common(struct > i40e_rx_queue *rxq, __rte_unused bool avx512) > _mm_store_si128((__m128i *)&rxdp++->read, dma_addr1); > } > #else > -#ifdef CC_AVX512_SUPPORT > +#ifdef __AVX512VL__ > if (avx512) { > struct rte_mbuf *mb0, *mb1, *mb2, *mb3; > struct rte_mbuf *mb4, *mb5, *mb6, *mb7; > -- > 2.30.2 Applied to dpdk-next-net-intel. Thanks Qi