From patchwork Wed Apr 27 16:13:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 66803 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2283310qge; Wed, 27 Apr 2016 09:22:07 -0700 (PDT) X-Received: by 10.50.13.74 with SMTP id f10mr27764144igc.55.1461774127426; Wed, 27 Apr 2016 09:22:07 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id tl17si9118099igc.9.2016.04.27.09.22.06; Wed, 27 Apr 2016 09:22:07 -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 C66F5611FB; Wed, 27 Apr 2016 16:22:06 +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 AF89B61586; Wed, 27 Apr 2016 16:17:02 +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 CC6CA6156A; Wed, 27 Apr 2016 16:15:51 +0000 (UTC) Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by lists.linaro.org (Postfix) with ESMTPS id 91C48611FD for ; Wed, 27 Apr 2016 16:14:22 +0000 (UTC) Received: by mail-wm0-f45.google.com with SMTP id u206so56933515wme.1 for ; Wed, 27 Apr 2016 09:14:22 -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=BKyVtHQx7QSAdMaULPEQbj0JlfhSP0nPPcxhfS5kDJI=; b=QJaWDZ/nf98DkgWRBF8lt91UjOeHbIgLFkdurAxaz+skbXc6jZ/sDPVHZqspNho1Xw brblLBPaWr9UNk9edO08Ym0twd4TKbxiFH686rKGD8YHMYD2rDmMZB/SsldL3fidNDng hSfuxvLlAE1Jiz2ae1miMVKVddT6rvIkhJTrgvLUWgLN2iYVcr0fBsHh8L1z1Kn6C5Hj z7yVE+AGmNCzddbmDULDhytPOoernNmBDY+DHeqG0QhZHEmlCsTWjhf0ZZxK8x9VPOv7 AfUtAjbF/jQhe7N4tjjKTopGAAtGJM5SLK/blMwvd/iSFGF1ukrbnJvt+Gw3joXgoXXz 6/dw== X-Gm-Message-State: AOPr4FXTpN595n0el7Bs+S/aPrziNrPdpUmY6Q0HUTUXMM+rTAYazAPP6YMkMQrXioTYLfqwNzs= X-Received: by 10.28.85.137 with SMTP id j131mr24849160wmb.15.1461773661742; Wed, 27 Apr 2016 09:14:21 -0700 (PDT) Received: from localhost.localdomain ([195.11.233.227]) by smtp.googlemail.com with ESMTPSA id f135sm9246636wmf.22.2016.04.27.09.14.20 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Apr 2016 09:14:21 -0700 (PDT) From: Zoltan Kiss To: lng-odp@lists.linaro.org Date: Wed, 27 Apr 2016 17:13:42 +0100 Message-Id: <1461773622-26062-4-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: patch Cc: petri.savolainen@nokia.com Subject: [lng-odp] [PATCH 3/3] linux-generic: pktio: don't return packet after failed enqueue 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" If queue_enq() fails, there is a serious internal error, the packet should be released instead of passing it back to pktin_poll() for enqueueing on an another one. Also return the error if there is any, not just the queue_enq() ones. Signed-off-by: Zoltan Kiss --- platform/linux-generic/include/odp_packet_io_internal.h | 2 +- platform/linux-generic/pktio/pktio_common.c | 13 ++++++------- platform/linux-generic/pktio/socket.c | 5 ++--- platform/linux-generic/pktio/socket_mmap.c | 4 ++-- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index cca5c39..19b0551 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -169,7 +169,7 @@ typedef struct pktio_if_ops { } pktio_if_ops_t; int _odp_packet_cls_enq(pktio_entry_t *pktio_entry, const uint8_t *base, - uint16_t buf_len, odp_packet_t *pkt_ret); + uint16_t buf_len); extern void *pktio_entry_ptr[]; diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index c568da3..394ee63 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -9,8 +9,7 @@ #include int _odp_packet_cls_enq(pktio_entry_t *pktio_entry, - const uint8_t *base, uint16_t buf_len, - odp_packet_t *pkt_ret) + const uint8_t *base, uint16_t buf_len) { cos_t *cos; odp_packet_t pkt; @@ -25,28 +24,28 @@ int _odp_packet_cls_enq(pktio_entry_t *pktio_entry, /* if No CoS found then drop the packet */ if (cos == NULL || cos->s.queue == NULL || cos->s.pool == NULL) - return 0; + return -1; pool = cos->s.pool->s.pool_hdl; pkt = odp_packet_alloc(pool, buf_len); if (odp_unlikely(pkt == ODP_PACKET_INVALID)) - return 0; + return -1; copy_packet_parser_metadata(&pkt_hdr, odp_packet_hdr(pkt)); odp_packet_hdr(pkt)->input = pktio_entry->s.handle; if (odp_packet_copydata_in(pkt, 0, buf_len, base) != 0) { odp_packet_free(pkt); - return 0; + return -1; } /* Parse and set packet header data */ odp_packet_pull_tail(pkt, odp_packet_len(pkt) - buf_len); ret = queue_enq(cos->s.queue, odp_buf_to_hdr((odp_buffer_t)pkt), 0); if (ret < 0) { - *pkt_ret = pkt; - return 1; + odp_packet_free(pkt); + return -1; } return 0; diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index edc36a1..6563565 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -649,10 +649,9 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, eth_hdr->h_source))) continue; - ret = _odp_packet_cls_enq(pktio_entry, base, - pkt_len, &pkt_table[nb_rx]); + ret = _odp_packet_cls_enq(pktio_entry, base, pkt_len); if (ret) - nb_rx++; + nb_rx = -1; } } else { struct iovec iovecs[ODP_PACKET_SOCKET_MAX_BURST_RX] diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index caca708..d7ca865 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -149,9 +149,9 @@ static inline unsigned pkt_mmap_v2_rx(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { ret = _odp_packet_cls_enq(pktio_entry, pkt_buf, - pkt_len, &pkt_table[nb_rx]); + pkt_len); if (ret) - nb_rx++; + nb_rx = -1; } else { odp_packet_hdr_t *hdr;