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 9C64B161309; Mon, 27 May 2024 18:59:02 +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=1716836342; cv=none; b=qR0MGwLbVHBtIiGpNpu71cSIab7m5s5+LnKm5IcUIUPTZotUsKS12+FyIAhbf24YwYSm57sG6Hkkfu8xFzEBvVXit7t58PDpO1mhSl75x5BwTe/klIpLYXE9zmFgMgoXRg2gsyc90z1It03rdBxiC7Hf/53J2RCaOq3yXj/PGHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716836342; c=relaxed/simple; bh=Iw2T+sCOUBJXhffzTchP1Yh8PvNoefG2vDAg2KU9/ZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DATfV/G0Zx2FaYHdKV+dPvWmSFm3VfBbC/D7TjiR62M0mOcFtYOCJQm9uF2GqcbDT15mBYLUhXiLZrpkSs20TP9FhcPQQx47OsbHdPk6vILFfVP+f24dtpjmphW0xGH41K5Svu1PXCvYByhXKrXP3v0CFtjRfbghXNP5uVd4Mkw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=19baxsGo; 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="19baxsGo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DC8EC2BBFC; Mon, 27 May 2024 18:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1716836342; bh=Iw2T+sCOUBJXhffzTchP1Yh8PvNoefG2vDAg2KU9/ZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=19baxsGoc3pLE2a3Z5ry+SZXNmcBbY13Pbn3RF7xf3LeZW6Xm3Nx+EmJepd/T/8/h KnKRletzGLtLEsJyZWC0iRRp4D2O4D+/SvnZpVQ+WdB5gDpBiV2kZVq+s5S0QmUwtC D9LY+crxwwEWbRJAoG9IjsT2VNmKyCLEBVjdruNQ= 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.9 017/427] Revert "r8169: dont try to disable interrupts if NAPI is, scheduled already" Date: Mon, 27 May 2024 20:51:04 +0200 Message-ID: <20240527185603.354312020@linuxfoundation.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240527185601.713589927@linuxfoundation.org> References: <20240527185601.713589927@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-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 @@ -4655,10 +4655,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);