From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Cc: Andrew Rybchenko <arybchenko@solarflare.com>,
Ray Kinsella <mdr@ashroe.eu>, Neil Horman <nhorman@tuxdriver.com>
Subject: [dpdk-dev] [PATCH 1/2] mempool: remove v20 ABI
Date: Tue, 6 Oct 2020 09:07:49 +0200 [thread overview]
Message-ID: <20201006070750.27104-1-olivier.matz@6wind.com> (raw)
Remove the deprecated v20 ABI of rte_mempool_populate_iova() and
rte_mempool_populate_virt().
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
lib/librte_mempool/meson.build | 2 -
lib/librte_mempool/rte_mempool.c | 79 ++--------------------
lib/librte_mempool/rte_mempool_version.map | 7 --
3 files changed, 5 insertions(+), 83 deletions(-)
diff --git a/lib/librte_mempool/meson.build b/lib/librte_mempool/meson.build
index 7dbe6b9bea..a6e861cbfc 100644
--- a/lib/librte_mempool/meson.build
+++ b/lib/librte_mempool/meson.build
@@ -9,8 +9,6 @@ foreach flag: extra_flags
endif
endforeach
-use_function_versioning = true
-
sources = files('rte_mempool.c', 'rte_mempool_ops.c',
'rte_mempool_ops_default.c', 'mempool_trace_points.c')
headers = files('rte_mempool.h', 'rte_mempool_trace.h',
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index 7774f0c8da..0e3a2a7635 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -30,7 +30,6 @@
#include <rte_string_fns.h>
#include <rte_spinlock.h>
#include <rte_tailq.h>
-#include <rte_function_versioning.h>
#include <rte_eal_paging.h>
@@ -305,17 +304,12 @@ mempool_ops_alloc_once(struct rte_mempool *mp)
return 0;
}
-__vsym int
-rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
- rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque);
-
/* Add objects in the pool, using a physically contiguous memory
* zone. Return the number of objects added, or a negative value
* on error.
*/
-__vsym int
-rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
+int
+rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
void *opaque)
{
@@ -375,35 +369,6 @@ rte_mempool_populate_iova_v21(struct rte_mempool *mp, char *vaddr,
return ret;
}
-BIND_DEFAULT_SYMBOL(rte_mempool_populate_iova, _v21, 21);
-MAP_STATIC_SYMBOL(
- int rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr,
- rte_iova_t iova, size_t len,
- rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque),
- rte_mempool_populate_iova_v21);
-
-__vsym int
-rte_mempool_populate_iova_v20(struct rte_mempool *mp, char *vaddr,
- rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque);
-
-__vsym int
-rte_mempool_populate_iova_v20(struct rte_mempool *mp, char *vaddr,
- rte_iova_t iova, size_t len, rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque)
-{
- int ret;
-
- ret = rte_mempool_populate_iova_v21(mp, vaddr, iova, len, free_cb,
- opaque);
- if (ret == 0)
- ret = -EINVAL;
-
- return ret;
-}
-VERSION_SYMBOL(rte_mempool_populate_iova, _v20, 20.0);
-
static rte_iova_t
get_iova(void *addr)
{
@@ -417,16 +382,11 @@ get_iova(void *addr)
return ms->iova + RTE_PTR_DIFF(addr, ms->addr);
}
-__vsym int
-rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
- size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque);
-
/* Populate the mempool with a virtual area. Return the number of
* objects added, or a negative value on error.
*/
-__vsym int
-rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
+int
+rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
void *opaque)
{
@@ -459,7 +419,7 @@ rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
break;
}
- ret = rte_mempool_populate_iova_v21(mp, addr + off, iova,
+ ret = rte_mempool_populate_iova(mp, addr + off, iova,
phys_len, free_cb, opaque);
if (ret == 0)
continue;
@@ -477,35 +437,6 @@ rte_mempool_populate_virt_v21(struct rte_mempool *mp, char *addr,
rte_mempool_free_memchunks(mp);
return ret;
}
-BIND_DEFAULT_SYMBOL(rte_mempool_populate_virt, _v21, 21);
-MAP_STATIC_SYMBOL(
- int rte_mempool_populate_virt(struct rte_mempool *mp,
- char *addr, size_t len, size_t pg_sz,
- rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque),
- rte_mempool_populate_virt_v21);
-
-__vsym int
-rte_mempool_populate_virt_v20(struct rte_mempool *mp, char *addr,
- size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque);
-
-__vsym int
-rte_mempool_populate_virt_v20(struct rte_mempool *mp, char *addr,
- size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
- void *opaque)
-{
- int ret;
-
- ret = rte_mempool_populate_virt_v21(mp, addr, len, pg_sz,
- free_cb, opaque);
-
- if (ret == 0)
- ret = -EINVAL;
-
- return ret;
-}
-VERSION_SYMBOL(rte_mempool_populate_virt, _v20, 20.0);
/* Get the minimal page size used in a mempool before populating it. */
int
diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
index 50e22ee020..83760ecfc9 100644
--- a/lib/librte_mempool/rte_mempool_version.map
+++ b/lib/librte_mempool/rte_mempool_version.map
@@ -31,13 +31,6 @@ DPDK_21 {
local: *;
};
-DPDK_20.0 {
- global:
-
- rte_mempool_populate_iova;
- rte_mempool_populate_virt;
-};
-
EXPERIMENTAL {
global:
--
2.25.1
next reply other threads:[~2020-10-06 7:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 7:07 Olivier Matz [this message]
2020-10-06 7:07 ` [dpdk-dev] [PATCH 2/2] mempool: remove experimental tags Olivier Matz
2020-10-06 8:15 ` [dpdk-dev] [PATCH 1/2] mempool: remove v20 ABI Bruce Richardson
2020-10-06 9:52 ` David Marchand
2020-10-06 11:57 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201006070750.27104-1-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=mdr@ashroe.eu \
--cc=nhorman@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).