From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 12919A0C4E; Tue, 2 Nov 2021 10:56:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8912B4068F; Tue, 2 Nov 2021 10:56:30 +0100 (CET) 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 893CF40689 for ; Tue, 2 Nov 2021 10:56:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635846989; 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=El0FxBtgby9+lTYV8OWejmx6KLqSetYRbXD84MLrGX4=; b=SdfgfALWCVogf/7MbYLDkqO5jhi2OobxOETRZQngEKX9CrmuuW8Yufl+yAPvpMp+FXXt6n vcLiHEH/KOWzQp2MwOwV/F0rnZx4f4FdDX0ThK+wjS9qu/Vq3VOWXH9MEu1iEzAzekSKsd +l+VuNlmz+3zGECY1h+TZY8kienwES4= 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-359-QTo8k7hcPveYJg5F48O19w-1; Tue, 02 Nov 2021 05:56:28 -0400 X-MC-Unique: QTo8k7hcPveYJg5F48O19w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BDDCEBD524; Tue, 2 Nov 2021 09:56:26 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id A05DF1B472; Tue, 2 Nov 2021 09:56:13 +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 , Thomas Monjalon Date: Tue, 2 Nov 2021 10:56:11 +0100 Message-Id: <20211102095611.6716-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-dev] [PATCH v3] 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 to vdpa_driver.h. Signed-off-by: Maxime Coquelin Acked-by: Thomas Monjalon Reviewed-by: Chenbo Xia --- Changes in v3: ============== - Update deprecation notice and release note Changes in v2: ============= - Alphabetical ordering in version.map (David) - Rename header to vdpa_driver.h (David) - Add Techboard in Cc to vote for API breakage exception doc/guides/rel_notes/deprecation.rst | 4 ---- doc/guides/rel_notes/release_21_11.rst | 4 ++++ 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_driver.h} | 12 +++++++++--- lib/vhost/version.map | 13 +++++++++---- lib/vhost/vhost.h | 2 +- 9 files changed, 29 insertions(+), 16 deletions(-) rename lib/vhost/{rte_vdpa_dev.h => vdpa_driver.h} (95%) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 4366015b01..ce1b727e77 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -107,10 +107,6 @@ Deprecation Notices is deprecated as ambiguous with respect to the embedded switch. The use of these attributes will become invalid starting from DPDK 22.11. -* vhost: ``rte_vdpa_register_device``, ``rte_vdpa_unregister_device``, - ``rte_vhost_host_notifier_ctrl`` and ``rte_vdpa_relay_vring_used`` vDPA - driver interface will be marked as internal in DPDK v21.11. - * vhost: rename ``struct vhost_device_ops`` to ``struct rte_vhost_device_ops`` in DPDK v21.11. diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 98d50a160b..7c2c976d47 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -475,6 +475,10 @@ API Changes * eventdev: Moved memory used by timer adapters to hugepage. This will prevent TLB misses if any and aligns to memory structure of other subsystems. +* vhost: ``rte_vdpa_register_device``, ``rte_vdpa_unregister_device``, + ``rte_vhost_host_notifier_ctrl`` and ``rte_vdpa_relay_vring_used`` vDPA + driver interface are marked as internal. + ABI Changes ----------- diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index dd5251d382..3853c4cf7e 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..a6c9404cb0 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..cdb37a4814 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_driver.h', +) deps += ['ethdev', 'cryptodev', 'hash', 'pci'] diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c index 6dd91859ac..09ad5d866e 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_driver.h" #include "vhost.h" /** Double linked list of vDPA devices. */ diff --git a/lib/vhost/rte_vdpa_dev.h b/lib/vhost/vdpa_driver.h similarity index 95% rename from lib/vhost/rte_vdpa_dev.h rename to lib/vhost/vdpa_driver.h index b0f494815f..fc2d6acedd 100644 --- a/lib/vhost/rte_vdpa_dev.h +++ b/lib/vhost/vdpa_driver.h @@ -2,11 +2,13 @@ * Copyright(c) 2018 Intel Corporation */ -#ifndef _RTE_VDPA_H_DEV_ -#define _RTE_VDPA_H_DEV_ +#ifndef _VDPA_DRIVER_H_ +#define _VDPA_DRIVER_H_ #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,7 +137,8 @@ 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); -#endif /* _RTE_VDPA_DEV_H_ */ +#endif /* _VDPA_DRIVER_H_ */ diff --git a/lib/vhost/version.map b/lib/vhost/version.map index c8599ddb97..a7ef7f1976 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; @@ -89,3 +85,12 @@ EXPERIMENTAL { # added in 21.11 rte_vhost_get_monitor_addr; }; + +INTERNAL { + global; + + rte_vdpa_register_device; + rte_vdpa_relay_vring_used; + rte_vdpa_unregister_device; + rte_vhost_host_notifier_ctrl; +}; diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 05ccc35f37..c07219296d 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_driver.h" #include "rte_vhost_async.h" -- 2.31.1