From: Christian Marangi <ansuelsmth@gmail.com>
To: stable@vger.kernel.org
Cc: Jakub Kicinski <kuba@kernel.org>, gregkh@linuxfoundation.org
Subject: Re: [PATCH] net: dsa: qca8k: reset cpu port on MTU change
Date: Sat, 9 Jul 2022 15:39:51 +0200 [thread overview]
Message-ID: <62c98528.1c69fb81.27e32.168c@mx.google.com> (raw)
In-Reply-To: <20220628143010.17526-1-ansuelsmth@gmail.com>
On Tue, Jun 28, 2022 at 04:30:10PM +0200, Christian Marangi wrote:
> commit 386228c694bf1e7a7688e44412cb33500b0ac585 upstream.
>
> It was discovered that the Documentation lacks of a fundamental detail
> on how to correctly change the MAX_FRAME_SIZE of the switch.
>
> In fact if the MAX_FRAME_SIZE is changed while the cpu port is on, the
> switch panics and cease to send any packet. This cause the mgmt ethernet
> system to not receive any packet (the slow fallback still works) and
> makes the device not reachable. To recover from this a switch reset is
> required.
>
> To correctly handle this, turn off the cpu ports before changing the
> MAX_FRAME_SIZE and turn on again after the value is applied.
>
> Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks")
> Cc: stable@vger.kernel.org
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> Link: https://lore.kernel.org/r/20220621151122.10220-1-ansuelsmth@gmail.com
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> [ backport: fix conflict using the old port_sts struct instead of bitmap ]
Cc Greg wonder if this has some problems or I pushed it badly? (first
time I try to push a fixed backport)
> ---
> drivers/net/dsa/qca8k.c | 23 +++++++++++++++++++++--
> 1 file changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
> index a984f06f6f04..67869c8cbeaa 100644
> --- a/drivers/net/dsa/qca8k.c
> +++ b/drivers/net/dsa/qca8k.c
> @@ -1599,7 +1599,7 @@ static int
> qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
> {
> struct qca8k_priv *priv = ds->priv;
> - int i, mtu = 0;
> + int ret, i, mtu = 0;
>
> priv->port_mtu[port] = new_mtu;
>
> @@ -1607,8 +1607,27 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
> if (priv->port_mtu[i] > mtu)
> mtu = priv->port_mtu[i];
>
> + /* To change the MAX_FRAME_SIZE the cpu ports must be off or
> + * the switch panics.
> + * Turn off both cpu ports before applying the new value to prevent
> + * this.
> + */
> + if (priv->port_sts[0].enabled)
> + qca8k_port_set_status(priv, 0, 0);
> +
> + if (priv->port_sts[6].enabled)
> + qca8k_port_set_status(priv, 6, 0);
> +
> /* Include L2 header / FCS length */
> - return qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN);
> + ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN);
> +
> + if (priv->port_sts[0].enabled)
> + qca8k_port_set_status(priv, 0, 1);
> +
> + if (priv->port_sts[6].enabled)
> + qca8k_port_set_status(priv, 6, 1);
> +
> + return ret;
> }
>
> static int
> --
> 2.36.1
>
--
Ansuel
next prev parent reply other threads:[~2022-07-09 13:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-28 14:30 [PATCH] net: dsa: qca8k: reset cpu port on MTU change Christian Marangi
2022-07-09 13:39 ` Christian Marangi [this message]
2022-07-10 14:17 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=62c98528.1c69fb81.27e32.168c@mx.google.com \
--to=ansuelsmth@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox