From nobody Sun Dec 14 21:56:07 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