From nobody Wed Dec 17 17:24:14 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9022F152789 for ; Tue, 9 Jul 2024 08:02:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720512167; cv=none; b=CH+hQWDraZHhGGI7Ai28O99mvZxQXhEPH2ktDKTaxM/iRE7a+OSg84UNLTYxwlQA1kRJcQIUMhoek5oIxH5hr0uFNZGs10nNqI+JjHWwx2mHyPVqORDeezkynK/ovqd/BiZb2UvNmnAsH7JcuKDvlLGZ4qFp9MQmcmOUPQ1kYfk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720512167; c=relaxed/simple; bh=doJuD6Ad6+WLmrSoHdYJY3eqzbQod0yKfr5czeLyavM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VpPmc42vQHEe25WGwcd1MGVthCdAso7f9nRLFY9mAn5LVEdaE8opc4RBLt3qNCF8LihrQ/GmYBjdyEmVoc1YcrD8nof/3HIgKIELqigt0FXfR5K6rwG9u/hrBuy+DlDud1pwXrHxOGIvTIAVEX8Vjp8wp0mMR8WdXN0BYLid4jQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YhK8TBv/; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YhK8TBv/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720512164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dHCaS+jY2Jg8S88jwIg+mBIv5Lor8XLl5Lwa81p6b8w=; b=YhK8TBv/AXKFUC8vGNSP0sO6k/+ssQkwEYTYZPzOxaYBCw000+y7o3n3zHnd6/GGsiEhvJ KeQ3DwIDzBQUoOTxy8gw9yYvKKmM3Bsn5GY+pwXboEz1SkZwNrp6IwE79EK8osXIJd4tSJ tF3XvVNTiEpa6P2Mpo0yR2K7GOp2p+M= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-201-nT-aBU6PO7epmALKVrmakw-1; Tue, 09 Jul 2024 04:02:41 -0400 X-MC-Unique: nT-aBU6PO7epmALKVrmakw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B70B11977338; Tue, 9 Jul 2024 08:02:39 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.184]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 08B863000181; Tue, 9 Jul 2024 08:02:32 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, Venkat Venkatsubra , Gia-Khanh Nguyen Subject: [PATCH net-next v3 1/3] virtio: rename virtio_config_enabled to virtio_config_core_enabled Date: Tue, 9 Jul 2024 16:02:12 +0800 Message-ID: <20240709080214.9790-2-jasowang@redhat.com> In-Reply-To: <20240709080214.9790-1-jasowang@redhat.com> References: <20240709080214.9790-1-jasowang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" Following patch will allow the config interrupt to be disabled by a specific driver via another boolean. So this patch renames virtio_config_enabled and relevant helpers to virtio_config_core_enabled. Cc: Venkat Venkatsubra Cc: Gia-Khanh Nguyen Signed-off-by: Jason Wang Reviewed-by: Xuan Zhuo --- drivers/virtio/virtio.c | 22 +++++++++++----------- include/linux/virtio.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index b968b2aa5f4d..73bab89b5326 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -127,7 +127,7 @@ static void __virtio_config_changed(struct virtio_devic= e *dev) { struct virtio_driver *drv =3D drv_to_virtio(dev->dev.driver); =20 - if (!dev->config_enabled) + if (!dev->config_core_enabled) dev->config_change_pending =3D true; else if (drv && drv->config_changed) drv->config_changed(dev); @@ -143,17 +143,17 @@ void virtio_config_changed(struct virtio_device *dev) } EXPORT_SYMBOL_GPL(virtio_config_changed); =20 -static void virtio_config_disable(struct virtio_device *dev) +static void virtio_config_core_disable(struct virtio_device *dev) { spin_lock_irq(&dev->config_lock); - dev->config_enabled =3D false; + dev->config_core_enabled =3D false; spin_unlock_irq(&dev->config_lock); } =20 -static void virtio_config_enable(struct virtio_device *dev) +static void virtio_config_core_enable(struct virtio_device *dev) { spin_lock_irq(&dev->config_lock); - dev->config_enabled =3D true; + dev->config_core_enabled =3D true; if (dev->config_change_pending) __virtio_config_changed(dev); dev->config_change_pending =3D false; @@ -322,7 +322,7 @@ static int virtio_dev_probe(struct device *_d) if (drv->scan) drv->scan(dev); =20 - virtio_config_enable(dev); + virtio_config_core_enable(dev); =20 return 0; =20 @@ -340,7 +340,7 @@ static void virtio_dev_remove(struct device *_d) struct virtio_device *dev =3D dev_to_virtio(_d); struct virtio_driver *drv =3D drv_to_virtio(dev->dev.driver); =20 - virtio_config_disable(dev); + virtio_config_core_disable(dev); =20 drv->remove(dev); =20 @@ -455,7 +455,7 @@ int register_virtio_device(struct virtio_device *dev) goto out_ida_remove; =20 spin_lock_init(&dev->config_lock); - dev->config_enabled =3D false; + dev->config_core_enabled =3D false; dev->config_change_pending =3D false; =20 INIT_LIST_HEAD(&dev->vqs); @@ -512,14 +512,14 @@ int virtio_device_freeze(struct virtio_device *dev) struct virtio_driver *drv =3D drv_to_virtio(dev->dev.driver); int ret; =20 - virtio_config_disable(dev); + virtio_config_core_disable(dev); =20 dev->failed =3D dev->config->get_status(dev) & VIRTIO_CONFIG_S_FAILED; =20 if (drv && drv->freeze) { ret =3D drv->freeze(dev); if (ret) { - virtio_config_enable(dev); + virtio_config_core_enable(dev); return ret; } } @@ -578,7 +578,7 @@ int virtio_device_restore(struct virtio_device *dev) if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK)) virtio_device_ready(dev); =20 - virtio_config_enable(dev); + virtio_config_core_enable(dev); =20 return 0; =20 diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 96fea920873b..a6f6df72f01a 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -115,7 +115,7 @@ struct virtio_admin_cmd { * struct virtio_device - representation of a device using virtio * @index: unique position on the virtio bus * @failed: saved value for VIRTIO_CONFIG_S_FAILED bit (for restore) - * @config_enabled: configuration change reporting enabled + * @config_core_enabled: configuration change reporting enabled by core * @config_change_pending: configuration change reported while disabled * @config_lock: protects configuration change reporting * @vqs_list_lock: protects @vqs. @@ -132,7 +132,7 @@ struct virtio_admin_cmd { struct virtio_device { int index; bool failed; - bool config_enabled; + bool config_core_enabled; bool config_change_pending; spinlock_t config_lock; spinlock_t vqs_list_lock; --=20 2.31.1 From nobody Wed Dec 17 17:24:14 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5605715216A for ; Tue, 9 Jul 2024 08:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720512177; cv=none; b=UVnBS+CzMjTBW7ElhGiHfOxkLMf3IQzaWP6s4Le73Wg3LuDTNLNn602c69coJYob3UFHcUF+LR6mb8HIeqWYmyTepu/xfQOibzmBtEwFj6FpVK5vERGdl4oyBE5daFP9Uw9uRVUJg5p6Gu4Hnn4QruReiWSoTRubctBq0vDfJI0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720512177; c=relaxed/simple; bh=DsrKoN1WZi6Obw7rOLPd2tvZyunyxpyVe2d4CjqYiag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=clBfAfI6aBX8n0LNgsO3WcMLKDOCTk40bh3SjIuvYrFm2X4CRC8//dG0xXwl6M2rwPRbCUJ0hJfeGTz9Cp0Z8nUCcSXIsdz0Hnn8L1kV/YKVGq5RYxo0Y/W37ktvKsZfflQEZx8irHGUN675uCW6R/pwBsj2XA2qUip2/+dETfw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=aedTrZt4; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aedTrZt4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720512175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FGA/3PS1XFY7Rh8YVbIU/85xe2LD8/jH4SJZgsPBNrM=; b=aedTrZt4MR1QpJHwkPhByWexbtcSskHi09myy7T8+EhN5pCMWgR7SFNqcaUPf2LQfnHYom /05xWcsY79IeHP6KETfzxkfAcFlCEPedApryDGZp2/imm81dzUXQQ6n8v/BZhO1nEoTD2h Olw0DMkrh6ALZD1JxCUgcMvxU6/pqpk= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-FrQOoc54MbGdRBZ2MchZIw-1; Tue, 09 Jul 2024 04:02:48 -0400 X-MC-Unique: FrQOoc54MbGdRBZ2MchZIw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E07451955F0D; Tue, 9 Jul 2024 08:02:46 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.184]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C24A3000184; Tue, 9 Jul 2024 08:02:40 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, Venkat Venkatsubra , Gia-Khanh Nguyen Subject: [PATCH net-next v3 2/3] virtio: allow driver to disable the configure change notification Date: Tue, 9 Jul 2024 16:02:13 +0800 Message-ID: <20240709080214.9790-3-jasowang@redhat.com> In-Reply-To: <20240709080214.9790-1-jasowang@redhat.com> References: <20240709080214.9790-1-jasowang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" Sometime, it would be useful to disable the configure change notification from the driver. So this patch allows this by introducing a variable config_change_driver_disabled and only allow the configure change notification callback to be triggered when it is allowed by both the virtio core and the driver. It is set to false by default to hold the current semantic so we don't need to change any drivers. The first user for this would be virtio-net. Cc: Venkat Venkatsubra Cc: Gia-Khanh Nguyen Signed-off-by: Jason Wang Reviewed-by: Xuan Zhuo --- drivers/virtio/virtio.c | 39 ++++++++++++++++++++++++++++++++++++--- include/linux/virtio.h | 7 +++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 73bab89b5326..23a96fbc2810 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -127,10 +127,12 @@ static void __virtio_config_changed(struct virtio_dev= ice *dev) { struct virtio_driver *drv =3D drv_to_virtio(dev->dev.driver); =20 - if (!dev->config_core_enabled) + if (!dev->config_core_enabled || dev->config_driver_disabled) dev->config_change_pending =3D true; - else if (drv && drv->config_changed) + else if (drv && drv->config_changed) { drv->config_changed(dev); + dev->config_change_pending =3D false; + } } =20 void virtio_config_changed(struct virtio_device *dev) @@ -143,6 +145,38 @@ void virtio_config_changed(struct virtio_device *dev) } EXPORT_SYMBOL_GPL(virtio_config_changed); =20 +/** + * virtio_config_driver_disable - disable config change reporting by drive= rs + * @dev: the device to reset + * + * This is only allowed to be called by a driver and disalbing can't + * be nested. + */ +void virtio_config_driver_disable(struct virtio_device *dev) +{ + spin_lock_irq(&dev->config_lock); + dev->config_driver_disabled =3D true; + spin_unlock_irq(&dev->config_lock); +} +EXPORT_SYMBOL_GPL(virtio_config_driver_disable); + +/** + * virtio_config_driver_enable - enable config change reporting by drivers + * @dev: the device to reset + * + * This is only allowed to be called by a driver and enabling can't + * be nested. + */ +void virtio_config_driver_enable(struct virtio_device *dev) +{ + spin_lock_irq(&dev->config_lock); + dev->config_driver_disabled =3D false; + if (dev->config_change_pending) + __virtio_config_changed(dev); + spin_unlock_irq(&dev->config_lock); +} +EXPORT_SYMBOL_GPL(virtio_config_driver_enable); + static void virtio_config_core_disable(struct virtio_device *dev) { spin_lock_irq(&dev->config_lock); @@ -156,7 +190,6 @@ static void virtio_config_core_enable(struct virtio_dev= ice *dev) dev->config_core_enabled =3D true; if (dev->config_change_pending) __virtio_config_changed(dev); - dev->config_change_pending =3D false; spin_unlock_irq(&dev->config_lock); } =20 diff --git a/include/linux/virtio.h b/include/linux/virtio.h index a6f6df72f01a..2be73de6f1f3 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -116,6 +116,8 @@ struct virtio_admin_cmd { * @index: unique position on the virtio bus * @failed: saved value for VIRTIO_CONFIG_S_FAILED bit (for restore) * @config_core_enabled: configuration change reporting enabled by core + * @config_driver_disabled: configuration change reporting disabled by + * a driver * @config_change_pending: configuration change reported while disabled * @config_lock: protects configuration change reporting * @vqs_list_lock: protects @vqs. @@ -133,6 +135,7 @@ struct virtio_device { int index; bool failed; bool config_core_enabled; + bool config_driver_disabled; bool config_change_pending; spinlock_t config_lock; spinlock_t vqs_list_lock; @@ -163,6 +166,10 @@ void __virtqueue_break(struct virtqueue *_vq); void __virtqueue_unbreak(struct virtqueue *_vq); =20 void virtio_config_changed(struct virtio_device *dev); + +void virtio_config_driver_disable(struct virtio_device *dev); +void virtio_config_driver_enable(struct virtio_device *dev); + #ifdef CONFIG_PM_SLEEP int virtio_device_freeze(struct virtio_device *dev); int virtio_device_restore(struct virtio_device *dev); --=20 2.31.1 From nobody Wed Dec 17 17:24:14 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F04C1527A5 for ; Tue, 9 Jul 2024 08:03:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720512189; cv=none; b=mPPLFs0FZGxbIZcJdXtCzZ7dha8L7EVLAKx5PEbkpHtoBtJouG66/AK3p7Xdfhr35Pwe4ujTPnNf7iRlEVhKjA2E4KxFB5QtKp7x39Uue+9/KNq4amy1K6sf4oAfwwr1QL+T4hTSxp6KdTHH//xxzfSJk82CyZ3Ukle27pvBB40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720512189; c=relaxed/simple; bh=ItSrSIZhMmKVBhL6QhqgNEBVHBV9MNji+zbTW7wRCZU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RqEO3VgtYFnx/r6ItNmZLH1cOh1io6ayd5talQ/lu6lxanK8DEoiZUuG3tXsq0V/N3M1jEHldtT0ZO9owwWwGa7bBBFKIl1t3uk2ar4swGpDVmzI1F0A0W9wMAUZ6yIkcJn2aIVCNpiIQ2nPisalAO+aDMEMHW2PLY0Dn4wiuaE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GPQHtC0c; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GPQHtC0c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720512186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YltytAobm35KcA9WCi/WWsmTKpYn/PUplt1/do/Zw1c=; b=GPQHtC0cZBNZ/afFq7KeE6mm9udzGftPrk3ym9KKxmG5F7G34dxzMTvmqqrLR9KNX1mk6/ PbJ0ZwJIgzvXHKPXrmPYo2yrFUXLLaBhK8lAEylFaNk+0sGkgY1UM+QjdhKLDYGcRyN4Ql vaELlqsJ9/xyVjX8JiuFeKYnpTRm+sg= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-231-etSNNHcXP1SMaDHgVlctrw-1; Tue, 09 Jul 2024 04:02:56 -0400 X-MC-Unique: etSNNHcXP1SMaDHgVlctrw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8599F1955F65; Tue, 9 Jul 2024 08:02:54 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.184]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F3FE23000185; Tue, 9 Jul 2024 08:02:47 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, Venkat Venkatsubra , Gia-Khanh Nguyen Subject: [PATCH net-next v3 3/3] virtio-net: synchronize operstate with admin state on up/down Date: Tue, 9 Jul 2024 16:02:14 +0800 Message-ID: <20240709080214.9790-4-jasowang@redhat.com> In-Reply-To: <20240709080214.9790-1-jasowang@redhat.com> References: <20240709080214.9790-1-jasowang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" This patch synchronize operstate with admin state per RFC2863. This is done by trying to toggle the carrier upon open/close and synchronize with the config change work. This allows propagate status correctly to stacked devices like: ip link add link enp0s3 macvlan0 type macvlan ip link set link enp0s3 down ip link show Before this patch: 3: enp0s3: mtu 1500 qdisc pfifo_fast state DOWN mode = DEFAULT group default qlen 1000 link/ether 00:00:05:00:00:09 brd ff:ff:ff:ff:ff:ff ...... 5: macvlan0@enp0s3: mtu 1500 qdisc= noqueue state UP mode DEFAULT group default qlen 1000 link/ether b2:a9:c5:04:da:53 brd ff:ff:ff:ff:ff:ff After this patch: 3: enp0s3: mtu 1500 qdisc pfifo_fast state DOWN mode = DEFAULT group default qlen 1000 link/ether 00:00:05:00:00:09 brd ff:ff:ff:ff:ff:ff ... 5: macvlan0@enp0s3: mtu 1500 qdi= sc noqueue state LOWERLAYERDOWN mode DEFAULT group default qlen 1000 link/ether b2:a9:c5:04:da:53 brd ff:ff:ff:ff:ff:ff Cc: Venkat Venkatsubra Cc: Gia-Khanh Nguyen Signed-off-by: Jason Wang Reviewed-by: Xuan Zhuo --- drivers/net/virtio_net.c | 64 ++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 0b4747e81464..e6626ba25b29 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2476,6 +2476,25 @@ static void virtnet_cancel_dim(struct virtnet_info *= vi, struct dim *dim) net_dim_work_cancel(dim); } =20 +static void virtnet_update_settings(struct virtnet_info *vi) +{ + u32 speed; + u8 duplex; + + if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_SPEED_DUPLEX)) + return; + + virtio_cread_le(vi->vdev, struct virtio_net_config, speed, &speed); + + if (ethtool_validate_speed(speed)) + vi->speed =3D speed; + + virtio_cread_le(vi->vdev, struct virtio_net_config, duplex, &duplex); + + if (ethtool_validate_duplex(duplex)) + vi->duplex =3D duplex; +} + static int virtnet_open(struct net_device *dev) { struct virtnet_info *vi =3D netdev_priv(dev); @@ -2494,6 +2513,18 @@ static int virtnet_open(struct net_device *dev) goto err_enable_qp; } =20 + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { + virtio_config_driver_enable(vi->vdev); + /* Do not schedule the config change work as the + * config change notification might have been disabled + * by the virtio core. */ + virtio_config_changed(vi->vdev); + } else { + vi->status =3D VIRTIO_NET_S_LINK_UP; + virtnet_update_settings(vi); + netif_carrier_on(dev); + } + return 0; =20 err_enable_qp: @@ -2936,12 +2967,19 @@ static int virtnet_close(struct net_device *dev) disable_delayed_refill(vi); /* Make sure refill_work doesn't re-enable napi! */ cancel_delayed_work_sync(&vi->refill); + /* Make sure config notification doesn't schedule config work */ + virtio_config_driver_disable(vi->vdev); + /* Make sure status updating is cancelled */ + cancel_work_sync(&vi->config_work); =20 for (i =3D 0; i < vi->max_queue_pairs; i++) { virtnet_disable_queue_pair(vi, i); virtnet_cancel_dim(vi, &vi->rq[i].dim); } =20 + vi->status &=3D ~VIRTIO_NET_S_LINK_UP; + netif_carrier_off(dev); + return 0; } =20 @@ -4640,25 +4678,6 @@ static void virtnet_init_settings(struct net_device = *dev) vi->duplex =3D DUPLEX_UNKNOWN; } =20 -static void virtnet_update_settings(struct virtnet_info *vi) -{ - u32 speed; - u8 duplex; - - if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_SPEED_DUPLEX)) - return; - - virtio_cread_le(vi->vdev, struct virtio_net_config, speed, &speed); - - if (ethtool_validate_speed(speed)) - vi->speed =3D speed; - - virtio_cread_le(vi->vdev, struct virtio_net_config, duplex, &duplex); - - if (ethtool_validate_duplex(duplex)) - vi->duplex =3D duplex; -} - static u32 virtnet_get_rxfh_key_size(struct net_device *dev) { return ((struct virtnet_info *)netdev_priv(dev))->rss_key_size; @@ -6000,13 +6019,6 @@ static int virtnet_probe(struct virtio_device *vdev) /* Assume link up if device can't report link status, otherwise get link status from config. */ netif_carrier_off(dev); - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { - schedule_work(&vi->config_work); - } else { - vi->status =3D VIRTIO_NET_S_LINK_UP; - virtnet_update_settings(vi); - netif_carrier_on(dev); - } =20 for (i =3D 0; i < ARRAY_SIZE(guest_offloads); i++) if (virtio_has_feature(vi->vdev, guest_offloads[i])) --=20 2.31.1