From patchwork Wed Feb 5 13:47:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Redaelli X-Patchwork-Id: 65590 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C0740A04FA; Wed, 5 Feb 2020 14:47:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 96DB11C1F5; Wed, 5 Feb 2020 14:47:21 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id BAFB11C1D4 for ; Wed, 5 Feb 2020 14:47:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580910439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w729bHruMM2rDKhrzY/8PDkJ/ZQgMNBWfdBk6gL56sM=; b=EZEKTnZ6DsS8pQ/qot3L4aYGtbgknwaqU6qy5XiYv2l9tVnbGmi0WFd8hub/WNc1DPU/BM zxxBmZmtarsFpa2g03+KRqbjR6DwDcoRIhtAfD4MaiAXXDsYfAdxkpYjgpe50mJ5713yCf jrechHtxmEl5XvzTfzl7+Ny4q/Yrd0k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-41-i8BrFtaoNSyP7aXeTWyZ1w-1; Wed, 05 Feb 2020 08:47:15 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 191D08B5E4F; Wed, 5 Feb 2020 13:47:14 +0000 (UTC) Received: from aldebaran.drizzt.lan (dhcp19-189-71.ntdv.lab.eng.bos.redhat.com [10.19.189.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8AD5857B7; Wed, 5 Feb 2020 13:47:12 +0000 (UTC) From: Timothy Redaelli To: dev@dpdk.org Cc: stable@dpdk.org, jin.yu@intel.com Date: Wed, 5 Feb 2020 14:47:03 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: i8BrFtaoNSyP7aXeTWyZ1w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 1/3] examples/vhost_blk: fix building with GCC 10 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" GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: c19beb3f38cd ("examples/vhost_blk: introduce vhost storage sample") Cc: jin.yu@intel.com Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Reviewed-by: Maxime Coquelin --- examples/vhost_blk/vhost_blk.c | 2 ++ examples/vhost_blk/vhost_blk.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c index e1036bf3a..143ae19f3 100644 --- a/examples/vhost_blk/vhost_blk.c +++ b/examples/vhost_blk/vhost_blk.c @@ -31,6 +31,8 @@ (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) +struct vhost_blk_ctrlr *g_vhost_ctrlr; + /* Path to folder where character device will be created. Can be set by user. */ static char dev_pathname[PATH_MAX] = ""; static sem_t exit_sem; diff --git a/examples/vhost_blk/vhost_blk.h b/examples/vhost_blk/vhost_blk.h index 933e2b7c5..17258d284 100644 --- a/examples/vhost_blk/vhost_blk.h +++ b/examples/vhost_blk/vhost_blk.h @@ -112,8 +112,8 @@ struct inflight_blk_task { struct rte_vhost_inflight_info_packed *inflight_packed; }; -struct vhost_blk_ctrlr *g_vhost_ctrlr; -struct vhost_device_ops vhost_blk_device_ops; +extern struct vhost_blk_ctrlr *g_vhost_ctrlr; +extern struct vhost_device_ops vhost_blk_device_ops; int vhost_bdev_process_blk_commands(struct vhost_block_dev *bdev, struct vhost_blk_task *task); From patchwork Wed Feb 5 17:05:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Redaelli X-Patchwork-Id: 65597 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3271CA04FA; Wed, 5 Feb 2020 18:06:29 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ACEBC1C2F3; Wed, 5 Feb 2020 18:06:28 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id DFEB81C2F1 for ; Wed, 5 Feb 2020 18:06:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580922387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E4MI3hl3hL8ZwLTgL1FCvBjWkblwzCVhO7xqiL8IND0=; b=DrFay6tkBij2nUC/cWhX8wOM7PZjzaqaJzbhKUmw5CRiatsgJ5yWn6u4tEOEpXAnGl6Fi7 lqtzejzBi+uutrSStKKAkSBn4T5HQ0mofnPv55ziV/cadCvw2lnVMoztLPt1ODnYEwLl6E /rDpatEh6HPxMA0uzOka7OXo4azBB8Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-311-4V7VWSraMoiUMm91YAL-aA-1; Wed, 05 Feb 2020 12:06:21 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CBB8F801A32; Wed, 5 Feb 2020 17:06:20 +0000 (UTC) Received: from aldebaran.drizzt.lan (dhcp19-189-71.ntdv.lab.eng.bos.redhat.com [10.19.189.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id A29F14FA9; Wed, 5 Feb 2020 17:06:19 +0000 (UTC) From: Timothy Redaelli To: dev@dpdk.org Cc: stable@dpdk.org, pbhagavatula@marvell.com Date: Wed, 5 Feb 2020 18:05:45 +0100 Message-Id: <937ee5d7d86bfb647997ac0fa695b19b8270e18e.1580921206.git.tredaelli@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: 4V7VWSraMoiUMm91YAL-aA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 2/3] examples/eventdev_pipeline: fix building with GCC 10 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" Fixes: 3d1b33e44ae2 ("examples/eventdev: move common data into pipeline common") Cc: pbhagavatula@marvell.com Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli --- examples/eventdev_pipeline/main.c | 2 ++ examples/eventdev_pipeline/pipeline_common.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/eventdev_pipeline/main.c b/examples/eventdev_pipeline/main.c index d3ff1bbe4..d0da51b1c 100644 --- a/examples/eventdev_pipeline/main.c +++ b/examples/eventdev_pipeline/main.c @@ -10,6 +10,8 @@ #include "pipeline_common.h" +struct fastpath_data *fdata; + struct config_data cdata = { .num_packets = (1L << 25), /* do ~32M packets */ .num_fids = 512, diff --git a/examples/eventdev_pipeline/pipeline_common.h b/examples/eventdev_pipeline/pipeline_common.h index 8e30393d0..c7245f7f0 100644 --- a/examples/eventdev_pipeline/pipeline_common.h +++ b/examples/eventdev_pipeline/pipeline_common.h @@ -93,8 +93,8 @@ struct port_link { uint8_t priority; }; -struct fastpath_data *fdata; -struct config_data cdata; +extern struct fastpath_data *fdata; +extern struct config_data cdata; static __rte_always_inline void exchange_mac(struct rte_mbuf *m) From patchwork Wed Feb 5 14:12:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Redaelli X-Patchwork-Id: 65591 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1A030A0530; Wed, 5 Feb 2020 15:12:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BDF641C1A2; Wed, 5 Feb 2020 15:12:32 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id BC6931C133 for ; Wed, 5 Feb 2020 15:12:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580911950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2KvFJ60fkRY9tFb84PiAoF4Zx6PMfEtuKc1uGhPhPIo=; b=EFjKA5cnOaAet+aL4956wgjJKsTYng+eh0Zy1mEOhprWxkE/Qq8IPXWS0hXV4oTJSzoPvB fmVDPE45LXY41SnY0mUWKmSIsbiJIuax3CogDCY/nMdPqVo62p9SL86WJpimOVCmgKNPN7 V3vvzjyjKfc6zDxy73tGZ8559EpDVEk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-ScwWc-0FNVus-vF8qhVlvw-1; Wed, 05 Feb 2020 09:12:26 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA89E802560; Wed, 5 Feb 2020 14:12:25 +0000 (UTC) Received: from aldebaran.drizzt.lan (dhcp19-189-71.ntdv.lab.eng.bos.redhat.com [10.19.189.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0B9A60BF7; Wed, 5 Feb 2020 14:12:21 +0000 (UTC) From: Timothy Redaelli To: stable@dpdk.org Cc: dev@dpdk.org, david.marchand@redhat.com, cristian.dumitrescu@intel.com Date: Wed, 5 Feb 2020 15:12:20 +0100 Message-Id: <5de9fca287dbda831bbe11e34ecf89631e3a812f.1580911676.git.tredaelli@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: ScwWc-0FNVus-vF8qhVlvw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v2 3/3] app/test-pipeline: fix building with GCC 10 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" GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: 48f31ca50cc4 ("app/pipeline: packet framework benchmark") Cc: cristian.dumitrescu@intel.com Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Acked-by: Cristian Dumitrescu --- v2: app is already declared as extern in main.h. (as reported by David) --- app/test-pipeline/config.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/test-pipeline/config.c b/app/test-pipeline/config.c index 28ac9fcc0..33f3f1c82 100644 --- a/app/test-pipeline/config.c +++ b/app/test-pipeline/config.c @@ -42,8 +42,6 @@ #include "main.h" -struct app_params app; - static const char usage[] = "\n"; void