From nobody Sun Dec 14 21:35:35 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 4982E195808 for ; Thu, 16 Jan 2025 05:53:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006811; cv=none; b=K86pZcaWU0odQ7j7BHNG4wZgj1xw2BZTEsaFatvoMpA3z/VoUgW73gkv4M2cHyjQ08k4Ucmbx8S/SGSSXABG0FN9aER8tG5SgsFVvAMSPPL+IJBQLLGGcCiZsrF9UTsnNShwr29blKYBMN4R1fqvAmx/Q1bBBHPLMC4yaj+1cBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006811; c=relaxed/simple; bh=yJvHEqdHpoC28W6nXw4OZ31j2d6z3msHRmx43NIpiUQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pmkUUbCq03RhDxkFhAnUtbKN2zs0Bmo6yzGR91th1foRVy0umHH5g1NhjFrtT4dEkZJBB4/IU/lWqy2Xru0kf91wm1pxGhv88DQooeGRWsifGlRCUBIUwvV8rjNDJGiepBJaT26p91FKes+DZUOK4BdOraqF1mmdQXFMMxM7s+g= 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=oprsE6mQ; arc=none smtp.client-ip=209.85.214.181 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="oprsE6mQ" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21649a7bcdcso7840115ad.1 for ; Wed, 15 Jan 2025 21:53:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737006809; x=1737611609; 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=XcY+kSjeMMu9asV4FI3bEFO3nH1Uxd3geQomjlGuQlg=; b=oprsE6mQGDWzDzFGb8J8iaeQOzuEOBAKNbiT03ljfZE2+dx8+0teuzBfJBKoTB5rmh klN+6yP3MYjQS04WbpzT1K6dAGxnxhjB+QYuXluV/812rzHR4ACN5AIOp53eJ04feIrW qjVIhxGWfTXnMsXxGTAe7aiPTCaD76FU6GJZc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737006809; x=1737611609; 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=XcY+kSjeMMu9asV4FI3bEFO3nH1Uxd3geQomjlGuQlg=; b=DdE2R+EWymEsruZsdICGIJ455aOob3qXKwWCKQ3QIPwRL6sbdvK+whL/qY38uhpFbT RoroKu2RBwZBU48N6mU+5gMCEiNTzngT0C4aM838iTvYcb92plZGl6vFiH1l+HH2wfzZ t7WH/+b5cwSEeRxiLqxObXOMaI36MOPXoU4zk09JEip2veeb3ljXrWzh9XTC4PR+5k9k UxtU9WfUSXBAXVfS/xLGx2MEp3HqgBZYwORThFkV1GxUG/JOyARtIrd/T0cepNJhZNvc RNLPdmiAnyG23kJW65OTWCkmKlgM+Mc4ly7s/+Tit9/lPdG3kGTGBRvc8yMMirMiAFqw 3rfw== X-Forwarded-Encrypted: i=1; AJvYcCWJcHGS31adO3lg3f+Onrtdf3+mt1JZgx0mhFPNz4yK/VHOrjUNfccQel4sdDPbtv85khtMwuScvmgGoHE=@vger.kernel.org X-Gm-Message-State: AOJu0YxB49iThNsG+hM7L5O29NPtKARbV61OQntTZN6Le0UDszUwKezs qfMS2NhFEMBtz5XFZI/sevG6EVwwtsnUn0MTKXj5iUrmKS9qdLLcetzdD6gjMknDYlolBEtjIGN G X-Gm-Gg: ASbGncuwjsgbq5IH5E8tRwOG+r4+V/5PitIEBhgeOSJI7U35aUJ6MuvPAMBLgpTuYoM yxG2vdCbWci0Q1uPauS9DIQAhKDn7AyqjUJHC1QnI0xGP/OJ7KJAaAa2/AV21IBTn6AMeatyOC0 Y3I+KlSOIr4SeRSTwuYiOfi7bjw+EXDKQ/bqLzBcXjq6ud4EJnarn8oaY+zcfZUe0HwJzmpmU1G wkLRTCtu9rW3n2qLX54rho4Ctc8dKDwTH0KrfFPnVYqsy98QdAHbuLnPCAeOgQN X-Google-Smtp-Source: AGHT+IFGBkkanzsZABlx+kwVbhQWzWrd9fcJLyyqg9XrcMim/tp4HH707mqDKYrn2ErGZPkhsWUDLA== X-Received: by 2002:a17:903:2311:b0:210:fce4:11ec with SMTP id d9443c01a7336-21a83f42687mr507328185ad.1.1737006809538; Wed, 15 Jan 2025 21:53:29 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21a9f22c991sm91249655ad.168.2025.01.15.21.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 21:53:29 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: gerhard@engleder-embedded.com, jasowang@redhat.com, leiyang@redhat.com, mkarsten@uwaterloo.ca, Joe Damato , "Michael S. Tsirkin" , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , virtualization@lists.linux.dev (open list:VIRTIO CORE AND NET DRIVERS), linux-kernel@vger.kernel.org (open list), bpf@vger.kernel.org (open list:XDP (eXpress Data Path):Keyword:(?:\b|_)xdp(?:\b|_)) Subject: [PATCH net-next v2 3/4] virtio_net: Map NAPIs to queues Date: Thu, 16 Jan 2025 05:52:58 +0000 Message-Id: <20250116055302.14308-4-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250116055302.14308-1-jdamato@fastly.com> References: <20250116055302.14308-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. $ 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 --- 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 | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index cff18c66b54a..c6fda756dd07 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2803,9 +2803,18 @@ static void virtnet_napi_do_enable(struct virtqueue = *vq, local_bh_enable(); } =20 -static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *= napi) +static void virtnet_napi_enable(struct virtqueue *vq, + struct napi_struct *napi) { + struct virtnet_info *vi =3D vq->vdev->priv; + int q =3D vq2rxq(vq); + u16 curr_qs; + virtnet_napi_do_enable(vq, napi); + + curr_qs =3D vi->curr_queue_pairs - vi->xdp_queue_pairs; + if (!vi->xdp_enabled || q < curr_qs) + netif_queue_set_napi(vi->dev, q, NETDEV_QUEUE_TYPE_RX, napi); } =20 static void virtnet_napi_tx_enable(struct virtnet_info *vi, @@ -2826,6 +2835,20 @@ static void virtnet_napi_tx_enable(struct virtnet_in= fo *vi, virtnet_napi_do_enable(vq, napi); } =20 +static void virtnet_napi_disable(struct virtqueue *vq, + struct napi_struct *napi) +{ + struct virtnet_info *vi =3D vq->vdev->priv; + int q =3D vq2rxq(vq); + u16 curr_qs; + + curr_qs =3D vi->curr_queue_pairs - vi->xdp_queue_pairs; + if (!vi->xdp_enabled || q < curr_qs) + netif_queue_set_napi(vi->dev, q, NETDEV_QUEUE_TYPE_RX, NULL); + + napi_disable(napi); +} + static void virtnet_napi_tx_disable(struct napi_struct *napi) { if (napi->weight) @@ -2842,7 +2865,8 @@ 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->vq, &rq->napi); + still_empty =3D !try_fill_recv(vi, rq, GFP_KERNEL); virtnet_napi_enable(rq->vq, &rq->napi); =20 @@ -3042,7 +3066,7 @@ static int virtnet_poll(struct napi_struct *napi, int= budget) 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_disable(vi->rq[qp_index].vq, &vi->rq[qp_index].napi); xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq); } =20 @@ -3313,7 +3337,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->vq, &rq->napi); virtnet_cancel_dim(vi, &rq->dim); } } @@ -5932,7 +5956,7 @@ 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_disable(vi->rq[i].vq, &vi->rq[i].napi); virtnet_napi_tx_disable(&vi->sq[i].napi); } } --=20 2.25.1