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 6AD5E1DC1A3 for ; Mon, 7 Oct 2024 16:56:46 +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=1728320206; cv=none; b=C54bAhrktd+rWs5U+G2fQeXjvV+5pKMtase4qsqtu6OryzTxMSu+k6mXEz0jMB+AUejnj33Y/O4nBPYCKgXx2sCkiTH0Q8jbzyGlX+S7q89dP8eeDR12l2IDhGQjoN04+th5+3Ca6mh0Ts8MMomYnuIlNGti7L8YhHqZNj3JTkI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728320206; c=relaxed/simple; bh=V7hRYTytQixpifEdVbGIt/e7xl4QdpsMfn8dhlIw74I=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=oADF9OnQqkuLEr1JX50eg5ND/rW7/AE8xnRmcrn9henH9wA+1A03jLAB9c+oZqGwoBDtAaq7nHzqGambE/6sTaZqUSiwm/oFaMKnxOEAxdkMusU7EybBdM47oh13HhEvmU4z/gS2xkdZH//Ypzo4t44pPFlAjvB2p/WeE/K6dCQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M26Fko6x; 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="M26Fko6x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9CA4C4CEC6; Mon, 7 Oct 2024 16:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728320206; bh=V7hRYTytQixpifEdVbGIt/e7xl4QdpsMfn8dhlIw74I=; h=Subject:To:Cc:From:Date:From; b=M26Fko6x/cI2XZNSMKZMGVmwnYv/hM79gOLaeGmnglz0thz+MYXMRCNzVxiUdw7aw TaqqdOWrXrKUPcA5Onc7vIWIeyVit2sFpvxgyCvTbR1f7ez57YEyZOJmfr/16h0UMv 5CrGkIOvhHEz2giPFBcNi6oi7/aMM9EMRrE/Bmhw= Subject: FAILED: patch "[PATCH] r8169: add tally counter fields added with RTL8125" failed to apply to 6.6-stable tree To: hkallweit1@gmail.com,horms@kernel.org,pabeni@redhat.com Cc: From: Date: Mon, 07 Oct 2024 18:56:34 +0200 Message-ID: <2024100734-mounting-unfiled-7a89@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x ced8e8b8f40accfcce4a2bbd8b150aa76d5eff9a # git commit -s git send-email --to '' --in-reply-to '2024100734-mounting-unfiled-7a89@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: ced8e8b8f40a ("r8169: add tally counter fields added with RTL8125") 8df9439389a4 ("r8169: Fix spelling mistake: "tx_underun" -> "tx_underrun"") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ced8e8b8f40accfcce4a2bbd8b150aa76d5eff9a Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Tue, 17 Sep 2024 23:04:46 +0200 Subject: [PATCH] r8169: add tally counter fields added with RTL8125 RTL8125 added fields to the tally counter, what may result in the chip dma'ing these new fields to unallocated memory. Therefore make sure that the allocated memory area is big enough to hold all of the tally counter values, even if we use only parts of it. Fixes: f1bce4ad2f1c ("r8169: add support for RTL8125") Cc: stable@vger.kernel.org Signed-off-by: Heiner Kallweit Reviewed-by: Simon Horman Link: https://patch.msgid.link/741d26a9-2b2b-485d-91d9-ecb302e345b5@gmail.com Signed-off-by: Paolo Abeni diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 45ac8befba29..3ddba7aa4914 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -579,6 +579,33 @@ struct rtl8169_counters { __le32 rx_multicast; __le16 tx_aborted; __le16 tx_underrun; + /* new since RTL8125 */ + __le64 tx_octets; + __le64 rx_octets; + __le64 rx_multicast64; + __le64 tx_unicast64; + __le64 tx_broadcast64; + __le64 tx_multicast64; + __le32 tx_pause_on; + __le32 tx_pause_off; + __le32 tx_pause_all; + __le32 tx_deferred; + __le32 tx_late_collision; + __le32 tx_all_collision; + __le32 tx_aborted32; + __le32 align_errors32; + __le32 rx_frame_too_long; + __le32 rx_runt; + __le32 rx_pause_on; + __le32 rx_pause_off; + __le32 rx_pause_all; + __le32 rx_unknown_opcode; + __le32 rx_mac_error; + __le32 tx_underrun32; + __le32 rx_mac_missed; + __le32 rx_tcam_dropped; + __le32 tdu; + __le32 rdu; }; struct rtl8169_tc_offsets {