From patchwork Tue Aug 1 16:54:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 27347 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 52C4BA23C; Tue, 1 Aug 2017 18:56:04 +0200 (CEST) Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by dpdk.org (Postfix) with ESMTP id 9989DA160 for ; Tue, 1 Aug 2017 18:55:35 +0200 (CEST) Received: by mail-wr0-f182.google.com with SMTP id 12so9286506wrb.1 for ; Tue, 01 Aug 2017 09:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=NaemIRcsfF/6GmJf39usMdEyWP4/MbY+iMn+MOvlzAw=; b=tr/csq9XvyrDupxDRmb7ufEWGeoDMYB7MvmbSAnnaFR6jqfEUiX8bI7zH1W8lZh/01 R9NODD8jhEAQpcPfsYfQ87o5uueDehmTiFV1mpKr6YYmHimDsOIFWVwF9TS3oBYwvRve aC+iruN2H/CRiZw3vKSHoSLdQlqIx5tweXGoiDF9mb6byoBVmjJzisfrIP5jgNFwWSbf 4piedL7c+t2aaCZJOFu4Jz4aKW+zWrFS+quNwJCVzUGSm+XGRNiDYiaiIJYF4BKe9dnz /Aw7gFqZt3rDwNe8gtFbmeUdt8FY9Q2djGMsxBzl7lCDsnD0Dz6mTUS5zrMbNOPvFShu UGuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=NaemIRcsfF/6GmJf39usMdEyWP4/MbY+iMn+MOvlzAw=; b=m4To0FKu4x6dSJ5iaCCkl7/RCc7sodoElHMHMqCR0zwwxAM0RQBB6gq2qIOERbXSvY M0HnDEb31pRVNxCfIW8+ECaEurHPF+FH7m+I0XMzbrgbvruzHGGS9Dzpvpd+BinWPlcL xM//lkBy7/SBPn/o1cWzW6o5qFBO7Qv6wKbfxbd2pIRHI7BcnPHpvMaCi75gsZB6ETAW EwbOacRGtW+CxM3k9uRy9Maf5iVEPUvyNljk7YljwOap+fwYco7LgNcmAQJbfB4oSpPn NoSK/+9ImYgDj4hNAAkcQ3bDc3l8Ib7aH4bmyJZz6mMGH48dT93hw/ehz/+FMNSPpdn6 gHfQ== X-Gm-Message-State: AIVw113d7ohDe1irC0WYv+UHJsDWXDUrkSgDfdtMtCLGfXVrxDNfqwHK 5iCLGyM5RUg2jM4hUdI= X-Received: by 10.223.162.9 with SMTP id p9mr14988083wra.236.1501606535153; Tue, 01 Aug 2017 09:55:35 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 195sm2006309wmv.25.2017.08.01.09.55.34 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 01 Aug 2017 09:55:34 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 1 Aug 2017 18:54:18 +0200 Message-Id: <17d3b32358bcccb1fdc9d15b0f40338e3c1e0f19.1501598384.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 31/48] net/mlx4: remove mbuf macro definitions 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" These were originally used for compatibility between DPDK releases when this PMD was built out of tree. Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index d831729..0f1169c 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -74,15 +74,6 @@ #include "mlx4.h" #include "mlx4_flow.h" -/* Convenience macros for accessing mbuf fields. */ -#define NEXT(m) ((m)->next) -#define DATA_LEN(m) ((m)->data_len) -#define PKT_LEN(m) ((m)->pkt_len) -#define DATA_OFF(m) ((m)->data_off) -#define SET_DATA_OFF(m, o) ((m)->data_off = (o)) -#define NB_SEGS(m) ((m)->nb_segs) -#define PORT(m) ((m)->port) - /* Work Request ID data type (64 bit). */ typedef union { struct { @@ -1006,7 +997,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) struct txq_elt *elt_next = &(*txq->elts)[elts_head_next]; struct txq_elt *elt = &(*txq->elts)[elts_head]; struct ibv_send_wr *wr = &elt->wr; - unsigned int segs = NB_SEGS(buf); + unsigned int segs = buf->nb_segs; unsigned int sent_size = 0; uint32_t send_flags = 0; @@ -1020,7 +1011,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) #endif /* Faster than rte_pktmbuf_free(). */ do { - struct rte_mbuf *next = NEXT(tmp); + struct rte_mbuf *next = tmp->next; rte_pktmbuf_free_seg(tmp); tmp = next; @@ -1040,7 +1031,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) /* Retrieve buffer information. */ addr = rte_pktmbuf_mtod(buf, uintptr_t); - length = DATA_LEN(buf); + length = buf->data_len; /* Retrieve Memory Region key for this memory pool. */ lkey = txq_mp2mr(txq, txq_mb2mp(buf)); if (unlikely(lkey == (uint32_t)-1)) { @@ -1414,7 +1405,7 @@ rxq_alloc_elts(struct rxq *rxq, unsigned int elts_n, struct rte_mbuf **pool) wr->sg_list = sge; wr->num_sge = 1; /* Headroom is reserved by rte_pktmbuf_alloc(). */ - assert(DATA_OFF(buf) == RTE_PKTMBUF_HEADROOM); + assert(buf->data_off == RTE_PKTMBUF_HEADROOM); /* Buffer is supposed to be empty. */ assert(rte_pktmbuf_data_len(buf) == 0); assert(rte_pktmbuf_pkt_len(buf) == 0); @@ -1726,12 +1717,12 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) (uintptr_t)rep); assert(WR_ID(wr->wr_id).id == WR_ID(wr_id).id); /* Update seg information. */ - SET_DATA_OFF(seg, RTE_PKTMBUF_HEADROOM); - NB_SEGS(seg) = 1; - PORT(seg) = rxq->port_id; - NEXT(seg) = NULL; - PKT_LEN(seg) = len; - DATA_LEN(seg) = len; + seg->data_off = RTE_PKTMBUF_HEADROOM; + seg->nb_segs = 1; + seg->port = rxq->port_id; + seg->next = NULL; + seg->pkt_len = len; + seg->data_len = len; seg->packet_type = 0; seg->ol_flags = 0; /* Return packet. */