From nobody Sun Dec 14 21:35:35 2025 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 5868E193077 for ; Thu, 16 Jan 2025 05:53:28 +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=1737006809; cv=none; b=ad47Q4BvxLXTmfPjXSVIKGZ0M/r6aqhb4wT7xk6RuVqxvB4D7WaGAp/vaiplODk1wCUWSnYmjha86p0xj3eMVOwOuFCNXTkX7y45qyRniYFnPEszCULNUtkV7c91eG2b6cO+0AGaRwtyXGZ6xw/0Pz6a4IeJ0N4bYMMvU5pUKtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737006809; c=relaxed/simple; bh=QoUuXeDBulZSbVMdrI5zM6Eg9lCr5hgBtBOzJbP8zEQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=A5IXrHowlMB3FnRNeGu7ljLDODCRowecWf9D8zcfCnPsrLN3wA2F0zR8NaZ9e4GQCyGLn8WGli//EH+m1GYVCWmIYKniJn5kD60aak5vqLZMYAmxlvGPGcHZGcu1VQ2dVscZK1PeDBklcAoOb3UgPW8Be/0NdxNszHSL7Z1WI1M= 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=hsHPwB+j; 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="hsHPwB+j" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2165cb60719so7982065ad.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=1737006807; x=1737611607; 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=hsHPwB+jmjdxpSXHZqDnT8mOjpoLwOJerTD332SuBOQOHBbfj7Bv29/2fjLKjOnf6T kqvuLJQ/90xeszBnuZMtDCbtLSqKYyvAESp+tYiBNipwWEx5sAJV8EC03cO9vbDmi1xX KEMB958LwJ+i9gtsVOGd8mkceI8cYwFwep8jE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737006807; x=1737611607; 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=JnJgTsu5vHVLIGPLm2pX5arWA5Mc0597cUfAelHn788Q2vedi1PoD82/HNpmfCb7OC vfWHh4gQAKtgFcclOOqVVF+sR+aqh4loSzIWK/PTwQ7xEDl62cQCG6tJGtma69gf/43R AyEZz1sTO6fZBEA2SHScf+kMg89xGMTOh+I9ba4q6uBxu+xc2Vqn4qnhHynA+YeQL1RT 0cyA90fbcGMACtpfbJH957GH7ZOJjU668yRgtNMZO10sA8msYank4yKEvvpF8W93uM72 bPUuYSKuThOYEhBNnxCNdHimWZAG++SdUeUF7+DCDzf1qyfKNga3r3EKJrs6zMtAzPxF drTg== X-Forwarded-Encrypted: i=1; AJvYcCVMQpjUkHKevaIeAROaUw67O9EI7q1kc6gbtQauaRQL9nmEe+AqmxE+rE2uxXugdBl6+Setyn6rExgfRTY=@vger.kernel.org X-Gm-Message-State: AOJu0YzR0bd7dfBJbjpT7vDot+ZPiQKwIWvyBOfJ9YZPY6O+wmd++83k S4+Fa1fbqufoVgGvAJ2PkO0KML0kDOAXZB7oF1YuOzwMLYGPe8WOb4lUS21vHSA= X-Gm-Gg: ASbGncu0s99qZrKdw9p02EXGeulyczx9lSSEYk41tXK6RImogN/lnqTjlVijf+7DuvS djcIUc5MN/U4x7IvSqqBIREFx/EINAguKuleEWrXvWOWEehsrglC6rLqnONGoZmUnOn2FF4XooM 6vTlw8mwbSV/WSIqBzIUP34Xe5WoXCi9Utp/oFsutCYrlawBOZekA2qkP/7DxGc6NTNYJf12TU5 4Hk4oNU7rEpoJHtupq+b90OaaT8wRnZbB4MJKXRsCNWpg/+Tp3I21uwuSmirj/R 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=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: [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: 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 --- 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