From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id C9400A0547
	for <public@inbox.dpdk.org>; Mon, 30 Aug 2021 10:18:27 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id B8F7E4113C;
	Mon, 30 Aug 2021 10:18:27 +0200 (CEST)
Received: from mga06.intel.com (mga06.intel.com [134.134.136.31])
 by mails.dpdk.org (Postfix) with ESMTP id 19241410FA;
 Mon, 30 Aug 2021 10:18:23 +0200 (CEST)
X-IronPort-AV: E=McAfee;i="6200,9189,10091"; a="279244681"
X-IronPort-AV: E=Sophos;i="5.84,362,1620716400"; d="scan'208";a="279244681"
Received: from orsmga002.jf.intel.com ([10.7.209.21])
 by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
 30 Aug 2021 01:18:20 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.84,362,1620716400"; d="scan'208";a="445657364"
Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86])
 by orsmga002.jf.intel.com with ESMTP; 30 Aug 2021 01:18:19 -0700
Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by
 fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2242.10; Mon, 30 Aug 2021 01:18:19 -0700
Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by
 fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2242.10; Mon, 30 Aug 2021 01:18:19 -0700
Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by
 fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2242.10 via Frontend Transport; Mon, 30 Aug 2021 01:18:19 -0700
Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.103)
 by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 15.1.2242.10; Mon, 30 Aug 2021 01:18:19 -0700
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=HjPabTfAT2vwMOVV4C5zG5YeBMLSuGujdflPlR9teYiyW7CaVAb+lmw77ywDVAUoQv9D7YMsbcgg4/8GV/F2CTIVlHAlBocrlnUgIE1sANvl7+QfRxfQagqIE+CuQFpHhU75grCQVD1kXU721UxQTA3qK9KOatQQFFPcOjo+A2AI2dfx45WJKusByPfTnv5o01Nz3kzz5QqMhd4N1L0074ODDkM5V1WyiuH4mwDNppRYblx6mgDLnPO7QttpG5z5YiUoF1Yn81VdqhSIkXTVkfguODA4azvs0a8oYlFkJFj4ibCJNbFRSGhmtWP6xhptHfUg+JIHqu6TQFxpksa5AA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=7ygBjgqns5GLUzuS4W+T41iht0VNYTAlAkDBDGvTP7s=;
 b=VoF3CvR/LvvJOpsfKn0btDOgb3oaJ0tma1GjVbZpGzJu+Nb/oMv2GoIyaj+/u/2Y2WsbTpP1aGcMkEGyRASJ6ajooaGtKje7Gg+oKPaXG05iobOdIW+//sPhqlGiK2fmpvRa2L55flwA3e5DpCVorP9pDjlla7oaR3GQ+oecZi4mdg2hQPxrm9YouvFpux850xHsvURK+d5cUaRkZk8h0uIbC3gX4+0hMgJmeDwEYfwGaiJeT7FPwAS4LQE6qZ2LxJBUGyRMzrHYQ5ns71eBLzSDzJT3JoD8PJDfkjP/z1CHZJrLHu4xStQjzl2JljoIerr73p8AcCCenjRv/0kSUg==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com;
 dkim=pass header.d=intel.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; 
 s=selector2-intel-onmicrosoft-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=7ygBjgqns5GLUzuS4W+T41iht0VNYTAlAkDBDGvTP7s=;
 b=PxOELfh+aPupJW6xRemNfVKYbVvQOuWThsANhh+PGnOtpYWEUypBY32SuoFUpObXaZPk1zFLNMX7zJpNgkS6p4csqhFJALE4hUJ7DAI3FBRAf8UGByrvMaeod6HNZPmFmjpFkkAGGQKxdrgU3T+2d9wPG+3ZNbO6da+dNiJOPxg=
Received: from SN6PR11MB2621.namprd11.prod.outlook.com (2603:10b6:805:59::15)
 by SN6PR11MB3247.namprd11.prod.outlook.com (2603:10b6:805:c2::11)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Mon, 30 Aug
 2021 08:18:16 +0000
Received: from SN6PR11MB2621.namprd11.prod.outlook.com
 ([fe80::3c70:90d7:e8d8:c7b9]) by SN6PR11MB2621.namprd11.prod.outlook.com
 ([fe80::3c70:90d7:e8d8:c7b9%3]) with mapi id 15.20.4457.024; Mon, 30 Aug 2021
 08:18:16 +0000
From: "Rong, Leyi" <leyi.rong@intel.com>
To: "Richardson, Bruce" <bruce.richardson@intel.com>, "dev@dpdk.org"
 <dev@dpdk.org>
CC: "brian90013@gmail.com" <brian90013@gmail.com>, "Lu, Wenzhuo"
 <wenzhuo.lu@intel.com>, "stable@dpdk.org" <stable@dpdk.org>, "Yang, Qiming"
 <qiming.yang@intel.com>, "Zhang, Qi Z" <qi.z.zhang@intel.com>
Thread-Topic: [PATCH 2/2] net/ice: fix generic build on FreeBSD
Thread-Index: AQHXlE+OrrIuyQPJr0emQ0TgqAl/+KuLdQgA
Date: Mon, 30 Aug 2021 08:18:15 +0000
Message-ID: <SN6PR11MB262159AC4AF2E104C476B4E2ECCB9@SN6PR11MB2621.namprd11.prod.outlook.com>
References: <bug-788-3@http.bugs.dpdk.org/>
 <20210818163816.19143-1-bruce.richardson@intel.com>
 <20210818163816.19143-2-bruce.richardson@intel.com>
In-Reply-To: <20210818163816.19143-2-bruce.richardson@intel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
dlp-product: dlpe-windows
dlp-reaction: no-action
dlp-version: 11.5.1.3
authentication-results: intel.com; dkim=none (message not signed)
 header.d=none;intel.com; dmarc=none action=none header.from=intel.com;
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 5779859b-0c69-47cd-7056-08d96b8eb7c3
x-ms-traffictypediagnostic: SN6PR11MB3247:
x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <SN6PR11MB324753CE22EDC005F1B16CBFECCB9@SN6PR11MB3247.namprd11.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:3826;
x-ms-exchange-senderadcheck: 1
x-ms-exchange-antispam-relay: 0
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: lKoku3PAFuVm1rNQVBudTRdZQmpE7pN0bcceLA5HJ8wit8dF0SejGx0aKOKCsjxxB7x36cho1yv5whK/a0Z/RbMrxzcaVkq+LzK91I4AMefgkX3lb8veXPRxQgdn+w5fPWYHlSWF4Or14mpq0odunbhVDRqOM5MFIMxGdVlFzIXt3463X6XfFPYGsyHDio8f6BwLDwgcuwk8kqgTR0/QBfPM05dYqb44cWeMruTZSUY3i/ecYV+hz1nYYhngdSwK9DDtwB+gXyjJ2XvDiG6OaYIDMC8rnYVGp20t1vuREXuUdDqloV21Bl6EKKoj0BYwtGMsl0RGF6KheBIqP6g6UfMJn0stnPHxGd/9Cs98yD2sJVF1osarCHLUOPE9sOMqDdhUtG3XVT6yFpIMv67pl6ZfL1qImaJy9xU5FLylinVKHO2h641SUurZHVMWPkjzSbIlS78T6eBnyJeexLmLDoJAPlGtzbGFrE9bb2SMrxW1X2WYQaCdmdhMZtYwMtef7F3/xody9W79ZBJbrVWFJu55CDoSQUIuKyKk+Car5zI3Mjqv9bo9LoZMXgeUvWYX907EWwPt/xHNmoKyI1rBD5vdM35PiBfsGu8d2KAvHbyGma9T5hKneqBZLUCxX0+9Zu3S8NPjJaqeI+KU9QgXnNywVypx81Ax7r8ONudCGbJZ5xgWeZfVSd1HkIgNyBj+vEDulWNTXm6x1GVANyC73jBfnx0YtdhhrDnMmDkXyQ8=
x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
 IPV:NLI; SFV:NSPM; H:SN6PR11MB2621.namprd11.prod.outlook.com; PTR:; CAT:NONE;
 SFS:(4636009)(136003)(376002)(366004)(346002)(396003)(39860400002)(5660300002)(26005)(52536014)(107886003)(6506007)(53546011)(2906002)(478600001)(8676002)(54906003)(110136005)(38100700002)(71200400001)(7696005)(316002)(122000001)(64756008)(8936002)(186003)(4326008)(38070700005)(83380400001)(9686003)(33656002)(66446008)(66556008)(66476007)(55016002)(66946007)(76116006)(86362001)(41533002);
 DIR:OUT; SFP:1102; 
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?qO6koA64f3BDAqSEQV3/s3M4NdQ5q7znibkZ3qjCCeBdetcvsveO8Mfr2Ujg?=
 =?us-ascii?Q?MqTP8NLcknh/xcEZEr9xG1YHAiS6D6eBoTwdk3/fZekhH0WLr7dBBzZpPi8q?=
 =?us-ascii?Q?rH9ROCCInltZ0Lpx56Ixz3VGYtWhn4cxHHDrExd6SbBRq8BQF3YvqKUwjVFn?=
 =?us-ascii?Q?3PT/ewZ+bgwDyD4OH/qrp1I1YY1slJDErXCkE3y4w1WT35HZrIi6hCoEQTd0?=
 =?us-ascii?Q?GL1cynHjSHRoDnR4H8p35YuDxp3Wx8NzXAUtArhTbHjfX1KEhyfkQusiOeag?=
 =?us-ascii?Q?QcTgklmtL1jp2FgLjvZ9+2GgFYzbYgBOjuFEQhEJgO11yGV6XMFxvG19uQcF?=
 =?us-ascii?Q?RzrH/VMDdxFDpkYgrakIqs5ugG49Lc4l2sTNSbCC/luYt88lel3ulxFgQrrT?=
 =?us-ascii?Q?Rxl+qYrbGApA643CNu0KS2+OhMwu0X9lkrDod7bqWfQZRCXRXoWU7N7C3YT3?=
 =?us-ascii?Q?5tBXI73W92HFvYVK+TvWlebhZupkir5t2MTN9sqTeNr0WKUTi2bFIReC4ifP?=
 =?us-ascii?Q?6ECkoYQNJurVqMyeHbx+a4JGgkYj4Km87UczJ+gY24yLgrY+yQnB9WEP1gjl?=
 =?us-ascii?Q?LOIE2ZGq6ibwzz9EqKOuf+w6P77s9UARZbfb1KOzOaZAZvGx64n/PpAu8JND?=
 =?us-ascii?Q?3xSInRWtwiZ2zY4DOcdIDoxXCy2eqTDt+NsT4AtpQgCUJbsg5TUkjvphU+0L?=
 =?us-ascii?Q?+AQ5Ql0wZgkhy047DCBFvgq97imnTTNGhlpBfVdURawxfH6J/5aUxkXnLLi8?=
 =?us-ascii?Q?hSo2NHW+lABDrHSRMXYTmHN1+lXGqrdcFSCdPAU+TEtkkb/gr2Xp5PoMeTFk?=
 =?us-ascii?Q?te0OkkZnx5qsY7JOpHAM+2mmYHtdBLQUFHRZ74HiWujrjejxZHO7LhoyBITH?=
 =?us-ascii?Q?3f0DmC7pgjXU3Z2rdiKuFlt4rfxs15bm4GJ6QLf9hq8IQx5mqG9uMOYtvO/9?=
 =?us-ascii?Q?RqgoFG8eno/RTIA/+7gRfmeHoXPyVmpsATJ4wieTWVrpX2tvljT7F5JNvzFB?=
 =?us-ascii?Q?0g7rF+To4YOmBMr0TYSJvdRgr+tngZyZEMjJwkbfhuFStfEKtjfb+0QJd7qX?=
 =?us-ascii?Q?hm7+13apc3i4tI2ogCB6b2JjgtJZQrh/r8flGyEgncxn+fTQhR9O7S2Tx2kN?=
 =?us-ascii?Q?h6ClEwiKPr54p0bMwTPZVXatsH5tAEObnbJIM6ha2k2R3E3hhTg6jZkq+PfL?=
 =?us-ascii?Q?mnha0zriaCgjPxqh3nKGSvM+cPBiSOXq2OIIPOnU+rOmGEK/dceFs3o5fkI7?=
 =?us-ascii?Q?j7aYOxclhHwgz0uNdkpQ2bsxPOFUOxv1wP2/VeDEKG+Cc3PynPrP+qGGQBTf?=
 =?us-ascii?Q?6m4=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2621.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5779859b-0c69-47cd-7056-08d96b8eb7c3
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2021 08:18:15.9934 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: mPLEy8KOtiDSs8juZWtm0nkSc+CdoENiHniRRjLsMDSLHF4DvqbrQTMWc7uw9IWgAXPweqFiv14H91iPkxNj0g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3247
X-OriginatorOrg: intel.com
Subject: Re: [dpdk-stable] [PATCH 2/2] net/ice: 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>


> -----Original Message-----
> From: Richardson, Bruce <bruce.richardson@intel.com>
> Sent: Thursday, August 19, 2021 12:38 AM
> To: dev@dpdk.org
> Cc: brian90013@gmail.com; Richardson, Bruce <bruce.richardson@intel.com>;
> Lu, Wenzhuo <wenzhuo.lu@intel.com>; Rong, Leyi <leyi.rong@intel.com>;
> stable@dpdk.org; Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Subject: [PATCH 2/2] net/ice: 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 compile=
r-
> capability flag set for the whole driver. With the current, incorrect, ma=
cro, 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: a4e480de268e ("net/ice: optimize Tx by using AVX512")
> Fixes: 20daa1c978b7 ("net/ice: fix crash in AVX512")
> Cc: wenzhuo.lu@intel.com
> Cc: leyi.rong@intel.com
> Cc: stable@dpdk.org
>=20
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  drivers/net/ice/ice_rxtx_vec_common.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>=20
> diff --git a/drivers/net/ice/ice_rxtx_vec_common.h
> b/drivers/net/ice/ice_rxtx_vec_common.h
> index 2d8ef7dc8a..e609a75fc6 100644
> --- a/drivers/net/ice/ice_rxtx_vec_common.h
> +++ b/drivers/net/ice/ice_rxtx_vec_common.h
> @@ -194,7 +194,7 @@ _ice_tx_queue_release_mbufs_vec(struct ice_tx_queue
> *txq)
>  	 */
>  	i =3D txq->tx_next_dd - txq->tx_rs_thresh + 1;
>=20
> -#ifdef CC_AVX512_SUPPORT
> +#ifdef __AVX512VL__
>  	struct rte_eth_dev *dev =3D &rte_eth_devices[txq->vsi->adapter-
> >pf.dev_data->port_id];
>=20
>  	if (dev->tx_pkt_burst =3D=3D ice_xmit_pkts_vec_avx512 || @@ -352,7
> +352,7 @@ ice_tx_vec_dev_check_default(struct rte_eth_dev *dev)
>  	return result;
>  }
>=20
> -#ifdef CC_AVX2_SUPPORT
> +#ifdef __AVX2__
>  static __rte_always_inline void
>  ice_rxq_rearm_common(struct ice_rx_queue *rxq, __rte_unused bool avx512)
> { @@ -414,7 +414,7 @@ ice_rxq_rearm_common(struct ice_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

Acked-by: Leyi Rong <leyi.rong@intel.com>