From: Cornelia Huck <cohuck@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-kernel@vger.kernel.org, Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: Re: [PATCH v3 38/38] virtio_net: use LE accessors for speed/duplex
Date: Wed, 5 Aug 2020 15:59:48 +0200 [thread overview]
Message-ID: <20200805155948.4869b0cc.cohuck@redhat.com> (raw)
In-Reply-To: <20200805134226.1106164-39-mst@redhat.com>
On Wed, 5 Aug 2020 09:45:00 -0400
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> Speed and duplex config fields depend on VIRTIO_NET_F_SPEED_DUPLEX
> which being 63>31 depends on VIRTIO_F_VERSION_1.
>
> Accordingly, use LE accessors for these fields.
>
> Reported-by: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/net/virtio_net.c | 9 +++++----
> include/uapi/linux/virtio_net.h | 2 +-
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index ba38765dc490..0934b1ec5320 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2264,12 +2264,13 @@ static void virtnet_update_settings(struct virtnet_info *vi)
> if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_SPEED_DUPLEX))
> return;
>
> - speed = virtio_cread32(vi->vdev, offsetof(struct virtio_net_config,
> - speed));
> + virtio_cread_le(vi->vdev, struct virtio_net_config, speed, &speed);
> +
> if (ethtool_validate_speed(speed))
> vi->speed = speed;
> - duplex = virtio_cread8(vi->vdev, offsetof(struct virtio_net_config,
> - duplex));
> +
> + virtio_cread_le(vi->vdev, struct virtio_net_config, duplex, &duplex);
Looks a bit odd for an u8, but does not really hurt.
> +
> if (ethtool_validate_duplex(duplex))
> vi->duplex = duplex;
> }
> diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
> index 27d996f29dd1..3f55a4215f11 100644
> --- a/include/uapi/linux/virtio_net.h
> +++ b/include/uapi/linux/virtio_net.h
> @@ -99,7 +99,7 @@ struct virtio_net_config {
> * speed, in units of 1Mb. All values 0 to INT_MAX are legal.
> * Any other value stands for unknown.
> */
> - __virtio32 speed;
> + __le32 speed;
> /*
> * 0x00 - half duplex
> * 0x01 - full duplex
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
prev parent reply other threads:[~2020-08-05 17:19 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 13:43 [PATCH v3 00/38] virtio: config space endian-ness cleanup Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 01/38] virtio_balloon: fix sparse warning Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 02/38] virtio_ring: sparse warning fixup Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 03/38] virtio: allow __virtioXX, __leXX in config space Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 04/38] virtio_9p: correct tags for config space fields Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 05/38] virtio_balloon: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 06/38] virtio_blk: " Michael S. Tsirkin
2020-08-05 14:24 ` Stefano Garzarella
2020-08-05 13:43 ` [PATCH v3 07/38] virtio_console: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 08/38] virtio_crypto: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 09/38] virtio_fs: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 10/38] virtio_gpu: " Michael S. Tsirkin
2020-08-07 11:22 ` Gerd Hoffmann
2020-08-05 13:43 ` [PATCH v3 11/38] virtio_input: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 12/38] virtio_iommu: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 13/38] virtio_mem: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 14/38] virtio_net: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 15/38] virtio_pmem: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 16/38] virtio_scsi: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 17/38] virtio_config: disallow native type fields Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 18/38] mlxbf-tmfifo: sparse tags for config access Michael S. Tsirkin
2020-08-05 14:24 ` Andy Shevchenko
2020-08-05 13:44 ` [PATCH v3 19/38] vdpa: make sure set_features is invoked for legacy Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 20/38] vhost/vdpa: switch to new helpers Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 21/38] virtio_vdpa: legacy features handling Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 22/38] vdpa_sim: fix endian-ness of config space Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 23/38] virtio_config: cread/write cleanup Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 24/38] virtio_config: rewrite using _Generic Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 25/38] virtio_config: disallow native type fields (again) Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 26/38] virtio_config: LE config space accessors Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 27/38] virtio_caif: correct tags for config space fields Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 28/38] virtio_config: add virtio_cread_le_feature Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 29/38] virtio_balloon: use LE config space accesses Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 30/38] virtio_input: convert to LE accessors Michael S. Tsirkin
2020-08-19 5:59 ` Gerd Hoffmann
2020-08-05 13:44 ` [PATCH v3 31/38] virtio_fs: " Michael S. Tsirkin
2020-08-06 17:28 ` Vivek Goyal
2020-08-05 13:44 ` [PATCH v3 32/38] virtio_crypto: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 33/38] virtio_pmem: " Michael S. Tsirkin
2020-08-07 20:05 ` Ira Weiny
2020-08-05 13:44 ` [PATCH v3 34/38] drm/virtio: " Michael S. Tsirkin
2020-08-07 11:22 ` Gerd Hoffmann
2020-08-05 13:44 ` [PATCH v3 35/38] virtio_mem: " Michael S. Tsirkin
2020-08-10 7:57 ` David Hildenbrand
2020-08-05 13:44 ` [PATCH v3 36/38] virtio-iommu: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 37/38] virtio_config: drop LE option from config space Michael S. Tsirkin
2020-08-05 13:45 ` [PATCH v3 38/38] virtio_net: use LE accessors for speed/duplex Michael S. Tsirkin
2020-08-05 13:59 ` Cornelia Huck [this message]
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=20200805155948.4869b0cc.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.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;
as well as URLs for NNTP newsgroup(s).