From patchwork Wed Apr 27 16:13:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 66801 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2282510qge; Wed, 27 Apr 2016 09:20:33 -0700 (PDT) X-Received: by 10.50.112.137 with SMTP id iq9mr26612324igb.19.1461774033204; Wed, 27 Apr 2016 09:20:33 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n20si30632051igi.2.2016.04.27.09.20.32; Wed, 27 Apr 2016 09:20:33 -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=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 93C07610BC; Wed, 27 Apr 2016 16:20:32 +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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, 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 0BBD76156D; Wed, 27 Apr 2016 16:16:56 +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 D1885611F3; Wed, 27 Apr 2016 16:15:45 +0000 (UTC) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by lists.linaro.org (Postfix) with ESMTPS id A0F61611FC for ; Wed, 27 Apr 2016 16:14:21 +0000 (UTC) Received: by mail-wm0-f51.google.com with SMTP id n129so34728949wmn.1 for ; Wed, 27 Apr 2016 09:14:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OMIu+gKYv+c6iVvxFwDT3XHLfAKqoYjiRgBDLjbjAHs=; b=YOHp4XlrYnmcyYxxern2icctAxQyzcm/6iSv+CodBNstl2TC4MHqh0/a868ioeMXoc qftFoPtVW0ABBphAlWPZO7Dil8o4otvwU8a6xW4eot1xnUvjumt5Hbrpt4af6Y2wNP+Q j6mPDZoswJtBwv6pTZRBYtPnEAvUBRljmdNQXtvZiKU75PMBOJIoqUjGczf2iaqPhVVE ax2gBINRGtkKOuGShzLngu1D+EFuzJwRaeFJ6QBemzEmnXPNr1RtiWux9JHckYY6H/Zk Ymk3YPlYYl3vr+osaJ7VyiTGUAe6Xh3dLnbD3lp+rusnDM9UK4nNx3nSbGq/Iogl+PrC Eawg== X-Gm-Message-State: AOPr4FUCIdq9VEnZU2wIqZI0h0KTqraxrArWR+fAoNOhXM1E1eJJe2TumYe9Ie+rwSysmYSDrpA= X-Received: by 10.194.88.201 with SMTP id bi9mr10025326wjb.147.1461773660797; Wed, 27 Apr 2016 09:14:20 -0700 (PDT) Received: from localhost.localdomain ([195.11.233.227]) by smtp.googlemail.com with ESMTPSA id f135sm9246636wmf.22.2016.04.27.09.14.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Apr 2016 09:14:20 -0700 (PDT) From: Zoltan Kiss To: lng-odp@lists.linaro.org Date: Wed, 27 Apr 2016 17:13:41 +0100 Message-Id: <1461773622-26062-3-git-send-email-zoltan.kiss@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461773622-26062-1-git-send-email-zoltan.kiss@linaro.org> References: <1461773622-26062-1-git-send-email-zoltan.kiss@linaro.org> X-Topics: Classification patch Cc: petri.savolainen@nokia.com Subject: [lng-odp] [PATCH 2/3] linux-generic: pktio: classification error handling fixes for loop 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" Several minor changes: - remove 'int j' as it no longer has function - add 'int failed' to count errors, and return it (or 0 if no failure) - in_errors counts the packet numbers, not the octets - in_ucast_pkts should not count these failed packets - as a side effect, separate this code path from normal handling completely Signed-off-by: Zoltan Kiss --- platform/linux-generic/pktio/loop.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 676e98b..60bd4b4 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -51,7 +51,7 @@ static int loopback_close(pktio_entry_t *pktio_entry) static int loopback_recv(pktio_entry_t *pktio_entry, odp_packet_t pkts[], unsigned len) { - int nbr, i, j; + int nbr, i; odp_buffer_hdr_t *hdr_tbl[QUEUE_MULTI_MAX]; queue_entry_t *qentry; odp_packet_hdr_t *pkt_hdr; @@ -64,7 +64,8 @@ static int loopback_recv(pktio_entry_t *pktio_entry, odp_packet_t pkts[], nbr = queue_deq_multi(qentry, hdr_tbl, len); if (pktio_cls_enabled(pktio_entry)) { - for (i = 0, j = 0; i < nbr; i++) { + int failed = 0; + for (i = 0; i < nbr; i++) { pkt = _odp_packet_from_buffer(odp_hdr_to_buf (hdr_tbl[i])); pkt_hdr = odp_packet_hdr(pkt); @@ -74,11 +75,12 @@ static int loopback_recv(pktio_entry_t *pktio_entry, odp_packet_t pkts[], pktio_entry->s.stats.in_octets += odp_packet_len(pkt); } else { - pktio_entry->s.stats.in_errors += - odp_packet_len(pkt); + failed--; } } - nbr = j; + pktio_entry->s.stats.in_errors += failed; + pktio_entry->s.stats.in_ucast_pkts += nbr - failed; + return failed; } else { for (i = 0; i < nbr; ++i) { pkts[i] = _odp_packet_from_buffer(odp_hdr_to_buf @@ -89,11 +91,9 @@ static int loopback_recv(pktio_entry_t *pktio_entry, odp_packet_t pkts[], pktio_entry->s.stats.in_octets += odp_packet_len(pkts[i]); } + pktio_entry->s.stats.in_ucast_pkts += nbr; + return nbr; } - - pktio_entry->s.stats.in_ucast_pkts += nbr; - - return nbr; } static int loopback_send(pktio_entry_t *pktio_entry, odp_packet_t pkt_tbl[],