Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1729097pxa; Thu, 20 Aug 2020 20:10:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1hTeYLVS3cCSt1Vtdz+bYuW8MkcldrIZvJrVrBMhacuWBxEcBb4uELW7DiCNtC2DMuXfk X-Received: by 2002:a17:906:a00d:: with SMTP id p13mr829122ejy.535.1597979439942; Thu, 20 Aug 2020 20:10:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597979439; cv=none; d=google.com; s=arc-20160816; b=r0HWA2BAW2KsmHRCDRlDJzmIer62fnJyAjuBRM6I5r0ZcT1/iOAcdvdxqwYbjuyTnj CL9B42cxXP98eRRs++cWaL6lh7UyZ5QJu2frQr/P+EN+jWVUD6HIPZQhRKQPSFsYl9Gu Wr+ihdMrpxwTmV71CSJ6tCELJ/7+rpSYMDFRelk9GemJdadHI1DVsPqYoxzNlqO6Punk jW6+2/BOJAzm5nUeJ0MJtQRNDAFNifhK9jAF5I7Io51gg6fXYBKaf4NWAhdtHOoT4d0R 6GZrsJDD+iUsboIdM1OTAeo54Gr33vgOsWRmaISxZ3feS4z9WVlHARBmG6G1wUA7ohJv zQBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:date:from :dkim-signature; bh=QovNeBLcz/7U1y28iI074IyoegagSi9Pk7ZasyQM9Xw=; b=ZOLQwz614Lx/O43Dmgz1Rpix2JSPmbny8mMXJX+KTU+m+qi5WOeXm6JWwxYbS2F2jf ltxt5TdK9xRSAc9mUvcZ+KN9uZR3Ba1U2Osu3zl0QPhBvtkMTw8+Jm2sHTahVD8rdFPR FJqw7RUGMVcNwgX4IFGudrQs62SJVh11bR7f0EfUrBhBV/T2cQrdvyemSNiNEIn/vTiq VFLPl8bN+6HawnwWKe+VYuMFaR3jHtPBUkfs6XJDzeCg4NoxGlv5umlxulvALQsyD3fU xpynSWkKshOhJtO1tS0Vx6+8Qi4LyS5U4EMMX3hgc/6SZ+Gwa03DiYsFA6e/I97L4aGH tBoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=lNPUrNxN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x6si391612ede.495.2020.08.20.20.10.15; Thu, 20 Aug 2020 20:10:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=lNPUrNxN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727101AbgHUDIi (ORCPT + 99 others); Thu, 20 Aug 2020 23:08:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725852AbgHUDIh (ORCPT ); Thu, 20 Aug 2020 23:08:37 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0A35C061385; Thu, 20 Aug 2020 20:08:36 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id ep8so206649pjb.3; Thu, 20 Aug 2020 20:08:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=QovNeBLcz/7U1y28iI074IyoegagSi9Pk7ZasyQM9Xw=; b=lNPUrNxNIaN3d3qmYG+uNNh2/bZ3UBB//1VGnslfwd0JVUdirtZRbkGgbX/XPYjp26 V0l2dZNTpmS1pbrUtkcYZtoHPYwp3vLzRclaeAj7BE2MTdGAT6rOvfjZFSQOpiw06Xb1 i51Lw90UQtUYgTCPDgnglSmFkGhfYQQJ91ZTYGfcZKmLZh8nNFyq9mT123e+xahr5ltO XvsC5FXg6KZeWtrvDOILcbMF5HlM9RphG8jBRzV2iA7CZqH9jH/cYf8c8++pewsJ8Z9O Qo7kjxC32v1ccbz9gg6gw19Ljx6uPo8jvprZxovKlh2E7g1iZhQysjxgWPlAdeC9oNPU cp2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QovNeBLcz/7U1y28iI074IyoegagSi9Pk7ZasyQM9Xw=; b=Zh4CNne0K46fhlPQlchnN9WxpL0OVcgl42Vou+fhV+OA5Fa3p4VgTEDT3yRjlpEfzY KFESg53eOm4X/r4eKxqUnIkYd/wsNfmhWGHaCeWn4ecgwTnufiX35wGx/RIJCNUMVjxO bA0q79N9795k6P5IQ4JeEqzfCkHR9b+Kx1wUHJ7EK3z8XYGQkKdppcHNPNOXSsATq+xa wFTMjC+QUVwQlDlHCjS5d/FYQf+/e1VJ73VrSIFNVd4riLGO+rrl7Y1Ox4JrjG50k8xV hFEot8G1lS4CbVu0fZcEdl3W984WZIkTK8ln9U1QlfK0guMJhsWTzOESWMVd/32SHTAp a+7g== X-Gm-Message-State: AOAM532m1GGoS6LX1XIgyMuBLKHY/bheCv0bbjBwc5SVBg0Eypo8aVaI DDOB6EbWbi35LgaITbvjYQw= X-Received: by 2002:a17:902:bd85:: with SMTP id q5mr666244pls.99.1597979316397; Thu, 20 Aug 2020 20:08:36 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id q82sm564189pfc.139.2020.08.20.20.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 20:08:35 -0700 (PDT) From: Coiby Xu X-Google-Original-From: Coiby Xu Date: Fri, 21 Aug 2020 11:08:22 +0800 To: Benjamin Poirier Cc: netdev@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, Manish Chopra , GR-Linux-NIC-Dev@marvell.com, Greg Kroah-Hartman , Michal Kubecek , open list , "open list:STAGING SUBSYSTEM" Subject: Re: [RFC 1/3] Initialize devlink health dump framework for the dlge driver Message-ID: <20200821030822.huyuxa5o5tcvtv2o@Rk> References: <20200814160601.901682-1-coiby.xu@gmail.com> <20200814160601.901682-2-coiby.xu@gmail.com> <20200816025640.GA27529@f3> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20200816025640.GA27529@f3> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Aug 16, 2020 at 11:56:40AM +0900, Benjamin Poirier wrote: >On 2020-08-15 00:05 +0800, Coiby Xu wrote: >> Initialize devlink health dump framework for the dlge driver so the >> coredump could be done via devlink. >> >> Signed-off-by: Coiby Xu >> --- >> drivers/staging/qlge/Makefile | 2 +- >> drivers/staging/qlge/qlge.h | 9 +++++++ >> drivers/staging/qlge/qlge_health.c | 43 ++++++++++++++++++++++++++++++ >> drivers/staging/qlge/qlge_health.h | 2 ++ >> drivers/staging/qlge/qlge_main.c | 21 +++++++++++++++ >> 5 files changed, 76 insertions(+), 1 deletion(-) >> create mode 100644 drivers/staging/qlge/qlge_health.c >> create mode 100644 drivers/staging/qlge/qlge_health.h >> >> diff --git a/drivers/staging/qlge/Makefile b/drivers/staging/qlge/Makefile >> index 1dc2568e820c..0a1e4c8dd546 100644 >> --- a/drivers/staging/qlge/Makefile >> +++ b/drivers/staging/qlge/Makefile >> @@ -5,4 +5,4 @@ >> >> obj-$(CONFIG_QLGE) += qlge.o >> >> -qlge-objs := qlge_main.o qlge_dbg.o qlge_mpi.o qlge_ethtool.o >> +qlge-objs := qlge_main.o qlge_dbg.o qlge_mpi.o qlge_ethtool.o qlge_health.o >> diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h >> index fc8c5ca8935d..055ded6dab60 100644 >> --- a/drivers/staging/qlge/qlge.h >> +++ b/drivers/staging/qlge/qlge.h >> @@ -2061,6 +2061,14 @@ struct nic_operations { >> int (*port_initialize) (struct ql_adapter *); >> }; >> > >This patch doesn't apply over the latest staging tree. I think your tree >is missing commit d923bb6bf508 ("staging: qlge: qlge.h: Function >definition arguments should have names.") Thank you for applying the patch to test it! I had incorrect understanding about the word "RFC" and didn't do a rebase onto the latest staging tree. > >> + >> + >> +struct qlge_devlink { >> + struct ql_adapter *qdev; >> + struct net_device *ndev; > >I don't have experience implementing devlink callbacks but looking at >some other devlink users (mlx4, ionic, ice), all of them use devlink >priv space for their main private structure. That would be struct >ql_adapter in this case. Is there a good reason to stray from that >pattern? > >> + struct devlink_health_reporter *reporter; >> +}; >> + >> /* >> * The main Adapter structure definition. >> * This structure has all fields relevant to the hardware. >> @@ -2078,6 +2086,7 @@ struct ql_adapter { >> struct pci_dev *pdev; >> struct net_device *ndev; /* Parent NET device */ >> >> + struct qlge_devlink *devlink; >> /* Hardware information */ >> u32 chip_rev_id; >> u32 fw_rev_id; >> diff --git a/drivers/staging/qlge/qlge_health.c b/drivers/staging/qlge/qlge_health.c >> new file mode 100644 >> index 000000000000..292f6b1827e1 >> --- /dev/null >> +++ b/drivers/staging/qlge/qlge_health.c >> @@ -0,0 +1,43 @@ >> +#include "qlge.h" >> +#include "qlge_health.h" >> + >> +static int >> +qlge_reporter_coredump(struct devlink_health_reporter *reporter, >> + struct devlink_fmsg *fmsg, void *priv_ctx, >> + struct netlink_ext_ack *extack) >> +{ >> + return 0; >> +} >> + >> +static const struct devlink_health_reporter_ops qlge_reporter_ops = { >> + .name = "dummy", >> + .dump = qlge_reporter_coredump, >> +}; > >I think > select NET_DEVLINK >should be added to drivers/staging/qlge/Kconfig Thank you for reminding me! > >> + >> +int qlge_health_create_reporters(struct qlge_devlink *priv) >> +{ >> + int err; >> + >> + struct devlink_health_reporter *reporter; >> + struct devlink *devlink; >> + >> + devlink = priv_to_devlink(priv); >> + reporter = >> + devlink_health_reporter_create(devlink, &qlge_reporter_ops, >> + 0, >> + priv); >> + if (IS_ERR(reporter)) { >> + netdev_warn(priv->ndev, >> + "Failed to create reporter, err = %ld\n", >> + PTR_ERR(reporter)); >> + return PTR_ERR(reporter); >> + } >> + priv->reporter = reporter; >> + >> + if (err) >> + return err; >> + >> + return 0; >> +} >> + >> + > >Stray newlines Will fix it in v1. > >> diff --git a/drivers/staging/qlge/qlge_health.h b/drivers/staging/qlge/qlge_health.h >> new file mode 100644 >> index 000000000000..07d3bafab845 >> --- /dev/null >> +++ b/drivers/staging/qlge/qlge_health.h >> @@ -0,0 +1,2 @@ >> +#include >> +int qlge_health_create_reporters(struct qlge_devlink *priv); > >I would suggest to put this in qlge.h instead of creating a new file. Although there are only two lines for now, is it possible qlge will add more devlink code? If that's the case, a file to single out these code is necessary as is the same to some other drivers, $ find drivers -name *health*.h drivers/net/ethernet/mellanox/mlx5/core/en/health.h $ find drivers -name *devlink*.h drivers/net/ethernet/huawei/hinic/hinic_devlink.h drivers/net/ethernet/mellanox/mlx5/core/devlink.h drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h drivers/net/ethernet/intel/ice/ice_devlink.h drivers/net/ethernet/pensando/ionic/ionic_devlink.h drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h > >> diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c >> index 1650de13842f..b2be7f4b7dd6 100644 >> --- a/drivers/staging/qlge/qlge_main.c >> +++ b/drivers/staging/qlge/qlge_main.c >> @@ -42,6 +42,7 @@ >> #include >> >> #include "qlge.h" >> +#include "qlge_health.h" >> >> char qlge_driver_name[] = DRV_NAME; >> const char qlge_driver_version[] = DRV_VERSION; >> @@ -4550,6 +4551,8 @@ static void ql_timer(struct timer_list *t) >> mod_timer(&qdev->timer, jiffies + (5 * HZ)); >> } >> >> +static const struct devlink_ops qlge_devlink_ops; >> + >> static int qlge_probe(struct pci_dev *pdev, >> const struct pci_device_id *pci_entry) >> { >> @@ -4557,6 +4560,13 @@ static int qlge_probe(struct pci_dev *pdev, >> struct ql_adapter *qdev = NULL; >> static int cards_found; >> int err = 0; >> + struct devlink *devlink; >> + struct qlge_devlink *qlge_dl; >> + >> + devlink = devlink_alloc(&qlge_devlink_ops, sizeof(struct qlge_devlink)); >> + if (!devlink) >> + return -ENOMEM; >> + qlge_dl = devlink_priv(devlink); >> >> ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), >> min(MAX_CPUS, >> @@ -4615,6 +4625,15 @@ static int qlge_probe(struct pci_dev *pdev, >> free_netdev(ndev); >> return err; >> } >> + >> + err = devlink_register(devlink, &pdev->dev); >> + if (err) >> + devlink_free(devlink); > >Are you sure it's safe to continue devlink init after an error here? >Again, that does not resemble usage of devlink in other drivers (ex. >bnxt). Thank you for pointing out my neglect! > >> + >> + qlge_health_create_reporters(qlge_dl); >> + qlge_dl->qdev = qdev; >> + qlge_dl->ndev = ndev; >> + qdev->devlink = qlge_dl; >> /* Start up the timer to trigger EEH if >> * the bus goes dead >> */ >> @@ -4647,6 +4666,8 @@ static void qlge_remove(struct pci_dev *pdev) >> unregister_netdev(ndev); >> ql_release_all(pdev); >> pci_disable_device(pdev); >> + devlink_unregister(priv_to_devlink(qdev->devlink)); >> + devlink_health_reporter_destroy(qdev->devlink->reporter); > >Isn't the order of those two calls mixed up? I haven't studied the code to figure out why but other drivers also use the same order. > >> free_netdev(ndev); >> } >> >> -- >> 2.27.0 >> -- Best regards, Coiby