From patchwork Wed Sep 2 13:16:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 6870 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id ECD54918F; Wed, 2 Sep 2015 15:18:13 +0200 (CEST) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by dpdk.org (Postfix) with ESMTP id C2F178E90 for ; Wed, 2 Sep 2015 15:18:12 +0200 (CEST) Received: by wicfx3 with SMTP id fx3so17428113wic.1 for ; Wed, 02 Sep 2015 06:18:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=x8hbNr0B4YkHyyi+IizB8r8erCLz1xtU5OSNFqN43Ec=; b=l0dfC+r4iACwLhqXdzaAFrQa2N5OwLnQDaBcuPecOnDQvVSkdyTS0cAAyt7JFHOS+B U5wkPoPn39r8fNZHE93+4Sfr6rkoLUQHJWFw9H/6t3T2+ZL0lm2fY1ftDwmg3kySPtbC vSYiwIAv1/IaSctnEw53UOgkTEnmpHlSmIAmVOQONxWN4W05U5V5F0k0xOt3h3B4lnPM pD7MM7GuMVKYseRxgGgpuECvHOa5nAufHpLR+QVEhkw2DxdKpyL5ukY2bNZ+xXHl4WvU QhHdWsTYVItXjMu08i5FrWFQY5tvJ3nD77vsAZgiDkY58kd0KnGGMotcJGQyEesmFpPL 3x9g== X-Gm-Message-State: ALoCoQkjK94mTcp6ZS72/LmfHp1C0WRev/d90XoAAr1x/D7MQ2AfgT7DliJWa1tLveOw8p/d52+4 X-Received: by 10.194.122.97 with SMTP id lr1mr39717363wjb.26.1441199892588; Wed, 02 Sep 2015 06:18:12 -0700 (PDT) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by smtp.gmail.com with ESMTPSA id i6sm32392938wje.33.2015.09.02.06.18.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Sep 2015 06:18:12 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 2 Sep 2015 15:16:43 +0200 Message-Id: <1441199803-27055-11-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441199803-27055-1-git-send-email-thomas.monjalon@6wind.com> References: <1441138697-25157-1-git-send-email-thomas.monjalon@6wind.com> <1441199803-27055-1-git-send-email-thomas.monjalon@6wind.com> Cc: Stephen Hemminger Subject: [dpdk-dev] [PATCH v2 10/10] ring: remove deprecated functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stephen Hemminger These were deprecated in 2.0 so remove them from 2.2. The library version is incremented. Signed-off-by: Stephen Hemminger Signed-off-by: Thomas Monjalon Acked-by: Neil Horman --- doc/guides/rel_notes/deprecation.rst | 3 -- doc/guides/rel_notes/release_2_2.rst | 5 ++- drivers/net/ring/Makefile | 2 +- drivers/net/ring/rte_eth_ring.c | 56 ------------------------------- drivers/net/ring/rte_eth_ring.h | 3 -- drivers/net/ring/rte_eth_ring_version.map | 2 -- 6 files changed, 5 insertions(+), 66 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 04819fa..5f6079b 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -40,9 +40,6 @@ Deprecation Notices the tunnel type, TNI/VNI, inner MAC and inner VLAN are monitored. The release 2.2 will contain these changes without backwards compatibility. -* librte_pmd_ring: The deprecated functions rte_eth_ring_pair_create and - rte_eth_ring_pair_attach should be removed. - * ABI changes are planned for struct virtio_net in order to support vhost-user multiple queues feature. It should be integrated in release 2.2 without backward compatibility. diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst index 6dcfe88..abe57b4 100644 --- a/doc/guides/rel_notes/release_2_2.rst +++ b/doc/guides/rel_notes/release_2_2.rst @@ -24,6 +24,9 @@ API Changes * The deprecated KNI functions are removed: rte_kni_create(), rte_kni_get_port_id() and rte_kni_info_get(). +* The deprecated ring PMD functions are removed: + rte_eth_ring_pair_create() and rte_eth_ring_pair_attach(). + ABI Changes ----------- @@ -67,7 +70,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_meter.so.1 librte_pipeline.so.1 librte_pmd_bond.so.1 - librte_pmd_ring.so.1 + + librte_pmd_ring.so.2 librte_port.so.1 librte_power.so.1 librte_reorder.so.1 diff --git a/drivers/net/ring/Makefile b/drivers/net/ring/Makefile index e442d0b..ae83505 100644 --- a/drivers/net/ring/Makefile +++ b/drivers/net/ring/Makefile @@ -41,7 +41,7 @@ CFLAGS += $(WERROR_FLAGS) EXPORT_MAP := rte_eth_ring_version.map -LIBABIVER := 1 +LIBABIVER := 2 # # all source are stored in SRCS-y diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 6fd3d0a..0ba36d5 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -391,62 +391,6 @@ eth_dev_ring_create(const char *name, const unsigned numa_node, return 0; } - -static int -eth_dev_ring_pair_create(const char *name, const unsigned numa_node, - enum dev_action action) -{ - /* rx and tx are so-called from point of view of first port. - * They are inverted from the point of view of second port - */ - struct rte_ring *rx[RTE_PMD_RING_MAX_RX_RINGS]; - struct rte_ring *tx[RTE_PMD_RING_MAX_TX_RINGS]; - unsigned i; - char rx_rng_name[RTE_RING_NAMESIZE]; - char tx_rng_name[RTE_RING_NAMESIZE]; - unsigned num_rings = RTE_MIN(RTE_PMD_RING_MAX_RX_RINGS, - RTE_PMD_RING_MAX_TX_RINGS); - - for (i = 0; i < num_rings; i++) { - snprintf(rx_rng_name, sizeof(rx_rng_name), "ETH_RX%u_%s", i, name); - rx[i] = (action == DEV_CREATE) ? - rte_ring_create(rx_rng_name, 1024, numa_node, - RING_F_SP_ENQ|RING_F_SC_DEQ) : - rte_ring_lookup(rx_rng_name); - if (rx[i] == NULL) - return -1; - snprintf(tx_rng_name, sizeof(tx_rng_name), "ETH_TX%u_%s", i, name); - tx[i] = (action == DEV_CREATE) ? - rte_ring_create(tx_rng_name, 1024, numa_node, - RING_F_SP_ENQ|RING_F_SC_DEQ): - rte_ring_lookup(tx_rng_name); - if (tx[i] == NULL) - return -1; - } - - if (rte_eth_from_rings(rx_rng_name, rx, num_rings, tx, num_rings, - numa_node) < 0 || - rte_eth_from_rings(tx_rng_name, tx, num_rings, rx, - num_rings, numa_node) < 0) - return -1; - - return 0; -} - -int -rte_eth_ring_pair_create(const char *name, const unsigned numa_node) -{ - RTE_LOG(WARNING, PMD, "rte_eth_ring_pair_create is deprecated\n"); - return eth_dev_ring_pair_create(name, numa_node, DEV_CREATE); -} - -int -rte_eth_ring_pair_attach(const char *name, const unsigned numa_node) -{ - RTE_LOG(WARNING, PMD, "rte_eth_ring_pair_attach is deprecated\n"); - return eth_dev_ring_pair_create(name, numa_node, DEV_ATTACH); -} - struct node_action_pair { char name[PATH_MAX]; unsigned node; diff --git a/drivers/net/ring/rte_eth_ring.h b/drivers/net/ring/rte_eth_ring.h index 2262249..5a69bff 100644 --- a/drivers/net/ring/rte_eth_ring.h +++ b/drivers/net/ring/rte_eth_ring.h @@ -65,9 +65,6 @@ int rte_eth_from_rings(const char *name, const unsigned nb_tx_queues, const unsigned numa_node); -int rte_eth_ring_pair_create(const char *name, const unsigned numa_node); -int rte_eth_ring_pair_attach(const char *name, const unsigned numa_node); - #ifdef __cplusplus } #endif diff --git a/drivers/net/ring/rte_eth_ring_version.map b/drivers/net/ring/rte_eth_ring_version.map index 8ad107d..0875e25 100644 --- a/drivers/net/ring/rte_eth_ring_version.map +++ b/drivers/net/ring/rte_eth_ring_version.map @@ -2,8 +2,6 @@ DPDK_2.0 { global: rte_eth_from_rings; - rte_eth_ring_pair_attach; - rte_eth_ring_pair_create; local: *; };