Skip to contentSkip to conversation

virtio_blk: mark all zone fields LE

PATCH In review Michael S. Tsirkin 3 participants 3 messages Dec 22, 2022 – Dec 23, 2022

Subsystems (2)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

PATCH 1/1 virtio_blk: mark all zone fields LE

zone is a virtio 1.x feature so all fields are LE,
they are handled as such, but have mistakenly been labeled __virtioXX in the header. This results in a bunch of sparse warnings.

Use the __leXX tags to make sparse happy.

---
 include/uapi/linux/virtio_blk.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
include/uapi/linux/virtio_blk.h +9 -9
index f4d5ee7c6f30..ec3c3779406f 100644
@@ -141,11 +141,11 @@ struct virtio_blk_config {
 
 	/* Zoned block device characteristics (if VIRTIO_BLK_F_ZONED) */
 	struct virtio_blk_zoned_characteristics {
-		__virtio32 zone_sectors;
-		__virtio32 max_open_zones;
-		__virtio32 max_active_zones;
-		__virtio32 max_append_sectors;
-		__virtio32 write_granularity;
+		__le32 zone_sectors;
+		__le32 max_open_zones;
+		__le32 max_active_zones;
+		__le32 max_append_sectors;
+		__le32 write_granularity;
 		__u8 model;
 		__u8 unused2[3];
 	} zoned;
@@ -245,11 +245,11 @@ struct virtio_blk_outhdr {
  */
 struct virtio_blk_zone_descriptor {
 	/* Zone capacity */
-	__virtio64 z_cap;
+	__le64 z_cap;
 	/* The starting sector of the zone */
-	__virtio64 z_start;
+	__le64 z_start;
 	/* Zone write pointer position in sectors */
-	__virtio64 z_wp;
+	__le64 z_wp;
 	/* Zone type */
 	__u8 z_type;
 	/* Zone state */
@@ -258,7 +258,7 @@ struct virtio_blk_zone_descriptor {
 };
 
 struct virtio_blk_zone_report {
-	__virtio64 nr_zones;
+	__le64 nr_zones;
 	__u8 reserved[56];
 	struct virtio_blk_zone_descriptor zones[];
 };
Signature · 6 lines
MST

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Michael S. Tsirkin

zone is a virtio 1.x feature so all fields are LE,
they are handled as such, but have mistakenly been labeled __virtioXX in the header. This results in a bunch of sparse warnings.

Use the __leXX tags to make sparse happy.

---

Every field from spec should reflect endianness from spec...

-ck

Acked-by on v1 1/1
#2 lore raw
In reply to Michael S. Tsirkin
Quoted 8 lines · Michael S. Tsirkin

zone is a virtio 1.x feature so all fields are LE,
they are handled as such, but have mistakenly been labeled __virtioXX in the header. This results in a bunch of sparse warnings.

Use the __leXX tags to make sparse happy.

Thanks

Quoted 50 lines
---
 include/uapi/linux/virtio_blk.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
include/uapi/linux/virtio_blk.h +9 -10
index f4d5ee7c6f30..ec3c3779406f 100644
@@ -141,11 +141,11 @@ struct virtio_blk_config {
 
        /* Zoned block device characteristics (if VIRTIO_BLK_F_ZONED) */
        struct virtio_blk_zoned_characteristics {
-               __virtio32 zone_sectors;
-               __virtio32 max_open_zones;
-               __virtio32 max_active_zones;
-               __virtio32 max_append_sectors;
-               __virtio32 write_granularity;
+               __le32 zone_sectors;
+               __le32 max_open_zones;
+               __le32 max_active_zones;
+               __le32 max_append_sectors;
+               __le32 write_granularity;
                __u8 model;
                __u8 unused2[3];
        } zoned;
@@ -245,11 +245,11 @@ struct virtio_blk_outhdr {
  */
 struct virtio_blk_zone_descriptor {
        /* Zone capacity */
-       __virtio64 z_cap;
+       __le64 z_cap;
        /* The starting sector of the zone */
-       __virtio64 z_start;
+       __le64 z_start;
        /* Zone write pointer position in sectors */
-       __virtio64 z_wp;
+       __le64 z_wp;
        /* Zone type */
        __u8 z_type;
        /* Zone state */
@@ -258,7 +258,7 @@ struct virtio_blk_zone_descriptor {
 };
 
 struct virtio_blk_zone_report {
-       __virtio64 nr_zones;
+       __le64 nr_zones;
        __u8 reserved[56];
        struct virtio_blk_zone_descriptor zones[];
 };
--
Quoted 2 lines

MST

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization