From patchwork Thu Oct 28 12:03:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 103158 X-Patchwork-Delegate: maxime.coquelin@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 A4978A0547; Thu, 28 Oct 2021 14:03:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4433C41100; Thu, 28 Oct 2021 14:03:49 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id 5442E40DF4 for ; Thu, 28 Oct 2021 14:03:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635422626; 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=VDzREgTBTnkxI/t/3Qm5ep0enh8DKaBhU5JQKHIBRJ0=; b=amLwzvF4XC5a2HaX8RPzePN05MRFMxCGm2yW/7eg/pMSoMWNN9DFSW2q7zriF+9f+Vm6c+ WfVz2L3kXAE+NMrvwePWzopyeue1CCHgUEKxVTjSKuc9YhLt2TAkTISYC0u0C/v7EJHU8/ Cw/YSYYWKHvYXwfLFGFwAPNgSBV+XpM= 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-589-uVJ_4JnOPFawwEtNTLS-Fg-1; Thu, 28 Oct 2021 08:03:43 -0400 X-MC-Unique: uVJ_4JnOPFawwEtNTLS-Fg-1 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 B677910B744E; Thu, 28 Oct 2021 12:03:42 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98C80604CC; Thu, 28 Oct 2021 12:03:33 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, chenbo.xia@intel.com, xuemingl@nvidia.com, xiao.w.wang@intel.com, david.marchand@redhat.com Cc: Maxime Coquelin Date: Thu, 28 Oct 2021 14:03:29 +0200 Message-Id: <20211028120329.44710-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH] vhost: mark vDPA driver API as internal 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 marks the vDPA driver APIs as internal and rename the corresponding header file. Signed-off-by: Maxime Coquelin --- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- drivers/vdpa/mlx5/mlx5_vdpa.h | 2 +- lib/vhost/meson.build | 4 +++- lib/vhost/vdpa.c | 2 +- lib/vhost/{rte_vdpa_dev.h => vdpa_dev.h} | 6 ++++++ lib/vhost/version.map | 13 +++++++++---- lib/vhost/vhost.h | 2 +- 7 files changed, 22 insertions(+), 9 deletions(-) rename lib/vhost/{rte_vdpa_dev.h => vdpa_dev.h} (97%) diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index dd5251d382..b80825fcd8 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h index cf4f384fa4..e2db6d432f 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h @@ -12,7 +12,7 @@ #pragma GCC diagnostic ignored "-Wpedantic" #endif #include -#include +#include #include #ifdef PEDANTIC #pragma GCC diagnostic error "-Wpedantic" diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build index 2d8fe0239f..6d2d061141 100644 --- a/lib/vhost/meson.build +++ b/lib/vhost/meson.build @@ -29,9 +29,11 @@ sources = files( ) headers = files( 'rte_vdpa.h', - 'rte_vdpa_dev.h', 'rte_vhost.h', 'rte_vhost_async.h', 'rte_vhost_crypto.h', ) +driver_sdk_headers = files( + 'vdpa_dev.h', +) deps += ['ethdev', 'cryptodev', 'hash', 'pci'] diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c index 6dd91859ac..778835e14e 100644 --- a/lib/vhost/vdpa.c +++ b/lib/vhost/vdpa.c @@ -17,7 +17,7 @@ #include #include "rte_vdpa.h" -#include "rte_vdpa_dev.h" +#include "vdpa_dev.h" #include "vhost.h" /** Double linked list of vDPA devices. */ diff --git a/lib/vhost/rte_vdpa_dev.h b/lib/vhost/vdpa_dev.h similarity index 97% rename from lib/vhost/rte_vdpa_dev.h rename to lib/vhost/vdpa_dev.h index b0f494815f..2bdd12b3e1 100644 --- a/lib/vhost/rte_vdpa_dev.h +++ b/lib/vhost/vdpa_dev.h @@ -7,6 +7,8 @@ #include +#include + #include "rte_vhost.h" #include "rte_vdpa.h" @@ -88,6 +90,7 @@ struct rte_vdpa_device { * @return * vDPA device pointer on success, NULL on failure */ +__rte_internal struct rte_vdpa_device * rte_vdpa_register_device(struct rte_device *rte_dev, struct rte_vdpa_dev_ops *ops); @@ -100,6 +103,7 @@ rte_vdpa_register_device(struct rte_device *rte_dev, * @return * device id on success, -1 on failure */ +__rte_internal int rte_vdpa_unregister_device(struct rte_vdpa_device *dev); @@ -115,6 +119,7 @@ rte_vdpa_unregister_device(struct rte_vdpa_device *dev); * @return * 0 on success, -1 on failure */ +__rte_internal int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable); @@ -132,6 +137,7 @@ rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable); * @return * number of synced used entries on success, -1 on failure */ +__rte_internal int rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m); diff --git a/lib/vhost/version.map b/lib/vhost/version.map index 8ebde3f694..f3f1a3c93b 100644 --- a/lib/vhost/version.map +++ b/lib/vhost/version.map @@ -8,10 +8,7 @@ DPDK_22 { rte_vdpa_get_rte_device; rte_vdpa_get_stats; rte_vdpa_get_stats_names; - rte_vdpa_register_device; - rte_vdpa_relay_vring_used; rte_vdpa_reset_stats; - rte_vdpa_unregister_device; rte_vhost_avail_entries; rte_vhost_clr_inflight_desc_packed; rte_vhost_clr_inflight_desc_split; @@ -52,7 +49,6 @@ DPDK_22 { rte_vhost_get_vring_base_from_inflight; rte_vhost_get_vring_num; rte_vhost_gpa_to_vva; - rte_vhost_host_notifier_ctrl; rte_vhost_log_used_vring; rte_vhost_log_write; rte_vhost_rx_queue_count; @@ -86,3 +82,12 @@ EXPERIMENTAL { rte_vhost_async_channel_unregister_thread_unsafe; rte_vhost_clear_queue_thread_unsafe; }; + +INTERNAL { + global; + + rte_vdpa_register_device; + rte_vdpa_unregister_device; + rte_vhost_host_notifier_ctrl; + rte_vdpa_relay_vring_used; +}; diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 6c6a2da2c9..521a21b5b6 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -22,7 +22,7 @@ #include "rte_vhost.h" #include "rte_vdpa.h" -#include "rte_vdpa_dev.h" +#include "vdpa_dev.h" #include "rte_vhost_async.h"