Merge pull request #1240 from hermit-os/notification-data

fix(virtqueue): `next_off` must not be shifted for notification data

src/drivers/net/virtio_net.rs

@@ -716,6 +716,7 @@ impl VirtioNetDriver {
 			| virtio_spec::net::F::INDIRECT_DESC
 			// Packed Vq can be used
 			| virtio_spec::net::F::RING_PACKED
+			| virtio_spec::net::F::NOTIFICATION_DATA
 			// Host should avoid the creation of checksums
 			| virtio_spec::net::F::CSUM
 			// Guest avoids the creation of checksums

src/drivers/virtio/virtqueue/packed.rs

@@ -971,8 +971,7 @@ impl Virtq for PackedVq {
 		if self.dev_event.is_notif() | self.dev_event.is_notif_specfic(next_off, next_wrap) {
 			let index = self.index.0.to_le_bytes();
 			let mut index = index.iter();
-			// Even on 64bit systems this is fine, as we have a queue_size < 2^15!
-			let det_notif_data: u16 = (next_off as u16) >> 1;
+			let det_notif_data: u16 = (next_off as u16) & !(1 << 15);
 			let flags = (det_notif_data | (u16::from(next_wrap) << 15)).to_le_bytes();
 			let mut flags = flags.iter();
 			let mut notif_data: [u8; 4] = [0, 0, 0, 0];
@@ -1014,8 +1013,7 @@ impl Virtq for PackedVq {
 		if self.dev_event.is_notif() {
 			let index = self.index.0.to_le_bytes();
 			let mut index = index.iter();
-			// Even on 64bit systems this is fine, as we have a queue_size < 2^15!
-			let det_notif_data: u16 = (next_off as u16) >> 1;
+			let det_notif_data: u16 = (next_off as u16) & !(1 << 15);
 			let flags = (det_notif_data | (u16::from(next_wrap) << 15)).to_le_bytes();
 			let mut flags = flags.iter();
 			let mut notif_data: [u8; 4] = [0, 0, 0, 0];
@@ -1044,8 +1042,7 @@ impl Virtq for PackedVq {
 		if self.dev_event.is_notif() {
 			let index = self.index.0.to_le_bytes();
 			let mut index = index.iter();
-			// Even on 64bit systems this is fine, as we have a queue_size < 2^15!
-			let det_notif_data: u16 = (next_off as u16) >> 1;
+			let det_notif_data: u16 = (next_off as u16) & !(1 << 15);
 			let flags = (det_notif_data | (u16::from(next_wrap) << 15)).to_le_bytes();
 			let mut flags = flags.iter();
 			let mut notif_data: [u8; 4] = [0, 0, 0, 0];

src/drivers/virtio/virtqueue/split.rs

@@ -380,8 +380,7 @@ impl Virtq for SplitVq {
 		if self.ring.borrow().dev_is_notif() {
 			let index = self.index.0.to_le_bytes();
 			let mut index = index.iter();
-			// Even on 64bit systems this is fine, as we have a queue_size < 2^15!
-			let det_notif_data: u16 = next_off >> 1;
+			let det_notif_data: u16 = next_off & !(1 << 15);
 			let flags = (det_notif_data | (next_wrap << 15)).to_le_bytes();
 			let mut flags = flags.iter();
 			let mut notif_data: [u8; 4] = [0, 0, 0, 0];