lkml.org 
[lkml]   [2004]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
SubjectRe: [PATCH] PPC64 Fix unbalanced pci_dev_put in EEH code
From
Hi Paul,

Hang on there, you didn't just rename the variable, you also missed a
teeny chunk of the original patch. The corrected path is attached below.
(Well, I rather liked my original var names better, but whatever).

--linas

Signed-off-by: Linas Vepstas <linas@linas.org>

On Wed, Aug 18, 2004 at 01:43:14PM +1000, Paul Mackerras was heard to remark:
> The EEH code currently can end up doing an extra pci_dev_put() in the
> case where we hot-unplug a card for which we are ignoring EEH errors
> (e.g. a graphics card). This patch fixes that problem by only
> maintaining a reference to the PCI device if we have entered any of
> its resource addresses into our address -> PCI device cache. This
> patch is based on an earlier patch by Linas Vepstas.
>
> Signed-off-by: Paul Mackerras <paulus@samba.org>
>


===== arch/ppc64/kernel/eeh.c 1.28 vs edited =====
--- 1.28/arch/ppc64/kernel/eeh.c Mon Jul 12 18:29:16 2004
+++ edited/arch/ppc64/kernel/eeh.c Wed Jul 14 15:40:47 2004
@@ -208,6 +208,7 @@
static void __pci_addr_cache_insert_device(struct pci_dev *dev)
{
struct device_node *dn;
+ int inserted = 0;
int i;

dn = pci_device_to_OF_node(dev);
@@ -226,9 +227,6 @@
#endif
return;
}
-
- /* The cache holds a reference to the device... */
- pci_dev_get(dev);

/* Walk resources on this device, poke them into the tree */
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
@@ -242,6 +242,12 @@
if (start == 0 || ~start == 0 || end == 0 || ~end == 0)
continue;
pci_addr_cache_insert(dev, start, end, flags);
+ inserted = 1;
+ }
+
+ /* The cache holds a reference to the device... */
+ if (inserted) {
+ pci_dev_get (dev);
}
}

@@ -265,6 +270,7 @@
static inline void __pci_addr_cache_remove_device(struct pci_dev *dev)
{
struct rb_node *n;
+ int removed = 0;

restart:
n = rb_first(&pci_io_addr_cache_root.rb_root);
@@ -275,13 +281,16 @@
if (piar->pcidev == dev) {
rb_erase(n, &pci_io_addr_cache_root.rb_root);
kfree(piar);
+ removed = 1;
goto restart;
}
n = rb_next(n);
}

/* The cache no longer holds its reference to this device... */
- pci_dev_put(dev);
+ if (removed) {
+ pci_dev_put(dev);
+ }
}

/**
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:05    [W:0.034 / U:101.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site