From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7CF98A04DD for ; Thu, 26 Nov 2020 19:05:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4CC8FCA39; Thu, 26 Nov 2020 19:05:16 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id B4A1ACA39 for ; Thu, 26 Nov 2020 19:05:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606413912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lba77fB1Gaqv7jDYVYBAf+k7SKuWKcQMclHmPBN1Fh0=; b=L6Ltm84K/NRRZF/B7xqTMfsbMz4+VK2plra0hASb9RE5mFN2QQFeIiS2ZwymPb5OSPP1Z0 JLSdp05vwhEnVyc6e4O/hmpH27Gr8MMLLtUPvuxyQDlkN5kz7InIbXJ5W4UDutyjgKs/D/ Z54vUig5or9qlr8qdmwRUCHbAhMiN2Q= Received: from mail-vk1-f198.google.com (mail-vk1-f198.google.com [209.85.221.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-543-ycHBPdGXMj-xN11tjAI8jQ-1; Thu, 26 Nov 2020 13:05:10 -0500 X-MC-Unique: ycHBPdGXMj-xN11tjAI8jQ-1 Received: by mail-vk1-f198.google.com with SMTP id j129so1031902vkb.15 for ; Thu, 26 Nov 2020 10:05:10 -0800 (PST) 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:content-transfer-encoding; bh=lba77fB1Gaqv7jDYVYBAf+k7SKuWKcQMclHmPBN1Fh0=; b=D7SgfQiI4WbUwGmqTpttvc6SSGtZimyGmcRBxClz0NMHmlBmfQtqk6G8ndvE7ebXgB TIFZ/odFT03zXwePtijAQF2szt3v+eo4B2th11/Zn7LBYts5vyxh7f42frG2lBMfArcB XBng0JzbItt1r1BPuJ1ySDy+VlOEzFIhtcljp+LjbUzryPJcwi45NL4ixWY079P4MtWf 9FAsuqen3OYE3tDuP18GB5ERr4UMolOJ82JBWyvnuHiUZQE15p62wmFwfujAZMyss8cN qQVAkjgAa9PGEWHNRn37bCCTv+lDSg1zCJ6/ZkFOeljgCg80JesJnSpcl3ltPwyB/WDH OQEQ== X-Gm-Message-State: AOAM530FxtkFBvHCixqFqprwByLY3ibGxOyE10O/PnYqdlbUbaJJNKEq deXtlkTC9F3y8Q4wgXoSDtavAud1mBb/56Ap93O81Dw0NgzeFTAsxgCVfHLknxtpcj8JUArZVj7 ooIb3+W8i1WCRH0oWOFjPDfI= X-Received: by 2002:a05:6102:2362:: with SMTP id o2mr2757812vsa.5.1606413908261; Thu, 26 Nov 2020 10:05:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+hXYXOckd2dgtqW4+BwdBDJWBwobKv+LRXXe0FPTB65jkLVrwWaGiilRQ/vUlWVQNJ3Th3udQHXkWjbwl30s= X-Received: by 2002:a05:6102:2362:: with SMTP id o2mr2757755vsa.5.1606413907863; Thu, 26 Nov 2020 10:05:07 -0800 (PST) MIME-Version: 1.0 References: <20201126142344.25018-1-olivier.matz@6wind.com> In-Reply-To: <20201126142344.25018-1-olivier.matz@6wind.com> From: David Marchand Date: Thu, 26 Nov 2020 19:04:56 +0100 Message-ID: To: Olivier Matz Cc: dev , Ferruh Yigit , Kevin Traynor , dpdk stable , Christophe Grosse Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] [PATCH] kni: fix compilation on RHEL 8.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Thu, Nov 26, 2020 at 3:24 PM Olivier Matz 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 RHEL 8.3 kernel. > > Cc: stable@dpdk.org > > Tested-by: Christophe Grosse > Signed-off-by: Olivier Matz Reproduced issue on a RHEL 8.3 with kernel 4.18.0-240.el8.x86_64. FAILED: kernel/linux/kni/rte_kni.ko make -j4 -C /lib/modules/4.18.0-240.el8.x86_64/build M=3D/root/dpdk/build/kernel/linux/kni src=3D/root/dpdk/kernel/linux/kni 'MODULE_CFLAGS=3D-include /root/dpdk/config/rte_config.h -I/root/dpdk/lib/librte_eal/include -I/root/dpdk/lib/librte_kni -I/root/dpdk/build -I/root/dpdk/kernel/linux/kni' modules make: Entering directory '/usr/src/kernels/4.18.0-240.el8.x86_64' CC [M] /root/dpdk/build/kernel/linux/kni/kni_net.o CC [M] /root/dpdk/build/kernel/linux/kni/kni_misc.o /root/dpdk/kernel/linux/kni/kni_net.c:791:20: error: initialization of =E2=80=98void (*)(struct net_device *, unsigned int)=E2=80=99 from incompat= ible pointer type =E2=80=98void (*)(struct net_device *)=E2=80=99 [-Werror=3Dincompatible-pointer-types] .ndo_tx_timeout =3D kni_net_tx_timeout, ^~~~~~~~~~~~~~~~~~ /root/dpdk/kernel/linux/kni/kni_net.c:791:20: note: (near initialization for =E2=80=98kni_net_netdev_ops..ndo_tx_timeout= =E2=80=99) cc1: some warnings being treated as errors make[1]: *** [scripts/Makefile.build:315: /root/dpdk/build/kernel/linux/kni/kni_net.o] Error 1 make: *** [Makefile:1544: _module_/root/dpdk/build/kernel/linux/kni] Error = 2 make: Leaving directory '/usr/src/kernels/4.18.0-240.el8.x86_64' ninja: build stopped: subcommand failed. > --- > 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 d515b27669..5f65640d5e 100644 > --- a/kernel/linux/kni/compat.h > +++ b/kernel/linux/kni/compat.h > @@ -131,7 +131,9 @@ > #define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT > #endif > > -#if KERNEL_VERSION(5, 6, 0) <=3D LINUX_VERSION_CODE > +#if KERNEL_VERSION(5, 6, 0) <=3D LINUX_VERSION_CODE || \ > + (defined(RHEL_RELEASE_CODE) && \ > + RHEL_RELEASE_VERSION(8, 3) <=3D RHEL_RELEASE_CODE) > #define HAVE_TX_TIMEOUT_TXQUEUE > #endif > > -- > 2.25.1 > Tested-by: David Marchand Thanks. --=20 David Marchand