From patchwork Fri Aug 31 09:20: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: 44076 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 7205B2C55; Fri, 31 Aug 2018 11:20:43 +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 943082BA3 for ; Fri, 31 Aug 2018 11:20:41 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id u12-v6so10535995wrr.4 for ; Fri, 31 Aug 2018 02:20:41 -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; bh=bezq+qAAoXmiSLnZSK9TUANj2czI2m6fOmg7Z7/79fk=; b=q2bA37n2map4slZ7somLwrANsKWQMd08M/NLSGcskTKzhIb1ssF/c1F5P+r42GOtya Usq6nnzGII4OiuC3d+B08f4/jezNqGcQtlngcSNe5HJNYlSQA4aQcBfl6VJ1w1CQQR6x i8aYUUmPkmAa8MgaXHVNeppWV5PHKx9doC9Y2OY4A5QOMulyUt6OABqBOgONod+4zfGL zUQxWE+KVyqbfwSo5VQIxZS8gLHL22mc2oJvYSQAJdIvZQfE3D9y+7DgJxsgeWGtoRP9 dXE2GQq6tj8u3r4tFGGaULXqaHb/mlJb3Xcj1aRbFSqrsy7d6eEL2YmtUrgqb8kpJNnW wuog== X-Gm-Message-State: APzg51DghQj8KZ5bCvWTmjN+RgC0On4V7vdxTqT1dI7LkXR4e+szX8v6 V7Y9v5II7L4TaTOVBuF5Upogk1wQ X-Google-Smtp-Source: ANB0VdbrKcUFAnnaesSIM7/P41bkHf80C1wVVW7W+y71Vo1irKdjwuoFFCJYXyCUOZz504e8oEsCxw== X-Received: by 2002:adf:d245:: with SMTP id o5-v6mr10025649wri.91.1535707240920; Fri, 31 Aug 2018 02:20:40 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id x125-v6sm4926019wmg.27.2018.08.31.02.20.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 02:20:39 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 10:20:26 +0100 Message-Id: <20180831092029.4887-1-bluca@debian.org> X-Mailer: git-send-email 2.18.0 Subject: [dpdk-dev] [PATCH 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") Signed-off-by: Luca Boccassi --- 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 Fri Aug 31 09:20: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: 44077 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 A65E34CAD; Fri, 31 Aug 2018 11:20:45 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 031002BA3 for ; Fri, 31 Aug 2018 11:20:43 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id o37-v6so10547348wrf.6 for ; Fri, 31 Aug 2018 02:20:42 -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=3tk8YEsC8OR6VURBUNTsvzUJt4efALY1zGMyPKxup0c=; b=QM5tOyfCIdLzb7DFi01o31YU/asURjl+h0yB2cSzkdF7iBwWALwj7ixa32eWmDFyn1 dkwmOZRlhDgwVPE6M9c8VtzuVgLgTFHKhhXJb0k8SB6yumyHAYukqNvGln1EdnbFDxCJ G/vEbGyPjxiUBX0UPMaMo5A8MwyCbvnAtKkLtvyQhSM0vfOK/Swz02fCVZZGFIJLnN+B SfqMmUlPoXigFW0d94Wa9HKpS8I9QHAVCeP58AkZ05qUnp22D9grhz8bJ0X/NnuFgU3n DlNFQHqLvYJYE6D1Kxxt7OPPq2hnczK2gLMB5KsKCSSiBsWTJLmchXGhMtkNdImPAJVB hn/g== X-Gm-Message-State: APzg51BZl+tv8ajZatCRQrC3Qvg987PpMH8RU3Kogyqq8aj/DcNoEYBD +zdgPJHkkd/cVCKbhXNqk8cNbmxl X-Google-Smtp-Source: ANB0VdZUae4qjQcAoAPxmXxozHzxDSEj5XNJWo+PIdz4CAtuF7/OL5PoRRxNxvLY79qxqwsAKBWp0g== X-Received: by 2002:adf:9142:: with SMTP id j60-v6mr10308104wrj.180.1535707242518; Fri, 31 Aug 2018 02:20:42 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id c3-v6sm13179302wrm.56.2018.08.31.02.20.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 02:20:41 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 10:20:27 +0100 Message-Id: <20180831092029.4887-2-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 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") Signed-off-by: Luca Boccassi --- drivers/raw/ifpga_rawdev/base/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build index cb6553521d..aadfc19084 100644 --- a/drivers/raw/ifpga_rawdev/base/meson.build +++ b/drivers/raw/ifpga_rawdev/base/meson.build @@ -19,7 +19,7 @@ sources = [ error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', '-Wno-format', '-Wno-unused-but-set-variable', - '-Wno-strict-aliasing' + '-Wno-strict-aliasing', '-Wno-error=format-security' ] c_args = cflags foreach flag: error_cflags From patchwork Fri Aug 31 09:20:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44078 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 A434A4CBB; Fri, 31 Aug 2018 11:20:47 +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 A99314C99 for ; Fri, 31 Aug 2018 11:20:44 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id o37-v6so10547418wrf.6 for ; Fri, 31 Aug 2018 02:20:44 -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=8NK4ayOBTipS4yUxeOqCjmV+SO0HqkX98DqVzmOuzN8=; b=iiDfRbJhwhEXD1CNfx//ZgtuyS57v4o2oxo26DwuP/SJH+JAn10Mnx8kpfZ43piKik 5B2hmzZKRwVuh/wGfQyJGJliaChJRhysyxln6AfVrJuS6XM72LdlGbmTM3KRoDXNTNJs 9qwbogzkUjnU/Ot4U2TnaYr4X4FeW1JpZ25PL/MlbsJ5t/TwLjOOI7cObvKYsfXYxaZH LjML93YwGhw2A5lEZmvhc9Cr5pE7eJoW6uxDqTtgv6kkCfzwJRNXVFWOdJB85LRKBeMh UkcpWKgdH1g4g3M9skP3qiJvx9YGg1D8Z3tDgVpSdDhQsWwXU+o+jYHg6tCPBtBvMF1b RBPQ== X-Gm-Message-State: APzg51DiSU+C2+L5UQByqxYFyrtf+ZLTkRNrDHatYjveGw9yzbB6r8QT +mVmYAyJ6aBrYfLONnT/wPW/p/SC X-Google-Smtp-Source: ANB0Vdbb3UbJ9nFgvXveKS3c0rzAW5yReQuh4zf8ev6m+qOoIn6qRI4k+2FRKCyjUB0/vqcqipNPCw== X-Received: by 2002:adf:9a46:: with SMTP id z64-v6mr9875118wrb.109.1535707244073; Fri, 31 Aug 2018 02:20:44 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id s24-v6sm2979622wmc.7.2018.08.31.02.20.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 02:20:43 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 10:20:28 +0100 Message-Id: <20180831092029.4887-3-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 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") Signed-off-by: Luca Boccassi --- drivers/net/i40e/base/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build index 401a1477fa..50bd4704e6 100644 --- a/drivers/net/i40e/base/meson.build +++ b/drivers/net/i40e/base/meson.build @@ -13,7 +13,7 @@ sources = [ error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', '-Wno-format', '-Wno-unused-but-set-variable', - '-Wno-strict-aliasing' + '-Wno-strict-aliasing', '-Wno-error=format-security' ] c_args = cflags foreach flag: error_cflags From patchwork Fri Aug 31 09:20:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44079 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 49DB64CE4; Fri, 31 Aug 2018 11:20:49 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 4E35D4CB3 for ; Fri, 31 Aug 2018 11:20:46 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id 20-v6so10536431wrb.12 for ; Fri, 31 Aug 2018 02:20:46 -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=MRFyTZqLXBDJZK9ywjfMGo7nx3nYSI/ZqPVidcrpca0=; b=F7xpXwrLABcuNnm2MDOxEVC5m3ShPVfqwCtuKLgA/tXyyTcT00+jKmBGY87AnQ5blt u7e4NdswucftX2yABX+NiKPY8db6ndQhIMmjEAOVVNrXpaFs4lx4DOXYbSXC9TjKPvpN kbvbQ+XbOI03wgZLyHLVy9UeM6tp/Pc3wU5runA5O/wspsG31xm4B+FNMfzv1ApIPLHP sZMKbYruxh3OCYlNqSLQXbWkUD6rcdSnlXJ2W6H216dCZ6BjvEPN+poKTQIQNxV9Ldv/ g+FVLLCJp+JAPo3L3oYzgr1RuIKVFARrls1xxZSy1LANk6U/vmMbicK4b4nsDhBooTPz imnQ== X-Gm-Message-State: APzg51Bgekb52FzmTMm7fsaTqdqYN+FWXzKkfY5IK2WZMirgs0KBzj8m wX8YzYOa4pDszaPWYXhpSHjVoYDo X-Google-Smtp-Source: ANB0VdbuLEnWnkhLj24ACnQSmfQJarxIvFDuHcgm46YWsIXruIZwUzPSQuOiJqCTtjIi2qD92ZNdJw== X-Received: by 2002:adf:f28c:: with SMTP id k12-v6mr10608608wro.263.1535707245696; Fri, 31 Aug 2018 02:20:45 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id w18-v6sm17786208wrc.38.2018.08.31.02.20.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 02:20:44 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 10:20:29 +0100 Message-Id: <20180831092029.4887-4-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 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") Signed-off-by: Luca Boccassi --- 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..f452986da3 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 $prefix/$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',