From patchwork Tue Feb 25 02:04:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13989179 X-Patchwork-Delegate: kuba@kernel.org 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 57FAD2C9D 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=1740449114; cv=none; b=ObG40we0TPsU2U5mheUR4Wi4oUT4oHgAQ0vVI3z0dRCc89aZC7mqO6u+ufWFj9qihqjPHzjSX1Y0Z5OJLRfw1PuZtt4gXHq/nTtRmLZBqd7n+iBJRo5pxeXvdUmcbRW2X8kQY8jGRiHEFi+whKs5+ihy6ZCKd0okXg4xpM3r6vU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449114; c=relaxed/simple; bh=O1/087om4F0aQVS80+qWqW7HTYSlWzFCPffyQOL+39g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xc15M0VJhIXOIVfDw4UiHKFr/7GHxorSDkirHj0rLlXZC7CpFOD+gKgZx+DmsB+dPty7O1g8VGEKbw6YcYn/2wwAlxkxsKJAtRS4dvoIgXQlug9tLQmK7WnTVpS2GDu3/+x7T7UxNjZhTLI0xhaZS3qfCWgBhmKT+vJm7GGocAw= 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.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="bw9CQfWv" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-220bfdfb3f4so226375ad.2 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=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=cNI2La8zZ4DYx04W9B2mPI/XECHAkC5eigTHniqmRV8dTGhw8lwDWk9pkYc/UBHwzl JitovVPjluyUpFje+Mo4hym30djDcf0m+VNQ7IwJW0aLGA0nYVb/oV8jNLP6Afdmj0KT jcdH0VjgHXPmltCP9Ceq/QxhBPCKrgbE1jbpM/KvjzJZqd7/9aLi6/cSiCnAl/M74egY ydXwGFUTvjvU+jJn+ITvQqO9J3luvYVA+HkQzHftCIUzcL4NtpzUUxj9IpwxwVHxvu8S +qd83pyqXtHhy9HezvCRWtP6xsZ7k37h1D5wU8E+VJu1DJQsr1r+43KDrayPrUBgy3o5 lfgg== X-Gm-Message-State: AOJu0YwCd6FRY61S0QX20GbSPsabXEzoqlQprQOvKGMlmrLcVK5h6a6j fHXxhtFmfHEtGIeiR/Diq01JpQpIaev5/gmZb36IXxwzFXEGdhyYry0rGezylCI2rpvIe2/3jK8 fPhRDMcrSJlOC4BZHWsHqQuIXXRqbphraXNiRJeEZwMa04CQ+I6Y3ub1men/gpVDJ2cseKb/GiV ub6uj43oICJfMzRkB3Tz64YwOyFLMtIUs5Rn8E2g== X-Gm-Gg: ASbGncsO8Gx2pCsFsW/XHFrFyt4GVJmRwWz/K3ouMOIzNyfzGTsLzdEgXyxsu1BNPJ1 2+VTgL77BxJru2bJOTVS5na+7SeWEao+Dvedl5WsYqVuZQ6bhw3boIgG0V/AimSBnazLaX4iDBF Ye3bhYrNJvN1GskfxbwzKsmnw2WQuaHf7fJWdSLpGaRhLj3jWOKztgZVaem9q+hofHxc4FHEMY/ gf1NbIGzFc7p50/8FZ3XvyvNOaLsxNxyGJoyWkVv5WlL5ywNpevj4HM8KyB4R1mrrFW0d4qYAwR xz4NBKXz4MY14QSiISij+MIg+fq00jI55Q== 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_P=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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 --- 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); } -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); @@ -2820,10 +2821,16 @@ static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi) local_bh_enable(); } -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 = sq->vq->vdev->priv; + struct napi_struct *napi = &sq->napi; + if (!napi->weight) return; @@ -2835,7 +2842,7 @@ static void virtnet_napi_tx_enable(struct virtnet_info *vi, return; } - return virtnet_napi_enable(vq, napi); + virtnet_napi_do_enable(sq->vq, napi); } static void virtnet_napi_tx_disable(struct napi_struct *napi) @@ -2856,7 +2863,7 @@ static void refill_work(struct work_struct *work) napi_disable(&rq->napi); still_empty = !try_fill_recv(vi, rq, GFP_KERNEL); - virtnet_napi_enable(rq->vq, &rq->napi); + virtnet_napi_enable(rq); /* 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_info *vi, int qp_index) if (err < 0) goto err_xdp_reg_mem_model; - 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]); return 0; @@ -3339,7 +3346,7 @@ static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queue *rq) schedule_delayed_work(&vi->refill, 0); if (running) - virtnet_napi_enable(rq->vq, &rq->napi); + virtnet_napi_enable(rq); } 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); if (running) - virtnet_napi_tx_enable(vi, sq->vq, &sq->napi); + virtnet_napi_tx_enable(sq); } static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *sq, @@ -5983,9 +5990,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct 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]); } } @@ -6000,9 +6006,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, if (netif_running(dev)) { for (i = 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) From patchwork Tue Feb 25 02:04:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13989180 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 4CE4B14830F for ; Tue, 25 Feb 2025 02:05:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449115; cv=none; b=tYpo9uO9cxri/R4QK9kY40WBmHBIJUT62QA+KW9mdfc5lLj4xh45pOGVTKrjrtG9r7eoayujGepyfl8751h2oEA1JNPTTYxzdLzhRGnhs4Y93IwmafFhlNizCbmHTQX2Kec/syMANyrCUL8756V16a+x+ZJ74z6oiE9vmLBsTJY= 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.176 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-f176.google.com with SMTP id d9443c01a7336-22114b800f7so100521595ad.2 for ; Mon, 24 Feb 2025 18:05:14 -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=inj+nizx8rnQbqwJqnGppLEFeIU65xIXnoSC8jOaBs09SgV6iQd/j4xfsugQHv7mUz wLSlhp16ke1IRBCdjjy+mSPhyEd5RE2U+00b9N3K75y7GvlVmMWXmprS9J4HEY5aSJf/ okPV9gS+HSpXXn8DP8JJBPQu5rQfz0aM8AP7/Yopcw+RZOOr8I4NJ3Z3DFsdC2CkARGV y+V2hjwwcff/CFkGUmeiR5AFbaRmACWOTlyYJRyKbttW1HlslhdDU2KoGCwNXjQJhLZb m/5+o5jSTm2rCooPF3Civ/VJEacB00D7BsFFDWOp+7Ar6DN31NeKaFDUM8b8M9M8GBBN prhQ== X-Gm-Message-State: AOJu0YwvZeE175j6BlzntLotNb513VGziI5gyAV6sVFrZWpP2TWeIZwE ePoGdHmnIxLY/wCVk2Gk/KFtvAnV6eKef3TLQPq/IrQmFLCXzRqpuHWo1pO5vBfDO8IK0zXgShu vWHaDsifIEL0fY47EHdv5LomZmqTvTRK1ZXGHn2ZVjQiqXRxXnrNij5vlh27coTEEi1WTgaJ07M npZ1EEyG5JklBgGtmL2J0FSQZSTV8EohPXj+OKAg== X-Gm-Gg: ASbGncuzUYLGKYAqjBPx0HgIGpOxBqqgB0P5MvG2ESmP6C6N6sB4VithMd+DHwbaRJs cnTkVyik+/VHp0jmxtvl51pboXkDoIYCzmlc8FAWnoKgYB+5Ul4hJfvE7C7ytjbT6V3cefZZj92 OgM1ekvgGrUaxrgEZHhwCx6KTeBWdjabmOf9qlcF75Jxd3wrCY+800dYF7KlvlxSgTFyshkcChE 8gsAsvxyY7L7f63iw31zbExNj+OnxONyHvvpD/gvznxEgBMnUPX4xvbbBdZaEzZcdhC5StuErJ4 JypbWud0PSKRSuSJc8VYU1HQZ2+C2aVlgw== 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_P=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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Create virtnet_napi_disable helper and refactor virtnet_napi_tx_disable to take a struct send_queue. Signed-off-by: Joe Damato --- 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_queue *sq) virtnet_napi_do_enable(sq->vq, napi); } -static void virtnet_napi_tx_disable(struct napi_struct *napi) +static void virtnet_napi_tx_disable(struct send_queue *sq) { + struct napi_struct *napi = &sq->napi; + if (napi->weight) napi_disable(napi); } +static void virtnet_napi_disable(struct receive_queue *rq) +{ + struct napi_struct *napi = &rq->napi; + + napi_disable(napi); +} + static void refill_work(struct work_struct *work) { struct virtnet_info *vi = @@ -2861,7 +2870,7 @@ static void refill_work(struct work_struct *work) for (i = 0; i < vi->curr_queue_pairs; i++) { struct receive_queue *rq = &vi->rq[i]; - napi_disable(&rq->napi); + virtnet_napi_disable(rq); still_empty = !try_fill_recv(vi, rq, GFP_KERNEL); virtnet_napi_enable(rq); @@ -3060,8 +3069,8 @@ static int virtnet_poll(struct napi_struct *napi, int budget) static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index) { - 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); } @@ -3333,7 +3342,7 @@ static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq) bool running = netif_running(vi->dev); 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 = sq - vi->sq; if (running) - virtnet_napi_tx_disable(&sq->napi); + virtnet_napi_tx_disable(sq); txq = netdev_get_tx_queue(vi->dev, qindex); @@ -5952,8 +5961,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, /* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running(dev)) { for (i = 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]); } } From patchwork Tue Feb 25 02:04:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13989181 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 1598C154449 for ; Tue, 25 Feb 2025 02:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449117; cv=none; b=JM0Q1Zq+9A1Bc86tC/4/n6ZPGLd3zPFulexk2fLY6plQfvg5wNbCf1P8TwAcnCxKiSxKLATQdMNbryKdFY1SfBhPwywnjeRGCKeM2wBuPyk9HEv4AIOzkH0GuEXRG8kpAzNPley1/KkdlQesnX69mNxRAtUvk5Z1dXs1Ls+YMBE= 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.178 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-f178.google.com with SMTP id d9443c01a7336-221057b6ac4so97077525ad.2 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=wCXxO7doQgHvAj1ejyQL97G9+qeTHFT7tT1KNTJxIZsTK2MQFjXlfz/+TBxf2RvNT0 xBqXbuncs6fQpzD0sGOGeCs6zzENDE6unWVLt8OJSRc2hPTH3RtVu2TzMZ3RqT9EcGPh mVgLk/Jo/yeQps4FSCkLmmZLbSX2BlXeGmvw60BfNwY60uVt12egKGYKTMMNFwgzey2b LEWkGpifWWT8d0XNrCBmx6coA2MW6ktuG3URxm7rS31PJUuVNAUo626sc4FmKTxEQpsT LfpMTdjPOucMYn8+PFhvJ8xfAbwVI9hoFgH3CM+GMtsiiXuCJcsYUCynPJRfT9V90kyF lkYw== X-Gm-Message-State: AOJu0YxhvBTZx5SUAgxop7KHW4uh3ZDhe9L0aGYO4Z53eNM7dLYdsArL PMVZ55dxIWUd7Mqr5KlUYLd2iscZW9vCVHtdgNV1RTjBfPEbZo+4WsS8bqEmLzW/+uUNHetX2R1 5qE0kuSoi1/cU00caBHjOIGtd/I6hrlVomSlCqwG4X8g9Km+PTNHMMJtCAlcrNB3dOv/2iTrZAO xIs+/THj22yWElJZneuz4n2bENiGHdi8UPupZhQQ== X-Gm-Gg: ASbGncvl9S5t5Zrz185KVNO7mBFoSEHlgo6ClFcxdEt1fE2A1MNX00OitoMrf+motAV as5BB7/3SoNXk70SIxXHZnYoqiBurbr0QCY1PuHgxU2bm7a29hdDNNXmhzdsygqZ9utLLhg/S2P wWcpHL+T3ItXi7ADBN5lW5R/FxqzYMgu9E9Ahz1Lro7XQC6cdZpBp7BvbFc6J4tdbRIVZ7A8Rp/ pDxpGXF71deicwZV1t8TUerx7MmwXYPs5XVHii7rhMCN7HluMsHgqPI6jWWuXZAagz/rg7VP3E8 DdEqsacb6uluOvr9NKT5pKtQz+Cf0x1A8A== 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_P=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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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='{"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 --- 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); } +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(); } -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 = rq->vq->vdev->priv; + int qidx = 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); } -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 = sq->vq->vdev->priv; struct napi_struct *napi = &sq->napi; + int qidx = vq2txq(sq->vq); if (!napi->weight) return; @@ -2843,20 +2863,31 @@ static void virtnet_napi_tx_enable(struct send_queue *sq) } virtnet_napi_do_enable(sq->vq, napi); + virtnet_queue_set_napi(vi->dev, napi, NETDEV_QUEUE_TYPE_TX, qidx, + need_rtnl); } -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 = sq->vq->vdev->priv; struct napi_struct *napi = &sq->napi; + int qidx = vq2txq(sq->vq); - if (napi->weight) + if (napi->weight) { + virtnet_queue_set_napi(vi->dev, NULL, NETDEV_QUEUE_TYPE_TX, + qidx, need_rtnl); napi_disable(napi); + } } -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 = rq->vq->vdev->priv; struct napi_struct *napi = &rq->napi; + int qidx = vq2rxq(rq->vq); + virtnet_queue_set_napi(vi->dev, NULL, NETDEV_QUEUE_TYPE_TX, qidx, + need_rtnl); napi_disable(napi); } @@ -2870,9 +2901,9 @@ static void refill_work(struct work_struct *work) for (i = 0; i < vi->curr_queue_pairs; i++) { struct receive_queue *rq = &vi->rq[i]; - virtnet_napi_disable(rq); + virtnet_napi_disable(rq, true); still_empty = !try_fill_recv(vi, rq, GFP_KERNEL); - virtnet_napi_enable(rq); + virtnet_napi_enable(rq, true); /* 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) static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index) { - 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); } @@ -3089,8 +3120,8 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index) if (err < 0) goto err_xdp_reg_mem_model; - 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); return 0; @@ -3342,7 +3373,7 @@ static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq) bool running = netif_running(vi->dev); 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); if (running) - virtnet_napi_enable(rq); + virtnet_napi_enable(rq, true); } 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 = sq - vi->sq; if (running) - virtnet_napi_tx_disable(sq); + virtnet_napi_tx_disable(sq, true); txq = netdev_get_tx_queue(vi->dev, qindex); @@ -3418,7 +3449,7 @@ static void virtnet_tx_resume(struct virtnet_info *vi, struct send_queue *sq) __netif_tx_unlock_bh(txq); if (running) - virtnet_napi_tx_enable(sq); + virtnet_napi_tx_enable(sq, true); } static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *sq, @@ -5961,8 +5992,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, /* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running(dev)) { for (i = 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); } } @@ -5999,8 +6030,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct 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); } } @@ -6015,8 +6046,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, if (netif_running(dev)) { for (i = 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) From patchwork Tue Feb 25 02:04:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13989182 X-Patchwork-Delegate: kuba@kernel.org 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 E48197081B for ; Tue, 25 Feb 2025 02:05:17 +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=1740449119; cv=none; b=e+kF6T60z7rCnIUYA+O6RAOp7yaI977r1NvE9KetPbalF/BlBSqf272kFLo3xH1+WSP63FI71dwKGJkvI8/TrL3jBK6M2Ez2xcTOSFU7fWs00cgi2+9+rqJUt7j3uFCri4MQC7iXPUxvgyt1USIH1GDBbKnbb1ysSFVhEawBKTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740449119; c=relaxed/simple; bh=sqHw+hydx5+J+3nTg7GiF/z4kDtuYCJJCVEcYQMUN3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q9xgwTaZA1Q9M+hkkfvQIm0hG0265fOvreuIjz2GbMr8BmEwHHSIq4HbY4q1/Z7GK2QY7TZhxthn6eVB7nLDPxUyIhwhcLujay6555w/oE0m+S7M3dwd6U/AMAjGW1tJ6x90sAKp6jVCOubuRBJQ8lMp3JuW0stvaiDFC+ETAfc= 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.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="SeVNVpXz" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-220f4dd756eso105245225ad.3 for ; Mon, 24 Feb 2025 18:05:17 -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=jINXRmetZce10ziODdtFBduInknHDMCW9CknUyI72S3Zd6qkN6voP2nLqDd0ozvhD+ YhCrcsuCM+jNV/aInEpDFF2pGUo/RKHJOp1LlUZQbDg7mcvpptp/meGdMPfftL37RWJt GoKg4emavhDyLk4FBWjpJ94ftNTFXYfJA+QNIQfh1Zz9wR4sJoo6pq4EtQApDmfXN8kS WOCAsqj5V4TRZeLGDd64stv6bx3+xCo/sESbqCjMOL31Gvs6deBMkDOGBTge5hH4vFA1 3p8bUgNpDzvo6j24nzLfvxg4pqJG1JmIDUXTXzWfFy8wvbK3sWbSfN6jd0tLl7XAKTJi /YDw== X-Gm-Message-State: AOJu0YygNqg+s2Cx9f6qaBWM0CqTBCQmwBomO++iVjd0XrUgJyX9CQ99 Z9xQ/lEWEvqUsbycuDeSvj0uz7fX1ljOh2UCthjP8raDlfrL/on3eQcFvNDccVWpQTZGEUoVaxY RrvM2yjlhLGYpyKkqZ1sDT/eHCCieLc/w5bdW0At0YKaSqTfN2X96DsOqQ1qdwfx1IVscLGxwum HzkfyTVFpba0B7FqtRmjfBVO3yFNQV31R08QFnsA== X-Gm-Gg: ASbGncujxms+m81jhaM7vwCw/ahOAt/ijFC8rZMpF9z2h2fCZ/+j16Psat6BNMrBZ5Q Z67rE90drjxtPV4txD5C5NwdZRUEKTdJRgc1KmRvQuShkJ/IPweVfTVuLkcFrZ1x+J8isLwhuTI X/e0TMPGQLwjEmjxZR6/LvU3W0wroi2ryVPLYnqaItIactMPznKHptAVyR5TTDlTiQiSG8Jld1F L4qjFylJPen3tChVO7NR2Np7OlXUoLqDWaXSOTF4aH2BBQdSqmmhz55io4S0c+f2Zf0Wi9Vw0Ds 2Yv0OjIRuXwDPASRbLTJmntBxPKXgX/e0Q== 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_P=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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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='{"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='{"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='{"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 --- 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 = 0; i < vi->max_queue_pairs; i++) { vi->rq[i].pages = 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 = napi_weight; netif_napi_add_tx_weight(vi->dev, &vi->sq[i].napi, virtnet_poll_tx, napi_tx ? napi_weight : 0);