From: David Marchand <david.marchand@redhat.com>
To: Olivier Matz <olivier.matz@6wind.com>
Cc: dev <dev@dpdk.org>, Ferruh Yigit <ferruh.yigit@intel.com>,
Kevin Traynor <ktraynor@redhat.com>,
dpdk stable <stable@dpdk.org>,
Christophe Grosse <christophe.grosse@6wind.com>
Subject: Re: [dpdk-stable] [PATCH] kni: fix compilation on RHEL 8.3
Date: Thu, 26 Nov 2020 19:04:56 +0100
Message-ID: <CAJFAV8yQz9fj0nijLzT_uTq=Jzve1RGvmMFbc6d99V47Fcz2AA@mail.gmail.com> (raw)
In-Reply-To: <20201126142344.25018-1-olivier.matz@6wind.com>
On Thu, Nov 26, 2020 at 3:24 PM Olivier Matz <olivier.matz@6wind.com> 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 <christophe.grosse@6wind.com>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
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=/root/dpdk/build/kernel/linux/kni src=/root/dpdk/kernel/linux/kni
'MODULE_CFLAGS=-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
‘void (*)(struct net_device *, unsigned int)’ from incompatible
pointer type ‘void (*)(struct net_device *)’
[-Werror=incompatible-pointer-types]
.ndo_tx_timeout = kni_net_tx_timeout,
^~~~~~~~~~~~~~~~~~
/root/dpdk/kernel/linux/kni/kni_net.c:791:20: note: (near
initialization for ‘kni_net_netdev_ops.<anonymous>.ndo_tx_timeout’)
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) <= LINUX_VERSION_CODE
> +#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \
> + (defined(RHEL_RELEASE_CODE) && \
> + RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE)
> #define HAVE_TX_TIMEOUT_TXQUEUE
> #endif
>
> --
> 2.25.1
>
Tested-by: David Marchand <david.marchand@redhat.com>
Thanks.
--
David Marchand
next prev parent reply other threads:[~2020-11-26 18:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 14:23 Olivier Matz
2020-11-26 18:04 ` David Marchand [this message]
2020-11-26 18:08 ` Ferruh Yigit
2020-11-27 0:41 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJFAV8yQz9fj0nijLzT_uTq=Jzve1RGvmMFbc6d99V47Fcz2AA@mail.gmail.com' \
--to=david.marchand@redhat.com \
--cc=christophe.grosse@6wind.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=ktraynor@redhat.com \
--cc=olivier.matz@6wind.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
patches for DPDK stable branches
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
stable@dpdk.org
public-inbox-index stable
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://inbox.dpdk.org/inbox.dpdk.stable
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git