From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4C543A04C7; Mon, 14 Sep 2020 18:18:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CEAB41C0D4; Mon, 14 Sep 2020 18:18:19 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id AA9851C0CA for ; Mon, 14 Sep 2020 18:18:18 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 2ED3F5C00C9; Mon, 14 Sep 2020 12:18:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 14 Sep 2020 12:18:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=9kAM8bbx0mduU H/C7Shmgzxjl0EZ5QyVcWZQ/LN9kG0=; b=K1wNqE30qVXW+1RYEoHHGal2RbC82 OzTOWnfZdPBooW58GQ52kCyXSfYmtM1h4SLH70cP1WWHkViPpXEqZW+kCCpefMFq 9OuxWayn5Ou2MQRSM8dyS+KbcikJWnA/UrL3izMbLmu5/eexA9re0px+BXH+qpId bbbwvj6HFmQQWhrhxowgWhHRwuW4eQvizbQQo/hXyd7eb+hF7KC2kcLgWov8ZspW XjaPuZkzTdeZt9lzZ5QV76c/guYeMui79+aAn2cNEuiwQbtnC9F+l973yM9CIAyt cfMdIWFl6xOFB8n+JPOYH/k9Y/fHSk8D7iqpiutHKs6OpJ+00fLqY612w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=9kAM8bbx0mduUH/C7Shmgzxjl0EZ5QyVcWZQ/LN9kG0=; b=eQui29eV VASNLiCv9kuzIpoNoRZvsGfhlWta0TTyI8uNP2fPtUuwz6qh9qdF+B87KswQuoDz tE12taYnRZhykOq+00QYsUerLzh6I3ThOGXFLS0NkXws9Jdi25kFl5GwnyKa5Igb lCt0IajxnLSe/kLVOn3Ja7+cFaw11dKQsY/N09B3invrs4MevLJQO8tZop7iUsc6 qkWZps1PgX6Hownu+duKL673a/bdqs6peDgski7oGqmIIWIfet65WT0gXGsnwKbf Tw/dlIrygv1hFuOir5ULK1QUyAh1gwAD3I8y7YU9qPlQINmB/6h4eYTi83jBU77h zr68t047Oo9YVg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudeiiedguddtudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhm rghsucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenuc ggtffrrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedt gfeutdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrh fuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgr lhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 1B26C3280059; Mon, 14 Sep 2020 12:18:17 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: mdr@ashroe.eu, david.marchand@redhat.com, Olivier Matz , Andrew Rybchenko Date: Mon, 14 Sep 2020 18:17:58 +0200 Message-Id: <20200914161801.572174-3-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200914161801.572174-1-thomas@monjalon.net> References: <20200914161801.572174-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 2/4] mempool: remove physical address aliases 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" 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 --- 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