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 AD26BA09E4; Fri, 29 Jan 2021 14:51:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B3C92401B9; Fri, 29 Jan 2021 14:51:26 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id CB3D4240134 for ; Fri, 29 Jan 2021 14:51:24 +0100 (CET) IronPort-SDR: tA+1m2UE20zLU5sCpNk+B2KTQyXmxaQQmPwWP5KaffUouN/FlinGuz9YRmArKC5iduDXmaszcB gymJvHCoIaSg== X-IronPort-AV: E=McAfee;i="6000,8403,9878"; a="176917464" X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="176917464" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2021 05:51:23 -0800 IronPort-SDR: a8Za5gemq2YOn/MXG7xi8Kcd7WWRnJIVbt81xSnwWc0z7ydTcEw2/IbriujuZtVWrfnFHnCDnX bjtNynaV1uRA== X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="389309724" Received: from bricha3-mobl.ger.corp.intel.com ([10.252.20.59]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 29 Jan 2021 05:51:19 -0800 Date: Fri, 29 Jan 2021 13:51:16 +0000 From: Bruce Richardson To: Juraj =?utf-8?Q?Linke=C5=A1?= Cc: "thomas@monjalon.net" , "Ruifeng.Wang@arm.com" , "jerinjacobk@gmail.com" , "hemant.agrawal@nxp.com" , "ferruh.yigit@intel.com" , "aboyer@pensando.io" , "dev@dpdk.org" Message-ID: <20210129135116.GG929@bricha3-MOBL.ger.corp.intel.com> References: <1611916159-32158-1-git-send-email-juraj.linkes@pantheon.tech> <20210129114340.GE929@bricha3-MOBL.ger.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Subject: Re: [dpdk-dev] [RFC PATCH v1] build: kni gcc cross-compilation support 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 Fri, Jan 29, 2021 at 12:33:06PM +0000, Juraj Linkeš wrote: > > > > -----Original Message----- > > From: Bruce Richardson > > Sent: Friday, January 29, 2021 12:44 PM > > To: Juraj Linkeš > > Cc: thomas@monjalon.net; Ruifeng.Wang@arm.com; jerinjacobk@gmail.com; > > hemant.agrawal@nxp.com; ferruh.yigit@intel.com; aboyer@pensando.io; > > dev@dpdk.org > > Subject: Re: [RFC PATCH v1] build: kni gcc cross-compilation support > > > > On Fri, Jan 29, 2021 at 11:29:19AM +0100, Juraj Linkeš wrote: > > > The kni linux module is using a custom target for building, which > > > doesn't take into account any cross compilation arguments. The > > > arguments in question are ARCH and CROSS_COMPILE. Get those from the > > > cross file and pass them to the custom target. > > > > > > The user supplied path may not contain the 'build' directory, such as > > > when using cross-compiled headers, so only append that in the default > > > case (when no path is supplied in native builds) and use the > > > unmodified path from the user otherwise. > > > > > > Signed-off-by: Juraj Linkeš > > > --- > > > kernel/linux/kni/meson.build | 4 ++-- > > > kernel/linux/meson.build | 33 +++++++++++++++++++++++++++++---- > > > 2 files changed, 31 insertions(+), 6 deletions(-) > > > > > > diff --git a/kernel/linux/kni/meson.build > > > b/kernel/linux/kni/meson.build index 07e0c9dae..0fbf52c93 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' + @@ -21,7 +21,7 @@ custom_target('rte_kni', > > > ' -I' + meson.source_root() + '/lib/librte_kni' + > > > ' -I' + meson.build_root() + > > > ' -I' + meson.current_source_dir(), > > > - 'modules'], > > > + 'modules'] + cross_args, > > > depends: kni_mkfile, > > > install: true, > > > install_dir: kernel_dir + '/extra/dpdk', diff --git > > > a/kernel/linux/meson.build b/kernel/linux/meson.build index > > > 5c864a465..57ed9bc48 100644 > > > --- a/kernel/linux/meson.build > > > +++ b/kernel/linux/meson.build > > > @@ -3,20 +3,45 @@ > > > > > > subdirs = ['kni'] > > > > > > +cross_args = [] > > > # if we are cross-compiling we need kernel_dir specified -if > > > get_option('kernel_dir') == '' and meson.is_cross_build() > > > - error('Need "kernel_dir" option for kmod compilation when cross- > > compiling') > > > +if meson.is_cross_build() > > > + if get_option('kernel_dir') == '' > > > + error('Need "kernel_dir" option for kmod compilation when > > cross-compiling') > > > + else > > > + cross_compiler = find_program('c').path() > > > + if cross_compiler.endswith('gcc') > > > + cross_prefix = '' > > > + # remove the 'gcc' suffix > > > + # meson doesn't support removing elements from an > > array > > > + # nor does it support slicing, so do it on our own > > > + foreach element : cross_compiler.split('-') > > > + if element != 'gcc' > > > + cross_prefix += '@0@- > > '.format(element) > > > + endif > > > + endforeach > > > + else > > > + error('Unsupported cross compiler: > > @0@'.format(cross_compiler)) > > > + endif > > > > Rather than splitting manually, might it be better to just define a new property in > > the cross-file to hold the prefix? > > That would by one more unnecessary input, so I don't like that. > > > Alternatively, rather than meson looping, why > > not just use "run_command" to use shell or python to do the job, e.g. [untested] > > > > run_command([py3, '-c', > > 'print("-".join("' + cross_compiler + '".split("-")[:-1]))') > > > > run_command('bash', '-c', > > 'echo ' + cross_compiler + ' | sed "s/gcc$//"') > > > > Since there isn't a better way to do this in Meson, it makes sense to use an external tool. > On top of that, this would save lines and wouldn't need as many code comments. I'll change it. > > > > + if host_machine.cpu_family() == 'aarch64' > > > + cross_arch = 'arm64' > > > + else > > > + cross_arch = build_machine.cpu_family() > > > + endif > > > + cross_args = ['ARCH=@0@'.format(cross_arch), > > > + 'CROSS_COMPILE=@0@'.format(cross_prefix)] > > > + endif > > > endif > > > > > > 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 > > > > The reason we don't keep the "build" off the kernel_dir is to ensure that the > > kernel modules install to the correct place. With this change the modules will go > > in "/lib/modules//build/extra/dpdk", rather than > > "/lib/modules//extra/dpdk". > > > > Ah, I see. The modules will be installed during meson install. This should also be changed, then, as we always want to install them to '/lib/modules/' (not necessarily to 'kernel_dir', as the user may change that) and only for native builds, right? > Well, we definitely want it for native builds, but I'd imagine it would be useful for cross-builds too, no? Can we find some way of getting it working for both cases. For native builds we want: * build kernel-dir = /lib/modules//build * install dir = /lib/modules//extra/dpdk What are the expected equivalent paths for cross building? /Bruce