make unregister_netdev error less of a PITA
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
58931a1928
commit
09ceb5a3e4
3 changed files with 27 additions and 3 deletions
|
@ -75,7 +75,7 @@ index 9c05c1fd8ed2..3fe28e536a56 100644
|
||||||
Safety option to keep boot IRQs enabled. This
|
Safety option to keep boot IRQs enabled. This
|
||||||
should never be necessary.
|
should never be necessary.
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||||
index 4b7034986223..5cfe37cdf1b4 100644
|
index a9e94df74b4e..88f623caa2dd 100644
|
||||||
--- a/drivers/pci/quirks.c
|
--- a/drivers/pci/quirks.c
|
||||||
+++ b/drivers/pci/quirks.c
|
+++ b/drivers/pci/quirks.c
|
||||||
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
|
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
|
||||||
|
@ -185,7 +185,7 @@ index 4b7034986223..5cfe37cdf1b4 100644
|
||||||
/*
|
/*
|
||||||
* Decoding should be disabled for a PCI device during BAR sizing to avoid
|
* Decoding should be disabled for a PCI device during BAR sizing to avoid
|
||||||
* conflict. But doing so may cause problems on host bridge and perhaps other
|
* conflict. But doing so may cause problems on host bridge and perhaps other
|
||||||
@@ -4826,6 +4926,8 @@ static const struct pci_dev_acs_enabled {
|
@@ -4827,6 +4927,8 @@ static const struct pci_dev_acs_enabled {
|
||||||
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
|
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
|
||||||
/* APM X-Gene */
|
/* APM X-Gene */
|
||||||
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
|
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
|
||||||
|
|
|
@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
||||||
index 62dae1d694a0..4abf33b6810d 100644
|
index e21dd82babf7..d77e312ba5cc 100644
|
||||||
--- a/virt/kvm/kvm_main.c
|
--- a/virt/kvm/kvm_main.c
|
||||||
+++ b/virt/kvm/kvm_main.c
|
+++ b/virt/kvm/kvm_main.c
|
||||||
@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);
|
@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
|
Date: Wed, 7 Oct 2020 17:18:28 +0200
|
||||||
|
Subject: [PATCH] net: core: downgrade unregister_netdevice refcount leak from
|
||||||
|
emergency to error
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||||
|
---
|
||||||
|
net/core/dev.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
||||||
|
index e1aeceb96cdd..06879dd34d8f 100644
|
||||||
|
--- a/net/core/dev.c
|
||||||
|
+++ b/net/core/dev.c
|
||||||
|
@@ -9279,7 +9279,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
|
||||||
|
refcnt = netdev_refcnt_read(dev);
|
||||||
|
|
||||||
|
if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {
|
||||||
|
- pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
|
||||||
|
+ pr_err("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
|
||||||
|
dev->name, refcnt);
|
||||||
|
warning_time = jiffies;
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue