From patchwork Mon Sep 17 09:01:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44783 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6A4972BE3; Mon, 17 Sep 2018 11:01:36 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id CE30F2B9A for ; Mon, 17 Sep 2018 11:01:34 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id s12-v6so8603257wmc.0 for ; Mon, 17 Sep 2018 02:01:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/dp5MATvQNnSOxUq0UWupJTbRpKSymAdaQY3TgPDIBw=; b=P6LnfO+ngREohzKjMza/wqk+3wvxX7wTFSZbJc8Hxb5k+zSyAVk+mU4DIU+r7YmCzv mNN5vES8DnLKrdj2zMq+Y3eei2OMZBChXfwfsXRhLO4PySmoC3+VXSbsvONHo3agJr58 zk+oqoy0Kdncuu67+OXNLrKpueAc/S7pXws2GQW3QpeDXyLl7oXKrQEQKeULftXEA33H lYCCoLZlgdOGldpoBbQEDt+Z2wBXPLMaNnZ/TRxaKE3bM8yUpZuCL0xBDtxetOP1NYKw FzCVpBDQmrcZMwvXXMx81OWbBSb7czS3eS95yLdAauazxRt/7GeI9UFGwAyGUOVTF2sg X+SA== X-Gm-Message-State: APzg51DBwv0XPKXOnSEpeg+JzJDl0hmhfZDBfVGn927BAkwu5WUj7hVr 27I5gwgufMFLcqPi3dmZQ6Z6tqoF X-Google-Smtp-Source: ANB0Vdbc798C8+KDVyxZCz5nQTZG9Epx2dPOpR16aNLLPs8eYUj0GAVIRcfsgAkhU6uhJSKfprsbDw== X-Received: by 2002:a7b:c096:: with SMTP id r22-v6mr10552235wmh.118.1537174893052; Mon, 17 Sep 2018 02:01:33 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id 142-v6sm5893463wme.35.2018.09.17.02.01.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 02:01:31 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Mon, 17 Sep 2018 10:01:24 +0100 Message-Id: <20180917090127.10541-1-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180831092029.4887-1-bluca@debian.org> References: <20180831092029.4887-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v3 1/4] build: include missing hypervisor files in Meson build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" They are built by the legacy makefiles but not by Meson. Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v3: added acked-by and cc stable lib/librte_eal/common/arch/arm/meson.build | 2 +- lib/librte_eal/common/arch/x86/meson.build | 2 +- lib/librte_eal/common/meson.build | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/arch/arm/meson.build b/lib/librte_eal/common/arch/arm/meson.build index c6bd92272b..79731e1a2c 100644 --- a/lib/librte_eal/common/arch/arm/meson.build +++ b/lib/librte_eal/common/arch/arm/meson.build @@ -2,4 +2,4 @@ # Copyright(c) 2017 Intel Corporation. eal_common_arch_sources = files('rte_cpuflags.c', - 'rte_cycles.c') + 'rte_cycles.c', 'rte_hypervisor.c') diff --git a/lib/librte_eal/common/arch/x86/meson.build b/lib/librte_eal/common/arch/x86/meson.build index 4e0f77900a..14bf204c6f 100644 --- a/lib/librte_eal/common/arch/x86/meson.build +++ b/lib/librte_eal/common/arch/x86/meson.build @@ -2,4 +2,4 @@ # Copyright(c) 2017 Intel Corporation eal_common_arch_sources = files('rte_spinlock.c', 'rte_cpuflags.c', - 'rte_cycles.c') + 'rte_cycles.c', 'rte_hypervisor.c') diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build index 56005bea80..b7fc984997 100644 --- a/lib/librte_eal/common/meson.build +++ b/lib/librte_eal/common/meson.build @@ -14,6 +14,7 @@ common_sources = files( 'eal_common_errno.c', 'eal_common_fbarray.c', 'eal_common_hexdump.c', + 'eal_common_hypervisor.c', 'eal_common_launch.c', 'eal_common_lcore.c', 'eal_common_log.c', @@ -59,6 +60,7 @@ common_headers = files( 'include/rte_errno.h', 'include/rte_fbarray.h', 'include/rte_hexdump.h', + 'include/rte_hypervisor.h', 'include/rte_interrupts.h', 'include/rte_keepalive.h', 'include/rte_launch.h', From patchwork Mon Sep 17 09:01:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44784 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A3D43772; Mon, 17 Sep 2018 11:01:38 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id DAC1F2B9A for ; Mon, 17 Sep 2018 11:01:35 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id e1-v6so16436016wrt.3 for ; Mon, 17 Sep 2018 02:01:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ezQ8ZrTJwQCTsZyDx6L5ZP3OezbldCIrhU4Wci5ZwkM=; b=ZNIcexBc3Dsx/EmqOwM9j3TZoZq2S97Pl8u/5dQS9cbfkFg2wFUhgpXPddFB4B8jaJ 52JsXe4VW6Mc8P5NB036jrzT2+6y1DRy+HGKYSSXG0OJCChO7wMizcCWyzTnt/EtWuKm AXd0m9DfmzQ7cu6/ApkY1jhc8hlju6yyAYMM5vouPRNx8xhXWk4VbwzkaiipkDlBHnFH 5s91POv4JatY4BbTRWd1SWuIoraZQ+zr8sKQ+z98Dot9JhXrftPu+bgmCn6HY3yW6/js Dqj5p2Xg5Z1L28c4JLPpe/21Vy1oGELgrpLNTQDEzY3DqbaEDQ2GiQDqRTtUd96/uxxE lkRg== X-Gm-Message-State: APzg51CItsw2CW8xfITQrgCUp/+CcizTLiT54X54xgztDtEhTCs54mFu 9/Tll+uh27MhTvmifq33BJ5KDs9z X-Google-Smtp-Source: ANB0VdayMicbk5MRoqW2Ce/06ycsYVcrU+LEe6MJzVfL72xWrByOcs/Peyx+CQw85hooDATvN76d6Q== X-Received: by 2002:adf:fc44:: with SMTP id e4-v6mr17994883wrs.9.1537174895225; Mon, 17 Sep 2018 02:01:35 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id f13-v6sm10111975wrt.9.2018.09.17.02.01.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 02:01:34 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Mon, 17 Sep 2018 10:01:25 +0100 Message-Id: <20180917090127.10541-2-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180917090127.10541-1-bluca@debian.org> References: <20180831092029.4887-1-bluca@debian.org> <20180917090127.10541-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v3 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" This PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used. Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v2: re-arranged flags v3: added acked-by and cc stable drivers/raw/ifpga_rawdev/base/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build index cb6553521d..03f5112caa 100644 --- a/drivers/raw/ifpga_rawdev/base/meson.build +++ b/drivers/raw/ifpga_rawdev/base/meson.build @@ -18,8 +18,8 @@ sources = [ ] error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', - '-Wno-format', '-Wno-unused-but-set-variable', - '-Wno-strict-aliasing' + '-Wno-format', '-Wno-error=format-security', + '-Wno-strict-aliasing', '-Wno-unused-but-set-variable' ] c_args = cflags foreach flag: error_cflags From patchwork Mon Sep 17 09:01:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44785 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09C524F93; Mon, 17 Sep 2018 11:01:40 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id A468A2E8F for ; Mon, 17 Sep 2018 11:01:37 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id k5-v6so16400908wre.10 for ; Mon, 17 Sep 2018 02:01:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9E7DKbGoLv1xctcF18qEMv75hXTt2Lu+hj8O64/1gWE=; b=drA+q+3OFlo3eNLVDy31ZErtxSgl/+0fmS2q0xQK7YrtJUj8++pjJKRLofuOT5Lokx qMNJzBmoufk5WU+30dOSG307eYUo7PL9DcFWwPpmPMwh3aAYXqGm3HOIuEiEMlidvv58 Em6jToP7xg0L2KdVnhGXhwCq4bMFiSm9+vo2hCcCP1szl5ejxnO9Og8wyvFlAzzC8hpd T0NupgWilY5Ep2FLKi9cLiBhm5wC8+hXqqnqbQYwn4upcxuSSt6a+Ht5fI3J7FhLrX8J +3bfPRquefkc15JnzXXmbVvQldeEr0SVdLByOCyHGExq1bbVoiu7bLL9vfockW7PxLRI Qrtg== X-Gm-Message-State: APzg51B5xkk8rm8kgHPXOqNWVGKUJNPH/ysqGkPnNx0ydHC90eNR1meJ 79h3gV3X2Ido3pxDSAojkwGdg8NQ X-Google-Smtp-Source: ANB0Vdb/kpsjTLxDolOb7F6oUaEwkGq8bf0w0q82HQUkilEMt3XNDxCVTRVe1dWhemUHrtBQClv37g== X-Received: by 2002:adf:ec85:: with SMTP id z5-v6mr18686476wrn.142.1537174896886; Mon, 17 Sep 2018 02:01:36 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id z184-v6sm9263320wmz.0.2018.09.17.02.01.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 02:01:35 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Mon, 17 Sep 2018 10:01:26 +0100 Message-Id: <20180917090127.10541-3-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180917090127.10541-1-bluca@debian.org> References: <20180831092029.4887-1-bluca@debian.org> <20180917090127.10541-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v3 3/4] build: use -Wno-error=format-security for Meson i40e build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" This PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used. Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v2: re-arranged flags v3: added acked-by and cc stable drivers/net/i40e/base/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build index 401a1477fa..e6163eaa6c 100644 --- a/drivers/net/i40e/base/meson.build +++ b/drivers/net/i40e/base/meson.build @@ -12,8 +12,8 @@ sources = [ ] error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', - '-Wno-format', '-Wno-unused-but-set-variable', - '-Wno-strict-aliasing' + '-Wno-format', '-Wno-error=format-security', + '-Wno-strict-aliasing', '-Wno-unused-but-set-variable' ] c_args = cflags foreach flag: error_cflags From patchwork Mon Sep 17 09:01:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44786 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A77C6532C; Mon, 17 Sep 2018 11:01:41 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 5236B4F90 for ; Mon, 17 Sep 2018 11:01:39 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id y2-v6so8610662wma.1 for ; Mon, 17 Sep 2018 02:01:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qJizT7hOopAIvYb1MR87UjqkZl6Y0iFmD8hN3w3JYUs=; b=FZ7akuUunka8E/ZeSl8DsPhT3ZfQLoNyC/wpG8I5jeFyau0fvtV34F7aXvW6c+gxAC E5dqc4knDRzETfDJ0NOAqez4MM/vVV4CNIdnQs5JQ33P5x8v6YENHY1Yt0gpaA13a8Ku AxIVmvD11ySCzvgr5usrYfkvdADNcYDdwqTUIYhRjpNFktzPuCUhBAb/1naxWKYkLjbT sz0LRLSqmFe60SN8V92U2jLYSQthDLYl2SETXMOEzzoUDD9TdwXlWdWo2PnRBMSPO27O RV+/59vpUb9IJFnlPbvxVWH0pqWJXD2gp1qzYvCfZfF3SbnHT+jisDJo+LAK2dGosEoh PFyA== X-Gm-Message-State: APzg51BdhoNUN+2oo5GJnYFN0MaKx1HjH9TSXA/1aUgIQsyCxi9DOrPM bLmsBEJV3XIBNMgshJPjd1G8PyWW X-Google-Smtp-Source: ANB0VdbvrvWD+0TKc+fJOp8hfPoMxONLLmmJik+ctUoU/+ALsdJCepLa+PfwTx/KEtcssHgSBPYXEg== X-Received: by 2002:a1c:b441:: with SMTP id d62-v6mr10434898wmf.17.1537174898652; Mon, 17 Sep 2018 02:01:38 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id z14-v6sm5399477wma.18.2018.09.17.02.01.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 02:01:37 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Mon, 17 Sep 2018 10:01:27 +0100 Message-Id: <20180917090127.10541-4-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180917090127.10541-1-bluca@debian.org> References: <20180831092029.4887-1-bluca@debian.org> <20180917090127.10541-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v3 4/4] build: install igb_uio kernel module when building with Meson X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something like: /lib/modules/$kver/build, so this directory will match the default one used by legacy makefiles. Fixes: a52f4574f798 ("igb_uio: build with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v2: fixed DEST_DIR in option help text v3: added acked-by and cc stable kernel/linux/igb_uio/meson.build | 2 ++ meson_options.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build index 71ed2e7a85..f5a9d5ccf3 100644 --- a/kernel/linux/igb_uio/meson.build +++ b/kernel/linux/igb_uio/meson.build @@ -15,4 +15,6 @@ custom_target('igb_uio', '/../../../lib/librte_eal/common/include', 'modules'], depends: mkfile, + install: true, + install_dir: kernel_dir + '/../extra/dpdk', build_by_default: get_option('enable_kmods')) diff --git a/meson_options.txt b/meson_options.txt index c843278587..f20887212a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,7 +7,7 @@ option('examples', type: 'string', value: '', 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') + description: 'path to the kernel for building kernel modules, they 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',