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 82AC6A04DD;
Tue, 20 Oct 2020 11:27:26 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 9ACD4D041;
Tue, 20 Oct 2020 11:14:51 +0200 (CEST)
Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com
[148.163.129.52]) by dpdk.org (Postfix) with ESMTP id C10DBC81A
for <dev@dpdk.org>; Tue, 20 Oct 2020 11:14:11 +0200 (CEST)
Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.61])
by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id
907216007F for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:11 +0000 (UTC)
Received: from us4-mdac16-73.ut7.mdlocal (unknown [10.7.64.192])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 908628009E
for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:11 +0000 (UTC)
X-Virus-Scanned: Proofpoint Essentials engine
Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.34])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 278108005B
for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:10 +0000 (UTC)
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-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id D1CDF600053
for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:09 +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.1497.2; Tue, 20 Oct 2020 10:14:00 +0100
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.1497.2 via Frontend Transport; Tue, 20 Oct 2020 10:14:00 +0100
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 09K9E0xM028412;
Tue, 20 Oct 2020 10:14:00 +0100
Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])
by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 2C3801613BE;
Tue, 20 Oct 2020 10:14:00 +0100 (BST)
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
CC: Ivan Malov <ivan.malov@oktetlabs.ru>
Date: Tue, 20 Oct 2020 10:13:05 +0100
Message-ID: <1603185222-14831-26-git-send-email-arybchenko@solarflare.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1603185222-14831-1-git-send-email-arybchenko@solarflare.com>
References: <1603183709-23420-1-git-send-email-arybchenko@solarflare.com>
<1603185222-14831-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.6.1012-25736.003
X-TM-AS-Result: No-3.402300-8.000000-10
X-TMASE-MatchedRID: S7VGIvJZFFl1zuUvhONl81ftSkmEYHZiWNbBpQ++I1lwkdIrVt8X1VDT
Kayi2ZF6pVG0HeSt+ryWGRCs++FM0t1RkEnBFAu+nFVnNmvv47uWODD/yzpvd7Zk7gsuflVKajy
hX70MWYEaArPy7J2TRUQAYu+Zw/VJ0ywZEqbRuQQaPMGCcVm9DjVfUuzvrtymR2YNIFh+clFwmP
/re/Fv5vtPFmJbG+2sXJFotwJumW5kihO6QdpZxZ4CIKY/Hg3AGdQnQSTrKGPEQdG7H66TyHEqm
8QYBtMO4O/iGw8qRmQJQheewnrWPK2gVRXQiAPDumqcaPkiPDv4MQw3pXdafVJ+vnzb7hsYR8ba
7yWJKLC33T9ZB6r8Qvv0bC9D3tKsk3UkV5Qp4wSI45Rd9ORJwFlJvEhEss3fzQahrdQz77w=
X-TM-AS-User-Approved-Sender: Yes
X-TM-AS-User-Blocked-Sender: No
X-TMASE-Result: 10--3.402300-8.000000
X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25736.003
X-MDID: 1603185250-mKO9RNwdhZtO
X-PPE-DISP: 1603185250;mKO9RNwdhZtO
Subject: [dpdk-dev] [PATCH v2 25/62] common/sfc_efx/base: support adding
VLAN POP action to a set
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: Ivan Malov <ivan.malov@oktetlabs.ru>
MAE supports stripping two tags, so this action can
be requested once or twice.
Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
---
drivers/common/sfc_efx/base/efx.h | 5 ++
drivers/common/sfc_efx/base/efx_impl.h | 7 +++
drivers/common/sfc_efx/base/efx_mae.c | 54 ++++++++++++++++++-
.../sfc_efx/rte_common_sfc_efx_version.map | 1 +
4 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h
index d37850eda6..17bfc6fdfd 100644
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -4166,6 +4166,11 @@ efx_mae_action_set_spec_fini(
__in efx_nic_t *enp,
__in efx_mae_actions_t *spec);
+LIBEFX_API
+extern __checkReturn efx_rc_t
+efx_mae_action_set_populate_vlan_pop(
+ __in efx_mae_actions_t *spec);
+
LIBEFX_API
extern __checkReturn efx_rc_t
efx_mae_action_set_populate_deliver(
diff --git a/drivers/common/sfc_efx/base/efx_impl.h b/drivers/common/sfc_efx/base/efx_impl.h
index 927324c85c..abd7f78cc2 100644
--- a/drivers/common/sfc_efx/base/efx_impl.h
+++ b/drivers/common/sfc_efx/base/efx_impl.h
@@ -1700,16 +1700,23 @@ struct efx_mae_match_spec_s {
};
typedef enum efx_mae_action_e {
+ /* These actions are strictly ordered. */
+ EFX_MAE_ACTION_VLAN_POP,
+
/* DELIVER is always the last action. */
EFX_MAE_ACTION_DELIVER,
EFX_MAE_NACTIONS
} efx_mae_action_t;
+/* MAE VLAN_POP action can handle 1 or 2 tags. */
+#define EFX_MAE_VLAN_POP_MAX_NTAGS (2)
+
typedef struct efx_mae_actions_s {
/* Bitmap of actions in spec, indexed by action type */
uint32_t emass_actions;
+ unsigned int emass_n_vlan_tags_to_pop;
efx_mport_sel_t emass_deliver_mport;
} efx_mae_actions_t;
diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c
index 1715cdc4fb..0465ddf923 100644
--- a/drivers/common/sfc_efx/base/efx_mae.c
+++ b/drivers/common/sfc_efx/base/efx_mae.c
@@ -641,6 +641,42 @@ efx_mae_action_set_spec_fini(
EFSYS_KMEM_FREE(enp->en_esip, sizeof (*spec), spec);
}
+static __checkReturn efx_rc_t
+efx_mae_action_set_add_vlan_pop(
+ __in efx_mae_actions_t *spec,
+ __in size_t arg_size,
+ __in_bcount(arg_size) const uint8_t *arg)
+{
+ efx_rc_t rc;
+
+ if (arg_size != 0) {
+ rc = EINVAL;
+ goto fail1;
+ }
+
+ if (arg != NULL) {
+ rc = EINVAL;
+ goto fail2;
+ }
+
+ if (spec->emass_n_vlan_tags_to_pop == EFX_MAE_VLAN_POP_MAX_NTAGS) {
+ rc = ENOTSUP;
+ goto fail3;
+ }
+
+ ++spec->emass_n_vlan_tags_to_pop;
+
+ return (0);
+
+fail3:
+ EFSYS_PROBE(fail3);
+fail2:
+ EFSYS_PROBE(fail2);
+fail1:
+ EFSYS_PROBE1(fail1, efx_rc_t, rc);
+ return (rc);
+}
+
static __checkReturn efx_rc_t
efx_mae_action_set_add_deliver(
__in efx_mae_actions_t *spec,
@@ -677,15 +713,20 @@ typedef struct efx_mae_action_desc_s {
} efx_mae_action_desc_t;
static const efx_mae_action_desc_t efx_mae_actions[EFX_MAE_NACTIONS] = {
+ [EFX_MAE_ACTION_VLAN_POP] = {
+ .emad_add = efx_mae_action_set_add_vlan_pop
+ },
[EFX_MAE_ACTION_DELIVER] = {
.emad_add = efx_mae_action_set_add_deliver
}
};
static const uint32_t efx_mae_action_ordered_map =
+ (1U << EFX_MAE_ACTION_VLAN_POP) |
(1U << EFX_MAE_ACTION_DELIVER);
-static const uint32_t efx_mae_action_repeat_map = 0;
+static const uint32_t efx_mae_action_repeat_map =
+ (1U << EFX_MAE_ACTION_VLAN_POP);
/*
* Add an action to an action set.
@@ -759,6 +800,14 @@ efx_mae_action_set_spec_populate(
return (rc);
}
+ __checkReturn efx_rc_t
+efx_mae_action_set_populate_vlan_pop(
+ __in efx_mae_actions_t *spec)
+{
+ return (efx_mae_action_set_spec_populate(spec,
+ EFX_MAE_ACTION_VLAN_POP, 0, NULL));
+}
+
__checkReturn efx_rc_t
efx_mae_action_set_populate_deliver(
__in efx_mae_actions_t *spec,
@@ -923,6 +972,9 @@ efx_mae_action_set_alloc(
MCDI_IN_SET_DWORD(req,
MAE_ACTION_SET_ALLOC_IN_ENCAP_HEADER_ID, EFX_MAE_RSRC_ID_INVALID);
+ MCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,
+ MAE_ACTION_SET_ALLOC_IN_VLAN_POP, spec->emass_n_vlan_tags_to_pop);
+
MCDI_IN_SET_DWORD(req,
MAE_ACTION_SET_ALLOC_IN_DELIVER, spec->emass_deliver_mport.sel);
diff --git a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map b/drivers/common/sfc_efx/rte_common_sfc_efx_version.map
index 0e0d058c8f..41c14c6451 100644
--- a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map
+++ b/drivers/common/sfc_efx/rte_common_sfc_efx_version.map
@@ -90,6 +90,7 @@ INTERNAL {
efx_mae_action_set_alloc;
efx_mae_action_set_free;
efx_mae_action_set_populate_deliver;
+ efx_mae_action_set_populate_vlan_pop;
efx_mae_action_set_spec_fini;
efx_mae_action_set_spec_init;
efx_mae_action_set_specs_equal;
--
2.17.1