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 6761CA0C41 for ; Tue, 8 Jun 2021 13:17:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 49FEE410EF; Tue, 8 Jun 2021 13:17:43 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 0128D4067A; Tue, 8 Jun 2021 13:17:40 +0200 (CEST) IronPort-SDR: 4QnTMB+P6ZcEclsDqD/UWvJMWrzG+0NHX3tIUSJIcPcVk0vt3kYvC9oW2bg8i/sTqAKcuR2JDq CO1oJCyCsv+A== X-IronPort-AV: E=McAfee;i="6200,9189,10008"; a="191931047" X-IronPort-AV: E=Sophos;i="5.83,257,1616482800"; d="scan'208";a="191931047" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2021 04:17:37 -0700 IronPort-SDR: XrtoG6LSW6ZgZpYxydZu1YYo2VDcerTYxaF6ZWKSc00KYINw8TO6dfDKS0oHYnizTeIWALOwrG j8vemWkwPI9g== X-IronPort-AV: E=Sophos;i="5.83,257,1616482800"; d="scan'208";a="481907906" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.213.215.30]) ([10.213.215.30]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2021 04:17:36 -0700 To: Christian Ehrhardt , dev Cc: Thomas Monjalon , stable@dpdk.org References: <20210602143317.2333707-1-christian.ehrhardt@canonical.com> From: Ferruh Yigit X-User: ferruhy Message-ID: <95714253-c0a5-9cbc-31ed-918e158c8109@intel.com> Date: Tue, 8 Jun 2021 12:17:32 +0100 MIME-Version: 1.0 In-Reply-To: <20210602143317.2333707-1-christian.ehrhardt@canonical.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] [PATCH] kni: fix compilation on SLES15-SP3 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 6/2/2021 3:33 PM, Christian Ehrhardt wrote: > Like what was done for mainline kernel in commit 38ad54f3bc76 ("kni: fix > build with Linux 5.6"), a new parameter 'txqueue' has to be added to > 'ndo_tx_timeout' ndo on SLES 15-SP3 kernel. > > Caused by: > commit c3bf155c40e9db722feb8a08c19efd44c12d5294 > Author: Thomas Bogendoerfer > Date: Fri Sep 11 16:08:31 2020 +0200 > - netdev: pass the stuck queue to the timeout handler > (jsc#SLE-13536). > - Refresh patches.suse/sfc-move-various-functions.patch. > > That is part of the SLES 5.3.18 kernel and therefore the > version we check for. > > Cc: stable@dpdk.org > > Signed-off-by: Christian Ehrhardt Hi Christian, There is a build error reported in CI [1] with 'SUSE15-64'. Can't the check 'linux version >= 5.3.18" may hit multiple SUSE versions, with some has the patch mentioned above backported and some did not? Can 'SLE_VERSION_CODE' be used to differentiate the SUSE versions? [1] http://mails.dpdk.org/archives/test-report/2021-June/197571.html > --- > kernel/linux/kni/compat.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h > index 5f65640d5ed..70e014fd1da 100644 > --- a/kernel/linux/kni/compat.h > +++ b/kernel/linux/kni/compat.h > @@ -133,7 +133,9 @@ > > #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) && \ > + KERNEL_VERSION(5, 3, 18) <= LINUX_VERSION_CODE) Can you please add comment here to clarify for which SUSE version this check is added? > #define HAVE_TX_TIMEOUT_TXQUEUE > #endif > >