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 73718A0C56 for ; Wed, 13 Oct 2021 18:53:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 626E8410E2; Wed, 13 Oct 2021 18:53:12 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 050DE40151; Wed, 13 Oct 2021 18:53:08 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10136"; a="313675339" X-IronPort-AV: E=Sophos;i="5.85,371,1624345200"; d="scan'208";a="313675339" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2021 09:53:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,371,1624345200"; d="scan'208";a="563170523" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by FMSMGA003.fm.intel.com with ESMTP; 13 Oct 2021 09:53:07 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Wed, 13 Oct 2021 09:53:07 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Wed, 13 Oct 2021 09:53:07 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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.2242.12 via Frontend Transport; Wed, 13 Oct 2021 09:53:07 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.174) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Wed, 13 Oct 2021 09:53:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mJhfVDJHzkOS4LWKKTqtqFfdXzAnlLEGJ+1aT/pLgabgBAJpxdILq7lgEZUQlvEVp/OGY9SgZO0G8x4o/rHoKjwSR8VGUd+Momqof8kGD/f6j3zHMC9dTFdLTQDhUrexYGZpuchvuYVbuHS3vEUG9HKC1DjdAw1dfhDf9NJQuhCZ3pPq6q5LQprtz+A2yvUy2aaMMJ3q54254aySrnJqtwtZpAe0vfNXVNVIHTlTceA1XwH0nTI51yVai7WC16omDJjYY2MvUcEbfAgtO2SfTs8tb/77bRmz8qWfiNW81gPv6ozmjySwqOSsOWcRHF4gDwztJ4XBnwBET768F7D+PA== 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=f0oFZM8pHEy9eVNY62kyHnjZ176vBE32trxg/HLrdZs=; b=K8CDco4z2ekDIfy7Djef/SMqf34tq2yZqsV6Z070BswDtx5/mJXcv2zyPU/80UEQPbyMiAWLuLW2ZQwebixmm7ijndkHpQGpMaiNoAjwq9lInCTSE1Bq7hrcEDuyuhd9D6s4hpX5+Gv9x6z/z/+aoVu0u0/dpy4k+VeqAiRdcdrfniCqTMH8FgXEtQrNAFfiI8ZZ8EA+sQmXmv8g8RuOu5AZHLpV5huXNxGinf83R0LIZ2KtlSkbIFUKTYdRaQqCQOJplQFtuLmxb5IJibkgEH8lOrv9VNAA42dajIEdwT63InqtLzR+juC1f1GDml7imUfgVE7UdQUqi9fCZYmZRw== 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=f0oFZM8pHEy9eVNY62kyHnjZ176vBE32trxg/HLrdZs=; b=tSj9nc12f/3sN84U1qg/QlYiFsKnwHv6KkES0W+iSo7RDFBCV6WO1m/lPuMNVWJB9Aai6Znlg7aSwIXdG0HNlYoojhtFHuJK59pHUVE3gE7Rb9RjUIxmFwIqhlgEhMg43ckfsBgAqialOLBdTQYqKguo5pzYPDsSzxUIvGSgYmU= Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; Received: from PH0PR11MB5000.namprd11.prod.outlook.com (2603:10b6:510:41::19) by PH0PR11MB5208.namprd11.prod.outlook.com (2603:10b6:510:3b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Wed, 13 Oct 2021 16:53:06 +0000 Received: from PH0PR11MB5000.namprd11.prod.outlook.com ([fe80::bd7d:29be:3342:632c]) by PH0PR11MB5000.namprd11.prod.outlook.com ([fe80::bd7d:29be:3342:632c%5]) with mapi id 15.20.4608.016; Wed, 13 Oct 2021 16:53:06 +0000 Message-ID: <978a94cb-6587-a6b1-e6e3-abde6cdcc4ba@intel.com> Date: Wed, 13 Oct 2021 17:52:59 +0100 Content-Language: en-US To: Aman Singh , CC: , , Christian Ehrhardt , Luca Boccassi References: <20211013143302.7019-1-aman.deep.singh@intel.com> From: Ferruh Yigit X-User: ferruhy In-Reply-To: <20211013143302.7019-1-aman.deep.singh@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: DB6PR0301CA0063.eurprd03.prod.outlook.com (2603:10a6:4:54::31) To PH0PR11MB5000.namprd11.prod.outlook.com (2603:10b6:510:41::19) MIME-Version: 1.0 Received: from [192.168.0.206] (37.228.236.146) by DB6PR0301CA0063.eurprd03.prod.outlook.com (2603:10a6:4:54::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Wed, 13 Oct 2021 16:53:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ad93126-41ee-475b-8291-08d98e69ed72 X-MS-TrafficTypeDiagnostic: PH0PR11MB5208: X-MS-Exchange-Transport-Forked: True 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: LSJ2s/6Ib0P27YAu8BNN4n8fSYx7p9Rza1+ndwTz923e8j/dpBjXmdcHdEXx8Y8FITDA5y5Q9qkDRTMFklc1r3/1tMjP0QSrSkb5jXaGre7fny/WduDG8bwkp/YYjzm+FuSoCtPfThspV7eDrjkdRg4zQSS8j/PX086+iJD17fB734jjBZ88/WP06WK7vzK/pvjoGlbdSh+Q3miFWEhe3i+ecG/nsTx1h4cymr+APwmA37hDNocF+XgMrrlaJpt/8U/Gbq5aFYGSk5oWYnHGhzDzsfLKcWFBAPWM8LRF6PZXihiV1plH3WN3p+pu3WMO26307nqIpj77LJ8wR3mhUQICyliG+4tl44m02kCKw7occjS5/ldtC9YD9V+uw8G5RMN1ix6lhTOz1t6hxML+oizqKTX0AZV46Cuz6HsWL4D4+Ub/bIYRHEDmL2MxOsc+Lm+Exb9AP9/w47zOVxvIo+dbR3CB90QJiyI7MbAPedECo5jIJC3CuYWzidZ60zjsB19JZcAnkNVELjzVxbDJ57vxdC7+PJZDYsuJaQf//074DopROKXo7BPxAXzQTOG/Jj6tPhvh2vY5LOGJH0xK1fdX70d2J0/pbw4CjmPkimDtB46fSGmIH1SQQrJwXKonyJHQABaSaLRQX0AQZh8Gtp9V4jfS9lJwect0f3OUpxjSN5oAzuhzBUrEnYPCnluNESUT+b1bGymr1dctlyuBNPiftCkvJqYTURZuSEHC4EQQOnArEn40zD8tbNxix+IxWHnvnx59PjFzABb8kYuA2h+bB/l2RlgohSKrfNAtHDA= 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)(36756003)(8676002)(86362001)(66946007)(66476007)(66556008)(31686004)(82960400001)(316002)(2906002)(54906003)(6486002)(6666004)(5660300002)(16576012)(186003)(966005)(44832011)(2616005)(4326008)(26005)(53546011)(956004)(508600001)(8936002)(31696002)(38100700002)(83380400001)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VSt5ZnJNMjFpSEVYdHpGaXRuN3E2c1BkS1BQaUpiemNLTFRlWkJYR0x5YUlD?= =?utf-8?B?WEVGQmZtbkl6MFllUkdOUzFGR05rV0NhY1hLYWpWaTdTT1BObFZucWwwY3ph?= =?utf-8?B?Slg2UEhIK2d5dnRMeXRFdmMwcnBjYWpSTkpXVFNPS0lvM25ZY0NwZEsreU1n?= =?utf-8?B?ZkhyczJBcUFTanRUYnBCbmRUdmNXZTJiZWczeVppMEtQNGJ0WG9rOVczTFJk?= =?utf-8?B?TVF5TTVhSTMvbFBBVnI2bVl3c3JYVTVMMTJmaVViVDV6QTFqdWtuZC8veVpN?= =?utf-8?B?SUk4ci9XdnNQMFRkNHVVYWFxL0xJU3YwbEp0cHlMZVRnUTZBMVJrRlBlL3FB?= =?utf-8?B?RWhyYWNFZkJmTDJudVlyMm5zYzhxdklZV0lTSDk0QTlkOThZQ29JbUlCQmVF?= =?utf-8?B?WHhBNTVSOVptRHk5V0FpNHlWcXM3Ky8ycmI4eGdMQ2xOOVlvTWxqcUpzT1lN?= =?utf-8?B?YXA3UkhjRFJaMzFyNGl1dTNZaHFMdzV6OTN1M2RpRmVHemI0RWNyVk5QZGcv?= =?utf-8?B?alJ0N3pHTW0yb0k5RXN3bjA4cjltaWFpalc3UkovWkFaZUdlam5IY3J4ZXM4?= =?utf-8?B?VXNPYUNlb0pGM3FmUER1dnB6WU1rQ3M5ditYdURTUDJ2U1VzZHl4Q3YzenRT?= =?utf-8?B?T0l0UHdwQUQ2WXozSkgxeHQzNzhORG9BYlFHMy8yUVZiNFdTcDVRcTBGeEhK?= =?utf-8?B?VnIvc1pkSWlIVnJoOWZ1U3J2UDdHWlVSZFpQN1J4eDZ2Vmg2NXJnbVliOWdI?= =?utf-8?B?VGNIaEp4bnJFYUNQRzY1WGFRdE10WXNEU2l2QTR6a05KOFBJa3lqM1E4WEVG?= =?utf-8?B?TnN1TXJhcC9iNEtweDFwdndzelEzdmRJMUJFTFUyRytuWEhUdVlMUzlMWlNQ?= =?utf-8?B?U2pCemtqcVY5TnpjK0Z2VjlKUTZqY3dkdDl1aXZjaVpDWVJuUC9qcUY3dGJT?= =?utf-8?B?VnJTL3B2cTJWWW5XTkpGb3RLVkZuT1ZjNk93WUxtVEw2d1Eyb09PeFNRK1ZI?= =?utf-8?B?aTBYN3NFMDlOOU1Bc0FXZ3VrWWxUVkl6ZjkzejlueTNBREJ3UnlBNlE4SUhJ?= =?utf-8?B?TEpmZUpweDc2Vmxrcmp6K2ZtT1hTa0dPSkIzdVdseURsR0ZWeDdRSDdtSjA1?= =?utf-8?B?SlNPdWVSUGpPSFFjbVRXTVVPZHBvUXlIcDM3b2QzUUE0NDJ5RDFkV3djK2Mw?= =?utf-8?B?UkRVUnkyVVExZXZjUis3YjEydGxjbUIvRGM0bUxDZkdFUXphVnVUK3NhM3NH?= =?utf-8?B?cndnN0dXNTc3UHM5ZXIzYWNOZUduRWtaVFhEaWZCOU1meVFtdU5DNGVScDNZ?= =?utf-8?B?K045OFdvckhPK0o3NHpJWThvWUg5clcvZE5XQzJIUlc0bDlCVlBXRU9IQ2Nx?= =?utf-8?B?bUQxcVc1QmJHOU5sdnV6dnY2b1BtV2JVb3BpMkNyZkhuMGljU0xoSXJSVnJZ?= =?utf-8?B?dVhxQTlWa3NWSXByQjUxSHVUbjZBYVFqU09scUpJQXIvNXh0WkFaS05mbWow?= =?utf-8?B?OEc2YktmK3Y5WTN2SmZYUEhJR3I4L2t3VTVNbDhwLy9TRGM5ck5Icmo1TjMy?= =?utf-8?B?Unc5bUQyL2t6Qk9VaVpnRGJqWitSTnNRdzdHNXJFdW9JS040M3JneXpvM0FL?= =?utf-8?B?QnBnRmtYcTNWRVlIM1gyMFBqTFhZcSt5YXlia2YrMzI2TTk0c250L2g2TWdW?= =?utf-8?B?cStXd1RCMWVGZ2twNHRFWit2amU4RWgwdEozTzVjR3k3d1RwbnFET2NpRFRz?= =?utf-8?Q?ATVtwpwN2AafPRF9fs+5I8gCyO4E/cMwC5v3wKy?= X-MS-Exchange-CrossTenant-Network-Message-Id: 7ad93126-41ee-475b-8291-08d98e69ed72 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5000.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2021 16:53:05.8758 (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: r8s9JUHuj8z8xkTKWNT62CN68oMtBBEu24gt069uAtVle+FAtP6lgB3ls9j6/3Hq+nBFN8uqOr14dYB8O97QcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5208 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH] kni: resolve build issue for OpenSuse15.3 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" On 10/13/2021 3:33 PM, Aman Singh wrote: > As suse version numbering is inconsistent to determine Linux kernel > API to be used. In this patch we check parameter of 'ndo_tx_timeout' > API directly from the kernel source. This is done only for suse build. > > Bugzilla ID: 812 > Cc: stable@dpdk.org > > Signed-off-by: Aman Singh > --- > kernel/linux/kni/compat.h | 3 ++- > kernel/linux/kni/meson.build | 14 +++++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h > index 5f65640d5e..664785674f 100644 > --- a/kernel/linux/kni/compat.h > +++ b/kernel/linux/kni/compat.h > @@ -133,7 +133,8 @@ > > #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \ > (defined(RHEL_RELEASE_CODE) && \ > - RHEL_RELEASE_VERSION(8, 3) <= 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 > #endif > > diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build > index c15c78b0b4..32533fe932 100644 > --- a/kernel/linux/kni/meson.build > +++ b/kernel/linux/kni/meson.build > @@ -1,6 +1,17 @@ > # SPDX-License-Identifier: BSD-3-Clause > # Copyright(c) 2018 Luca Boccassi > > +# For SUSE build check function arguments of ndo_tx_timeout API > +# Ref: https://jira.devtools.intel.com/browse/DPDK-29263 > +kmod_cflags = '' > +file_path = kernel_build_dir + '/include/linux/netdevice.h' > +run_cmd = run_command('grep', 'ndo_tx_timeout', file_path) > + > +if run_cmd.stdout().contains('txqueue') == true > + kmod_cflags = '-DHAVE_ARG_TX_QUEUE' > +endif > + > + > kni_mkfile = custom_target('rte_kni_makefile', > output: 'Makefile', > command: ['touch', '@OUTPUT@']) > @@ -17,7 +28,8 @@ custom_target('rte_kni', > command: ['make', '-j4', '-C', kernel_build_dir, > 'M=' + meson.current_build_dir(), > 'src=' + meson.current_source_dir(), > - 'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' + > + ' '.join(['MODULE_CFLAGS=', kmod_cflags,'-include ']) > + + meson.source_root() + '/config/rte_config.h' + > ' -I' + meson.source_root() + '/lib/eal/include' + > ' -I' + meson.source_root() + '/lib/kni' + > ' -I' + meson.build_root() + > Acked-by: Ferruh Yigit I didn't check on the SUSE, but _unconventional_ detection method is not causing any problem in my test environment.