From patchwork Wed Oct 20 06:59:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 102340 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EC84CA0C45; Wed, 20 Oct 2021 09:00:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6717740E6E; Wed, 20 Oct 2021 09:00:04 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D5D7C40142 for ; Wed, 20 Oct 2021 09:00:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634713202; 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; bh=d9USp4o4XFTz4Nl6nXkx/z/W+YBy785tcbf92W3cyKU=; b=YApaAPA00UWF4iMtHcmgYhpW4/vdGduHTNpfZ06e1xzcWUcCVFHsd2A0tB/8ZUVpZeyv1J 1nOTt+SAUWTdB3BHalfpTvnKOBQwRUkULHcJKaqMx3SA4R037s/Z2gv0z6n8xDIQJJugVv iahFpo7wVPPviMaBtRoL+hle/iC0Toc= 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-476-XNOj3GFWPJ26_nE2yu1JTg-1; Wed, 20 Oct 2021 02:59:59 -0400 X-MC-Unique: XNOj3GFWPJ26_nE2yu1JTg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DB95C1006AA4; Wed, 20 Oct 2021 06:59:57 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AB1C62A41; Wed, 20 Oct 2021 06:59:55 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Chengwen Feng , Ray Kinsella Date: Wed, 20 Oct 2021 08:59:43 +0200 Message-Id: <20211020065944.19617-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 1/2] dmadev: hide devices array 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" No need to expose rte_dma_devices out of the dmadev library. Existing helpers should be enough, and inlines make use of rte_dma_fp_objs. Signed-off-by: David Marchand Reviewed-by: Chengwen Feng Tested-by: Conor Walsh --- app/test/test_dmadev.c | 5 +++-- lib/dmadev/rte_dmadev.c | 2 +- lib/dmadev/rte_dmadev_pmd.h | 2 -- lib/dmadev/version.map | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c index 1e327bd45f..8b58256afc 100644 --- a/app/test/test_dmadev.c +++ b/app/test/test_dmadev.c @@ -747,10 +747,11 @@ test_dmadev_instance(int16_t dev_id) }; const int vchan = 0; + rte_dma_info_get(dev_id, &info); + printf("\n### Test dmadev instance %u [%s]\n", - dev_id, rte_dma_devices[dev_id].data->dev_name); + dev_id, info.dev_name); - rte_dma_info_get(dev_id, &info); if (info.max_vchans < 1) ERR_RETURN("Error, no channels available on device id %u\n", dev_id); diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c index 182d32aedb..d4b32b2971 100644 --- a/lib/dmadev/rte_dmadev.c +++ b/lib/dmadev/rte_dmadev.c @@ -18,7 +18,7 @@ static int16_t dma_devices_max; struct rte_dma_fp_object *rte_dma_fp_objs; -struct rte_dma_dev *rte_dma_devices; +static struct rte_dma_dev *rte_dma_devices; static struct { /* Hold the dev_max information of the primary process. This field is * set by the primary process and is read by the secondary process. diff --git a/lib/dmadev/rte_dmadev_pmd.h b/lib/dmadev/rte_dmadev_pmd.h index b97b5bf10b..5316ad5b5f 100644 --- a/lib/dmadev/rte_dmadev_pmd.h +++ b/lib/dmadev/rte_dmadev_pmd.h @@ -131,8 +131,6 @@ struct rte_dma_dev { uint64_t reserved[2]; /**< Reserved for future fields. */ } __rte_cache_aligned; -extern struct rte_dma_dev *rte_dma_devices; - /** * @internal * Allocate a new dmadev slot for an DMA device and return the pointer to that diff --git a/lib/dmadev/version.map b/lib/dmadev/version.map index ef561acd46..89f7a5b1d3 100644 --- a/lib/dmadev/version.map +++ b/lib/dmadev/version.map @@ -30,7 +30,6 @@ EXPERIMENTAL { INTERNAL { global: - rte_dma_devices; rte_dma_fp_objs; rte_dma_pmd_allocate; rte_dma_pmd_release; From patchwork Wed Oct 20 06:59:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 102341 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 758CCA0C45; Wed, 20 Oct 2021 09:00:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6499840687; Wed, 20 Oct 2021 09:00:16 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id CA56A40142 for ; Wed, 20 Oct 2021 09:00:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634713214; 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=Fk7Mw/GOmS4G7HprAai2ho3jE0a7o1IX9bG8kZFO8Yk=; b=cqfSVllTP6dEIjue1WVmo0MOa8KeokgLX4YtLC8kKNFxmMe6ZoQkxyOvJFpoLXDrcUTio7 YJy58NhqSS5CRTcgobKG9kTIsZg+kbQI0/m/ptmqgdPkFTD380F1nYuIUSqkTeyKREp4AY zP9NU8rdcjupQLecXKRrca78RwuuCoA= 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-406-3Rl4XUMzPQmnhTcNwesh3w-1; Wed, 20 Oct 2021 03:00:10 -0400 X-MC-Unique: 3Rl4XUMzPQmnhTcNwesh3w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC5151800D41; Wed, 20 Oct 2021 07:00:08 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id D19606A914; Wed, 20 Oct 2021 07:00:05 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: bruce.richardson@intel.com, Ray Kinsella , Chengwen Feng , =?utf-8?q?Morten_Br=C3=B8rup?= , Kevin Laatz , Conor Walsh Date: Wed, 20 Oct 2021 08:59:44 +0200 Message-Id: <20211020065944.19617-2-david.marchand@redhat.com> In-Reply-To: <20211020065944.19617-1-david.marchand@redhat.com> References: <20211020065944.19617-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 2/2] dmadev: remove symbol versioning for inline helpers 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" Inline helpers have no global symbols in shared libraries. There is no reason to ask for versioning (plus this library would not build on Windows). Fixes: 91e581e5c924 ("dmadev: add data plane API") Fixes: ea8cf0f8536d ("dmadev: add burst capacity API") Signed-off-by: David Marchand Acked-by: Bruce Richardson --- lib/dmadev/version.map | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/dmadev/version.map b/lib/dmadev/version.map index 89f7a5b1d3..7031d6b335 100644 --- a/lib/dmadev/version.map +++ b/lib/dmadev/version.map @@ -1,17 +1,11 @@ EXPERIMENTAL { global: - rte_dma_burst_capacity; rte_dma_close; - rte_dma_completed; - rte_dma_completed_status; rte_dma_configure; - rte_dma_copy; - rte_dma_copy_sg; rte_dma_count_avail; rte_dma_dev_max; rte_dma_dump; - rte_dma_fill; rte_dma_get_dev_id_by_name; rte_dma_info_get; rte_dma_is_valid; @@ -20,7 +14,6 @@ EXPERIMENTAL { rte_dma_stats_get; rte_dma_stats_reset; rte_dma_stop; - rte_dma_submit; rte_dma_vchan_setup; rte_dma_vchan_status; From patchwork Thu Oct 21 12:59:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 102590 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 893D0A0C4E; Thu, 21 Oct 2021 15:04:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47F81411FE; Thu, 21 Oct 2021 15:04:16 +0200 (CEST) Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by mails.dpdk.org (Postfix) with ESMTP id 96CD0411FB for ; Thu, 21 Oct 2021 15:04:14 +0200 (CEST) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4HZnhb4L7cz8tkW; Thu, 21 Oct 2021 21:02:55 +0800 (CST) Received: from dggpeml500024.china.huawei.com (7.185.36.10) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Thu, 21 Oct 2021 21:04:11 +0800 Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Thu, 21 Oct 2021 21:04:10 +0800 From: Chengwen Feng To: CC: , , , , Date: Thu, 21 Oct 2021 20:59:38 +0800 Message-ID: <20211021125938.52401-3-fengchengwen@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021125938.52401-1-fengchengwen@huawei.com> References: <20211020065944.19617-1-david.marchand@redhat.com> <20211021125938.52401-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500024.china.huawei.com (7.185.36.10) X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH v2 3/3] dmadev: fix compile error in debug mode 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" This patch fix compile error when enable RTE_DMADEV_DEBUG. Fixes: ea8cf0f8536d ("dmadev: add burst capacity API") Signed-off-by: Chengwen Feng Reviewed-by: David Marchand Acked-by: Kevin Laatz Acked-by: Conor Walsh --- lib/dmadev/rte_dmadev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h index f5d23017b1..9942c6ec21 100644 --- a/lib/dmadev/rte_dmadev.h +++ b/lib/dmadev/rte_dmadev.h @@ -1126,7 +1126,7 @@ rte_dma_burst_capacity(int16_t dev_id, uint16_t vchan) #ifdef RTE_DMADEV_DEBUG if (!rte_dma_is_valid(dev_id)) return 0; - RTE_FUNC_PTR_OR_ERR_RET(*obbj->burst_capacity, 0); + RTE_FUNC_PTR_OR_ERR_RET(*obj->burst_capacity, 0); #endif return (*obj->burst_capacity)(obj->dev_private, vchan); }