From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id E89DF326B for ; Tue, 4 Apr 2017 13:57:45 +0200 (CEST) Received: from pure.maildistiller.com (unknown [10.110.50.29]) by dispatch1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTP id 4AC5B60055 for ; Tue, 4 Apr 2017 11:57:45 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx4-us3.ppe-hosted.com (unknown [10.110.49.251]) by pure.maildistiller.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 95C836004B for ; Tue, 4 Apr 2017 11:57:44 +0000 (UTC) Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx4-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 6E98080053 for ; Tue, 4 Apr 2017 11:57:44 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Tue, 4 Apr 2017 04:57:41 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Tue, 4 Apr 2017 04:57:41 -0700 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v34Bvegm004456 for ; Tue, 4 Apr 2017 12:57:40 +0100 Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v34Bve56015851 for ; Tue, 4 Apr 2017 12:57:40 +0100 From: Andrew Rybchenko To: Date: Tue, 4 Apr 2017 12:57:36 +0100 Message-ID: <1491307056-15810-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 MIME-Version: 1.0 Content-Type: text/plain X-MDID: 1491307065-Z4aV4PofqA-4 Subject: [dpdk-dev] [PATCH] net/sfc: remove unnecessary mbuf initialization on Rx path 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: , X-List-Received-Date: Tue, 04 Apr 2017 11:57:46 -0000 mbuf next is equal to NULL, nb_segs and reference counter are equal to 1 when mbuf is obtained from mempool. Signed-off-by: Andrew Rybchenko --- Depends on http://dpdk.org/ml/archives/dev/2017-March/059693.html drivers/net/sfc/sfc_ef10_rx.c | 18 +++++++++--------- drivers/net/sfc/sfc_rx.c | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c index 2a3bf89..1484bab 100644 --- a/drivers/net/sfc/sfc_ef10_rx.c +++ b/drivers/net/sfc/sfc_ef10_rx.c @@ -386,9 +386,8 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev, *rx_pkts++ = m; - *(uint64_t *)(&m->rearm_data) = rxq->rearm_data; - /* rearm_data rewrites ol_flags which is updated below */ - rte_compiler_barrier(); + RTE_BUILD_BUG_ON(sizeof(m->rearm_data[0]) != sizeof(rxq->rearm_data)); + m->rearm_data[0] = rxq->rearm_data; /* Classify packet based on Rx event */ sfc_ef10_rx_ev_to_offloads(rxq, rx_ev, m); @@ -412,7 +411,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev, rte_pktmbuf_data_len(m) = pkt_len; rte_pktmbuf_pkt_len(m) = pkt_len; - m->next = NULL; + SFC_ASSERT(m->next == NULL); /* Remember mbuf to copy offload flags and packet type from */ m0 = m; @@ -426,9 +425,9 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev, if (ready > rxq->prepared) *rx_pkts++ = m; - *(uint64_t *)(&m->rearm_data) = rxq->rearm_data; - /* rearm_data rewrites ol_flags which is updated below */ - rte_compiler_barrier(); + RTE_BUILD_BUG_ON(sizeof(m->rearm_data[0]) != + sizeof(rxq->rearm_data)); + m->rearm_data[0] = rxq->rearm_data; /* Event-dependent information is the same */ m->ol_flags = m0->ol_flags; @@ -449,7 +448,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev, rte_pktmbuf_data_len(m) = pkt_len; rte_pktmbuf_pkt_len(m) = pkt_len; - m->next = NULL; + SFC_ASSERT(m->next == NULL); } return n_rx_pkts; @@ -560,7 +559,8 @@ sfc_ef10_mk_mbuf_rearm_data(uint16_t port_id, uint16_t prefix_size) /* rearm_data covers structure members filled in above */ rte_compiler_barrier(); - return *(uint64_t *)(&m.rearm_data); + RTE_BUILD_BUG_ON(sizeof(m.rearm_data[0]) != sizeof(uint64_t)); + return m.rearm_data[0]; } static sfc_dp_rx_qcreate_t sfc_ef10_rx_qcreate; diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 56130b2..ddf9217 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -122,10 +122,10 @@ sfc_efx_rx_qrefill(struct sfc_efx_rxq *rxq) rxd = &rxq->sw_desc[id]; rxd->mbuf = m; - rte_mbuf_refcnt_set(m, 1); + SFC_ASSERT(rte_mbuf_refcnt_read(m) == 1); m->data_off = RTE_PKTMBUF_HEADROOM; - m->next = NULL; - m->nb_segs = 1; + SFC_ASSERT(m->next == NULL); + SFC_ASSERT(m->nb_segs == 1); m->port = port_id; addr[i] = rte_pktmbuf_mtophys(m); -- 2.7.4