DPDK patches and discussions
 help / color / mirror / Atom feed
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: mdr@ashroe.eu, david.marchand@redhat.com,
	Olivier Matz <olivier.matz@6wind.com>,
	Andrew Rybchenko <arybchenko@solarflare.com>
Subject: [dpdk-dev] [PATCH 2/4] mempool: remove physical address aliases
Date: Mon, 14 Sep 2020 18:17:58 +0200	[thread overview]
Message-ID: <20200914161801.572174-3-thomas@monjalon.net> (raw)
In-Reply-To: <20200914161801.572174-1-thomas@monjalon.net>

Remove the deprecated unioned fields physaddr and phys_addr
from the structures rte_mempool_objhdr and rte_mempool_memhdr.
They are replaced with the fields iova which are at the same offsets.

Remove the deprecated macro MEMPOOL_F_NO_PHYS_CONTIG
which is an alias of the more recent MEMPOOL_F_NO_IOVA_CONTIG.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 lib/librte_mempool/rte_mempool.h | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 6ad7e31170..9ea7ff934c 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -138,11 +138,7 @@ struct rte_mempool_objsz {
 struct rte_mempool_objhdr {
 	STAILQ_ENTRY(rte_mempool_objhdr) next; /**< Next in list. */
 	struct rte_mempool *mp;          /**< The mempool owning the object. */
-	RTE_STD_C11
-	union {
-		rte_iova_t iova;         /**< IO address of the object. */
-		phys_addr_t physaddr;    /**< deprecated - Physical address of the object. */
-	};
+	rte_iova_t iova;                 /**< IO address of the object. */
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
 	uint64_t cookie;                 /**< Debug cookie. */
 #endif
@@ -188,11 +184,7 @@ struct rte_mempool_memhdr {
 	STAILQ_ENTRY(rte_mempool_memhdr) next; /**< Next in list. */
 	struct rte_mempool *mp;  /**< The mempool owning the chunk */
 	void *addr;              /**< Virtual address of the chunk */
-	RTE_STD_C11
-	union {
-		rte_iova_t iova;       /**< IO address of the chunk */
-		phys_addr_t phys_addr; /**< Physical address of the chunk */
-	};
+	rte_iova_t iova;         /**< IO address of the chunk */
 	size_t len;              /**< length of the chunk */
 	rte_mempool_memchunk_free_cb_t *free_cb; /**< Free callback */
 	void *opaque;            /**< Argument passed to the free callback */
@@ -269,7 +261,6 @@ struct rte_mempool {
 #define MEMPOOL_F_SC_GET         0x0008 /**< Default get is "single-consumer".*/
 #define MEMPOOL_F_POOL_CREATED   0x0010 /**< Internal: pool is created. */
 #define MEMPOOL_F_NO_IOVA_CONTIG 0x0020 /**< Don't need IOVA contiguous objs. */
-#define MEMPOOL_F_NO_PHYS_CONTIG MEMPOOL_F_NO_IOVA_CONTIG /* deprecated */
 
 /**
  * @internal When debug is enabled, store some statistics.
-- 
2.28.0


  parent reply	other threads:[~2020-09-14 16:18 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-14 16:17 [dpdk-dev] [PATCH 0/4] remove aliases replaced with IOVA Thomas Monjalon
2020-09-14 16:17 ` [dpdk-dev] [PATCH 1/4] mem: remove physical address aliases Thomas Monjalon
2020-09-15  7:07   ` Andrew Rybchenko
2020-09-15 11:46   ` Burakov, Anatoly
2020-09-14 16:17 ` Thomas Monjalon [this message]
2020-09-15  7:08   ` [dpdk-dev] [PATCH 2/4] mempool: " Andrew Rybchenko
2020-09-14 16:17 ` [dpdk-dev] [PATCH 3/4] mbuf: remove deprecated function and macro aliases Thomas Monjalon
2020-09-15  7:09   ` Andrew Rybchenko
2020-09-15  8:38     ` Thomas Monjalon
2020-09-14 16:18 ` [dpdk-dev] [PATCH 4/4] mbuf: remove physical address alias Thomas Monjalon
2020-09-15  7:10   ` Andrew Rybchenko
2020-09-17 10:41 ` [dpdk-dev] [PATCH v2 0/4] remove aliases replaced with IOVA Thomas Monjalon
2020-09-17 10:41   ` [dpdk-dev] [PATCH v2 1/4] mem: remove physical address aliases Thomas Monjalon
2020-09-17 10:53     ` Hemant Agrawal
2020-09-18 14:38     ` Kinsella, Ray
2020-09-17 10:41   ` [dpdk-dev] [PATCH v2 2/4] mempool: " Thomas Monjalon
2020-09-18 14:39     ` Kinsella, Ray
2020-09-17 10:41   ` [dpdk-dev] [PATCH v2 3/4] mbuf: remove deprecated function and macro aliases Thomas Monjalon
2020-09-17 10:55     ` Hemant Agrawal
2020-09-18 14:42     ` Kinsella, Ray
2020-09-17 10:41   ` [dpdk-dev] [PATCH v2 4/4] mbuf: remove physical address alias Thomas Monjalon
2020-09-18 14:43     ` Kinsella, Ray
2020-09-18 22:32       ` Thomas Monjalon

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=20200914161801.572174-3-thomas@monjalon.net \
    --to=thomas@monjalon.net \
    --cc=arybchenko@solarflare.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=mdr@ashroe.eu \
    --cc=olivier.matz@6wind.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).