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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65A79C433F5 for ; Wed, 29 Sep 2021 14:16:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48959613CD for ; Wed, 29 Sep 2021 14:16:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343898AbhI2OSX (ORCPT ); Wed, 29 Sep 2021 10:18:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:50652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343948AbhI2OSM (ORCPT ); Wed, 29 Sep 2021 10:18:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CCAB4613A7; Wed, 29 Sep 2021 14:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632924991; bh=x8PJgYHBfZYy5vbHjr7vMOaIkyPKYTkxWVBFHp1eeg4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BGIbu/AGlYFcQKLeJl04hR8MvgPE1d1akDokD6itR1bgBlPElkeaHjQx8b9s1Ymuz rnHg724w0U0TGgmuRYa1eHCai5JMHXj1ifyKegB++KTqB9iDoVdgTVgfLotJ2/TyZ1 DdN68VCwdXXxT36Ly3efz3HJ7qZrHrvX8gytj8GGpcIzpSiVG/hgUDV10GzodN1g6k u4zFNgbjNcTbb7weVWrq/JWAijjVLRXb0DSPhop90H1FXzaKPMywXqIfoKSG7c9a9r gVLcnKb/RmxNGe/jznBrXa/HEsVN11EVYbKMjwGBXJikb4RfhdhQo91BWLcVObrTWp +X4HpqZlazHNQ== Date: Wed, 29 Sep 2021 17:16:28 +0300 From: Leon Romanovsky To: Jakub Kicinski Cc: "David S . Miller" , 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: References: <20210929065549.43b13203@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210929065549.43b13203@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Wed, Sep 29, 2021 at 06:55:49AM -0700, Jakub Kicinski wrote: > 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. devlink_ops pointer is not constant at this stage, so why can't I copy reload_* pointers to the "main" devlink ops? I wanted to avoid to copy all pointers. Thanks