From patchwork Thu Apr 21 00:14:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 66269 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2743347qge; Wed, 20 Apr 2016 17:20:57 -0700 (PDT) X-Received: by 10.140.28.36 with SMTP id 33mr14679821qgy.47.1461198057724; Wed, 20 Apr 2016 17:20:57 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m131si4289695qke.164.2016.04.20.17.20.57; Wed, 20 Apr 2016 17:20:57 -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 6468967574; Thu, 21 Apr 2016 00:20:57 +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 C9A0368A5C; Thu, 21 Apr 2016 00:15:31 +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 7F18B669E4; Thu, 21 Apr 2016 00:15:00 +0000 (UTC) Received: from mail-oi0-f46.google.com (mail-oi0-f46.google.com [209.85.218.46]) by lists.linaro.org (Postfix) with ESMTPS id A48C3686A2 for ; Thu, 21 Apr 2016 00:14:27 +0000 (UTC) Received: by mail-oi0-f46.google.com with SMTP id x201so60925177oif.3 for ; Wed, 20 Apr 2016 17:14:27 -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=z6g9GbDhuzXmAMl3L9TpABVUbl4/0zNgjZ/o+FfhYpY=; b=gzQNZbKn/DSlDoyoIVUoA5XVvIgWkD9VLlI3t7zp6bLSXzFgtiQDy4udiNf6lcaDeJ nG/PJHVNdJMga5XxqaIbp51FECFkgKiaCcsCZKGVhea5vvngaJHeEGmMu49VDdWJlSH2 AeQ9ApX8HjMCd7o5ie6yopOGKYnieaR4xcLY1mPSxeKfJxuMyJ7SRSwIP2b3xPLsn85k cwYo0rirHoWZ9jL9jsMxSd46bT0nO4a3hZBJkuvxiaVmWa6WWMOmZMRGkOBjYbjHcnNW /06yVcSGDjn3kDWEg8mAtny+VK5XCDTnI+YfzOfFRHvk4PDjVEfj/lAKDi1Ra8k+CW3r uH8A== X-Gm-Message-State: AOPr4FW3bz9dogNe7KhUDTbe6BhjYTA2Hlso0BDqvMAPiGoiIi2lhcZM12zMuXwtUUinCFoWgV0= X-Received: by 10.202.93.133 with SMTP id r127mr4921915oib.100.1461197667187; Wed, 20 Apr 2016 17:14:27 -0700 (PDT) Received: from Ubuntu15.localdomain (cpe-66-68-129-43.austin.res.rr.com. [66.68.129.43]) by smtp.gmail.com with ESMTPSA id a34sm335otb.1.2016.04.20.17.14.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 17:14:26 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 20 Apr 2016 19:14:14 -0500 Message-Id: <1461197655-23743-11-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461197655-23743-1-git-send-email-bill.fischofer@linaro.org> References: <1461197655-23743-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv4 10/11] linux-generic: pktio: add pktin timestamp argument to _odp_packet_cls_enq() 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" From: Matias Elo _odp_packet_cls_enq() allocates new odp packets internally. Add new packet timestamp argument to enable adding input timestamps to these packets. Signed-off-by: Matias Elo Reviewed-and-tested-by: Bill Fischofer --- .../linux-generic/include/odp_packet_io_internal.h | 3 ++- platform/linux-generic/pktio/dpdk.c | 2 +- platform/linux-generic/pktio/netmap.c | 2 +- platform/linux-generic/pktio/pktio_common.c | 18 +++++++++++------- platform/linux-generic/pktio/socket.c | 3 ++- platform/linux-generic/pktio/socket_mmap.c | 3 ++- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index a807d13..9fc13a9 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -211,7 +211,8 @@ 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, odp_time_t *ts, + odp_packet_t *pkt_ret); extern void *pktio_entry_ptr[]; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 83fb1ba..3845448 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -677,7 +677,7 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { if (_odp_packet_cls_enq(pktio_entry, (const uint8_t *)buf, pkt_len, - &pkt_table[nb_pkts])) + NULL, &pkt_table[nb_pkts])) nb_pkts++; } else { pkt = packet_alloc(pktio_entry->s.pkt_dpdk.pool, diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c index 0b794a0..9112ba3 100644 --- a/platform/linux-generic/pktio/netmap.c +++ b/platform/linux-generic/pktio/netmap.c @@ -586,7 +586,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry, if (pktio_cls_enabled(pktio_entry)) { ret = _odp_packet_cls_enq(pktio_entry, (const uint8_t *)buf, - len, pkt_out); + len, NULL, pkt_out); if (ret) return 0; return -1; diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c index c568da3..e7bb3d8 100644 --- a/platform/linux-generic/pktio/pktio_common.c +++ b/platform/linux-generic/pktio/pktio_common.c @@ -10,18 +10,19 @@ int _odp_packet_cls_enq(pktio_entry_t *pktio_entry, const uint8_t *base, uint16_t buf_len, - odp_packet_t *pkt_ret) + odp_time_t *ts, odp_packet_t *pkt_ret) { cos_t *cos; odp_packet_t pkt; - odp_packet_hdr_t pkt_hdr; + odp_packet_hdr_t *pkt_hdr; + odp_packet_hdr_t src_pkt_hdr; int ret; odp_pool_t pool; - packet_parse_reset(&pkt_hdr); + packet_parse_reset(&src_pkt_hdr); - _odp_cls_parse(&pkt_hdr, base); - cos = pktio_select_cos(pktio_entry, base, &pkt_hdr); + _odp_cls_parse(&src_pkt_hdr, base); + cos = pktio_select_cos(pktio_entry, base, &src_pkt_hdr); /* if No CoS found then drop the packet */ if (cos == NULL || cos->s.queue == NULL || cos->s.pool == NULL) @@ -32,15 +33,18 @@ int _odp_packet_cls_enq(pktio_entry_t *pktio_entry, pkt = odp_packet_alloc(pool, buf_len); if (odp_unlikely(pkt == ODP_PACKET_INVALID)) return 0; + pkt_hdr = odp_packet_hdr(pkt); - copy_packet_parser_metadata(&pkt_hdr, odp_packet_hdr(pkt)); - odp_packet_hdr(pkt)->input = pktio_entry->s.handle; + copy_packet_parser_metadata(&src_pkt_hdr, pkt_hdr); + pkt_hdr->input = pktio_entry->s.handle; if (odp_packet_copydata_in(pkt, 0, buf_len, base) != 0) { odp_packet_free(pkt); return 0; } + packet_set_ts(pkt_hdr, ts); + /* 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); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 44f18c2..e28fd07 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -650,7 +650,8 @@ static int sock_mmsg_recv(pktio_entry_t *pktio_entry, continue; ret = _odp_packet_cls_enq(pktio_entry, base, - pkt_len, &pkt_table[nb_rx]); + pkt_len, NULL, + &pkt_table[nb_rx]); if (ret) nb_rx++; } diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index da0f7b7..5cd1ad6 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -149,7 +149,8 @@ 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, NULL, + &pkt_table[nb_rx]); if (ret) nb_rx++; } else {