* [PATCH] virtio-net: Update the mtu code to match virtio spec
@ 2016-10-25 16:35 Aaron Conole
2016-10-25 16:41 ` Michael S. Tsirkin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Aaron Conole @ 2016-10-25 16:35 UTC (permalink / raw)
To: netdev; +Cc: Jarod Wilson, Michael S. Tsirkin, linux-kernel, virtualization
From: Aaron Conole <aconole@bytheb.org>
The virtio committee recently ratified a change, VIRTIO-152, which
defines the mtu field to be 'max' MTU, not simply desired MTU.
This commit brings the virtio-net device in compliance with VIRTIO-152.
Additionally, drop the max_mtu branch - it cannot be taken since the u16
returned by virtio_cread16 will never exceed the initial value of
max_mtu.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
drivers/net/virtio_net.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 720809f..2cafd12 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1870,10 +1870,12 @@ static int virtnet_probe(struct virtio_device *vdev)
mtu = virtio_cread16(vdev,
offsetof(struct virtio_net_config,
mtu));
- if (mtu < dev->min_mtu || mtu > dev->max_mtu)
+ if (mtu < dev->min_mtu) {
__virtio_clear_bit(vdev, VIRTIO_NET_F_MTU);
- else
+ } else {
dev->mtu = mtu;
+ dev->max_mtu = mtu;
+ }
}
if (vi->any_header_sg)
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] virtio-net: Update the mtu code to match virtio spec
2016-10-25 16:35 [PATCH] virtio-net: Update the mtu code to match virtio spec Aaron Conole
@ 2016-10-25 16:41 ` Michael S. Tsirkin
2016-10-25 17:09 ` Jarod Wilson
2016-10-25 20:06 ` Aaron Conole
2 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2016-10-25 16:41 UTC (permalink / raw)
To: Aaron Conole; +Cc: netdev, Jarod Wilson, linux-kernel, virtualization
On Tue, Oct 25, 2016 at 12:35:35PM -0400, Aaron Conole wrote:
> From: Aaron Conole <aconole@bytheb.org>
>
> The virtio committee recently ratified a change, VIRTIO-152, which
> defines the mtu field to be 'max' MTU, not simply desired MTU.
>
> This commit brings the virtio-net device in compliance with VIRTIO-152.
>
> Additionally, drop the max_mtu branch - it cannot be taken since the u16
> returned by virtio_cread16 will never exceed the initial value of
> max_mtu.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Jarod Wilson <jarod@redhat.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/net/virtio_net.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 720809f..2cafd12 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -1870,10 +1870,12 @@ static int virtnet_probe(struct virtio_device *vdev)
> mtu = virtio_cread16(vdev,
> offsetof(struct virtio_net_config,
> mtu));
> - if (mtu < dev->min_mtu || mtu > dev->max_mtu)
> + if (mtu < dev->min_mtu) {
> __virtio_clear_bit(vdev, VIRTIO_NET_F_MTU);
> - else
> + } else {
> dev->mtu = mtu;
> + dev->max_mtu = mtu;
> + }
> }
>
> if (vi->any_header_sg)
> --
> 2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] virtio-net: Update the mtu code to match virtio spec
2016-10-25 16:35 [PATCH] virtio-net: Update the mtu code to match virtio spec Aaron Conole
2016-10-25 16:41 ` Michael S. Tsirkin
@ 2016-10-25 17:09 ` Jarod Wilson
2016-10-25 20:06 ` Aaron Conole
2 siblings, 0 replies; 5+ messages in thread
From: Jarod Wilson @ 2016-10-25 17:09 UTC (permalink / raw)
To: Aaron Conole; +Cc: netdev, Michael S. Tsirkin, linux-kernel, virtualization
On Tue, Oct 25, 2016 at 12:35:35PM -0400, Aaron Conole wrote:
> From: Aaron Conole <aconole@bytheb.org>
>
> The virtio committee recently ratified a change, VIRTIO-152, which
> defines the mtu field to be 'max' MTU, not simply desired MTU.
>
> This commit brings the virtio-net device in compliance with VIRTIO-152.
>
> Additionally, drop the max_mtu branch - it cannot be taken since the u16
> returned by virtio_cread16 will never exceed the initial value of
> max_mtu.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Jarod Wilson <jarod@redhat.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
Worksforme.
Acked-by: Jarod Wilson <jarod@redhat.com>
--
Jarod Wilson
jarod@redhat.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] virtio-net: Update the mtu code to match virtio spec
2016-10-25 16:35 [PATCH] virtio-net: Update the mtu code to match virtio spec Aaron Conole
2016-10-25 16:41 ` Michael S. Tsirkin
2016-10-25 17:09 ` Jarod Wilson
@ 2016-10-25 20:06 ` Aaron Conole
2016-10-25 20:14 ` Aaron Conole
2 siblings, 1 reply; 5+ messages in thread
From: Aaron Conole @ 2016-10-25 20:06 UTC (permalink / raw)
To: netdev; +Cc: virtualization, linux-kernel, Michael S. Tsirkin, Jarod Wilson
> From: Aaron Conole <aconole@bytheb.org>
>
> The virtio committee recently ratified a change, VIRTIO-152, which
> defines the mtu field to be 'max' MTU, not simply desired MTU.
>
> This commit brings the virtio-net device in compliance with VIRTIO-152.
>
> Additionally, drop the max_mtu branch - it cannot be taken since the u16
> returned by virtio_cread16 will never exceed the initial value of
> max_mtu.
>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Jarod Wilson <jarod@redhat.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---
Sorry about the subject line, David. This is targetted at net-next, and
it appears my from was mangled. Would you like me to resubmit with
these details corrected?
-Aaron
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] virtio-net: Update the mtu code to match virtio spec
2016-10-25 20:06 ` Aaron Conole
@ 2016-10-25 20:14 ` Aaron Conole
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Conole @ 2016-10-25 20:14 UTC (permalink / raw)
To: netdev; +Cc: virtualization, linux-kernel, Michael S. Tsirkin, Jarod Wilson
Aaron Conole <aconole@redhat.com> writes:
>> From: Aaron Conole <aconole@bytheb.org>
>>
>> The virtio committee recently ratified a change, VIRTIO-152, which
>> defines the mtu field to be 'max' MTU, not simply desired MTU.
>>
>> This commit brings the virtio-net device in compliance with VIRTIO-152.
>>
>> Additionally, drop the max_mtu branch - it cannot be taken since the u16
>> returned by virtio_cread16 will never exceed the initial value of
>> max_mtu.
>>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Jarod Wilson <jarod@redhat.com>
>> Signed-off-by: Aaron Conole <aconole@redhat.com>
>> ---
>
> Sorry about the subject line, David. This is targetted at net-next, and
> it appears my from was mangled. Would you like me to resubmit with
> these details corrected?
I answered my own question. Sorry for the noise.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-25 20:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-25 16:35 [PATCH] virtio-net: Update the mtu code to match virtio spec Aaron Conole
2016-10-25 16:41 ` Michael S. Tsirkin
2016-10-25 17:09 ` Jarod Wilson
2016-10-25 20:06 ` Aaron Conole
2016-10-25 20:14 ` Aaron Conole
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).