From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E78CAEAE7 for ; Sun, 18 Jan 2026 16:16:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768752985; cv=none; b=N4l/lOWL7Kaq0hMLeVFK53UG+8VpuMvVHlXzfpIgXMt4+VkC/Wj21NehUiB9/+CTqIkUiQmhvlzslR6nq/lcW5jnfKXWhfW25rupxgXvUUZkya3F0EHv7eUmA/lYvL3P0cQMBqr+TyNGqy+wODUogXFV6/vzx90RpYR65z+rZBw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768752985; c=relaxed/simple; bh=WShuIAPyE68nfy0UjiL2DWEKFe79X2KK4RQCP1VjDNE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OsTkw0UF38NPZv4UO1pxuluCy0nCHUQRJz2GrkIjrmuWIf4eAdUUzqid8UufwzQ4OBaM65QFzc9epbO715X6yhOlZqqYhBx3n376x3lgmog6U1ZJ3sBTHwd590Y6L6yvQh/6gP7OuvKGvJzYT309egbKcu+NEWjsSD8uHg/cmEU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=QaaTQpI7; arc=none smtp.client-ip=95.215.58.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="QaaTQpI7" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1768752982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T65OoKpCdEFFVP2+DiaAhKdFuag7lvxT1ZvELnGzBuM=; b=QaaTQpI7xNuksLfCVIXEbWERu4VfCtboEZpuLTLhQhW8yyecLZ9cRKRRqke6VUGsPprvQE /cYusvTj6yhK+bWdHHDRIzr+F957lDFPK/l9bjSoVIGD4430Y8aMlfOatOZjPL8OwBGd1M M/OvwmXA5Iu1jdBIU2qAGLg448XkXAc= From: wen.yang@linux.dev To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , Jason Xing , Paolo Abeni , Wen Yang Subject: [PATCH 6.6 1/3] net: napi_schedule_rps() cleanup Date: Mon, 19 Jan 2026 00:15:44 +0800 Message-Id: <72f1345baff9fe5a296915d4b5a7a18bd304df68.1768751557.git.wen.yang@linux.dev> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Eric Dumazet commit 8fcb76b934daff12cde76adeab3d502eeb0734b1 upstream. napi_schedule_rps() return value is ignored, remove it. Change the comment to clarify the intent. Signed-off-by: Eric Dumazet Reviewed-by: Jason Xing Tested-by: Jason Xing Signed-off-by: Paolo Abeni Signed-off-by: Wen Yang --- net/core/dev.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 114fc8bc37f8..e35f41e75bdd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4684,11 +4684,18 @@ static void trigger_rx_softirq(void *data) } /* - * Check if this softnet_data structure is another cpu one - * If yes, queue it to our IPI list and return 1 - * If no, return 0 + * After we queued a packet into sd->input_pkt_queue, + * we need to make sure this queue is serviced soon. + * + * - If this is another cpu queue, link it to our rps_ipi_list, + * and make sure we will process rps_ipi_list from net_rx_action(). + * As we do not know yet if we are called from net_rx_action(), + * we have to raise NET_RX_SOFTIRQ. This might change in the future. + * + * - If this is our own queue, NAPI schedule our backlog. + * Note that this also raises NET_RX_SOFTIRQ. */ -static int napi_schedule_rps(struct softnet_data *sd) +static void napi_schedule_rps(struct softnet_data *sd) { struct softnet_data *mysd = this_cpu_ptr(&softnet_data); @@ -4698,11 +4705,10 @@ static int napi_schedule_rps(struct softnet_data *sd) mysd->rps_ipi_list = sd; __raise_softirq_irqoff(NET_RX_SOFTIRQ); - return 1; + return; } #endif /* CONFIG_RPS */ __napi_schedule_irqoff(&mysd->backlog); - return 0; } #ifdef CONFIG_NET_FLOW_LIMIT -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-178.mta0.migadu.com (out-178.mta0.migadu.com [91.218.175.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8958F500945 for ; Sun, 18 Jan 2026 16:18:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768753082; cv=none; b=SStrpGpQcV9lz1CvMjadxMxCP6UoI9Yp7Cmvp/gHvCHbmeZdaz/LjtSe5zlIyq6TiywNGMO3y6SH5vf+Js6GGNkL5TsLVj71NQSvRHuo1YIH0FmsLI5STzyiz05N6MSkKQxE9hXy1Utl+NnZ+W+Q3BVi036FWgOYKRbx+VIF3vg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768753082; c=relaxed/simple; bh=WShuIAPyE68nfy0UjiL2DWEKFe79X2KK4RQCP1VjDNE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Nq2xkDh0jDaYBRTjib2GKGY1dV0ASo6mBaNeRDcGUPkpKZwFdpeY+Sr3PAwY0ocqwrMLqZLbLI8hJs9svcGCAcDZ0M3rbNGZrNak380wjNyAWHKuHbJt7b3VlcX91WcTq9+deYiGO2zVatyxzN8mt+jWGMiQfG2mJq87p/pCOGg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=v+D+6v8g; arc=none smtp.client-ip=91.218.175.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="v+D+6v8g" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1768753078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T65OoKpCdEFFVP2+DiaAhKdFuag7lvxT1ZvELnGzBuM=; b=v+D+6v8gvZouVtYe7D7Qk0/oQvltAcX2Pt5CNfVf2VWlPM1vD8LbJ5E39sR63atUOTvjT6 Wwpe7iOglh9SY/iAJsMYsPBrH62KNWGzw2x1SFMceexUojm/i2eHD577ShwgeDl99sjSKB kWl/+EKKX5S8ZeDuCRE99HW0Hhuidj0= From: wen.yang@linux.dev To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , Jason Xing , Paolo Abeni , Wen Yang Subject: [PATCH 6.1 1/3] net: napi_schedule_rps() cleanup Date: Mon, 19 Jan 2026 00:17:39 +0800 Message-ID: <72f1345baff9fe5a296915d4b5a7a18bd304df68.1768751557.git.wen.yang@linux.dev> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Message-ID: <20260118161739.QIjNMox2SNCB_OiN4Y2zPFqCji95gxiKPtpq0VE_BMI@z> From: Eric Dumazet commit 8fcb76b934daff12cde76adeab3d502eeb0734b1 upstream. napi_schedule_rps() return value is ignored, remove it. Change the comment to clarify the intent. Signed-off-by: Eric Dumazet Reviewed-by: Jason Xing Tested-by: Jason Xing Signed-off-by: Paolo Abeni Signed-off-by: Wen Yang --- net/core/dev.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 114fc8bc37f8..e35f41e75bdd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4684,11 +4684,18 @@ static void trigger_rx_softirq(void *data) } /* - * Check if this softnet_data structure is another cpu one - * If yes, queue it to our IPI list and return 1 - * If no, return 0 + * After we queued a packet into sd->input_pkt_queue, + * we need to make sure this queue is serviced soon. + * + * - If this is another cpu queue, link it to our rps_ipi_list, + * and make sure we will process rps_ipi_list from net_rx_action(). + * As we do not know yet if we are called from net_rx_action(), + * we have to raise NET_RX_SOFTIRQ. This might change in the future. + * + * - If this is our own queue, NAPI schedule our backlog. + * Note that this also raises NET_RX_SOFTIRQ. */ -static int napi_schedule_rps(struct softnet_data *sd) +static void napi_schedule_rps(struct softnet_data *sd) { struct softnet_data *mysd = this_cpu_ptr(&softnet_data); @@ -4698,11 +4705,10 @@ static int napi_schedule_rps(struct softnet_data *sd) mysd->rps_ipi_list = sd; __raise_softirq_irqoff(NET_RX_SOFTIRQ); - return 1; + return; } #endif /* CONFIG_RPS */ __napi_schedule_irqoff(&mysd->backlog); - return 0; } #ifdef CONFIG_NET_FLOW_LIMIT -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-173.mta0.migadu.com (out-173.mta0.migadu.com [91.218.175.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C89AA1F192E for ; Sun, 18 Jan 2026 16:29:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768753752; cv=none; b=GLqiRI2YDyFGH69B49oBi3yZ3mIVxEmN1MelVmBm3ZJEIQppli/ZBNXN8ILwWWM4RPa0Lz3GG24lw6bPpUFJrfvgq7tqolNsgSUCNNKB9SzS0TfkN1tgXcGIdUXzSTr2SW2NLjD44/BS2xbi+Kjd/Pjx3827vnQUr1se0QArUek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768753752; c=relaxed/simple; bh=WShuIAPyE68nfy0UjiL2DWEKFe79X2KK4RQCP1VjDNE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gh1Ficrtj1fYnuRSi3SJ24DjGRaSXs5B039ab0br1/xz8NaTNZuPNu3UFZ0ErQuSAsl2qvnrwx89gS7Tg2HLCWHaU6hGHf/r0ciuBm6ca9L3GsyQ+9k89rJ7AHbq6/H81PEWWh5qg/sg1CHX/ihR1sRIOtTcw2nJ2YQxCFczBG0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=gYv3+rgu; arc=none smtp.client-ip=91.218.175.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="gYv3+rgu" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1768753747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T65OoKpCdEFFVP2+DiaAhKdFuag7lvxT1ZvELnGzBuM=; b=gYv3+rguU9yjBihZDxC52t6zu0YBsln3jxRfuM892oDUiHkWsrBHvf1DlxrlrG81K2BWnB dj9+RfE4RF99ZcL6JE9mQX02WbcgrTk0zdpU9pZt0J7N6ESZc7uknqzw26YG+cgHSr/4pm YI1HpsXeO6QXeBNhsH0wWidSAstKIBQ= From: wen.yang@linux.dev To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , Jason Xing , Paolo Abeni , Wen Yang Subject: [PATCH 6.1 1/3] net: napi_schedule_rps() cleanup Date: Mon, 19 Jan 2026 00:28:22 +0800 Message-ID: <72f1345baff9fe5a296915d4b5a7a18bd304df68.1768751557.git.wen.yang@linux.dev> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Message-ID: <20260118162822.M4jUnzHWSZFj1_tP-2uX0RVgAXloMLtprWvomVYJvEQ@z> From: Eric Dumazet commit 8fcb76b934daff12cde76adeab3d502eeb0734b1 upstream. napi_schedule_rps() return value is ignored, remove it. Change the comment to clarify the intent. Signed-off-by: Eric Dumazet Reviewed-by: Jason Xing Tested-by: Jason Xing Signed-off-by: Paolo Abeni Signed-off-by: Wen Yang --- net/core/dev.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 114fc8bc37f8..e35f41e75bdd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4684,11 +4684,18 @@ static void trigger_rx_softirq(void *data) } /* - * Check if this softnet_data structure is another cpu one - * If yes, queue it to our IPI list and return 1 - * If no, return 0 + * After we queued a packet into sd->input_pkt_queue, + * we need to make sure this queue is serviced soon. + * + * - If this is another cpu queue, link it to our rps_ipi_list, + * and make sure we will process rps_ipi_list from net_rx_action(). + * As we do not know yet if we are called from net_rx_action(), + * we have to raise NET_RX_SOFTIRQ. This might change in the future. + * + * - If this is our own queue, NAPI schedule our backlog. + * Note that this also raises NET_RX_SOFTIRQ. */ -static int napi_schedule_rps(struct softnet_data *sd) +static void napi_schedule_rps(struct softnet_data *sd) { struct softnet_data *mysd = this_cpu_ptr(&softnet_data); @@ -4698,11 +4705,10 @@ static int napi_schedule_rps(struct softnet_data *sd) mysd->rps_ipi_list = sd; __raise_softirq_irqoff(NET_RX_SOFTIRQ); - return 1; + return; } #endif /* CONFIG_RPS */ __napi_schedule_irqoff(&mysd->backlog); - return 0; } #ifdef CONFIG_NET_FLOW_LIMIT -- 2.25.1