From mboxrd@z Thu Jan 1 00:00:00 1970 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 D0BCF14372F for ; Thu, 30 May 2024 06:10:11 +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=1717049413; cv=none; b=gQ1kUTwaSJYsVq/10baUZhvUrcZ5wowJ0fs7vHmCjvp6NKncoG7lELJRdeJDXasU/E9q8uDGzSoWclXtJs09q1xlmDOelw600zKK+AHSCcP/SSnBINmNFSDGLkOxnwGA3qgX8QLz3i9LtRSswITdCVyapRbVlENmCrt23FvljSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717049413; c=relaxed/simple; bh=yP9Y3KRiTvMWKu3gxpiZVwRahe3Bt6bczvW1WWNe54A=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=akvdLfZYE7RUzf5ofLONWLM4rHIl1WcUxTXB8fK5UzLkRPvpdmvUyNkoSpcJVSGb529qX5XElyUpaaAG8fEsROcUEm99vjL8aoqV6TYfdP+aiKSvQPD6oFZnaFgWjXLwqF7jOmPpDH2ST7D75cuC8Q/bZguBc+9uFC0VA0mN8/g= 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=HoebgYGB; 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="HoebgYGB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717049410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ShPq/rZDg0QngIclP+9hv0sjxOwB+M97w7spUmjwwy0=; b=HoebgYGBxlWflDRNdcSx0VauuHltvACyH0KAP6+eeP32eVEYA3JRL7yEOI27jBaDmiU6PA Qpxg2KN2Tb/ye1O5V1puFDPM2cdc+JGY3WzGkWRb+wKhjbn9QUnyz6kfNDX5+PxrJkWWM+ cB7+8ldzLrUJ96ewkcRj7yQwk/FpQAE= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-VDeKZ_0ZPt2LaSzQh-LeCw-1; Thu, 30 May 2024 02:10:08 -0400 X-MC-Unique: VDeKZ_0ZPt2LaSzQh-LeCw-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5785f7b847cso441157a12.0 for ; Wed, 29 May 2024 23:10:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717049407; x=1717654207; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ShPq/rZDg0QngIclP+9hv0sjxOwB+M97w7spUmjwwy0=; b=simDeHpWbdN5T83qDYBlM+MkNa0nyEET/dCWUJGS4pOOzjIBCJ/nfp0VWcULg0YkcI +sahAALdHoP5MFvAsIp6ZuEj+bEWGNtci4ZjxrU/4yeEh8ssQJpJJVjgQadVgrnuotsB ULM66EXnBlQdIG1dx7vj1m6qAIfD9AJh8WtNGhdS1oS7XAcJs6zPjXkPs8cuMWa2Cekh tftT6inzkxg6JrBJksY8oBWMLnn7MEyeXw+dVKj74tChTYZ4uLiYVOkpaGnI651r8+nB 48uR5MJnWnXhGrA7JJeIPkBdVI7tfGv0KHWm3xBf7VPAtnq9PwH1ai2dpFLojjBToKoo GKCA== X-Forwarded-Encrypted: i=1; AJvYcCUTKQZE0vhjfg+CfBBgdhnctoowxLDlDeaJtjKvI60plDVGnwmxj2o8ySzEJUaxT4VOTI7thheEhL3zJcRqHe3NJ7JgqIsy X-Gm-Message-State: AOJu0Yw8kqPyCq8kWJiCifK7L1IwHt3oD3EbxZ04HJ7PojNk1owAIf69 5BZU/PcVjliHoVC/n+Kn4TrjRQyIUG0rpthtSL3kdT+5zCJLwQUvML7HWKK5uOmNeerVm0lhOy0 nUM9C3sHBCTvRG96lxJIoh2JVwIA5fuHRBXlhfKVuJXBE8zeqirAcsQ== X-Received: by 2002:a50:99d5:0:b0:578:62f7:2881 with SMTP id 4fb4d7f45d1cf-57a193fd230mr677858a12.0.1717049407346; Wed, 29 May 2024 23:10:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEh3yx8ajC6dqkpsRhAU4hikCNWT/SG2J1Gi5RJ/WmLD97+UWJPaCgBhGTelxANjPRoZwTQHg== X-Received: by 2002:a50:99d5:0:b0:578:62f7:2881 with SMTP id 4fb4d7f45d1cf-57a193fd230mr677832a12.0.1717049406703; Wed, 29 May 2024 23:10:06 -0700 (PDT) Received: from redhat.com ([2.55.191.38]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-579c2026406sm6538802a12.37.2024.05.29.23.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 23:10:06 -0700 (PDT) Date: Thu, 30 May 2024 02:10:02 -0400 From: "Michael S. Tsirkin" To: Jason Wang Cc: xuanzhuo@linux.alibaba.com, eperezma@redhat.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Venkat Venkatsubra , Gia-Khanh Nguyen Subject: Re: [PATCH net-next V2] virtio-net: synchronize operstate with admin state on up/down Message-ID: <20240530020531-mutt-send-email-mst@kernel.org> References: <20240530032055.8036-1-jasowang@redhat.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240530032055.8036-1-jasowang@redhat.com> On Thu, May 30, 2024 at 11:20:55AM +0800, Jason Wang wrote: > 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 qdisc 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 > Reviewed-by: Xuan Zhuo > Acked-by: Michael S. Tsirkin > Signed-off-by: Jason Wang > --- > Changes since V1: > - rebase > - add ack/review tags > --- > drivers/net/virtio_net.c | 94 +++++++++++++++++++++++++++------------- > 1 file changed, 63 insertions(+), 31 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 4a802c0ea2cb..69e4ae353c51 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -433,6 +433,12 @@ struct virtnet_info { > /* The lock to synchronize the access to refill_enabled */ > spinlock_t refill_lock; > > + /* Is config change enabled? */ > + bool config_change_enabled; > + > + /* The lock to synchronize the access to config_change_enabled */ > + spinlock_t config_change_lock; > + > /* Work struct for config space updates */ > struct work_struct config_work; > But we already have dev->config_lock and dev->config_enabled. And it actually works better - instead of discarding config change events it defers them until enabled. > @@ -623,6 +629,20 @@ static void disable_delayed_refill(struct virtnet_info *vi) > spin_unlock_bh(&vi->refill_lock); > } > > +static void enable_config_change(struct virtnet_info *vi) > +{ > + spin_lock_irq(&vi->config_change_lock); > + vi->config_change_enabled = true; > + spin_unlock_irq(&vi->config_change_lock); > +} > + > +static void disable_config_change(struct virtnet_info *vi) > +{ > + spin_lock_irq(&vi->config_change_lock); > + vi->config_change_enabled = false; > + spin_unlock_irq(&vi->config_change_lock); > +} > + > static void enable_rx_mode_work(struct virtnet_info *vi) > { > rtnl_lock(); > @@ -2421,6 +2441,25 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index) > return err; > } > > +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 = speed; > + > + virtio_cread_le(vi->vdev, struct virtio_net_config, duplex, &duplex); > + > + if (ethtool_validate_duplex(duplex)) > + vi->duplex = duplex; > +} > + > static int virtnet_open(struct net_device *dev) > { > struct virtnet_info *vi = netdev_priv(dev); > @@ -2439,6 +2478,18 @@ static int virtnet_open(struct net_device *dev) > goto err_enable_qp; > } > > + /* 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)) { > + enable_config_change(vi); > + schedule_work(&vi->config_work); > + } else { > + vi->status = VIRTIO_NET_S_LINK_UP; > + virtnet_update_settings(vi); > + netif_carrier_on(dev); > + } > + > return 0; > > err_enable_qp: > @@ -2875,12 +2926,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 */ > + disable_config_change(vi); > + /* Make sure status updating is cancelled */ > + cancel_work_sync(&vi->config_work); > > for (i = 0; i < vi->max_queue_pairs; i++) { > virtnet_disable_queue_pair(vi, i); > cancel_work_sync(&vi->rq[i].dim.work); > } > > + vi->status &= ~VIRTIO_NET_S_LINK_UP; > + netif_carrier_off(dev); > + > return 0; > } > > @@ -4583,25 +4641,6 @@ static void virtnet_init_settings(struct net_device *dev) > vi->duplex = DUPLEX_UNKNOWN; > } > > -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 = speed; > - > - virtio_cread_le(vi->vdev, struct virtio_net_config, duplex, &duplex); > - > - if (ethtool_validate_duplex(duplex)) > - vi->duplex = duplex; > -} > - > static u32 virtnet_get_rxfh_key_size(struct net_device *dev) > { > return ((struct virtnet_info *)netdev_priv(dev))->rss_key_size; > @@ -5163,7 +5202,10 @@ static void virtnet_config_changed(struct virtio_device *vdev) > { > struct virtnet_info *vi = vdev->priv; > > - schedule_work(&vi->config_work); > + spin_lock_irq(&vi->config_change_lock); > + if (vi->config_change_enabled) > + schedule_work(&vi->config_work); > + spin_unlock_irq(&vi->config_change_lock); > } > > static void virtnet_free_queues(struct virtnet_info *vi) > @@ -5706,6 +5748,7 @@ static int virtnet_probe(struct virtio_device *vdev) > INIT_WORK(&vi->config_work, virtnet_config_changed_work); > INIT_WORK(&vi->rx_mode_work, virtnet_rx_mode_work); > spin_lock_init(&vi->refill_lock); > + spin_lock_init(&vi->config_change_lock); > > if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) { > vi->mergeable_rx_bufs = true; > @@ -5901,17 +5944,6 @@ static int virtnet_probe(struct virtio_device *vdev) > goto free_unregister_netdev; > } > > - /* 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 = VIRTIO_NET_S_LINK_UP; > - virtnet_update_settings(vi); > - netif_carrier_on(dev); > - } > - > for (i = 0; i < ARRAY_SIZE(guest_offloads); i++) > if (virtio_has_feature(vi->vdev, guest_offloads[i])) > set_bit(guest_offloads[i], &vi->guest_offloads); > -- > 2.42.0