From: Chris Wright <chrisw@redhat.com>
To: kvm@vger.kernel.org
Cc: Alex Williamson <alex.williamson@redhat.com>,
Chris Wright <chrisw@redhat.com>
Subject: [PATCH qemu-kvm] device-assignment: add config fd qdev property
Date: Wed, 19 May 2010 12:00:41 -0700 [thread overview]
Message-ID: <20100519190041.GK28275@x200.localdomain> (raw)
When libvirt launches a guest it first chowns the relevenat
/sys/bus/pci/.../config file for an assigned device then drops privileges.
This causes an issue for device assignment because despite being file
owner, the sysfs config space file checks for CAP_SYS_ADMIN before
allowing access to device dependent config space.
This adds a new qdev configfd property which allows libvirt to open the
sysfs config space file and give qemu an already opened file descriptor.
Along with a change pending for the 2.6.35 kernel, this allows the
capability check to compare against privileges from when the file was
opened.
Signed-off-by: Chris Wright <chrisw@redhat.com>
---
hw/device-assignment.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index eb31c78..172f0c9 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -612,12 +612,15 @@ static int get_real_device(AssignedDevice *pci_dev, uint16_t r_seg,
snprintf(name, sizeof(name), "%sconfig", dir);
- fd = open(name, O_RDWR);
+ fd = dev->config_fd;
if (fd == -1) {
- fprintf(stderr, "%s: %s: %m\n", __func__, name);
- return 1;
+ fd = open(name, O_RDWR);
+ if (fd == -1) {
+ fprintf(stderr, "%s: %s: %m\n", __func__, name);
+ return 1;
+ }
+ dev->config_fd = fd;
}
- dev->config_fd = fd;
again:
r = read(fd, pci_dev->dev.config, pci_config_size(&pci_dev->dev));
if (r < 0) {
@@ -1433,6 +1436,7 @@ static PCIDeviceInfo assign_info = {
.qdev.props = (Property[]) {
DEFINE_PROP("host", AssignedDevice, host, qdev_prop_hostaddr, PCIHostDevice),
DEFINE_PROP_UINT32("iommu", AssignedDevice, use_iommu, 1),
+ DEFINE_PROP_INT32("configfd", AssignedDevice, real_device.config_fd, -1),
DEFINE_PROP_END_OF_LIST(),
},
};
next reply other threads:[~2010-05-19 19:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-19 19:00 Chris Wright [this message]
2010-05-19 19:08 ` [PATCH qemu-kvm] device-assignment: add config fd qdev property Alex Williamson
2010-05-19 19:18 ` Anthony Liguori
2010-05-19 21:10 ` Chris Wright
2010-05-19 21:50 ` Anthony Liguori
2010-05-19 21:59 ` Chris Wright
2010-05-19 22:27 ` Anthony Liguori
2010-05-20 10:06 ` Daniel P. Berrange
2010-05-20 12:11 ` Markus Armbruster
2010-05-24 16:53 ` Alex Williamson
2010-05-24 18:20 ` Chris Wright
2010-05-25 6:43 ` Markus Armbruster
2010-05-25 21:14 ` Alex Williamson
2010-05-31 20:22 ` Marcelo Tosatti
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=20100519190041.GK28275@x200.localdomain \
--to=chrisw@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=kvm@vger.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