| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 30 Dec 2021 15:48:22 +0200
From: Ido Schimmel <idosch@...sch.org>
To: Yevhen Orlov <yevhen.orlov@...ision.eu>
Cc: netdev@...r.kernel.org, stephen@...workplumber.org, andrew@...n.ch,
Volodymyr Mytnyk <volodymyr.mytnyk@...ision.eu>,
Taras Chornyi <taras.chornyi@...ision.eu>,
Mickey Rachamim <mickeyr@...vell.com>,
Serhiy Pshyk <serhiy.pshyk@...ision.eu>,
Taras Chornyi <tchornyi@...vell.com>,
Oleksandr Mazur <oleksandr.mazur@...ision.eu>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next v2 3/6] net: marvell: prestera: Add prestera
router infra
On Mon, Dec 27, 2021 at 11:52:28PM +0200, Yevhen Orlov wrote:
> Add prestera_router.c, which contains code to subscribe/unsubscribe on
> kernel notifiers for router. This handle kernel notifications,
> parse structures to make key to manipulate prestera_router_hw's objects.
>
> Also prestera_router is container for router's objects database.
>
> Co-developed-by: Taras Chornyi <tchornyi@...vell.com>
> Signed-off-by: Taras Chornyi <tchornyi@...vell.com>
> Co-developed-by: Oleksandr Mazur <oleksandr.mazur@...ision.eu>
> Signed-off-by: Oleksandr Mazur <oleksandr.mazur@...ision.eu>
> Signed-off-by: Yevhen Orlov <yevhen.orlov@...ision.eu>
> ---
> v1-->v2
> * No changes
> ---
> .../net/ethernet/marvell/prestera/Makefile | 3 +-
> .../net/ethernet/marvell/prestera/prestera.h | 11 ++++++++
> .../ethernet/marvell/prestera/prestera_main.c | 6 ++++
> .../marvell/prestera/prestera_router.c | 28 +++++++++++++++++++
> 4 files changed, 47 insertions(+), 1 deletion(-)
> create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_router.c
>
> diff --git a/drivers/net/ethernet/marvell/prestera/Makefile b/drivers/net/ethernet/marvell/prestera/Makefile
> index 48dbcb2baf8f..ec69fc564a9f 100644
> --- a/drivers/net/ethernet/marvell/prestera/Makefile
> +++ b/drivers/net/ethernet/marvell/prestera/Makefile
> @@ -3,6 +3,7 @@ obj-$(CONFIG_PRESTERA) += prestera.o
> prestera-objs := prestera_main.o prestera_hw.o prestera_dsa.o \
> prestera_rxtx.o prestera_devlink.o prestera_ethtool.o \
> prestera_switchdev.o prestera_acl.o prestera_flow.o \
> - prestera_flower.o prestera_span.o prestera_counter.o
> + prestera_flower.o prestera_span.o prestera_counter.o \
> + prestera_router.o
>
> obj-$(CONFIG_PRESTERA_PCI) += prestera_pci.o
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera.h b/drivers/net/ethernet/marvell/prestera/prestera.h
> index 636caf492531..7160da678457 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera.h
> +++ b/drivers/net/ethernet/marvell/prestera/prestera.h
> @@ -270,12 +270,20 @@ struct prestera_switch {
> u32 mtu_min;
> u32 mtu_max;
> u8 id;
> + struct prestera_router *router;
> struct prestera_lag *lags;
> struct prestera_counter *counter;
> u8 lag_member_max;
> u8 lag_max;
> };
>
> +struct prestera_router {
> + struct prestera_switch *sw;
> + struct list_head vr_list;
> + struct list_head rif_entry_list;
> + bool aborted;
Never used
> +};
> +
> struct prestera_rxtx_params {
> bool use_sdma;
> u32 map_addr;
> @@ -303,6 +311,9 @@ struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
>
> int prestera_port_autoneg_set(struct prestera_port *port, u64 link_modes);
>
> +int prestera_router_init(struct prestera_switch *sw);
> +void prestera_router_fini(struct prestera_switch *sw);
> +
> struct prestera_port *prestera_find_port(struct prestera_switch *sw, u32 id);
>
> int prestera_port_cfg_mac_read(struct prestera_port *port,
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c
> index a0dbad5cb88d..242904fcd866 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
> @@ -893,6 +893,10 @@ static int prestera_switch_init(struct prestera_switch *sw)
> if (err)
> return err;
>
> + err = prestera_router_init(sw);
> + if (err)
> + goto err_router_init;
> +
> err = prestera_switchdev_init(sw);
> if (err)
> goto err_swdev_register;
> @@ -949,6 +953,8 @@ static int prestera_switch_init(struct prestera_switch *sw)
> err_rxtx_register:
> prestera_switchdev_fini(sw);
> err_swdev_register:
> + prestera_router_fini(sw);
Missing a call in prestera_switch_fini(). Most likely visible with
kmemleak enabled
> +err_router_init:
> prestera_netdev_event_handler_unregister(sw);
> prestera_hw_switch_fini(sw);
>
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router.c b/drivers/net/ethernet/marvell/prestera/prestera_router.c
> new file mode 100644
> index 000000000000..f3980d10eb29
> --- /dev/null
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_router.c
> @@ -0,0 +1,28 @@
> +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
> +/* Copyright (c) 2019-2021 Marvell International Ltd. All rights reserved */
> +
> +#include <linux/kernel.h>
> +#include <linux/types.h>
> +
> +#include "prestera.h"
> +
> +int prestera_router_init(struct prestera_switch *sw)
> +{
> + struct prestera_router *router;
> +
> + router = kzalloc(sizeof(*sw->router), GFP_KERNEL);
> + if (!router)
> + return -ENOMEM;
> +
> + sw->router = router;
> + router->sw = sw;
> +
> + return 0;
> +}
> +
> +void prestera_router_fini(struct prestera_switch *sw)
> +{
> + kfree(sw->router);
> + sw->router = NULL;
> +}
> +
> --
> 2.17.1
>
Powered by blists - more mailing lists