From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4ADBEA0C45; Mon, 13 Sep 2021 18:46:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C47641191; Mon, 13 Sep 2021 18:45:08 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 8EB77410E9 for ; Mon, 13 Sep 2021 18:45:03 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10106"; a="201239156" X-IronPort-AV: E=Sophos;i="5.85,290,1624345200"; d="scan'208";a="201239156" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2021 09:45:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,290,1624345200"; d="scan'208";a="507429198" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com) ([10.237.223.107]) by fmsmga008.fm.intel.com with ESMTP; 13 Sep 2021 09:45:02 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Date: Mon, 13 Sep 2021 17:44:35 +0100 Message-Id: <20210913164443.16875-16-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210913164443.16875-1-cristian.dumitrescu@intel.com> References: <20210910133713.93103-1-cristian.dumitrescu@intel.com> <20210913164443.16875-1-cristian.dumitrescu@intel.com> Subject: [dpdk-dev] [PATCH V3 16/24] pipeline: enable persistent instruction meta-data X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Save the instruction meta-data for later use instead of freeing it up once the instruction translation is completed. Signed-off-by: Cristian Dumitrescu --- lib/pipeline/rte_swx_pipeline.c | 9 ++++++--- lib/pipeline/rte_swx_pipeline_internal.h | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index 8b64c57652..4099e364f5 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -6456,13 +6456,14 @@ instruction_config(struct rte_swx_pipeline *p, if (a) { a->instructions = instr; + a->instruction_data = data; a->n_instructions = n_instructions; } else { p->instructions = instr; + p->instruction_data = data; p->n_instructions = n_instructions; } - free(data); return 0; error: @@ -6811,8 +6812,8 @@ action_build(struct rte_swx_pipeline *p) { struct action *action; - p->action_instructions = calloc(p->n_actions, - sizeof(struct instruction *)); + /* p->action_instructions. */ + p->action_instructions = calloc(p->n_actions, sizeof(struct instruction *)); CHECK(p->action_instructions, ENOMEM); TAILQ_FOREACH(action, &p->actions, node) @@ -6841,6 +6842,7 @@ action_free(struct rte_swx_pipeline *p) break; TAILQ_REMOVE(&p->actions, action, node); + free(action->instruction_data); free(action->instructions); free(action); } @@ -8777,6 +8779,7 @@ rte_swx_pipeline_free(struct rte_swx_pipeline *p) if (!p) return; + free(p->instruction_data); free(p->instructions); metarray_free(p); diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h index efd136196f..7a02d6cb5f 100644 --- a/lib/pipeline/rte_swx_pipeline_internal.h +++ b/lib/pipeline/rte_swx_pipeline_internal.h @@ -693,6 +693,7 @@ struct action { struct struct_type *st; int *args_endianness; /* 0 = Host Byte Order (HBO); 1 = Network Byte Order (NBO). */ struct instruction *instructions; + struct instruction_data *instruction_data; uint32_t n_instructions; uint32_t id; }; @@ -1388,6 +1389,7 @@ struct rte_swx_pipeline { struct regarray_runtime *regarray_runtime; struct metarray_runtime *metarray_runtime; struct instruction *instructions; + struct instruction_data *instruction_data; struct thread threads[RTE_SWX_PIPELINE_THREADS_MAX]; uint32_t n_structs; -- 2.17.1