From patchwork Thu Jan 16 05:52:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13941307 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 8D86C192598 for ; Thu, 16 Jan 2025 05:53:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006809; cv=none; b=JqSukvTeq0oO2WTgnOOkxOc6KZfpwyN1zBv2gucdPNcra8uIh/iLH/iPHlqDRTQrQ4OCP8P4NIbFvvhIQooi+9pNV7OOLJ7T8JJEZ4x2UJse/JckpqtaKjge+2HvhPNZGF12RnOlz9hqp65AzkFoqMF2sCR4gV3NzJnyEUE0E1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006809; c=relaxed/simple; bh=mVwktbWSoWFP1usMOPYKCXwzUeeubnCUrVQ2w9l1YuQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aQv13/dAktLoGLD4GttcHjzUfSa1aMA9GTe9R2tBB1YU9ZOqoe/gWkIysz9LLVMGho5eHHIDySQIrznatcoHACXuWap1cXkJzkFU/zz9iosnQIlq8ztBUJxyPxpWQOfU0Ety8uMOhFaagauzqjYk+MhtYYPeW3yInFwEx3qY9y4= 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=W8IuDHzq; arc=none smtp.client-ip=209.85.214.170 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="W8IuDHzq" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21669fd5c7cso7395625ad.3 for ; Wed, 15 Jan 2025 21:53:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737006806; x=1737611606; 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=bC/KHeKZrs1tP54amz5eEuxLD6Mq90VAvd7Bs8DlJ+8=; b=W8IuDHzqCQSok1vUWamvq63rULHrmt1A/F775C09EjKjhEwSa8c/zip+VYutvPsW77 zIFSpp3ShLwE1KuLMPbtgfq5+Zr2UZvSWa+P3PmBb2p2LcMR1VPKauF9Gs0P6GBYhjRY bzH4655x9QpzIpxWW/s2PO5BX/h8Aer6RdDMU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737006806; x=1737611606; 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=bC/KHeKZrs1tP54amz5eEuxLD6Mq90VAvd7Bs8DlJ+8=; b=QPraHw8C8HCNuOvRwefJcPRlihd2VnB2ZjftnEIe4qNVgYYWY5AJ5PfohF9jYvVy91 16PIGSPSxd+0+riw2f1rECkjFXjSgG5Ge4BaoVnK+geltAqwu1vbYEqW7mVqF8cRjEQM BM66ZF8GNYB0bskRMQxsWKijuu2FKcNmtWNyaCYwxBWGvdVWh7itJ/3lgjGPzazuMint EERiFo0hViLD3pWJ2QylPjcVCz8tTTUKqVpuMcEkc069bGK4+0hVV3CMHjKORLhjKb9q L7r2Rs3AkzvZJVAN2DWZg7q0qjPTNgwE9+6rXEVdsVFAZ6vMzw+kgjTz2MiUlknrl1Tn hVyg== X-Gm-Message-State: AOJu0Yzpn6lHh1DOSmqD9YqOg4VmqOOdKZenMYGwrbJfbYpbhi8idHeM fmXAvuy4uboR9chhiNSxoHgJ2Y+zuH0BQ+ylBOuWq+ya6ads3T1KVztkzZFLqX4Y6aBeI6BRQRN qQgnHxrlz2pvreIZYuedecUHtOPK21Z6VfaA8cGq8MecjkZdmgSHPAP4hyCp6YQZM047ZUY/6Zq IY05vECjFO4PE384/GT3wskiGs4rYk5kUNgdI= X-Gm-Gg: ASbGncsAqH5e701j0GuAwI5MNXksv1AfWiTwB6gdFADk/rP/aFpc01L0vJvh3cm5XRN vvvmlIYyEeuOfAGaJLpwDg1Ff7d2CbFfpMmunVdsph1xUV3mZBGqunkTjSLkqxFVpK8E7kOjgu6 8l9jOVatL2y5mPgV+c4yjliiZZG0GStE0RTkTE2lhaU0tSiG5MlR8oR8pvVsEWsNY3lKd2GbWzt /Cz/VBGjIVTc4bpYUI+8F82l3X03HKklg3yOE2Q9N2GcxGL9RLdAMs7G72CyuIf X-Google-Smtp-Source: AGHT+IGntTkOMJEdO2lJ/RT1ILNh9iXtgR2mfbiueSHch1JtTC7D230UEJorte+y+OkqI+IHqifhdA== X-Received: by 2002:a17:902:e5c2:b0:215:b33b:e26d with SMTP id d9443c01a7336-21a83f55103mr529430015ad.21.1737006805997; Wed, 15 Jan 2025 21:53:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 21:53:25 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: gerhard@engleder-embedded.com, jasowang@redhat.com, leiyang@redhat.com, mkarsten@uwaterloo.ca, Jakub Kicinski , Joe Damato , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Andrew Lunn , Sebastian Andrzej Siewior , Lorenzo Bianconi , Alexander Lobakin , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next v2 1/4] net: protect queue -> napi linking with netdev_lock() Date: Thu, 16 Jan 2025 05:52:56 +0000 Message-Id: <20250116055302.14308-2-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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 8308d9c75918..c7201642e9fb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -690,7 +690,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; @@ -2458,7 +2458,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. */ @@ -2685,6 +2686,10 @@ static inline void *netdev_priv(const struct net_device *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); 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 782ae3ff3f8d..528478cd8615 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6851,14 +6851,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; if (WARN_ON_ONCE(napi && !napi->dev)) return; - if (dev->reg_state >= NETREG_REGISTERED) - ASSERT_RTNL(); + netdev_assert_locked_or_invisible(dev); switch (type) { case NETDEV_QUEUE_TYPE_RX: @@ -6873,7 +6883,7 @@ void netif_queue_set_napi(struct net_device *dev, unsigned int queue_index, return; } } -EXPORT_SYMBOL(netif_queue_set_napi); +EXPORT_SYMBOL(netif_queue_set_napi_locked); static void napi_restore_config(struct napi_struct *n) { From patchwork Thu Jan 16 05:52:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13941308 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 B75E5192D6B for ; Thu, 16 Jan 2025 05:53:28 +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=1737006810; cv=none; b=jnaonWE/3FqToMpDKD2AiWevBCuw5hIX53Maea6JvT4QdpY5R2l1NAf5UJMJGEsjiJAHU0rO9UnS3RwPyYP6FStxIxfH54B3gpPmfaYHR/4xXdWXU3a8gyMjlu5806lIFOVpvbFLLtaz45qJCAjxGV8pV9IG3d9wRSng1mI+9z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006810; c=relaxed/simple; bh=QoUuXeDBulZSbVMdrI5zM6Eg9lCr5hgBtBOzJbP8zEQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bSvqQK8klwM8cSbuALtCT4Is21Aq+Lat21U2nDsTsgrFGDoNKqMsf4dFtlNWQgnZX5LFeYo9ocrI2hTzAR3l4YyUE28sUkWDfsfiuHXAn+1fJdBb9HNV7du6IzFbkZ5WUXpqfdpewyAj27yRgDuGV86bG0nYvZdyqGN1una54Zw= 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=dw8RHrEd; 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="dw8RHrEd" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2165cb60719so7982205ad.0 for ; Wed, 15 Jan 2025 21:53:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737006808; x=1737611608; 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=dw8RHrEdUovecLojkSYU0FDKWuo5lb5WfTa5yS4l8Ukj5oB4lpnP04O2ffPlMrzy8Z +WLpiQlIG6aTHxyyK9svYt4wvh0lp5p/W77/gRBM7yYyAKBJPEcA2qkUKfbl5Dh1Mppt HIfSkH1OVTGWN4srag4QtRSjF/+7FD/ASS+VI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737006808; x=1737611608; 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=r7db/OUMyzcR9p17w1yEFeOZnrEteuBMGSqjBEAwDRHxfUhAxyeVak6sKjIDBxBoeh pxEmUmWTB1+1gCwiMn9ZDEKC17ur/l8EhKyBTX/qoMfBftc0AweGAulS7KhTI4IxxV5R usqy3uJQiKIqx3lqAKSD64HmmwJJXca0hjwVW3rukJBEPgzILPnM/+7IK4v7HFhtAbBM W8hSEudSGXbOtIN9B3fFH8WDXVrhG7Q0pgQmrVlE3+Q4ROyB9Yz9UefaMAs80Q5yHKsE wfuiapbbLD8d4JWPbpsY2yIUnMJJufxjRf02FxL+hiZfUvAAkG8FIVdDH0VAnku+64Uo ws/g== X-Gm-Message-State: AOJu0Yy4WQiDTxXhxK3eWTqXz+seV2E/N2Jbh91C7OlAfNGg3jSt4mXz mX1SZvaMBEoTM1dmS0itO/O4tO9elGy2yoK4jUOMEo5Bkil32mFn76/eaIWCnoyPaXvcVrKUDml 3OVfBwyhxu75NNFsa9x2HNe8tKuwDJ9Rr17nJMxXcL0ggiN83CNlG4FJ4c8O1r+PEKGsR5g+cpl uJroRUkpXVZlvQ4NqqcoXC3tie5MFJ8v40J/Y= X-Gm-Gg: ASbGncsJMt/75ZziIc8ceIe3lRwxl+co5qub1KZiaDsrKxBH6jrkmjCOkLYksJKB0M7 AHanIVgiKqnipNaAJDg6DnImnZ0JfeEbxRZMhfe8WvdD6JkZgMRG7oX1XqWxsNFoq9X/MiaMZJy vvpeG4oZdtN4f6NHWG9LtDGDhehm9fnRFqXEKR97XXR//QumbukupUEUimiTtM9Y/Rk4js3QUtx 96A1nre8i9VG1dyQYgNXjP7sPZGoKn0jppL7Qezr8imnLMpldAAJTSZ8eOVB1Bi X-Google-Smtp-Source: AGHT+IEJCssTOUws+b72W8uZUvjCTPp85OZ9h1VVGxQI7rHP+zFi1sj5ShlGmZbXcEUCTdHWY7Z3FA== X-Received: by 2002:a17:902:9a09:b0:21a:8dec:e596 with SMTP id d9443c01a7336-21a8dece7e5mr344365815ad.35.1737006807678; Wed, 15 Jan 2025 21:53:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 21:53:27 -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_P=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: [PATCH net-next v2 2/4] virtio_net: Prepare for NAPI to queue mapping Date: Thu, 16 Jan 2025 05:52:57 +0000 Message-Id: <20250116055302.14308-3-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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 --- 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); } -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); @@ -2802,6 +2803,11 @@ static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi) local_bh_enable(); } +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_info *vi, return; } - return virtnet_napi_enable(vq, napi); + virtnet_napi_do_enable(vq, napi); } static void virtnet_napi_tx_disable(struct napi_struct *napi) From patchwork Thu Jan 16 05:52:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13941306 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 3284A194C75 for ; Thu, 16 Jan 2025 05:53:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006811; cv=none; b=AjbHotc8Gnk/L0gx3FHtI5NmRw8q+oBELXn2AJWBtHRpbMpikn1uy9hZYdLh3Dgc09EO0ByTBbsHBgYqLhWmXyEw5q9eYGdzXWDs7tFEUq+hGD4lbutIJVZ35Bzz2ifoZNZsKGZZMYob0agwPSu1n54kLLQI6hhl2LBkmkU0Vgg= 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.182 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-f182.google.com with SMTP id d9443c01a7336-21649a7bcdcso7840125ad.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=s6dDmrAtxZcdiElprh21HWktbhvypxmWGTXtL9Q830hH7FXnZgdGEirba8AWfk7Ng/ 1HL8QSdNbtnBzZ2HiI08nBu6B4iwgLlQTW43UvDsB7YASjjnFtHVgLt9UWa+Bd2KVayk IlgrRgDbT5KsFyrsNt0mVEH0rhCLDhvT2MlQZNVeQYVDhBRtgIl+47Bq+WWF7WrIYKb4 aLG/8Tt+KVob5XQRCuLuL9Pu/OxTsZsIJBXKR/VCo+RG5pQ52Bp0DspUZJrDTXk8s8Rv iOGmPeF1tTnZaiomu+IxMmZFoFfnB45oBn7dWMlF8Pq1WkhrzPEL0U2FphTTNMEJhrZu XEcg== X-Forwarded-Encrypted: i=1; AJvYcCV2L71DRuAf8QItTuLMSqES8c4zEeqG1fvsrrN5H4V+Its7xHAcwwWwDT+I2IwBUKGWlr8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7Er++xFBTsZ9JlCjS3bqVRDCVntkxsXxgIDbLvVUj67VNB9wL nf7GSRod0Pi6TbSGGK3XYS+zcGFlmFCs3QEdXOQ9zm/B+zF0BP4VMR/J7QhkI40= X-Gm-Gg: ASbGncuAG9IImYwbrwljsJkzDpNinOSkaMn225fbjR45BNS9rD0dgWsUz5QA7uWx+Fr eCMay99gSDvWG4wjKO0r00XBGZcJs0W3WNvMeuDSuTwv42JIQcJIMh4ptiX2g9n0ZKQhF54Fv2W wt4SMUkCLm3FWFZJ3JwxRLTpBqWNFDthdtU9HOidPBLkqhQP7cfYaPalXsVoD9Y6fefNVeVYTgd dNciY6yxZMGWBx55K1jcxnG+HjptwlL+uU3iBtPvZTkwqc5mySG2N6mOsgLQJky 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_P=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: bpf@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. $ 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 --- 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(); } -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 = vq->vdev->priv; + int q = vq2rxq(vq); + u16 curr_qs; + virtnet_napi_do_enable(vq, napi); + + curr_qs = 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); } static void virtnet_napi_tx_enable(struct virtnet_info *vi, @@ -2826,6 +2835,20 @@ static void virtnet_napi_tx_enable(struct virtnet_info *vi, virtnet_napi_do_enable(vq, napi); } +static void virtnet_napi_disable(struct virtqueue *vq, + struct napi_struct *napi) +{ + struct virtnet_info *vi = vq->vdev->priv; + int q = vq2rxq(vq); + u16 curr_qs; + + curr_qs = 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 = 0; i < vi->curr_queue_pairs; i++) { struct receive_queue *rq = &vi->rq[i]; - napi_disable(&rq->napi); + virtnet_napi_disable(rq->vq, &rq->napi); + still_empty = !try_fill_recv(vi, rq, GFP_KERNEL); virtnet_napi_enable(rq->vq, &rq->napi); @@ -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_index) { 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); } @@ -3313,7 +3337,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->vq, &rq->napi); virtnet_cancel_dim(vi, &rq->dim); } } @@ -5932,7 +5956,7 @@ 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_disable(vi->rq[i].vq, &vi->rq[i].napi); virtnet_napi_tx_disable(&vi->sq[i].napi); } } From patchwork Thu Jan 16 05:52:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 13941309 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 627D219992C for ; Thu, 16 Jan 2025 05:53:32 +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=1737006813; cv=none; b=H+ok0qEKKvdn+38cpgZ2kwIXHGoaGK7eWSVbFuMBaDYUvoYwuotDoTMOPN249rCdbsVh5nhtf93SJkjtKs/JM4gOB+oz0wS5IkmHPyFFzCCOponmBU13UJH8b1Y9UZUROoPCMEUB+5IaeHsE8XCAaBcU1qHUOQ3BYr4J5+tELjY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006813; c=relaxed/simple; bh=UXb3rPE/1GDUYX7xYJCycggz8UdX0ho9WDF1GZTuo+k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JpzKIIA+08GiUjBHVMTSg8REjgbbvv24clB8pYnV+71cBLJUQuwBT4xVenoiPivgPZoeCi05l330/2Akig7NsfszSg4pTB1CfEy+Zb75bY3RgLccfCho3pE6F/eCoO0eCS0/MAdVHBhUKRfG4BnpblcArSqM19nZi9pYODhVq0c= 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=mVNTyO5A; 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="mVNTyO5A" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2166651f752so10997955ad.3 for ; Wed, 15 Jan 2025 21:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737006811; x=1737611611; 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=uZtsz2Rtgk1xt8CSQNH2JM2w40RollK9oAaOdJJO1B8=; b=mVNTyO5AueG417aZ80WO//Gl32jM0u9aMFWJyGBz10NMCkRZ+0iZZ3PqFVLH6xxF1P XnSBBuljpGWDmealrh6GFFXOTC7sw4IbPasu6DHLeLbfOMnEuFHH3i/Zl32Mg3zwjMI1 tTbHIHT6BwpPcdESiaS9irQsT0x6XwSbZQiD8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737006811; x=1737611611; 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=uZtsz2Rtgk1xt8CSQNH2JM2w40RollK9oAaOdJJO1B8=; b=XkjvgLhbSraoobNUKlQXosDaVvJmwFu+pY8iSHDNTWWCZzUHemgBu6CeegiiLJDuB6 hj8bTCHAo+G3S/rBthVWBD25tU4yQC3H5m49jQ4KVrNVdTjyuMJFlqBw8WtSsivBsJf9 KBBvlMuCpSNGRx6Dkzp3TxmrHbWEQduTly0IfFPt5b4ScjiUGVkh/Zmc6uoiEyIipKz+ t8CzR6UI0eM4rcfE/PW1uYgEaIvoi+ZtqmQV9IBQvMtCLp+D2R41FEgAz4D3Aq4HeZQy 1U6gh1DYAfyG7rXMJUR43QflmvYdEBcPaqGR+dNZmNM57Aq5yukTEmpuaw53vrkH8SJ9 mONw== X-Gm-Message-State: AOJu0Ywy/thyq/WPW1/uq+0jsZQJKaroc6h+KOnTCz1SGgnMdcWfs+Ca TWyfOfAQWT0HC14yIyJBsMiEkIsrkHB39kjkP5peBlaFzpLiJcCTxC7abBPgYh9VuB6UIOxf8az mypGgXdpqpVAB9sOgzOkIopxlUu1zda2wwvGckq13R9ZTrPvJ6+GaYEKrnGOcJS30u+0Nee2HDJ tWFYOVczdmx8STcqH9+VQdjw7SyFotmHpRc3g= X-Gm-Gg: ASbGncut70MuPg8z4vq9KcJCK2QkXWDdvwq7NHTgBvT9K+5t4mS68WXjXsB5C4YpviD EDcCWZAUvv/4Yy+lAkVY3WxUoW6gRGPXYvAU8cmukEilMckBvi2x4zWbweq5vyMR93TExyc9fDn 7TTTLEo3Nt266kDRr5TX5gD4Srqc3F2IUd72qnoMW2CoSN5g1NQ0GwiUeIr5VwwbR+UDibhE3QG 4igCJZpu2xXxzzR3O15W0l+mKhWPzA0/+YMcoD+OqBGqnGJ+K/SnX3/hoV0rjbH X-Google-Smtp-Source: AGHT+IGKQzp0gRosRVZZiRnTi2eKc0WyUMTIwNaRCmD8fTVjAZ/tLpnB9TpD79nfRxnZfUmc/GT8fg== X-Received: by 2002:a17:902:dace:b0:216:4b5a:998b with SMTP id d9443c01a7336-21a83fe4c3bmr516333485ad.45.1737006811200; Wed, 15 Jan 2025 21:53:31 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 21:53:30 -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_P=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: [PATCH net-next v2 4/4] virtio_net: Use persistent NAPI config Date: Thu, 16 Jan 2025 05:52:59 +0000 Message-Id: <20250116055302.14308-5-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: 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 --- v2: - New in this v2. Adds persistent NAPI config so that NAPI IDs are not renumbered and napi_config settings are persisted. 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 c6fda756dd07..52094596e94b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -6420,8 +6420,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);