Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Yevhen Orlov <yevhen.orlov@plvision.eu>
To:     netdev@vger.kernel.org
Cc:     Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>,
        Taras Chornyi <taras.chornyi@plvision.eu>,
        Mickey Rachamim <mickeyr@marvell.com>,
        Serhiy Pshyk <serhiy.pshyk@plvision.eu>,
        Yevhen Orlov <yevhen.orlov@plvision.eu>,
        Taras Chornyi <tchornyi@marvell.com>,
        Oleksandr Mazur <oleksandr.mazur@plvision.eu>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 2/3] net: marvell: prestera: add hardware router objects accounting for lpm
Date:   Wed, 16 Feb 2022 03:05:56 +0200
Message-Id: <20220216010557.11483-3-yevhen.orlov@plvision.eu>
In-Reply-To: <20220216010557.11483-1-yevhen.orlov@plvision.eu>
References: <20220216010557.11483-1-yevhen.orlov@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?b+AwrkSPpvgw6xzT7uL2xalxqVbMQf1tekOrW5c+vY8DXtPV+OJ7WGLMSdp+?=
 =?us-ascii?Q?El1rEJd0rli3CCCpEroyl9NHK49O42t05HwjWhBuTuPVMMxgIrw7FBigWn8a?=
 =?us-ascii?Q?lL+GZoXNqafM4yLDiXi9wDPWuCFXxBviDuW5BtBfKaH+afMy3vOIyH0/L2CT?=
 =?us-ascii?Q?SUd7T7ONML8KUxAlCZCPRZEqcVQ1fBOx4UGzu46HOfLFU1up2ng6YNsMxLia?=
 =?us-ascii?Q?9rD+bX7ltdP/wznMMLJR/hbRhQ9zJFNrVBmkMlVfDQyG+7P+/pY+254J1pLT?=
 =?us-ascii?Q?ZtG7dQdOL0RizSiTHn5UHqH+6UPijt29bDqwC78q9cLOH3FMbC1vdGS4bh9E?=
 =?us-ascii?Q?y5HilzoBU+y99gMWAnKM9iAUCYNax4tBZg6aacLXTnuZ+qvCxAdQVE0UhFc0?=
 =?us-ascii?Q?pK9slZtvMt662R7cip8mLzhaw28U5i2//WtXmxoUfhCUYPjsJOleqkcqFyYx?=
 =?us-ascii?Q?3q23Rm3l3dsPV5YzIq94otWBAD8+tg6xBoWO7Y278LuLgLgZOcmpG930QIbY?=
 =?us-ascii?Q?NOUS4sF3dw3QQ3Bb5z7MzT3xo2atvNRIRq2EY6WCyBfIOBAasYuze0z8oqID?=
 =?us-ascii?Q?gEVwvNoQakblH43Rd4mCl4LlTJXld/kiqcwGN57lOc4YM+vJ8XZMzxbnTSdZ?=
 =?us-ascii?Q?K+KMPudEMaWkOmsbhozG7KCF5lqAWoMVt9zAUJfoysuXobN5mn0V49K5EvTq?=
 =?us-ascii?Q?XeQDr8l8VSZ3K1MroGXJDWOxOxWDfzMT/3+RGqpBq7RY3+MM8Izo3V6z/DFu?=
 =?us-ascii?Q?LvociJM5tAHl3lCCFOyMdZ0fifXW9agPVIczbs2iveTWUHazq/BJj1ooTOCz?=
 =?us-ascii?Q?u4HBUARKBYiBisRoqRKizibCfxG5jE2gnXlalDPNDxiQWrWSNxwECKUBVYta?=
 =?us-ascii?Q?9QvZGBoSdmHmk6uEEQNjirKF+gauT2+ycmXAjdBApP8iGzXIokJlt7EAVva2?=
 =?us-ascii?Q?eQiFdmQLG2FcvUrkHQKN6zESsQxFpzRQRo0U/rWmgkduRi3GJA9XiGvWZxHt?=
 =?us-ascii?Q?L647C0l73Azv2yHQN6ftHe6EjBNNx4FIvUj0Xg129dIpiU9+69E02et09V/L?=
 =?us-ascii?Q?Xfckm1p3l+i5iOBS8W+nPMHZ6UaaXZ8YZ/lfUjXWGfJBhUicuRU2xYgKqNS1?=
 =?us-ascii?Q?6WTI40EVoaR+XoCFmVO9Tbu8V97ryp6bOQ0VQJSJrEO4MmCoalGMDP06ewdE?=
 =?us-ascii?Q?E2/nyiJSrFhQ/rJgYgeCHwQpY4KoZdxrAEvJU2F0Q92JoNDIK5U5WDdKDy7k?=
 =?us-ascii?Q?I9pcdOD2EATM+xLaTdVgASDIRIqD4pNmzVslFLgAMcBu2ZC/vCru2/QMbbW/?=
 =?us-ascii?Q?O9cEiC5IsrWmhCMEjKB/B4pv3kTQuI90r+361Lf/RSVmc2KKbveNdNKWVIE5?=
 =?us-ascii?Q?Osea/w2UEg72zpAXDgKpfsgKldX2bth+x+WityG/twHeTPPR1UD5ydIjdPX0?=
 =?us-ascii?Q?JeDPCZbfg+lySNMDqqDraps8c/armlEzddVNBUTKGFcwx9YQfYSdLXN3v/t4?=
 =?us-ascii?Q?lymZuJT5Yfg44oSU1iteQAR4PBjSy7XQnVtvrNnQPAFRdqt32VGKlMP3UXrQ?=
 =?us-ascii?Q?z5PcaqeNgnSybBQ6eyPDOXYYAOECqbm3bPwIy9vn+ncW/hvLG5nYxwkS2FLK?=
 =?us-ascii?Q?VBbIxKGoOqqJpSKF9OzxdsqZxzleKnVrrLgDOD27PG/BK72Zo4VcYEITp2jG?=
 =?us-ascii?Q?Ho5Dsg=3D=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: 4327a48f-388b-454f-5695-08d9f0e8b85b
X-MS-Exchange-CrossTenant-AuthSource: AM9P190MB1122.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 01:07:36.6958
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 73hmy2GFJ1F9kMeC53Iv7i5fmT7wAzmjhj61XheVkMSJn6OTBuEtTzA97gqMRDjTXvLnGD8Jh04F1fjOJ7KyXaMWLnTFgUOkdE37R2paWos=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P190MB1169
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add new router_hw object "fib_node". For now it support only DROP and
TRAP mode.

Co-developed-by: Taras Chornyi <tchornyi@marvell.com>
Signed-off-by: Taras Chornyi <tchornyi@marvell.com>
Co-developed-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
Signed-off-by: Yevhen Orlov <yevhen.orlov@plvision.eu>
---
 .../net/ethernet/marvell/prestera/prestera.h  |   1 +
 .../marvell/prestera/prestera_router_hw.c     | 132 +++++++++++++++++-
 .../marvell/prestera/prestera_router_hw.h     |  44 ++++++
 3 files changed, 170 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera.h b/drivers/net/ethernet/marvell/prestera/prestera.h
index 2fd9ef2fe5d6..dcaddf685d21 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera.h
+++ b/drivers/net/ethernet/marvell/prestera/prestera.h
@@ -281,6 +281,7 @@ struct prestera_router {
 	struct prestera_switch *sw;
 	struct list_head vr_list;
 	struct list_head rif_entry_list;
+	struct rhashtable fib_ht;
 	struct notifier_block inetaddr_nb;
 	struct notifier_block inetaddr_valid_nb;
 };
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
index e5592b69ad37..d62adb970dd5 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
@@ -9,23 +9,41 @@
 #include "prestera_acl.h"
 
 /*            +--+
- *   +------->|vr|
- *   |        +--+
- *   |
- * +-+-------+
- * |rif_entry|
- * +---------+
- *  Rif is
+ *   +------->|vr|<-+
+ *   |        +--+  |
+ *   |              |
+ * +-+-------+   +--+---+-+
+ * |rif_entry|   |fib_node|
+ * +---------+   +--------+
+ *  Rif is        Fib - is exit point
  *  used as
  *  entry point
  *  for vr in hw
  */
 
+#define PRESTERA_NHGR_UNUSED (0)
+#define PRESTERA_NHGR_DROP (0xFFFFFFFF)
+
+static const struct rhashtable_params __prestera_fib_ht_params = {
+	.key_offset  = offsetof(struct prestera_fib_node, key),
+	.head_offset = offsetof(struct prestera_fib_node, ht_node),
+	.key_len     = sizeof(struct prestera_fib_key),
+	.automatic_shrinking = true,
+};
+
 int prestera_router_hw_init(struct prestera_switch *sw)
 {
+	int err;
+
+	err = rhashtable_init(&sw->router->fib_ht,
+			      &__prestera_fib_ht_params);
+	if (err)
+		goto err_fib_ht_init;
+
 	INIT_LIST_HEAD(&sw->router->vr_list);
 	INIT_LIST_HEAD(&sw->router->rif_entry_list);
 
+err_fib_ht_init:
 	return 0;
 }
 
@@ -33,6 +51,7 @@ void prestera_router_hw_fini(struct prestera_switch *sw)
 {
 	WARN_ON(!list_empty(&sw->router->vr_list));
 	WARN_ON(!list_empty(&sw->router->rif_entry_list));
+	rhashtable_destroy(&sw->router->fib_ht);
 }
 
 static struct prestera_vr *__prestera_vr_find(struct prestera_switch *sw,
@@ -212,3 +231,102 @@ prestera_rif_entry_create(struct prestera_switch *sw,
 err_kzalloc:
 	return NULL;
 }
+
+struct prestera_fib_node *
+prestera_fib_node_find(struct prestera_switch *sw, struct prestera_fib_key *key)
+{
+	struct prestera_fib_node *fib_node;
+
+	fib_node = rhashtable_lookup_fast(&sw->router->fib_ht, key,
+					  __prestera_fib_ht_params);
+	return IS_ERR(fib_node) ? NULL : fib_node;
+}
+
+static void __prestera_fib_node_destruct(struct prestera_switch *sw,
+					 struct prestera_fib_node *fib_node)
+{
+	struct prestera_vr *vr;
+
+	vr = fib_node->info.vr;
+	prestera_hw_lpm_del(sw, vr->hw_vr_id, fib_node->key.addr.u.ipv4,
+			    fib_node->key.prefix_len);
+	switch (fib_node->info.type) {
+	case PRESTERA_FIB_TYPE_TRAP:
+		break;
+	case PRESTERA_FIB_TYPE_DROP:
+		break;
+	default:
+	      pr_err("Unknown fib_node->info.type = %d",
+		     fib_node->info.type);
+	}
+
+	prestera_vr_put(sw, vr);
+}
+
+void prestera_fib_node_destroy(struct prestera_switch *sw,
+			       struct prestera_fib_node *fib_node)
+{
+	__prestera_fib_node_destruct(sw, fib_node);
+	rhashtable_remove_fast(&sw->router->fib_ht, &fib_node->ht_node,
+			       __prestera_fib_ht_params);
+	kfree(fib_node);
+}
+
+struct prestera_fib_node *
+prestera_fib_node_create(struct prestera_switch *sw,
+			 struct prestera_fib_key *key,
+			 enum prestera_fib_type fib_type)
+{
+	struct prestera_fib_node *fib_node;
+	u32 grp_id;
+	struct prestera_vr *vr;
+	int err;
+
+	fib_node = kzalloc(sizeof(*fib_node), GFP_KERNEL);
+	if (!fib_node)
+		goto err_kzalloc;
+
+	memcpy(&fib_node->key, key, sizeof(*key));
+	fib_node->info.type = fib_type;
+
+	vr = prestera_vr_get(sw, key->tb_id, NULL);
+	if (IS_ERR(vr))
+		goto err_vr_get;
+
+	fib_node->info.vr = vr;
+
+	switch (fib_type) {
+	case PRESTERA_FIB_TYPE_TRAP:
+		grp_id = PRESTERA_NHGR_UNUSED;
+		break;
+	case PRESTERA_FIB_TYPE_DROP:
+		grp_id = PRESTERA_NHGR_DROP;
+		break;
+	default:
+		pr_err("Unsupported fib_type %d", fib_type);
+		goto err_nh_grp_get;
+	}
+
+	err = prestera_hw_lpm_add(sw, vr->hw_vr_id, key->addr.u.ipv4,
+				  key->prefix_len, grp_id);
+	if (err)
+		goto err_lpm_add;
+
+	err = rhashtable_insert_fast(&sw->router->fib_ht, &fib_node->ht_node,
+				     __prestera_fib_ht_params);
+	if (err)
+		goto err_ht_insert;
+
+	return fib_node;
+
+err_ht_insert:
+	prestera_hw_lpm_del(sw, vr->hw_vr_id, key->addr.u.ipv4,
+			    key->prefix_len);
+err_lpm_add:
+err_nh_grp_get:
+	prestera_vr_put(sw, vr);
+err_vr_get:
+	kfree(fib_node);
+err_kzalloc:
+	return NULL;
+}
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.h b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.h
index b6b028551868..67dbb49c8bd4 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.h
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.h
@@ -22,6 +22,42 @@ struct prestera_rif_entry {
 	struct list_head router_node; /* ht */
 };
 
+struct prestera_ip_addr {
+	union {
+		__be32 ipv4;
+		struct in6_addr ipv6;
+	} u;
+	enum {
+		PRESTERA_IPV4 = 0,
+		PRESTERA_IPV6
+	} v;
+};
+
+struct prestera_fib_key {
+	struct prestera_ip_addr addr;
+	u32 prefix_len;
+	u32 tb_id;
+};
+
+struct prestera_fib_info {
+	struct prestera_vr *vr;
+	struct list_head vr_node;
+	enum prestera_fib_type {
+		PRESTERA_FIB_TYPE_INVALID = 0,
+		/* It can be connected route
+		 * and will be overlapped with neighbours
+		 */
+		PRESTERA_FIB_TYPE_TRAP,
+		PRESTERA_FIB_TYPE_DROP
+	} type;
+};
+
+struct prestera_fib_node {
+	struct rhash_head ht_node; /* node of prestera_vr */
+	struct prestera_fib_key key;
+	struct prestera_fib_info info; /* action related info */
+};
+
 struct prestera_rif_entry *
 prestera_rif_entry_find(const struct prestera_switch *sw,
 			const struct prestera_rif_entry_key *k);
@@ -31,6 +67,14 @@ struct prestera_rif_entry *
 prestera_rif_entry_create(struct prestera_switch *sw,
 			  struct prestera_rif_entry_key *k,
 			  u32 tb_id, const unsigned char *addr);
+struct prestera_fib_node *prestera_fib_node_find(struct prestera_switch *sw,
+						 struct prestera_fib_key *key);
+void prestera_fib_node_destroy(struct prestera_switch *sw,
+			       struct prestera_fib_node *fib_node);
+struct prestera_fib_node *
+prestera_fib_node_create(struct prestera_switch *sw,
+			 struct prestera_fib_key *key,
+			 enum prestera_fib_type fib_type);
 int prestera_router_hw_init(struct prestera_switch *sw);
 void prestera_router_hw_fini(struct prestera_switch *sw);
 
-- 
2.17.1