From patchwork Fri Dec 5 15:20:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ananyev, Konstantin" X-Patchwork-Id: 1772 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 03E537E75; Fri, 5 Dec 2014 16:20:56 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id AE4442C7A for ; Fri, 5 Dec 2014 16:20:53 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 05 Dec 2014 07:19:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,522,1413270000"; d="scan'208";a="619246593" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 05 Dec 2014 07:20:43 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id sB5FKgHg020232; Fri, 5 Dec 2014 15:20:42 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id sB5FKgZU015392; Fri, 5 Dec 2014 15:20:42 GMT Received: (from kananye1@localhost) by sivswdev02.ir.intel.com with id sB5FKfA4015388; Fri, 5 Dec 2014 15:20:41 GMT From: Konstantin Ananyev To: dev@dpdk.org Date: Fri, 5 Dec 2014 15:20:34 +0000 Message-Id: <1417792834-20590-1-git-send-email-konstantin.ananyev@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [RFC PATCH] ixgbe: ixgbe_recv_pkts_vec shouldn't override mbuf buffer length X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" That's an alternative way to fix the problem described in the patch: http://dpdk.org/ml/archives/dev/2014-December/009394.html. The main difference is: - move buf_len fields out of rearm_data marker. - make ixgbe_recv_pkts_vec() not touch buf_len field at all (as all other RX functions behave). Signed-off-by: Konstantin Ananyev Acked-by: Jean-Mickael Guerin --- lib/librte_mbuf/rte_mbuf.h | 7 +++++-- lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 2e5fce5..bb88318 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -179,6 +179,8 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask); typedef void *MARKER[0]; /**< generic marker for a point in a structure */ typedef uint64_t MARKER64[0]; /**< marker that allows us to overwrite 8 bytes * with a single assignment */ +typedef uint8_t MARKER8[0]; /**< generic marker with 1B alignment */ + /** * The generic rte_mbuf, containing a packet mbuf. */ @@ -188,9 +190,10 @@ struct rte_mbuf { void *buf_addr; /**< Virtual address of segment buffer. */ phys_addr_t buf_physaddr; /**< Physical address of segment buffer. */ - /* next 8 bytes are initialised on RX descriptor rearm */ - MARKER64 rearm_data; uint16_t buf_len; /**< Length of segment buffer. */ + + /* next 6 bytes are initialised on RX descriptor rearm */ + MARKER8 rearm_data; uint16_t data_off; /** diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c index 579bc46..d5fc0cc 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c @@ -79,13 +79,22 @@ ixgbe_rxq_rearm(struct igb_rx_queue *rxq) /* Initialize the mbufs in vector, process 2 mbufs in one loop */ for (i = 0; i < RTE_IXGBE_RXQ_REARM_THRESH; i += 2, rxep += 2) { __m128i vaddr0, vaddr1; + uintptr_t p0, p1; mb0 = rxep[0].mbuf; mb1 = rxep[1].mbuf; - /* flush mbuf with pkt template */ - mb0->rearm_data[0] = rxq->mbuf_initializer; - mb1->rearm_data[0] = rxq->mbuf_initializer; + /* + * Flush mbuf with pkt template. + * Data to be rearmed is 6 bytes long. + * Though, RX will overwrite ol_flags that are coming next + * anyway. So overwrite whole 8 bytes with one load: + * 6 bytes of rearm_data plus first 2 bytes of ol_flags. + */ + p0 = (uintptr_t)&mb0->rearm_data; + *(uint64_t *)p0 = rxq->mbuf_initializer; + p1 = (uintptr_t)&mb1->rearm_data; + *(uint64_t *)p1 = rxq->mbuf_initializer; /* load buf_addr(lo 64bit) and buf_physaddr(hi 64bit) */ vaddr0 = _mm_loadu_si128((__m128i *)&(mb0->buf_addr)); @@ -732,14 +741,15 @@ static struct ixgbe_txq_ops vec_txq_ops = { int ixgbe_rxq_vec_setup(struct igb_rx_queue *rxq) { + uintptr_t p; struct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */ mb_def.nb_segs = 1; mb_def.data_off = RTE_PKTMBUF_HEADROOM; - mb_def.buf_len = rxq->mb_pool->elt_size - sizeof(struct rte_mbuf); mb_def.port = rxq->port_id; rte_mbuf_refcnt_set(&mb_def, 1); - rxq->mbuf_initializer = *((uint64_t *)&mb_def.rearm_data); + p = (uintptr_t)&mb_def.rearm_data; + rxq->mbuf_initializer = *(uint64_t *)p; return 0; }