* [PATCH] vhost: drop hard-coded num_buffers size
@ 2015-02-24 16:31 Michael S. Tsirkin
2015-02-25 21:56 ` David Miller
2015-02-27 20:58 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-02-24 16:31 UTC (permalink / raw)
To: linux-kernel; +Cc: kvm, virtualization, netdev
The 2 that we use for copy_to_iter comes from sizeof(u16),
it used to be that way before the iov iter update.
Fix it up, making it obvious the size of stack access
is right.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vhost/net.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index ca70434..2bbfc25 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -621,7 +621,8 @@ static void handle_rx(struct vhost_net *net)
num_buffers = cpu_to_vhost16(vq, headcount);
if (likely(mergeable) &&
- copy_to_iter(&num_buffers, 2, &fixup) != 2) {
+ copy_to_iter(&num_buffers, sizeof num_buffers,
+ &fixup) != sizeof num_buffers) {
vq_err(vq, "Failed num_buffers write");
vhost_discard_vq_desc(vq, headcount);
break;
--
MST
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] vhost: drop hard-coded num_buffers size
2015-02-24 16:31 [PATCH] vhost: drop hard-coded num_buffers size Michael S. Tsirkin
@ 2015-02-25 21:56 ` David Miller
2015-02-26 8:21 ` Michael S. Tsirkin
2015-02-27 20:58 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2015-02-25 21:56 UTC (permalink / raw)
To: mst; +Cc: linux-kernel, kvm, virtualization, netdev
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Tue, 24 Feb 2015 17:31:10 +0100
> The 2 that we use for copy_to_iter comes from sizeof(u16),
> it used to be that way before the iov iter update.
> Fix it up, making it obvious the size of stack access
> is right.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Michael, what tree do you want these two patches to go through?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] vhost: drop hard-coded num_buffers size
2015-02-25 21:56 ` David Miller
@ 2015-02-26 8:21 ` Michael S. Tsirkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-02-26 8:21 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, kvm, virtualization, netdev
On Wed, Feb 25, 2015 at 04:56:52PM -0500, David Miller wrote:
> From: "Michael S. Tsirkin" <mst@redhat.com>
> Date: Tue, 24 Feb 2015 17:31:10 +0100
>
> > The 2 that we use for copy_to_iter comes from sizeof(u16),
> > it used to be that way before the iov iter update.
> > Fix it up, making it obvious the size of stack access
> > is right.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> Michael, what tree do you want these two patches to go through?
Sorry about being unclear.
They are net specific so I'd like them merged for 4.0 through net tree.
If that's a problem, pls let me know.
Thanks,
--
MST
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] vhost: drop hard-coded num_buffers size
2015-02-24 16:31 [PATCH] vhost: drop hard-coded num_buffers size Michael S. Tsirkin
2015-02-25 21:56 ` David Miller
@ 2015-02-27 20:58 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2015-02-27 20:58 UTC (permalink / raw)
To: mst; +Cc: linux-kernel, kvm, virtualization, netdev
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Tue, 24 Feb 2015 17:31:10 +0100
> The 2 that we use for copy_to_iter comes from sizeof(u16),
> it used to be that way before the iov iter update.
> Fix it up, making it obvious the size of stack access
> is right.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] vhost: drop hard-coded num_buffers size
@ 2015-02-25 14:20 Michael S. Tsirkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-02-25 14:20 UTC (permalink / raw)
To: linux-kernel; +Cc: kvm, virtualization, netdev
The 2 that we use for copy_to_iter comes from sizeof(u16),
it used to be that way before the iov iter update.
Fix it up, making it obvious the size of stack access
is right.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vhost/net.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index ca70434..2bbfc25 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -621,7 +621,8 @@ static void handle_rx(struct vhost_net *net)
num_buffers = cpu_to_vhost16(vq, headcount);
if (likely(mergeable) &&
- copy_to_iter(&num_buffers, 2, &fixup) != 2) {
+ copy_to_iter(&num_buffers, sizeof num_buffers,
+ &fixup) != sizeof num_buffers) {
vq_err(vq, "Failed num_buffers write");
vhost_discard_vq_desc(vq, headcount);
break;
--
MST
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-27 20:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-24 16:31 [PATCH] vhost: drop hard-coded num_buffers size Michael S. Tsirkin
2015-02-25 21:56 ` David Miller
2015-02-26 8:21 ` Michael S. Tsirkin
2015-02-27 20:58 ` David Miller
2015-02-25 14:20 Michael S. Tsirkin
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).