From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id CA0E5A04BB;
Tue, 6 Oct 2020 11:52:21 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id A5657F64;
Tue, 6 Oct 2020 11:52:20 +0200 (CEST)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [216.205.24.124])
by dpdk.org (Postfix) with ESMTP id E0A75F3E
for <dev@dpdk.org>; Tue, 6 Oct 2020 11:52:17 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1601977936;
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:
in-reply-to:in-reply-to:references:references;
bh=yLS+xT4Vxe65Or504Rb6TiWkfMwjBDBbdYWLB4aDPi8=;
b=ReAFdR5B8hOt8A9or8jZ8hCBI2fmKnlQVv2gfRLVRXViWbC2gPS1oCC4goSs1dzn+8Oy+Y
hg5FqEfFeaTHtO7Gy2JRusvZlOM+v9zryfGSF+6t998eaTKzSq7AapfEMrv+lmSTg+Pnl9
ExLdTbl2m60LP9eAAqRiTjvfEO/usjs=
Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com
[209.85.222.69]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-163-JBAx1MNKO3il7Zo5wqJiQQ-1; Tue, 06 Oct 2020 05:52:15 -0400
X-MC-Unique: JBAx1MNKO3il7Zo5wqJiQQ-1
Received: by mail-ua1-f69.google.com with SMTP id b12so609847uaj.2
for <dev@dpdk.org>; Tue, 06 Oct 2020 02:52:14 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:references:in-reply-to:from:date
:message-id:subject:to:cc;
bh=yLS+xT4Vxe65Or504Rb6TiWkfMwjBDBbdYWLB4aDPi8=;
b=iX7r5y02cXW9hMz2wqN7edivB1ncNUaJvzZNy2sPCXf5JWTGxl1w/7p3ywbgJGp+6a
/j9z5aCKej9JOyF7Kr9tMc1OWqsamnb/WVfTRbPHY8h9Lh8bANbB+K1XILVyLpn79BxP
TDwR+crWIRmJQpJG5zN7dUoX1FhLt6mLUg1dH46vQqlQBf/afQuuKROiXr0xsCX3nTmT
VjJgfZD7pn15zdTBT3beM4SRIZRSEvpN0QIFFVGDZmIO6gv3fDb43bVuOzY03exkmxxt
DfFDr1lvu+3Bu2dU39BIic1PtCOA+OCjRvwzVwl7o7XOqk+ae/U+/GZ78c+UQxQ3zkUl
MxBg==
X-Gm-Message-State: AOAM531TnMiR2MUz+774HLTx9lv2ANQfNKGYY/+880uB05gHfilEQiXT
SdS8ZPRM4qQ/hfWNw1Ywj/env2vC9+xJrwJShF0cXjjM6V9iS8MmLgeRLZTBwyXiE2gfFqkrVf3
lzgh8xGFB52oaxirvk6Y=
X-Received: by 2002:ab0:4287:: with SMTP id j7mr2153792uaj.53.1601977934173;
Tue, 06 Oct 2020 02:52:14 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJz5dmUXnFBwQ2D2ZGgg9hYfLGoJEzmy/mcv7KEBVBosIRbmlNiTY8+/hjVGzsMCkmWgjXvvLEMLqmGbBB+rwGs=
X-Received: by 2002:ab0:4287:: with SMTP id j7mr2153786uaj.53.1601977933894;
Tue, 06 Oct 2020 02:52:13 -0700 (PDT)
MIME-Version: 1.0
References: <20201006070750.27104-1-olivier.matz@6wind.com>
In-Reply-To: <20201006070750.27104-1-olivier.matz@6wind.com>
From: David Marchand <david.marchand@redhat.com>
Date: Tue, 6 Oct 2020 11:52:03 +0200
Message-ID: <CAJFAV8yqDPuBU_=fh8r9UEMoG+av=rfaru5eza=t13nZCeGfmg@mail.gmail.com>
To: Olivier Matz <olivier.matz@6wind.com>
Cc: dev <dev@dpdk.org>, Andrew Rybchenko <arybchenko@solarflare.com>,
Ray Kinsella <mdr@ashroe.eu>, Neil Horman <nhorman@tuxdriver.com>
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset="UTF-8"
Subject: Re: [dpdk-dev] [PATCH 1/2] mempool: remove v20 ABI
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
On Tue, Oct 6, 2020 at 9:08 AM Olivier Matz <olivier.matz@6wind.com> wrote:
>
> 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
>
For the series,
Reviewed-by: David Marchand <david.marchand@redhat.com>
--
David Marchand