From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>,
x86@kernel.org, Dave Airlie <airlied@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Julia Lawall <julia@diku.dk>, Matthew Garrett <mjg@redhat.com>
Subject: [PATCH] PCI: fix default vga ref_count
Date: Tue, 18 Sep 2012 16:44:42 -0700 [thread overview]
Message-ID: <1348011882-31452-1-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <CAErSpo54VVFHj4TDA5JELW0LwFVMXjVOJywwFQ4fo4C1rX69mQ@mail.gmail.com>
when __ARCH_HAS_VGA_DEFAULT_DEVICE is not defined, aka EFIFB is not used,
for static path, vga_default setting is through vga_arbiter_add_pci_device.
and later x86 pci_fixup_video, will skip setting again.
- subsys_initcall(vga_arb_device_init) come first to call vga_arbiter_add_pci_device. It will call pci_get_dev to hold one reference.
for hotplug add path, even vga_arbiter_add_pci_device is called via notifier,
but it will check VGA_RSRC_LEGACY_MASK that is not set for hotplug path.
So x86 pci_fixup_video will take over to call vga_set_default_device().
It will not hold one refrence.
Later for hotplug remove path, vga_arbiter_del_pci_device that does not check
VGA_RSRC_LEGACY_MASK will call put_device and it will cause ref_count to
decrease extra. that will have that pci device get deleted early wrongly.
Need to make get/put balance for both cases.
-v2: According to Bjorn, update vga_set_default_device instead...
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: x86@kernel.org
Cc: Dave Airlie <airlied@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Julia Lawall <julia@diku.dk>
Cc: Matthew Garrett <mjg@redhat.com>
---
drivers/gpu/vga/vgaarb.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
Index: linux-2.6/drivers/gpu/vga/vgaarb.c
===================================================================
--- linux-2.6.orig/drivers/gpu/vga/vgaarb.c
+++ linux-2.6/drivers/gpu/vga/vgaarb.c
@@ -141,6 +141,12 @@ EXPORT_SYMBOL_GPL(vga_default_device);
void vga_set_default_device(struct pci_dev *pdev)
{
+ if (vga_default)
+ pci_dev_put(vga_default);
+
+ if (pdev)
+ pdev = pci_dev_get(pdev);
+
vga_default = pdev;
}
#endif
@@ -577,7 +583,7 @@ static bool vga_arbiter_add_pci_device(s
#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
if (vga_default == NULL &&
((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK))
- vga_default = pci_dev_get(pdev);
+ vga_set_default_device(pdev);
#endif
vga_arbiter_check_bridge_sharing(vgadev);
@@ -613,10 +619,8 @@ static bool vga_arbiter_del_pci_device(s
}
#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
- if (vga_default == pdev) {
- pci_dev_put(vga_default);
- vga_default = NULL;
- }
+ if (vga_default == pdev)
+ vga_set_default_device(NULL);
#endif
if (vgadev->decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM))
next prev parent reply other threads:[~2012-09-18 23:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-15 0:48 [PATCH] PCI, x86: fix default vga ref_count Yinghai Lu
2012-09-15 0:48 ` [PATCH] PCI: Use correct type when freeing bus resource list Yinghai Lu
2012-09-18 22:53 ` Bjorn Helgaas
2012-09-15 0:48 ` [PATCH] PCI, x86: clear initial value for root info resources Yinghai Lu
2012-09-18 22:46 ` Bjorn Helgaas
2012-09-18 23:49 ` Yinghai Lu
2012-09-19 13:12 ` Bjorn Helgaas
2012-09-19 17:17 ` Yinghai Lu
2012-09-19 17:49 ` Yinghai Lu
2012-09-19 17:49 ` [PATCH] PCI, ia64: " Yinghai Lu
2012-09-21 16:50 ` [PATCH] PCI, x86: " Konrad Rzeszutek Wilk
[not found] ` <CAE9FiQV9WK4NG5+aGwVrGO3ueFH3TmmmG5zea+JjwgtQyngNRg@mail.gmail.com>
2012-09-23 20:33 ` Konrad Rzeszutek Wilk
2012-09-19 15:34 ` Jiang Liu
2012-09-18 22:15 ` [PATCH] PCI, x86: fix default vga ref_count Bjorn Helgaas
2012-09-18 22:39 ` Yinghai Lu
2012-09-18 23:44 ` Yinghai Lu [this message]
2012-09-18 23:54 ` [PATCH] PCI: " Matthew Garrett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348011882-31452-1-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=airlied@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=julia@diku.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).