From nobody Sun Dec 14 21:56:07 2025 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52DB81F7075 for ; Tue, 21 Jan 2025 19:11:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486675; cv=none; b=Xa8iLBC+o14SK3xEFwVCGd4cBJTTnsJ8leP0hKEOds4O2reWPm9bq/T7tGJFZ1hAljVBO55lfAxhyOLbBM6Zw2pYXpi0zMuIABuUmDFAfJ0pofhbUzUYP4fL3W2MMx8qKKqnm2Q8N+rEtqpMkYXy96A2rvb/vdBwyxzQOyAiW2Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486675; c=relaxed/simple; bh=ps14zeISRQUrPp/FMjIu7GyzXnHtSdfWr0SOARpLgXs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GQCS5Bdxy6R6J8DrkMpczWcZLNQ+/WoWwQjqjfczDilEaB2ZM6Nmz6QdU1j+QyydQexXD6WVtBwbL3zPQJrCkTqwxHfRY+WAmCLVu4/9kEGtm97mumXyyASxzGg3ZSbtsYgU+i482gTt2saDs0OYrPowVVdHl7z8m3uSeC2Txqo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=k6fpRo3E; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="k6fpRo3E" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2ef6c56032eso7818249a91.2 for ; Tue, 21 Jan 2025 11:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737486673; x=1738091473; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TDWORuj0wvWXpxW0vCuhr9iAbZl0aXjuDP2zaKtZhzU=; b=k6fpRo3EWMYUOlZUU1A//3IWPPrcC/R+/2j9FIFzxEykWMGX2lErW0ts4ieiMmYJ5f UVGzS3/It6ZWTXc+niF2h66qijlrhLneWSUvE0L/bU3oEYVAWZCsbFI9vLfpL91hX9ZB AQlXovdvDPDFkjsqvqgW5EfvOgDkPrmc3i1cg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737486673; x=1738091473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TDWORuj0wvWXpxW0vCuhr9iAbZl0aXjuDP2zaKtZhzU=; b=RY2WYXlaJH5fhNXW2AjF0WLncil7I6qdtqQN9IvRu5VBQ7o7AGa3Cgh+RuAJNhfZZE aOvCwjCiqy9nQpBtGAoH5V3xShGtJqy8t07Uw2hLlthS41lhOVgNmfZLlAZUVa7ZOHMD d6w5MJM7mSOEvqX8NjpIVaVdWb0Ot7kLZ7DWzO9jYOiLqpV9T27prcSHE4qZuQ6gpfEs M8N5CqHlBrdAFdTJqGp5P2CtB5dryRnfWKq992af8sR+hHMcvphVg39+5HcWDxCIay91 zl7zbQdowwPrPbo39FGuarLcZf1DcOI4iZ1+AglvkHU7BzSd7ZBXJXGai8OPuG2LX8/J 2vzw== X-Forwarded-Encrypted: i=1; AJvYcCWhf0blG6P75B3knA9DhpzLFkShk8pQu0/6HKsmKqr0ckp9RALuRzmm5R1Kz8IK59hRzxISqhAI4g0i02I=@vger.kernel.org X-Gm-Message-State: AOJu0YzLaQlMKEx1weGH702yZZvNulFg19xOitwK12DaIMNubrG5zvkm C2xBy/gT4vcZHarfkjarV189IiA9w4xAXhmoGuSAhaUY65ZuUbLysTY6uK0me/wi5M2K2LPdRtU L X-Gm-Gg: ASbGnctDgOvFq2X7mvFjgI8QMZxrOWJarXd525+u7IHRoq+HOK8ssqM1BnSSBb2+V8c zF8rAoG8BbTdeztl0AjfUSZPlkzPFT+0ERjF9SJ7+MICfZfkmXUoHpzER0hoZglH3iyYOWJHK9I htP9PsLCCTrGcCtQElux0WAqe0T64MVWSGAzkPNnYjOk9AGBgMD0QqO8uY3mUpBDL6xTqgOCUPk iImvgQOedJ1Ffe9cd4+bFxMA93zC28zqPObWWzFrnmGDROAcKwG9mRseTv1TqLvTMG9+eeajU0H eQ== X-Google-Smtp-Source: AGHT+IEb+ow9B8HMeKsPl0hXMsb+u+xhEKMUqjLwNXvMEkGNBJdrkESWe8cbHdWnNyIQHfkYMacpPA== X-Received: by 2002:a17:90a:c888:b0:2f4:f7f8:fc8a with SMTP id 98e67ed59e1d1-2f782d8cd4emr28724895a91.33.1737486673632; Tue, 21 Jan 2025 11:11:13 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f7db6ab125sm1793440a91.26.2025.01.21.11.11.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 11:11:13 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: gerhard@engleder-embedded.com, jasowang@redhat.com, leiyang@redhat.com, xuanzhuo@linux.alibaba.com, mkarsten@uwaterloo.ca, Joe Damato , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , virtualization@lists.linux.dev (open list:VIRTIO CORE AND NET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [RFC net-next v3 4/4] virtio_net: Use persistent NAPI config Date: Tue, 21 Jan 2025 19:10:44 +0000 Message-Id: <20250121191047.269844-5-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250121191047.269844-1-jdamato@fastly.com> References: <20250121191047.269844-1-jdamato@fastly.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 Content-Type: text/plain; charset="utf-8" Use persistent NAPI config so that NAPI IDs are not renumbered as queue counts change. $ sudo ethtool -l ens4 | tail -5 | egrep -i '(current|combined)' Current hardware settings: Combined: 4 $ ./tools/net/ynl/pyynl/cli.py \ --spec Documentation/netlink/specs/netdev.yaml \ --dump queue-get --json=3D'{"ifindex": 2}' [{'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'rx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8194, 'type': 'rx'}, {'id': 2, 'ifindex': 2, 'napi-id': 8195, 'type': 'rx'}, {'id': 3, 'ifindex': 2, 'napi-id': 8196, 'type': 'rx'}, {'id': 0, 'ifindex': 2, 'type': 'tx'}, {'id': 1, 'ifindex': 2, 'type': 'tx'}, {'id': 2, 'ifindex': 2, 'type': 'tx'}, {'id': 3, 'ifindex': 2, 'type': 'tx'}] Now adjust the queue count, note that the NAPI IDs are not renumbered: $ sudo ethtool -L ens4 combined 1 $ ./tools/net/ynl/pyynl/cli.py \ --spec Documentation/netlink/specs/netdev.yaml \ --dump queue-get --json=3D'{"ifindex": 2}' [{'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'rx'}, {'id': 0, 'ifindex': 2, 'type': 'tx'}] $ sudo ethtool -L ens4 combined 8 $ ./tools/net/ynl/pyynl/cli.py \ --spec Documentation/netlink/specs/netdev.yaml \ --dump queue-get --json=3D'{"ifindex": 2}' [{'id': 0, 'ifindex': 2, 'napi-id': 8193, 'type': 'rx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8194, 'type': 'rx'}, {'id': 2, 'ifindex': 2, 'napi-id': 8195, 'type': 'rx'}, {'id': 3, 'ifindex': 2, 'napi-id': 8196, 'type': 'rx'}, {'id': 4, 'ifindex': 2, 'napi-id': 8197, 'type': 'rx'}, {'id': 5, 'ifindex': 2, 'napi-id': 8198, 'type': 'rx'}, {'id': 6, 'ifindex': 2, 'napi-id': 8199, 'type': 'rx'}, {'id': 7, 'ifindex': 2, 'napi-id': 8200, 'type': 'rx'}, [...] Signed-off-by: Joe Damato Reviewed-by: Xuan Zhuo Acked-by: Jason Wang Reviewed-by: Gerhard Engleder --- rfcv3: - Added Xuan Zhuo's Reviewed-by tag. No functional changes. v2: - Eliminate RTNL code paths using the API Jakub introduced in patch 1 of this v2. - Added virtnet_napi_disable to reduce code duplication as suggested by Jason Wang. drivers/net/virtio_net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index c120cb2106c0..e0752a856adf 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -6411,8 +6411,9 @@ static int virtnet_alloc_queues(struct virtnet_info *= vi) INIT_DELAYED_WORK(&vi->refill, refill_work); for (i =3D 0; i < vi->max_queue_pairs; i++) { vi->rq[i].pages =3D NULL; - netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll, - napi_weight); + netif_napi_add_config(vi->dev, &vi->rq[i].napi, virtnet_poll, + i); + vi->rq[i].napi.weight =3D napi_weight; netif_napi_add_tx_weight(vi->dev, &vi->sq[i].napi, virtnet_poll_tx, napi_tx ? napi_weight : 0); --=20 2.25.1