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 X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED437C43381 for ; Sun, 24 Feb 2019 11:01:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0B0720661 for ; Sun, 24 Feb 2019 11:01:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="NDzOOxNr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727021AbfBXLBj (ORCPT ); Sun, 24 Feb 2019 06:01:39 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44837 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbfBXLBj (ORCPT ); Sun, 24 Feb 2019 06:01:39 -0500 Received: by mail-wr1-f68.google.com with SMTP id w2so6806945wrt.11 for ; Sun, 24 Feb 2019 03:01:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=JB4ZiQMoSKCAEVHSTlNAsOaOlmvs25iQgzV8bIsDsYY=; b=NDzOOxNrUZ0qzxMYK0CjrHLLJb4fQWFVbmUDjwTpqQ481pNSMAjH9v+tSKq8wEFBQF 9qbQjIJuvndn8IhekLuCtVnxMvY2xjvWPVsI8GsY58z6zprsbFLF6E+LGYUKdkdDkEmh qkWl9i+uh2U8mwNejeiYaire47LNlgIe7IrvD3Vz4WzO3EfUAvE356JEzNY14hVc/G4E qu6FTA3ZnYDu6ZnSWDiXXZSbWITYq+1vyAiLlt/PFH4eiuWO6WuUV2mVD7zPe5kL+LA6 lKcw2EryWRF6I9TMMFrOlOGqoVhliSQtMjZClxvNmOZZs9nBEN0VCCtFPFmHncNlvAFA GL9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=JB4ZiQMoSKCAEVHSTlNAsOaOlmvs25iQgzV8bIsDsYY=; b=h/j4RpNBaCrzuISqy/WmqOBifkjgWGLBUtSSq4hLgyebeOL0qZupWZJi51MjIydaNT rsQg288mlxII7VG84tz15e0eFs9Vywx6Jgn2PzeSQCU4nlqh28uLS1t0AZUGduwVdSTQ Zyb/4kG1Akw2h+XhKkSEj2mRAmCwt7UKXGoSSyRUQuLXV1tOkIQIsEPjvYUGdTobNxlm yhQ2qFNEuJV/ECH0K53G2iVTWyeeYutCnEPh+vZaAWtecOQrjgtZmM5vs5TUH0mZJDoF ODdF73Dr/cJnM4eF3y33+OZy8prJSKVMaNzPlW7C/htTjW/BqWuFmSFrV9Ci477RrXgu hR9Q== X-Gm-Message-State: AHQUAubiOJJQHHiqOE3hE1QLRTzJXRhf//T+9ta/bQqDlDk/FGitRwQS mJyvyR5/7gzN6BaAUFYxk+5T0w== X-Google-Smtp-Source: AHgI3IYgwuL+jLiLCpHchTLruc0Kc/7UgkHCc0/1rO01WAMg5HovbcJ06pfccdCH/nXYb2+NinroVg== X-Received: by 2002:adf:f145:: with SMTP id y5mr9604196wro.240.1551006097143; Sun, 24 Feb 2019 03:01:37 -0800 (PST) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id v9sm5115999wru.83.2019.02.24.03.01.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Feb 2019 03:01:36 -0800 (PST) Date: Sun, 24 Feb 2019 11:51:57 +0100 From: Jiri Pirko To: Jakub Kicinski Cc: davem@davemloft.net, mkubecek@suse.cz, andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com Subject: Re: [PATCH net-next v3 2/6] devlink: create a special NDO for getting the devlink instance Message-ID: <20190224105157.GF2759@nanopsycho.orion> References: <20190222220758.7117-1-jakub.kicinski@netronome.com> <20190222220758.7117-3-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190222220758.7117-3-jakub.kicinski@netronome.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fri, Feb 22, 2019 at 11:07:53PM CET, jakub.kicinski@netronome.com wrote: >Instead of iterating over all devlink ports add a NDO which >will return the devlink instance from the driver. > >v2: add the netdev_to_devlink() helper (Michal) >v3: check that devlink has ops (Florian) > >Suggested-by: Jiri Pirko >Signed-off-by: Jakub Kicinski >Reviewed-by: Florian Fainelli [...] > void devlink_compat_running_version(struct net_device *dev, > char *buf, size_t len) > { >- struct devlink_port *devlink_port; > struct devlink *devlink; > >- mutex_lock(&devlink_mutex); >- list_for_each_entry(devlink, &devlink_list, list) { >- mutex_lock(&devlink->lock); >- list_for_each_entry(devlink_port, &devlink->port_list, list) { >- if (devlink_port->type == DEVLINK_PORT_TYPE_ETH && >- devlink_port->type_dev == dev) { >- __devlink_compat_running_version(devlink, >- buf, len); >- mutex_unlock(&devlink->lock); >- goto out; >- } >- } >- mutex_unlock(&devlink->lock); >- } >-out: >- mutex_unlock(&devlink_mutex); >+ devlink = netdev_to_devlink(dev); What prevents devlink from being unregistered now from another thread? I think you should hold &devlink_mutex here to prevent it. >+ if (!devlink || !devlink->ops || !devlink->ops->info_get) >+ return; >+ >+ mutex_lock(&devlink->lock); >+ __devlink_compat_running_version(devlink, buf, len); >+ mutex_unlock(&devlink->lock); > } > > int devlink_compat_flash_update(struct net_device *dev, const char *file_name) > { >- struct devlink_port *devlink_port; > struct devlink *devlink; >+ int ret; > >- mutex_lock(&devlink_mutex); >- list_for_each_entry(devlink, &devlink_list, list) { >- mutex_lock(&devlink->lock); >- list_for_each_entry(devlink_port, &devlink->port_list, list) { >- int ret = -EOPNOTSUPP; >- >- if (devlink_port->type != DEVLINK_PORT_TYPE_ETH || >- devlink_port->type_dev != dev) >- continue; >- >- mutex_unlock(&devlink_mutex); >- if (devlink->ops->flash_update) >- ret = devlink->ops->flash_update(devlink, >- file_name, >- NULL, NULL); >- mutex_unlock(&devlink->lock); >- return ret; >- } >- mutex_unlock(&devlink->lock); >- } >- mutex_unlock(&devlink_mutex); >+ devlink = netdev_to_devlink(dev); Same here. >+ if (!devlink || !devlink->ops || !devlink->ops->flash_update) >+ return -EOPNOTSUPP; > >- return -EOPNOTSUPP; >+ mutex_lock(&devlink->lock); >+ ret = devlink->ops->flash_update(devlink, file_name, NULL, NULL); >+ mutex_unlock(&devlink->lock); >+ return ret; > } > > static int __init devlink_init(void) >-- >2.19.2 >