From patchwork Thu Jul 20 20:00:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 108443 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2563381qge; Thu, 20 Jul 2017 13:05:12 -0700 (PDT) X-Received: by 10.200.36.70 with SMTP id d6mr7327122qtd.42.1500581112054; Thu, 20 Jul 2017 13:05:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500581112; cv=none; d=google.com; s=arc-20160816; b=EJ3Nw1H61NYRoFsbs/01R5KmmYZjq2BrtP2702BE3MlecILOVYHIRWDSe5U0iaq3w4 /9K1TppsherR+Sa7xPGLE30flpsd7R9f+y8un40QpBJH0eNjSEPFCIsLD0Iu0/i0bKzM ftv+YkHBz6oEDIkUUiPhdaJR91Os1pr77zIFIiOFqBFJk3HumyCDQRlIgVv6fqjtdGRA Na9JYyNoNRAdIPxThPBmbbU9Zk4K1JzqosY/9QXpP3P9/AxKdE8+2FUHi/geeCzxahyQ 0uPFlPHwJUTwkAEjURXNGMVIMqDEpyJuWLVCJahlVqEGejX+IOf0cXlFnZSDyQzTldjv SC0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=dAwOVPWv4bcwn1BOj3i/DVuPSAIdKHgYznxpuwIHmFs=; b=tmwjFJk2RnlxgBKld3A32onShheb3IasqK2s9GlKVmsB+v6UbivK0jYFYIn4TAs7Rz kpGKo0hJZL2o43XSloOcZSrKXyTQ8cv0SzoZ4iPZFISy/uFZqYA8f0dgZDnCz0DHrGJy 73RXGZaCqemiCum7GWsgdqYwwy5nWvTiUNMwySH7I07suMIjJDRYSu6Dn4OfJGZBUjrJ 4bnRdooSzndxvacJwUwAua8b5/DnCG/Ulu46rUA3RyehvuDdfJQOwOG39u5AMBhyqsbQ boYhU3mP0AK5V7yDRmUEn0rNzlaeJJXq00JDO+t0qRgH964u88aIqsGE+vyn+sYLwiYA Q9cQ== ARC-Authentication-Results: i=1; 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 sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id p41si2547762qta.19.2017.07.20.13.05.11; Thu, 20 Jul 2017 13:05:12 -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 sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A3B9C65BBB; Thu, 20 Jul 2017 20:05:11 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 C6C5B644E2; Thu, 20 Jul 2017 20:01:57 +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 3D77D65BBD; Thu, 20 Jul 2017 20:01:50 +0000 (UTC) Received: from forward1p.cmail.yandex.net (forward1p.cmail.yandex.net [77.88.31.16]) by lists.linaro.org (Postfix) with ESMTPS id C1E0F644E6 for ; Thu, 20 Jul 2017 20:00:44 +0000 (UTC) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [IPv6:2a02:6b8:0:1619::15:6]) by forward1p.cmail.yandex.net (Yandex) with ESMTP id B770B20D14 for ; Thu, 20 Jul 2017 23:00:42 +0300 (MSK) Received: from smtp4j.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp4j.mail.yandex.net (Yandex) with ESMTP id 7F7A23240DE8 for ; Thu, 20 Jul 2017 23:00:41 +0300 (MSK) Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 0hzMV06TG7-0fESJJPW; Thu, 20 Jul 2017 23:00:41 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 20 Jul 2017 23:00:28 +0300 Message-Id: <1500580834-26476-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500580834-26476-1-git-send-email-odpbot@yandex.ru> References: <1500580834-26476-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 82 Subject: [lng-odp] [PATCH v4 4/10] linux-generic: packet: add initializations for new hdr fields 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bill Fischofer Add initializations for new packet hdr fields needed to support packet references. Signed-off-by: Bill Fischofer --- /** Email created from pull request 82 (Bill-Fischofer-Linaro:pktrefs) ** https://github.com/Linaro/odp/pull/82 ** Patch: https://github.com/Linaro/odp/pull/82.patch ** Base sha: 3eeb249a4774f12d2d16ca349a591654eae620ae ** Merge commit sha: f6e0d4b8b10f1803fb4513254c404df31e3f9f3f **/ platform/linux-generic/include/odp_packet_internal.h | 4 ++++ platform/linux-generic/odp_packet.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 396d8cb5..e5887c9b 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -216,6 +216,10 @@ static inline void packet_init(odp_packet_hdr_t *pkt_hdr, uint32_t len) CONFIG_PACKET_TAILROOM; pkt_hdr->input = ODP_PKTIO_INVALID; + + /* By default packet has no references */ + pkt_hdr->unshared_len = len; + pkt_hdr->ref_hdr = NULL; } static inline void copy_packet_parser_metadata(odp_packet_hdr_t *src_hdr, diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 38879a7f..8806be8a 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -253,6 +253,9 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) pkt_hdr->p.l2_offset = 0; pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; + + /* Ensure dummy pkt hdrs used in I/O recv classification are valid */ + pkt_hdr->ref_hdr = NULL; } static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) @@ -265,6 +268,7 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; hdr->buf_hdr.seg[0].len = BASE_LEN; + packet_ref_count_set(hdr, 1); /* Link segments */ if (CONFIG_PACKET_MAX_SEGS != 1) { @@ -274,6 +278,7 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) for (i = 1; i < num; i++) { odp_buffer_hdr_t *buf_hdr; + packet_ref_count_set(pkt_hdr[i], 1); buf_hdr = &pkt_hdr[i]->buf_hdr; hdr->buf_hdr.seg[i].hdr = buf_hdr; hdr->buf_hdr.seg[i].data = buf_hdr->base_data;