From patchwork Wed Dec 13 23:40:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chunmei Liu X-Patchwork-Id: 32247 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A78971B00B; Thu, 14 Dec 2017 00:40:45 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 9D9857D06 for ; Thu, 14 Dec 2017 00:40:44 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Dec 2017 15:40:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,398,1508828400"; d="scan'208";a="2595147" Received: from otccldstore01.sc.intel.com ([172.25.110.24]) by orsmga008.jf.intel.com with ESMTP; 13 Dec 2017 15:40:43 -0800 From: chunmei Liu To: dev@dpdk.org Cc: chunmei Date: Wed, 13 Dec 2017 15:40:31 -0800 Message-Id: <1513208431-64890-1-git-send-email-chunmei.liu@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-dev] [PATCH] fix ceph async messenger runtime bug based on spdk/dpdk 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" From: chunmei ceph async messenger has some run time error with this dpdk library, 1) need set rxm->next= null at end of packet since not init it to null when allocate a buffer other wise rte_mbuf_sanity_check will report error. 2) when check the size, can't calculate mbuf_data_room_size because async messenger dpdk will allocate this part later not at create mempool. Signed-off-by: chunmei Liu --- drivers/net/ixgbe/ixgbe_rxtx.c | 3 ++- lib/librte_mbuf/rte_mbuf.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 1e07895..a0acc5c 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -2190,7 +2190,8 @@ ixgbe_recv_pkts_lro(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts, rxm->next = next_rxe->mbuf; next_sc_entry->fbuf = first_seg; goto next_desc; - } + }else + rxm->next = NULL; /* Initialize the first mbuf of the returned packet */ ixgbe_fill_cluster_head_buf(first_seg, &rxd, rxq, staterr); diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 0e3e36a..c01da19 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -102,7 +102,6 @@ rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg) } RTE_ASSERT(mp->elt_size >= sizeof(struct rte_mbuf) + - user_mbp_priv->mbuf_data_room_size + user_mbp_priv->mbuf_priv_size); mbp_priv = rte_mempool_get_priv(mp); @@ -233,6 +232,8 @@ rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header) } if (nb_segs != 0) rte_panic("bad nb_segs\n"); + if (m_seg != NULL) + rte_panic("bad m_seg\n"); } /* dump a mbuf on console */