From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 6D24918C937 for ; Thu, 16 Jan 2025 05:53:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006805; cv=none; b=mVRaJNkG7/+J++kYVsg5o4mXBEwh/uH3H/BSgfOGnIT1hIIIkY3XRyV6A7LVynI0v/JtCxVVLf2gtmKb5V2uMNUZgrxhPX3SigcXCF40PuOmct9GigImAfGhEky1NQM1b1k00pnkIFV6rmJhn6W885vxrzoF3C830XNufM6fxRU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006805; c=relaxed/simple; bh=PxaGUABDfZwGHALMhA6EDFWJE56G41dezvHCy/3MZPI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=fOeltdqIoOBJ8Mxo69OgrFJtY+O53KJ/tMlwX5dTlI6Ovspfom9Hxeu2L86v4rWZysvb+pimbwKyKQpdQta7/HaxPLcK6R8Zus0LbNZRzQ4N1hrdPoLKOUI+5onFr700mu2c6LS4aawvYnR9u2N4FajZ8vityh8CLxeb8+KmPqI= 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=ne8D1/Ol; arc=none smtp.client-ip=209.85.214.180 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="ne8D1/Ol" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21bc1512a63so9439135ad.1 for ; Wed, 15 Jan 2025 21:53:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1737006802; x=1737611602; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1r+E3A1LZoi68KOlSIiDg+UrGp1t+qLs3TwuwgbmtBg=; b=ne8D1/Ol2yKux/hfBZNF7GdSMqUOuC++y70Mzrr0rSc9g8GkhFrRPOFwgycdkainC2 x1p44Dv7XIjHuN00ssbR/cfpVf9kQCP9+i1lKNlh8cLwhsi+7dnaP/Nc0rZt6RltW+xD 7FRVQkhycaKUYBtGGCEMUB2MvLAQe0H2nsEAU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737006802; x=1737611602; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1r+E3A1LZoi68KOlSIiDg+UrGp1t+qLs3TwuwgbmtBg=; b=i+SZCMvJEZSO7A8QY23cRZJQfnkGWqRMtTe4huDstoghzMf3vDocbx9u1EMPzK//Es WpX2nPpOR0mlr0kSocKbjq8xFF34W07CTCIihrc5tOvXTHEBgo0IEZfTqvxNj3FRDEyr EF9eXv2x6hF/G3MdQ1BVamwn0jFWWKU/MGmgzYsxaKZIYYBZmVRbIDzYYMpBXPOUSBvI psLAgSkXPsz2b0+SxKToVRdI6N4VBzOlz8t5BsKPEd3IAYvIxNjr8E3PGuS1vyiiTFJG 5WzyrfRnYV97NySeXOvsYwpvQbJFE5ufaCjk4gVUDO4mBk21349kT0VqOpgO7jCyabY+ O/NQ== X-Forwarded-Encrypted: i=1; AJvYcCU6If4a+eAaOr8GIydU55uZEQ19WX/3Rkqg6Jq6HkjvTncKoyJTovjG5ehnm0qD2r9AvYqIseb5VaFXjBE=@vger.kernel.org X-Gm-Message-State: AOJu0YzZQtkZvA4TpPzAEhhU+2nZCNuz6fzurDDl+F9aVMooQIzkFGEd A+ZurkJSFthfS4oKqVeMMDfHq07TH2dNNszmUtnGb4YBkLuHp3O8vGdFoDJiYC4= X-Gm-Gg: ASbGnctfUw+N1M/fYhT21hDP//tY8clVOuxbTJQ1H+zWipd02/9Eg2PZe3ZXyGlfnPA TCBSMex5f2aIUK7TkwgNh7qZFi970N9faLZoz1lBCAgZ5Bsl95FZTJ3E/rLeouYYvu3f8LtIjGB 3FWXVjhifarz/VVWbJImsQmiUoHEH/8xM6HpsC0QpnthbkdcSp0IWvnNK5/CWF4kyZvdhdb3ePB Blk8XF7aBfNn+OM4uaZNxjXDRXO1hixkbPMPu+M5dOel/MDQ5TS1g3KBgL+tpGU X-Google-Smtp-Source: AGHT+IFNdCXa8QX/05yvf/OWy2KJnL5/tksWkjrm/Z5QSwf5RL8iWi8wxNrXPyaNMxgtOmHTEyqogA== X-Received: by 2002:a17:902:d482:b0:215:b058:28a5 with SMTP id d9443c01a7336-21a83f52831mr439294615ad.18.1737006802656; Wed, 15 Jan 2025 21:53:22 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 21:53:22 -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 , Alexander Lobakin , Alexei Starovoitov , Andrew Lunn , bpf@vger.kernel.org (open list:XDP (eXpress Data Path):Keyword:(?:\b|_)xdp(?:\b|_)), Daniel Borkmann , "David S. Miller" , Eric Dumazet , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , linux-kernel@vger.kernel.org (open list), Lorenzo Bianconi , "Michael S. Tsirkin" , Paolo Abeni , Sebastian Andrzej Siewior , Simon Horman , virtualization@lists.linux.dev (open list:VIRTIO CORE AND NET DRIVERS), Xuan Zhuo Subject: [PATCH net-next v2 0/4] virtio_net: Link queues to NAPIs Date: Thu, 16 Jan 2025 05:52:55 +0000 Message-Id: <20250116055302.14308-1-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Greetings: Welcome to v2. Recently [1], Jakub mentioned that there were a few drivers that are not yet mapping queues to NAPIs. While I don't have any of the other hardware mentioned, I do happen to have a virtio_net laying around ;) I've attempted to link queues to NAPIs, using the new locking Jakub introduced avoiding RTNL. Note: It seems virtio_net uses TX-only NAPIs which do not have NAPI IDs. As such, I've left the TX NAPIs unset (as opposed to setting them to 0). Note: I tried to handle the XDP case correctly (namely XDP queues should not have NAPIs registered, but AF_XDP/XSK should have NAPIs registered, IIUC). I would appreciate reviewers familiar with virtio_net double checking me on that. See the commit message of patch 3 for an example of how to get the NAPI to queue mapping information. See the commit message of patch 4 for an example of how NAPI IDs are persistent despite queue count changes. Thanks, Joe [1]: https://lore.kernel.org/netdev/20250109084301.2445a3e3@kernel.org/ v2: - patch 1: - New in the v2 from Jakub. - patch 2: - Previously patch 1, unchanged from v1. - Added Gerhard Engleder's Reviewed-by. - Added Lei Yang's Tested-by. - patch 3: - Introduced virtnet_napi_disable to eliminate duplicated code in virtnet_xdp_set, virtnet_rx_pause, virtnet_disable_queue_pair, refill_work as suggested by Jason Wang. - As a result of the above refactor, dropped Reviewed-by and Tested-by from patch 3. - patch 4: - New in v2. Adds persistent NAPI configuration. See commit message for more details. Jakub Kicinski (1): net: protect queue -> napi linking with netdev_lock() Joe Damato (3): virtio_net: Prepare for NAPI to queue mapping virtio_net: Map NAPIs to queues virtio_net: Use persistent NAPI config drivers/net/virtio_net.c | 47 +++++++++++++++++++++++++++++------ include/linux/netdevice.h | 9 +++++-- include/net/netdev_rx_queue.h | 2 +- net/core/dev.c | 16 +++++++++--- 4 files changed, 60 insertions(+), 14 deletions(-) base-commit: 0b21051a4a6208c721615bb0285a035b416a4383 -- 2.25.1