From: Gerd Hoffmann <kraxel@redhat.com> To: qemu-devel@nongnu.org Cc: igvt-g@ml01.01.org, xen-devel@lists.xensource.com, Eduardo Habkost <ehabkost@redhat.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Gerd Hoffmann <kraxel@redhat.com>, vfio-users@redhat.com Subject: [Qemu-devel] [PATCH v2 07/10] igd: revamp host config read Date: Mon, 14 Dec 2015 12:39:39 +0100 [thread overview] Message-ID: <1450093182-3500-9-git-send-email-kraxel@redhat.com> (raw) In-Reply-To: <1450093182-3500-1-git-send-email-kraxel@redhat.com> Move all work to the host_pci_config_copy helper function, which we can easily reuse when adding q35 support. Open sysfs file only once for all values. Use pread. Proper error handling. Fix bugs: * Don't throw away results (like old host_pci_config_read did because val was passed by value not reference). * Update config space directly (writing via pci_default_write_config only works for registers whitelisted in wmask). Hmm, this code can hardly ever worked before, /me wonders what test coverage it had. With this patch in place igd-passthru=on actually works, although it still requires root priviledges because linux refuses to allow non-root users access pci config space above offset 0x50. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/pci-host/igd.c | 65 +++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/hw/pci-host/igd.c b/hw/pci-host/igd.c index 0784128..ec48875 100644 --- a/hw/pci-host/igd.c +++ b/hw/pci-host/igd.c @@ -19,47 +19,39 @@ static const IGDHostInfo igd_host_bridge_infos[] = { {0xa8, 4}, /* SNB: base of GTT stolen memory */ }; -static int host_pci_config_read(int pos, int len, uint32_t val) +static void host_pci_config_copy(PCIDevice *guest, const char *host, + const IGDHostInfo *list, int len, Error **errp) { - char path[PATH_MAX]; - int config_fd; - ssize_t size = sizeof(path); - /* Access real host bridge. */ - int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", - 0, 0, 0, 0, "config"); - int ret = 0; + char *path; + int config_fd, rc, i; - if (rc >= size || rc < 0) { - return -ENODEV; - } - - config_fd = open(path, O_RDWR); + path = g_strdup_printf("/sys/bus/pci/devices/%s/config", host); + config_fd = open(path, O_RDONLY); if (config_fd < 0) { - return -ENODEV; + error_setg_file_open(errp, errno, path); + goto out_free; } - if (lseek(config_fd, pos, SEEK_SET) != pos) { - ret = -errno; - goto out; + for (i = 0; i < len; i++) { + rc = pread(config_fd, guest->config + list[i].offset, + list[i].len, list[i].offset); + if (rc != list[i].len) { + error_setg_errno(errp, errno, "read %s, offset 0x%x", + path, list[i].offset); + goto out_close; + } } - do { - rc = read(config_fd, (uint8_t *)&val, len); - } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); - if (rc != len) { - ret = -errno; - } -out: + +out_close: close(config_fd); - return ret; +out_free: + g_free(path); } static void (*i440fx_realize)(PCIDevice *pci_dev, Error **errp); static void igd_pt_i440fx_realize(PCIDevice *pci_dev, Error **errp) { Error *err = NULL; - uint32_t val = 0; - int rc, i, num; - int pos, len; i440fx_realize(pci_dev, &err); if (err != NULL) { @@ -67,16 +59,13 @@ static void igd_pt_i440fx_realize(PCIDevice *pci_dev, Error **errp) return; } - num = ARRAY_SIZE(igd_host_bridge_infos); - for (i = 0; i < num; i++) { - pos = igd_host_bridge_infos[i].offset; - len = igd_host_bridge_infos[i].len; - rc = host_pci_config_read(pos, len, val); - if (rc) { - error_setg(errp, "failed to read host config"); - return; - } - pci_default_write_config(pci_dev, pos, val, len); + host_pci_config_copy(pci_dev, "0000:00:00.0", + igd_host_bridge_infos, + ARRAY_SIZE(igd_host_bridge_infos), + &err); + if (err != NULL) { + error_propagate(errp, err); + return; } } -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> To: qemu-devel-qX2TKyscuCcdnm+yROfE0A@public.gmane.org Cc: igvt-g-y27Ovi1pjclAfugRpC6u6w@public.gmane.org, xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org, Eduardo Habkost <ehabkost-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, Stefano Stabellini <stefano.stabellini-mvvWK6WmYclDPfheJLI6IQ@public.gmane.org>, vfio-users-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Subject: [PATCH v2 07/10] igd: revamp host config read Date: Mon, 14 Dec 2015 12:39:39 +0100 [thread overview] Message-ID: <1450093182-3500-9-git-send-email-kraxel@redhat.com> (raw) In-Reply-To: <1450093182-3500-1-git-send-email-kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Move all work to the host_pci_config_copy helper function, which we can easily reuse when adding q35 support. Open sysfs file only once for all values. Use pread. Proper error handling. Fix bugs: * Don't throw away results (like old host_pci_config_read did because val was passed by value not reference). * Update config space directly (writing via pci_default_write_config only works for registers whitelisted in wmask). Hmm, this code can hardly ever worked before, /me wonders what test coverage it had. With this patch in place igd-passthru=on actually works, although it still requires root priviledges because linux refuses to allow non-root users access pci config space above offset 0x50. Signed-off-by: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- hw/pci-host/igd.c | 65 +++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/hw/pci-host/igd.c b/hw/pci-host/igd.c index 0784128..ec48875 100644 --- a/hw/pci-host/igd.c +++ b/hw/pci-host/igd.c @@ -19,47 +19,39 @@ static const IGDHostInfo igd_host_bridge_infos[] = { {0xa8, 4}, /* SNB: base of GTT stolen memory */ }; -static int host_pci_config_read(int pos, int len, uint32_t val) +static void host_pci_config_copy(PCIDevice *guest, const char *host, + const IGDHostInfo *list, int len, Error **errp) { - char path[PATH_MAX]; - int config_fd; - ssize_t size = sizeof(path); - /* Access real host bridge. */ - int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", - 0, 0, 0, 0, "config"); - int ret = 0; + char *path; + int config_fd, rc, i; - if (rc >= size || rc < 0) { - return -ENODEV; - } - - config_fd = open(path, O_RDWR); + path = g_strdup_printf("/sys/bus/pci/devices/%s/config", host); + config_fd = open(path, O_RDONLY); if (config_fd < 0) { - return -ENODEV; + error_setg_file_open(errp, errno, path); + goto out_free; } - if (lseek(config_fd, pos, SEEK_SET) != pos) { - ret = -errno; - goto out; + for (i = 0; i < len; i++) { + rc = pread(config_fd, guest->config + list[i].offset, + list[i].len, list[i].offset); + if (rc != list[i].len) { + error_setg_errno(errp, errno, "read %s, offset 0x%x", + path, list[i].offset); + goto out_close; + } } - do { - rc = read(config_fd, (uint8_t *)&val, len); - } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); - if (rc != len) { - ret = -errno; - } -out: + +out_close: close(config_fd); - return ret; +out_free: + g_free(path); } static void (*i440fx_realize)(PCIDevice *pci_dev, Error **errp); static void igd_pt_i440fx_realize(PCIDevice *pci_dev, Error **errp) { Error *err = NULL; - uint32_t val = 0; - int rc, i, num; - int pos, len; i440fx_realize(pci_dev, &err); if (err != NULL) { @@ -67,16 +59,13 @@ static void igd_pt_i440fx_realize(PCIDevice *pci_dev, Error **errp) return; } - num = ARRAY_SIZE(igd_host_bridge_infos); - for (i = 0; i < num; i++) { - pos = igd_host_bridge_infos[i].offset; - len = igd_host_bridge_infos[i].len; - rc = host_pci_config_read(pos, len, val); - if (rc) { - error_setg(errp, "failed to read host config"); - return; - } - pci_default_write_config(pci_dev, pos, val, len); + host_pci_config_copy(pci_dev, "0000:00:00.0", + igd_host_bridge_infos, + ARRAY_SIZE(igd_host_bridge_infos), + &err); + if (err != NULL) { + error_propagate(errp, err); + return; } } -- 1.8.3.1
next prev parent reply other threads:[~2015-12-14 11:40 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-14 11:39 [Qemu-devel] [PATCH v2 00/10] igd passthrough chipset tweaks Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH] ehci: make idt processing more robust Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 01/10] pc: wire up TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE for !xen Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 02/10] pc: remove has_igd_gfx_passthru global Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-17 17:45 ` [Qemu-devel] " Eduardo Habkost 2015-12-17 17:45 ` Eduardo Habkost 2015-12-18 7:46 ` [Qemu-devel] " Gerd Hoffmann 2015-12-18 7:46 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 03/10] pc: move igd support code to igd.c Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 04/10] igd: switch TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE to realize Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 05/10] igd: TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE: call parent realize Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 06/10] igd: use defines for standard pci config space offsets Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann [this message] 2015-12-14 11:39 ` [PATCH v2 07/10] igd: revamp host config read Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 08/10] igd: add q35 support Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 09/10] igd: move igd-passthrough-isa-bridge to igd.c too Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann 2015-12-14 11:39 ` [Qemu-devel] [PATCH v2 10/10] igd: handle igd-passthrough-isa-bridge setup in realize() Gerd Hoffmann 2015-12-14 11:39 ` Gerd Hoffmann
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=1450093182-3500-9-git-send-email-kraxel@redhat.com \ --to=kraxel@redhat.com \ --cc=ehabkost@redhat.com \ --cc=igvt-g@ml01.01.org \ --cc=qemu-devel@nongnu.org \ --cc=stefano.stabellini@eu.citrix.com \ --cc=vfio-users@redhat.com \ --cc=xen-devel@lists.xensource.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.