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 00F13263F52; Tue, 11 Nov 2025 01:13:30 +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=1762823611; cv=none; b=Lg19aY3XtSE4S67AqIDeLuQPJqTsrZCkJ5bR/xjhn6jRPulv89TCK88u5iXZF4jw57Jmz5Npm1BwZq6xMkaKqBvq6Nmf1bhooHX2KKOxBXz+oeefjf2lCqlK+HhJbK5/Vo6ourl0tUjj5vWxs3OjQoZzUcXMWCJmlwFIuaa8Dkk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762823611; c=relaxed/simple; bh=RttPQttfLFIMuax/ghoPLxGFKSAIhMalaxcgEjiVZlM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=We1B/NhC4/ji6AL5VaBUSqqd0WFacuFHuC6gmrj7qUdA4WBrw1kqyZ+AagHJtF3HKc+0WWLwqbQ4yNU/9hPYPMgvHS61K6TnfgZ6J5KPU3jxzQonO8+Ko//Rqa2GMSCIvdIL4Q4rPMaZD0UzmiFBHaOxYHXRxdJZa2+LBUHhb2Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pT4ulrLh; 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="pT4ulrLh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DA1EC113D0; Tue, 11 Nov 2025 01:13:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1762823610; bh=RttPQttfLFIMuax/ghoPLxGFKSAIhMalaxcgEjiVZlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pT4ulrLhy4o+M+/1ATyvjIPxUrV5lGvbCj8IxPaED668nXRPrnNKG33meY//NXkYW N+FHpH2LiXLiSzVmLf45YVn3MsoODe3R5gzVqNK4OaJ/qdj0fkNVD62bJqebQI7ld5 yxu39+NutngRh1CoK55bnzAUx+A5Ro4GRRIgCRTs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kuniyuki Iwashima , Eric Dumazet , Shakeel Butt , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.17 335/849] net: Call trace_sock_exceed_buf_limit() for memcg failure with SK_MEM_RECV. Date: Tue, 11 Nov 2025 09:38:25 +0900 Message-ID: <20251111004544.518155442@linuxfoundation.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251111004536.460310036@linuxfoundation.org> References: <20251111004536.460310036@linuxfoundation.org> User-Agent: quilt/0.69 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.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuniyuki Iwashima [ Upstream commit 9d85c565a7b7c78b732393c02bcaa4d5c275fe58 ] Initially, trace_sock_exceed_buf_limit() was invoked when __sk_mem_raise_allocated() failed due to the memcg limit or the global limit. However, commit d6f19938eb031 ("net: expose sk wmem in sock_exceed_buf_limit tracepoint") somehow suppressed the event only when memcg failed to charge for SK_MEM_RECV, although the memcg failure for SK_MEM_SEND still triggers the event. Let's restore the event for SK_MEM_RECV. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Reviewed-by: Shakeel Butt Link: https://patch.msgid.link/20250815201712.1745332-5-kuniyu@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index e21348ead7e76..1382bddcbaff4 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3336,8 +3336,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) } } - if (kind == SK_MEM_SEND || (kind == SK_MEM_RECV && charged)) - trace_sock_exceed_buf_limit(sk, prot, allocated, kind); + trace_sock_exceed_buf_limit(sk, prot, allocated, kind); sk_memory_allocated_sub(sk, amt); -- 2.51.0