From patchwork Tue Aug 7 21:34:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 43620 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8FF331150; Tue, 7 Aug 2018 23:34:58 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id DDF45FEB for ; Tue, 7 Aug 2018 23:34:56 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id f12-v6so81972wrv.12 for ; Tue, 07 Aug 2018 14:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iJrslaaxr3QoviSA3KyucCxrHS/6HScYZNxlTcgU3+c=; b=yHk+purTxbt/ZPoF1Mg1yyoh0YYQbo9DSjRSxKUZij22g8Tw8ylrmsKaabvNSSolZD CSHWHWuKFZXDJm4sjt9fHmTMsXIDaZHp7FlcK78ftzUE8L8BOl5nbN76am0cYxwnPKvf 5Z7sD+5uKFBttv13t/UOFO+PpAv+ZUHQjTwn1Yfki9bF68HAZ9vvF2XZ1rNJONkBXQMB Lj1XJx5cn7kCYEmgoiJti79QVpvJEE10dh1TxWDSRdhg9iBBOk5wK1wXAkjGWqsHkP8P rSW0LU2GvBiRJ9uE+0uHWCO5vMGUkO/yTORvbNh8JkuFNgAaLF3I9wgpkPrC+pDcmeqM 49Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iJrslaaxr3QoviSA3KyucCxrHS/6HScYZNxlTcgU3+c=; b=Fmtue9o7EjEuGlRfje0k+nfR3+4NXEjsKkrReErmLs1zl2tO7t7ES3dr8GjVpgiS5k uJzl1PmfJEV1nHbR/faNb2Lz8d+l+1ttnfkBByezmk+/PHOdCKrGXN5zN99XdhIIghQ9 45JyalW8Ks2g9JILG6VB/9ujxrRgURrEXjc2NgjRq39AVMXRivnzWaDTItMsIARr2Kos bUKJ9ijtYqHN7Wf8ziIAxai4YgZQuUhBHV7Z/Gj+EeGkQJVU5V8I1IUrMJsf9waMQhau aUwgSviry6R5Eug23LJJ415mHrLLGU+eZcd3BNrJ1ZF8Wakrg7T79AIjIbgOqzAES9Ef eDVA== X-Gm-Message-State: AOUpUlFHYvr07tI4+qfDRp/dBIZXWRuG3fPu216mDvH1+DRVemauefbH OaEOt4l+ZBLia3/00zZvk7eWhx+UeFZbTg== X-Google-Smtp-Source: AA+uWPyQxdHdV5AFCS7zicB4xWJpoISkiCJqxQ4BaCxXhn+H5b5rbq9qG1jETL2jMQVFpRcXNYN/fg== X-Received: by 2002:a5d:4643:: with SMTP id j3-v6mr100949wrs.52.1533677696304; Tue, 07 Aug 2018 14:34:56 -0700 (PDT) Received: from localhost.localdomain ([37.173.249.81]) by smtp.gmail.com with ESMTPSA id q16-v6sm2309914wmq.25.2018.08.07.14.34.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 14:34:55 -0700 (PDT) From: Olivier Matz X-Google-Original-From: Olivier Matz To: dev@dpdk.org, Hemant Agrawal , John McNamara Cc: Thomas Monjalon , Anatoly Burakov , Santosh Shukla , Olivier Matz Date: Tue, 7 Aug 2018 23:34:42 +0200 Message-Id: <20180807213443.24847-1-zer0@droids-corp.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180626095637.5637-1-olivier.matz@6wind.com> References: <20180626095637.5637-1-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH v3 1/2] eal: remove deprecated function returning mbuf pool ops name 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" From: Olivier Matz rte_eal_mbuf_default_mempool_ops() is replaced by rte_mbuf_best_mempool_ops(). Signed-off-by: Olivier Matz Reviewed-by: Anatoly Burakov Acked-by: Santosh Shukla --- v3: * bump ABI version and update the release notes v2: * remove rte_eal_mbuf_user_pool_ops from .map in next patch instead of this doc/guides/rel_notes/deprecation.rst | 9 --------- doc/guides/rel_notes/release_18_08.rst | 6 +++++- lib/librte_eal/bsdapp/eal/Makefile | 2 +- lib/librte_eal/bsdapp/eal/eal.c | 10 ---------- lib/librte_eal/common/include/rte_eal.h | 11 ----------- lib/librte_eal/linuxapp/eal/Makefile | 2 +- lib/librte_eal/linuxapp/eal/eal.c | 10 ---------- lib/librte_eal/meson.build | 2 +- lib/librte_eal/rte_eal_version.map | 1 - 9 files changed, 8 insertions(+), 45 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index bade1e4c4..118f962d9 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -42,15 +42,6 @@ Deprecation Notices - ``eal_parse_pci_DomBDF`` replaced by ``rte_pci_addr_parse`` - ``rte_eal_compare_pci_addr`` replaced by ``rte_pci_addr_cmp`` -* eal: a new set of mbuf mempool ops name APIs for user, platform and best - mempool names have been defined in ``rte_mbuf`` in v18.02. The uses of - ``rte_eal_mbuf_default_mempool_ops`` shall be replaced by - ``rte_mbuf_best_mempool_ops``. - The following function is deprecated since 18.05, and will be removed - in 18.08: - - - ``rte_eal_mbuf_default_mempool_ops`` - * mbuf: The opaque ``mbuf->hash.sched`` field will be updated to support generic definition in line with the ethdev TM and MTR APIs. Currently, this field is defined in librte_sched in a non-generic way. The new generic format diff --git a/doc/guides/rel_notes/release_18_08.rst b/doc/guides/rel_notes/release_18_08.rst index 9849fec7d..06cc38e85 100644 --- a/doc/guides/rel_notes/release_18_08.rst +++ b/doc/guides/rel_notes/release_18_08.rst @@ -181,6 +181,10 @@ API Changes - ``RTE_COMP_FF_OOP_SGL_IN_LB_OUT`` - ``RTE_COMP_FF_OOP_LB_IN_SGL_OUT`` +* eal: The function ``rte_eal_mbuf_default_mempool_ops`` was deprecated + and is removed in 18.08. It shall be replaced by + ``rte_mbuf_best_mempool_ops``. + ABI Changes ----------- @@ -242,7 +246,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_compressdev.so.1 + librte_cryptodev.so.5 librte_distributor.so.1 - librte_eal.so.7 + + librte_eal.so.8 librte_ethdev.so.9 librte_eventdev.so.4 librte_flow_classify.so.1 diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index be684072e..d27da3d15 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -22,7 +22,7 @@ LDLIBS += -lrte_kvargs EXPORT_MAP := ../../rte_eal_version.map -LIBABIVER := 7 +LIBABIVER := 8 # specific to bsdapp exec-env SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) := eal.c diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 6a6dd5e85..89e8110a2 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -153,16 +153,6 @@ rte_eal_mbuf_user_pool_ops(void) return internal_config.user_mbuf_pool_ops_name; } -/* Return mbuf pool ops name */ -const char * -rte_eal_mbuf_default_mempool_ops(void) -{ - if (internal_config.user_mbuf_pool_ops_name == NULL) - return RTE_MBUF_DEFAULT_MEMPOOL_OPS; - - return internal_config.user_mbuf_pool_ops_name; -} - /* Return a pointer to the configuration structure */ struct rte_config * rte_eal_get_configuration(void) diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h index 8de5d69e8..0c9c3f13b 100644 --- a/lib/librte_eal/common/include/rte_eal.h +++ b/lib/librte_eal/common/include/rte_eal.h @@ -501,17 +501,6 @@ enum rte_iova_mode rte_eal_iova_mode(void); const char * __rte_experimental rte_eal_mbuf_user_pool_ops(void); -/** - * @deprecated - * Get default pool ops name for mbuf - * - * @return - * returns default pool ops name. - */ -__rte_deprecated -const char * -rte_eal_mbuf_default_mempool_ops(void); - #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index b48352825..fd92c75c2 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -10,7 +10,7 @@ ARCH_DIR ?= $(RTE_ARCH) EXPORT_MAP := ../../rte_eal_version.map VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR) -LIBABIVER := 7 +LIBABIVER := 8 VPATH += $(RTE_SDK)/lib/librte_eal/common diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index d2d5aae80..511eb062f 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -161,16 +161,6 @@ rte_eal_mbuf_user_pool_ops(void) return internal_config.user_mbuf_pool_ops_name; } -/* Return mbuf pool ops name */ -const char * -rte_eal_mbuf_default_mempool_ops(void) -{ - if (internal_config.user_mbuf_pool_ops_name == NULL) - return RTE_MBUF_DEFAULT_MEMPOOL_OPS; - - return internal_config.user_mbuf_pool_ops_name; -} - /* Return a pointer to the configuration structure */ struct rte_config * rte_eal_get_configuration(void) diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index 98174476c..e1fde15d1 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -21,7 +21,7 @@ else error('unsupported system type "@0@"'.format(host_machine.system())) endif -version = 7 # the version of the EAL API +version = 8 # the version of the EAL API allow_experimental_apis = true deps += 'compat' deps += 'kvargs' diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index f18387137..de9abc812 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -181,7 +181,6 @@ DPDK_17.11 { rte_bus_get_iommu_class; rte_eal_has_pci; rte_eal_iova_mode; - rte_eal_mbuf_default_mempool_ops; rte_eal_using_phys_addrs; rte_eal_vfio_intr_mode; rte_lcore_has_role; From patchwork Tue Aug 7 21:34:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 43621 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 83F361DBD; Tue, 7 Aug 2018 23:35:00 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 60D8EFEB for ; Tue, 7 Aug 2018 23:34:58 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id f12-v6so82056wrv.12 for ; Tue, 07 Aug 2018 14:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/vSR0i5sruDjStaLaqNdQdDsHIAzJiBwWfRje7iNCM8=; b=LS2apNpmYSfF9sFwCoo4w2by+J1pYqEou+CNnUAA3YGhvlTDYO/bta2z6yLw6g/Cnl lV2ZhhHoXKo3ANDR3vk73xmpWLX/8wsDXX3KmSeBH9JnffS7CA4QMUpnb1srSHjx8kOs oRT00+k53qXbqrM8lw+zKdezBWlu3+EV8uUzL+cbtJmjDO0FmOjH02E8NxV4DvHTrHJ1 eRJkr6KJFOLB6Zi+2oLmjYrAJVs0F9q0BTwTpRydGH0WwbHB/0KYAfgB074cSZXImB27 L0vL7rocK/6PnzlfmsAH4yBuZcVM1TgMWGTcp7f89NZeLN50FFaWoYs4TCQV9Z0ZJKLo yKiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/vSR0i5sruDjStaLaqNdQdDsHIAzJiBwWfRje7iNCM8=; b=XQSl1z+qggDhvYD25cmCR/hamiXYBUFihHIJA2Y0rVyXYsbUxkPPt5OScjdLujSJZF ic0IjGZSjHI++z1ZmsM+WpWdoZfIo2yZCKJW4J+zAA4plMTu6M2j3K40qgEhhQKRGrg3 y9xNL5eHk8ZpWISEiqi3mTpYPumU+c6i0u8/4fzwypbscx/m60yo9PHtD8RsVDX30aEF JCSklYw/u92B3GfCg8eOnnROwuWHOSN+zG2UW+wHFuR/RaUg4ipxcTJwsMBT8grOfOmY 8uEOycSzJjGFmKJuUKPnL8mR8m6u5yacc99iHFlGLbJgxwQPLh1cCcaeGWN6YBqeFYnP nuqA== X-Gm-Message-State: AOUpUlFvyUFppnPvAGy/9/Vv6PvF2I5P5XNxn8FgpC5IoDBuiviE3bt0 eSyW1UcJ8D4mzEZaP081DF2Zj7EFxufJDQ== X-Google-Smtp-Source: AA+uWPxDXdAaTBByH07bjOeEdvTTPRsPacuVbMJLyDwyvPYPDucrFGlxgN9Qnf5oYcicfFTVuMSFfQ== X-Received: by 2002:adf:aa09:: with SMTP id p9-v6mr104365wrd.92.1533677697963; Tue, 07 Aug 2018 14:34:57 -0700 (PDT) Received: from localhost.localdomain ([37.173.249.81]) by smtp.gmail.com with ESMTPSA id q16-v6sm2309914wmq.25.2018.08.07.14.34.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 14:34:57 -0700 (PDT) From: Olivier Matz X-Google-Original-From: Olivier Matz To: dev@dpdk.org, Hemant Agrawal , John McNamara Cc: Thomas Monjalon , Anatoly Burakov , Santosh Shukla , Olivier Matz Date: Tue, 7 Aug 2018 23:34:43 +0200 Message-Id: <20180807213443.24847-2-zer0@droids-corp.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180807213443.24847-1-zer0@droids-corp.org> References: <20180626095637.5637-1-olivier.matz@6wind.com> <20180807213443.24847-1-zer0@droids-corp.org> Subject: [dpdk-dev] [PATCH v3 2/2] eal: remove experimental tag from user mbuf pool ops func 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" From: Olivier Matz Remove experimental tag from rte_eal_mbuf_user_pool_ops(). Signed-off-by: Olivier Matz Acked-by: Santosh Shukla --- v3: * nothing v2: * remove rte_eal_mbuf_user_pool_ops from .map in this patch instead of previous one lib/librte_eal/bsdapp/eal/eal.c | 2 +- lib/librte_eal/common/include/rte_eal.h | 5 +---- lib/librte_eal/linuxapp/eal/eal.c | 2 +- lib/librte_eal/rte_eal_version.map | 7 ++++++- lib/librte_mbuf/Makefile | 1 - lib/librte_mbuf/meson.build | 1 - 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 89e8110a2..d7ae9d686 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -147,7 +147,7 @@ eal_get_runtime_dir(void) } /* Return user provided mbuf pool ops name */ -const char * __rte_experimental +const char * rte_eal_mbuf_user_pool_ops(void) { return internal_config.user_mbuf_pool_ops_name; diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h index 0c9c3f13b..e114dcbdc 100644 --- a/lib/librte_eal/common/include/rte_eal.h +++ b/lib/librte_eal/common/include/rte_eal.h @@ -490,15 +490,12 @@ static inline int rte_gettid(void) enum rte_iova_mode rte_eal_iova_mode(void); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * Get user provided pool ops name for mbuf * * @return * returns user provided pool ops name. */ -const char * __rte_experimental +const char * rte_eal_mbuf_user_pool_ops(void); #ifdef __cplusplus diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 511eb062f..e59ac6577 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -155,7 +155,7 @@ eal_get_runtime_dir(void) } /* Return user provided mbuf pool ops name */ -const char * __rte_experimental +const char * rte_eal_mbuf_user_pool_ops(void) { return internal_config.user_mbuf_pool_ops_name; diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index de9abc812..67a89e6a6 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -261,6 +261,12 @@ DPDK_18.08 { } DPDK_18.05; +DPDK_18.08 { + global: + + rte_eal_mbuf_user_pool_ops; +} DPDK_18.05; + EXPERIMENTAL { global: @@ -286,7 +292,6 @@ EXPERIMENTAL { rte_eal_cleanup; rte_eal_hotplug_add; rte_eal_hotplug_remove; - rte_eal_mbuf_user_pool_ops; rte_fbarray_attach; rte_fbarray_destroy; rte_fbarray_detach; diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile index 8749a00fe..e2b98a254 100644 --- a/lib/librte_mbuf/Makefile +++ b/lib/librte_mbuf/Makefile @@ -6,7 +6,6 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_mbuf.a -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 LDLIBS += -lrte_eal -lrte_mempool diff --git a/lib/librte_mbuf/meson.build b/lib/librte_mbuf/meson.build index 869c17c1c..45ffb0db5 100644 --- a/lib/librte_mbuf/meson.build +++ b/lib/librte_mbuf/meson.build @@ -2,7 +2,6 @@ # Copyright(c) 2017 Intel Corporation version = 3 -allow_experimental_apis = true sources = files('rte_mbuf.c', 'rte_mbuf_ptype.c', 'rte_mbuf_pool_ops.c') headers = files('rte_mbuf.h', 'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h') deps += ['mempool']