From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDFB229CA for ; Wed, 29 Sep 2021 13:55:52 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 93920613D1; Wed, 29 Sep 2021 13:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632923752; bh=40noVjUADcTFuL18AWlGlA5AqcgIKtJPa+QjlNndmaA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=TXfiJIOjDYkjlTD+FmCDLSeBSzFecqoscMatnM7hRJz6j32y6GJB5hP8vfTt6JtQw gn9IlvE39J2vPbTRVUjz/jaT1L06lP4uP3LB0zCIkKE19K7ZX7zpsQT4XmXdM9B3iy n2nfvYiL7HU7s8inrnWIlJkpF247sn7mwN75YafcAT+/81FgXfryg4c2QAJFCt3D9j ZSL6MbbLr8QpNIW+tnfQcnHcw8vhN2rd8/kZZ/1VvZZr/OQDqKCuAkkyMyIRCyYbsS 0inDhEXaYXr29LaGJbQDn0nEnUJH5BtJeJ6S5lwBpW7pky/dWO5mnEJNlMzLVnU0ir pugj5/zEYMKlg== Date: Wed, 29 Sep 2021 06:55:49 -0700 From: Jakub Kicinski To: Leon Romanovsky Cc: "David S . Miller" , Leon Romanovsky , Alexandre Belloni , Andrew Lunn , Ariel Elior , Bin Luo , Claudiu Manoil , Coiby Xu , Derek Chickles , drivers@pensando.io, Eric Dumazet , Felix Manlunas , Florian Fainelli , Geetha sowjanya , Greg Kroah-Hartman , GR-everest-linux-l2@marvell.com, GR-Linux-NIC-Dev@marvell.com, hariprasad , Ido Schimmel , intel-wired-lan@lists.osuosl.org, Ioana Ciornei , Jerin Jacob , Jesse Brandeburg , Jiri Pirko , Jonathan Lemon , Linu Cherian , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-rdma@vger.kernel.org, linux-staging@lists.linux.dev, Manish Chopra , Michael Chan , Moshe Shemesh , netdev@vger.kernel.org, oss-drivers@corigine.com, Richard Cochran , Saeed Mahameed , Salil Mehta , Satanand Burla , Shannon Nelson , Shay Drory , Simon Horman , Subbaraya Sundeep , Sunil Goutham , Taras Chornyi , Tariq Toukan , Tony Nguyen , UNGLinuxDriver@microchip.com, Vadym Kochan , Vivien Didelot , Vladimir Oltean , Yisen Zhuang Subject: Re: [PATCH net-next v1 4/5] net/mlx5: Register separate reload devlink ops for multiport device Message-ID: <20210929065549.43b13203@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Wed, 29 Sep 2021 15:00:45 +0300 Leon Romanovsky wrote: > From: Leon Romanovsky >=20 > Mulitport slave device doesn't support devlink reload, so instead of > complicating initialization flow with devlink_reload_enable() which > will be removed in next patch, set specialized devlink ops callbacks > for reload operations. >=20 > This fixes an error when reload counters exposed (and equal zero) for > the mode that is not supported at all. >=20 > Fixes: d89ddaae1766 ("net/mlx5: Disable devlink reload for multi port sla= ve device") > Signed-off-by: Leon Romanovsky > --- > drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/= net/ethernet/mellanox/mlx5/core/devlink.c > index 47c9f7f5bb79..e85eca6976a9 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c > @@ -309,14 +309,17 @@ static struct devlink_ops mlx5_devlink_ops =3D { > #endif > .flash_update =3D mlx5_devlink_flash_update, > .info_get =3D mlx5_devlink_info_get, > + .trap_init =3D mlx5_devlink_trap_init, > + .trap_fini =3D mlx5_devlink_trap_fini, > + .trap_action_set =3D mlx5_devlink_trap_action_set, > +}; > + > +static struct devlink_ops mlx5_devlink_reload =3D { > .reload_actions =3D BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) | > BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE), > .reload_limits =3D BIT(DEVLINK_RELOAD_LIMIT_NO_RESET), > .reload_down =3D mlx5_devlink_reload_down, > .reload_up =3D mlx5_devlink_reload_up, > - .trap_init =3D mlx5_devlink_trap_init, > - .trap_fini =3D mlx5_devlink_trap_fini, > - .trap_action_set =3D mlx5_devlink_trap_action_set, > }; > =20 > void mlx5_devlink_trap_report(struct mlx5_core_dev *dev, int trap_id, st= ruct sk_buff *skb, > @@ -791,6 +794,7 @@ static void mlx5_devlink_traps_unregister(struct devl= ink *devlink) > =20 > int mlx5_devlink_register(struct devlink *devlink) > { > + struct mlx5_core_dev *dev =3D devlink_priv(devlink); > int err; > =20 > err =3D devlink_params_register(devlink, mlx5_devlink_params, > @@ -808,6 +812,9 @@ int mlx5_devlink_register(struct devlink *devlink) > if (err) > goto traps_reg_err; > =20 > + if (!mlx5_core_is_mp_slave(dev)) > + devlink_set_ops(devlink, &mlx5_devlink_reload); Does this work? Where do you make a copy of the ops? =F0=9F=A4=94 You can't= modify the driver-global ops, to state the obvious. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Kicinski Date: Wed, 29 Sep 2021 06:55:49 -0700 Subject: [Intel-wired-lan] [PATCH net-next v1 4/5] net/mlx5: Register separate reload devlink ops for multiport device In-Reply-To: References: Message-ID: <20210929065549.43b13203@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: On Wed, 29 Sep 2021 15:00:45 +0300 Leon Romanovsky wrote: > From: Leon Romanovsky > > Mulitport slave device doesn't support devlink reload, so instead of > complicating initialization flow with devlink_reload_enable() which > will be removed in next patch, set specialized devlink ops callbacks > for reload operations. > > This fixes an error when reload counters exposed (and equal zero) for > the mode that is not supported at all. > > Fixes: d89ddaae1766 ("net/mlx5: Disable devlink reload for multi port slave device") > Signed-off-by: Leon Romanovsky > --- > drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c > index 47c9f7f5bb79..e85eca6976a9 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c > @@ -309,14 +309,17 @@ static struct devlink_ops mlx5_devlink_ops = { > #endif > .flash_update = mlx5_devlink_flash_update, > .info_get = mlx5_devlink_info_get, > + .trap_init = mlx5_devlink_trap_init, > + .trap_fini = mlx5_devlink_trap_fini, > + .trap_action_set = mlx5_devlink_trap_action_set, > +}; > + > +static struct devlink_ops mlx5_devlink_reload = { > .reload_actions = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) | > BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE), > .reload_limits = BIT(DEVLINK_RELOAD_LIMIT_NO_RESET), > .reload_down = mlx5_devlink_reload_down, > .reload_up = mlx5_devlink_reload_up, > - .trap_init = mlx5_devlink_trap_init, > - .trap_fini = mlx5_devlink_trap_fini, > - .trap_action_set = mlx5_devlink_trap_action_set, > }; > > void mlx5_devlink_trap_report(struct mlx5_core_dev *dev, int trap_id, struct sk_buff *skb, > @@ -791,6 +794,7 @@ static void mlx5_devlink_traps_unregister(struct devlink *devlink) > > int mlx5_devlink_register(struct devlink *devlink) > { > + struct mlx5_core_dev *dev = devlink_priv(devlink); > int err; > > err = devlink_params_register(devlink, mlx5_devlink_params, > @@ -808,6 +812,9 @@ int mlx5_devlink_register(struct devlink *devlink) > if (err) > goto traps_reg_err; > > + if (!mlx5_core_is_mp_slave(dev)) > + devlink_set_ops(devlink, &mlx5_devlink_reload); Does this work? Where do you make a copy of the ops? ? You can't modify the driver-global ops, to state the obvious.