From patchwork Fri Aug 31 10:41:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44090 X-Patchwork-Delegate: thomas@monjalon.net 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 3E4E82C55; Fri, 31 Aug 2018 12:42:05 +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 CA1F12BA3 for ; Fri, 31 Aug 2018 12:42:03 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id k5-v6so10766212wre.10 for ; Fri, 31 Aug 2018 03:42:03 -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=bezq+qAAoXmiSLnZSK9TUANj2czI2m6fOmg7Z7/79fk=; b=D0AlYIUw0mWV2InX0XJBqur08BUh0eIve/+cceDwTRflhteIlMjTMjHHBsvr1gt4Yg ZyMDBcj5ce7lzV8M4xFOiHS3SBkllvk3mh0Lshbt271i7GgWmYEbk9aIcCnijYpx8jUn V+oR6L6iBvyY4qsgcpDhygllwXYiqKq1gs4Og9yxh89VymOUuotOEP7j2bhoPNziNS+c M+9OEzkXJKM7Qm6kB+Nc6v6zXOHzb/kpEskyag+NoTrw5/EKeHObdA2qZZxrisxldry3 jrEPGOYtwlobjFr0xUjgwJ6oiUDyDq/imk4lFda5BApQEMzlmHKHJI0KAtSm+vz2avEq 6yRA== X-Gm-Message-State: APzg51AMdTqD09qDwpm+F2AH/fV7FX6FxFuKKXw9So1y8YgsdVyn1nzr k1/48pBhm9Mm3qG9ZscKjQPN5k1q X-Google-Smtp-Source: ANB0Vdb50dZmCK5aDrNs3VzuIYY0skfb+3smr15XJPMNiwUOGo1GoPyKLCYMjHAVxgvYBKZaX9FXTA== X-Received: by 2002:adf:9b9b:: with SMTP id d27-v6mr10621475wrc.240.1535712123189; Fri, 31 Aug 2018 03:42:03 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id j6-v6sm8915221wrq.25.2018.08.31.03.42.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 03:42:02 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 11:41:51 +0100 Message-Id: <20180831104154.20938-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 v2 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 Acked-by: Bruce Richardson --- 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 10:41:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44091 X-Patchwork-Delegate: thomas@monjalon.net 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 951CD4CAF; Fri, 31 Aug 2018 12:42:07 +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 98F534C90 for ; Fri, 31 Aug 2018 12:42:05 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id k5-v6so10766291wre.10 for ; Fri, 31 Aug 2018 03:42:05 -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=9udFNtb9ptxt8NK3bKIVkw3TfSU1z6f2reEPvNy/wr0=; b=tWjn6iK16xVIQosGfsK/YfymOj3P7o4vOKS96MWTME6x3AmkNIkB59/lI25Cd22WfC fUMdyIsDzT1mkuiMf0fdnlc7NtBGoQHtcAFysFNaxCCEG2jGp3Kbcad5dxwqTVJjQXll c/XjuLqRBv0M1t7q1mdIA9uWRFxxEH73gGJCk9bX/wPjis+EEENUoODK6VNs5L8xbJ+n Fb6PdAf5qiCgYlX5inLgVEeegcrVuCKduMFPTKrPF0eygZE0p0oKUCkTSFdBsLiDVPSt /tYqrxcb6yUR7YRF+JQE+Pw1ZajSyMEawQExQvYgWq2s/KERLzuMk//EHLjqQ/X1P3vE jQzA== X-Gm-Message-State: APzg51Bz39Hcd8a2aVBMV7GnPPpv7Pd6NkysTjtCOZQq5hu7ljBuGK1k TOK+ODr5o5oxZd+r5Ab12w1MUd4s X-Google-Smtp-Source: ANB0VdaUA/XxuzG1sKQRIcafTW5ZMxUoTBbLK2DbeO5lTjjMQ46v0hvIqo82qotq8KLGumOMA8iD8A== X-Received: by 2002:adf:bacf:: with SMTP id w15-v6mr11004473wrg.203.1535712124958; Fri, 31 Aug 2018 03:42:04 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id v6-v6sm9202216wro.66.2018.08.31.03.42.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 03:42:03 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 11:41:52 +0100 Message-Id: <20180831104154.20938-2-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180831104154.20938-1-bluca@debian.org> References: <20180831092029.4887-1-bluca@debian.org> <20180831104154.20938-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v2 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 Acked-by: Bruce Richardson --- v2: re-arranged flags 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 Fri Aug 31 10:41:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44092 X-Patchwork-Delegate: thomas@monjalon.net 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 8B8954CBB; Fri, 31 Aug 2018 12:42:09 +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 41E3F4CA9 for ; Fri, 31 Aug 2018 12:42:07 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id m27-v6so10786587wrf.3 for ; Fri, 31 Aug 2018 03:42:07 -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=OF14RhXohn5FF7//KDYUa0rBLwX+Bd2AtmGxTLfT7sY=; b=EQtVwxVYao9QP6XEBgBm/tMlONiAzFk8oF0+NqzGVG819bw5/TsdYnzFIgdBn48ct+ BDx2ZyJ+lqzd2LOoDwKJ/QSgXDGXkbk2d7b6eYeT6VTBtOZCG27smFPZ5WDtYt5j1Mi9 KloNdL1GTEJhHv9c2xkCuQfAuKBxHF1W33/c+VcW36Z5O466DirHIsNiEoZf1FWa29tb 4BVNfhyB/ax9mp52oiI6wUXRE5rMFoz1SBiCeWrvqpwneZ9Oav683Oo1glt8Q6UdmJSC 3UtMC6tkyx9E1J3rZOOZLbKMzGK5xsVec2VHI5BaKmaUwVzYwdV/c5+2fXaMJ5uw3aI4 Hf+A== X-Gm-Message-State: APzg51BtpOu2MBgCRUHI95ODpG9QsvBdq14bZc+6KAZSDU1mJWJTEae6 K9RERXEsbwzVmQ0zBn2MdUClcP5I X-Google-Smtp-Source: ANB0Vda3gZuVqRSFiZ7zTQ5x1+bnfWWsNZJqklDThrv+8BSHit4TzEIchyaDmy0/4mAoFBylcDHYDg== X-Received: by 2002:a5d:51cf:: with SMTP id n15-v6mr11007906wrv.107.1535712126671; Fri, 31 Aug 2018 03:42:06 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id w4-v6sm9623447wro.24.2018.08.31.03.42.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 03:42:05 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 11:41:53 +0100 Message-Id: <20180831104154.20938-3-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180831104154.20938-1-bluca@debian.org> References: <20180831092029.4887-1-bluca@debian.org> <20180831104154.20938-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v2 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 Acked-by: Bruce Richardson --- v2: re-arranged flags 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 Fri Aug 31 10:41:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44093 X-Patchwork-Delegate: thomas@monjalon.net 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 06A474CC3; Fri, 31 Aug 2018 12:42:11 +0200 (CEST) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 324B04C9C for ; Fri, 31 Aug 2018 12:42:09 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id o18-v6so4903125wmc.0 for ; Fri, 31 Aug 2018 03:42:09 -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=R69svp0JPT4/JeMX49lJ8f2JlM7mQotedtUt0cl4KhQ=; b=GQEc220h+/6M8IKvPKwRqfLTokPloulirAF/Xj9AyV96yI+5hAc+XPOSgeq0zc8i6w iVf/WyMslLFhXTiMngdu/GuBDpdSjXgh19lgCTKLPnHrpeiXwflsQV2qiB3umpWK4xY5 MQTjlyJsHi1koSKz79V2wDuqoyX9ElikWcuzOl8Mizw0DkN5J0QJu668EkzuPLc6oDxx XtbH6uMCa8oXUFnKj0oxuwlFo4BGyVtwv8K+7gfptJXqo1jwcltHLLfoFUqZV1ARinJ4 Bvd121gYrs3vHmRw2FU+zwTMh+n21bKcIPxDN6DFaetT00LW/BPBBkHlS0Mjk26mz12G txMQ== X-Gm-Message-State: APzg51BlE6XyCWmWFhUEvwDU/H+x+MRakaUqIrUYbVgz3PehRpirwDdk qBOB99CaIamBtPCtrxhQWTO/tRXf X-Google-Smtp-Source: ANB0VdY8Qfa2cwcUFSN0vVqQwG7GXtI8mYpW3BMnuRDXKtLKZGdZKmKtnEvATj4LhhVuoDPjcws/XA== X-Received: by 2002:a1c:48d:: with SMTP id 135-v6mr4586296wme.128.1535712128391; Fri, 31 Aug 2018 03:42:08 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id z184-v6sm4954566wmz.0.2018.08.31.03.42.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Aug 2018 03:42:07 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com Date: Fri, 31 Aug 2018 11:41:54 +0100 Message-Id: <20180831104154.20938-4-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180831104154.20938-1-bluca@debian.org> References: <20180831092029.4887-1-bluca@debian.org> <20180831104154.20938-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v2 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 Acked-by: Bruce Richardson --- v2: fixed DEST_DIR in option help text 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',