From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id DC14CA0577;
Tue, 14 Apr 2020 10:20:15 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id F0FA31D164;
Tue, 14 Apr 2020 10:15:06 +0200 (CEST)
Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com
[209.85.210.194]) by dpdk.org (Postfix) with ESMTP id 2FC1F1D160
for <dev@dpdk.org>; Tue, 14 Apr 2020 10:15:05 +0200 (CEST)
Received: by mail-pf1-f194.google.com with SMTP id u65so5742048pfb.4
for <dev@dpdk.org>; Tue, 14 Apr 2020 01:15:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=dTjmtNBYLz+Emc0kXrwGLp1L/m8tb/HvqPLLOaJbPvc=;
b=SstseJJ9N10XLGJKS8jUbo6UlwJ2Ybb5yLIlGaGgV0M22UqRqcsaSXq31SKrjzTI2j
GLOdeK74D7/wfv9nan5FhvJXHwKvD1kN1DyeQmQzpj1SHNjkKoW32pedhw7S6hTRXTJo
UnWbmKzg+nmFngwiUrmYhdOlax+K9HOe/Ov34=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=dTjmtNBYLz+Emc0kXrwGLp1L/m8tb/HvqPLLOaJbPvc=;
b=rlFZJ1UFljOaaK2qRyKKpnd4DMLScJmfMKdlN/ussxn3WZn2pExz5RRVOzWWATcFUK
xhFYr0AvO1JlqDt4ov0ppa9yDIDDxSaVRuVDvMztPUhuD6HhpJjctQVyOPjUI8oAkl7A
2fGO08iw2R+DmhXsHI4xNdwQ3YZuFGOSPrcTl22bUm9brYB2steVGoC3uXo5lDuX1Tms
vpFdTSpwLkz+GVNnfRhheg6Ol8IICoQUc+RY9uDUgSQg7WXXEr0yD6U/3AeKTRAxuRUv
tgLqsk5FJ9mvxGpbLTooQZ9WJztdwsGOsmjQZrpnnSX+5nnleloFRuLeEtgzhEdZl6Oy
TyPw==
X-Gm-Message-State: AGi0PuaILt/lttEIyWDTVRo9qE908bmh1CtYpOR+CvuMwIUHHKaXfGFQ
saPk1CuyF3UGVwqFGgyAYJDEzpV2+1UK3OBl9o9a1DmFtNUtoIfxFNTwOqrKZT+rSzwxjcNGbuv
XELwkgEDDHDndFjhEYGmUeMDCVqseveGBu0snuH86DuCEUxt4AVNRdC3wWbzC6Vb76SaK
X-Google-Smtp-Source: APiQypJN+Kn4VauhgT+RlWW3+fgMd0BLp3YDIBSW0au1chdI321HtXCtbUMIZqqQPqVj8piz5LxWlw==
X-Received: by 2002:a63:cc06:: with SMTP id x6mr12137999pgf.143.1586852103899;
Tue, 14 Apr 2020 01:15:03 -0700 (PDT)
Received: from S60.dhcp.broadcom.net ([192.19.234.250])
by smtp.gmail.com with ESMTPSA id e196sm671176pfh.43.2020.04.14.01.15.01
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Tue, 14 Apr 2020 01:15:03 -0700 (PDT)
From: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
To: dev@dpdk.org
Cc: Kishore Padmanabha <kishore.padmanabha@broadcom.com>,
Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Date: Tue, 14 Apr 2020 13:43:27 +0530
Message-Id: <1586852011-37536-31-git-send-email-venkatkumar.duvvuru@broadcom.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1586852011-37536-1-git-send-email-venkatkumar.duvvuru@broadcom.com>
References: <1586806811-21736-1-git-send-email-venkatkumar.duvvuru@broadcom.com>
<1586852011-37536-1-git-send-email-venkatkumar.duvvuru@broadcom.com>
Subject: [dpdk-dev] [PATCH v3 30/34] net/bnxt: add support for rte flow
flush driver hook
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
This patch does the following
1. Gets the ulp session information from eth_dev
2. Fetches the rte_flow table associated with this session
3. Iterates through all the flows in the flow table
4. Calls ulp_mapper_resources_free which releases the key & action
tables associated with each flow
Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Reviewed-by: Lance Richardson <lance.richardson@broadcom.com>
Reviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 3 ++
drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 33 +++++++++++++++-
drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 69 +++++++++++++++++++++++++++++++++
drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 11 ++++++
4 files changed, 115 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index 3795c6d..56e08f2 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -517,6 +517,9 @@ bnxt_ulp_deinit(struct bnxt *bp)
if (!session)
return;
+ /* clean up regular flows */
+ ulp_flow_db_flush_flows(&bp->ulp_ctx, BNXT_ULP_REGULAR_FLOW_TABLE);
+
/* cleanup the eem table scope */
ulp_eem_tbl_scope_deinit(bp, &bp->ulp_ctx);
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
index 35099a3..4958895 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
@@ -262,11 +262,42 @@ bnxt_ulp_flow_destroy(struct rte_eth_dev *dev,
return ret;
}
+/* Function to destroy the rte flows. */
+static int32_t
+bnxt_ulp_flow_flush(struct rte_eth_dev *eth_dev,
+ struct rte_flow_error *error)
+{
+ struct bnxt_ulp_context *ulp_ctx;
+ int32_t ret;
+ struct bnxt *bp;
+
+ ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(eth_dev);
+ if (!ulp_ctx) {
+ BNXT_TF_DBG(ERR, "ULP context is not initialized\n");
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to flush flow.");
+ return -EINVAL;
+ }
+ bp = eth_dev->data->dev_private;
+
+ /* Free the resources for the last device */
+ if (!ulp_ctx_deinit_allowed(bp))
+ return 0;
+
+ ret = ulp_flow_db_flush_flows(ulp_ctx, BNXT_ULP_REGULAR_FLOW_TABLE);
+ if (ret)
+ rte_flow_error_set(error, ret,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to flush flow.");
+ return ret;
+}
+
const struct rte_flow_ops bnxt_ulp_rte_flow_ops = {
.validate = bnxt_ulp_flow_validate,
.create = bnxt_ulp_flow_create,
.destroy = bnxt_ulp_flow_destroy,
- .flush = NULL,
+ .flush = bnxt_ulp_flow_flush,
.query = NULL,
.isolate = NULL
};
diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
index ee703a1..aed5078 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
@@ -555,3 +555,72 @@ int32_t ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
/* all good, return success */
return 0;
}
+
+/** Get the flow database entry iteratively
+ *
+ * flow_tbl [in] Ptr to flow table
+ * fid [in/out] The index to the flow entry
+ *
+ * returns 0 on success and negative on failure.
+ */
+static int32_t
+ulp_flow_db_next_entry_get(struct bnxt_ulp_flow_tbl *flowtbl,
+ uint32_t *fid)
+{
+ uint32_t lfid = *fid;
+ uint32_t idx;
+ uint64_t bs;
+
+ do {
+ lfid++;
+ if (lfid >= flowtbl->num_flows)
+ return -ENOENT;
+ idx = lfid / ULP_INDEX_BITMAP_SIZE;
+ while (!(bs = flowtbl->active_flow_tbl[idx])) {
+ idx++;
+ if ((idx * ULP_INDEX_BITMAP_SIZE) >= flowtbl->num_flows)
+ return -ENOENT;
+ }
+ lfid = (idx * ULP_INDEX_BITMAP_SIZE) + __builtin_clzl(bs);
+ if (*fid >= lfid) {
+ BNXT_TF_DBG(ERR, "Flow Database is corrupt\n");
+ return -ENOENT;
+ }
+ } while (!ulp_flow_db_active_flow_is_set(flowtbl, lfid));
+
+ /* all good, return success */
+ *fid = lfid;
+ return 0;
+}
+
+/*
+ * Flush all flows in the flow database.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * tbl_idx [in] The index to table
+ *
+ * returns 0 on success or negative number on failure
+ */
+int32_t ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx,
+ uint32_t idx)
+{
+ uint32_t fid = 0;
+ struct bnxt_ulp_flow_db *flow_db;
+ struct bnxt_ulp_flow_tbl *flow_tbl;
+
+ if (!ulp_ctx) {
+ BNXT_TF_DBG(ERR, "Invalid Argument\n");
+ return -EINVAL;
+ }
+
+ flow_db = bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctx);
+ if (!flow_db) {
+ BNXT_TF_DBG(ERR, "Flow database not found\n");
+ return -EINVAL;
+ }
+ flow_tbl = &flow_db->flow_tbl[idx];
+ while (!ulp_flow_db_next_entry_get(flow_tbl, &fid))
+ (void)ulp_mapper_resources_free(ulp_ctx, fid, idx);
+
+ return 0;
+}
diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h
index eb5effa..5435415 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h
@@ -142,4 +142,15 @@ int32_t ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
enum bnxt_ulp_flow_db_tables tbl_idx,
uint32_t fid);
+/*
+ * Flush all flows in the flow database.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * tbl_idx [in] The index to table
+ *
+ * returns 0 on success or negative number on failure
+ */
+int32_t ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx,
+ uint32_t idx);
+
#endif /* _ULP_FLOW_DB_H_ */
--
2.7.4