staging: qlge: Initialize devlink health dump framework for the dlge driver
Subsystems (4)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/6 staging: qlge: Initialize devlink health dump framework for the dlge driver
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 9 +++++++ drivers/staging/qlge/qlge_devlink.c | 38 +++++++++++++++++++++++++++++ drivers/staging/qlge/qlge_devlink.h | 8 ++++++ drivers/staging/qlge/qlge_main.c | 28 +++++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.h
drivers/staging/qlge/Kconfig +1 -0
@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
drivers/staging/qlge/Makefile +1 -1
@@ -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_devlink.o
drivers/staging/qlge/qlge.h +9 -0
@@ -2060,6 +2060,14 @@ struct nic_operations {int (*port_initialize)(struct ql_adapter *qdev); }; + + +struct qlge_devlink { +struct ql_adapter *qdev; +struct net_device *ndev; +struct devlink_health_reporter *reporter; +}; +/* * The main Adapter structure definition. * This structure has all fields relevant to the hardware.
@@ -2077,6 +2085,7 @@ struct ql_adapter {struct pci_dev *pdev;struct net_device *ndev;/* Parent NET device */ +struct qlge_devlink *ql_devlink;/* Hardware information */ u32 chip_rev_id;u32 fw_rev_id;
drivers/staging/qlge/qlge_devlink.c new file +38 -0
@@ -0,0 +1,38 @@ +#include "qlge.h" +#include "qlge_devlink.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, +}; + +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; + +return err; +}
drivers/staging/qlge/qlge_devlink.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef QLGE_DEVLINK_H +#define QLGE_DEVLINK_H + +#include <net/devlink.h> + +int qlge_health_create_reporters (struct qlge_devlink *priv); + +#endif /* QLGE_DEVLINK_H */
drivers/staging/qlge/qlge_main.c +28 -0
@@ -42,6 +42,7 @@#include <net/ip6_checksum.h> #include "qlge.h" +#include "qlge_devlink.h" char qlge_driver_name[] =DRV_NAME ;const char qlge_driver_version[] =DRV_VERSION ;
@@ -4549,6 +4550,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) {
@@ -4556,6 +4559,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 *ql_devlink; + + devlink =devlink_alloc (&qlge_devlink_ops,sizeof (struct qlge_devlink )); +if (!devlink) +return -ENOMEM ; + ql_devlink =devlink_priv (devlink); ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), min(MAX_CPUS,
@@ -4614,6 +4624,16 @@ static int qlge_probe(struct pci_dev *pdev,free_netdev (ndev);return err; } + + err =devlink_register (devlink, &pdev->dev); +if (err) { + goto devlink_free; + } + +qlge_health_create_reporters (ql_devlink); + ql_devlink->qdev = qdev; + ql_devlink->ndev = ndev; + qdev->ql_devlink = ql_devlink;/* Start up the timer to trigger EEH if * the bus goes dead */
@@ -4624,6 +4644,10 @@ static int qlge_probe(struct pci_dev *pdev,atomic_set (&qdev->lb_count,0 ); cards_found++;return 0 ; + +devlink_free: +devlink_free (devlink); +return err; }netdev_tx_t ql_lb_send (struct sk_buff *skb,struct net_device *ndev)
@@ -4640,12 +4664,16 @@ static void qlge_remove(struct pci_dev *pdev) {struct net_device *ndev =pci_get_drvdata (pdev);struct ql_adapter *qdev =netdev_priv (ndev); +struct devlink *devlink =priv_to_devlink (qdev->ql_devlink);del_timer_sync (&qdev->timer);ql_cancel_all_work_sync (qdev);unregister_netdev (ndev);ql_release_all (pdev);pci_disable_device (pdev); +devlink_health_reporter_destroy (qdev->ql_devlink->reporter); +devlink_unregister (devlink); +devlink_free (devlink);free_netdev (ndev); }
Signature · 1 line
2.28.0
Quoted 10 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>drivers/staging/qlge/qlge_main.c +0
-0@@ -4556,6 +4559,13 @@ static int qlge_probe(struct pci_dev *pdev,struct ql_adapter *qdev =NULL ;static int cards_found;int err =0 ;
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4571
Quoted 10 lines
drivers/staging/qlge/qlge_main.c +7
-0+struct devlink *devlink; +struct qlge_devlink *ql_devlink; + + devlink =devlink_alloc (&qlge_devlink_ops,sizeof (struct qlge_devlink )); +if (!devlink) +return -ENOMEM ; + ql_devlink =devlink_priv (devlink); ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), min(MAX_CPUS,
need to goto devlink_free instead of return -ENOMEM here, too.
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4625
Quoted 3 lines
drivers/staging/qlge/qlge_main.c +0
-0@@ -4614,6 +4624,16 @@ static int qlge_probe(struct pci_dev *pdev,free_netdev (ndev);return err;
and here
Quoted 23 lines
drivers/staging/qlge/qlge_main.c +14
-0} + + err =devlink_register (devlink, &pdev->dev); +if (err) { + goto devlink_free; + } + +qlge_health_create_reporters (ql_devlink); + ql_devlink->qdev = qdev; + ql_devlink->ndev = ndev; + qdev->ql_devlink = ql_devlink;/* Start up the timer to trigger EEH if * the bus goes dead */ @@ -4624,6 +4644,10 @@ static int qlge_probe(struct pci_dev *pdev,atomic_set (&qdev->lb_count,0 ); cards_found++;return 0 ; + +devlink_free: +devlink_free (devlink); +return err; }
Quoted 24 lines · Willem de Bruijn
Quoted 10 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>drivers/staging/qlge/qlge_main.c +0
-0@@ -4556,6 +4559,13 @@ static int qlge_probe(struct pci_dev *pdev,struct ql_adapter *qdev =NULL ;static int cards_found;int err =0 ;drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4571
Quoted 10 lines
drivers/staging/qlge/qlge_main.c +7
-0+struct devlink *devlink; +struct qlge_devlink *ql_devlink; + + devlink =devlink_alloc (&qlge_devlink_ops,sizeof (struct qlge_devlink )); +if (!devlink) +return -ENOMEM ; + ql_devlink =devlink_priv (devlink); ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), min(MAX_CPUS,need to goto
devlink_freeinstead of return-ENOMEMhere, too.
Quoted 6 lines
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4625
Quoted 3 lines
drivers/staging/qlge/qlge_main.c +0
-0@@ -4614,6 +4624,16 @@ static int qlge_probe(struct pci_dev *pdev,free_netdev (ndev);return err;and here
Thank you for reviewing this work and the speedy feedback! I'll fix it in v2.
Quoted 15 lines
Quoted 15 lines
drivers/staging/qlge/qlge_main.c +10
-0} + + err =devlink_register (devlink, &pdev->dev); +if (err) { + goto devlink_free; + } + +qlge_health_create_reporters (ql_devlink); + ql_devlink->qdev = qdev; + ql_devlink->ndev = ndev; + qdev->ql_devlink = ql_devlink;/* Start up the timer to trigger EEH if * the bus goes dead */ @@ -4624,6 +4644,10 @@ static int qlge_probe(struct pci_dev *pdev,
Quoted 8 lines
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4651
Quoted 8 lines
drivers/staging/qlge/qlge_main.c +4
-0atomic_set (&qdev->lb_count,0 ); cards_found++;return 0 ; + +devlink_free: +devlink_free (devlink); +return err; }
--
Best regards,
Coiby
Quoted 19 lines · Willem de Bruijn
Quoted 18 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>drivers/staging/qlge/qlge_main.c +7
-0@@ -4556,6 +4559,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 *ql_devlink; + + devlink =devlink_alloc (&qlge_devlink_ops,sizeof (struct qlge_devlink )); +if (!devlink) +return -ENOMEM ; + ql_devlink =devlink_priv (devlink);
Quoted 4 lines
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4571
Quoted 2 lines
drivers/staging/qlge/qlge_main.c +0
-0ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), min(MAX_CPUS,need to goto
devlink_freeinstead of return-ENOMEMhere, too.
devlink_alloc return NULL only if kzalloc return NULL. So we shouldn't go to devlink_free which will call kfree.
Quoted 6 lines
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4625
Quoted 4 lines
drivers/staging/qlge/qlge_main.c +0
-0@@ -4614,6 +4624,16 @@ static int qlge_probe(struct pci_dev *pdev,free_netdev (ndev);return err;and here
But I should goto devlink_free here. Thank you for pointing out my neglect.
Quoted 16 lines
Quoted 16 lines
drivers/staging/qlge/qlge_main.c +10
-0} + + err =devlink_register (devlink, &pdev->dev); +if (err) { + goto devlink_free; + } + +qlge_health_create_reporters (ql_devlink); + ql_devlink->qdev = qdev; + ql_devlink->ndev = ndev; + qdev->ql_devlink = ql_devlink;/* Start up the timer to trigger EEH if * the bus goes dead */ @@ -4624,6 +4644,10 @@ static int qlge_probe(struct pci_dev *pdev,
Quoted 8 lines
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4651
Quoted 8 lines
drivers/staging/qlge/qlge_main.c +4
-0atomic_set (&qdev->lb_count,0 ); cards_found++;return 0 ; + +devlink_free: +devlink_free (devlink); +return err; }
--
Best regards,
Coiby
Quoted 42 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 9 +++++++ drivers/staging/qlge/qlge_devlink.c | 38 +++++++++++++++++++++++++++++ drivers/staging/qlge/qlge_devlink.h | 8 ++++++ drivers/staging/qlge/qlge_main.c | 28 +++++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.hdrivers/staging/qlge/Kconfig +1
-0@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.drivers/staging/qlge/Makefile +1
-1@@ -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_devlink.odrivers/staging/qlge/qlge.h +0
-0
drivers/staging/qlge/qlge.h struct nic_operations { · line 2064
Quoted 5 lines
drivers/staging/qlge/qlge.h +2
-0@@ -2060,6 +2060,14 @@ struct nic_operations {int (*port_initialize)(struct ql_adapter *qdev); }; + +
Having multiple blank lines in a row leads to a static checker warning. Please run checkpatch.pl --strict over your patches.
Quoted 27 lines
drivers/staging/qlge/qlge.h +7
-0+struct qlge_devlink { +struct ql_adapter *qdev; +struct net_device *ndev; +struct devlink_health_reporter *reporter; +}; +/* * The main Adapter structure definition. * This structure has all fields relevant to the hardware. @@ -2077,6 +2085,7 @@ struct ql_adapter {struct pci_dev *pdev;struct net_device *ndev;/* Parent NET device */ +struct qlge_devlink *ql_devlink;/* Hardware information */ u32 chip_rev_id;u32 fw_rev_id;drivers/staging/qlge/qlge_devlink.c new file +4
-0@@ -0,0 +1,38 @@ +#include "qlge.h" +#include "qlge_devlink.h" + +static int
drivers/staging/qlge/qlge_devlink.c line 14
Quoted 10 lines
drivers/staging/qlge/qlge_devlink.c new file +10
-0+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,
Indented too far.
drivers/staging/qlge/qlge_devlink.c line 20
Quoted 6 lines
drivers/staging/qlge/qlge_devlink.c new file +6
-0+}; + +int qlge_health_create_reporters (struct qlge_devlink *priv) +{ +int err; +
No blanks in the middle of declarations.
drivers/staging/qlge/qlge_devlink.c line 22
Quoted 2 lines
drivers/staging/qlge/qlge_devlink.c new file +2
-0+struct devlink_health_reporter *reporter; +struct devlink *devlink;
Generally this driver declares variables in "Reverse Christmas Tree" order. The names are orderred by the length of the line from longest to shortest.
type long_name; type medium; type short;
drivers/staging/qlge/qlge_devlink.c line 28
Quoted 6 lines
drivers/staging/qlge/qlge_devlink.c new file +6
-0+ + devlink =priv_to_devlink (priv); + reporter = +devlink_health_reporter_create (devlink, &qlge_reporter_ops, +0 , + priv);
Break this up like so:
reporter = devlink_health_reporter_create(devlink, &qlge_reporter_ops, 0, priv);
drivers/staging/qlge/qlge_devlink.c line 33
Quoted 5 lines
drivers/staging/qlge/qlge_devlink.c new file +5
-0+if (IS_ERR (reporter)) { +netdev_warn (priv->ndev, +"Failed to create reporter, err = %ld\n" , +PTR_ERR (reporter)); +return PTR_ERR (reporter);
No point in returning an error if the caller doesn't check?
drivers/staging/qlge/qlge_devlink.c line 37
Quoted 4 lines
drivers/staging/qlge/qlge_devlink.c new file +4
-0+ } + priv->reporter = reporter; + +return err;
err is uninitialized. "return 0;"
Quoted 51 lines
drivers/staging/qlge/qlge_devlink.c new file +1
-0+}drivers/staging/qlge/qlge_devlink.h new file +8
-0@@ -0,0 +1,8 @@ +#ifndef QLGE_DEVLINK_H +#define QLGE_DEVLINK_H + +#include <net/devlink.h> + +int qlge_health_create_reporters (struct qlge_devlink *priv); + +#endif /* QLGE_DEVLINK_H */ drivers/staging/qlge/qlge_main.c +10
-0@@ -42,6 +42,7 @@#include <net/ip6_checksum.h> #include "qlge.h" +#include "qlge_devlink.h" char qlge_driver_name[] =DRV_NAME ;const char qlge_driver_version[] =DRV_VERSION ;@@ -4549,6 +4550,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) {@@ -4556,6 +4559,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 *ql_devlink; + + devlink =devlink_alloc (&qlge_devlink_ops,sizeof (struct qlge_devlink )); +if (!devlink) +return -ENOMEM ; + ql_devlink =devlink_priv (devlink); ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), min(MAX_CPUS,
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4631
Quoted 8 lines
drivers/staging/qlge/qlge_main.c +5
-0@@ -4614,6 +4624,16 @@ static int qlge_probe(struct pci_dev *pdev,free_netdev (ndev);return err; } + + err =devlink_register (devlink, &pdev->dev); +if (err) { + goto devlink_free; + }
Checkpatch warning.
regards,
dan carpenter
Quoted 188 lines · Dan Carpenter
Quoted 42 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 9 +++++++ drivers/staging/qlge/qlge_devlink.c | 38 +++++++++++++++++++++++++++++ drivers/staging/qlge/qlge_devlink.h | 8 ++++++ drivers/staging/qlge/qlge_main.c | 28 +++++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.hdrivers/staging/qlge/Kconfig +1
-0@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.drivers/staging/qlge/Makefile +1
-1@@ -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_devlink.odrivers/staging/qlge/qlge.h +0
-0drivers/staging/qlge/qlge.h struct nic_operations { · line 2064
Quoted 5 lines
drivers/staging/qlge/qlge.h +2
-0@@ -2060,6 +2060,14 @@ struct nic_operations {int (*port_initialize)(struct ql_adapter *qdev); }; + +Having multiple blank lines in a row leads to a static checker warning. Please run
checkpatch.pl --strictover your patches.Quoted 27 lines
drivers/staging/qlge/qlge.h +7
-0+struct qlge_devlink { +struct ql_adapter *qdev; +struct net_device *ndev; +struct devlink_health_reporter *reporter; +}; +/* * The main Adapter structure definition. * This structure has all fields relevant to the hardware. @@ -2077,6 +2085,7 @@ struct ql_adapter {struct pci_dev *pdev;struct net_device *ndev;/* Parent NET device */ +struct qlge_devlink *ql_devlink;/* Hardware information */ u32 chip_rev_id;u32 fw_rev_id;drivers/staging/qlge/qlge_devlink.c new file +4
-0@@ -0,0 +1,38 @@ +#include "qlge.h" +#include "qlge_devlink.h" + +static intdrivers/staging/qlge/qlge_devlink.c line 14
Quoted 10 lines
drivers/staging/qlge/qlge_devlink.c new file +10
-0+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,Indented too far.
drivers/staging/qlge/qlge_devlink.c line 20
Quoted 6 lines
drivers/staging/qlge/qlge_devlink.c new file +6
-0+}; + +int qlge_health_create_reporters (struct qlge_devlink *priv) +{ +int err; +No blanks in the middle of declarations.
drivers/staging/qlge/qlge_devlink.c line 22
Quoted 2 lines
drivers/staging/qlge/qlge_devlink.c new file +2
-0+struct devlink_health_reporter *reporter; +struct devlink *devlink;Generally this driver declares variables in "Reverse Christmas Tree" order. The names are orderred by the length of the line from longest to shortest.
type long_name; type medium; type short;drivers/staging/qlge/qlge_devlink.c line 28
Quoted 6 lines
drivers/staging/qlge/qlge_devlink.c new file +6
-0+ + devlink =priv_to_devlink (priv); + reporter = +devlink_health_reporter_create (devlink, &qlge_reporter_ops, +0 , + priv);Break this up like so:
reporter = devlink_health_reporter_create(devlink, &qlge_reporter_ops, 0, priv);drivers/staging/qlge/qlge_devlink.c line 33
Quoted 5 lines
drivers/staging/qlge/qlge_devlink.c new file +5
-0+if (IS_ERR (reporter)) { +netdev_warn (priv->ndev, +"Failed to create reporter, err = %ld\n" , +PTR_ERR (reporter)); +return PTR_ERR (reporter);No point in returning an error if the caller doesn't check?
drivers/staging/qlge/qlge_devlink.c line 37
Quoted 4 lines
drivers/staging/qlge/qlge_devlink.c new file +4
-0+ } + priv->reporter = reporter; + +return err;err is uninitialized. "return 0;"
Quoted 48 lines
drivers/staging/qlge/qlge_devlink.c new file +1
-0+}drivers/staging/qlge/qlge_devlink.h new file +8
-0@@ -0,0 +1,8 @@ +#ifndef QLGE_DEVLINK_H +#define QLGE_DEVLINK_H + +#include <net/devlink.h> + +int qlge_health_create_reporters (struct qlge_devlink *priv); + +#endif /* QLGE_DEVLINK_H */ drivers/staging/qlge/qlge_main.c +10
-0@@ -42,6 +42,7 @@#include <net/ip6_checksum.h> #include "qlge.h" +#include "qlge_devlink.h" char qlge_driver_name[] =DRV_NAME ;const char qlge_driver_version[] =DRV_VERSION ;@@ -4549,6 +4550,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) {@@ -4556,6 +4559,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 *ql_devlink; + + devlink =devlink_alloc (&qlge_devlink_ops,sizeof (struct qlge_devlink )); +if (!devlink) +return -ENOMEM ; + ql_devlink =devlink_priv (devlink);
Quoted 14 lines
drivers/staging/qlge/qlge_main.c static int qlge_probe(struct pci_dev *pdev, · line 4631
Quoted 11 lines
drivers/staging/qlge/qlge_main.c +5
-0ndev = alloc_etherdev_mq(sizeof(struct ql_adapter), min(MAX_CPUS,@@ -4614,6 +4624,16 @@ static int qlge_probe(struct pci_dev *pdev,free_netdev (ndev);return err; } + + err =devlink_register (devlink, &pdev->dev); +if (err) { + goto devlink_free; + }Checkpatch warning.
Thank you for the reminding!
Quoted 3 lines
regards,
dan carpenter
--
Best regards,
Coiby
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Coiby,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on staging/staging-testing]
url: https://github.com/0day-ci/linux/commits/Coiby-Xu/staging-qlge-Re-writing-the-debugging-features/20201008-200002 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 76c3bdd67d27289b9e407113821eab2a70bbcca6 config: arm64-randconfig-r025-20201008 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 8da0df3d6dcc0dd42740be60b0da4ec201190904)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/dda18d66af0554f1f2b69f9a61335f3de9ec5124
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Coiby-Xu/staging-qlge-Re-writing-the-debugging-features/20201008-200002 git checkout dda18d66af0554f1f2b69f9a61335f3de9ec5124
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/staging/qlge/qlge_devlink.c:37:9: warning: variable 'err' is uninitialized when used here [-Wuninitialized]
return err;
^~~
drivers/staging/qlge/qlge_devlink.c:19:9: note: initialize the variable 'err' to silence this warning
int err;
^
= 01 warning generated.
vim +/err +37 drivers/staging/qlge/qlge_devlink.c
16
17 int qlge_health_create_reporters(struct qlge_devlink *priv)
18 {
19 int err;
20
21 struct devlink_health_reporter *reporter;
22 struct devlink *devlink;
23
24 devlink = priv_to_devlink(priv);
25 reporter =
26 devlink_health_reporter_create(devlink, &qlge_reporter_ops,
27 0,
28 priv);
29 if (IS_ERR(reporter)) {
30 netdev_warn(priv->ndev,
31 "Failed to create reporter, err = %ld\n",
32 PTR_ERR(reporter));
33 return PTR_ERR(reporter);
34 }
35 priv->reporter = reporter;
36
> 37 return err;---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
Quoted 42 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 9 +++++++ drivers/staging/qlge/qlge_devlink.c | 38 +++++++++++++++++++++++++++++ drivers/staging/qlge/qlge_devlink.h | 8 ++++++ drivers/staging/qlge/qlge_main.c | 28 +++++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.hdrivers/staging/qlge/Kconfig +1
-0@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.drivers/staging/qlge/Makefile +1
-1@@ -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_devlink.odrivers/staging/qlge/qlge.h +0
-0
drivers/staging/qlge/qlge.h struct nic_operations { · line 2067
Quoted 8 lines
drivers/staging/qlge/qlge.h +5
-0@@ -2060,6 +2060,14 @@ struct nic_operations {int (*port_initialize)(struct ql_adapter *qdev); }; + + +struct qlge_devlink { +struct ql_adapter *qdev; +struct net_device *ndev;
This member should be removed, it is unused throughout the rest of the series. Indeed, it's simple to use qdev->ndev and that's what qlge_reporter_coredump() does.
Quoted 46 lines · Benjamin Poirier
Quoted 45 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 9 +++++++ drivers/staging/qlge/qlge_devlink.c | 38 +++++++++++++++++++++++++++++ drivers/staging/qlge/qlge_devlink.h | 8 ++++++ drivers/staging/qlge/qlge_main.c | 28 +++++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.hdrivers/staging/qlge/Kconfig +1
-0@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.drivers/staging/qlge/Makefile +1
-1@@ -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_devlink.odrivers/staging/qlge/qlge.h +0
-0@@ -2060,6 +2060,14 @@ struct nic_operations {int (*port_initialize)(struct ql_adapter *qdev); };
Quoted 9 lines
drivers/staging/qlge/qlge.h struct nic_operations { · line 2067
Quoted 5 lines
drivers/staging/qlge/qlge.h +5
-0+ + +struct qlge_devlink { +struct ql_adapter *qdev; +struct net_device *ndev;This member should be removed, it is unused throughout the rest of the series. Indeed, it's simple to use
qdev->ndevand that's whatqlge_reporter_coredump()does.
It reminds me that I forgot to reply to one of your comments in RFC and sorry for that,
Quoted 11 lines
drivers/staging/qlge/qlge.h struct nic_operations { · line 2067
Quoted 5 lines
drivers/staging/qlge/qlge.h +5
-0+ + +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_adapterin this case. Is there a good reason to stray from that pattern?
struct ql_adapter which is created via alloc_etherdev_mq is the private space of struct net_device so we can't use ql_adapter as the the devlink private space simultaneously. Thus struct qlge_devlink is required.
--
Best regards,
Coiby
Quoted 57 lines · Coiby Xu
Quoted 46 lines · Benjamin Poirier
Quoted 45 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 9 +++++++ drivers/staging/qlge/qlge_devlink.c | 38 +++++++++++++++++++++++++++++ drivers/staging/qlge/qlge_devlink.h | 8 ++++++ drivers/staging/qlge/qlge_main.c | 28 +++++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.hdrivers/staging/qlge/Kconfig +1
-0@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.drivers/staging/qlge/Makefile +1
-1@@ -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_devlink.odrivers/staging/qlge/qlge.h +0
-0@@ -2060,6 +2060,14 @@ struct nic_operations {int (*port_initialize)(struct ql_adapter *qdev); };Quoted 9 lines
drivers/staging/qlge/qlge.h struct nic_operations { · line 2067
Quoted 5 lines
drivers/staging/qlge/qlge.h +5
-0+ + +struct qlge_devlink { +struct ql_adapter *qdev; +struct net_device *ndev;This member should be removed, it is unused throughout the rest of the series. Indeed, it's simple to use
qdev->ndevand that's whatqlge_reporter_coredump()does.
Quoted 13 lines
It reminds me that I forgot to reply to one of your comments in RFC and sorry for that,
Quoted 11 lines
drivers/staging/qlge/qlge.h struct nic_operations { · line 2067
Quoted 5 lines
drivers/staging/qlge/qlge.h +5
-0+ + +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_adapterin this case. Is there a good reason to stray from that pattern?
Thanks for getting back to that comment.
Quoted 5 lines
struct
ql_adapterwhich is created viaalloc_etherdev_mqis the private space of structnet_deviceso we can't useql_adapteras the the devlink private space simultaneously. Thus structqlge_devlinkis required.
Looking at those drivers (mlx4, ionic, ice), the usage of alloc_etherdev_mq() is not really an obstacle. Definitely, some members would need to be moved from ql_adapter to qlge_devlink to use that pattern.
I think, but didn't check in depth, that in those drivers, the devlink device is tied to the pci device and can exist independently of the netdev, at least in principle.
In any case, I see now that some other drivers (bnxt, liquidio) have a pattern similar to what you use so I guess that's acceptable too.
Quoted 80 lines · Benjamin Poirier
Quoted 57 lines · Coiby Xu
Quoted 46 lines · Benjamin Poirier
Quoted 45 lines · Coiby Xu
Initialize devlink health dump framework for the dlge driver so the coredump could be done via devlink.
Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/Kconfig | 1 + drivers/staging/qlge/Makefile | 2 +- drivers/staging/qlge/qlge.h | 9 +++++++ drivers/staging/qlge/qlge_devlink.c | 38 +++++++++++++++++++++++++++++ drivers/staging/qlge/qlge_devlink.h | 8 ++++++ drivers/staging/qlge/qlge_main.c | 28 +++++++++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/qlge/qlge_devlink.c create mode 100644 drivers/staging/qlge/qlge_devlink.hdrivers/staging/qlge/Kconfig +1
-0@@ -3,6 +3,7 @@ config QLGE tristate "QLogic QLGE 10Gb Ethernet Driver Support" depends on ETHERNET && PCI + select NET_DEVLINK help This driver supports QLogic ISP8XXX 10Gb Ethernet cards.drivers/staging/qlge/Makefile +1
-1@@ -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_devlink.odrivers/staging/qlge/qlge.h +0
-0@@ -2060,6 +2060,14 @@ struct nic_operations {int (*port_initialize)(struct ql_adapter *qdev); };Quoted 9 lines
drivers/staging/qlge/qlge.h struct nic_operations { · line 2067
Quoted 5 lines
drivers/staging/qlge/qlge.h +5
-0+ + +struct qlge_devlink { +struct ql_adapter *qdev; +struct net_device *ndev;This member should be removed, it is unused throughout the rest of the series. Indeed, it's simple to use
qdev->ndevand that's whatqlge_reporter_coredump()does.Quoted 13 lines
It reminds me that I forgot to reply to one of your comments in RFC and sorry for that,
Quoted 11 lines
drivers/staging/qlge/qlge.h struct nic_operations { · line 2067
Quoted 5 lines
drivers/staging/qlge/qlge.h +5
-0+ + +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_adapterin this case. Is there a good reason to stray from that pattern?Thanks for getting back to that comment.
Quoted 5 lines
struct
ql_adapterwhich is created viaalloc_etherdev_mqis the private space of structnet_deviceso we can't useql_adapteras the the devlink private space simultaneously. Thus structqlge_devlinkis required.
Quoted 5 lines
Looking at those drivers (mlx4, ionic, ice), the usage of
alloc_etherdev_mq()is not really an obstacle. Definitely, some members would need to be moved fromql_adaptertoqlge_devlinkto use that pattern.
I see what you mean now. I thought we were going to use struct ql_adapter as the shared private structure of devlink and net_device. If we are going to use ql_adapter as the private structure of devlink then we have to define another private structure for net_device.
Quoted 4 lines
I think, but didn't check in depth, that in those drivers, the devlink device is tied to the pci device and can exist independently of the netdev, at least in principle.
You are right. Take drivers/net/ethernet/mellanox/mlxsw as an example, devlink reload would first first unregister_netdev and then register_netdev but struct devlink stays put. But I have yet to understand when unregister/register_netdev is needed. Do we need to add "devlink reload" for qlge?
Quoted 2 lines
In any case, I see now that some other drivers (bnxt, liquidio) have a pattern similar to what you use so I guess that's acceptable too.
--
Best regards,
Coiby
On 2020-10-12 19:24 +0800, Coiby Xu wrote:
[...]
Quoted 8 lines
Quoted 4 lines
I think, but didn't check in depth, that in those drivers, the devlink device is tied to the pci device and can exist independently of the netdev, at least in principle.
You are right. Take
drivers/net/ethernet/mellanox/mlxswas an example, devlink reload would first firstunregister_netdevand thenregister_netdevbut struct devlink stays put. But I have yet to understand when unregister/register_netdev is needed.
Maybe it can be useful to manually recover if the hardware or driver gets in an erroneous state. I've used modprobe -r qlge && modprobe qlge for the same in the past.
Quoted 2 lines
Do we need to
add "devlink reload" for qlge?
Not for this patchset. That would be a new feature.
Quoted 6 lines · Benjamin Poirier
On 2020-10-12 19:24 +0800, Coiby Xu wrote:
[...]Quoted 4 lines
Quoted 4 lines
I think, but didn't check in depth, that in those drivers, the devlink device is tied to the pci device and can exist independently of the netdev, at least in principle.
Quoted 8 lines
Quoted 4 lines
You are right. Take
drivers/net/ethernet/mellanox/mlxswas an example, devlink reload would first firstunregister_netdevand thenregister_netdevbut struct devlink stays put. But I have yet to understand when unregister/register_netdev is needed.Maybe it can be useful to manually recover if the hardware or driver gets in an erroneous state. I've used
modprobe -r qlge && modprobe qlgefor the same in the past.
Thank you for providing this user case!
Quoted 5 lines
Quoted 3 lines
Do we need to
add "devlink reload" for qlge?Not for this patchset. That would be a new feature.
To implement this feature, it seems I need to understand how qlge work under the hood. For example, what's the difference between qlge_soft_reset_mpi_risc and qlge_hard_reset_mpi_risc? Or should we use a brute-force way like do the tasks in qlge_remove and then re-do the tasks in qlge_probe? Is a hardware reference manual for qlge device?
--
Best regards,
Coiby
Quoted 21 lines · Coiby Xu
Quoted 6 lines · Benjamin Poirier
On 2020-10-12 19:24 +0800, Coiby Xu wrote:
[...]Quoted 4 lines
Quoted 4 lines
I think, but didn't check in depth, that in those drivers, the devlink device is tied to the pci device and can exist independently of the netdev, at least in principle.
Quoted 8 lines
Quoted 4 lines
You are right. Take
drivers/net/ethernet/mellanox/mlxswas an example, devlink reload would first firstunregister_netdevand thenregister_netdevbut struct devlink stays put. But I have yet to understand when unregister/register_netdev is needed.Maybe it can be useful to manually recover if the hardware or driver gets in an erroneous state. I've used
modprobe -r qlge && modprobe qlgefor the same in the past.Thank you for providing this user case!
Quoted 4 lines
Quoted 3 lines
Do we need to
add "devlink reload" for qlge?
Quoted 7 lines
Quoted 1 line
Not for this patchset. That would be a new feature.
To implement this feature, it seems I need to understand how qlge work under the hood. For example, what's the difference between
qlge_soft_reset_mpi_riscandqlge_hard_reset_mpi_risc? Or should we use a brute-force way like do the tasks inqlge_removeand then re-do the tasks inqlge_probe?
I don't know. Like I've said before, I'd recommend testing on actual hardware. I don't have access to it anymore.
Quoted 1 line
Is a hardware reference manual for qlge device?
I've never gotten access to one.
The only noteworthy thing from Qlogic that I know of is the firmware update:
http://driverdownloads.qlogic.com/QLogicDriverDownloads_UI/SearchByProduct.aspx?ProductCategory=322&Product=1104&Os=190
It did fix some weird behavior when I applied it so I'd recommend doing the same if you get an adapter.
Quoted 24 lines · Benjamin Poirier
Quoted 23 lines · Coiby Xu
Quoted 6 lines · Benjamin Poirier
On 2020-10-12 19:24 +0800, Coiby Xu wrote:
[...]Quoted 4 lines
Quoted 4 lines
I think, but didn't check in depth, that in those drivers, the devlink device is tied to the pci device and can exist independently of the netdev, at least in principle.
Quoted 8 lines
Quoted 4 lines
You are right. Take
drivers/net/ethernet/mellanox/mlxswas an example, devlink reload would first firstunregister_netdevand thenregister_netdevbut struct devlink stays put. But I have yet to understand when unregister/register_netdev is needed.Maybe it can be useful to manually recover if the hardware or driver gets in an erroneous state. I've used
modprobe -r qlge && modprobe qlgefor the same in the past.Thank you for providing this user case!
Quoted 5 lines
Quoted 3 lines
Do we need to
add "devlink reload" for qlge?Not for this patchset. That would be a new feature.
Quoted 8 lines
Quoted 5 lines
To implement this feature, it seems I need to understand how qlge work under the hood. For example, what's the difference between
qlge_soft_reset_mpi_riscandqlge_hard_reset_mpi_risc? Or should we use a brute-force way like do the tasks inqlge_removeand then re-do the tasks inqlge_probe?I don't know. Like I've said before, I'd recommend testing on actual hardware. I don't have access to it anymore.
Yeah, as I'm changing more code, it's more and more important to test it on actual hardware. Have you heard anyone installing qle8142 to Raspberry Pi which has a PCIe bus.
Quoted 5 lines
Quoted 2 lines
Is a hardware reference manual for qlge device?
I've never gotten access to one.
My experience of wrestling with an AMD GPIO chip [1] shows it would be a bit annoying to deal with a device without a reference manual. I have to treat it like a blackbox and try different kinds of input to see what would happen.
Btw, it seems resetting the device is a kind of panacea. For example, according to the specs of my touchpad (Synaptics RMI4 Specification), it even has the feature of spontaneous reset. devlink health [2] also has the so-called auto-recovery. So resetting is a common phenomenon. I wonder if there are some common guidelines to do resetting which also apply to the qlge8*** devices.
Quoted 6 lines
The only noteworthy thing from Qlogic that I know of is the firmware update:
http://driverdownloads.qlogic.com/QLogicDriverDownloads_UI/SearchByProduct.aspx?ProductCategory=322&Product=1104&Os=190It did fix some weird behavior when I applied it so I'd recommend doing the same if you get an adapter.
Thank you for sharing the info!
[1] https://www.spinics.net/lists/linux-gpio/msg53901.html
[2] https://www.kernel.org/doc/html/latest/networking/devlink/devlink-health.html
--
Best regards,
Coiby
PATCH 2/6 staging: qlge: coredump via devlink health reporter
In reply to a message not in the archive $ devlink health dump show DEVICE reporter coredump -p -j
{
"Core Registers": {
"segment": 1,
"values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]
},
"Test Logic Regs": {
"segment": 2,
"values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]
},
"RMII Registers": {
"segment": 3,
"values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]
},
...
"Sem Registers": {
"segment": 50,
"values": [ 0,0,0,0 ]
}
}--- drivers/staging/qlge/qlge_devlink.c | 131 ++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 6 deletions(-)
drivers/staging/qlge/qlge_devlink.c +125 -6
@@ -1,16 +1,135 @@#include "qlge.h" #include "qlge_devlink.h" -static int -qlge_reporter_coredump (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg,void *priv_ctx, -struct netlink_ext_ack *extack) +static int fill_seg_ (struct devlink_fmsg *fmsg, +struct mpi_coredump_segment_header *seg_header, +u32 *reg_data) { -return 0 ; +int i; +int header_size =sizeof (struct mpi_coredump_segment_header ); +int regs_num = (seg_header->seg_size - header_size) /sizeof (u32); +int err; + + err =devlink_fmsg_pair_nest_start (fmsg, seg_header->description); +if (err) +return err; + err =devlink_fmsg_obj_nest_start (fmsg); +if (err) +return err; + err =devlink_fmsg_u32_pair_put (fmsg,"segment" , seg_header->seg_num); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_start (fmsg,"values" ); +if (err) +return err; +for (i =0 ; i < regs_num; i++) { + err =devlink_fmsg_u32_put (fmsg, *reg_data); +if (err) +return err; + reg_data++; + } + err =devlink_fmsg_obj_nest_end (fmsg); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_end (fmsg); +if (err) +return err; + err =devlink_fmsg_pair_nest_end (fmsg); +return err; +} + +#define fill_seg (seg_hdr, seg_regs) \ + do { \ + err = fill_seg_(fmsg, &dump->seg_hdr, dump->seg_regs); \ + if (err) { \ + kvfree(dump); \ + return err; \ + } \ + } while (0) + +static int qlge_reporter_coredump (struct devlink_health_reporter *reporter, +struct devlink_fmsg *fmsg,void *priv_ctx, +struct netlink_ext_ack *extack) +{ +int err =0 ; + +struct qlge_devlink *dev =devlink_health_reporter_priv (reporter); +struct ql_adapter *qdev = dev->qdev; +struct ql_mpi_coredump *dump; + +if (!netif_running (qdev->ndev)) +return 0 ; + + dump =kvmalloc (sizeof (*dump),GFP_KERNEL ); +if (!dump) +return -ENOMEM ; + + err =ql_core_dump (qdev, dump); +if (err) { +kvfree (dump); +return err; + } + +fill_seg (core_regs_seg_hdr, mpi_core_regs); +fill_seg (test_logic_regs_seg_hdr, test_logic_regs); +fill_seg (rmii_regs_seg_hdr, rmii_regs); +fill_seg (fcmac1_regs_seg_hdr, fcmac1_regs); +fill_seg (fcmac2_regs_seg_hdr, fcmac2_regs); +fill_seg (fc1_mbx_regs_seg_hdr, fc1_mbx_regs); +fill_seg (ide_regs_seg_hdr, ide_regs); +fill_seg (nic1_mbx_regs_seg_hdr, nic1_mbx_regs); +fill_seg (smbus_regs_seg_hdr, smbus_regs); +fill_seg (fc2_mbx_regs_seg_hdr, fc2_mbx_regs); +fill_seg (nic2_mbx_regs_seg_hdr, nic2_mbx_regs); +fill_seg (i2c_regs_seg_hdr, i2c_regs); +fill_seg (memc_regs_seg_hdr, memc_regs); +fill_seg (pbus_regs_seg_hdr, pbus_regs); +fill_seg (mde_regs_seg_hdr, mde_regs); +fill_seg (nic_regs_seg_hdr, nic_regs); +fill_seg (nic2_regs_seg_hdr, nic2_regs); +fill_seg (xgmac1_seg_hdr, xgmac1); +fill_seg (xgmac2_seg_hdr, xgmac2); +fill_seg (code_ram_seg_hdr, code_ram); +fill_seg (memc_ram_seg_hdr, memc_ram); +fill_seg (xaui_an_hdr, serdes_xaui_an); +fill_seg (xaui_hss_pcs_hdr, serdes_xaui_hss_pcs); +fill_seg (xfi_an_hdr, serdes_xfi_an); +fill_seg (xfi_train_hdr, serdes_xfi_train); +fill_seg (xfi_hss_pcs_hdr, serdes_xfi_hss_pcs); +fill_seg (xfi_hss_tx_hdr, serdes_xfi_hss_tx); +fill_seg (xfi_hss_rx_hdr, serdes_xfi_hss_rx); +fill_seg (xfi_hss_pll_hdr, serdes_xfi_hss_pll); + + err =fill_seg_ (fmsg, &dump->misc_nic_seg_hdr, + (u32 *)&dump->misc_nic_info); +if (err) { +kvfree (dump); +return err; + } + +fill_seg (intr_states_seg_hdr, intr_states); +fill_seg (cam_entries_seg_hdr, cam_entries); +fill_seg (nic_routing_words_seg_hdr, nic_routing_words); +fill_seg (ets_seg_hdr, ets); +fill_seg (probe_dump_seg_hdr, probe_dump); +fill_seg (routing_reg_seg_hdr, routing_regs); +fill_seg (mac_prot_reg_seg_hdr, mac_prot_regs); +fill_seg (xaui2_an_hdr, serdes2_xaui_an); +fill_seg (xaui2_hss_pcs_hdr, serdes2_xaui_hss_pcs); +fill_seg (xfi2_an_hdr, serdes2_xfi_an); +fill_seg (xfi2_train_hdr, serdes2_xfi_train); +fill_seg (xfi2_hss_pcs_hdr, serdes2_xfi_hss_pcs); +fill_seg (xfi2_hss_tx_hdr, serdes2_xfi_hss_tx); +fill_seg (xfi2_hss_rx_hdr, serdes2_xfi_hss_rx); +fill_seg (xfi2_hss_pll_hdr, serdes2_xfi_hss_pll); +fill_seg (sem_regs_seg_hdr, sem_regs); + +kvfree (dump); +return err; }static const struct devlink_health_reporter_ops qlge_reporter_ops = { - .name ="dummy" , + .name ="coredump" , .dump = qlge_reporter_coredump, };
Signature · 1 line
2.28.0
Re: [PATCH v1 2/6] staging: qlge: coredump via devlink health reporter
drivers/staging/qlge/qlge_devlink.c line 9
Quoted 11 lines · Coiby Xu
drivers/staging/qlge/qlge_devlink.c +5
-5-static int -qlge_reporter_coredump (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg,void *priv_ctx, -struct netlink_ext_ack *extack) +static int fill_seg_ (struct devlink_fmsg *fmsg, +struct mpi_coredump_segment_header *seg_header, +u32 *reg_data) { -return 0 ; +int i; +int header_size =sizeof (struct mpi_coredump_segment_header );
Please use the sizeof() directly in the code. Don't introduce indirection if you can help it.
drivers/staging/qlge/qlge_devlink.c line 12
Quoted 3 lines
drivers/staging/qlge/qlge_devlink.c +3
-0+int regs_num = (seg_header->seg_size - header_size) /sizeof (u32); +int err; +
regards,
dan carpenter
Re: [PATCH v1 2/6] staging: qlge: coredump via devlink health reporter
Quoted 16 lines · Dan Carpenter
drivers/staging/qlge/qlge_devlink.c line 9
Quoted 11 lines · Coiby Xu
drivers/staging/qlge/qlge_devlink.c +5
-5-static int -qlge_reporter_coredump (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg,void *priv_ctx, -struct netlink_ext_ack *extack) +static int fill_seg_ (struct devlink_fmsg *fmsg, +struct mpi_coredump_segment_header *seg_header, +u32 *reg_data) { -return 0 ; +int i; +int header_size =sizeof (struct mpi_coredump_segment_header );Please use the
sizeof()directly in the code. Don't introduce indirection if you can help it.
Quoted 4 lines
drivers/staging/qlge/qlge_devlink.c line 12
Quoted 3 lines
drivers/staging/qlge/qlge_devlink.c +3
-0+int regs_num = (seg_header->seg_size - header_size) /sizeof (u32); +int err; +
Thank you for the suggestion!
Quoted 2 lines
regards,
dan carpenter
--
Best regards,
Coiby
Re: [PATCH v1 2/6] staging: qlge: coredump via devlink health reporter
In reply to Coiby XuQuoted 32 lines · Coiby Xu
$ devlink health dump show DEVICE reporter coredump -p -j { "Core Registers": { "segment": 1, "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ] }, "Test Logic Regs": { "segment": 2, "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ] }, "RMII Registers": { "segment": 3, "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ] }, ... "Sem Registers": { "segment": 50, "values": [ 0,0,0,0 ] } }Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/qlge_devlink.c | 131 ++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 6 deletions(-)drivers/staging/qlge/qlge_devlink.c +0
-0
drivers/staging/qlge/qlge_devlink.c line 4
Quoted 8 lines
drivers/staging/qlge/qlge_devlink.c +1
-4@@ -1,16 +1,135 @@#include "qlge.h" #include "qlge_devlink.h" -static int -qlge_reporter_coredump (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg,void *priv_ctx, -struct netlink_ext_ack *extack) +static int fill_seg_(struct devlink_fmsg *fmsg,
Please include the "qlge_" prefix.
Quoted 28 lines
drivers/staging/qlge/qlge_devlink.c +26
-1+struct mpi_coredump_segment_header *seg_header, + u32 *reg_data) { -return 0 ; + int i; +int header_size =sizeof (struct mpi_coredump_segment_header ); +int regs_num = (seg_header->seg_size - header_size) /sizeof (u32); +int err; + + err =devlink_fmsg_pair_nest_start (fmsg, seg_header->description); +if (err) +return err; + err =devlink_fmsg_obj_nest_start (fmsg); +if (err) +return err; + err =devlink_fmsg_u32_pair_put (fmsg,"segment" , seg_header->seg_num); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_start (fmsg,"values" ); +if (err) +return err; +for (i =0 ; i < regs_num; i++) { + err =devlink_fmsg_u32_put (fmsg, *reg_data); +if (err) +return err; + reg_data++; + } + err =devlink_fmsg_obj_nest_end (fmsg);
drivers/staging/qlge/qlge_devlink.c line 41
Quoted 10 lines
drivers/staging/qlge/qlge_devlink.c +10
-0+if (err) +return err; + err =devlink_fmsg_arr_pair_nest_end (fmsg); +if (err) +return err; + err =devlink_fmsg_pair_nest_end (fmsg); +return err; +} + +#define fill_seg (seg_hdr, seg_regs) \
considering that this macro accesses local variables, it is not really "function-like". I think an all-caps name would be better to tip-off the reader.
Quoted 5 lines
drivers/staging/qlge/qlge_devlink.c +5
-0+ do { \ + err = fill_seg_(fmsg, &dump->seg_hdr, dump->seg_regs); \ + if (err) { \ + kvfree(dump); \ + return err; \
drivers/staging/qlge/qlge_devlink.c line 56
Quoted 10 lines
drivers/staging/qlge/qlge_devlink.c +10
-0+ } \ + }while (0 ) + +static int qlge_reporter_coredump(struct devlink_health_reporter *reporter, +struct devlink_fmsg *fmsg,void *priv_ctx, +struct netlink_ext_ack *extack) +{ +int err =0 ; + +struct qlge_devlink *dev =devlink_health_reporter_priv (reporter);
Please name this variable ql_devlink, like in qlge_probe().
Re: [PATCH v1 2/6] staging: qlge: coredump via devlink health reporter
Quoted 78 lines · Benjamin Poirier
Quoted 32 lines · Coiby Xu
$ devlink health dump show DEVICE reporter coredump -p -j { "Core Registers": { "segment": 1, "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ] }, "Test Logic Regs": { "segment": 2, "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ] }, "RMII Registers": { "segment": 3, "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ] }, ... "Sem Registers": { "segment": 50, "values": [ 0,0,0,0 ] } }Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/qlge_devlink.c | 131 ++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 6 deletions(-)drivers/staging/qlge/qlge_devlink.c +0
-0drivers/staging/qlge/qlge_devlink.c line 4
Quoted 8 lines
drivers/staging/qlge/qlge_devlink.c +1
-4@@ -1,16 +1,135 @@#include "qlge.h" #include "qlge_devlink.h" -static int -qlge_reporter_coredump (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg,void *priv_ctx, -struct netlink_ext_ack *extack) +static int fill_seg_(struct devlink_fmsg *fmsg,Please include the "
qlge_" prefix.Quoted 34 lines
drivers/staging/qlge/qlge_devlink.c +32
-1+struct mpi_coredump_segment_header *seg_header, + u32 *reg_data) { -return 0 ; + int i; +int header_size =sizeof (struct mpi_coredump_segment_header ); +int regs_num = (seg_header->seg_size - header_size) /sizeof (u32); +int err; + + err =devlink_fmsg_pair_nest_start (fmsg, seg_header->description); +if (err) +return err; + err =devlink_fmsg_obj_nest_start (fmsg); +if (err) +return err; + err =devlink_fmsg_u32_pair_put (fmsg,"segment" , seg_header->seg_num); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_start (fmsg,"values" ); +if (err) +return err; +for (i =0 ; i < regs_num; i++) { + err =devlink_fmsg_u32_put (fmsg, *reg_data); +if (err) +return err; + reg_data++; + } + err =devlink_fmsg_obj_nest_end (fmsg); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_end (fmsg); +if (err) +return err; + err =devlink_fmsg_pair_nest_end (fmsg);
Quoted 9 lines
drivers/staging/qlge/qlge_devlink.c line 41
Quoted 4 lines
drivers/staging/qlge/qlge_devlink.c +4
-0+return err; +} + +#define fill_seg (seg_hdr, seg_regs) \considering that this macro accesses local variables, it is not really "function-like". I think an all-caps name would be better to tip-off the reader.
Thank you for this suggestion!
Quoted 9 lines
Quoted 9 lines
drivers/staging/qlge/qlge_devlink.c +9
-0+do { \ + err =fill_seg_ (fmsg, &dump->seg_hdr, dump->seg_regs); \ +if (err) { \ +kvfree (dump); \ +return err; \ + } \ + } while (0) + +static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,
Quoted 8 lines
drivers/staging/qlge/qlge_devlink.c line 56
Quoted 6 lines
drivers/staging/qlge/qlge_devlink.c +6
-0+ struct devlink_fmsg *fmsg, void *priv_ctx, + struct netlink_ext_ack *extack) +{ + int err = 0; + +struct qlge_devlink *dev =devlink_health_reporter_priv (reporter);Please name this variable
ql_devlink, like inqlge_probe().
I happened to find the following text in drivers/staging/qlge/TODO
Quoted 4 lines
* in terms of namespace, the driver uses either
qlge_,ql_(used by other qlogic drivers, with clashes, ex:ql_sem_spinlock) or nothing (with clashes, ex: structob_mac_iocb_req). Rename everything to use the "qlge_" prefix.
So I will adopt qlge_ instead. Besides I prefer qlge_dl to ql_devlink.
--
Best regards,
Coiby
Re: [PATCH v1 2/6] staging: qlge: coredump via devlink health reporter
On 2020-10-10 18:02 +0800, Coiby Xu wrote:
[...]
Quoted 18 lines
Quoted 9 lines
Quoted 9 lines
drivers/staging/qlge/qlge_devlink.c +9
-0+do { \ + err =fill_seg_ (fmsg, &dump->seg_hdr, dump->seg_regs); \ +if (err) { \ +kvfree (dump); \ +return err; \ + } \ + } while (0) + +static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,Quoted 8 lines
drivers/staging/qlge/qlge_devlink.c line 56
Quoted 6 lines
drivers/staging/qlge/qlge_devlink.c +6
-0+ struct devlink_fmsg *fmsg, void *priv_ctx, + struct netlink_ext_ack *extack) +{ + int err = 0; + +struct qlge_devlink *dev =devlink_health_reporter_priv (reporter);Please name this variable
ql_devlink, like inqlge_probe().
Quoted 5 lines
I happened to find the following text in
drivers/staging/qlge/TODOQuoted 4 lines
* in terms of namespace, the driver uses either
qlge_,ql_(used by other qlogic drivers, with clashes, ex:ql_sem_spinlock) or nothing (with clashes, ex: structob_mac_iocb_req). Rename everything to use the "qlge_" prefix.
This comment applies to global identifiers, not local variables.
Quoted 2 lines
So I will adopt
qlge_instead. Besides I preferqlge_dltoql_devlink.
Up to you but personally, I think ql_devlink is better. In any case, "dev" is too general and often used for struct net_device pointers instead.
Re: [PATCH v1 2/6] staging: qlge: coredump via devlink health reporter
Quoted 20 lines · Benjamin Poirier
On 2020-10-10 18:02 +0800, Coiby Xu wrote:
[...]Quoted 18 lines
Quoted 17 lines
Quoted 5 lines
drivers/staging/qlge/qlge_devlink.c +5
-0+ do { \ + err = fill_seg_(fmsg, &dump->seg_hdr, dump->seg_regs); \ + if (err) { \ + kvfree(dump); \ + return err; \drivers/staging/qlge/qlge_devlink.c line 56
Quoted 10 lines
drivers/staging/qlge/qlge_devlink.c +10
-0+ } \ + }while (0 ) + +static int qlge_reporter_coredump(struct devlink_health_reporter *reporter, +struct devlink_fmsg *fmsg,void *priv_ctx, +struct netlink_ext_ack *extack) +{ +int err =0 ; + +struct qlge_devlink *dev =devlink_health_reporter_priv (reporter);Please name this variable
ql_devlink, like inqlge_probe().
Quoted 7 lines
Quoted 5 lines
I happened to find the following text in
drivers/staging/qlge/TODOQuoted 4 lines
* in terms of namespace, the driver uses either
qlge_,ql_(used by other qlogic drivers, with clashes, ex:ql_sem_spinlock) or nothing (with clashes, ex: structob_mac_iocb_req). Rename everything to use the "qlge_" prefix.This comment applies to global identifiers, not local variables.
Thank you for the explanation! Are you suggesting we should choose different naming styles so we better tell global identifiers from local variables?
Quoted 7 lines
Quoted 3 lines
So I will adopt
qlge_instead. Besides I preferqlge_dltoql_devlink.Up to you but personally, I think
ql_devlinkis better. In any case, "dev" is too general and often used for structnet_devicepointers instead.
Thank you for the suggestion. Another reason to use qlge_dl is many other network drivers supporting devlink interface also adopt this kind of style.
--
Best regards,
Coiby
Re: [PATCH v1 2/6] staging: qlge: coredump via devlink health reporter
Quoted 27 lines · Coiby Xu
Quoted 26 lines · Benjamin Poirier
On 2020-10-10 18:02 +0800, Coiby Xu wrote:
[...]Quoted 23 lines
Quoted 9 lines
Quoted 9 lines
drivers/staging/qlge/qlge_devlink.c +9
-0+do { \ + err =fill_seg_ (fmsg, &dump->seg_hdr, dump->seg_regs); \ +if (err) { \ +kvfree (dump); \ +return err; \ + } \ + } while (0) + +static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,Quoted 8 lines
drivers/staging/qlge/qlge_devlink.c line 56
Quoted 6 lines
drivers/staging/qlge/qlge_devlink.c +6
-0+ struct devlink_fmsg *fmsg, void *priv_ctx, + struct netlink_ext_ack *extack) +{ + int err = 0; + +struct qlge_devlink *dev =devlink_health_reporter_priv (reporter);Please name this variable
ql_devlink, like inqlge_probe().I happened to find the following text in
drivers/staging/qlge/TODOQuoted 4 lines
* in terms of namespace, the driver uses either
qlge_,ql_(used by other qlogic drivers, with clashes, ex:ql_sem_spinlock) or nothing (with clashes, ex: structob_mac_iocb_req). Rename everything to use the "qlge_" prefix.
Quoted 5 lines
Quoted 1 line
This comment applies to global identifiers, not local variables.
Thank you for the explanation! Are you suggesting we should choose different naming styles so we better tell global identifiers from local variables?
That's not the main purpose IMO. Using a consistent prefix for global identifiers (ex. "qlge_") is to avoid clashes (two drivers using the same name, as in the examples above). Strictly speaking, it is not a problem for symbols with internal linkage (ex. static functions) or type definitions in local header files but it makes the code clearer because it shows immediately that this identifier was defined in the driver.
For local variables, the name is more a matter of personal taste I think but it should be consistent within the driver and with other users of the same api, where applicable. A prefix is not needed but the name is sometimes a simpler version of a type name which includes a prefix.
Quoted 9 lines
Quoted 5 lines
Quoted 1 line
So I will adopt
qlge_instead. Besides I preferqlge_dltoql_devlink.Up to you but personally, I think
ql_devlinkis better. In any case, "dev" is too general and often used for structnet_devicepointers instead.Thank you for the suggestion. Another reason to use
qlge_dlis many other network drivers supporting devlink interface also adopt this kind of style.
Sounds good. On second thought I regretted suggesting ql_devlink. While local variable don't need any prefix; if they do have one, better not mix qlge_ and ql_.
PATCH 3/6 staging: qlge: support force_coredump option for devlink health dump
In reply to a message not in the archiveWith force_coredump module paramter set, devlink health dump will reset the MPI RISC first which takes 5 secs to be finished.
--- drivers/staging/qlge/qlge_devlink.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/staging/qlge/qlge_devlink.c +7 -0
@@ -56,10 +56,17 @@ static int qlge_reporter_coredump(struct devlink_health_reporter *reporter,struct qlge_devlink *dev =devlink_health_reporter_priv (reporter);struct ql_adapter *qdev = dev->qdev;struct ql_mpi_coredump *dump; +wait_queue_head_t wait;if (!netif_running (qdev->ndev))return 0 ; +if (test_bit (QL_FRC_COREDUMP , &qdev->flags)) { +ql_queue_fw_error (qdev); +init_waitqueue_head (&wait); +wait_event_timeout (wait,0 ,5 *HZ ); + } + dump =kvmalloc (sizeof (*dump),GFP_KERNEL );if (!dump)return -ENOMEM ;
Signature · 1 line
2.28.0
PATCH 4/6 staging: qlge: remove mpi_core_to_log which sends coredump to the kernel ring buffer
In reply to a message not in the archivedevlink health could be used to get coredump. No need to send so much data to the kernel ring buffer.
--- drivers/staging/qlge/qlge.h | 3 --- drivers/staging/qlge/qlge_dbg.c | 11 ----------- drivers/staging/qlge/qlge_ethtool.c | 1 - drivers/staging/qlge/qlge_main.c | 2 -- drivers/staging/qlge/qlge_mpi.c | 6 ------ 5 files changed, 23 deletions(-)
drivers/staging/qlge/qlge.h +0 -3
@@ -2149,7 +2149,6 @@ struct ql_adapter {u32 port_init;u32 link_status;struct ql_mpi_coredump *mpi_coredump; -u32 core_is_dumped;u32 link_config;u32 led_config;u32 max_frame_size;
@@ -2162,7 +2161,6 @@ struct ql_adapter {struct delayed_work mpi_work;struct delayed_work mpi_port_cfg_work;struct delayed_work mpi_idc_work; -struct delayed_work mpi_core_to_log;struct completion ide_completion;const struct nic_operations *nic_ops;u16 device_id;
@@ -2253,7 +2251,6 @@ int ql_write_cfg(struct ql_adapter *qdev, void *ptr, int size, u32 bit,void ql_queue_fw_error (struct ql_adapter *qdev);void ql_mpi_work (struct work_struct *work);void ql_mpi_reset_work (struct work_struct *work); -void ql_mpi_core_to_log (struct work_struct *work);int ql_wait_reg_rdy (struct ql_adapter *qdev,u32 reg,u32 bit,u32 ebit);void ql_queue_asic_error (struct ql_adapter *qdev);void ql_set_ethtool_ops (struct net_device *ndev);
drivers/staging/qlge/qlge_dbg.c +0 -11
@@ -1314,17 +1314,6 @@ void ql_get_dump(struct ql_adapter *qdev, void *buff) } } -/* Coredump to messages log file using separate worker thread */ -void ql_mpi_core_to_log (struct work_struct *work) -{ -struct ql_adapter *qdev = - container_of(work, struct ql_adapter, mpi_core_to_log.work); - -print_hex_dump (KERN_DEBUG ,"Core is dumping to log file!\n" , -DUMP_PREFIX_OFFSET ,32 ,4 , qdev->mpi_coredump, -sizeof (*qdev->mpi_coredump), false); -} -#ifdef QL_REG_DUMP static void ql_dump_intr_states (struct ql_adapter *qdev) {
drivers/staging/qlge/qlge_ethtool.c +0 -1
@@ -616,7 +616,6 @@ static void ql_get_regs(struct net_device *ndev,struct ql_adapter *qdev =netdev_priv (ndev);ql_get_dump (qdev, p); - qdev->core_is_dumped =0 ;if (!test_bit (QL_FRC_COREDUMP , &qdev->flags)) regs->len =sizeof (struct ql_mpi_coredump );else
drivers/staging/qlge/qlge_main.c +0 -2
@@ -3808,7 +3808,6 @@ static void ql_cancel_all_work_sync(struct ql_adapter *qdev)cancel_delayed_work_sync (&qdev->mpi_reset_work);cancel_delayed_work_sync (&qdev->mpi_work);cancel_delayed_work_sync (&qdev->mpi_idc_work); -cancel_delayed_work_sync (&qdev->mpi_core_to_log);cancel_delayed_work_sync (&qdev->mpi_port_cfg_work); }
@@ -4504,7 +4503,6 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,INIT_DELAYED_WORK (&qdev->mpi_work, ql_mpi_work);INIT_DELAYED_WORK (&qdev->mpi_port_cfg_work, ql_mpi_port_cfg_work);INIT_DELAYED_WORK (&qdev->mpi_idc_work, ql_mpi_idc_work); -INIT_DELAYED_WORK (&qdev->mpi_core_to_log, ql_mpi_core_to_log);init_completion (&qdev->ide_completion);mutex_init (&qdev->mpi_mutex);
drivers/staging/qlge/qlge_mpi.c +0 -6
@@ -1269,11 +1269,5 @@ void ql_mpi_reset_work(struct work_struct *work)return ; } -if (qdev->mpi_coredump && !ql_core_dump (qdev, qdev->mpi_coredump)) { -netif_err (qdev, drv, qdev->ndev,"Core is dumped!\n" ); - qdev->core_is_dumped =1 ; -queue_delayed_work (qdev->workqueue, - &qdev->mpi_core_to_log,5 *HZ ); - }ql_soft_reset_mpi_risc (qdev); }
Signature · 1 line
2.28.0
PATCH 5/6 staging: qlge: clean up debugging code in the QL_ALL_DUMP ifdef land
In reply to a message not in the archiveThe debugging code in the following ifdef land
- QL_ALL_DUMP
- QL_REG_DUMP
- QL_DEV_DUMP
- QL_CB_DUMP
- QL_IB_DUMP
- QL_OB_DUMP
becomes unnecessary because,
- Device status and general registers can be obtained by ethtool.
- Coredump can be done via devlink health reporter.
- Structure related to the hardware (struct ql_adapter) can be obtained by crash or drgn.
--- drivers/staging/qlge/qlge.h | 82 ---- drivers/staging/qlge/qlge_dbg.c | 688 ---------------------------- drivers/staging/qlge/qlge_ethtool.c | 2 - drivers/staging/qlge/qlge_main.c | 7 +- 4 files changed, 1 insertion(+), 778 deletions(-)
drivers/staging/qlge/qlge.h +0 -82
@@ -2285,86 +2285,4 @@ void ql_check_lb_frame(struct ql_adapter *qdev, struct sk_buff *skb);int ql_own_firmware (struct ql_adapter *qdev);int ql_clean_lb_rx_ring (struct rx_ring *rx_ring,int budget); -/* #define QL_ALL_DUMP */ -/* #define QL_REG_DUMP */ -/* #define QL_DEV_DUMP */ -/* #define QL_CB_DUMP */ -/* #define QL_IB_DUMP */ -/* #define QL_OB_DUMP */ - -#ifdef QL_REG_DUMP -void ql_dump_xgmac_control_regs (struct ql_adapter *qdev); -void ql_dump_routing_entries (struct ql_adapter *qdev); -void ql_dump_regs (struct ql_adapter *qdev); -#define QL_DUMP_REGS (qdev) ql_dump_regs(qdev) -#define QL_DUMP_ROUTE (qdev) ql_dump_routing_entries(qdev) -#define QL_DUMP_XGMAC_CONTROL_REGS (qdev) ql_dump_xgmac_control_regs(qdev) -#else -#define QL_DUMP_REGS (qdev) -#define QL_DUMP_ROUTE (qdev) -#define QL_DUMP_XGMAC_CONTROL_REGS (qdev) -#endif - -#ifdef QL_STAT_DUMP -void ql_dump_stat (struct ql_adapter *qdev); -#define QL_DUMP_STAT (qdev) ql_dump_stat(qdev) -#else -#define QL_DUMP_STAT (qdev) -#endif - -#ifdef QL_DEV_DUMP -void ql_dump_qdev (struct ql_adapter *qdev); -#define QL_DUMP_QDEV (qdev) ql_dump_qdev(qdev) -#else -#define QL_DUMP_QDEV (qdev) -#endif - -#ifdef QL_CB_DUMP -void ql_dump_wqicb (struct wqicb *wqicb); -void ql_dump_tx_ring (struct tx_ring *tx_ring); -void ql_dump_ricb (struct ricb *ricb); -void ql_dump_cqicb (struct cqicb *cqicb); -void ql_dump_rx_ring (struct rx_ring *rx_ring); -void ql_dump_hw_cb (struct ql_adapter *qdev,int size,u32 bit,u16 q_id); -#define QL_DUMP_RICB (ricb) ql_dump_ricb(ricb) -#define QL_DUMP_WQICB (wqicb) ql_dump_wqicb(wqicb) -#define QL_DUMP_TX_RING (tx_ring) ql_dump_tx_ring(tx_ring) -#define QL_DUMP_CQICB (cqicb) ql_dump_cqicb(cqicb) -#define QL_DUMP_RX_RING (rx_ring) ql_dump_rx_ring(rx_ring) -#define QL_DUMP_HW_CB (qdev, size, bit, q_id) \ - ql_dump_hw_cb(qdev, size, bit, q_id) -#else -#define QL_DUMP_RICB (ricb) -#define QL_DUMP_WQICB (wqicb) -#define QL_DUMP_TX_RING (tx_ring) -#define QL_DUMP_CQICB (cqicb) -#define QL_DUMP_RX_RING (rx_ring) -#define QL_DUMP_HW_CB (qdev, size, bit, q_id) -#endif - -#ifdef QL_OB_DUMP -void ql_dump_tx_desc (struct ql_adapter *qdev,struct tx_buf_desc *tbd); -void ql_dump_ob_mac_iocb (struct ql_adapter *qdev,struct ob_mac_iocb_req *ob_mac_iocb); -void ql_dump_ob_mac_rsp (struct ql_adapter *qdev,struct ob_mac_iocb_rsp *ob_mac_rsp); -#define QL_DUMP_OB_MAC_IOCB (qdev, ob_mac_iocb) ql_dump_ob_mac_iocb(qdev, ob_mac_iocb) -#define QL_DUMP_OB_MAC_RSP (qdev, ob_mac_rsp) ql_dump_ob_mac_rsp(qdev, ob_mac_rsp) -#else -#define QL_DUMP_OB_MAC_IOCB (qdev, ob_mac_iocb) -#define QL_DUMP_OB_MAC_RSP (qdev, ob_mac_rsp) -#endif - -#ifdef QL_IB_DUMP -void ql_dump_ib_mac_rsp (struct ql_adapter *qdev,struct ib_mac_iocb_rsp *ib_mac_rsp); -#define QL_DUMP_IB_MAC_RSP (qdev, ib_mac_rsp) ql_dump_ib_mac_rsp(qdev, ib_mac_rsp) -#else -#define QL_DUMP_IB_MAC_RSP (qdev, ib_mac_rsp) -#endif - -#ifdef QL_ALL_DUMP -void ql_dump_all (struct ql_adapter *qdev); -#define QL_DUMP_ALL (qdev) ql_dump_all(qdev) -#else -#define QL_DUMP_ALL (qdev) -#endif -#endif /* _QLGE_H_ */
drivers/staging/qlge/qlge_dbg.c +0 -688
691 lines not on this page · raw message
drivers/staging/qlge/qlge_ethtool.c +0 -2
@@ -327,8 +327,6 @@ static void ql_update_stats(struct ql_adapter *qdev)ql_sem_unlock (qdev, qdev->xg_sem_mask); quit:spin_unlock (&qdev->stats_lock); - -QL_DUMP_STAT (qdev); }static void ql_get_strings (struct net_device *dev,u32 stringset,u8 *buf)
drivers/staging/qlge/qlge_main.c +1 -6
@@ -1857,8 +1857,6 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,struct net_device *ndev = qdev->ndev;struct sk_buff *skb =NULL ; -QL_DUMP_IB_MAC_RSP (qdev, ib_mac_rsp); - skb =ql_build_rx_skb (qdev, rx_ring, ib_mac_rsp);if (unlikely (!skb)) { netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
@@ -1955,8 +1953,6 @@ static unsigned long ql_process_mac_rx_intr(struct ql_adapter *qdev, ((le16_to_cpu (ib_mac_rsp->vlan_id) & IB_MAC_IOCB_RSP_VLAN_MASK)) : 0xffff; -QL_DUMP_IB_MAC_RSP (qdev, ib_mac_rsp); -if (ib_mac_rsp->flags4 &IB_MAC_IOCB_RSP_HV ) {/* The data and headers are split into * separate buffers.
@@ -2002,7 +1998,6 @@ static void ql_process_mac_tx_intr(struct ql_adapter *qdev,struct tx_ring *tx_ring;struct tx_ring_desc *tx_ring_desc; -QL_DUMP_OB_MAC_RSP (qdev, mac_rsp); tx_ring = &qdev->tx_ring[mac_rsp->txq_idx]; tx_ring_desc = &tx_ring->q[mac_rsp->tid];ql_unmap_send (qdev, tx_ring_desc, tx_ring_desc->map_cnt);
@@ -2593,7 +2588,7 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev) tx_ring->tx_errors++;return NETDEV_TX_BUSY ; } -QL_DUMP_OB_MAC_IOCB (qdev, mac_iocb_ptr); + tx_ring->prod_idx++;if (tx_ring->prod_idx == tx_ring->wq_len) tx_ring->prod_idx =0 ;
Signature · 1 line
2.28.0
Re: [PATCH v1 5/6] staging: qlge: clean up debugging code in the QL_ALL_DUMP ifdef land
Quoted 14 lines · Coiby Xu
The debugging code in the following ifdef land
-QL_ALL_DUMP
-QL_REG_DUMP
-QL_DEV_DUMP
-QL_CB_DUMP
-QL_IB_DUMP
-QL_OB_DUMPbecomes unnecessary because,
- Device status and general registers can be obtained by ethtool.
- Coredump can be done via devlink health reporter.
- Structure related to the hardware (structql_adapter) can be obtained by crash or drgn.
Quoted 7 lines
Suggested-by Benjamin Poirier <[email protected]>Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/qlge.h | 82 ---- drivers/staging/qlge/qlge_dbg.c | 688 ---------------------------- drivers/staging/qlge/qlge_ethtool.c | 2 - drivers/staging/qlge/qlge_main.c | 7 +-
Please also update drivers/staging/qlge/TODO accordingly. There is still a lot of debugging code IMO (the netif_printk statements - kernel tracing can be used instead of those) but this patch is a substantial improvement.
Re: [PATCH v1 5/6] staging: qlge: clean up debugging code in the QL_ALL_DUMP ifdef land
Quoted 23 lines · Benjamin Poirier
Quoted 14 lines · Coiby Xu
The debugging code in the following ifdef land
-QL_ALL_DUMP
-QL_REG_DUMP
-QL_DEV_DUMP
-QL_CB_DUMP
-QL_IB_DUMP
-QL_OB_DUMPbecomes unnecessary because,
- Device status and general registers can be obtained by ethtool.
- Coredump can be done via devlink health reporter.
- Structure related to the hardware (structql_adapter) can be obtained by crash or drgn.Quoted 7 lines
Suggested-by Benjamin Poirier <[email protected]>Signed-off-by Coiby Xu <[email protected]>--- drivers/staging/qlge/qlge.h | 82 ---- drivers/staging/qlge/qlge_dbg.c | 688 ---------------------------- drivers/staging/qlge/qlge_ethtool.c | 2 - drivers/staging/qlge/qlge_main.c | 7 +-
Quoted 4 lines
Please also update
drivers/staging/qlge/TODOaccordingly. There is still a lot of debugging code IMO (thenetif_printkstatements - kernel tracing can be used instead of those) but this patch is a substantial improvement.
Thank you for the reminding! To move qlge out of staging tree would be interesting exercise for me:)
--
Best regards,
Coiby
Re: [PATCH v1 5/6] staging: qlge: clean up debugging code in the QL_ALL_DUMP ifdef land
On 2020-10-10 18:00 +0800, Coiby Xu wrote:
[...]
Quoted 8 lines
Quoted 5 lines
Please also update
drivers/staging/qlge/TODOaccordingly. There is still a lot of debugging code IMO (thenetif_printkstatements - kernel tracing can be used instead of those) but this patch is a substantial improvement.Thank you for the reminding! To move qlge out of staging tree would be interesting exercise for me:)
If you would like to work more on the driver, I would highly suggest getting one or two adapters to be able to test your changes. They can be had for relatively cheap on ebay. Just search for "qle8142".
Re: [PATCH v1 5/6] staging: qlge: clean up debugging code in the QL_ALL_DUMP ifdef land
Quoted 8 lines · Benjamin Poirier
On 2020-10-10 18:00 +0800, Coiby Xu wrote:
[...]Quoted 6 lines
Quoted 5 lines
Please also update
drivers/staging/qlge/TODOaccordingly. There is still a lot of debugging code IMO (thenetif_printkstatements - kernel tracing can be used instead of those) but this patch is a substantial improvement.
Quoted 6 lines
Quoted 2 lines
Thank you for the reminding! To move qlge out of staging tree would be interesting exercise for me:)
If you would like to work more on the driver, I would highly suggest getting one or two adapters to be able to test your changes. They can be had for relatively cheap on ebay. Just search for "qle8142".
Thank you for the info! Right now I don't have a desktop to install this kind of adapter. I'll get one after settling the plan for a desktop.
--
Best regards,
Coiby
PATCH 6/6 staging: qlge: add documentation for debugging qlge
In reply to a message not in the archiveInstructions and examples on kernel data structures dumping and coredump.
--- .../networking/device_drivers/index.rst | 1 + .../device_drivers/qlogic/index.rst | 18 +++ .../networking/device_drivers/qlogic/qlge.rst | 118 ++++++++++++++++++ MAINTAINERS | 6 + 4 files changed, 143 insertions(+) create mode 100644 Documentation/networking/device_drivers/qlogic/index.rst create mode 100644 Documentation/networking/device_drivers/qlogic/qlge.rst
Documentation/networking/device_drivers/index.rst +1 -0
@@ -15,6 +15,7 @@ Contents: ethernet/index fddi/index hamradio/index + qlogic/index wan/index wifi/index
Documentation/networking/device_drivers/qlogic/index.rst new file +18 -0
@@ -0,0 +1,18 @@ +.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) + +QLogic QLGE Device Drivers +=============================================== + +Contents: + +.. toctree:: + :maxdepth: 2 + + qlge + +.. only:: subproject and html + + Indices + ======= + + * :ref:`genindex`
Documentation/networking/device_drivers/qlogic/qlge.rst new file +118 -0
118 lines not on this page · raw message
MAINTAINERS +6 -0
@@ -14411,6 +14411,12 @@ L: [email protected] S: Supported F: drivers/staging/qlge/ +QLOGIC QLGE 10Gb ETHERNET DRIVER +M: Coiby Xu <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/networking/device_drivers/qlogic/qlge.rst + QM1D1B0004 MEDIA DRIVER M: Akihiro Tsukada <[email protected]> L: [email protected]
Signature · 1 line
2.28.0