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 3859EA034C for ; Tue, 14 Dec 2021 14:10:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 255B8410F3; Tue, 14 Dec 2021 14:10:25 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 491134003C; Tue, 14 Dec 2021 14:10:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639487422; x=1671023422; h=message-id:date:to:cc:references:from:subject: in-reply-to:content-transfer-encoding:mime-version; bh=3hNoIcPgP96YCdiKefVWTLhaQgEBgCHPQRXnHcJ8zRo=; b=elat/SdIrMIGUyOdx+26SoTzzB/q31zmsHNkd4JX1vI+92LQJciVhxTA RYAe89Q0xzXBOeEUEevfm2mXaCNfAEB4VfQ5V0TlYm7QgSl8Qq0kTiWoX MpgimmN1DuJPvAsbgY4rBL/ktzKs5J1N0v26EOGA3zgpg0uo6nfkbhKYe S+RIXnksRYUOtF51rqbKhxJ3YAK+JgnSKI6m5zzfPZfQFU+6Ydo/6FQVa 8NPWdn5nAAe28Vwe4B3556aAEVlBh1q6oISxqzCezFLYjrXUaVR1WF8aj vKmp2TELM/7r4/UVw5S61cx0kqBNgNCWZwpy+KMZr8QlPtppAznxD8TUn Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10197"; a="325248849" X-IronPort-AV: E=Sophos;i="5.88,205,1635231600"; d="scan'208";a="325248849" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2021 05:10:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,205,1635231600"; d="scan'208";a="545160589" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga001.jf.intel.com with ESMTP; 14 Dec 2021 05:10:20 -0800 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 14 Dec 2021 05:10:20 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Tue, 14 Dec 2021 05:10:20 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.174) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Tue, 14 Dec 2021 05:10:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ntdso2nD8BJWQjNxrwC5vkBZicXdb3IGt1wDpnnsxa6bCdMkIpf/FKwbeCiZ1SYCjTmLUCHkQSb8UHnMxHoegII7ecSatSVkTQNYX+DZXNMAfHGxb2F/pZtJB3TLz9P7eyL/G57lGG03aeUTCGTQuNh5CtDrQB2Klatsu7NQ2LlNeMyAA6NF+axAINMOYitTtRNi/3OoOGHWgVGZIM/ONBeR4koxxlu9waEHZtBO/bw8QCKOgwuJOGxKHCEcdqIUn9wN6oqQo9/vuwMxiCWOYov3U4Oz5qRQClcJKVil+X0zqcvBhq041UND4WGsnNT3WOJh/8rqFN54AwLbRexEZg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9LBDLygaU72Z4HpfUiTN79YhyHJPB5CaLCYUgJXF7U4=; b=QI12if4jBBQGEB4OK0PaaA74/D31uMeCQXvGKJkA3vVGXBdJf9C3loZH9YltoZp7caT/2zYVJP9tpXtoWV5QvqRn6sfmupoXWudG4sBDYZ6VOYo1IxyphJaciNCmpNrXIqYpBV6IT4fVD4GzrlMsSNCkfxIjcVWPw/DCeHj5tFtpstMuFnjQalFb4Kg6spIlO5jKAdn342VC+S5l9wAp78KRSUXwmL792DSZMBBjbQt3+NFoVbLERbCLTn4UXTiUF4wbnx/cm0C2ZyD/IKkv5LuBUhMGuY8qFmtjWpc61EBGfCGvxT22v8z2ClMJaNu6OsY+rAAkCo+RDEpgxVjKjg== 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=9LBDLygaU72Z4HpfUiTN79YhyHJPB5CaLCYUgJXF7U4=; b=tgJUw0cmv4hsfdBirbtvDyiIUXcjecgljrnV5f3ynopvQ/SdK5v9zGAtEwyKryEIwFKLXX1rTtrHhsolMN4cMiNNA+VLJwgDMy6FtriEp2N1AnHJXYzfpEbFXXE6sclkuIyaH36UeeQD0RZI21jExZWbDqPFXFpo62SOvKgGsP8= Authentication-Results: canonical.com; dkim=none (message not signed) header.d=none;canonical.com; dmarc=none action=none header.from=intel.com; Received: from PH0PR11MB5000.namprd11.prod.outlook.com (2603:10b6:510:41::19) by PH7PR11MB5817.namprd11.prod.outlook.com (2603:10b6:510:13a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Tue, 14 Dec 2021 13:10:17 +0000 Received: from PH0PR11MB5000.namprd11.prod.outlook.com ([fe80::bc5f:31a7:10ad:443c]) by PH0PR11MB5000.namprd11.prod.outlook.com ([fe80::bc5f:31a7:10ad:443c%5]) with mapi id 15.20.4778.018; Tue, 14 Dec 2021 13:10:17 +0000 Message-ID: <9f445304-f5d6-49a7-1f0f-65db8725d1ca@intel.com> Date: Tue, 14 Dec 2021 13:10:08 +0000 Content-Language: en-US To: Christian Ehrhardt CC: Kalesh Anakkur Purayil , "Abhishek Marathe" , Akhil Goyal , Ali Alnubani , David Christensen , Hariprasad Govindharajan , Hemant Agrawal , Ian Stokes , Jerin Jacob , John McNamara , Ju-Hyoung Lee , Kevin Traynor , Luca Boccassi , Pei Zhang , Raslan Darawsheh , Thomas Monjalon , , dpdk stable , dpdk-dev , , , , References: <20211209144315.3424225-1-christian.ehrhardt@canonical.com> <7bf4583f-c2de-0aa7-fb00-bf3e9ff8d99b@intel.com> <34e0a9a8-327e-0150-b18a-dc3bfdca7d11@intel.com> <43d82514-b3e0-1bbd-1351-f1221bfc53db@intel.com> <5ac74587-4a18-3e0b-f674-73f927a11f95@intel.com> From: Ferruh Yigit Subject: Re: 19.11.11 patches review and test X-User: ferruhy In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: LO4P123CA0082.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:190::15) To PH0PR11MB5000.namprd11.prod.outlook.com (2603:10b6:510:41::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9cc912c1-826e-4b38-9e0e-08d9bf031290 X-MS-TrafficTypeDiagnostic: PH7PR11MB5817: X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x3UsBVfkyeGvI4IVj+XnjHXtk/UqMLzcHkv0nfi6u2viGGb7Fv4kGN/MZ8921VavVNUcgtjLFM6Z0GdCKeDt3sInNL7kb0a7EY+8GewSEACPrgoHqUXEO6As1GUymghkNZeJUXtnj4W+YdxTzsgmN1sPt6oW+cul17hhyr7opmOvAJXVm3+s9dkUrGbY27udO7O2+UOkJYaCIqm/3W/T/6AkeMO3ABsnZxyi/cwINXnI5FUXeggQXTOwJBSDhJT85Z1B3Q6FHKQsoDeFjPyQanEh3AjiJqHrF7GVKhsO3rpDqAAR3/h5OBzk4tYC1I5HQbw9r87UHPrQ8z2bTV8+zX2j912T3bVkm0M2E32eC70tQp3bRQBeNQEOqFpi5Av/XsaCzVHtfAXh5rAlYAW53sXTalzY+gFl/BiAVhADgYEOQlsYS8vQUkEtqakYHDX5DBPjA8d6mfoMRsxPV3qbMzTApPXnIbbd31wsbAZTjEWROCMB+qarh4qIzUHbuUdfLc8N63wDN0RjbogmIUe/yGHfw4o/k4H848qwLNwnDAAHRpfpTvr9Hooa7cKkjurXHgMz2WDfyq8Ep1zgqDndZUQMt2WAEzOw+3ckUka5tfcb/uaAr714x5yb7MALNCuiUdFmUhcviwFGSpPJCmb7ZYzBQfYApDMnjMEuwZ6ex+ITzuCeErCe/O5WCibFfUQqT2g5a8NgJB9eNF2tfYqahOuqApC9FECadVu8TEc00zE7pCnFXecfyILdJU00FJR+7Aoxri1Jkz4mcRTV6f8jCGzOQg71/BXJ+TB4Ss2+aQM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5000.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(5660300002)(44832011)(2906002)(8676002)(26005)(966005)(31686004)(86362001)(38100700002)(6486002)(53546011)(6512007)(83380400001)(107886003)(186003)(82960400001)(31696002)(66556008)(316002)(66476007)(6506007)(6666004)(8936002)(66946007)(508600001)(7416002)(54906003)(36756003)(2616005)(4326008)(6916009)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aTJ2cGd1c08wTEdBcU1wRU1ZSFNVT2tOMkdaTEQwbW10VUFsWHc5RThtbTdM?= =?utf-8?B?ZmxtencwNm9RbkJ4TUlXUHkzTXRlOXRkRTVUWlpJNkwyRERyczhucFVGL1lC?= =?utf-8?B?dHh0ZC9GQVRzcXBodCt1dDlyb3dMRHdNUXpvYzFCaW54UVdJSC9vMmErSytN?= =?utf-8?B?L2dNRDlFbUR6Qk0xS2UxRUV5a1R3VFNRZFFtajJCVnJtQTJIWmV4eDdoZkRS?= =?utf-8?B?YWtFT3NlVmVTcnlvR3ZTRXhhb1FUNzZtaXArbm5XZzNwWHpKZ3Z1ZXp1cXEr?= =?utf-8?B?VjI1STg0dW1TbXdQdnZtZWNjeFB0bVZSZk80RzFHSjdOb0NWdDNqUkZvZE9p?= =?utf-8?B?WVZDMkhReEkzajcwWFZWcUpyckpMNjd4TDRJbkNpSHZZVHFwR0Z1cml3VHRM?= =?utf-8?B?cXd5WmVWdDZGejY4b09UNlVObzdxYWpwSHlXYXlkUjhobXl1RVg1MmdMWkh0?= =?utf-8?B?Wk4vd0ZwZmhhQ0pwNjY4VWpHbisreDhzUXdzS2tQSXhSMVVpbDhjOEU3ZHdO?= =?utf-8?B?T1JUSFVBU2hURGVIbE5mVHlhZ3djVFd0K2RyWk9OY04raTlWdGpiNnZaL215?= =?utf-8?B?WXdOL2lwYXEwaWJpVlNuTVA1dE1oTGxhWUdmQyt3OEhVNjNJZHRWQlpOOFhX?= =?utf-8?B?ZkE2UUFXSUZRUkRmZFNJQ0hxUFBXOWNITnhNZW1GY2FBOXZpTmt5REcvMVc1?= =?utf-8?B?Kzg1NEdlcStUckFxWHJXN3lzVE5RY0gwaXhtbzRrZEJxbE5EaGZvNUFuM2tL?= =?utf-8?B?THRVbHFjQmdUZ1ErK0Q4YlBWYU1vR2FUbUE4L0ZaQ0ZzUnF5RFdVOW1RaXRk?= =?utf-8?B?djB4WExDMlNxSWJqSG1Gd2thYWJEclVKYnRKOGtjdXRvRmZ1Qlhuamk3Tm5L?= =?utf-8?B?SjFablAwS3dQZmMycGhSbEhvT1ArU0VSbXV2Y0RBc3RnQ0JjZ0ZNMFUxaDNm?= =?utf-8?B?YTVSYzVWbkFHenI2aTZTYjRJT2c3VGF3YUxtb0RVVEVYSjhDdmQ1M05jL1Iv?= =?utf-8?B?WkFSeVZ6TnJUb0krVUl6TjRXc1RJNVlhSEVSeWNOMnkvQUQyQTNWV2lyeFk0?= =?utf-8?B?a21COGNESkZuOTZpNU5sSmRBUWdpUGpsL2Y0WldYUFhGeC9MRXJaQjQ5di8z?= =?utf-8?B?S0dSenRSeGdVdlphU0k1THJjTnl6dUxUVzFaTkVkVjJmT3pGM2tlaGNDNlJO?= =?utf-8?B?R1ZzU09MSnRZUDNkU3dMTEJwVlAwLzRLVHZ1NW5WVnhOWjhnRktHSUZsMUlx?= =?utf-8?B?K3llSlREQVRrYUZTOG11RVd4aHU2dko2M2JoOWNTODEyaFFyUGJkcGQrTE1T?= =?utf-8?B?Sk1lU2dvNk5YaG4zSFhweHVvelFUdDhLanIxbGdiRklYNm00SE82YnpIcmpN?= =?utf-8?B?dlQ0dFNWNGlzcnlUSTh0V3o3aVJ3bDdqbThYMlpFSncxZTZ6ZVZDa3JFMzR4?= =?utf-8?B?WDZPeWFxcUtsd2g4ck9CTHkwNnJMOVdHLzk4ZFdkOENxT2xSNnZ6dlJWdHY5?= =?utf-8?B?VDkwdGFmQzdLYmlSSytqTDIxeXVDNGhIMFNjOEhEUE5HNmt1R0RvTjExNzVH?= =?utf-8?B?L25DK2syckViYVdxZWtwWnl3bk02RzM1bGlKYjRuNGdiWUI0Mk9wYitlZUds?= =?utf-8?B?SHBLbndFVWtrUGRnQksxT0t0TmNyZWhpbVZuOGVRSmJRVjVqTDVXUmtxY0ZO?= =?utf-8?B?QzB5c3RURm5DSWNSdGZFdS9qUTNHTnJpZ1hRNTJCQUR6RGFOTEd3MDRIYytO?= =?utf-8?B?UkVjNXVzb2VuYkFyc1lWa3V4aExDMnBoTUkwakZhWkRzYXRDYUZTdGFFSmpX?= =?utf-8?B?T0xvRXJIQXBBOS9ETG5KL0t6WC96L1pKK1VTMVhKMS9JZGJSTUhWZGZ3d2RF?= =?utf-8?B?dythUkZ3VytOWjY2cmR1Nk4reVBaYStCV3ZtSVRWakZkUFpGRTlTbUwzSmJv?= =?utf-8?B?R3BVbnIvbWx5d2c1NmxNMWFadEdWbUJCUlNHNzFNZlRpcyt4VVBNL2tpbmpj?= =?utf-8?B?U2hEenIwZ3pLaW5OOFNMRlM4T01aUU5rZVVTLytCNGRiVDJKaXRhZ1grZi9B?= =?utf-8?B?RTNNQjdFMFhBRjFEd05CY1l6MTBuUmlDUndaY2duQ1gvSDBXU004ZmQrZ3Er?= =?utf-8?B?NDcyRXZvMlZzc0gvV1ppL0J4WVZtM2diU3ZFM0V6dkUzSktoU3hTd0NSWGZq?= =?utf-8?Q?NUt+Iq8BK3qZmWz2Z7UMTBQ=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9cc912c1-826e-4b38-9e0e-08d9bf031290 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5000.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 13:10:17.0464 (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: /kA98kII1gMaafoKLTiKWIDXZFbwunEauTtX03aYzsBs8iFy0zGiYG2zMU+cGcchrGaGCuKFjbTayavX6+r2PQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB5817 X-OriginatorOrg: intel.com 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 On 12/14/2021 11:39 AM, Christian Ehrhardt wrote: > On Tue, Dec 14, 2021 at 11:13 AM Ferruh Yigit wrote: >> >> On 12/14/2021 7:44 AM, Christian Ehrhardt wrote: >>> On Tue, Dec 14, 2021 at 6:49 AM Kalesh Anakkur Purayil >>> wrote: >>> >>> [snip] >>> >>>>>> [Kalesh] Yes, i am seeing the same error. I used make command to build dpdk, not meson. >>>>>> The back ported commit you mentioned takes care of meson build only I think. >>>>>> >>>>> >>>>> I see, make build is failing, and yes the fix is only for the meson. >>>>> I will check the make build and will send a fix for it. >>>> >>>> [Kalesh]: looks like the below changes fixes the issue. I tried only on SLES15 SP3 and not on other SLES flavors. >>>> >>>> diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile >>>> index 595bac2..bf0efab 100644 >>>> --- a/kernel/linux/kni/Makefile >>>> +++ b/kernel/linux/kni/Makefile >>>> @@ -16,6 +16,16 @@ MODULE_CFLAGS += -I$(RTE_OUTPUT)/include >>>> MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h >>>> MODULE_CFLAGS += -Wall -Werror >>>> >>>> +# >>>> +# Use explicit 'source' folder for header path. In SUSE 'source' is not linked to 'build' folder. >>>> +# >>>> +ifdef CONFIG_SUSE_KERNEL >>>> + KSRC = /lib/modules/$(shell uname -r)/source >>>> + ifneq ($(shell grep -A 1 "ndo_tx_timeout" $(KSRC)/include/linux/netdevice.h | grep -o txqueue),) >>>> + MODULE_CFLAGS += -DHAVE_TX_TIMEOUT_TXQUEUE >>>> + endif >>>> +endif >>> >>> Back in the day we tried various "is Suse and kernel version x.y" >>> approaches, but they failed as there was no clear version throughout >>> all of the Suse streams (leap, tumbleweed, sles) that worked well for >>> all. >>> This change here follows the upstream approach of "just check if it is there". >>> >>> I've applied this to 19.11 and did test builds across various distributions: >>> 1. no non-suse build changed >>> 2. suse builds stayed as-is or improved >>> Formerly failing: >>> openSUSE_Factory_ARM aarch64 >>> SLE_15 x86_64 -> now working >>> openSUSE_Leap_15.3 x86_64 -> now working >>> openSUSE_Tumbleweed x86_64 -> still failing >>> Formerly working: >>> SLE_12_SP4 x86_64 ppc64le -> still fine >>> openSUSE_Factory_ARM armv7l -> still fine >>> openSUSE_Leap_15.2 x86_64 -> still fine >>> >> >> Thanks Kalesh for the fix, and thanks Christian for testing. >> >> I was expecting this approach will fix all builds, after patch only >> 'openSUSE_Tumbleweed' is failing, right? I will check it. > > As just discussed on IRC, yes and the log for that is at > https://build.opensuse.org/package/live_build_log/home:cpaelzer:branches:home:bluca:dpdk/dpdk-19.11/openSUSE_Tumbleweed/x86_64 > > It also is affected by an issue around -Werror=implicit-fallthrough, > so even with KNI fixed it likely is going to fail. > >> And I think you need the fix as a patch anyway, @Kalesh are you >> planning to send the patch? > > I don't need it, as I have already grabbed and preliminary added it: > https://github.com/cpaelzer/dpdk-stable-queue/commit/d43fa3e198c08a3a76d70f4565b31ad3ab5f29c4 > > But surely, once/If you come up with a full patch that also includes > tumbleweed I can replace it with yours. > 'tumbleweed' error is odd, it complains about macro being redefined, not sure why only in this platform we are getting an error. Macro is only defined in one place, but indeed header file included multiple times, one direct and one indirect, so macro defined multiple times but without value, so it should be OK and it is OK for other platforms, it is defined as: #define HAVE_TX_TIMEOUT_TXQUEUE Another option is that macro is defined in some other header file, although I think that is very unlikely, can you please test with below change to rule out that option: diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 664785674ff1..71846419f437 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -135,7 +135,7 @@ (defined(RHEL_RELEASE_CODE) && \ RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) || \ (defined(CONFIG_SUSE_KERNEL) && defined(HAVE_ARG_TX_QUEUE)) -#define HAVE_TX_TIMEOUT_TXQUEUE +#define RTE_HAVE_TX_TIMEOUT_TXQUEUE #endif #if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index c8bad5f197ca..7397de4659b2 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -623,7 +623,7 @@ kni_net_rx(struct kni_dev *kni) /* * Deal with a transmit timeout. */ -#ifdef HAVE_TX_TIMEOUT_TXQUEUE +#ifdef RTE_HAVE_TX_TIMEOUT_TXQUEUE static void kni_net_tx_timeout(struct net_device *dev, unsigned int txqueue) #else >>> Past fixes always "inverted" the result, by fixing some but breaking others. >>> This new patch works in "not breaking any formerly working build" but >>> at the same time fixing a few builds. >>> Therefore -> applied & thanks! >>> >>> I'll likely tag -rc2 before the end of the week. >>> The good thing is that (so far) we have: >>> 1. a non functional change >>> 2. a change fixing clang-13 builds (TBH only one of many needed clang13 issues) >>> 3. a change fixing sles15SP3 builds >>> >>> Due to those, no current ongoing tests will have to be restarted. >>> Whoever was able to build, can continue the current tests. >>> Whoever was blocked by SLES15SP3 or clang-13 had no tests other than a >>> failing build and can work with -rc2 then. >>> I'll explain the same in the mail about -rc2. >>> >>>> -include /etc/lsb-release >>>> >>>> ifeq ($(DISTRIB_ID),Ubuntu) >>>> >>>> Regards, >>>> Kalesh >>> >>> [snip] >>> >> > >