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 5ACC0A0563; Wed, 15 Apr 2020 10:25:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ECE7B1D5A8; Wed, 15 Apr 2020 10:20:32 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 281F91D5F1 for ; Wed, 15 Apr 2020 10:20:28 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id d24so983549pll.8 for ; Wed, 15 Apr 2020 01:20:28 -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=pS+9yWGv4uKgNhltBAApmnhb1slz3B5nvMDJn6GW8c4=; b=aCO0HT6D043IjckZBiOzprCPOwsf0ERgun3WxOlAIR353iigyvN5FcNsCAZZQP+8xp JeJps5kXUTXCAMx8dSs5RwKpHA5cFCOm22ulETnXgmcnbiM5qlnRd815cFId2L32ZbaT 3g668FTb7kqGypB8lgAAzShkrKli4mHlKKn9E= 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=pS+9yWGv4uKgNhltBAApmnhb1slz3B5nvMDJn6GW8c4=; b=YOyZb5+0l45k5q+Isn9YNGnPj6d7Uc95R2RlF4wB08oJKYGQAak3+bdlfruKap0fJV LylwmOsvldCOFCjI4md+ir+176bI6a1qv2oTLbNzvfh33kAuc774G9pr8f4DYaAx41HO rRrZ+Ki0UirIhPPUoRgWS1Ftcx7X1JyQcbFBYiDRjp+0q2pbq+FtY/GAGZlvIBriFxWx kRfysxSzBiJGLQrEof2jOxpGWMuQGysxbbAvyIOmKmYfKUEzxFsoSoqWHwIA0oACewtL 02Z3y+af5NXkhJrUmTUaoI/6Cibfee/FVMKgk1R/c9E2f+n8SPbKoD173NBUv1Yio8gy F+kQ== X-Gm-Message-State: AGi0PuaE0tAUOkVt1M33wpo0r4WuX1m3chIhwpQFyNiC5uE8DlWjZq8D LbZ/SoDMw3vd2UqkX5oTJ9Aeh6Vj2+p/xFH7HmQ/UMzw63whzD4//m3KorOEffo0R9kOk7VqK2n VQDh5OtN8GejGtmRQiWEMrIiNx+lVgU/PAD/pouTEfeL4yZG6zquKgZFp+sTHJVpUIvyj X-Google-Smtp-Source: APiQypITib+jAbNmu3fMV3Hkd4JSsWSsB8sYZaCBOxvckFq0jJ1boi4hVsm9vqa1r4zeQxVllqPPvQ== X-Received: by 2002:a17:90a:315:: with SMTP id 21mr4496121pje.96.1586938826900; Wed, 15 Apr 2020 01:20:26 -0700 (PDT) Received: from S60.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id fy21sm3819019pjb.25.2020.04.15.01.20.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2020 01:20:26 -0700 (PDT) From: Venkat Duvvuru To: dev@dpdk.org Cc: Kishore Padmanabha , Venkat Duvvuru Date: Wed, 15 Apr 2020 13:49:01 +0530 Message-Id: <1586938751-32808-25-git-send-email-venkatkumar.duvvuru@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1586938751-32808-1-git-send-email-venkatkumar.duvvuru@broadcom.com> References: <1586852011-37536-1-git-send-email-venkatkumar.duvvuru@broadcom.com> <1586938751-32808-1-git-send-email-venkatkumar.duvvuru@broadcom.com> Subject: [dpdk-dev] [PATCH v4 24/34] net/bnxt: match rte flow actions with flow template actions 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: Kishore Padmanabha This patch does the following 1. Takes act_bitmap generated from the rte_flow_actions 2. Iterates through the static act_bitmap list 3. Returns success if a match is found, otherwise an error Signed-off-by: Kishore Padmanabha Signed-off-by: Venkat Duvvuru Reviewed-by: Lance Richardson Reviewed-by: Ajit Kumar Khaparde --- drivers/net/bnxt/tf_ulp/ulp_matcher.c | 36 +++++++++++++++++++++++++++ drivers/net/bnxt/tf_ulp/ulp_matcher.h | 9 +++++++ drivers/net/bnxt/tf_ulp/ulp_template_db.c | 12 +++++++++ drivers/net/bnxt/tf_ulp/ulp_template_db.h | 2 ++ drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 10 ++++++++ 5 files changed, 69 insertions(+) diff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.c b/drivers/net/bnxt/tf_ulp/ulp_matcher.c index f367e4c..ec4121d 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_matcher.c +++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.c @@ -150,3 +150,39 @@ ulp_matcher_pattern_match(enum ulp_direction_type dir, *class_id = 0; return BNXT_TF_RC_ERROR; } + +/* + * Function to handle the matching of RTE Flows and validating + * the action against the flow templates. + */ +int32_t +ulp_matcher_action_match(enum ulp_direction_type dir, + struct ulp_rte_act_bitmap *act_bitmap, + uint32_t *act_id) +{ + struct bnxt_ulp_action_match_info *sel_act_match; + uint32_t act_num, idx; + + /* Select the ingress or egress template to match against */ + if (dir == ULP_DIR_INGRESS) { + sel_act_match = ulp_ingress_act_match_list; + act_num = BNXT_ULP_INGRESS_ACT_MATCH_SZ; + } else { + sel_act_match = ulp_egress_act_match_list; + act_num = BNXT_ULP_EGRESS_ACT_MATCH_SZ; + } + + /* Loop through the list of action templates to find the match */ + for (idx = 0; idx < act_num; idx++, sel_act_match++) { + if (!ULP_BITSET_CMP(&sel_act_match->act_bitmap, + act_bitmap)) { + *act_id = sel_act_match->act_tmpl_id; + BNXT_TF_DBG(DEBUG, "Found matching act template %u\n", + *act_id); + return BNXT_TF_RC_SUCCESS; + } + } + BNXT_TF_DBG(DEBUG, "Did not find any matching action template\n"); + *act_id = 0; + return BNXT_TF_RC_ERROR; +} diff --git a/drivers/net/bnxt/tf_ulp/ulp_matcher.h b/drivers/net/bnxt/tf_ulp/ulp_matcher.h index 57a161d..c818bbe 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_matcher.h +++ b/drivers/net/bnxt/tf_ulp/ulp_matcher.h @@ -23,4 +23,13 @@ ulp_matcher_pattern_match(enum ulp_direction_type dir, struct ulp_rte_act_bitmap *act_bitmap, uint32_t *class_id); +/* + * Function to handle the matching of RTE Flows and validating + * the action against the flow templates. + */ +int32_t +ulp_matcher_action_match(enum ulp_direction_type dir, + struct ulp_rte_act_bitmap *act_bitmap, + uint32_t *act_id); + #endif /* ULP_MATCHER_H_ */ diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.c b/drivers/net/bnxt/tf_ulp/ulp_template_db.c index 9fc4b08..5a5b1f1 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db.c +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.c @@ -1121,6 +1121,18 @@ struct bnxt_ulp_mapper_ident_info ulp_ident_list[] = { } }; +struct bnxt_ulp_action_match_info ulp_ingress_act_match_list[] = { + { + .act_bitmap = { .bits = + BNXT_ULP_ACTION_BIT_MARK | + BNXT_ULP_ACTION_BIT_RSS }, + .act_tmpl_id = 0 + } +}; + +struct bnxt_ulp_action_match_info ulp_egress_act_match_list[] = { +}; + struct bnxt_ulp_mapper_tbl_list_info ulp_act_tmpl_list[] = { [((0 << BNXT_ULP_LOG2_MAX_NUM_DEV) | BNXT_ULP_DEVICE_ID_WH_PLUS)] = { .device_name = BNXT_ULP_DEVICE_ID_WH_PLUS, diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db.h b/drivers/net/bnxt/tf_ulp/ulp_template_db.h index 319500a..f4850bf 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_db.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_db.h @@ -15,6 +15,8 @@ #define BNXT_ULP_LOG2_MAX_NUM_DEV 2 #define BNXT_ULP_INGRESS_HDR_MATCH_SZ 2 #define BNXT_ULP_EGRESS_HDR_MATCH_SZ 1 +#define BNXT_ULP_INGRESS_ACT_MATCH_SZ 2 +#define BNXT_ULP_EGRESS_ACT_MATCH_SZ 1 enum bnxt_ulp_action_bit { BNXT_ULP_ACTION_BIT_MARK = 0x0000000000000001, diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h index dd06fb1..0e811ec 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h +++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h @@ -62,6 +62,16 @@ extern struct bnxt_ulp_header_match_info ulp_egress_hdr_match_list[]; /* Flow field match Information Structure Array defined in template source*/ extern struct bnxt_ulp_matcher_field_info ulp_field_match[]; +/* Flow Matcher Action structures */ +struct bnxt_ulp_action_match_info { + struct ulp_rte_act_bitmap act_bitmap; + uint32_t act_tmpl_id; +}; + +/* Flow Matcher templates Structure Array defined in template source */ +extern struct bnxt_ulp_action_match_info ulp_ingress_act_match_list[]; +extern struct bnxt_ulp_action_match_info ulp_egress_act_match_list[]; + /* Device specific parameters */ struct bnxt_ulp_device_params { uint8_t description[16]; -- 2.7.4