[PATCH v2] virtio_rpmsg: Fix config space alignment

From: Francesco Valla

Date: Fri Nov 20 2026 - 18:01:33 EST


The comment for virtio_rpmsg_config says that this structure is
naturally aligned to 32 bits, and this is desirable by some
architectures that don't get along with unaligned accesses.
The content of the structure itself however isn't aligned, and the
__packed attribute prevent the compiler to add this alignment.

Fix this by extending the version field to 16 bits.

Fixes: ca96ea25e51a ("rpmsg: virtio_rpmsg_bus: Get buffer size from config space")
Signed-off-by: Francesco Valla <francesco@xxxxxxxx>
---
Changes in v2:
- version field extended to 16 bits instead of adding a reserved byte.
- Rebased on current master.
- Link to v1: https://patch.msgid.link/20261101-rpmsg-config-size-v1-1-65686b445b22@xxxxxxxx
---
drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
include/linux/rpmsg/virtio_rpmsg.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index 23ff6c8b7a20..27282475a732 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -815,7 +815,7 @@ static void rpmsg_virtio_del_ctrl_dev(struct rpmsg_device *rpdev_ctrl)
static int rpmsg_virtio_get_buf_size(struct virtproc_info *vrp)
{
struct virtio_device *vdev;
- u8 version;
+ u16 version;
u16 size;

vdev = vrp->vdev;
diff --git a/include/linux/rpmsg/virtio_rpmsg.h b/include/linux/rpmsg/virtio_rpmsg.h
index 0872cbca4593..57f48d537de9 100644
--- a/include/linux/rpmsg/virtio_rpmsg.h
+++ b/include/linux/rpmsg/virtio_rpmsg.h
@@ -31,7 +31,7 @@
* the structure is naturally 32-bit aligned.
*/
struct virtio_rpmsg_config {
- u8 version;
+ __virtio16 version;
__virtio16 size;
/* The tx/rx individual buffer size (if VIRTIO_RPMSG_F_BUFSZ) */
__virtio32 txbuf_size;

---
base-commit: 5f22fb20497f4983094131f00a734362300d22d2
change-id: 20261101-rpmsg-config-size-0dbe9ea63c6d

Best regards,
--
Francesco Valla <francesco@xxxxxxxx>