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 E3AB9A0C49; Thu, 10 Jun 2021 12:31:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D159F410D8; Thu, 10 Jun 2021 12:31:04 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id CD0F74003C for ; Thu, 10 Jun 2021 12:31:03 +0200 (CEST) Received: from mail-qk1-f199.google.com ([209.85.222.199]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrHxn-0008Uw-Fp for dev@dpdk.org; Thu, 10 Jun 2021 10:31:03 +0000 Received: by mail-qk1-f199.google.com with SMTP id r22-20020a37a8160000b02903ab435911daso938970qke.20 for ; Thu, 10 Jun 2021 03:31:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=KgENQH4Vmsc8edRnzZseAOrMcPx6GmKADWLcuOXlYhQ=; b=LNFR1DLapbAuBVrztQjoTCX4YDIjegar4Fe0z2yUE+uCckmdo/+SpvfTnYz+Fe3tx8 84T3sAt7TIBQapC/UASAhR66rlE0Qo6J6ztiffaKd8vwavnrIMMt1OodSDsRVnnP1Psv E1ty4EWxpYoqvkbzlqygT4nvQhBAv8lkGtxi5ivEWUXqZ2fSVPhmYWLGYH7Hh/8eLNHE QxYa76cp7fDfUN0SXYWcL6PW4tL6Whm7B60wuXUuFlV1rAwiAiBJxLmZNj2wysYB8hI+ /0+3DCSuJrpcPGzNvTwBfmQqIgQXiNCVCmw7I1tjHQMYy2NCYEsnm7wNjKazWZVq/YuX ZDPA== X-Gm-Message-State: AOAM5338ca87/4WJK4MalQflCVXv3Kmrl10nmU0HW4+sNnx2aoplf3oC uVXoJjg21vKCubafXoaOKPPBICGuG9hkrWTss3ruVdcvQDJNI/42aifuKXlWveFu2OvzVSmaIXH wEov//Pep/wC+02MSL3qzby8e/dW6OgPjoKZx X-Received: by 2002:ac8:7c4b:: with SMTP id o11mr4401893qtv.336.1623321062409; Thu, 10 Jun 2021 03:31:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYD7+4Jqf6ydKiRb/8BbBsNFiSKiZAZtv9wSZyTqBCJTrS/G3tfS8CDIeTZdsXD84KiyKocoddi09nHFIHJIU= X-Received: by 2002:ac8:7c4b:: with SMTP id o11mr4401869qtv.336.1623321062185; Thu, 10 Jun 2021 03:31:02 -0700 (PDT) MIME-Version: 1.0 References: <20210602143317.2333707-1-christian.ehrhardt@canonical.com> <95714253-c0a5-9cbc-31ed-918e158c8109@intel.com> In-Reply-To: From: Christian Ehrhardt Date: Thu, 10 Jun 2021 12:30:36 +0200 Message-ID: To: Ferruh Yigit Cc: dev , Thomas Monjalon , dpdk stable Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH] kni: fix compilation on SLES15-SP3 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Thu, Jun 10, 2021 at 10:39 AM Christian Ehrhardt wrote: > > On Tue, Jun 8, 2021 at 1:17 PM Ferruh Yigit wrote: > > > > 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? > > I don't have a perfect insight in the SUSE distro variants and their > kernel versions. > > 5.3.18 in SLES15-SP3 was what broke it and I have hoped that this would apply in general. > But the error above seems we have others that are > 5.3.18 but at the > same time not have the backport. > > I'll try to create a v3, but do we have anyone from Suse to usually > directly ping for feedback on this? With the new version (not submitted since it fails me) you can have a look at my personal WIP branch: => https://github.com/cpaelzer/dpdk-stable-queue/commit/43b908fe83e9cd68b08e259c0ace26ec692bb737 Now "my SLE15" fails [ 232s] /home/abuild/rpmbuild/BUILD/dpdk-1623314498.43b908fe8/x86_64-default-linux-gcc/build/kernel/linux/kni/kni_net.c:791:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] [ 232s] .ndo_tx_timeout = kni_net_tx_timeout, [ 232s] ^~~~~~~~~~~~~~~~~~ The full log is at https://build.opensuse.org/package/live_build_log/home:cpaelzer:branches:home:bluca:dpdk/dpdk-19.11/SLE_15/x86_64 That means now the check is now no more catching this SLE15 with their linux-5.3.18-57. I need to find what SLE_VERSION_CODE really is in that environment :-/ Sadly I don't have that system locally. So the V3 will be delayed, but any additional input is welcome. P.S. or I can't make an >= check on SLE_VERSION_CODE ...? > > [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? > > I outlined that in the commit message already, and since the RH8.3 > check above was added without inline comment I kept the same style. > With the updated v3 it will be readable from the code as I'll try > (SLE_VERSION_CODE >= SLE_VERSION(15, 3, 0) > > I'll submit the v3 after it has passed my test builds which include > - SLE_12_SP4 > - SLE_15 > - openSUSE_Factory_ARM > - openSUSE_Leap_15.2 > - openSUSE_Leap_42.3 > - openSUSE_Tumbleweed > > And of those SLE_15 was the one affected without this fix due to their > new new kernel. > > > > #define HAVE_TX_TIMEOUT_TXQUEUE > > > #endif > > > > > > > > > > > -- > Christian Ehrhardt > Staff Engineer, Ubuntu Server > Canonical Ltd -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd