From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB9cQ-0004Dr-CC for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:21:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RB9cO-0007Au-GW for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:21:30 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:56743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB9cN-0007Aj-Ur for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:21:28 -0400 Message-ID: <4E8B4EA5.8060800@web.de> Date: Tue, 04 Oct 2011 20:21:25 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1317739882-4809-1-git-send-email-anthony.perard@citrix.com> <1317739882-4809-2-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1317739882-4809-2-git-send-email-anthony.perard@citrix.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig20875CB65C23FC4054A90D95" Sender: jan.kiszka@web.de Subject: Re: [Qemu-devel] [PATCH RFC V1 01/11] Introduce HostPCIDevice to access a pci device on the host. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony PERARD Cc: Alex Williamson , Xen Devel , QEMU-devel , Stefano Stabellini This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig20875CB65C23FC4054A90D95 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable This wasn't run through checkpatch.pl, I bet. On 2011-10-04 16:51, Anthony PERARD wrote: > Signed-off-by: Anthony PERARD > --- > hw/host-pci-device.c | 192 ++++++++++++++++++++++++++++++++++++++++++= ++++++++ > hw/host-pci-device.h | 36 +++++++++ > 2 files changed, 228 insertions(+), 0 deletions(-) > create mode 100644 hw/host-pci-device.c > create mode 100644 hw/host-pci-device.h >=20 > diff --git a/hw/host-pci-device.c b/hw/host-pci-device.c > new file mode 100644 > index 0000000..b3f2899 > --- /dev/null > +++ b/hw/host-pci-device.c > @@ -0,0 +1,192 @@ > +#include "qemu-common.h" > +#include "host-pci-device.h" > + > +static int path_to(const HostPCIDevice *d, > + const char *name, char *buf, ssize_t size) > +{ > + return snprintf(buf, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%x= /%s", > + d->domain, d->bus, d->dev, d->func, name); > +} > + > +static int get_resource(HostPCIDevice *d) > +{ > + int i; > + FILE *f; > + char path[PATH_MAX]; > + unsigned long long start, end, flags, size; > + > + path_to(d, "resource", path, sizeof (path)); > + f =3D fopen(path, "r"); > + if (!f) { > + fprintf(stderr, "Error: Can't open %s: %s\n", path, strerror(e= rrno)); > + return -1; > + } > + > + for (i =3D 0; i < PCI_NUM_REGIONS; i++) { > + if (fscanf(f, "%llx %llx %llx", &start, &end, &flags) !=3D 3) = { > + fprintf(stderr, "Error: Syntax error in %s\n", path); > + break; > + } > + if (start) { > + size =3D end - start + 1; > + } else { > + size =3D 0; > + } > + > + flags &=3D 0xf; No magic numbers please. It also looks a bit strange to me: It's the resource type encoded in the second byte? Aren't you interested in it? > + > + if (i < PCI_ROM_SLOT) { > + d->base_addr[i] =3D start | flags; > + d->size[i] =3D size; > + } else { > + d->rom_base_addr =3D start | flags; > + d->rom_size =3D size; > + } > + } > + > + fclose(f); > + return 0; > +} > + > +static unsigned long get_value(HostPCIDevice *d, const char *name) > +{ > + char path[PATH_MAX]; > + FILE *f; > + unsigned long value; > + > + path_to(d, name, path, sizeof (path)); > + f =3D fopen(path, "r"); > + if (!f) { > + fprintf(stderr, "Error: Can't open %s: %s\n", path, strerror(e= rrno)); > + return -1; > + } > + if (fscanf(f, "%lx\n", &value) !=3D 1) { > + fprintf(stderr, "Error: Syntax error in %s\n", path); > + value =3D -1; > + } > + fclose(f); > + return value; > +} > + > +static int pci_dev_is_virtfn(HostPCIDevice *d) > +{ > + int rc; > + char path[PATH_MAX]; > + struct stat buf; > + > + path_to(d, "physfn", path, sizeof (path)); > + rc =3D !stat(path, &buf); > + > + return rc; > +} > + > +static int host_pci_config_fd(HostPCIDevice *d) [ We will also need the reverse: pass in open file descriptors that HostPCIDevice should use. Can be added later. ] > +{ > + char path[PATH_MAX]; > + > + if (d->config_fd < 0) { > + path_to(d, "config", path, sizeof (path)); > + d->config_fd =3D open(path, O_RDWR); > + if (d->config_fd < 0) { > + fprintf(stderr, "HostPCIDevice: Can not open '%s': %s\n", > + path, strerror(errno)); > + } > + } > + return d->config_fd; > +} > +static int host_pci_config_read(HostPCIDevice *d, int pos, void *buf, = int len) > +{ > + int fd =3D host_pci_config_fd(d); > + int res =3D 0; > + > + res =3D pread(fd, buf, len, pos); > + if (res < 0) { > + fprintf(stderr, "host_pci_config: read failed: %s (fd: %i)\n",= > + strerror(errno), fd); > + return -1; > + } > + return res; > +} > +static int host_pci_config_write(HostPCIDevice *d, > + int pos, const void *buf, int len) > +{ > + int fd =3D host_pci_config_fd(d); > + int res =3D 0; > + > + res =3D pwrite(fd, buf, len, pos); > + if (res < 0) { > + fprintf(stderr, "host_pci_config: write failed: %s\n", > + strerror(errno)); > + return -1; > + } > + return res; > +} > + > +uint8_t host_pci_read_byte(HostPCIDevice *d, int pos) > +{ > + uint8_t buf; > + host_pci_config_read(d, pos, &buf, 1); > + return buf; > +} > +uint16_t host_pci_read_word(HostPCIDevice *d, int pos) > +{ > + uint16_t buf; > + host_pci_config_read(d, pos, &buf, 2); > + return le16_to_cpu(buf); > +} > +uint32_t host_pci_read_long(HostPCIDevice *d, int pos) > +{ > + uint32_t buf; > + host_pci_config_read(d, pos, &buf, 4); > + return le32_to_cpu(buf); > +} > +int host_pci_read_block(HostPCIDevice *d, int pos, uint8_t *buf, int l= en) > +{ > + return host_pci_config_read(d, pos, buf, len); > +} > + > +int host_pci_write_byte(HostPCIDevice *d, int pos, uint8_t data) > +{ > + return host_pci_config_write(d, pos, &data, 1); > +} > +int host_pci_write_word(HostPCIDevice *d, int pos, uint16_t data) > +{ > + return host_pci_config_write(d, pos, &data, 2); You adjust endianess on read, but not on write. > +} > +int host_pci_write_long(HostPCIDevice *d, int pos, uint32_t data) > +{ > + return host_pci_config_write(d, pos, &data, 4); > +} > +int host_pci_write_block(HostPCIDevice *d, int pos, uint8_t *buf, int = len) > +{ > + return host_pci_config_write(d, pos, buf, len); > +} > + > +HostPCIDevice *host_pci_device_get(uint8_t bus, uint8_t dev, uint8_t f= unc) > +{ > + HostPCIDevice *d =3D NULL; > + > + d =3D g_new0(HostPCIDevice, 1); > + > + d->config_fd =3D -1; > + d->domain =3D 0; > + d->bus =3D bus; > + d->dev =3D dev; > + d->func =3D func; > + > + if (host_pci_config_fd(d) =3D=3D -1) > + goto error; > + if (get_resource(d) =3D=3D -1) > + goto error; > + > + d->vendor_id =3D get_value(d, "vendor"); > + d->device_id =3D get_value(d, "device"); > + d->is_virtfn =3D pci_dev_is_virtfn(d); > + > + return d; > +error: > + if (d->config_fd >=3D 0) > + close(d->config_fd); > + g_free(d); > + return NULL; > +} > diff --git a/hw/host-pci-device.h b/hw/host-pci-device.h > new file mode 100644 > index 0000000..0137507 > --- /dev/null > +++ b/hw/host-pci-device.h > @@ -0,0 +1,36 @@ > +#ifndef HW_HOST_PCI_DEVICE > +# define HW_HOST_PCI_DEVICE > + > +#include "pci.h" > + > +typedef struct HostPCIDevice { > + uint16_t domain; > + uint8_t bus; > + uint8_t dev; > + uint8_t func; > + > + uint16_t vendor_id; > + uint16_t device_id; > + > + pcibus_t base_addr[PCI_NUM_REGIONS - 1]; > + pcibus_t size[PCI_NUM_REGIONS - 1]; > + pcibus_t rom_base_addr; > + pcibus_t rom_size; Regions deserve their own type IMHO. In KVM we have typedef struct { int type; /* Memory or port I/O */ int valid; uint32_t base_addr; uint32_t size; /* size of the region */ int resource_fd; } PCIRegion; Should probably become HostPCIIORegion (vs. virtual PCIIORegion), and our field types need some cleanups. > + > + bool is_virtfn; > + > + int config_fd; > +} HostPCIDevice; > + > +HostPCIDevice *host_pci_device_get(uint8_t bus, uint8_t dev, uint8_t f= unc); And what about some host_pci_device_put when we're done with it? > + > +uint8_t host_pci_read_byte(HostPCIDevice *d, int pos); > +uint16_t host_pci_read_word(HostPCIDevice *d, int pos); > +uint32_t host_pci_read_long(HostPCIDevice *d, int pos); > +int host_pci_read_block(HostPCIDevice *d, int pos, uint8_t *buf, int l= en); > +int host_pci_write_byte(HostPCIDevice *d, int pos, uint8_t data); > +int host_pci_write_word(HostPCIDevice *d, int pos, uint16_t data); > +int host_pci_write_long(HostPCIDevice *d, int pos, uint32_t data); > +int host_pci_write_block(HostPCIDevice *d, int pos, uint8_t *buf, int = len); I think these should be analogous to our pci layer: host_pci_get/set_byte/word/long/quad. Looks like it's generally useful for KVM as well. Jan --------------enig20875CB65C23FC4054A90D95 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6LTqUACgkQitSsb3rl5xRYCQCgq2Z2BpDXH7fas8ILZX79Af4B JoQAn2GEfTTxqm0m2AImK3eHa/Fxn3Ct =pqQw -----END PGP SIGNATURE----- --------------enig20875CB65C23FC4054A90D95-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH RFC V1 01/11] Introduce HostPCIDevice to access a pci device on the host. Date: Tue, 04 Oct 2011 20:21:25 +0200 Message-ID: <4E8B4EA5.8060800@web.de> References: <1317739882-4809-1-git-send-email-anthony.perard@citrix.com> <1317739882-4809-2-git-send-email-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig20875CB65C23FC4054A90D95" Return-path: In-Reply-To: <1317739882-4809-2-git-send-email-anthony.perard@citrix.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org To: Anthony PERARD Cc: Alex Williamson , Xen Devel , QEMU-devel , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig20875CB65C23FC4054A90D95 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable This wasn't run through checkpatch.pl, I bet. On 2011-10-04 16:51, Anthony PERARD wrote: > Signed-off-by: Anthony PERARD > --- > hw/host-pci-device.c | 192 ++++++++++++++++++++++++++++++++++++++++++= ++++++++ > hw/host-pci-device.h | 36 +++++++++ > 2 files changed, 228 insertions(+), 0 deletions(-) > create mode 100644 hw/host-pci-device.c > create mode 100644 hw/host-pci-device.h >=20 > diff --git a/hw/host-pci-device.c b/hw/host-pci-device.c > new file mode 100644 > index 0000000..b3f2899 > --- /dev/null > +++ b/hw/host-pci-device.c > @@ -0,0 +1,192 @@ > +#include "qemu-common.h" > +#include "host-pci-device.h" > + > +static int path_to(const HostPCIDevice *d, > + const char *name, char *buf, ssize_t size) > +{ > + return snprintf(buf, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%x= /%s", > + d->domain, d->bus, d->dev, d->func, name); > +} > + > +static int get_resource(HostPCIDevice *d) > +{ > + int i; > + FILE *f; > + char path[PATH_MAX]; > + unsigned long long start, end, flags, size; > + > + path_to(d, "resource", path, sizeof (path)); > + f =3D fopen(path, "r"); > + if (!f) { > + fprintf(stderr, "Error: Can't open %s: %s\n", path, strerror(e= rrno)); > + return -1; > + } > + > + for (i =3D 0; i < PCI_NUM_REGIONS; i++) { > + if (fscanf(f, "%llx %llx %llx", &start, &end, &flags) !=3D 3) = { > + fprintf(stderr, "Error: Syntax error in %s\n", path); > + break; > + } > + if (start) { > + size =3D end - start + 1; > + } else { > + size =3D 0; > + } > + > + flags &=3D 0xf; No magic numbers please. It also looks a bit strange to me: It's the resource type encoded in the second byte? Aren't you interested in it? > + > + if (i < PCI_ROM_SLOT) { > + d->base_addr[i] =3D start | flags; > + d->size[i] =3D size; > + } else { > + d->rom_base_addr =3D start | flags; > + d->rom_size =3D size; > + } > + } > + > + fclose(f); > + return 0; > +} > + > +static unsigned long get_value(HostPCIDevice *d, const char *name) > +{ > + char path[PATH_MAX]; > + FILE *f; > + unsigned long value; > + > + path_to(d, name, path, sizeof (path)); > + f =3D fopen(path, "r"); > + if (!f) { > + fprintf(stderr, "Error: Can't open %s: %s\n", path, strerror(e= rrno)); > + return -1; > + } > + if (fscanf(f, "%lx\n", &value) !=3D 1) { > + fprintf(stderr, "Error: Syntax error in %s\n", path); > + value =3D -1; > + } > + fclose(f); > + return value; > +} > + > +static int pci_dev_is_virtfn(HostPCIDevice *d) > +{ > + int rc; > + char path[PATH_MAX]; > + struct stat buf; > + > + path_to(d, "physfn", path, sizeof (path)); > + rc =3D !stat(path, &buf); > + > + return rc; > +} > + > +static int host_pci_config_fd(HostPCIDevice *d) [ We will also need the reverse: pass in open file descriptors that HostPCIDevice should use. Can be added later. ] > +{ > + char path[PATH_MAX]; > + > + if (d->config_fd < 0) { > + path_to(d, "config", path, sizeof (path)); > + d->config_fd =3D open(path, O_RDWR); > + if (d->config_fd < 0) { > + fprintf(stderr, "HostPCIDevice: Can not open '%s': %s\n", > + path, strerror(errno)); > + } > + } > + return d->config_fd; > +} > +static int host_pci_config_read(HostPCIDevice *d, int pos, void *buf, = int len) > +{ > + int fd =3D host_pci_config_fd(d); > + int res =3D 0; > + > + res =3D pread(fd, buf, len, pos); > + if (res < 0) { > + fprintf(stderr, "host_pci_config: read failed: %s (fd: %i)\n",= > + strerror(errno), fd); > + return -1; > + } > + return res; > +} > +static int host_pci_config_write(HostPCIDevice *d, > + int pos, const void *buf, int len) > +{ > + int fd =3D host_pci_config_fd(d); > + int res =3D 0; > + > + res =3D pwrite(fd, buf, len, pos); > + if (res < 0) { > + fprintf(stderr, "host_pci_config: write failed: %s\n", > + strerror(errno)); > + return -1; > + } > + return res; > +} > + > +uint8_t host_pci_read_byte(HostPCIDevice *d, int pos) > +{ > + uint8_t buf; > + host_pci_config_read(d, pos, &buf, 1); > + return buf; > +} > +uint16_t host_pci_read_word(HostPCIDevice *d, int pos) > +{ > + uint16_t buf; > + host_pci_config_read(d, pos, &buf, 2); > + return le16_to_cpu(buf); > +} > +uint32_t host_pci_read_long(HostPCIDevice *d, int pos) > +{ > + uint32_t buf; > + host_pci_config_read(d, pos, &buf, 4); > + return le32_to_cpu(buf); > +} > +int host_pci_read_block(HostPCIDevice *d, int pos, uint8_t *buf, int l= en) > +{ > + return host_pci_config_read(d, pos, buf, len); > +} > + > +int host_pci_write_byte(HostPCIDevice *d, int pos, uint8_t data) > +{ > + return host_pci_config_write(d, pos, &data, 1); > +} > +int host_pci_write_word(HostPCIDevice *d, int pos, uint16_t data) > +{ > + return host_pci_config_write(d, pos, &data, 2); You adjust endianess on read, but not on write. > +} > +int host_pci_write_long(HostPCIDevice *d, int pos, uint32_t data) > +{ > + return host_pci_config_write(d, pos, &data, 4); > +} > +int host_pci_write_block(HostPCIDevice *d, int pos, uint8_t *buf, int = len) > +{ > + return host_pci_config_write(d, pos, buf, len); > +} > + > +HostPCIDevice *host_pci_device_get(uint8_t bus, uint8_t dev, uint8_t f= unc) > +{ > + HostPCIDevice *d =3D NULL; > + > + d =3D g_new0(HostPCIDevice, 1); > + > + d->config_fd =3D -1; > + d->domain =3D 0; > + d->bus =3D bus; > + d->dev =3D dev; > + d->func =3D func; > + > + if (host_pci_config_fd(d) =3D=3D -1) > + goto error; > + if (get_resource(d) =3D=3D -1) > + goto error; > + > + d->vendor_id =3D get_value(d, "vendor"); > + d->device_id =3D get_value(d, "device"); > + d->is_virtfn =3D pci_dev_is_virtfn(d); > + > + return d; > +error: > + if (d->config_fd >=3D 0) > + close(d->config_fd); > + g_free(d); > + return NULL; > +} > diff --git a/hw/host-pci-device.h b/hw/host-pci-device.h > new file mode 100644 > index 0000000..0137507 > --- /dev/null > +++ b/hw/host-pci-device.h > @@ -0,0 +1,36 @@ > +#ifndef HW_HOST_PCI_DEVICE > +# define HW_HOST_PCI_DEVICE > + > +#include "pci.h" > + > +typedef struct HostPCIDevice { > + uint16_t domain; > + uint8_t bus; > + uint8_t dev; > + uint8_t func; > + > + uint16_t vendor_id; > + uint16_t device_id; > + > + pcibus_t base_addr[PCI_NUM_REGIONS - 1]; > + pcibus_t size[PCI_NUM_REGIONS - 1]; > + pcibus_t rom_base_addr; > + pcibus_t rom_size; Regions deserve their own type IMHO. In KVM we have typedef struct { int type; /* Memory or port I/O */ int valid; uint32_t base_addr; uint32_t size; /* size of the region */ int resource_fd; } PCIRegion; Should probably become HostPCIIORegion (vs. virtual PCIIORegion), and our field types need some cleanups. > + > + bool is_virtfn; > + > + int config_fd; > +} HostPCIDevice; > + > +HostPCIDevice *host_pci_device_get(uint8_t bus, uint8_t dev, uint8_t f= unc); And what about some host_pci_device_put when we're done with it? > + > +uint8_t host_pci_read_byte(HostPCIDevice *d, int pos); > +uint16_t host_pci_read_word(HostPCIDevice *d, int pos); > +uint32_t host_pci_read_long(HostPCIDevice *d, int pos); > +int host_pci_read_block(HostPCIDevice *d, int pos, uint8_t *buf, int l= en); > +int host_pci_write_byte(HostPCIDevice *d, int pos, uint8_t data); > +int host_pci_write_word(HostPCIDevice *d, int pos, uint16_t data); > +int host_pci_write_long(HostPCIDevice *d, int pos, uint32_t data); > +int host_pci_write_block(HostPCIDevice *d, int pos, uint8_t *buf, int = len); I think these should be analogous to our pci layer: host_pci_get/set_byte/word/long/quad. Looks like it's generally useful for KVM as well. Jan --------------enig20875CB65C23FC4054A90D95 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk6LTqUACgkQitSsb3rl5xRYCQCgq2Z2BpDXH7fas8ILZX79Af4B JoQAn2GEfTTxqm0m2AImK3eHa/Fxn3Ct =pqQw -----END PGP SIGNATURE----- --------------enig20875CB65C23FC4054A90D95--