virtio: fix return type of get_driver_features()

The virtio spec defines the features field to be 64 bits. The lower parts of the virtio drivers (virtio::virtio_driver) treated it as such, but the interface for each specific driver to override the feature bits (virtio::virtio_driver::get_driver_features()) limited that to 32 bits only. This patch rectifies it, changing the function's signature and all overrides in the various drivers. Signed-off-by: Fotis Xenakis <[email protected]> Message-Id: <AM0PR03MB62923C5820454DC1B9887D9AA6EF0@AM0PR03MB6292.eurprd03.prod.outlook.com>
cloudius-systems · Nov 8, 2020 · 571e8f2 · 571e8f2
1 parent ec8d020
commit 571e8f2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/drivers/virtio-blk.cc b/drivers/virtio-blk.cc
@@ -333,7 +333,7 @@ int blk::make_request(struct bio* bio)
     }
 }
 
-u32 blk::get_driver_features()
+u64 blk::get_driver_features()
 {
     auto base = virtio_driver::get_driver_features();
     return (base | ( 1 << VIRTIO_BLK_F_SIZE_MAX)

diff --git a/drivers/virtio-blk.hh b/drivers/virtio-blk.hh
@@ -125,7 +125,7 @@ public:
     virtual std::string get_name() const { return _driver_name; }
     void read_config();
 
-    virtual u32 get_driver_features();
+    virtual u64 get_driver_features();
 
     int make_request(struct bio*);
 

diff --git a/drivers/virtio-net.cc b/drivers/virtio-net.cc
@@ -900,9 +900,9 @@ void net::txq::gc()
     vqueue->get_buf_gc();
 }
 
-u32 net::get_driver_features()
+u64 net::get_driver_features()
 {
-    u32 base = virtio_driver::get_driver_features();
+    auto base = virtio_driver::get_driver_features();
     return (base | (1 << VIRTIO_NET_F_MAC)        \
                  | (1 << VIRTIO_NET_F_MRG_RXBUF)  \
                  | (1 << VIRTIO_NET_F_STATUS)     \

diff --git a/drivers/virtio-net.hh b/drivers/virtio-net.hh
@@ -216,7 +216,7 @@ public:
     virtual std::string get_name() const { return _driver_name; }
     void read_config();
 
-    virtual u32 get_driver_features();
+    virtual u64 get_driver_features();
 
     void wait_for_queue(vring* queue);
     bool bad_rx_csum(struct mbuf* m, struct net_hdr* hdr);

diff --git a/drivers/virtio-scsi.cc b/drivers/virtio-scsi.cc
@@ -246,7 +246,7 @@ int scsi::make_request(struct bio* bio)
     }
 }
 
-u32 scsi::get_driver_features()
+u64 scsi::get_driver_features()
 {
     auto base = virtio_driver::get_driver_features();
     return base | ( 1 << VIRTIO_SCSI_F_INOUT);

diff --git a/drivers/virtio-scsi.hh b/drivers/virtio-scsi.hh
@@ -149,7 +149,7 @@ public:
     virtual std::string get_name() const { return _driver_name; }
     void read_config();
 
-    virtual u32 get_driver_features();
+    virtual u64 get_driver_features();
 
     static struct scsi_priv *get_priv(struct bio *bio) {
         return reinterpret_cast<struct scsi_priv*>(bio->bio_dev->private_data);

diff --git a/drivers/virtio.hh b/drivers/virtio.hh
@@ -105,7 +105,7 @@ public:
 
 protected:
     // Actual drivers should implement this on top of the basic ring features
-    virtual u32 get_driver_features() { return 1 << VIRTIO_RING_F_INDIRECT_DESC | 1 << VIRTIO_RING_F_EVENT_IDX; }
+    virtual u64 get_driver_features() { return 1 << VIRTIO_RING_F_INDIRECT_DESC | 1 << VIRTIO_RING_F_EVENT_IDX; }
     void setup_features();
 protected:
     virtio_device& _dev;