From nobody Mon Feb 9 07:20:39 2026 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 351E42144CF for ; Fri, 10 Jan 2025 20:26:20 +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=1736540781; cv=none; b=LHQ4m0lCNQhVHGW1YdJac8ZhKUwn5QM4EdFeu8ozHyAUn7hWycr2tzwNzv0Q+S1x4yyRl7kF0HWAEF5AYBbKkFnAhpJzv7Hsu3ojklFSX8+A0Fs6R04bWVEYEVqV/bZL2LOPiYPXDZl4PAY+p0aCj8jVHmaL2U3Y1qnXpclJBJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736540781; c=relaxed/simple; bh=L//1ItUL/phY7fZdnQAHFMdHc+JAiSoz2Yj9uNn6Lyc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OaMbYmBEHVNv1etanDZsy4UxIVXv1BRQTrkQBHxGx/BvsnjSiemkf7crYjTMi8A3Vf8l9p2OVtaNsLgf8YgY3rLugewY5KjTTJ9vF423LuLp7K8qNLKBxQJDwOBmvZOAjPQ7GnkU86HMyoan9nfkgSbxan6wYRuShAqnLzcrcCU= 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=fIpWSx1T; 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="fIpWSx1T" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2165cb60719so44107425ad.0 for ; Fri, 10 Jan 2025 12:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1736540780; x=1737145580; 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=lYBtxkIddVIdjfELPff+6zSxWcfnw5xo+urXkFqVelo=; b=fIpWSx1TcEHg+cMQTbr3vp2AsUt+f89yhfUWQDiExFbfNnVE+KyA+ink+4flsQysJ2 wEUIDSJAbxWpFNBU+0yio3GyiQ3tHDKx963dnxYrONmqehce9qd2IsBq6nPLLsEoW/EY 6+VwzmQIXRtrNTjXlBj5n9wi+mt5biBFc2o7Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736540780; x=1737145580; 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=lYBtxkIddVIdjfELPff+6zSxWcfnw5xo+urXkFqVelo=; b=LyS18AFeUczJ1/oL41KQGmuaqZqVUTYPBtfkOpCxg9pZk2nPvkdomNz/qzXNcRARyg 8e/MoAUdkA5VA/2rJP3u2IUcZXwaWf6wcE4/xLHyX9br2JQcWyraosjBROHmFn8VObFF 3dkXILSpcZjG6NCm/hfBSi56riJps7MSOQwuPzPzEHB+lFk2bo7A7nMAX2mHGXxylX6g yeW28ZiIS+DW7wEli1AJBHgSOtbg2Bzim93I49GtnPugzJ49O4jXgS38MtMaYnMtZNM/ DlYSRfJ4CBXH2jjOMPJbX1pZFucCGRsB/lPPeiMUkcxezDzL+lPWPl0s6/uVJoGC4UYc t2AA== X-Forwarded-Encrypted: i=1; AJvYcCVT5kobWG8cgay0v9HMjkS4AcH2XlL5hmEl68pa7AbaVPArXezmC5wy56yAgUOoSTPzqHzwKiYBZebbK5E=@vger.kernel.org X-Gm-Message-State: AOJu0YwUS7QbbnClMAZ0h0ts+ryOXv1mwmAYQmO4u+mOYejVt0VUhsa+ 6FYr4VfDdBWupjlFGd0uUMu1heNImUAIP+GPUmhb4FJH8DYrQ6glZUtrXx2ZpIg= X-Gm-Gg: ASbGncvUDzq9MM4wKbygi/WUfql8/ytsrXVOkt3Cz0EPbsHbTFdGrvCpRRASMWaeWzp 06U42ZYSHAQ5mfSeq64bvLTnOhx78Novjjp/tBqRFeNVEdzHeJ2g1teTJUmX+DXLKs99LmoGa+d jpB6qeGV4CHqth61FOB20CS5RtJungVukoKkkOxTjtZOzwwAe0vp9QHvqOYec/RydzUjRIJs8Dv stL1WDDouh/ipQcTmkfT6x0kjmFN1qOZUCXEI2SmGTbcXneubX84212DgSFbRSn X-Google-Smtp-Source: AGHT+IE/1wk47T+YBogVHpi2dklAZot8YbzIIrliuB0Q46BizHw8aPtqwioCvHXYsjt1ulmmZpPd0w== X-Received: by 2002:a17:902:ea08:b0:215:9894:5679 with SMTP id d9443c01a7336-21a83da498emr183024235ad.0.1736540779765; Fri, 10 Jan 2025 12:26:19 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c019:0:65e:3115:2f58:c5fd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21a9f22eb8esm17091825ad.166.2025.01.10.12.26.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 12:26:18 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org Cc: mkarsten@uwaterloo.ca, Joe Damato , "Michael S. Tsirkin" , Jason Wang , 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 1/3] virtio_net: Prepare for NAPI to queue mapping Date: Fri, 10 Jan 2025 20:26:02 +0000 Message-Id: <20250110202605.429475-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250110202605.429475-1-jdamato@fastly.com> References: <20250110202605.429475-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 --- 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