From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D86D1A0573; Thu, 5 Mar 2020 11:48:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A1EAB1C01E; Thu, 5 Mar 2020 11:48:13 +0100 (CET) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 4903F1BFF1 for ; Thu, 5 Mar 2020 11:48:08 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us4.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 04691800061 for ; Thu, 5 Mar 2020 10:48:07 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 5 Mar 2020 10:48:01 +0000 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 5 Mar 2020 10:48:01 +0000 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 025Am1LQ016221; Thu, 5 Mar 2020 10:48:01 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 4973F161250; Thu, 5 Mar 2020 10:48:01 +0000 (GMT) From: Andrew Rybchenko To: CC: Ivan Malov Date: Thu, 5 Mar 2020 10:47:50 +0000 Message-ID: <1583405273-14176-5-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1583405273-14176-1-git-send-email-arybchenko@solarflare.com> References: <1583405273-14176-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1020-25270.003 X-TM-AS-Result: No-2.948200-8.000000-10 X-TMASE-MatchedRID: tJBzqNGT4BrIVeuQnVnkwMqlR6dnL7KewZJymmK7rZL5+tteD5RzhVcc sLFgYQ2ETgLCpjD2796Pbtzbp+lSUaH2g9syPs88PwKTD1v8YV5MkOX0UoduuVVkJxysad/IYZK N7WXQYpTZpnQsEwZkvSlZbcpUYplkNtywwIf5ksWeAiCmPx4NwBnUJ0Ek6yhjxEHRux+uk8hxKp vEGAbTDlGlsX220R0mb4OC2UKFfQZM4qIDUDaKB+hCflZZlMpAUI5xulRneMtlxOw0E2wcqlVGR k/R/2NS9m+HH7VyXqbG4YbaY/H9uJN1JFeUKeMEiOOUXfTkScBZSbxIRLLN380Goa3UM++8 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--2.948200-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1020-25270.003 X-MDID: 1583405287-Ff7A4VNK2RVh Subject: [dpdk-dev] [PATCH 4/7] net/sfc: introduce flow allocation and free path X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" From: Ivan Malov Riverhead boards maintain support for MAE, a low-level Match-Action Engine. The upcoming patches will bring support for MAE to RTE flow implementation. A follow-up patch will introduce MAE-specific specification cleanup method. In order to prepare for the patch, introduce flow allocation and free path. Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_flow.c | 49 ++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c index 9be1f9ac8..2ddde6168 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -2309,6 +2309,27 @@ sfc_flow_parse(struct rte_eth_dev *dev, return rc; } +static struct rte_flow * +sfc_flow_zmalloc(struct rte_flow_error *error) +{ + struct rte_flow *flow; + + flow = rte_zmalloc("sfc_rte_flow", sizeof(*flow), 0); + if (flow == NULL) { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "Failed to allocate memory"); + } + + return flow; +} + +static void +sfc_flow_free(__rte_unused struct sfc_adapter *sa, struct rte_flow *flow) +{ + rte_free(flow); +} + static int sfc_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -2316,11 +2337,19 @@ sfc_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_action actions[], struct rte_flow_error *error) { - struct rte_flow flow; + struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev); + struct rte_flow *flow; + int rc; - memset(&flow, 0, sizeof(flow)); + flow = sfc_flow_zmalloc(error); + if (flow == NULL) + return -rte_errno; - return sfc_flow_parse(dev, attr, pattern, actions, &flow, error); + rc = sfc_flow_parse(dev, attr, pattern, actions, flow, error); + + sfc_flow_free(sa, flow); + + return rc; } static struct rte_flow * @@ -2334,13 +2363,9 @@ sfc_flow_create(struct rte_eth_dev *dev, struct rte_flow *flow = NULL; int rc; - flow = rte_zmalloc("sfc_rte_flow", sizeof(*flow), 0); - if (flow == NULL) { - rte_flow_error_set(error, ENOMEM, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "Failed to allocate memory"); + flow = sfc_flow_zmalloc(error); + if (flow == NULL) goto fail_no_mem; - } rc = sfc_flow_parse(dev, attr, pattern, actions, flow, error); if (rc != 0) @@ -2368,7 +2393,7 @@ sfc_flow_create(struct rte_eth_dev *dev, TAILQ_REMOVE(&sa->flow_list, flow, entries); fail_bad_value: - rte_free(flow); + sfc_flow_free(sa, flow); sfc_adapter_unlock(sa); fail_no_mem: @@ -2393,7 +2418,7 @@ sfc_flow_remove(struct sfc_adapter *sa, } TAILQ_REMOVE(&sa->flow_list, flow, entries); - rte_free(flow); + sfc_flow_free(sa, flow); return rc; } @@ -2497,7 +2522,7 @@ sfc_flow_fini(struct sfc_adapter *sa) while ((flow = TAILQ_FIRST(&sa->flow_list)) != NULL) { TAILQ_REMOVE(&sa->flow_list, flow, entries); - rte_free(flow); + sfc_flow_free(sa, flow); } } -- 2.17.1