From nobody Sun Feb 8 14:11:21 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 54B23946C for ; Tue, 25 Feb 2025 02:05:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449113; cv=none; b=REKHjJIy19RAUuzkCwGM8pAzwAleXBfeeVl/IWoix54sdJLKUUmHkih/tn6teGgZpd9WL7xgCN2/2vv4U36onwx/OqxWhzlkGA96SIqxKEJXixDdaMczlAOo9ZfJMqzs2tsUOh7CAxx1M3WzW9JhR382Xwita10r9ebtCpAwNdQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449113; c=relaxed/simple; bh=O1/087om4F0aQVS80+qWqW7HTYSlWzFCPffyQOL+39g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ns2t9I8Y5jsUdW7x8Rof+bINB22TwTcNqLHD/yUYTzAINgCmEzk4lRXdqfJa11IkCdZDObjT/qzIlwH0du5FgmJZm2oMFN9HR871Gxq12Zks8xpr1FGGIMm3dwRMo3TVWYSMzHb1H8EaEuh+L/JFqkn7V1uqOUC/6/jHvnQXHMQ= 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=bw9CQfWv; arc=none smtp.client-ip=209.85.214.175 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="bw9CQfWv" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2210d92292eso294695ad.1 for ; Mon, 24 Feb 2025 18:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1740449112; x=1741053912; 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=LrU/GLtdg0ptzOcVYQYyLKXFl5BzTzzKA9LeyaGSuBE=; b=bw9CQfWvofOQK65sxBFINjA6c9lVhiKwonOMhooD1Cs6jODoHyx2Xe+8/E4s/4iZp+ +qN7xbmetHDf9+oQpkHVR4n/uMPlhy8gtotmcrJdaFVK6aoameK+kkHdaAX1x1JNQLZH /9AkoZkTtsf9RnAP9v07Iapx+4qOZ6ndiHg/I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740449112; x=1741053912; 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=LrU/GLtdg0ptzOcVYQYyLKXFl5BzTzzKA9LeyaGSuBE=; b=kyY+t68NnJicv24msEejAxhwAfb4tPTWBy/2ujYowV2m1fAJpZ154rLlQAF+373ioV uh/ifzpOdSPBe6sfW/R065LrlygY2f4Y4Jl/KemokA6DX4pquW9e/OAgpIKlBMpfPENh qn9883ryBpqormJsZj+JfGaRtzEs5frrHoeERxFoX9NmjwxA3FLRO0hOEZJ3iqVkB7JH 56/+izwChVfdhVWFX591YdMNEAlruLO2Y9UfEB67yG693WiXHZDl4w63IEZ7bxjUdKTX y5L0XfZ1VHyIGXFCeWNqPYpozl5/0OzKT2p4mY7kQhZbvjAP86BuLu+8ki3/SuP9xxBO ToaA== X-Forwarded-Encrypted: i=1; AJvYcCVPI/W6p74wR1/rA6jQG07L/XCJ4g191oy5XxvdNzw4hnqAGiZpZpFaUTy3lRo50Wl9oKMYgD9lbFez55k=@vger.kernel.org X-Gm-Message-State: AOJu0YyHEyKkqGlkQZgQ2LQnZWadBa/MthP6DWKcWMfM6REARPzKFDSK OkyhiBDtsjheUkAR82S+Tl/9HDvKdRpV46SE7Y3exLit3hCiVy384vSRCtUfIIU= X-Gm-Gg: ASbGncsE/fFmcn8hdUT949uV5hSjvqtlUO945JMyExccyOj7TJkNcL9WN0bvAQ8IXK6 lmyLhytpMHQ/HMC5pwHTdtPLygwaw1uQu1DL3NueN2njcH7wvShQtho7KWIe+qZCWTzzy0tzYXw LG8NExdbW+bQrz5zRlS4h1LJ139+B8l731uHvf/xkM5Aov+COCodLP7VM++1u9rZcZMmqcchzEy 444N9ThzosoneFQ1FMiiP6tK6jDP31QskAyNa+nF8KDEw8o4maR0pYswqrodZrDsZtD5MKeLWGj KFI4rmtZrQ+9HonIF7qs4E/T5kEB/lowJQ== X-Google-Smtp-Source: AGHT+IHY8lwN0JrUuvEAmWjnsdHLEwnDxmgRP+MXId726hvqxCaVfFz4XoQuZ4YlYhDmAgxBLFzirg== X-Received: by 2002:a17:902:ced0:b0:220:e792:8456 with SMTP id d9443c01a7336-2219ff311c3mr267682865ad.11.1740449111274; Mon, 24 Feb 2025 18:05:11 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a021909sm2926985ad.94.2025.02.24.18.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 18:05:10 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, gerhard@engleder-embedded.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, kuba@kernel.org, Joe Damato , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , virtualization@lists.linux.dev (open list:VIRTIO CORE AND NET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v4 1/4] virtio-net: Refactor napi_enable paths Date: Tue, 25 Feb 2025 02:04:48 +0000 Message-ID: <20250225020455.212895-2-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225020455.212895-1-jdamato@fastly.com> References: <20250225020455.212895-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" Refactor virtnet_napi_enable and virtnet_napi_tx_enable to take a struct receive_queue. Create a helper, virtnet_napi_do_enable, which contains the logic to enable a NAPI. Signed-off-by: Joe Damato Acked-by: Jason Wang Acked-by: Michael S. Tsirkin Tested-by: Lei Yang --- drivers/net/virtio_net.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ac26a6201c44..133b004c7a9a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2807,7 +2807,8 @@ static void skb_recv_done(struct virtqueue *rvq) virtqueue_napi_schedule(&rq->napi, rvq); } =20 -static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *= napi) +static void virtnet_napi_do_enable(struct virtqueue *vq, + struct napi_struct *napi) { napi_enable(napi); =20 @@ -2820,10 +2821,16 @@ static void virtnet_napi_enable(struct virtqueue *v= q, struct napi_struct *napi) local_bh_enable(); } =20 -static void virtnet_napi_tx_enable(struct virtnet_info *vi, - struct virtqueue *vq, - struct napi_struct *napi) +static void virtnet_napi_enable(struct receive_queue *rq) { + virtnet_napi_do_enable(rq->vq, &rq->napi); +} + +static void virtnet_napi_tx_enable(struct send_queue *sq) +{ + struct virtnet_info *vi =3D sq->vq->vdev->priv; + struct napi_struct *napi =3D &sq->napi; + if (!napi->weight) return; =20 @@ -2835,7 +2842,7 @@ static void virtnet_napi_tx_enable(struct virtnet_inf= o *vi, return; } =20 - return virtnet_napi_enable(vq, napi); + virtnet_napi_do_enable(sq->vq, napi); } =20 static void virtnet_napi_tx_disable(struct napi_struct *napi) @@ -2856,7 +2863,7 @@ static void refill_work(struct work_struct *work) =20 napi_disable(&rq->napi); still_empty =3D !try_fill_recv(vi, rq, GFP_KERNEL); - virtnet_napi_enable(rq->vq, &rq->napi); + virtnet_napi_enable(rq); =20 /* In theory, this can happen: if we don't get any buffers in * we will *never* try to fill again. @@ -3073,8 +3080,8 @@ static int virtnet_enable_queue_pair(struct virtnet_i= nfo *vi, int qp_index) if (err < 0) goto err_xdp_reg_mem_model; =20 - virtnet_napi_enable(vi->rq[qp_index].vq, &vi->rq[qp_index].napi); - virtnet_napi_tx_enable(vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi); + virtnet_napi_enable(&vi->rq[qp_index]); + virtnet_napi_tx_enable(&vi->sq[qp_index]); =20 return 0; =20 @@ -3339,7 +3346,7 @@ static void virtnet_rx_resume(struct virtnet_info *vi= , struct receive_queue *rq) schedule_delayed_work(&vi->refill, 0); =20 if (running) - virtnet_napi_enable(rq->vq, &rq->napi); + virtnet_napi_enable(rq); } =20 static int virtnet_rx_resize(struct virtnet_info *vi, @@ -3402,7 +3409,7 @@ static void virtnet_tx_resume(struct virtnet_info *vi= , struct send_queue *sq) __netif_tx_unlock_bh(txq); =20 if (running) - virtnet_napi_tx_enable(vi, sq->vq, &sq->napi); + virtnet_napi_tx_enable(sq); } =20 static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *s= q, @@ -5983,9 +5990,8 @@ static int virtnet_xdp_set(struct net_device *dev, st= ruct bpf_prog *prog, if (old_prog) bpf_prog_put(old_prog); if (netif_running(dev)) { - virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi); - virtnet_napi_tx_enable(vi, vi->sq[i].vq, - &vi->sq[i].napi); + virtnet_napi_enable(&vi->rq[i]); + virtnet_napi_tx_enable(&vi->sq[i]); } } =20 @@ -6000,9 +6006,8 @@ static int virtnet_xdp_set(struct net_device *dev, st= ruct bpf_prog *prog, =20 if (netif_running(dev)) { for (i =3D 0; i < vi->max_queue_pairs; i++) { - virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi); - virtnet_napi_tx_enable(vi, vi->sq[i].vq, - &vi->sq[i].napi); + virtnet_napi_enable(&vi->rq[i]); + virtnet_napi_tx_enable(&vi->sq[i]); } } if (prog) --=20 2.45.2 From nobody Sun Feb 8 14:11:21 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 D82A8143722 for ; Tue, 25 Feb 2025 02:05:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449115; cv=none; b=AMRLn9fRwDLbRLYrRVKspDkMxcbZWxw1T4+nYdTPOU3htV6JJUyUkah532X1OirgpBW9pU1xQfhm+/q6HYeh8UqNoX4MdnFfLId8goe5f/x7v5cO/EzSxAjj3kc9d/fBKKclE5gA1Sk86SQS6nopNsS4KcH7/h6ihMwzcchs/qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449115; c=relaxed/simple; bh=GWWDChFIQB2blY/jPfW79k1D8RtfKUSWn6cGyll0Ezg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZglE4a/BhsxdGWS+54ZwxsIgHO6tEpTS+rQ72xX2/BO0z9l3sZk6rt9GuBBoI31vEpDvtng2vGKXaePZBjEQrUl3kzLx7OMsRfTLeFVBZn7VxXdct/RLYqHNCa9heFIihxcXkRJNNascsq/hu97bJROqCL2ejHSEfxz7SAwrpHY= 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=lzzRgMx2; arc=none smtp.client-ip=209.85.214.171 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="lzzRgMx2" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-220d132f16dso78200575ad.0 for ; Mon, 24 Feb 2025 18:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1740449113; x=1741053913; 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=4Nd9NSzHqA5rIn7zkDOos29JmkSo0ut7TBrki2afWb8=; b=lzzRgMx2BFKdmOcweC7W/S0csh5sm9x4GhmyI7wYkwvEqVTpdV06yF/g2rJl2xsCWl p7E1sY1PWkIuMjligG3jprAja7tLwyL6g2jcxMBLNBf5/rvQ158XAjg0x6Nsw9QxQ8Yy pteH76c+73WVUsOKL8OhHpbs7iw/FKum4ReYo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740449113; x=1741053913; 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=4Nd9NSzHqA5rIn7zkDOos29JmkSo0ut7TBrki2afWb8=; b=NKGizGQOEcI3VWXlDv/G+yBGanlZwRkAJr0+qOXmjfUxgsvusq5xmfzZcwEQ6AL8LI Xy0vu0iMH8QPLNgODTxLMRW7llTTl53TVqlRg837kk4z5X2rifPfVlfrAH0J0HKCuzCQ yxjnJ9D02jXzFeBxU21fOonrsTrhm6XVCVNrj4C4yqfxfBHZi2RorNZ8LB52DKlDW52A M67a936YbIvDpS3ISk7HrCgQuYu1RWJbtCgb3Uj39RnrTcxtU+bdjm8EVY5ddl/HSAjq jW9xtDFG/9jiqVW5Tmmr5DvbzXQr+ioXLS/QDqDvCNw7mo1tfiJ3CiYln7/LFCDGFxJf LbxQ== X-Forwarded-Encrypted: i=1; AJvYcCVL+9DRS4niBpqE5FH7i7VWbAdHusFarNgcyDaH6Te1JMo2cN6AG1wyMD6lAjZsl6Db61TJj09x9zesyuM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywri84Cn11XhE20s5hQPMwnWc5RB7g0iY/4Q2Gvxf+UGeMzM1Bt WuW/JnZOukGzte24eWrBdQOMGYqnP4Ymh6G6WlhdUoTuXAv5hUNsnl2JAgFXHkC0GUMnblIByJY jDEI= X-Gm-Gg: ASbGncuksejXHFyXsi+/wXBq0U8feh8tC8tvDECPO+GaQlnOq2Lb42L/BzG6fFhm5UL tei6DeFBAnHoO3P+ETyDwwmToMokigfn+OgAWDpFnZ1pXbhKFEHt2h9SGFsb6tSemv1gC37vltQ Udw76E4ZykCpYyz1XdtxfwMA2oJ7KfV0HsSZnl2RWm9GH7YAJSMMqa7TDj2W9TSAWnh6Tx2JRUt AZYVm+kdYJoahkS5tWwaCs5KFRGq3H57PU14PRLHFuqcasE61VDK2aYBhDqW+v+HsH+3WHSNh2c YIyoA8/nWvVZzeWljclVyZkZB2iuq7RLOw== X-Google-Smtp-Source: AGHT+IFv9Txtr44zQZYD0oHJYIFMzObgMUa7hD66RW/Qe+HC1Hn+TXbMiigLaJAVRrR47Zqg0gTjmg== X-Received: by 2002:a17:902:d4cf:b0:21d:cd54:c7ef with SMTP id d9443c01a7336-2219ff31902mr229422035ad.9.1740449113075; Mon, 24 Feb 2025 18:05:13 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a021909sm2926985ad.94.2025.02.24.18.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 18:05:12 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, gerhard@engleder-embedded.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, kuba@kernel.org, Joe Damato , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , virtualization@lists.linux.dev (open list:VIRTIO CORE AND NET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v4 2/4] virtio-net: Refactor napi_disable paths Date: Tue, 25 Feb 2025 02:04:49 +0000 Message-ID: <20250225020455.212895-3-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225020455.212895-1-jdamato@fastly.com> References: <20250225020455.212895-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" Create virtnet_napi_disable helper and refactor virtnet_napi_tx_disable to take a struct send_queue. Signed-off-by: Joe Damato Acked-by: Jason Wang Acked-by: Michael S. Tsirkin Tested-by: Lei Yang --- drivers/net/virtio_net.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 133b004c7a9a..e578885c1093 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2845,12 +2845,21 @@ static void virtnet_napi_tx_enable(struct send_queu= e *sq) virtnet_napi_do_enable(sq->vq, napi); } =20 -static void virtnet_napi_tx_disable(struct napi_struct *napi) +static void virtnet_napi_tx_disable(struct send_queue *sq) { + struct napi_struct *napi =3D &sq->napi; + if (napi->weight) napi_disable(napi); } =20 +static void virtnet_napi_disable(struct receive_queue *rq) +{ + struct napi_struct *napi =3D &rq->napi; + + napi_disable(napi); +} + static void refill_work(struct work_struct *work) { struct virtnet_info *vi =3D @@ -2861,7 +2870,7 @@ static void refill_work(struct work_struct *work) for (i =3D 0; i < vi->curr_queue_pairs; i++) { struct receive_queue *rq =3D &vi->rq[i]; =20 - napi_disable(&rq->napi); + virtnet_napi_disable(rq); still_empty =3D !try_fill_recv(vi, rq, GFP_KERNEL); virtnet_napi_enable(rq); =20 @@ -3060,8 +3069,8 @@ static int virtnet_poll(struct napi_struct *napi, int= budget) =20 static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_ind= ex) { - virtnet_napi_tx_disable(&vi->sq[qp_index].napi); - napi_disable(&vi->rq[qp_index].napi); + virtnet_napi_tx_disable(&vi->sq[qp_index]); + virtnet_napi_disable(&vi->rq[qp_index]); xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq); } =20 @@ -3333,7 +3342,7 @@ static void virtnet_rx_pause(struct virtnet_info *vi,= struct receive_queue *rq) bool running =3D netif_running(vi->dev); =20 if (running) { - napi_disable(&rq->napi); + virtnet_napi_disable(rq); virtnet_cancel_dim(vi, &rq->dim); } } @@ -3375,7 +3384,7 @@ static void virtnet_tx_pause(struct virtnet_info *vi,= struct send_queue *sq) qindex =3D sq - vi->sq; =20 if (running) - virtnet_napi_tx_disable(&sq->napi); + virtnet_napi_tx_disable(sq); =20 txq =3D netdev_get_tx_queue(vi->dev, qindex); =20 @@ -5952,8 +5961,8 @@ static int virtnet_xdp_set(struct net_device *dev, st= ruct bpf_prog *prog, /* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running(dev)) { for (i =3D 0; i < vi->max_queue_pairs; i++) { - napi_disable(&vi->rq[i].napi); - virtnet_napi_tx_disable(&vi->sq[i].napi); + virtnet_napi_disable(&vi->rq[i]); + virtnet_napi_tx_disable(&vi->sq[i]); } } =20 --=20 2.45.2 From nobody Sun Feb 8 14:11:21 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 9437214F9FF for ; Tue, 25 Feb 2025 02:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449117; cv=none; b=fNtGNnEjIMy3ETbSAhwPVJDI0lEu7vVdv5ij7t9vk7Fcn3k+gMD9y+CwFQhVWOgIdexO6QNMoFUnlyv3hNqmzSXOdNyqTcmME7fsQ2ecK3sgNhC4e9ABms6yRoqBA+bLi6P1vnXFjP5QxYwBbqeCrVkzD1cXYVV/ycjnofgddhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449117; c=relaxed/simple; bh=YqThljS+z2rvWEULTOq783byam96cUms4PJNbrKe1eE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GJS8/A4O9htKHE4e/vxYMNeuk1PcuCOHmETso7xZERpz3c9qmRwzggVF40t9iOHMtoSvWJk9x/LUFK6KwDgt3xQVibGGj7oz7WgQUU9Vxk7bPonJudjbeDdS9yBGLMBa97T1BHr/g817E6+SGX9ofY/dUFjyAj2v0ZyX0qXARe0= 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=g3F8DLYb; arc=none smtp.client-ip=209.85.214.179 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="g3F8DLYb" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-219f8263ae0so106732345ad.0 for ; Mon, 24 Feb 2025 18:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1740449115; x=1741053915; 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=8Snh9ND17tUPe0ximyCM9OYF2x7OPKQXCCkpOdmoFuU=; b=g3F8DLYbapK9/Tko42G3Ii3IQ6ePYPFyWEQ8eqe2m6p8tzKqjidyeRkicHZaN14iCt EIdFWjxrw6JJslvyMsJZ8mUvvSWTwZ2d2ixgCui/ju8xNIJ0DJfdyPKA/HuT6I3I/MdA g3Q4XRTMSy8mKbPB6sTnjaVD46OCsKV78ytGA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740449115; x=1741053915; 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=8Snh9ND17tUPe0ximyCM9OYF2x7OPKQXCCkpOdmoFuU=; b=QlqzxBJS3Y5uiMD0wbJJgCnwaFIYFmt+McSiwLDSvVZ3Y0NpgWVzTBuhrPGcgPjbrj ewx7xLTazekkF1iCp7Y23LkJfRCDY1LlSggRg+980JwF2c/bGxKtb6pNeO1/Bqm9xC+6 cmA/bRmNZDvX87lx6gIlVH2IVf8+aM3J9TJkSZ/cob7zU/nAR8WFwg9FL6rajQOD6BmN jTDu/rUKcM5/PPFAnPQTg6tH/n61TcjwVcWOkWKqAT5/zK+9oB+Uh+RcBLy23PL2tbE8 I4VqTDXIRxcTXAjkBGeA+Rg4t0UuwNF1p6ueuvoDypOsWsW8beI8Qqj+G7yGGL96xvbr yB7Q== X-Forwarded-Encrypted: i=1; AJvYcCXIlBCkt5MtSN0UKxZOxkxKFIm/g5npHI3uW0RIB/3ZUweTI/f70CwTNPSDjiUmJp+zg+zwlhPeG+9OrFM=@vger.kernel.org X-Gm-Message-State: AOJu0Yzcswgg2/VmzrvlXgf8k72NeAGOp4wbS2CSlrba055SKq8Cjt2Y +08uwJ63fK2DrEXcjTpYQiuBfadPQxVFyWe9Xi+oN8t0dFy/CakZGoj/lhO+2qk= X-Gm-Gg: ASbGncs1rAt0FdMhN/yBAo60LalPgykMc8ax7zMQYMCZdvQkKvRZdQz0ci7ceslSgSa 5tWYljVZhAw1IjFzKi4GQwyZiK0huv8Mya10Dm2ameY3aLqZO5MQ1B1nrEsif4BTpIvqkEtE++O J43C6NX07UKLf9uf07ZfiZp+bbsA+7kk8D5pyltSJlFoncslY8Zp6wQckodzpGvJyEwDaMysTyG MXMrDtkoKUrgMbWp8pgc7P5suFzr8t1t8T/5fb6FigOmoytjehnQJDkQsH8ZIWtsO/Sg69gjfuy 1V58c0w3jUye7gfIx3W7Uk6MVwLG01OZkQ== X-Google-Smtp-Source: AGHT+IHCvop7PHEGOGbAsvCw/IG/lFcjljiGLYpCNBBJXObyJXhimwHpVmnD5+SRMh+DiFNZX2lEQg== X-Received: by 2002:a17:902:ce8c:b0:21f:522b:690f with SMTP id d9443c01a7336-221a11b9bfdmr255955815ad.46.1740449114783; Mon, 24 Feb 2025 18:05:14 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a021909sm2926985ad.94.2025.02.24.18.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 18:05:14 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, gerhard@engleder-embedded.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, kuba@kernel.org, Joe Damato , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , virtualization@lists.linux.dev (open list:VIRTIO CORE AND NET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v4 3/4] virtio-net: Map NAPIs to queues Date: Tue, 25 Feb 2025 02:04:50 +0000 Message-ID: <20250225020455.212895-4-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225020455.212895-1-jdamato@fastly.com> References: <20250225020455.212895-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 netif_queue_set_napi to map NAPIs to queue IDs so that the mapping can be accessed by user apps, taking care to hold RTNL as needed. $ ethtool -i ens4 | grep driver driver: virtio_net $ sudo ethtool -L ens4 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': 8289, 'type': 'rx'}, {'id': 1, 'ifindex': 2, 'napi-id': 8290, 'type': 'rx'}, {'id': 2, 'ifindex': 2, 'napi-id': 8291, 'type': 'rx'}, {'id': 3, 'ifindex': 2, 'napi-id': 8292, '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'}] Note that virtio_net has TX-only NAPIs which do not have NAPI IDs, so the lack of 'napi-id' in the above output is expected. Signed-off-by: Joe Damato Acked-by: Michael S. Tsirkin Tested-by: Lei Yang --- drivers/net/virtio_net.c | 73 ++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 21 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e578885c1093..13bb4a563073 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2807,6 +2807,20 @@ static void skb_recv_done(struct virtqueue *rvq) virtqueue_napi_schedule(&rq->napi, rvq); } =20 +static void virtnet_queue_set_napi(struct net_device *dev, + struct napi_struct *napi, + enum netdev_queue_type q_type, int qidx, + bool need_rtnl) +{ + if (need_rtnl) + rtnl_lock(); + + netif_queue_set_napi(dev, qidx, q_type, napi); + + if (need_rtnl) + rtnl_unlock(); +} + static void virtnet_napi_do_enable(struct virtqueue *vq, struct napi_struct *napi) { @@ -2821,15 +2835,21 @@ static void virtnet_napi_do_enable(struct virtqueue= *vq, local_bh_enable(); } =20 -static void virtnet_napi_enable(struct receive_queue *rq) +static void virtnet_napi_enable(struct receive_queue *rq, bool need_rtnl) { + struct virtnet_info *vi =3D rq->vq->vdev->priv; + int qidx =3D vq2rxq(rq->vq); + virtnet_napi_do_enable(rq->vq, &rq->napi); + virtnet_queue_set_napi(vi->dev, &rq->napi, + NETDEV_QUEUE_TYPE_RX, qidx, need_rtnl); } =20 -static void virtnet_napi_tx_enable(struct send_queue *sq) +static void virtnet_napi_tx_enable(struct send_queue *sq, bool need_rtnl) { struct virtnet_info *vi =3D sq->vq->vdev->priv; struct napi_struct *napi =3D &sq->napi; + int qidx =3D vq2txq(sq->vq); =20 if (!napi->weight) return; @@ -2843,20 +2863,31 @@ static void virtnet_napi_tx_enable(struct send_queu= e *sq) } =20 virtnet_napi_do_enable(sq->vq, napi); + virtnet_queue_set_napi(vi->dev, napi, NETDEV_QUEUE_TYPE_TX, qidx, + need_rtnl); } =20 -static void virtnet_napi_tx_disable(struct send_queue *sq) +static void virtnet_napi_tx_disable(struct send_queue *sq, bool need_rtnl) { + struct virtnet_info *vi =3D sq->vq->vdev->priv; struct napi_struct *napi =3D &sq->napi; + int qidx =3D vq2txq(sq->vq); =20 - if (napi->weight) + if (napi->weight) { + virtnet_queue_set_napi(vi->dev, NULL, NETDEV_QUEUE_TYPE_TX, + qidx, need_rtnl); napi_disable(napi); + } } =20 -static void virtnet_napi_disable(struct receive_queue *rq) +static void virtnet_napi_disable(struct receive_queue *rq, bool need_rtnl) { + struct virtnet_info *vi =3D rq->vq->vdev->priv; struct napi_struct *napi =3D &rq->napi; + int qidx =3D vq2rxq(rq->vq); =20 + virtnet_queue_set_napi(vi->dev, NULL, NETDEV_QUEUE_TYPE_TX, qidx, + need_rtnl); napi_disable(napi); } =20 @@ -2870,9 +2901,9 @@ static void refill_work(struct work_struct *work) for (i =3D 0; i < vi->curr_queue_pairs; i++) { struct receive_queue *rq =3D &vi->rq[i]; =20 - virtnet_napi_disable(rq); + virtnet_napi_disable(rq, true); still_empty =3D !try_fill_recv(vi, rq, GFP_KERNEL); - virtnet_napi_enable(rq); + virtnet_napi_enable(rq, true); =20 /* In theory, this can happen: if we don't get any buffers in * we will *never* try to fill again. @@ -3069,8 +3100,8 @@ static int virtnet_poll(struct napi_struct *napi, int= budget) =20 static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_ind= ex) { - virtnet_napi_tx_disable(&vi->sq[qp_index]); - virtnet_napi_disable(&vi->rq[qp_index]); + virtnet_napi_tx_disable(&vi->sq[qp_index], false); + virtnet_napi_disable(&vi->rq[qp_index], false); xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq); } =20 @@ -3089,8 +3120,8 @@ static int virtnet_enable_queue_pair(struct virtnet_i= nfo *vi, int qp_index) if (err < 0) goto err_xdp_reg_mem_model; =20 - virtnet_napi_enable(&vi->rq[qp_index]); - virtnet_napi_tx_enable(&vi->sq[qp_index]); + virtnet_napi_enable(&vi->rq[qp_index], false); + virtnet_napi_tx_enable(&vi->sq[qp_index], false); =20 return 0; =20 @@ -3342,7 +3373,7 @@ static void virtnet_rx_pause(struct virtnet_info *vi,= struct receive_queue *rq) bool running =3D netif_running(vi->dev); =20 if (running) { - virtnet_napi_disable(rq); + virtnet_napi_disable(rq, true); virtnet_cancel_dim(vi, &rq->dim); } } @@ -3355,7 +3386,7 @@ static void virtnet_rx_resume(struct virtnet_info *vi= , struct receive_queue *rq) schedule_delayed_work(&vi->refill, 0); =20 if (running) - virtnet_napi_enable(rq); + virtnet_napi_enable(rq, true); } =20 static int virtnet_rx_resize(struct virtnet_info *vi, @@ -3384,7 +3415,7 @@ static void virtnet_tx_pause(struct virtnet_info *vi,= struct send_queue *sq) qindex =3D sq - vi->sq; =20 if (running) - virtnet_napi_tx_disable(sq); + virtnet_napi_tx_disable(sq, true); =20 txq =3D netdev_get_tx_queue(vi->dev, qindex); =20 @@ -3418,7 +3449,7 @@ static void virtnet_tx_resume(struct virtnet_info *vi= , struct send_queue *sq) __netif_tx_unlock_bh(txq); =20 if (running) - virtnet_napi_tx_enable(sq); + virtnet_napi_tx_enable(sq, true); } =20 static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *s= q, @@ -5961,8 +5992,8 @@ static int virtnet_xdp_set(struct net_device *dev, st= ruct bpf_prog *prog, /* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running(dev)) { for (i =3D 0; i < vi->max_queue_pairs; i++) { - virtnet_napi_disable(&vi->rq[i]); - virtnet_napi_tx_disable(&vi->sq[i]); + virtnet_napi_disable(&vi->rq[i], false); + virtnet_napi_tx_disable(&vi->sq[i], false); } } =20 @@ -5999,8 +6030,8 @@ static int virtnet_xdp_set(struct net_device *dev, st= ruct bpf_prog *prog, if (old_prog) bpf_prog_put(old_prog); if (netif_running(dev)) { - virtnet_napi_enable(&vi->rq[i]); - virtnet_napi_tx_enable(&vi->sq[i]); + virtnet_napi_enable(&vi->rq[i], false); + virtnet_napi_tx_enable(&vi->sq[i], false); } } =20 @@ -6015,8 +6046,8 @@ static int virtnet_xdp_set(struct net_device *dev, st= ruct bpf_prog *prog, =20 if (netif_running(dev)) { for (i =3D 0; i < vi->max_queue_pairs; i++) { - virtnet_napi_enable(&vi->rq[i]); - virtnet_napi_tx_enable(&vi->sq[i]); + virtnet_napi_enable(&vi->rq[i], false); + virtnet_napi_tx_enable(&vi->sq[i], false); } } if (prog) --=20 2.45.2 From nobody Sun Feb 8 14:11:21 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 2CC13156F5D for ; Tue, 25 Feb 2025 02:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449118; cv=none; b=Dyhb4LB4S6zxqcHPSuUsUuQ2Vjpf3UEFJKUEO6yFA5/L7Omi1R5Cwxf/4X87e3TiUHBBJWC8Dz+wtwDeRZIxs4dzACI1w9sYiU9ufC+jd0g2TIuXNVCToN/WveIXS2sLAcQuI6ilfLRkopyuhIANWJsY2XZVG70WMtqrxGzHUO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449118; c=relaxed/simple; bh=sqHw+hydx5+J+3nTg7GiF/z4kDtuYCJJCVEcYQMUN3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VioV/4FFyHMHG25LSpmGvXeM9eGmApLS/OICgd621eSxUYb49NV2kyS3pjpCgt4SVh78TudDfz0JelAYTdmThLU65ykx67FneSS0HTRRYnrn+TB3YIyZTxTXe+3aOpfmSndB2FPb3G1F8LAJ+dlrKdh3nDpBamIjmASUHf5Y6kY= 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=SeVNVpXz; arc=none smtp.client-ip=209.85.216.52 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="SeVNVpXz" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2f42992f608so7929452a91.0 for ; Mon, 24 Feb 2025 18:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1740449116; x=1741053916; 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=6jTrPXbJae2NFrVRDORH6UMqB3L+3yI0Uf5GqI0AUQw=; b=SeVNVpXzBVmWL24GcetM5Sq9Fmxm4MTy37KknoKqfo5uz6UzqUGpwtSyIm/7WLmRsg QhDzFre74qNDcOkHjyAfLiVs0BO5XF/gn0zjMmxaWMINkhXwgAd+j35CUtA/CUj6CWxR GGWZ5dTw0Hn7mHgDI1+QxSJ657/ymjj2DpgwA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740449116; x=1741053916; 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=6jTrPXbJae2NFrVRDORH6UMqB3L+3yI0Uf5GqI0AUQw=; b=p7Aez2cB0j8vaEu4LImIuz5HNQ0lrN2PdGktM8RzNn+Y4AEZzf1/5xsBjn96NV1Uju HSEHshDEerB69JwcPU17HeYehqKd9Nqz9pILp08V3gAiu5naEqwG29UReGzekwsutJQn CAPPOYiQN5TFDvHfhBx3CD4AZsr5p2p25HfDm5Wp5F4ZhBj31qwHSQBTOc/n7YvDuXPo yi6DgDvSAx8ynji/Vitud0wMnHavuNorPJtBego++AbhVHo4Zx3fFD4RLf/WN4lN2F+z 89RMz7aI2nJbskdh8qLV42XX+mC3RG/5PdBbvVEmRDvp6yvQzYwPpuLlQGM9nXBjZzOt Pm2g== X-Forwarded-Encrypted: i=1; AJvYcCXzkIOpU0EUOyLNuyna0K0NiF2rPjo+WyECIRTbFRyygCqkgCjviJuuUkrYubr2InzYiKhsQU5lm0Q0iSI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7KNAnaK4lzyMdL2RQ6hSrCwfWf11oL9i9xmURLKwpZbTElQku SAkuqzGEDWwCsaPsFZhcye7ImuVL+TrkY31mDzmd5b836MQDs5xu7KqXxyOrn2plz53FvV+K9nA Tyes= X-Gm-Gg: ASbGncsi4WI4FIo3dXN7eEgbf+Gw4s0uBOt6A7ObWWUbPn4CdAzQxR+h+ZjB0T2wV0K +oPhdZJw6tPiMS4MHyDJVl08bD8LpxfdoAc+X5+CcP0O9zi1uzQZGGQWnMueHBB9H9lihjVkhxF BB3N32nRzTAGzgrATbTFUs/QJXNzkSXAEYdKpGudKQamNFTIlrgrTb1AZ7C5M5EhE1hjOvNzxza yatGJ/eSEDtfE+n83INl5U4OMxWc/93mWMajDzI/EJdSpQPRaNoCZl7Ht//IQz7SBEzXF6FEOve CvFTEGm3Kci0b8T+hLJtVxOggN+/2WEwJA== X-Google-Smtp-Source: AGHT+IGbedvJQbC1f3rBktTR2fDXpQeCE8dIxMRlL1M+qlTRLacNZdzhniWMjgESJ1sAs0pz8D4XNA== X-Received: by 2002:a17:90b:4a41:b0:2ee:4b8f:a5b1 with SMTP id 98e67ed59e1d1-2fe68cf3fc4mr2493123a91.24.1740449116365; Mon, 24 Feb 2025 18:05:16 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2230a021909sm2926985ad.94.2025.02.24.18.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 18:05:16 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, gerhard@engleder-embedded.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, kuba@kernel.org, Joe Damato , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , virtualization@lists.linux.dev (open list:VIRTIO CORE AND NET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v4 4/4] virtio-net: Use persistent NAPI config Date: Tue, 25 Feb 2025 02:04:51 +0000 Message-ID: <20250225020455.212895-5-jdamato@fastly.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250225020455.212895-1-jdamato@fastly.com> References: <20250225020455.212895-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 Reviewed-by: Gerhard Engleder Acked-by: Jason Wang Acked-by: Michael S. Tsirkin Tested-by: Lei Yang --- 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 13bb4a563073..186030693eeb 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -6454,8 +6454,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.45.2