Message ID | 1427876112-12615-10-git-send-email-jasowang@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, 1 Apr 2015 16:15:03 +0800 Jason Wang <jasowang@redhat.com> wrote: > Instead of depending on marco, using a bus specific limit. Also make > it clear that the number of gsis per I/O adapter is not directly > depending on the number of virtio queues, but rather the other way > around. > > Cc: Alexander Graf <agraf@suse.de> > Cc: Cornelia Huck <cornelia.huck@de.ibm.com> > Cc: Christian Borntraeger <borntraeger@de.ibm.com> > Cc: Richard Henderson <rth@twiddle.net> > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- > hw/s390x/s390-virtio-ccw.c | 7 +++++-- > hw/s390x/virtio-ccw.c | 19 ++++++++++++------- > include/hw/s390x/s390_flic.h | 4 +++- > 3 files changed, 20 insertions(+), 10 deletions(-) > > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index dfe6ded..935b880 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -265,8 +267,9 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, > uint16_t index, uint16_t num) > { > VirtIODevice *vdev = virtio_ccw_get_vdev(sch); > + int queue_max = virtio_get_queue_max(vdev); > > - if (index > VIRTIO_PCI_QUEUE_MAX) { > + if (index > queue_max) { trivial conflict on master (>= instead of >) > return -EINVAL; > } > In master, there's also a new instance of VIRTIO_PCI_QUEUE_MAX (in virtio_ccw_cb()) which needs a similar treatment. But on the whole, looks good.
On Thu, Apr 2, 2015 at 9:47 PM, Cornelia Huck <cornelia.huck@de.ibm.com> wrote: > On Wed, 1 Apr 2015 16:15:03 +0800 > Jason Wang <jasowang@redhat.com> wrote: > >> Instead of depending on marco, using a bus specific limit. Also make >> it clear that the number of gsis per I/O adapter is not directly >> depending on the number of virtio queues, but rather the other way >> around. >> >> Cc: Alexander Graf <agraf@suse.de> >> Cc: Cornelia Huck <cornelia.huck@de.ibm.com> >> Cc: Christian Borntraeger <borntraeger@de.ibm.com> >> Cc: Richard Henderson <rth@twiddle.net> >> Signed-off-by: Jason Wang <jasowang@redhat.com> >> --- >> hw/s390x/s390-virtio-ccw.c | 7 +++++-- >> hw/s390x/virtio-ccw.c | 19 ++++++++++++------- >> include/hw/s390x/s390_flic.h | 4 +++- >> 3 files changed, 20 insertions(+), 10 deletions(-) >> > >> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c >> index dfe6ded..935b880 100644 >> --- a/hw/s390x/virtio-ccw.c >> +++ b/hw/s390x/virtio-ccw.c > >> @@ -265,8 +267,9 @@ static int virtio_ccw_set_vqs(SubchDev *sch, >> uint64_t addr, uint32_t align, >> uint16_t index, uint16_t num) >> { >> VirtIODevice *vdev = virtio_ccw_get_vdev(sch); >> + int queue_max = virtio_get_queue_max(vdev); >> >> - if (index > VIRTIO_PCI_QUEUE_MAX) { >> + if (index > queue_max) { > > trivial conflict on master (>= instead of >) Yes, because of 590fe5722b522e492a9c78adadae4def35b137dd. > >> return -EINVAL; >> } >> > > In master, there's also a new instance of VIRTIO_PCI_QUEUE_MAX (in > virtio_ccw_cb()) which needs a similar treatment. > > But on the whole, looks good. Thanks for the reminding, will address this in V6.
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index afb539a..96b84ab 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -55,6 +55,7 @@ void io_subsystem_reset(void) static int virtio_ccw_hcall_notify(const uint64_t *args) { + VirtIODevice *vdev; uint64_t subch_id = args[0]; uint64_t queue = args[1]; SubchDev *sch; @@ -67,10 +68,12 @@ static int virtio_ccw_hcall_notify(const uint64_t *args) if (!sch || !css_subch_visible(sch)) { return -EINVAL; } - if (queue >= VIRTIO_PCI_QUEUE_MAX) { + + vdev = virtio_ccw_get_vdev(sch); + if (queue >= virtio_get_queue_max(vdev)) { return -EINVAL; } - virtio_queue_notify(virtio_ccw_get_vdev(sch), queue); + virtio_queue_notify(vdev, queue); return 0; } diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index dfe6ded..935b880 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -32,6 +32,8 @@ static QTAILQ_HEAD(, IndAddr) indicator_addresses = QTAILQ_HEAD_INITIALIZER(indicator_addresses); +#define VIRTIO_CCW_QUEUE_MAX ADAPTER_ROUTES_MAX_GSI + static IndAddr *get_indicator(hwaddr ind_addr, int len) { IndAddr *indicator; @@ -170,7 +172,7 @@ static void virtio_ccw_start_ioeventfd(VirtioCcwDevice *dev) return; } vdev = virtio_bus_get_device(&dev->bus); - for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) { + for (n = 0; n < virtio_get_queue_max(vdev); n++) { if (!virtio_queue_get_num(vdev, n)) { continue; } @@ -205,7 +207,7 @@ static void virtio_ccw_stop_ioeventfd(VirtioCcwDevice *dev) return; } vdev = virtio_bus_get_device(&dev->bus); - for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) { + for (n = 0; n < virtio_get_queue_max(vdev); n++) { if (!virtio_queue_get_num(vdev, n)) { continue; } @@ -265,8 +267,9 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, uint16_t index, uint16_t num) { VirtIODevice *vdev = virtio_ccw_get_vdev(sch); + int queue_max = virtio_get_queue_max(vdev); - if (index > VIRTIO_PCI_QUEUE_MAX) { + if (index > queue_max) { return -EINVAL; } @@ -291,7 +294,7 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, virtio_queue_set_vector(vdev, index, index); } /* tell notify handler in case of config change */ - vdev->config_vector = VIRTIO_PCI_QUEUE_MAX; + vdev->config_vector = queue_max; return 0; } @@ -1036,14 +1039,16 @@ static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc, static void virtio_ccw_notify(DeviceState *d, uint16_t vector) { VirtioCcwDevice *dev = to_virtio_ccw_dev_fast(d); + VirtIODevice *vdev = virtio_bus_get_device(&dev->bus); SubchDev *sch = dev->sch; uint64_t indicators; - if (vector >= 128) { + /* queue indicators + secondary indicators */ + if (vector >= virtio_get_queue_max(vdev) + 64) { return; } - if (vector < VIRTIO_PCI_QUEUE_MAX) { + if (vector < virtio_get_queue_max(vdev)) { if (!dev->indicators) { return; } @@ -1711,7 +1716,7 @@ static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data) k->load_queue = virtio_ccw_load_queue; k->save_config = virtio_ccw_save_config; k->load_config = virtio_ccw_load_config; - k->queue_max = VIRTIO_PCI_QUEUE_MAX; + k->queue_max = VIRTIO_CCW_QUEUE_MAX; } static const TypeInfo virtio_ccw_bus_info = { diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h index 489d73b..e1b0389 100644 --- a/include/hw/s390x/s390_flic.h +++ b/include/hw/s390x/s390_flic.h @@ -17,10 +17,12 @@ #include "hw/s390x/adapter.h" #include "hw/virtio/virtio.h" +#define ADAPTER_ROUTES_MAX_GSI 64 + typedef struct AdapterRoutes { AdapterInfo adapter; int num_routes; - int gsi[VIRTIO_PCI_QUEUE_MAX]; + int gsi[ADAPTER_ROUTES_MAX_GSI]; } AdapterRoutes; #define TYPE_S390_FLIC_COMMON "s390-flic"
Instead of depending on marco, using a bus specific limit. Also make it clear that the number of gsis per I/O adapter is not directly depending on the number of virtio queues, but rather the other way around. Cc: Alexander Graf <agraf@suse.de> Cc: Cornelia Huck <cornelia.huck@de.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Jason Wang <jasowang@redhat.com> --- hw/s390x/s390-virtio-ccw.c | 7 +++++-- hw/s390x/virtio-ccw.c | 19 ++++++++++++------- include/hw/s390x/s390_flic.h | 4 +++- 3 files changed, 20 insertions(+), 10 deletions(-)