From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27E19C2D0A3 for ; Tue, 3 Nov 2020 20:38:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E3C4822277 for ; Tue, 3 Nov 2020 20:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604435918; bh=P1t3xTSBef/ptJcoRxUOYbaDLDAH7WtU9bn53/s+I9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rdvlpevP1KjLk9ENUZZ4D1C5tNHxfo2lAmsAancSncXZZo1s9BPyELd7/73KfuoMM ZNfjOL4lzUs42svqJWEgLXshYxkZG9XoSGkW20uh0GMNGataDjHTFwjf2YdfDHGVBK lO/9oOvyOPNJjiVV8++WWQ6bHz8zPX6eqCw5K5p8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729972AbgKCUih (ORCPT ); Tue, 3 Nov 2020 15:38:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:48912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729969AbgKCUig (ORCPT ); Tue, 3 Nov 2020 15:38:36 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B175922226; Tue, 3 Nov 2020 20:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604435916; bh=P1t3xTSBef/ptJcoRxUOYbaDLDAH7WtU9bn53/s+I9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pnpp6dLpCc235FvACi+8wdItA6l7whUYgVsjn8VyGw58XyXg61tEdcVSHfxxrqWxP Rg3djkAwWlMQ1TI9OPB6jxkBkUSiKTXNnpQw1JiYoIkpEUtOGGBuG/p1F585bd+Mhe 7Mc63GDRVCGEd06kI59byOGAxy3S1H6nh6Ib9rpY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, jasowang@redhat.com, Laurent Vivier , "Michael S. Tsirkin" , Sasha Levin Subject: [PATCH 5.9 038/391] vdpasim: fix MAC address configuration Date: Tue, 3 Nov 2020 21:31:29 +0100 Message-Id: <20201103203350.250691382@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Laurent Vivier [ 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 Link: https://lore.kernel.org/r/20201029122050.776445-2-lvivier@redhat.com Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang Signed-off-by: Sasha Levin --- 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