From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USoLG-0004wt-Eb for qemu-devel@nongnu.org; Thu, 18 Apr 2013 08:53:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USoLC-0004bf-N9 for qemu-devel@nongnu.org; Thu, 18 Apr 2013 08:53:34 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:55163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USoLB-0004an-MN for qemu-devel@nongnu.org; Thu, 18 Apr 2013 08:53:30 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 18 Apr 2013 22:41:47 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 097B42BB0023 for ; Thu, 18 Apr 2013 22:53:21 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3ICrF2A9044340 for ; Thu, 18 Apr 2013 22:53:15 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3ICrKQ9023938 for ; Thu, 18 Apr 2013 22:53:20 +1000 From: Anthony Liguori In-Reply-To: <516FDA39.7010905@greensocs.com> References: <1365690602-22729-1-git-send-email-fred.konrad@greensocs.com> <1365690602-22729-7-git-send-email-fred.konrad@greensocs.com> <20130418084126.GA16686@redhat.com> <516FDA39.7010905@greensocs.com> Date: Thu, 18 Apr 2013 07:52:54 -0500 Message-ID: <87vc7k2e6x.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 6/7] virtio-net: cleanup: use QOM cast. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: KONRAD =?utf-8?B?RnLDqWTDqXJpYw==?= , "Michael S. Tsirkin" Cc: cornelia.huck@de.ibm.com, peter.maydell@linaro.org, mark.burton@greensocs.com, qemu-devel@nongnu.org KONRAD Fr=C3=A9d=C3=A9ric writes: > On 18/04/2013 10:41, Michael S. Tsirkin wrote: >> BTW this is data path so was supposed to use the faster non-QOM casts. >> Also in other places below. This was applied meanwhile, but maybe we >> could revert the relevant chunks? Or maybe everyone who cares about >> speed uses vhost-net anyway so we don't care ... >> >> I point datapath below in case it's useful. > > Which faster non-QOM casts? > > In virtio-pci there is this one: > > static inline VirtIOPCIProxy *to_virtio_pci_proxy_fast(DeviceState *d) > { > return container_of(d, VirtIOPCIProxy, pci_dev.qdev); > } > > Is that what you want? Nack. "Faster non-QOM casts" is FUD. Regards, Anthony Liguori > >> >>> @@ -629,7 +626,7 @@ static int virtio_net_can_receive(NetClientState *n= c) >>> } >>>=20=20=20 >>> if (!virtio_queue_ready(q->rx_vq) || >>> - !(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) { >>> + !(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) { >>> return 0; >>> } >>>=20=20=20 >>> @@ -759,6 +756,7 @@ static ssize_t virtio_net_receive(NetClientState *n= c, const uint8_t *buf, size_t >>> { >>> VirtIONet *n =3D qemu_get_nic_opaque(nc); >>> VirtIONetQueue *q =3D virtio_net_get_subqueue(nc); >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>> struct iovec mhdr_sg[VIRTQUEUE_MAX_SIZE]; >>> struct virtio_net_hdr_mrg_rxbuf mhdr; >>> unsigned mhdr_cnt =3D 0; >> datapath >> >>> @@ -792,7 +790,7 @@ static ssize_t virtio_net_receive(NetClientState *n= c, const uint8_t *buf, size_t >>> "i %zd mergeable %d offset %zd, size %zd, " >>> "guest hdr len %zd, host hdr len %zd guest featur= es 0x%x", >>> i, n->mergeable_rx_bufs, offset, size, >>> - n->guest_hdr_len, n->host_hdr_len, n->vdev.guest_f= eatures); >>> + n->guest_hdr_len, n->host_hdr_len, vdev->guest_fea= tures); >>> exit(1); >>> } >>>=20=20=20 >>> @@ -849,7 +847,7 @@ static ssize_t virtio_net_receive(NetClientState *n= c, const uint8_t *buf, size_t >>> } >>>=20=20=20 >>> virtqueue_flush(q->rx_vq, i); >>> - virtio_notify(&n->vdev, q->rx_vq); >>> + virtio_notify(vdev, q->rx_vq); >>>=20=20=20 >>> return size; >>> } >>> @@ -860,9 +858,10 @@ static void virtio_net_tx_complete(NetClientState = *nc, ssize_t len) >>> { >>> VirtIONet *n =3D qemu_get_nic_opaque(nc); >>> VirtIONetQueue *q =3D virtio_net_get_subqueue(nc); >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>>=20=20=20 >>> virtqueue_push(q->tx_vq, &q->async_tx.elem, 0); >>> - virtio_notify(&n->vdev, q->tx_vq); >>> + virtio_notify(vdev, q->tx_vq); >>>=20=20=20 >>> q->async_tx.elem.out_num =3D q->async_tx.len =3D 0; >>> >> datapath >>=20=20=20=20 >>> @@ -874,14 +873,15 @@ static void virtio_net_tx_complete(NetClientState= *nc, ssize_t len) >>> static int32_t virtio_net_flush_tx(VirtIONetQueue *q) >>> { >>> VirtIONet *n =3D q->n; >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>> VirtQueueElement elem; >>> int32_t num_packets =3D 0; >>> int queue_index =3D vq2q(virtio_get_queue_index(q->tx_vq)); >>> - if (!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) { >>> + if (!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) { >>> return num_packets; >>> } >>>=20=20=20 >>> - assert(n->vdev.vm_running); >>> + assert(vdev->vm_running); >>>=20=20=20 >>> if (q->async_tx.elem.out_num) { >>> virtio_queue_set_notification(q->tx_vq, 0); >> >> datapath >> >>> @@ -930,7 +930,7 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *= q) >>> len +=3D ret; >>>=20=20=20 >>> virtqueue_push(q->tx_vq, &elem, 0); >>> - virtio_notify(&n->vdev, q->tx_vq); >>> + virtio_notify(vdev, q->tx_vq); >>>=20=20=20 >>> if (++num_packets >=3D n->tx_burst) { >>> break; >>> @@ -941,11 +941,11 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue= *q) >>>=20=20=20 >>> static void virtio_net_handle_tx_timer(VirtIODevice *vdev, VirtQueue = *vq) >>> { >>> - VirtIONet *n =3D to_virtio_net(vdev); >>> + VirtIONet *n =3D VIRTIO_NET(vdev); >>> VirtIONetQueue *q =3D &n->vqs[vq2q(virtio_get_queue_index(vq))]; >>>=20=20=20 >>> /* This happens when device was stopped but VCPU wasn't. */ >>> - if (!n->vdev.vm_running) { >>> + if (!vdev->vm_running) { >>> q->tx_waiting =3D 1; >>> return; >>> } >> >> datapath >> >>> @@ -965,7 +965,7 @@ static void virtio_net_handle_tx_timer(VirtIODevice= *vdev, VirtQueue *vq) >>>=20=20=20 >>> static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq) >>> { >>> - VirtIONet *n =3D to_virtio_net(vdev); >>> + VirtIONet *n =3D VIRTIO_NET(vdev); >>> VirtIONetQueue *q =3D &n->vqs[vq2q(virtio_get_queue_index(vq))]; >>>=20=20=20 >>> if (unlikely(q->tx_waiting)) { >> datapath >> >>> @@ -973,7 +973,7 @@ static void virtio_net_handle_tx_bh(VirtIODevice *v= dev, VirtQueue *vq) >>> } >>> q->tx_waiting =3D 1; >>> /* This happens when device was stopped but VCPU wasn't. */ >>> - if (!n->vdev.vm_running) { >>> + if (!vdev->vm_running) { >>> return; >>> } >>> virtio_queue_set_notification(vq, 0); >>> @@ -984,13 +984,15 @@ static void virtio_net_tx_timer(void *opaque) >>> { >>> VirtIONetQueue *q =3D opaque; >>> VirtIONet *n =3D q->n; >>> - assert(n->vdev.vm_running); >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>> + assert(vdev->vm_running); >>>=20=20=20 >>> q->tx_waiting =3D 0; >>>=20=20=20 >>> /* Just in case the driver is not ready on more */ >>> - if (!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) >>> + if (!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) { >>> return; >>> + } >>>=20=20=20 >>> virtio_queue_set_notification(q->tx_vq, 1); >>> virtio_net_flush_tx(q); >> datapath >> >>> @@ -1000,15 +1002,17 @@ static void virtio_net_tx_bh(void *opaque) >>> { >>> VirtIONetQueue *q =3D opaque; >>> VirtIONet *n =3D q->n; >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>> int32_t ret; >>>=20=20=20 >>> - assert(n->vdev.vm_running); >>> + assert(vdev->vm_running); >>>=20=20=20 >>> q->tx_waiting =3D 0; >>>=20=20=20 >>> /* Just in case the driver is not ready on more */ >>> - if (unlikely(!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK))) >>> + if (unlikely(!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK))) { >>> return; >>> + } >>>=20=20=20 >>> ret =3D virtio_net_flush_tx(q); >>> if (ret =3D=3D -EBUSY) { >> datapath >> >>> @@ -1036,7 +1040,7 @@ static void virtio_net_tx_bh(void *opaque) >>>=20=20=20 >>> static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue, i= nt ctrl) >>> { >>> - VirtIODevice *vdev =3D &n->vdev; >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>> int i, max =3D multiqueue ? n->max_queues : 1; >>>=20=20=20 >>> n->multiqueue =3D multiqueue; >>> @@ -1074,11 +1078,12 @@ static void virtio_net_save(QEMUFile *f, void *= opaque) >>> { >>> int i; >>> VirtIONet *n =3D opaque; >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>>=20=20=20 >>> /* At this point, backend must be stopped, otherwise >>> * it might keep writing to memory. */ >>> assert(!n->vhost_started); >>> - virtio_save(&n->vdev, f); >>> + virtio_save(vdev, f); >>>=20=20=20 >>> qemu_put_buffer(f, n->mac, ETH_ALEN); >>> qemu_put_be32(f, n->vqs[0].tx_waiting); >>> @@ -1109,12 +1114,13 @@ static void virtio_net_save(QEMUFile *f, void *= opaque) >>> static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) >>> { >>> VirtIONet *n =3D opaque; >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(n); >>> int ret, i, link_down; >>>=20=20=20 >>> if (version_id < 2 || version_id > VIRTIO_NET_VM_VERSION) >>> return -EINVAL; >>>=20=20=20 >>> - ret =3D virtio_load(&n->vdev, f); >>> + ret =3D virtio_load(vdev, f); >>> if (ret) { >>> return ret; >>> } >>> @@ -1163,11 +1169,11 @@ static int virtio_net_load(QEMUFile *f, void *o= paque, int version_id) >>>=20=20=20 >>> if (n->has_vnet_hdr) { >>> tap_set_offload(qemu_get_queue(n->nic)->peer, >>> - (n->vdev.guest_features >> VIRTIO_NET_F_GUEST_CSUM= ) & 1, >>> - (n->vdev.guest_features >> VIRTIO_NET_F_GUEST_TSO4= ) & 1, >>> - (n->vdev.guest_features >> VIRTIO_NET_F_GUEST_TSO6= ) & 1, >>> - (n->vdev.guest_features >> VIRTIO_NET_F_GUEST_ECN)= & 1, >>> - (n->vdev.guest_features >> VIRTIO_NET_F_GUEST_UFO)= & 1); >>> + (vdev->guest_features >> VIRTIO_NET_F_GUEST_CSUM) = & 1, >>> + (vdev->guest_features >> VIRTIO_NET_F_GUEST_TSO4) = & 1, >>> + (vdev->guest_features >> VIRTIO_NET_F_GUEST_TSO6) = & 1, >>> + (vdev->guest_features >> VIRTIO_NET_F_GUEST_ECN) = & 1, >>> + (vdev->guest_features >> VIRTIO_NET_F_GUEST_UFO) = & 1); >>> } >>> } >>>=20=20=20 >>> @@ -1240,7 +1246,7 @@ static NetClientInfo net_virtio_info =3D { >>>=20=20=20 >>> static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int= idx) >>> { >>> - VirtIONet *n =3D to_virtio_net(vdev); >>> + VirtIONet *n =3D VIRTIO_NET(vdev); >>> NetClientState *nc =3D qemu_get_subqueue(n->nic, vq2q(idx)); >>> assert(n->vhost_started); >>> return vhost_net_virtqueue_pending(tap_get_vhost_net(nc->peer), i= dx); >>> @@ -1249,7 +1255,7 @@ static bool virtio_net_guest_notifier_pending(Vir= tIODevice *vdev, int idx) >>> static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int id= x, >>> bool mask) >>> { >>> - VirtIONet *n =3D to_virtio_net(vdev); >>> + VirtIONet *n =3D VIRTIO_NET(vdev); >>> NetClientState *nc =3D qemu_get_subqueue(n->nic, vq2q(idx)); >>> assert(n->vhost_started); >>> vhost_net_virtqueue_mask(tap_get_vhost_net(nc->peer), >> kind of datapath >> >>> @@ -1273,6 +1279,7 @@ static VirtIODevice *virtio_net_common_init(Devic= eState *dev, NICConf *conf, >>> VirtIONet **pn) >>> { >>> VirtIONet *n =3D *pn; >>> + VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); >>> int i, config_size =3D 0; >>>=20=20=20 >>> /* >>> @@ -1295,18 +1302,18 @@ static VirtIODevice *virtio_net_common_init(Dev= iceState *dev, NICConf *conf, >>> n->config_size); >>> } >>>=20=20=20 >>> - n->vdev.get_config =3D virtio_net_get_config; >>> - n->vdev.set_config =3D virtio_net_set_config; >>> - n->vdev.get_features =3D virtio_net_get_features; >>> - n->vdev.set_features =3D virtio_net_set_features; >>> - n->vdev.bad_features =3D virtio_net_bad_features; >>> - n->vdev.reset =3D virtio_net_reset; >>> - n->vdev.set_status =3D virtio_net_set_status; >>> - n->vdev.guest_notifier_mask =3D virtio_net_guest_notifier_mask; >>> - n->vdev.guest_notifier_pending =3D virtio_net_guest_notifier_pendi= ng; >>> + vdev->get_config =3D virtio_net_get_config; >>> + vdev->set_config =3D virtio_net_set_config; >>> + vdev->get_features =3D virtio_net_get_features; >>> + vdev->set_features =3D virtio_net_set_features; >>> + vdev->bad_features =3D virtio_net_bad_features; >>> + vdev->reset =3D virtio_net_reset; >>> + vdev->set_status =3D virtio_net_set_status; >>> + vdev->guest_notifier_mask =3D virtio_net_guest_notifier_mask; >>> + vdev->guest_notifier_pending =3D virtio_net_guest_notifier_pending; >>> n->max_queues =3D MAX(conf->queues, 1); >>> n->vqs =3D g_malloc0(sizeof(VirtIONetQueue) * n->max_queues); >>> - n->vqs[0].rx_vq =3D virtio_add_queue(&n->vdev, 256, virtio_net_han= dle_rx); >>> + n->vqs[0].rx_vq =3D virtio_add_queue(vdev, 256, virtio_net_handle_= rx); >>> n->curr_queues =3D 1; >>> n->vqs[0].n =3D n; >>> n->tx_timeout =3D net->txtimer; >>> @@ -1319,16 +1326,16 @@ static VirtIODevice *virtio_net_common_init(Dev= iceState *dev, NICConf *conf, >>> } >>>=20=20=20 >>> if (net->tx && !strcmp(net->tx, "timer")) { >>> - n->vqs[0].tx_vq =3D virtio_add_queue(&n->vdev, 256, >>> + n->vqs[0].tx_vq =3D virtio_add_queue(vdev, 256, >>> virtio_net_handle_tx_timer= ); >>> n->vqs[0].tx_timer =3D qemu_new_timer_ns(vm_clock, virtio_net= _tx_timer, >>> &n->vqs[0]); >>> } else { >>> - n->vqs[0].tx_vq =3D virtio_add_queue(&n->vdev, 256, >>> + n->vqs[0].tx_vq =3D virtio_add_queue(vdev, 256, >>> virtio_net_handle_tx_bh); >>> n->vqs[0].tx_bh =3D qemu_bh_new(virtio_net_tx_bh, &n->vqs[0]); >>> } >>> - n->ctrl_vq =3D virtio_add_queue(&n->vdev, 64, virtio_net_handle_ct= rl); >>> + n->ctrl_vq =3D virtio_add_queue(vdev, 64, virtio_net_handle_ctrl); >>> qemu_macaddr_default_if_unset(&conf->macaddr); >>> memcpy(&n->mac[0], &conf->macaddr, sizeof(n->mac)); >>> n->status =3D VIRTIO_NET_S_LINK_UP; >>> @@ -1361,7 +1368,7 @@ static VirtIODevice *virtio_net_common_init(Devic= eState *dev, NICConf *conf, >>>=20=20=20 >>> add_boot_device_path(conf->bootindex, dev, "/ethernet-phy@0"); >>>=20=20=20 >>> - return &n->vdev; >>> + return vdev; >>> } >>>=20=20=20 >>> VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, >>> @@ -1373,7 +1380,7 @@ VirtIODevice *virtio_net_init(DeviceState *dev, N= ICConf *conf, >>>=20=20=20 >>> void virtio_net_exit(VirtIODevice *vdev) >>> { >>> - VirtIONet *n =3D DO_UPCAST(VirtIONet, vdev, vdev); >>> + VirtIONet *n =3D VIRTIO_NET(vdev); >>> int i; >>>=20=20=20 >>> /* This will stop vhost backend if appropriate. */ >>> @@ -1400,7 +1407,7 @@ void virtio_net_exit(VirtIODevice *vdev) >>>=20=20=20 >>> g_free(n->vqs); >>> qemu_del_nic(n->nic); >>> - virtio_cleanup(&n->vdev); >>> + virtio_cleanup(vdev); >>> } >>>=20=20=20 >>> static int virtio_net_device_init(VirtIODevice *vdev) >>> @@ -1449,7 +1456,7 @@ static int virtio_net_device_exit(DeviceState *qd= ev) >>>=20=20=20 >>> g_free(n->vqs); >>> qemu_del_nic(n->nic); >>> - virtio_common_cleanup(&n->vdev); >>> + virtio_common_cleanup(vdev); >>>=20=20=20 >>> return 0; >>> } >>> diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-= net.h >>> index 9fbb506..ce4ab50 100644 >>> --- a/include/hw/virtio/virtio-net.h >>> +++ b/include/hw/virtio/virtio-net.h >>> @@ -153,7 +153,7 @@ typedef struct VirtIONetQueue { >>> } VirtIONetQueue; >>>=20=20=20 >>> typedef struct VirtIONet { >>> - VirtIODevice vdev; >>> + VirtIODevice parent_obj; >>> uint8_t mac[ETH_ALEN]; >>> uint16_t status; >>> VirtIONetQueue *vqs; >>> --=20 >>> 1.8.1.4 >>>