From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3115C33CAF for ; Thu, 16 Jan 2020 17:12:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8087224696 for ; Thu, 16 Jan 2020 17:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194775; bh=a2LQdgbQHU9J3o9vCQmo2CDdyQCvbmKqP3aCk5mwQys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AGAl9vO+BNxr7NV0/wyWJ5fw8dB3sPrYrmVE1VHXQxziDO0ms1k4PrxfjUimLvUSX kgODdXgQJHOKoZnphZU9IgxOujINQ4N/ObAJ4qmWZ3Y9kC5dCeM5dFFFdQEEsaJcYU b2la8u/6M9M7lg2xvs/yPGe41QQ5Lxr6OClveu3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389590AbgAPRMy (ORCPT ); Thu, 16 Jan 2020 12:12:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:56394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390577AbgAPRMv (ORCPT ); Thu, 16 Jan 2020 12:12:51 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A839F24690; Thu, 16 Jan 2020 17:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194770; bh=a2LQdgbQHU9J3o9vCQmo2CDdyQCvbmKqP3aCk5mwQys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=idngglJDkZymms5hmRldATv/SIuyNmFZst31ZN0LzTugLUbE96PwJHgtn7g5BNVV9 oJah3bVRPt57meB4Fs1sx2fR3zD6pYF+ow4Qh0HWziDynY9sFbTXHNy8JKzGgmdiWv T9OiS5nGIBANhP/bA2dodlGFc4QnmN0mAlwg6I0o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 589/671] net: avoid possible false sharing in sk_leave_memory_pressure() Date: Thu, 16 Jan 2020 12:03:47 -0500 Message-Id: <20200116170509.12787-326-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 503978aca46124cd714703e180b9c8292ba50ba7 ] As mentioned in https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE#it-may-improve-performance a C compiler can legally transform : if (memory_pressure && *memory_pressure) *memory_pressure = 0; to : if (memory_pressure) *memory_pressure = 0; Fixes: 0604475119de ("tcp: add TCPMemoryPressuresChrono counter") Fixes: 180d8cd942ce ("foundations of per-cgroup memory pressure controlling.") Fixes: 3ab224be6d69 ("[NET] CORE: Introducing new memory accounting interface.") Signed-off-by: Eric Dumazet Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index bbde5f6a7dc9..b9ec14f2c729 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2179,8 +2179,8 @@ static void sk_leave_memory_pressure(struct sock *sk) } else { unsigned long *memory_pressure = sk->sk_prot->memory_pressure; - if (memory_pressure && *memory_pressure) - *memory_pressure = 0; + if (memory_pressure && READ_ONCE(*memory_pressure)) + WRITE_ONCE(*memory_pressure, 0); } } -- 2.20.1