| 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:44:50 +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 2/6] net: marvell: prestera: Add router
interface ABI
On Mon, Dec 27, 2021 at 11:52:27PM +0200, Yevhen Orlov wrote:
> Add functions to enable routing on port, which is not in vlan.
> Also we can enable routing on vlan.
I don't understand these two lines. Can you explain for which netdev
types you can create a router interface?
> prestera_hw_rif_create() take index of allocated virtual router.
s/take/takes/
>
> 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/prestera.h | 23 +++++
> .../ethernet/marvell/prestera/prestera_hw.c | 97 +++++++++++++++++++
> .../ethernet/marvell/prestera/prestera_hw.h | 7 ++
> 3 files changed, 127 insertions(+)
>
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera.h b/drivers/net/ethernet/marvell/prestera/prestera.h
> index 797b2e4d3551..636caf492531 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera.h
> +++ b/drivers/net/ethernet/marvell/prestera/prestera.h
> @@ -225,6 +225,29 @@ struct prestera_event {
> };
> };
>
> +enum prestera_if_type {
> + /* the interface is of port type (dev,port) */
> + PRESTERA_IF_PORT_E = 0,
> +
> + /* the interface is of lag type (lag-id) */
> + PRESTERA_IF_LAG_E = 1,
> +
> + /* the interface is of Vid type (vlan-id) */
> + PRESTERA_IF_VID_E = 3,
> +};
> +
> +struct prestera_iface {
> + enum prestera_if_type type;
> + struct {
> + u32 hw_dev_num;
> + u32 port_num;
> + } dev_port;
> + u32 hw_dev_num;
> + u16 vr_id;
> + u16 lag_id;
> + u16 vlan_id;
> +};
> +
> struct prestera_switchdev;
> struct prestera_span;
> struct prestera_rxtx;
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_hw.c
> index 8783adbad593..51fc841b1e7a 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_hw.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_hw.c
> @@ -53,6 +53,8 @@ enum prestera_cmd_type_t {
> PRESTERA_CMD_TYPE_VTCAM_IFACE_BIND = 0x560,
> PRESTERA_CMD_TYPE_VTCAM_IFACE_UNBIND = 0x561,
>
> + PRESTERA_CMD_TYPE_ROUTER_RIF_CREATE = 0x600,
> + PRESTERA_CMD_TYPE_ROUTER_RIF_DELETE = 0x601,
> PRESTERA_CMD_TYPE_ROUTER_VR_CREATE = 0x630,
> PRESTERA_CMD_TYPE_ROUTER_VR_DELETE = 0x631,
>
> @@ -483,6 +485,36 @@ struct prestera_msg_rxtx_resp {
> __le32 map_addr;
> };
>
> +struct prestera_msg_iface {
> + union {
> + struct {
> + __le32 dev;
> + __le32 port;
> + };
> + __le16 lag_id;
> + };
> + __le16 vr_id;
> + __le16 vid;
> + u8 type;
> + u8 __pad[3];
> +};
> +
> +struct prestera_msg_rif_req {
> + struct prestera_msg_cmd cmd;
> + struct prestera_msg_iface iif;
> + __le32 mtu;
> + __le16 rif_id;
> + __le16 __reserved;
> + u8 mac[ETH_ALEN];
> + u8 __pad[2];
> +};
> +
> +struct prestera_msg_rif_resp {
> + struct prestera_msg_ret ret;
> + __le16 rif_id;
> + u8 __pad[2];
> +};
> +
> struct prestera_msg_vr_req {
> struct prestera_msg_cmd cmd;
> __le16 vr_id;
> @@ -564,8 +596,12 @@ static void prestera_hw_build_tests(void)
> BUILD_BUG_ON(sizeof(struct prestera_msg_acl_action) != 32);
> BUILD_BUG_ON(sizeof(struct prestera_msg_counter_req) != 16);
> BUILD_BUG_ON(sizeof(struct prestera_msg_counter_stats) != 16);
> + BUILD_BUG_ON(sizeof(struct prestera_msg_rif_req) != 36);
> BUILD_BUG_ON(sizeof(struct prestera_msg_vr_req) != 8);
>
> + /* structure that are part of req/resp fw messages */
> + BUILD_BUG_ON(sizeof(struct prestera_msg_iface) != 16);
> +
> /* check responses */
> BUILD_BUG_ON(sizeof(struct prestera_msg_common_resp) != 8);
> BUILD_BUG_ON(sizeof(struct prestera_msg_switch_init_resp) != 24);
> @@ -577,6 +613,7 @@ static void prestera_hw_build_tests(void)
> BUILD_BUG_ON(sizeof(struct prestera_msg_rxtx_resp) != 12);
> BUILD_BUG_ON(sizeof(struct prestera_msg_vtcam_resp) != 16);
> BUILD_BUG_ON(sizeof(struct prestera_msg_counter_resp) != 24);
> + BUILD_BUG_ON(sizeof(struct prestera_msg_rif_resp) != 12);
> BUILD_BUG_ON(sizeof(struct prestera_msg_vr_resp) != 12);
>
> /* check events */
> @@ -1769,6 +1806,66 @@ int prestera_hw_bridge_port_delete(struct prestera_port *port, u16 bridge_id)
> &req.cmd, sizeof(req));
> }
>
> +static int prestera_iface_to_msg(struct prestera_iface *iface,
> + struct prestera_msg_iface *msg_if)
> +{
> + switch (iface->type) {
> + case PRESTERA_IF_PORT_E:
> + case PRESTERA_IF_VID_E:
> + msg_if->port = __cpu_to_le32(iface->dev_port.port_num);
> + msg_if->dev = __cpu_to_le32(iface->dev_port.hw_dev_num);
> + break;
> + case PRESTERA_IF_LAG_E:
> + msg_if->lag_id = __cpu_to_le16(iface->lag_id);
> + break;
> + default:
> + return -EOPNOTSUPP;
> + }
> +
> + msg_if->vr_id = __cpu_to_le16(iface->vr_id);
> + msg_if->vid = __cpu_to_le16(iface->vlan_id);
> + msg_if->type = iface->type;
> + return 0;
> +}
> +
> +int prestera_hw_rif_create(struct prestera_switch *sw,
> + struct prestera_iface *iif, u8 *mac, u16 *rif_id)
> +{
> + struct prestera_msg_rif_req req;
> + struct prestera_msg_rif_resp resp;
> + int err;
Same comment as before
> +
> + memcpy(req.mac, mac, ETH_ALEN);
Each RIF can use whatever MAC it wants? You don't have limitations on
common prefix or something like that? Guess it depends on how many RIFs
you can support
> +
> + err = prestera_iface_to_msg(iif, &req.iif);
> + if (err)
> + return err;
> +
> + err = prestera_cmd_ret(sw, PRESTERA_CMD_TYPE_ROUTER_RIF_CREATE,
> + &req.cmd, sizeof(req), &resp.ret, sizeof(resp));
> + if (err)
> + return err;
> +
> + *rif_id = __le16_to_cpu(resp.rif_id);
> + return err;
> +}
> +
> +int prestera_hw_rif_delete(struct prestera_switch *sw, u16 rif_id,
> + struct prestera_iface *iif)
> +{
> + struct prestera_msg_rif_req req = {
> + .rif_id = __cpu_to_le16(rif_id),
> + };
> + int err;
> +
> + err = prestera_iface_to_msg(iif, &req.iif);
> + if (err)
> + return err;
> +
> + return prestera_cmd(sw, PRESTERA_CMD_TYPE_ROUTER_RIF_DELETE, &req.cmd,
> + sizeof(req));
> +}
> +
> int prestera_hw_vr_create(struct prestera_switch *sw, u16 *vr_id)
> {
> int err;
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_hw.h b/drivers/net/ethernet/marvell/prestera/prestera_hw.h
> index 6d9fafad451d..3ff12bae5909 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_hw.h
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_hw.h
> @@ -137,6 +137,7 @@ struct prestera_rxtx_params;
> struct prestera_acl_hw_action_info;
> struct prestera_acl_iface;
> struct prestera_counter_stats;
> +struct prestera_iface;
>
> /* Switch API */
> int prestera_hw_switch_init(struct prestera_switch *sw);
> @@ -238,6 +239,12 @@ int prestera_hw_span_bind(const struct prestera_port *port, u8 span_id);
> int prestera_hw_span_unbind(const struct prestera_port *port);
> int prestera_hw_span_release(struct prestera_switch *sw, u8 span_id);
>
> +/* Router API */
> +int prestera_hw_rif_create(struct prestera_switch *sw,
> + struct prestera_iface *iif, u8 *mac, u16 *rif_id);
> +int prestera_hw_rif_delete(struct prestera_switch *sw, u16 rif_id,
> + struct prestera_iface *iif);
> +
> /* Virtual Router API */
> int prestera_hw_vr_create(struct prestera_switch *sw, u16 *vr_id);
> int prestera_hw_vr_delete(struct prestera_switch *sw, u16 vr_id);
> --
> 2.17.1
>
Powered by blists - more mailing lists