rpmsg: virtio: add endianness conversions
PATCH 1/1 rpmsg: virtio: add endianness conversions
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that.
--- drivers/rpmsg/virtio_rpmsg_bus.c | 61 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 28 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +33 -28
@@ -11,6 +11,8 @@#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h>
@@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h> #include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h>
@@ -84,11 +87,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__le32 src; +__le32 dst; +__le32 reserved; +__le16 len; +__le16 flags;u8 data[]; } __packed;
@@ -106,8 +109,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__le32 addr; +__le32 flags; } __packed;/**
@@ -335,8 +338,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -359,8 +362,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -612,15 +615,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_le16 (len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_le32 (src); + msg->dst =cpu_to_le32 (dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);
@@ -704,13 +707,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =le16_to_cpu (msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +le32_to_cpu (msg->src),le32_to_cpu (msg->dst), msg_len, +le16_to_cpu (msg->flags),le32_to_cpu (msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /*
@@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,le32_to_cpu (msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)
@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +le32_to_cpu (msg->src));mutex_unlock (&ept->cb_lock);
@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =le32_to_cpu (msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ?"destroy" :"creat" , + msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);
Signature · 1 line
1.9.3
Quoted 39 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that.
Suggested-by Michael S. Tsirkin <[email protected]>Signed-off-by Guennadi Liakhovetski <[email protected]>--- drivers/rpmsg/virtio_rpmsg_bus.c | 61 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +3
-3@@ -11,6 +11,8 @@#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h> @@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h> #include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> @@ -84,11 +87,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved;
drivers/rpmsg/virtio_rpmsg_bus.c struct virtproc_info { · line 97
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c +5
-2-u16 len; -u16 flags; +__le32 src; +__le32 dst; +__le32 reserved; +__le16 len; +__le16 flags;u8 data[]; } __packed;
I really has __virtio32/virtio16 types in mind. This way existing BE setups (if any!) can keep working.
However if RPMSG maintainers want this, that's also fine by me ...
Quoted 125 lines
drivers/rpmsg/virtio_rpmsg_bus.c +25
-23@@ -106,8 +109,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__le32 addr; +__le32 flags; } __packed;/** @@ -335,8 +338,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +362,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,15 +615,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_le16 (len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_le32 (src); + msg->dst =cpu_to_le32 (dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);@@ -704,13 +707,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =le16_to_cpu (msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +le32_to_cpu (msg->src),le32_to_cpu (msg->dst), msg_len, +le16_to_cpu (msg->flags),le32_to_cpu (msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,le32_to_cpu (msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +le32_to_cpu (msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =le32_to_cpu (msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ?"destroy" :"creat" , + msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
1.9.3
Mathieu Poirier
maintainerQuoted 60 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that.
Suggested-by Michael S. Tsirkin <[email protected]>Signed-off-by Guennadi Liakhovetski <[email protected]>--- drivers/rpmsg/virtio_rpmsg_bus.c | 61 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +10
-7@@ -11,6 +11,8 @@#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h> @@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h> #include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> @@ -84,11 +87,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__le32 src; +__le32 dst; +__le32 reserved; +__le16 len; +__le16 flags;u8 data[]; } __packed;@@ -106,8 +109,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__le32 addr; +__le32 flags; } __packed;/**
drivers/rpmsg/virtio_rpmsg_bus.c static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev) · line 342
Quoted 7 lines
drivers/rpmsg/virtio_rpmsg_bus.c +2
-2@@ -335,8 +338,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_CREATE );
So how will this work with existing firmware?
Quoted 35 lines
drivers/rpmsg/virtio_rpmsg_bus.c +6
-6err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +362,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,15 +615,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_le16 (len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_le32 (src); + msg->dst =cpu_to_le32 (dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, · line 710
Quoted 4 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1
-0@@ -704,13 +707,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =le16_to_cpu (msg->len);
And here too, along with everything else that follows?
As Michael suggested using __virtioXY types would allow to use the virtioXY_to_cpu() and cpu_to_virtioXY() macros, which is definitely a step in the right direction.
Thanks,
Mathieu
Quoted 68 lines
drivers/rpmsg/virtio_rpmsg_bus.c +14
-13int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +le32_to_cpu (msg->src),le32_to_cpu (msg->dst), msg_len, +le16_to_cpu (msg->flags),le32_to_cpu (msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,le32_to_cpu (msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +le32_to_cpu (msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =le32_to_cpu (msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ?"destroy" :"creat" , + msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
1.9.3
Hi Mathieu,
Thanks for your review.
Quoted 63 lines · Mathieu Poirier
Quoted 62 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that.
Suggested-by Michael S. Tsirkin <[email protected]>Signed-off-by Guennadi Liakhovetski <[email protected]>--- drivers/rpmsg/virtio_rpmsg_bus.c | 61 ++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +10
-7@@ -11,6 +11,8 @@#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h> @@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h> #include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> @@ -84,11 +87,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__le32 src; +__le32 dst; +__le32 reserved; +__le16 len; +__le16 flags;u8 data[]; } __packed;@@ -106,8 +109,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__le32 addr; +__le32 flags; } __packed;/** @@ -335,8 +338,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;
Quoted 7 lines
drivers/rpmsg/virtio_rpmsg_bus.c static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev) · line 342
Quoted 5 lines
drivers/rpmsg/virtio_rpmsg_bus.c +2
-2strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_CREATE );So how will this work with existing firmware?
Is this currently running on any BE machines?
Quoted 41 lines
Quoted 34 lines
drivers/rpmsg/virtio_rpmsg_bus.c +6
-6err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +362,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_le32 (rpdev->ept->addr); + nsm.flags =cpu_to_le32 (RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,15 +615,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_le16 (len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_le32 (src); + msg->dst =cpu_to_le32 (dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, · line 710
Quoted 4 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1
-0@@ -704,13 +707,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =le16_to_cpu (msg->len);And here too, along with everything else that follows?
Quoted 3 lines
As Michael suggested using
__virtioXYtypes would allow to use thevirtioXY_to_cpu()andcpu_to_virtioXY()macros, which is definitely a step in the right direction.
Ok, sure, I'll redo this, I just wanted to see if there would be any more comments before submitting a new version.
Thanks
Guennadi
Quoted 72 lines
Thanks,
MathieuQuoted 68 lines
drivers/rpmsg/virtio_rpmsg_bus.c +14
-13int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +le32_to_cpu (msg->src),le32_to_cpu (msg->dst), msg_len, +le16_to_cpu (msg->flags),le32_to_cpu (msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,le32_to_cpu (msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +le32_to_cpu (msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =le32_to_cpu (msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ?"destroy" :"creat" , + msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (le32_to_cpu (msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
1.9.3
PATCH v2 1/1 rpmsg: virtio: add endianness conversions
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
---
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 ++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 28 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +35 -28
@@ -11,6 +11,8 @@#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h>
@@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h> #include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h>
@@ -84,11 +87,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;
@@ -106,8 +109,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/**
@@ -335,8 +338,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -359,8 +362,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -612,15 +615,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);
@@ -704,13 +707,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /*
@@ -718,15 +725,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)
@@ -739,8 +746,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);
@@ -846,15 +853,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);
Signature · 1 line
1.9.3
Quoted 19 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>---
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 ++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +0
-0
drivers/rpmsg/virtio_rpmsg_bus.c line 15
Quoted 5 lines
drivers/rpmsg/virtio_rpmsg_bus.c +2
-0@@ -11,6 +11,8 @@#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +
Not sure about this header - what does it provide?
drivers/rpmsg/virtio_rpmsg_bus.c line 27
Quoted 8 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1
-0#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h> @@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h>
This too... It should be fine with linux/virtio_config.h below since it already includes linux/virtio_byteorder.h
Moreover, please send another revision that applies on rproc-next. The third hunk in this patch doesn't apply.
With the above:
Quoted 148 lines
drivers/rpmsg/virtio_rpmsg_bus.c +32
-28#include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> @@ -84,11 +87,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +109,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +338,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +362,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,15 +615,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);@@ -704,13 +707,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +725,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +746,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +853,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
1.9.3
Quoted 28 lines · Mathieu Poirier
Quoted 19 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>---
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 ++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +0
-0drivers/rpmsg/virtio_rpmsg_bus.c line 15
Quoted 5 lines
drivers/rpmsg/virtio_rpmsg_bus.c +2
-0@@ -11,6 +11,8 @@#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +Not sure about this header - what does it provide?
Quoted 11 lines
drivers/rpmsg/virtio_rpmsg_bus.c line 27
Quoted 8 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1
-0#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h> @@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h> This too... It should be fine with
linux/virtio_config.hbelow since it already includeslinux/virtio_byteorder.h
It's probably best to include linux/virtio_byteorder.h explicitly.
Quoted 134 lines
Moreover, please send another revision that applies on rproc-next. The third hunk in this patch doesn't apply.
With the above:
Reviewed-by Mathieu Poirier <[email protected]>Quoted 127 lines
drivers/rpmsg/virtio_rpmsg_bus.c +26
-22#include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> @@ -84,11 +87,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +109,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +338,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +362,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,15 +615,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);@@ -704,13 +707,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +725,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +746,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +853,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ;
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, · line 860
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c +3
-5-dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + + dev_info(dev, "%sing channel %s addr 0x%x\n",
Let's not try tricks. Just %s and destroying/creating below. Wastes 3 bytes of kernel space but is clearer.
Quoted 11 lines
Quoted 11 lines
drivers/rpmsg/virtio_rpmsg_bus.c +3
-1+virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? + "destroy" : "creat", msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
1.9.3
Quoted 22 lines · Michael S. Tsirkin
Quoted 21 lines · Mathieu Poirier
Quoted 20 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>---
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 ++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +0
-0@@ -11,6 +11,8 @@
Quoted 6 lines
Quoted 6 lines
drivers/rpmsg/virtio_rpmsg_bus.c line 15
Quoted 4 lines
drivers/rpmsg/virtio_rpmsg_bus.c +2
-0#define pr_fmt (fmt) "%s: " fmt, __func__ +#include <asm/byteorder.h> +Not sure about this header - what does it provide?
It was needed for the original cpu_to_le... and friends version of the patch.
Quoted 13 lines
Quoted 12 lines
drivers/rpmsg/virtio_rpmsg_bus.c line 27
Quoted 9 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1
-0#include <linux/dma-mapping.h> #include <linux/idr.h> #include <linux/jiffies.h> @@ -22,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/types.h> This too... It should be fine with
linux/virtio_config.hbelow since it already includeslinux/virtio_byteorder.h
Quoted 1 line
It's probably best to include
linux/virtio_byteorder.hexplicitly.
Yep, will do.
Quoted 10 lines
Quoted 10 lines
Moreover, please send another revision that applies on rproc-next. The third hunk in this patch doesn't apply.
With the above:
Reviewed-by Mathieu Poirier <[email protected]>Quoted 3 lines
drivers/rpmsg/virtio_rpmsg_bus.c +0
-0#include <linux/virtio.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h>
[snip]
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/rpmsg/virtio_rpmsg_bus.c +0
-0@@ -846,15 +853,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ;
Quoted 14 lines
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, · line 860
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c +3
-5-dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + + dev_info(dev, "%sing channel %s addr 0x%x\n",Let's not try tricks. Just %s and destroying/creating below. Wastes 3 bytes of kernel space but is clearer.
Those aren't my tricks - they're already there, but sure, I can replace that while at it.
Thanks
Guennadi
Quoted 13 lines
Quoted 12 lines
Quoted 12 lines
drivers/rpmsg/virtio_rpmsg_bus.c +3
-1+virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? + "destroy" : "creat", msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
1.9.3
Quoted 21 lines · Guennadi Liakhovetski
Quoted 20 lines · Michael S. Tsirkin
Quoted 19 lines · Mathieu Poirier
Quoted 18 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>---
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 ++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +0
-0
[snip]
Quoted 19 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/rpmsg/virtio_rpmsg_bus.c +0
-0@@ -846,15 +853,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ;Quoted 14 lines
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, · line 860
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c +3
-5-dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + + dev_info(dev, "%sing channel %s addr 0x%x\n",Let's not try tricks. Just %s and destroying/creating below. Wastes 3 bytes of kernel space but is clearer.
Quoted 1 line
Those aren't my tricks - they're already there, but sure, I can replace that while at it.
On a second thought, that would be an unrelated change, so, I should probably keep it as is.
Thanks
Guennadi
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c +3
-1+virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? + "destroy" : "creat", msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
1.9.3
PATCH v3 1/1 rpmsg: virtio: add endianness conversions
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
---
v3: use the virtio_byteorder.h header
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 61 +++++++++++++++++--------------- 1 file changed, 33 insertions(+), 28 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +33 -28
@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h>
@@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;
@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/**
@@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -612,15 +613,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);
@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /*
@@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)
@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);
@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);
Signature · 1 line
2.27.0
Hi,
Quoted 8 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>---
As requested by Mathieu, I performed few tests on the stm32mp1 platform (little Endian), LGTM No platform in ST to test the BE configuration.
I have just have a comment below then
Quoted 81 lines
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 61 +++++++++++++++++--------------- 1 file changed, 33 insertions(+), 28 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +14
-14@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,15 +613,15 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src);
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, · line 627
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c +2
-1+ msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , msg,sizeof (*msg) + msg->len, true);
msg->len format is __virtio16, should be be replaced by len which respects CPU endianness.
Regards,
Arnaud
Quoted 73 lines
drivers/rpmsg/virtio_rpmsg_bus.c +17
-13@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);
PATCH v4 1/1 rpmsg: virtio: add endianness conversions
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
---
Mathieu, I had to remove your "Reviewed-by" because this is a modified version...
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
v3: use the virtio_byteorder.h header
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +34 -29
@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h>
@@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;
@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/**
@@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);
@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /*
@@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)
@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);
@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);
Signature · 1 line
2.27.0
Quoted 6 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Quoted 7 lines
Signed-off-by Guennadi Liakhovetski <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>---
Mathieu, I had to remove your "Reviewed-by" because this is a modified version...
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
It is indeed a good catch
Quoted 170 lines
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +34
-30@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret); --2.27.0
Bjorn, Ohad, is this one good to go? Can we proceed with the next step:
https://marc.info/?l=kvm&m=159060274705978&w=2
Thanks
Guennadi
Quoted 190 lines · Mathieu Poirier
Quoted 6 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Quoted 7 lines
Signed-off-by Guennadi Liakhovetski <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>---
Mathieu, I had to remove your "Reviewed-by" because this is a modified version...
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
It is indeed a good catch
Reviewed-by Mathieu Poirier <[email protected]>Quoted 170 lines
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +34
-30@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret); --2.27.0
PATCH RESEND v4 1/1 rpmsg: virtio: add endianness conversions
In reply to Mathieu PoirierAccording to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
---
Ping: 2 weeks since the original submission. Also added back the updated "reviewed-by" tag.
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
v3: use the virtio_byteorder.h header
v2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +34 -29
@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h>
@@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;
@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/**
@@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)
@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);
@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /*
@@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)
@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);
@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);
Signature · 1 line
2.27.0
Quoted 8 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>
Looks good to me
Who's merging this? If me, could I get acks from maintainers on this please?
Quoted 176 lines
---
Ping: 2 weeks since the original submission. Also added back the updated "reviewed-by" tag.
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +34
-29@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
2.27.0
Quoted 5 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Quoted 8 lines
Signed-off-by Guennadi Liakhovetski <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>---
Ping: 2 weeks since the original submission. Also added back the updated "reviewed-by" tag.
Sorry about that, I missed the reviewed version in my inbox. Applied to the rpmsg-next tree for v5.9, with Michael's ack.
Regards,
Bjorn
Quoted 172 lines
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +34
-29@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Signature · 1 line
2.27.0
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).
Hello:
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).
Quoted 10 lines · On Tue, 21 Jul 2020 10:56:38 +0200 you wrote:
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>[...]
Here is a summary with links:
- [RESEND,v4] rpmsg: virtio: add endianness conversions
https://git.kernel.org/andersson/remoteproc/c/111d1089700cdb752681ef44f54ab6137736f5c2
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot
Quoted 173 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>---
Ping: 2 weeks since the original submission. Also added back the updated "reviewed-by" tag.
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +29
-28@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr);
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, · line 865
Quoted 10 lines
drivers/rpmsg/virtio_rpmsg_bus.c +5
-1+ +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst); -if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);
Question: are all these calls taking place *after* feature negotiation happened? Because virtio32_to_cpu will not DTRT before ...
Quoted 2 lines
Signature · 1 line
2.27.0
Mathieu Poirier
maintainerQuoted 180 lines · Michael S. Tsirkin
Quoted 178 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>---
Ping: 2 weeks since the original submission. Also added back the updated "reviewed-by" tag.
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +33
-28@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst);
Quoted 9 lines
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, · line 865
Quoted 5 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1
-1-if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Question: are all these calls taking place *after* feature negotiation happened? Because
virtio32_to_cpuwill not DTRT before ...
After
Quoted 4 lines
Quoted 3 lines
--
2.27.0
Michael S. Tsirkin
Acked-byQuoted 11 lines · Mathieu Poirier
Quoted 10 lines · Michael S. Tsirkin
Quoted 8 lines · Guennadi Liakhovetski
According to the VirtIO 1.0 spec data, sent over virtual queues must be in little-endian format. Update the RPMsg VirtIO implementation to enforce that but let legacy configurations continue use native endianness.
Signed-off-by Guennadi Liakhovetski <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Tested-by Arnaud Pouliquen <[email protected]>
Pls feel free to merge.
Quoted 185 lines
Quoted 169 lines
Quoted 169 lines
---
Ping: 2 weeks since the original submission. Also added back the updated "reviewed-by" tag.
v4: fix a left-over use of an LE value in calculation - thanks to Arnaud for catching!
v3: use the
virtio_byteorder.hheaderv2: Following suggestions from Michael and Mathieu switch to using virtio16/32 types and conversion functions.
drivers/rpmsg/virtio_rpmsg_bus.c | 63 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-)drivers/rpmsg/virtio_rpmsg_bus.c +33
-28@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/virtio.h> +#include <linux/virtio_byteorder.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> #include <linux/wait.h> @@ -84,11 +85,11 @@ struct virtproc_info {* Every message sent(/received) on the rpmsg bus begins with this header. */ struct rpmsg_hdr { -u32 src; -u32 dst; -u32 reserved; -u16 len; -u16 flags; +__virtio32 src; +__virtio32 dst; +__virtio32 reserved; +__virtio16 len; +__virtio16 flags;u8 data[]; } __packed;@@ -106,8 +107,8 @@ struct rpmsg_hdr {*/ struct rpmsg_ns_msg {char name[RPMSG_NAME_SIZE ]; -u32 addr; -u32 flags; +__virtio32 addr; +__virtio32 flags; } __packed;/** @@ -335,8 +336,8 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_CREATE ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_CREATE ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -359,8 +360,8 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)struct rpmsg_ns_msg nsm;strncpy (nsm.name, rpdev->id.name,RPMSG_NAME_SIZE ); - nsm.addr = rpdev->ept->addr; - nsm.flags =RPMSG_NS_DESTROY ; + nsm.addr =cpu_to_virtio32 (vrp->vdev, rpdev->ept->addr); + nsm.flags =cpu_to_virtio32 (vrp->vdev,RPMSG_NS_DESTROY ); err =rpmsg_sendto (rpdev->ept, &nsm,sizeof (nsm),RPMSG_NS_ADDR );if (err)@@ -612,18 +613,18 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_device *rpdev, } } - msg->len = len; + msg->len =cpu_to_virtio16 (vrp->vdev, len); msg->flags =0 ; - msg->src = src; - msg->dst = dst; + msg->src =cpu_to_virtio32 (vrp->vdev, src); + msg->dst =cpu_to_virtio32 (vrp->vdev, dst); msg->reserved =0 ;memcpy (msg->data, data, len);dev_dbg (dev,"TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); + src, dst, len, msg->flags, msg->reserved);#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio TX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + len, true);#endif rpmsg_sg_init (&sg, msg,sizeof (*msg) + len);@@ -704,13 +705,17 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev, {struct rpmsg_endpoint *ept;struct scatterlist sg; +unsigned int msg_len =virtio16_to_cpu (vrp->vdev, msg->len);int err;dev_dbg (dev,"From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n" , - msg->src, msg->dst, msg->len, msg->flags, msg->reserved); +virtio32_to_cpu (vrp->vdev, msg->src), +virtio32_to_cpu (vrp->vdev, msg->dst), msg_len, +virtio16_to_cpu (vrp->vdev, msg->flags), +virtio32_to_cpu (vrp->vdev, msg->reserved));#if defined(CONFIG_DYNAMIC_DEBUG )dynamic_hex_dump ("rpmsg_virtio RX: " ,DUMP_PREFIX_NONE ,16 ,1 , - msg,sizeof (*msg) + msg->len, true); + msg,sizeof (*msg) + msg_len, true);#endif /* @@ -718,15 +723,15 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,* the reported payload length. */ if (len > vrp->buf_size || - msg->len > (len -sizeof (struct rpmsg_hdr ))) { -dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg->len); + msg_len > (len -sizeof (struct rpmsg_hdr ))) { +dev_warn (dev,"inbound msg too big: (%d, %d)\n" , len, msg_len);return -EINVAL ; }/* use the dst addr to fetch the callback of the appropriate user */ mutex_lock (&vrp->endpoints_lock); - ept =idr_find (&vrp->endpoints, msg->dst); + ept =idr_find (&vrp->endpoints,virtio32_to_cpu (vrp->vdev, msg->dst));/* let's make sure no one deallocates ept while we use it */ if (ept)@@ -739,8 +744,8 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,mutex_lock (&ept->cb_lock);if (ept->cb) - ept->cb (ept->rpdev, msg->data, msg->len, ept->priv, - msg->src); + ept->cb (ept->rpdev, msg->data, msg_len, ept->priv, +virtio32_to_cpu (vrp->vdev, msg->src));mutex_unlock (&ept->cb_lock);@@ -846,15 +851,15 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,/* don't trust the remote processor for null terminating the name */ msg->name[RPMSG_NAME_SIZE -1 ] ='\0' ; -dev_info (dev,"%sing channel %s addr 0x%x\n" , - msg->flags &RPMSG_NS_DESTROY ?"destroy" :"creat" , - msg->name, msg->addr); -strncpy (chinfo.name, msg->name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; - chinfo.dst = msg->addr; + chinfo.dst =virtio32_to_cpu (vrp->vdev, msg->addr); + +dev_info (dev,"%sing channel %s addr 0x%x\n" , +virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ? +"destroy" :"creat" , msg->name, chinfo.dst);Quoted 9 lines
drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len, · line 865
Quoted 5 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1
-1-if (msg->flags &RPMSG_NS_DESTROY ) { +if (virtio32_to_cpu (vrp->vdev, msg->flags) &RPMSG_NS_DESTROY ) { ret =rpmsg_unregister_device (&vrp->vdev->dev, &chinfo);if (ret)dev_err (dev,"rpmsg_destroy_channel failed: %d\n" , ret);Question: are all these calls taking place *after* feature negotiation happened? Because
virtio32_to_cpuwill not DTRT before ...After
Quoted 4 lines
Quoted 3 lines
--
2.27.0