From patchwork Mon Jan 22 12:00:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125405 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1118995ljf; Mon, 22 Jan 2018 04:06:32 -0800 (PST) X-Google-Smtp-Source: AH8x2274pANC1iqpJwfsY5ouO8WF06fsjQe90ayQTel6QsVawppv6t57i1oVzIDb16ar1T7ugy3b X-Received: by 10.55.26.195 with SMTP id l64mr9032594qkh.150.1516622792396; Mon, 22 Jan 2018 04:06:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516622792; cv=none; d=google.com; s=arc-20160816; b=IvWDChBNaR+Cjc5GdPHp5MlVf/oXd8taxlFMz/hmSrT/AWllBUOnifIOK/gMnFqyKa Ymhkgot3pcpB3BcrLW/v+2Bq+vW6OJeIkfu7tQTxkvCclc12KIjwE6TJtTbXVN32zi3s Oc5/9uwi8HSdC4HtJw/i4r37RU2k7jzOdCzObHjpYG1HBdbuQ5TCpdQJZjcy77BKpqTv rvRaBIeN7JtogynR5evuKUAyNTWEIP0lEEaq57mhuTZ5867xWe++xDf3MDNI3u6ABQSa a2b/FQsqH4NKku0HtVc4aiviIqqlO92Mji8SxMOR/g8GxGUUNlV3ssRXLUlabF5aud/q kGug== 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=Y/k8HJrFidhdqqdKQK7LYeLvzJzKXRNvxdkAN2FxVwk=; b=qW32YstOkBmULsM8/Nefw7IQCWh2qMbam4B90PBn9uFR0gBOkc8s3uSUGUL0/w0lhN L/K3khOw62EwI7l0Q3PQ6oFcT+z9nlS6g3MJrtrlqBEZ4b55AQTNmv0x5GnyVxb80wGc nR8z+u9BKXTgIT8GVNZGleXSa/nZwWjYmlk0ZBk/xgeyXsf70QZD+y+ccSSzwCTBH3fU OTmoePEEi1+HtazHKdmfUD9iPWp8YqrRjX/JP8ZdJ8JksmJcVUmmMQvHsBF8A+Ntp5MY QTmUvWy3tNLOKf9TJCyw3ovM3fKlKvPQyidXTMvr05oqxNXydYZNF9ODdwREbCHGU+dd PkBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id p6si3193648qtp.126.2018.01.22.04.06.32; Mon, 22 Jan 2018 04:06:32 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 1866A61798; Mon, 22 Jan 2018 12:06: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,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 9F5EF617C0; Mon, 22 Jan 2018 12:01:55 +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 6097861748; Mon, 22 Jan 2018 12:01:32 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id E6ACD617A1 for ; Mon, 22 Jan 2018 12:00:28 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward105o.mail.yandex.net (Yandex) with ESMTP id DABD544413CE for ; Mon, 22 Jan 2018 15:00:24 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Bva3kz61QK-0O0CnoEY; Mon, 22 Jan 2018 15:00:24 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id WD5CZQ6bpO-0OQeJ2j5; Mon, 22 Jan 2018 15:00:24 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 22 Jan 2018 15:00:18 +0300 Message-Id: <1516622419-10351-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516622419-10351-1-git-send-email-odpbot@yandex.ru> References: <1516622419-10351-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 392 Subject: [lng-odp] [PATCH API-NEXT v3 5/6] linux-gen: packet: initialize user ptr to NULL 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: Petri Savolainen Use a flag to record if user pointer has been set. This avoids resetting the pointer in every alloc. Signed-off-by: Petri Savolainen --- /** Email created from pull request 392 (psavol:next-user-ptr-init-rebase) ** https://github.com/Linaro/odp/pull/392 ** Patch: https://github.com/Linaro/odp/pull/392.patch ** Base sha: 5fba303faf04d29b616f687ce1f721400b2c6f9c ** Merge commit sha: c91d727cb8abe5b21a4fb430ee09541af51b40e4 **/ .../include/odp/api/plat/packet_inline_types.h | 12 +++++++++--- .../linux-generic/include/odp/api/plat/packet_inlines.h | 7 +++++++ platform/linux-generic/odp_packet.c | 13 +++++++++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index dbfc66411..e8ebdabb1 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -44,6 +44,7 @@ typedef struct _odp_packet_inline_offset_t { uint16_t flow_hash; uint16_t timestamp; uint16_t input_flags; + uint16_t flags; } _odp_packet_inline_offset_t; @@ -109,7 +110,12 @@ typedef union { uint32_t all_flags; struct { - uint32_t reserved1: 12; + uint32_t reserved1: 11; + + /* + * Init flags + */ + uint32_t user_ptr_set: 1; /* User has set a non-NULL value */ /* * Packet output flags @@ -135,8 +141,8 @@ typedef union { /* Flag groups */ struct { - uint32_t reserved2: 12; - uint32_t other: 12; /* All other flags */ + uint32_t reserved2: 11; + uint32_t other: 13; /* All other flags */ uint32_t error: 8; /* All error flags */ } all; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 3416b9949..fe22d70a8 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -102,6 +102,13 @@ static inline int _odp_packet_num_segs(odp_packet_t pkt) /** @internal Inline function @param pkt @return */ static inline void *_odp_packet_user_ptr(odp_packet_t pkt) { + _odp_packet_flags_t flags; + + flags.all_flags = _odp_pkt_get(pkt, uint32_t, flags); + + if (flags.user_ptr_set == 0) + return NULL; + return _odp_pkt_get(pkt, void *, user_ptr); } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 033981dc2..ec460ea04 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -42,7 +42,8 @@ const _odp_packet_inline_offset_t ODP_ALIGNED_CACHE _odp_packet_inline = { .l4_offset = offsetof(odp_packet_hdr_t, p.l4_offset), .flow_hash = offsetof(odp_packet_hdr_t, flow_hash), .timestamp = offsetof(odp_packet_hdr_t, timestamp), - .input_flags = offsetof(odp_packet_hdr_t, p.input_flags) + .input_flags = offsetof(odp_packet_hdr_t, p.input_flags), + .flags = offsetof(odp_packet_hdr_t, p.flags) }; @@ -1259,7 +1260,15 @@ int odp_packet_input_index(odp_packet_t pkt) void odp_packet_user_ptr_set(odp_packet_t pkt, const void *ptr) { - packet_hdr(pkt)->buf_hdr.user_ptr = ptr; + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + + if (odp_unlikely(ptr == NULL)) { + pkt_hdr->p.flags.user_ptr_set = 0; + return; + } + + pkt_hdr->buf_hdr.user_ptr = ptr; + pkt_hdr->p.flags.user_ptr_set = 1; } int odp_packet_l2_offset_set(odp_packet_t pkt, uint32_t offset)