| From beb087ac5ecb37cb08a459d13a7250fa18c69a53 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 29 Oct 2020 13:20:49 +0100 |
| Subject: vdpasim: fix MAC address configuration |
| |
| From: Laurent Vivier <lvivier@redhat.com> |
| |
| [ Upstream commit 4a6a42db53aae049a8a64d4b273761bc80c46ebf ] |
| |
| vdpa_sim generates a ramdom MAC address but it is never used by upper |
| layers because the VIRTIO_NET_F_MAC bit is not set in the features list. |
| |
| Because of that, virtio-net always regenerates a random MAC address each |
| time it is loaded whereas the address should only change on vdpa_sim |
| load/unload. |
| |
| Fix that by adding VIRTIO_NET_F_MAC in the features list of vdpa_sim. |
| |
| Fixes: 2c53d0f64c06 ("vdpasim: vDPA device simulator") |
| Cc: jasowang@redhat.com |
| Signed-off-by: Laurent Vivier <lvivier@redhat.com> |
| Link: https://lore.kernel.org/r/20201029122050.776445-2-lvivier@redhat.com |
| Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
| Acked-by: Jason Wang <jasowang@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/vdpa/vdpa_sim/vdpa_sim.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c |
| index 62d6403271450..01ef22d03a8c1 100644 |
| --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c |
| +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c |
| @@ -60,7 +60,8 @@ struct vdpasim_virtqueue { |
| |
| static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) | |
| (1ULL << VIRTIO_F_VERSION_1) | |
| - (1ULL << VIRTIO_F_ACCESS_PLATFORM); |
| + (1ULL << VIRTIO_F_ACCESS_PLATFORM) | |
| + (1ULL << VIRTIO_NET_F_MAC); |
| |
| /* State of each vdpasim device */ |
| struct vdpasim { |
| -- |
| 2.27.0 |
| |
