From nobody Sun Dec 14 13:57:36 2025 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 2EE9D1F756A for ; Tue, 21 Jan 2025 19:11:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486671; cv=none; b=hstgojylPowJCmGfGi57+WXyQ5K2BJBAOjWlhX2z+s7E3Vh9dmYE+Vi6OQJwPeNudOA5IeQmPPoRQPSF4/z9nOJtqhIPCCVy2N7aEwjSKzBIDqO5q1fDC26D0jQKb8tCxjrqDBZBja+1Tw7TwMohGWykDDyO6BEKwFK9AzwsWC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486671; c=relaxed/simple; bh=36m+Ryb9CJuvJR9nbvQowFH7ClbOSrNUnAqBaTNmIQY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a0/Sa68vWieCvs+mYyE+6Q4U0IuU9HutTmyu9FYOewwbHj3u1b0dF/PnHrl3+9ZrdRxHzR62nNKhdXZrg9Y/sgQy7XpjswA3q6FFnHSIWEWZ+aNfc86eY7Z+CEMTUJzqGhnduoWiQOD+DJ3MvyrzHlzU/6ZvrB03wvageoFlm0Q= 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=X422TL3N; arc=none smtp.client-ip=209.85.216.53 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="X422TL3N" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2ee989553c1so10393029a91.3 for ; Tue, 21 Jan 2025 11:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737486669; x=1738091469; 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=FDwiQXOb0dtbRJ3DmhupJOiqoOo1ySphxgwOZ65b5Lc=; b=X422TL3NgiDRJB9TLcq0u5EBu2w1v5ZZuFriMvZtJRVPqlQxCpFEvdkuozAlgADo09 wrb0sKV4WC9ZNLGRbw7W4vYgPAn2rVo0JLUNJ87Fe9XyeyP9qBsPpvuz/K/ND6pG3KaF XzomIJxyA9JzADSCTyp9SgLZo2+8jQppuyxc4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737486669; x=1738091469; 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=FDwiQXOb0dtbRJ3DmhupJOiqoOo1ySphxgwOZ65b5Lc=; b=PBnGZ32MeS/8bPAO4nJrZU5hQF1svRv1KqUe1K0AcmiZmLaSMY8NQtd5vmIILwBvxd gdhcOzoPkdr+2OOgKiqrLL+aGdc478Qokatgm1VNjbp9TGZ8VJET4SyFTE1tjwDzozwm Lf6Jkm7+P0/Ts+7B8LlbaSKYqkkKjsN5VH/mIRfsT2pITDXI+c36ds+drrN8GYTEso00 8t87Qe0vTyVWrnlle//Jlhwub2W5ZMdw+fHy+yngB/JNnNnH7bAIRtKQu2FZBc1+mtcm iPezFUO+pa2PIU9tEZLiS7TuY+PZqjozyhnHjMOluavjRNlJAIuFCkptlXjJbO8BIubR jnKw== X-Forwarded-Encrypted: i=1; AJvYcCVUVQFr3oJXc/XsjtwhrhuHiksWQMuxLCc9nFr9lV2tEKgDaD/lVD6TeopN0oPBOK+59YX5FUQ/eiztVEM=@vger.kernel.org X-Gm-Message-State: AOJu0YyQEd/hixuU98gGXOJ8Q/pyaRfKQzhEai40y3xj9YvEcNd7RYVo g8US8yG8+zC2OnVn3GyRlREJswYhfTszimsVbg7k64FHG2oiNY86/SHi4mFsIo8= X-Gm-Gg: ASbGncvVSoK7Ir+BGGeNnsdDPZUGaSndwruphPyx/vU7+BxFnAel6dW3kfxQ0+A5a2s 0uzoYrgOFQFOObnQyiYBkuMNmB7cpFDnBjsTbNgDFDOxC5xu34MllPRzKK1Osh7EQ2FA3FpQmFx i4P5yIUaZY+OcymAwMw0Ay2XP+HM+i/QcrE3bPFrY0YFbdvB5uW3PNl+IHNJaok+M1+6Z07v/a0 YLbI1KOLUvqfa6AjyLOmPQ5UQTNK58BEAbszMjNyY32h0+h6kMukK1+KOwJ1O8NmKZFJ2/+jTco GA== X-Google-Smtp-Source: AGHT+IFrbRJ/R0m0SceTG3oQbb0XNatc3hOdnfunYdBKaQ+YC8e4bymwDNEoE5iJLWgFoSXDDDTmQQ== X-Received: by 2002:a17:90a:d60f:b0:2ef:31a9:95af with SMTP id 98e67ed59e1d1-2f782d32956mr26450648a91.27.1737486668611; Tue, 21 Jan 2025 11:11:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 11:11:08 -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, Jakub Kicinski , Joe Damato , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Sebastian Andrzej Siewior , Lorenzo Bianconi , Alexander Lobakin , linux-kernel@vger.kernel.org (open list) Subject: [RFC net-next v3 1/4] net: protect queue -> napi linking with netdev_lock() Date: Tue, 21 Jan 2025 19:10:41 +0000 Message-Id: <20250121191047.269844-2-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" From: Jakub Kicinski netdev netlink is the only reader of netdev_{,rx_}queue->napi, and it already holds netdev->lock. Switch protection of the writes to netdev->lock as well. Add netif_queue_set_napi_locked() for API completeness, but the expectation is that most current drivers won't have to worry about locking any more. Today they jump thru hoops to take rtnl_lock. Signed-off-by: Jakub Kicinski Reviewed-by: Joe Damato --- v2: - Added in v2 from Jakub. include/linux/netdevice.h | 9 +++++++-- include/net/netdev_rx_queue.h | 2 +- net/core/dev.c | 16 +++++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 8da4c61f97b9..4709d16bada5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -691,7 +691,7 @@ struct netdev_queue { * slow- / control-path part */ /* NAPI instance for the queue - * Readers and writers must hold RTNL + * Readers and writers must hold netdev->lock */ struct napi_struct *napi; =20 @@ -2467,7 +2467,8 @@ struct net_device { * Partially protects (writers must hold both @lock and rtnl_lock): * @up * - * Also protects some fields in struct napi_struct. + * Also protects some fields in: + * struct napi_struct, struct netdev_queue, struct netdev_rx_queue * * Ordering: take after rtnl_lock. */ @@ -2694,6 +2695,10 @@ static inline void *netdev_priv(const struct net_dev= ice *dev) void netif_queue_set_napi(struct net_device *dev, unsigned int queue_index, enum netdev_queue_type type, struct napi_struct *napi); +void netif_queue_set_napi_locked(struct net_device *dev, + unsigned int queue_index, + enum netdev_queue_type type, + struct napi_struct *napi); =20 static inline void netdev_lock(struct net_device *dev) { diff --git a/include/net/netdev_rx_queue.h b/include/net/netdev_rx_queue.h index 596836abf7bf..9fcac0b43b71 100644 --- a/include/net/netdev_rx_queue.h +++ b/include/net/netdev_rx_queue.h @@ -23,7 +23,7 @@ struct netdev_rx_queue { struct xsk_buff_pool *pool; #endif /* NAPI instance for the queue - * Readers and writers must hold RTNL + * Readers and writers must hold netdev->lock */ struct napi_struct *napi; struct pp_memory_provider_params mp_params; diff --git a/net/core/dev.c b/net/core/dev.c index afa2282f2604..ab361fd9efd9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6842,14 +6842,24 @@ EXPORT_SYMBOL(dev_set_threaded); */ void netif_queue_set_napi(struct net_device *dev, unsigned int queue_index, enum netdev_queue_type type, struct napi_struct *napi) +{ + netdev_lock(dev); + netif_queue_set_napi_locked(dev, queue_index, type, napi); + netdev_unlock(dev); +} +EXPORT_SYMBOL(netif_queue_set_napi); + +void netif_queue_set_napi_locked(struct net_device *dev, + unsigned int queue_index, + enum netdev_queue_type type, + struct napi_struct *napi) { struct netdev_rx_queue *rxq; struct netdev_queue *txq; =20 if (WARN_ON_ONCE(napi && !napi->dev)) return; - if (dev->reg_state >=3D NETREG_REGISTERED) - ASSERT_RTNL(); + netdev_assert_locked_or_invisible(dev); =20 switch (type) { case NETDEV_QUEUE_TYPE_RX: @@ -6864,7 +6874,7 @@ void netif_queue_set_napi(struct net_device *dev, uns= igned int queue_index, return; } } -EXPORT_SYMBOL(netif_queue_set_napi); +EXPORT_SYMBOL(netif_queue_set_napi_locked); =20 static void napi_restore_config(struct napi_struct *n) { --=20 2.25.1 From nobody Sun Dec 14 13:57:36 2025 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 13EB51F5612 for ; Tue, 21 Jan 2025 19:11:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486672; cv=none; b=DPdroNITxe+1adpQeAcmRyCxdPjp1/9xnGrCnZ0D6RLlmX3kTpPg0BjwX9VdO2M53H8gSPYKuEDOqCGN7kLdfr+TloITTiOESEBHJimtP8FdTc2xqxnTG0VF5aWw2gkKipneugYB/i1+89j7n7mxfL6HtUkqzNRkhvoQidIMjmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486672; c=relaxed/simple; bh=QoUuXeDBulZSbVMdrI5zM6Eg9lCr5hgBtBOzJbP8zEQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H+TW/L+3wrbgV0h800Tq3hFNtvv9jcZRTB0bgC4ZNX3vosOtc9Z7pZhjdOmSD07v6Un5OayYfCheBYMsDKXF8/Gau+O9ypvEpmieaekbporSSLaySz0gT8HFxSdfhy2URpO0eDqkIQLuoU8J/HADIxNdz7CxKU33CueGqV7cI/M= 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=mW1YJNsK; arc=none smtp.client-ip=209.85.216.41 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="mW1YJNsK" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2efb17478adso10409951a91.1 for ; Tue, 21 Jan 2025 11:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737486670; x=1738091470; 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=9sIKGTHIeBOioZLiUeQpKiV7N2jyLH+xFiew0830fKc=; b=mW1YJNsKjJg3HwaDbspcfvC0mniLoI8kV23X/hka0pO+ouLoZml9Vs7ap2X1XJHyZv fUMQGuk1ERBHcgg5+lBnmOwUNKXzD5EmnjyPV9Kz451uNgEqY3bqpKUhJNrqgxO0288+ eE9MkHE8xncJh6i0ATwM/HN9Y6Y9pdaBO3eVA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737486670; x=1738091470; 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=9sIKGTHIeBOioZLiUeQpKiV7N2jyLH+xFiew0830fKc=; b=wLZRDg0U2BHthgJexpSrFo9/dDR6W1klt/5AKXJkN/01kyJBzNu7aELSHwUCwkqmBD 1UBZQF9yhJ+Gsuo0NJMXEfDBjZWYrN20h6pFbcuYHk6CHm3PIf+aXbABQWVRqCTni3k8 9tCsETMBYMUJcOBNrp2qMH4dBtTBvgX/KDWfHJIuUYqSgpk72+68xfbUBb8YHaxl1n1/ Ks0lD2Mz7CcoKFgrAIC+GGhiZBWXfiGhzdyIwXZy0OvnyYnuiZmYTdUORvuiL45vs3lg nW/PSeZpp3cggMT80WIU+kAacXLMJNT0g2TZHrL7Loag1lh5DI8UrW8Q5JSFNDpGebwn FoHw== X-Forwarded-Encrypted: i=1; AJvYcCVrpb0LWtwVpD3Xd/8FK1XxlkekGZgmt1iiXXU7KWmIzUlFX8N5Wkq3fJY/QeuibpbhQtiRvmm/fA2rh5U=@vger.kernel.org X-Gm-Message-State: AOJu0YxW0ZNMNjIDw0zI7TTjZcDw66R9Ou24ObT8WPN+608iBYuslVqY gsH+cvAy2sxkipLzTq8TJfbYaVMIDoVI12laeJHY5QF7DsnRBeqMLR0XfklsQcU= X-Gm-Gg: ASbGncuZdsqXBBgVWznEwMXuObA+v/mpImx75ByFNAWmLSRd8TqI9zsCiJqgw/6FVUz iypkuf2PVh1Hjdkr78TUJogpk4yksR905a5wpHg7L5Ukayb6Bf8sAiYWEoJXqxlJ9UBit6LgIbG bBTTo8jdbKyKz2/ab/h5mACsebx7WLXvy7sAqNoENe2zqcaKmY3ITIsWl5H1pNN6Z2YPO25GPWH EePANZpdg7fuv7yjkTTThHPzmcoC8ceZ89rLzg6n+t0J6XwfnJS8HGJ2d8wFZvMPbekAtUCcISG EA== X-Google-Smtp-Source: AGHT+IE4irALDUjtpmu8CkVPCmQyuHgMI1XADWpZWozR+u77nlArMTYTrKbNpUm0btjkrguF/oTbgg== X-Received: by 2002:a17:90b:4c06:b0:2ee:7862:1b10 with SMTP id 98e67ed59e1d1-2f782c701f7mr28198326a91.11.1737486670370; Tue, 21 Jan 2025 11:11:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 11:11:09 -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 2/4] virtio_net: Prepare for NAPI to queue mapping Date: Tue, 21 Jan 2025 19:10:42 +0000 Message-Id: <20250121191047.269844-3-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" Slight refactor to prepare the code for NAPI to queue mapping. No functional changes. Signed-off-by: Joe Damato Reviewed-by: Gerhard Engleder Tested-by: Lei Yang Acked-by: Jason Wang --- v2: - Previously patch 1 in the v1. - Added Reviewed-by and Tested-by tags to commit message. No functional changes. drivers/net/virtio_net.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7646ddd9bef7..cff18c66b54a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2789,7 +2789,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 @@ -2802,6 +2803,11 @@ static void virtnet_napi_enable(struct virtqueue *vq= , struct napi_struct *napi) local_bh_enable(); } =20 +static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *= napi) +{ + virtnet_napi_do_enable(vq, napi); +} + static void virtnet_napi_tx_enable(struct virtnet_info *vi, struct virtqueue *vq, struct napi_struct *napi) @@ -2817,7 +2823,7 @@ static void virtnet_napi_tx_enable(struct virtnet_inf= o *vi, return; } =20 - return virtnet_napi_enable(vq, napi); + virtnet_napi_do_enable(vq, napi); } =20 static void virtnet_napi_tx_disable(struct napi_struct *napi) --=20 2.25.1 From nobody Sun Dec 14 13:57:36 2025 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 B0D5B1F76B0 for ; Tue, 21 Jan 2025 19:11:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486674; cv=none; b=efhJlROprPLDc1axyvBMEz/HR+EhRFBEl7HvXjy/UD8kGUIUkP1l5ADoTWDdt/dK3URl6tCE+ArrSC9wVDedTCWg76Hl79Rh848qXbKCeQM9brPUru3Gr8vnGmrAX+vAzfC289h0tuRb0kWFKb43iFQc6lyODtwoL2mMMfqxxoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737486674; c=relaxed/simple; bh=CCW7kggp+rYbKpVhb0njIkNRisnJGwdMk+Hd84d4x2g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ERzkvF/uhNeqDJ8/Wo+SxlGT3+CjgRRSWpX0C5r4g04ND//EPiICMarJRy3RKF2AFuvWHB6RQpyGc3SnDQRPaKKVRsMX9yYeMP6lWAPGZGALYrFheK+4FKlb6fqv9kfDvw3JCP25sTNDRWfPha18bvOAnmXMjC7id1hwpinAgY0= 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=MBzaNvjs; arc=none smtp.client-ip=209.85.216.49 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="MBzaNvjs" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2eec9b3a1bbso8309753a91.3 for ; Tue, 21 Jan 2025 11:11:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737486672; x=1738091472; 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=BIxZmc2dYAqFea8fzwYrgwOnSbwHFqsyPk6MUVa0VxU=; b=MBzaNvjse7oevDYEBFWFKxZbDmgGUTUeZuKqKDYYq6jYzXhWxsXrb7XPPXxhnhTtKE 9sirjjKXjzShNZ3fJBquEHmrtN3LKamzoC0YboN1lcadLa21ntzmmmoL/W7hzWwutDca wU19tnULStfkBwK7iTMX/kWcBxHKbQNAML64E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737486672; x=1738091472; 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=BIxZmc2dYAqFea8fzwYrgwOnSbwHFqsyPk6MUVa0VxU=; b=tqUSUP8NmWNFnvPB1MYyxRP0hciOY9Redv/9AqOw4o/LQN8Os2w5Q9cApvh94QrFqn HkyAUtKG7PB8p5+NRBmA3OJuzt++7V+bSmRzBea+0h+nzFKved8ve+dJdratyRLuFa9n z8USSUtWFIzGtqMork9DtLH7usjRBHv1VifEI3SDpzvc3XAozUQ0PaHJyb2pihNdlcar JwwBWhDX07c+Jf5VAV9g2D54Chl28FfBerYRwtjHrLZiiHe8ExiQTsHqou/DUyuvfl27 ZohbMxTXp9skSrPQbt/VGPoxTTxJWCOfgXRHlM/dLzqptZC7EbCnNi8VJuU0vG6/Cba4 PImw== X-Forwarded-Encrypted: i=1; AJvYcCVIpP3tqcs05F/3+dBxYhxmtVEow7CDL+2u23pQ+3500I2X5mWTMs4lPhx2usmOSaT+pZn013OZkJVPqGg=@vger.kernel.org X-Gm-Message-State: AOJu0YwTcrb/6ArEEpdVfTnbEkRfdkGY2sysjcRY+WrJYVKuLnliNDg4 wbAtb3Jfa+OOFWZ36K0oNqC3y3DJjACpq9wtH6AwBTtPHgIljq4MKCNlk9v72K0= X-Gm-Gg: ASbGncsFagjXRPyuWBD5gD9xazSfX6A+xAYpl1lQqowjsoqqL9vB+j7PurUF/vgt6H6 +i56PMBRgC12Qga3cDmbEC4WZT08fvpdzxtheieU2M82IrpkVtMCMdHfD+Y+X3+1VFzVPJEOPp9 iNYJQtKzWUQkGUtmOQhVnCD2GHsMJQH3CBNgNaaBCGgWCFKeAuDHlm2zuSCJkXX+WYTg6LObLRU gliiwNMnWc28QVmRrVLUdx66hK2pSAJpxDDBl0H4qYGNy5cWxQVFdHvIEnAH0pgO2hx1nmElnWc ug== X-Google-Smtp-Source: AGHT+IFmMAsVqWPTr/+MdaRMifAEOsKB5cFMykGXnqvqzynVvQlUx7VWgc1M158q6rlxSpFG7RmfQw== X-Received: by 2002:a17:90b:5206:b0:2f4:f7f8:fc8b with SMTP id 98e67ed59e1d1-2f782d4ed77mr26908949a91.27.1737486672019; Tue, 21 Jan 2025 11:11:12 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2025 11:11:11 -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 3/4] virtio_net: Map NAPIs to queues Date: Tue, 21 Jan 2025 19:10:43 +0000 Message-Id: <20250121191047.269844-4-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 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 Acked-by: Jason Wang Reviewed-by: Gerhard Engleder --- rfcv3: - Eliminated XDP checks; NAPIs will always be mapped to RX queues, as Gerhard Engleder suggested. 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 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index cff18c66b54a..c120cb2106c0 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2805,7 +2805,11 @@ static void virtnet_napi_do_enable(struct virtqueue = *vq, =20 static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *= napi) { + struct virtnet_info *vi =3D vq->vdev->priv; + virtnet_napi_do_enable(vq, napi); + + netif_queue_set_napi(vi->dev, vq2rxq(vq), NETDEV_QUEUE_TYPE_RX, napi); } =20 static void virtnet_napi_tx_enable(struct virtnet_info *vi, @@ -2826,6 +2830,16 @@ 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; + + netif_queue_set_napi(vi->dev, vq2rxq(vq), NETDEV_QUEUE_TYPE_RX, NULL); + + napi_disable(napi); +} + static void virtnet_napi_tx_disable(struct napi_struct *napi) { if (napi->weight) @@ -2842,7 +2856,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 +3057,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 +3328,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 +5947,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 From nobody Sun Dec 14 13:57:36 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