| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 15 Feb 2018 19:24:42 +0530
From: Rahul Lakkireddy <rahul.lakkireddy@...lsio.com>
To: netdev@...r.kernel.org
Cc: davem@...emloft.net, ganeshgr@...lsio.com, nirranjan@...lsio.com,
indranil@...lsio.com,
Rahul Lakkireddy <rahul.lakkireddy@...lsio.com>
Subject: [PATCH net-next] cxgb4: append firmware dump to vmcore in kernel panic
Register callback to panic_notifier_list. Invoke dump collect routine
to append dump to vmcore.
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@...lsio.com>
Signed-off-by: Ganesh Goudar <ganeshgr@...lsio.com>
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 5 ++
drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 93 +++++++++++++++++++++++-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h | 4 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 13 ++++
4 files changed, 111 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index d3fa53db61ee..3d578fa1d640 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -568,6 +568,7 @@ enum { /* adapter flags */
FW_OFLD_CONN = (1 << 9),
ROOT_NO_RELAXED_ORDERING = (1 << 10),
SHUTTING_DOWN = (1 << 11),
+ K_CRASH = (1 << 12),
};
enum {
@@ -946,6 +947,10 @@ struct adapter {
/* Ethtool Dump */
struct ethtool_dump eth_dump;
+
+ void *dump_buf; /* Dump buffer for collecting logs in panic */
+ u32 dump_buf_size; /* Dump buffer size */
+ struct notifier_block panic_nb; /* Panic notifier info */
};
/* Support for "sched-class" command to allow a TX Scheduling Class to be
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
index 30485f9a598f..579a019a246f 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
@@ -383,13 +383,25 @@ static void cxgb4_cudbg_collect_entity(struct cudbg_init *pdbg_init,
static int cudbg_alloc_compress_buff(struct cudbg_init *pdbg_init)
{
+ struct adapter *adap = pdbg_init->adap;
u32 workspace_size;
workspace_size = cudbg_get_workspace_size();
- pdbg_init->compress_buff = vzalloc(CUDBG_COMPRESS_BUFF_SIZE +
- workspace_size);
- if (!pdbg_init->compress_buff)
- return -ENOMEM;
+
+ if (adap->flags & K_CRASH) {
+ /* In panic scenario, the compression buffer is already
+ * allocated. So, just update accordingly.
+ */
+ pdbg_init->compress_buff = (u8 *)adap->dump_buf +
+ adap->dump_buf_size -
+ workspace_size -
+ CUDBG_COMPRESS_BUFF_SIZE;
+ } else {
+ pdbg_init->compress_buff = vzalloc(CUDBG_COMPRESS_BUFF_SIZE +
+ workspace_size);
+ if (!pdbg_init->compress_buff)
+ return -ENOMEM;
+ }
pdbg_init->compress_buff_size = CUDBG_COMPRESS_BUFF_SIZE;
pdbg_init->workspace = (u8 *)pdbg_init->compress_buff +
@@ -399,6 +411,14 @@ static int cudbg_alloc_compress_buff(struct cudbg_init *pdbg_init)
static void cudbg_free_compress_buff(struct cudbg_init *pdbg_init)
{
+ struct adapter *adap = pdbg_init->adap;
+
+ /* Don't free in panic scenario. We need the buffer to be present
+ * in vmcore so that we can extract the dump.
+ */
+ if (adap->flags & K_CRASH)
+ return;
+
if (pdbg_init->compress_buff)
vfree(pdbg_init->compress_buff);
}
@@ -488,3 +508,68 @@ void cxgb4_init_ethtool_dump(struct adapter *adapter)
adapter->eth_dump.version = adapter->params.fw_vers;
adapter->eth_dump.len = 0;
}
+
+static int cxgb4_panic_notify(struct notifier_block *this, unsigned long event,
+ void *ptr)
+{
+ struct adapter *adap = container_of(this, struct adapter, panic_nb);
+ bool use_bd;
+ u32 len;
+
+ /* Save original value and restore after collection */
+ use_bd = adap->use_bd;
+
+ dev_info(adap->pdev_dev, "Initialized cxgb4 crash handler");
+ adap->flags |= K_CRASH;
+
+ /* Don't contact firmware. Directly access registers */
+ adap->use_bd = true;
+
+ len = adap->dump_buf_size;
+ cxgb4_cudbg_collect(adap, adap->dump_buf, &len, CXGB4_ETH_DUMP_ALL);
+ dev_info(adap->pdev_dev, "cxgb4 debug collection done...");
+
+ /* Restore original value */
+ adap->use_bd = use_bd;
+ return NOTIFY_DONE;
+}
+
+int cxgb4_cudbg_register_notifier(struct adapter *adap)
+{
+ u32 wsize, len;
+
+ len = sizeof(struct cudbg_hdr) +
+ sizeof(struct cudbg_entity_hdr) * CUDBG_MAX_ENTITY;
+ len += cxgb4_get_dump_length(adap, CXGB4_ETH_DUMP_ALL);
+
+ /* If compression is enabled, allocate extra memory needed for
+ * compression too.
+ */
+ wsize = cudbg_get_workspace_size();
+ if (wsize)
+ wsize += CUDBG_COMPRESS_BUFF_SIZE;
+
+ adap->dump_buf_size = len + wsize;
+ adap->dump_buf = vzalloc(adap->dump_buf_size);
+ if (!adap->dump_buf)
+ return -ENOMEM;
+
+ /* Print info so that we can extract firmware dump from vmcore */
+ dev_info(adap->pdev_dev,
+ "Registering cxgb4 panic handler.., Buffer start address = %p, size: %u\n",
+ adap->dump_buf, len);
+
+ adap->panic_nb.notifier_call = cxgb4_panic_notify;
+ adap->panic_nb.priority = INT_MAX;
+ atomic_notifier_chain_register(&panic_notifier_list, &adap->panic_nb);
+ return 0;
+}
+
+void cxgb4_cudbg_unregister_notifier(struct adapter *adap)
+{
+ if (adap->dump_buf) {
+ atomic_notifier_chain_unregister(&panic_notifier_list,
+ &adap->panic_nb);
+ vfree(adap->dump_buf);
+ }
+}
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h
index ce1ac9a1c878..66d4252f5032 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h
@@ -41,8 +41,12 @@ enum CXGB4_ETHTOOL_DUMP_FLAGS {
CXGB4_ETH_DUMP_HW = (1 << 1), /* various FW and HW dumps */
};
+#define CXGB4_ETH_DUMP_ALL (CXGB4_ETH_DUMP_MEM | CXGB4_ETH_DUMP_HW)
+
u32 cxgb4_get_dump_length(struct adapter *adap, u32 flag);
int cxgb4_cudbg_collect(struct adapter *adap, void *buf, u32 *buf_size,
u32 flag);
void cxgb4_init_ethtool_dump(struct adapter *adapter);
+int cxgb4_cudbg_register_notifier(struct adapter *adap);
+void cxgb4_cudbg_unregister_notifier(struct adapter *adap);
#endif /* __CXGB4_CUDBG_H__ */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 56bc626ef006..f61d7a552dda 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -5290,6 +5290,16 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
setup_memwin(adapter);
+
+ /* Register panic notifier */
+ err = cxgb4_cudbg_register_notifier(adapter);
+ if (err) {
+ dev_warn(adapter->pdev_dev,
+ "Fail registering panic notifier, err: %d. Continuing\n",
+ err);
+ err = 0;
+ }
+
err = adap_init0(adapter);
#ifdef CONFIG_DEBUG_FS
bitmap_zero(adapter->sge.blocked_fl, adapter->sge.egr_sz);
@@ -5537,6 +5547,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
destroy_workqueue(adapter->workq);
kfree(adapter->mbox_log);
+ cxgb4_cudbg_unregister_notifier(adapter);
kfree(adapter);
out_unmap_bar0:
iounmap(regs);
@@ -5610,6 +5621,8 @@ static void remove_one(struct pci_dev *pdev)
pci_release_regions(pdev);
kfree(adapter->mbox_log);
synchronize_rcu();
+ /* Unregister panic notifier */
+ cxgb4_cudbg_unregister_notifier(adapter);
kfree(adapter);
}
#ifdef CONFIG_PCI_IOV
--
2.14.1
Powered by blists - more mailing lists