From patchwork Fri Apr 8 08:13:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elo, Matias \(Nokia - FI/Espoo\)" X-Patchwork-Id: 65358 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp531983lbl; Fri, 8 Apr 2016 01:13:20 -0700 (PDT) X-Received: by 10.55.80.136 with SMTP id e130mr9421734qkb.28.1460103200524; Fri, 08 Apr 2016 01:13:20 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c64si8973363qgc.18.2016.04.08.01.13.20; Fri, 08 Apr 2016 01:13:20 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE dis=NONE) header.from=nokia.com Received: by lists.linaro.org (Postfix, from userid 109) id D1F846178E; Fri, 8 Apr 2016 08:13:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C222F6174E; Fri, 8 Apr 2016 08:13:15 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 052FC61757; Fri, 8 Apr 2016 08:13:14 +0000 (UTC) Received: from demumfd001.nsn-inter.net (demumfd001.nsn-inter.net [93.183.12.32]) by lists.linaro.org (Postfix) with ESMTPS id 02C546170B for ; Fri, 8 Apr 2016 08:13:12 +0000 (UTC) Received: from demuprx016.emea.nsn-intra.net ([10.150.129.55]) by demumfd001.nsn-inter.net (8.15.2/8.15.2) with ESMTPS id u388DBN5012785 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 8 Apr 2016 08:13:11 GMT Received: from 10.144.19.15 ([10.144.104.112]) by demuprx016.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id u388DAnI024785 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Fri, 8 Apr 2016 10:13:10 +0200 From: Matias Elo To: lng-odp@lists.linaro.org Date: Fri, 8 Apr 2016 11:13:10 +0300 Message-Id: <1460103190-6746-1-git-send-email-matias.elo@nokia.com> X-Mailer: git-send-email 1.9.1 X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 3053 X-purgate-ID: 151667::1460103191-00001B3D-9C9AD536/0/0 X-Topics: patch Subject: [lng-odp] [PATCH] linux-generic: pktio: support new pktio_entry states X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Use new pktio_entry states in netmap and dpdk pktio implementations. Fixes build for both pktio types. Signed-off-by: Matias Elo Reviewed-by: Bill Fischofer --- platform/linux-generic/include/odp_packet_dpdk.h | 1 - platform/linux-generic/pktio/dpdk.c | 7 +++---- platform/linux-generic/pktio/netmap.c | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 6e00d2d..747ab72 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -54,7 +54,6 @@ typedef struct { uint16_t mtu; /**< maximum transmission unit */ /** DPDK packet pool name (pktpool_) */ char pool_name[IF_NAMESIZE + 8]; - odp_bool_t started; /**< DPDK device has been started */ /** Use system call to get/set vdev promisc mode */ odp_bool_t vdev_sysc_promisc; uint8_t port_id; /**< DPDK port identifier */ diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 3fce723..623433f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -320,7 +320,7 @@ static int dpdk_close(pktio_entry_t *pktio_entry) rte_pktmbuf_free(pkt_dpdk->rx_cache[i].s.pkt[idx++]); } - if (pkt_dpdk->started) + if (pktio_entry->s.state != STATE_OPENED) rte_eth_dev_close(pkt_dpdk->port_id); return 0; @@ -636,7 +636,6 @@ static int dpdk_start(pktio_entry_t *pktio_entry) ret, port_id); return -1; } - pkt_dpdk->started = 1; return 0; } @@ -771,7 +770,7 @@ static int dpdk_recv_queue(pktio_entry_t *pktio_entry, int i; unsigned cache_idx; - if (odp_unlikely(pktio_entry->s.state == STATE_STOP)) + if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) return 0; if (!pkt_dpdk->lockless_rx) @@ -834,7 +833,7 @@ static int dpdk_send_queue(pktio_entry_t *pktio_entry, int i; int mbufs; - if (odp_unlikely(pktio_entry->s.state == STATE_STOP)) + if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) return 0; if (!pktio_entry->s.pkt_dpdk.lockless_tx) diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index df5a108..0e160c5 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -667,7 +667,7 @@ static int netmap_recv_queue(pktio_entry_t *pktio_entry, int index, int max_fd = 0; fd_set empty_rings; - if (odp_unlikely(pktio_entry->s.state == STATE_STOP)) + if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) return 0; FD_ZERO(&empty_rings); @@ -722,7 +722,7 @@ static int netmap_send_queue(pktio_entry_t *pktio_entry, int index, unsigned slot_id; char *buf; - if (odp_unlikely(pktio_entry->s.state == STATE_STOP)) + if (odp_unlikely(pktio_entry->s.state != STATE_STARTED)) return 0; /* Only one netmap tx ring per pktout queue */