From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 34B0D19FA7F; Thu, 6 Jun 2024 14:12:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683137; cv=none; b=OpbMJ2jbhCbXV+I/Olfoveo/5kUgIsMtzIjNUwHRC/YVm5a5nG+bni8EFg3WH6GX5DXghHX+Eu2a5geGmyKerlZtOlHZuJ++moINSQoRI720V2Q0qAb9j9axCR71rmU80+O1RwEBLPzjLoAOPgPTgsfedY7uWY4NqEUCB0RKi44= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683137; c=relaxed/simple; bh=DRSjy2w4LEy+hWbep+sqT283A4a5LRSFcFOQd8EchMs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lOs0n7SVrmD/751C5HjngC98KBrD7YcUBKvyc29I0fV3sRZEkTAulUyhdDpx5oCYge7KB69nkn1dpvatfQxcpTKKZahOpOL/S4NL/9ekXINQo7tyjA6nh7HTL1sDG8SiPlsEvBR1WLUZ9h5iGDSavpLBWR7fyhv12qiBkyjGb8E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KkJ7yamV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KkJ7yamV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11FCBC2BD10; Thu, 6 Jun 2024 14:12:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683137; bh=DRSjy2w4LEy+hWbep+sqT283A4a5LRSFcFOQd8EchMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KkJ7yamVOlIVmDrUg0RHnxRrnHxpK66LNfcAO84qAMqxcXAB5uvQGpZ1XxabBrSZ9 ZQMIjAu/zmEmnjb9E4hAMhc7TPTsCyAj8tkaWju/T0fA6YMHO2M03bTWHCH4ehxWl7 Mgk0VxV+KB7WSGDwO+i3R4ntP5hY8kKxSq79blWU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ken Milmore , Heiner Kallweit , Eric Dumazet , Paolo Abeni Subject: [PATCH 6.1 009/473] Revert "r8169: dont try to disable interrupts if NAPI is, scheduled already" Date: Thu, 6 Jun 2024 15:58:58 +0200 Message-ID: <20240606131700.125121227@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131659.786180261@linuxfoundation.org> References: <20240606131659.786180261@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heiner Kallweit commit eabb8a9be1e4a12f3bf37ceb7411083e3775672d upstream. This reverts commit 7274c4147afbf46f45b8501edbdad6da8cd013b9. Ken reported that RTL8125b can lock up if gro_flush_timeout has the default value of 20000 and napi_defer_hard_irqs is set to 0. In this scenario device interrupts aren't disabled, what seems to trigger some silicon bug under heavy load. I was able to reproduce this behavior on RTL8168h. Fix this by reverting 7274c4147afb. Fixes: 7274c4147afb ("r8169: don't try to disable interrupts if NAPI is scheduled already") Cc: stable@vger.kernel.org Reported-by: Ken Milmore Signed-off-by: Heiner Kallweit Reviewed-by: Eric Dumazet Link: https://lore.kernel.org/r/9b5b6f4c-4f54-4b90-b0b3-8d8023c2e780@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4607,10 +4607,8 @@ static irqreturn_t rtl8169_interrupt(int rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING); } - if (napi_schedule_prep(&tp->napi)) { - rtl_irq_disable(tp); - __napi_schedule(&tp->napi); - } + rtl_irq_disable(tp); + napi_schedule(&tp->napi); out: rtl_ack_events(tp, status);