From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 439AEC433FE for ; Wed, 16 Mar 2022 16:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357415AbiCPQBR (ORCPT ); Wed, 16 Mar 2022 12:01:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234320AbiCPQBP (ORCPT ); Wed, 16 Mar 2022 12:01:15 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D0373DDFD; Wed, 16 Mar 2022 09:00:00 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id p15so5161893ejc.7; Wed, 16 Mar 2022 09:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=CxBlO0C502y1jpeWHAj0rnF5IMS/Z4EuROWhss7SnWs=; b=JGMB0dsPB1GrxAi6JpNXgtS72jVkFOHljY4TZdBg6Vn985GUp5yWutHNgiB/ymSvVz Ns4YRhE+2mtfwFWgMAyS/l1Wv204oLxxxtjNiDBISwvIdmYli7Zxg30TxJf2PSpo5qD7 KVfluv9AKpsQtstRO6ImY9Nr9cU8pKn2N/kRRgB8eLUCRZIrBIV0PbtUr9LeS64c/qtO HrnYfue7by4ulT6m/17L1358uDPQKiQovIzEpGgnQnQvJG0r3hSGEMZWhZEEirlEVsG9 Y4cN05Y5px1OY1rXeHVqkf5WjSUfemS6aKqRBK4VBmdC3AkobI4kJakUHp7qgQSVthjH CuAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=CxBlO0C502y1jpeWHAj0rnF5IMS/Z4EuROWhss7SnWs=; b=7LvJhdGbiP5QjC9moz3umAiCOJgtRo8ehk+QrZzj6G+GbFkfqlTnDBDnr8s9+3b/bc 2d3YmxDTh2mGArf88PYUb8xhJ1CdTaplPj3cc4TGa4gEUdRzRmtuiOWcUK8eKox+j92P d6iuMHgU/c3Md5FMOsxdtc5yvK5EkT/uM+zS2+5eIs2wVhdgrC7GjmVEw4eMc8ynvJWS Je5fb/EBLMUvYf8WnPZ840GM6/fbCxFl+crbouQSD6QTMkuuytJGml88+g/ERThxa/kU D/j7LTyedPe7lRBAN9f3QckWCsrCy9SWr68Tmmw1hVD2M+0H5bgZ0oUcMHBkPH5/oZ1x GpWA== X-Gm-Message-State: AOAM530oEy7erSrAHLqd/i7KO2tPb9IDO3xcZ384FvUI41i7dBbsUnrX Vg50VtRmxeTZxjKOCXlBox8= X-Google-Smtp-Source: ABdhPJwcOThT7DlE2zS9uYNLym4QBIYFoyqVObijFN6e4+Cjci/GkcPa4xgC79NQo5C1dAplVRFVlA== X-Received: by 2002:a17:906:2699:b0:6d0:9f3b:a6a7 with SMTP id t25-20020a170906269900b006d09f3ba6a7mr510974ejc.397.1647446398797; Wed, 16 Mar 2022 08:59:58 -0700 (PDT) Received: from skbuf ([188.26.57.45]) by smtp.gmail.com with ESMTPSA id w19-20020a05640234d300b00416baf4cdcasm1218527edc.48.2022.03.16.08.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 08:59:58 -0700 (PDT) Date: Wed, 16 Mar 2022 17:59:56 +0200 From: Vladimir Oltean To: Tobias Waldekranz Cc: davem@davemloft.net, kuba@kernel.org, Andrew Lunn , Vivien Didelot , Florian Fainelli , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Russell King , Petr Machata , Ido Schimmel , Matt Johnston , Cooper Lees , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bridge@lists.linux-foundation.org Subject: Re: [PATCH v5 net-next 10/15] net: dsa: Validate hardware support for MST Message-ID: <20220316155956.swin6lhz5r4fn5ef@skbuf> References: <20220316150857.2442916-1-tobias@waldekranz.com> <20220316150857.2442916-11-tobias@waldekranz.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220316150857.2442916-11-tobias@waldekranz.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 16, 2022 at 04:08:52PM +0100, Tobias Waldekranz wrote: > When joining a bridge where MST is enabled, we validate that the > proper offloading support is in place, otherwise we fallback to > software bridging. > > When then mode is changed on a bridge in which we are members, we > refuse the change if offloading is not supported. > > At the moment we only check for configurable learning, but this will > be further restricted as we support more MST related switchdev events. > > Signed-off-by: Tobias Waldekranz > --- Reviewed-by: Vladimir Oltean > net/dsa/dsa_priv.h | 2 ++ > net/dsa/port.c | 22 ++++++++++++++++++++++ > net/dsa/slave.c | 6 ++++++ > 3 files changed, 30 insertions(+) > > diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h > index f20bdd8ea0a8..2aba420696ef 100644 > --- a/net/dsa/dsa_priv.h > +++ b/net/dsa/dsa_priv.h > @@ -234,6 +234,8 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, > struct netlink_ext_ack *extack); > bool dsa_port_skip_vlan_configuration(struct dsa_port *dp); > int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock); > +int dsa_port_mst_enable(struct dsa_port *dp, bool on, > + struct netlink_ext_ack *extack); > int dsa_port_mtu_change(struct dsa_port *dp, int new_mtu, > bool targeted_match); > int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr, > diff --git a/net/dsa/port.c b/net/dsa/port.c > index 58291df14cdb..02214033cec0 100644 > --- a/net/dsa/port.c > +++ b/net/dsa/port.c > @@ -321,6 +321,11 @@ static void dsa_port_bridge_destroy(struct dsa_port *dp, > kfree(bridge); > } > > +static bool dsa_port_supports_mst(struct dsa_port *dp) > +{ > + return dsa_port_can_configure_learning(dp); > +} > + > int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br, > struct netlink_ext_ack *extack) > { > @@ -334,6 +339,9 @@ int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br, > struct net_device *brport_dev; > int err; > > + if (br_mst_enabled(br) && !dsa_port_supports_mst(dp)) > + return -EOPNOTSUPP; > + > /* Here the interface is already bridged. Reflect the current > * configuration so that drivers can program their chips accordingly. > */ > @@ -735,6 +743,20 @@ int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock) > return 0; > } > > +int dsa_port_mst_enable(struct dsa_port *dp, bool on, > + struct netlink_ext_ack *extack) > +{ > + if (!on) > + return 0; > + > + if (!dsa_port_supports_mst(dp)) { > + NL_SET_ERR_MSG_MOD(extack, "Hardware does not support MST"); > + return -EINVAL; > + } > + > + return 0; > +} > + > int dsa_port_pre_bridge_flags(const struct dsa_port *dp, > struct switchdev_brport_flags flags, > struct netlink_ext_ack *extack) > diff --git a/net/dsa/slave.c b/net/dsa/slave.c > index f9cecda791d5..2e8f62476ce9 100644 > --- a/net/dsa/slave.c > +++ b/net/dsa/slave.c > @@ -464,6 +464,12 @@ static int dsa_slave_port_attr_set(struct net_device *dev, const void *ctx, > > ret = dsa_port_ageing_time(dp, attr->u.ageing_time); > break; > + case SWITCHDEV_ATTR_ID_BRIDGE_MST: > + if (!dsa_port_offloads_bridge_dev(dp, attr->orig_dev)) > + return -EOPNOTSUPP; > + > + ret = dsa_port_mst_enable(dp, attr->u.mst, extack); > + break; > case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS: > if (!dsa_port_offloads_bridge_port(dp, attr->orig_dev)) > return -EOPNOTSUPP; > -- > 2.25.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=CxBlO0C502y1jpeWHAj0rnF5IMS/Z4EuROWhss7SnWs=; b=JGMB0dsPB1GrxAi6JpNXgtS72jVkFOHljY4TZdBg6Vn985GUp5yWutHNgiB/ymSvVz Ns4YRhE+2mtfwFWgMAyS/l1Wv204oLxxxtjNiDBISwvIdmYli7Zxg30TxJf2PSpo5qD7 KVfluv9AKpsQtstRO6ImY9Nr9cU8pKn2N/kRRgB8eLUCRZIrBIV0PbtUr9LeS64c/qtO HrnYfue7by4ulT6m/17L1358uDPQKiQovIzEpGgnQnQvJG0r3hSGEMZWhZEEirlEVsG9 Y4cN05Y5px1OY1rXeHVqkf5WjSUfemS6aKqRBK4VBmdC3AkobI4kJakUHp7qgQSVthjH CuAg== Date: Wed, 16 Mar 2022 17:59:56 +0200 From: Vladimir Oltean Message-ID: <20220316155956.swin6lhz5r4fn5ef@skbuf> References: <20220316150857.2442916-1-tobias@waldekranz.com> <20220316150857.2442916-11-tobias@waldekranz.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220316150857.2442916-11-tobias@waldekranz.com> Subject: Re: [Bridge] [PATCH v5 net-next 10/15] net: dsa: Validate hardware support for MST List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tobias Waldekranz Cc: Ivan Vecera , Andrew Lunn , Florian Fainelli , Jiri Pirko , Petr Machata , Nikolay Aleksandrov , bridge@lists.linux-foundation.org, Russell King , Vivien Didelot , Ido Schimmel , netdev@vger.kernel.org, Cooper Lees , Roopa Prabhu , kuba@kernel.org, Matt Johnston , davem@davemloft.net, linux-kernel@vger.kernel.org On Wed, Mar 16, 2022 at 04:08:52PM +0100, Tobias Waldekranz wrote: > When joining a bridge where MST is enabled, we validate that the > proper offloading support is in place, otherwise we fallback to > software bridging. > > When then mode is changed on a bridge in which we are members, we > refuse the change if offloading is not supported. > > At the moment we only check for configurable learning, but this will > be further restricted as we support more MST related switchdev events. > > Signed-off-by: Tobias Waldekranz > --- Reviewed-by: Vladimir Oltean > net/dsa/dsa_priv.h | 2 ++ > net/dsa/port.c | 22 ++++++++++++++++++++++ > net/dsa/slave.c | 6 ++++++ > 3 files changed, 30 insertions(+) > > diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h > index f20bdd8ea0a8..2aba420696ef 100644 > --- a/net/dsa/dsa_priv.h > +++ b/net/dsa/dsa_priv.h > @@ -234,6 +234,8 @@ int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, > struct netlink_ext_ack *extack); > bool dsa_port_skip_vlan_configuration(struct dsa_port *dp); > int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock); > +int dsa_port_mst_enable(struct dsa_port *dp, bool on, > + struct netlink_ext_ack *extack); > int dsa_port_mtu_change(struct dsa_port *dp, int new_mtu, > bool targeted_match); > int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr, > diff --git a/net/dsa/port.c b/net/dsa/port.c > index 58291df14cdb..02214033cec0 100644 > --- a/net/dsa/port.c > +++ b/net/dsa/port.c > @@ -321,6 +321,11 @@ static void dsa_port_bridge_destroy(struct dsa_port *dp, > kfree(bridge); > } > > +static bool dsa_port_supports_mst(struct dsa_port *dp) > +{ > + return dsa_port_can_configure_learning(dp); > +} > + > int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br, > struct netlink_ext_ack *extack) > { > @@ -334,6 +339,9 @@ int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br, > struct net_device *brport_dev; > int err; > > + if (br_mst_enabled(br) && !dsa_port_supports_mst(dp)) > + return -EOPNOTSUPP; > + > /* Here the interface is already bridged. Reflect the current > * configuration so that drivers can program their chips accordingly. > */ > @@ -735,6 +743,20 @@ int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock) > return 0; > } > > +int dsa_port_mst_enable(struct dsa_port *dp, bool on, > + struct netlink_ext_ack *extack) > +{ > + if (!on) > + return 0; > + > + if (!dsa_port_supports_mst(dp)) { > + NL_SET_ERR_MSG_MOD(extack, "Hardware does not support MST"); > + return -EINVAL; > + } > + > + return 0; > +} > + > int dsa_port_pre_bridge_flags(const struct dsa_port *dp, > struct switchdev_brport_flags flags, > struct netlink_ext_ack *extack) > diff --git a/net/dsa/slave.c b/net/dsa/slave.c > index f9cecda791d5..2e8f62476ce9 100644 > --- a/net/dsa/slave.c > +++ b/net/dsa/slave.c > @@ -464,6 +464,12 @@ static int dsa_slave_port_attr_set(struct net_device *dev, const void *ctx, > > ret = dsa_port_ageing_time(dp, attr->u.ageing_time); > break; > + case SWITCHDEV_ATTR_ID_BRIDGE_MST: > + if (!dsa_port_offloads_bridge_dev(dp, attr->orig_dev)) > + return -EOPNOTSUPP; > + > + ret = dsa_port_mst_enable(dp, attr->u.mst, extack); > + break; > case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS: > if (!dsa_port_offloads_bridge_port(dp, attr->orig_dev)) > return -EOPNOTSUPP; > -- > 2.25.1 >