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 F26A0A04B5 for ; Mon, 2 Dec 2019 10:16:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E5C711BF83; Mon, 2 Dec 2019 10:16:34 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id ECD761BF8C for ; Mon, 2 Dec 2019 10:16:32 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id p9so970206wmg.0 for ; Mon, 02 Dec 2019 01:16:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nfware-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ov+HrU5SDYLAj2BQdXsr0yESohSLyWLzwR5bKJ/LgAM=; b=xvzCeZnBPFSqM2xxxpjiKHez9ndvdUGzbrKULBZaUS7mbNLEBwzXt32UUSxG52KJh3 FHB1oYRD+8O4U+VaScfztnKLITLVRtPLD4HCrOp452tsbUGgCaN/UjhK1qiyvv38Cy46 h3SP1QLZ/4wVMT49KwlPwxhJ8yqXMVnxRdBXckAzJgH256qz1gUbZvkYGZCIb107mqKd Y6sLlsbMD20pvF8D9tBwAh4QABiLpIiLaCtYIZlrAM/9M9McSLdTZC3Vt8o7It+Q8V48 OTynizPjrXWturvMHL25RVLsOJgH1JULqvW9eCkXae0R0qOYDl0Bl212+YRvoWYUB5k5 BoTg== 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=Ov+HrU5SDYLAj2BQdXsr0yESohSLyWLzwR5bKJ/LgAM=; b=sO38kwo/B51AtXx+WPkYyMWCboLSdOkqN1hD5MyfWW+gA5RoQRa70EZ+3RfMlE6Stt HcKPd9UR5U1nuq/MZKiH6EEnW86aAUSdqKmLlb68AjKSBBJscqA/gHIgJOYQyCfl567F fiTO0bj1wL5RxJv5qTYpndv1phPxQUpPlS+T4C6ZrsiOg8N3dCxooYb7MFafD+hgcTOq W+T1Ncg11RvflU+3MnVUJPp5ygXfkym51AXtywMBC0jEXB0NPxBNiWwnwSx1Ph2AMIxD FKAJE1lO2YL8um96WU2lV9l94i9t8dYu5H87/bbhG+8xa4FMJ5JLKd/a9TyVp+wo+WY5 FKUw== X-Gm-Message-State: APjAAAW4wHx4mNh/CNR6MrlqbKH77K/rrg4i2RQjUhfEK/P5Qn4gDc5x IB0lJI9wvD65jYArdsmxk5ltkEN+hfuN3v3c50SjsTp4PQZ9Ag== X-Google-Smtp-Source: APXvYqzE4GL5cq4OuzoJKJhBpZijwcD3/3CJMt8tDyCmwc5549U+U76LHot/8d9YlWqgRlTvAWAUVnIdLzgMIL/28oU= X-Received: by 2002:a7b:ce19:: with SMTP id m25mr7923270wmc.6.1575278192622; Mon, 02 Dec 2019 01:16:32 -0800 (PST) MIME-Version: 1.0 References: <20191202061442.56964-1-xiaolong.ye@intel.com> <20191202083903.GA78157@intel.com> In-Reply-To: <20191202083903.GA78157@intel.com> From: Igor Ryzhov Date: Mon, 2 Dec 2019 12:16:21 +0300 Message-ID: To: Ye Xiaolong Cc: Ferruh Yigit , Bruce Richardson , dev , dpdk stable Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-stable] [PATCH] kernel/linux: fix kernel dir for meson 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" We should at least install it into /lib/modules/kernel-version. For convenience, dpdk modules are installed into /lib/modules/kernel-version/extra/dpdk. In the cross-compilation case, you can use DEST_DIR to set some prefix. I don't really see the issue here. The description clearly says that headers must be in $kernel_dir/build which is usually a symlink to /usr/src/linux-headers-kernel-version. Just set kernel_dir correctly and there won't be compilation failure. Igor On Mon, Dec 2, 2019 at 11:43 AM Ye Xiaolong wrote: > Hi, Igor > > Thanks for the feedback. > > On 12/02, Igor Ryzhov wrote: > >Hi Xiaolong, > > > >Nack from me. It's just an incorrect revert of my fix. > >Kernel modules will be installed in wrong directory, just check > install_dir > > Is there any convention that we must install kernel modules to which > directory? > And what about for cross compilation case? > > Current issue is that if I specify kernel_dir as one local linux src dir > in meson_options.txt, > meson build would fail to compile kernel modules while setting > RTE_KERNELDIR='//build_dir/target-x86_64_glibc/linux-x86_64/linux-4.19.81/' > before make works fine. Is there any subtlety I have missed? > > Thanks, > Xiaolong > > >parameter in kni/meson.build and igb_uio/meson.build. > > > >Igor > > > >On Mon, Dec 2, 2019 at 9:18 AM Xiaolong Ye wrote: > > > >> kernel_dir option in meson build is equivalent to RTE_KERNELDIR in make > >> system, for cross-compilation case, users would specify it as local > >> kernel src dir like > >> > >> //target-arm_glibc/linux-arm/linux-4.19.81/ > >> > >> Current meson build would fail to compile kernel module if user specify > >> kernel_dir as above, this patch fixes this issue. > >> > >> Fixes: 317832f97c16 ("kernel/linux: fix modules install path") > >> Cc: stable@dpdk.org > >> Cc: iryzhov@nfware.com > >> > >> Signed-off-by: Xiaolong Ye > >> --- > >> kernel/linux/igb_uio/meson.build | 2 +- > >> kernel/linux/kni/meson.build | 2 +- > >> kernel/linux/meson.build | 4 ++-- > >> meson_options.txt | 2 +- > >> 4 files changed, 5 insertions(+), 5 deletions(-) > >> > >> diff --git a/kernel/linux/igb_uio/meson.build > >> b/kernel/linux/igb_uio/meson.build > >> index fac404f07..e66218dae 100644 > >> --- a/kernel/linux/igb_uio/meson.build > >> +++ b/kernel/linux/igb_uio/meson.build > >> @@ -8,7 +8,7 @@ mkfile = custom_target('igb_uio_makefile', > >> custom_target('igb_uio', > >> input: ['igb_uio.c', 'Kbuild'], > >> output: 'igb_uio.ko', > >> - command: ['make', '-C', kernel_dir + '/build', > >> + command: ['make', '-C', kernel_dir, > >> 'M=' + meson.current_build_dir(), > >> 'src=' + meson.current_source_dir(), > >> 'EXTRA_CFLAGS=-I' + meson.current_source_dir() + > >> diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build > >> index 955eec949..9fce0c16e 100644 > >> --- a/kernel/linux/kni/meson.build > >> +++ b/kernel/linux/kni/meson.build > >> @@ -13,7 +13,7 @@ kni_sources = files( > >> custom_target('rte_kni', > >> input: kni_sources, > >> output: 'rte_kni.ko', > >> - command: ['make', '-j4', '-C', kernel_dir + '/build', > >> + command: ['make', '-j4', '-C', kernel_dir, > >> 'M=' + meson.current_build_dir(), > >> 'src=' + meson.current_source_dir(), > >> 'MODULE_CFLAGS=-include ' + meson.source_root() + > >> '/config/rte_config.h' + > >> diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build > >> index 1796cc686..a37c95752 100644 > >> --- a/kernel/linux/meson.build > >> +++ b/kernel/linux/meson.build > >> @@ -13,11 +13,11 @@ kernel_dir = get_option('kernel_dir') > >> if kernel_dir == '' > >> # use default path for native builds > >> kernel_version = run_command('uname', '-r').stdout().strip() > >> - kernel_dir = '/lib/modules/' + kernel_version > >> + kernel_dir = '/lib/modules/' + kernel_version + '/build' > >> endif > >> > >> # test running make in kernel directory, using "make kernelversion" > >> -make_returncode = run_command('make', '-sC', kernel_dir + '/build', > >> +make_returncode = run_command('make', '-sC', kernel_dir, > >> 'kernelversion').returncode() > >> if make_returncode != 0 > >> warning('Cannot compile kernel modules as requested - are kernel > >> headers installed?') > >> diff --git a/meson_options.txt b/meson_options.txt > >> index bc369d06c..7eba3b720 100644 > >> --- a/meson_options.txt > >> +++ b/meson_options.txt > >> @@ -17,7 +17,7 @@ option('ibverbs_link', type: 'combo', choices : > >> ['shared', 'dlopen'], value: 'sh > >> option('include_subdir_arch', type: 'string', value: '', > >> description: 'subdirectory where to install arch-dependent > >> headers') > >> option('kernel_dir', type: 'string', value: '', > >> - description: 'Path to the kernel for building kernel modules. > >> Headers must be in $kernel_dir/build. Modules will be installed in > >> $DEST_DIR/$kernel_dir/extra/dpdk.') > >> + description: 'Path to the kernel for building kernel modules. > >> Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.') > >> option('lib_musdk_dir', type: 'string', value: '', > >> description: 'path to the MUSDK library installation directory') > >> option('machine', type: 'string', value: 'native', > >> -- > >> 2.17.1 > >> > >> >