Skip to content

Commit 92e6e08

Browse files
halil-pasicgregkh
authored andcommitted
virtio: write back F_VERSION_1 before validate
commit 2f9a174 upstream. The virtio specification virtio-v1.1-cs01 states: "Transitional devices MUST detect Legacy drivers by detecting that VIRTIO_F_VERSION_1 has not been acknowledged by the driver." This is exactly what QEMU as of 6.1 has done relying solely on VIRTIO_F_VERSION_1 for detecting that. However, the specification also says: "... the driver MAY read (but MUST NOT write) the device-specific configuration fields to check that it can support the device ..." before setting FEATURES_OK. In that case, any transitional device relying solely on VIRTIO_F_VERSION_1 for detecting legacy drivers will return data in legacy format. In particular, this implies that it is in big endian format for big endian guests. This naturally confuses the driver which expects little endian in the modern mode. It is probably a good idea to amend the spec to clarify that VIRTIO_F_VERSION_1 can only be relied on after the feature negotiation is complete. Before validate callback existed, config space was only read after FEATURES_OK. However, we already have two regressions, so let's address this here as well. The regressions affect the VIRTIO_NET_F_MTU feature of virtio-net and the VIRTIO_BLK_F_BLK_SIZE feature of virtio-blk for BE guests when virtio 1.0 is used on both sides. The latter renders virtio-blk unusable with DASD backing, because things simply don't work with the default. See Fixes tags for relevant commits. For QEMU, we can work around the issue by writing out the feature bits with VIRTIO_F_VERSION_1 bit set. We (ab)use the finalize_features config op for this. This isn't enough to address all vhost devices since these do not get the features until FEATURES_OK, however it looks like the affected devices actually never handled the endianness for legacy mode correctly, so at least that's not a regression. No devices except virtio net and virtio blk seem to be affected. Long term the right thing to do is to fix the hypervisors. Cc: <[email protected]> #v4.11 Signed-off-by: Halil Pasic <[email protected]> Fixes: 82e89ea ("virtio-blk: Add validation for block size in config space") Fixes: fe36cbe ("virtio_net: clear MTU when out of range") Reported-by: [email protected] Reviewed-by: Cornelia Huck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 86e3ad8 commit 92e6e08

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/virtio/virtio.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,17 @@ static int virtio_dev_probe(struct device *_d)
240240
driver_features_legacy = driver_features;
241241
}
242242

243+
/*
244+
* Some devices detect legacy solely via F_VERSION_1. Write
245+
* F_VERSION_1 to force LE config space accesses before FEATURES_OK for
246+
* these when needed.
247+
*/
248+
if (drv->validate && !virtio_legacy_is_little_endian()
249+
&& device_features & BIT_ULL(VIRTIO_F_VERSION_1)) {
250+
dev->features = BIT_ULL(VIRTIO_F_VERSION_1);
251+
dev->config->finalize_features(dev);
252+
}
253+
243254
if (device_features & (1ULL << VIRTIO_F_VERSION_1))
244255
dev->features = driver_features & device_features;
245256
else

0 commit comments

Comments
 (0)