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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C586C61DA4 for ; Mon, 6 Mar 2023 15:42:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 714C06B007B; Mon, 6 Mar 2023 10:42:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6C5066B007D; Mon, 6 Mar 2023 10:42:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58DB76B007E; Mon, 6 Mar 2023 10:42:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4987E6B007B for ; Mon, 6 Mar 2023 10:42:16 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F1F2FC0576 for ; Mon, 6 Mar 2023 15:42:15 +0000 (UTC) X-FDA: 80538889830.27.4E0D4B6 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by imf09.hostedemail.com (Postfix) with ESMTP id 46A94140022 for ; Mon, 6 Mar 2023 15:42:14 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=p6QOaLsO; spf=pass (imf09.hostedemail.com: domain of findns94@gmail.com designates 209.85.160.171 as permitted sender) smtp.mailfrom=findns94@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678117334; a=rsa-sha256; cv=none; b=nT50SVj3T8VfZJP1FHuoRhRHUnkGXzKWUDCBqI7AjUIlnoOX+wamrQY1bw6W9SgaTYhN5K GjY4kbGl8Mf1FwJIajLNA0+Ob5xBKO6Qo6VH9R3xxbfQOyR9tB+EGfAvHYdYEIlXvEr/c1 YOfN5h2PaU41XdZ4CMywSPMi8CyNJ/w= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=p6QOaLsO; spf=pass (imf09.hostedemail.com: domain of findns94@gmail.com designates 209.85.160.171 as permitted sender) smtp.mailfrom=findns94@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678117334; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=0NtQyJ6eQBb0wGTDfYWZm4PPrLnDXxCUuuQDDh4+5sU=; b=fdGUsrts7QDmBsuY5fh+t+tQ88tosvjFePrauyIKtrASoE660CsoncRih+xD/YmLZGxFaT 6bE5r1wIaQ0qvfx8Umym74LvMT28IBJKJxnmH2VyJ80g7PJ3m4GEG/EedwRW3YXRVsl+Qv /xWoWBiczwDFnJDQCDLL/WVRf65kzwU= Received: by mail-qt1-f171.google.com with SMTP id y10so10985585qtj.2 for ; Mon, 06 Mar 2023 07:42:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678117333; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=0NtQyJ6eQBb0wGTDfYWZm4PPrLnDXxCUuuQDDh4+5sU=; b=p6QOaLsOhtyQJzkmQb72krbjZZTYJqL3+85RbgaTSEfMrdL/bMTMGHgczRpwUo3QWG 7+j2vCkJDM9ruYYy+Nfu3XvmdOG8slzKlROb03WCQdG8DDGqhGgQqvRJOhNL8pFLrmmI +ev1QP60Jnuv1fKaWdyuD+HazZp1e/27BIpKObz53uW92JMY5YhWsqHKGt3WSE57mUEs ZQphWrShLIPoNvsh0QjWJrUKOdv6ocOuNswcj7aP8e+ueiH02tCrQaqF0bqLiihZWKWv DyqCYh0Me+WO8Ftqx1ReuWcYmdt/cO7hbA9z9IsmPYdp0El45dD6vMPePBkHn1+jhLNx pejg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678117333; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0NtQyJ6eQBb0wGTDfYWZm4PPrLnDXxCUuuQDDh4+5sU=; b=05NrSxvwR7hcSZhvUsLL0ocKqH4DttdHet4JJJi9WJs7PadjEBLptkat+XdhhMminL iJliOGZUf3RiMrNzCUqojybtnHsMKv7V6KRwsPZrnZU4qcor2421hhd7BHHl5PXOBJ/Q dKc0doAqTFdJa7Uhn6+ABs9m3aCZVimry+lmstyb4kPKa4p1pzEFJddcki8e7GRi/0Ix ckIbs8CjFxRnOtfYqCCJe2hCjRFtABHfH+SNknmAEY5UGo8yLCTvEsHZjFk8u2DKt5DP IGVv2PnBTA2nsfqaYaWw2uPTuI+yXV8epMlL4oqTBvvFccWy/d1awY1R5Vy+k9N4vIgI iTGA== X-Gm-Message-State: AO0yUKVri2n4XNppU6rYQz8l+dRAGa36tpllLjDQf9NCAA/ofttPT/Zi P7/Z4+3FzEADNSYeeHvaZ2Q= X-Google-Smtp-Source: AK7set//PKS1+aICL/kDFtE+6AbfSA+d0toJvyGobvIzhfwP2rlswkxPCWAkAUTT7evRVVYZWD05kg== X-Received: by 2002:ac8:5e4a:0:b0:3b8:2ea9:a09c with SMTP id i10-20020ac85e4a000000b003b82ea9a09cmr19719350qtx.1.1678117333372; Mon, 06 Mar 2023 07:42:13 -0800 (PST) Received: from MSI-FindNS.localdomain ([107.191.40.138]) by smtp.gmail.com with ESMTPSA id u19-20020a05620a121300b007424376ca4bsm7618400qkj.18.2023.03.06.07.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 07:42:13 -0800 (PST) From: Yue Zhao To: akpm@linux-foundation.org Cc: roman.gushchin@linux.dev, hannes@cmpxchg.org, mhocko@kernel.org, shakeelb@google.com, muchun.song@linux.dev, willy@infradead.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, tangyeechou@gmail.com, Yue Zhao Subject: [PATCH v2, 2/4] mm, memcg: Prevent memory.swappiness load/store tearing Date: Mon, 6 Mar 2023 23:41:36 +0800 Message-Id: <20230306154138.3775-3-findns94@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230306154138.3775-1-findns94@gmail.com> References: <20230306154138.3775-1-findns94@gmail.com> X-Rspam-User: X-Rspamd-Queue-Id: 46A94140022 X-Rspamd-Server: rspam01 X-Stat-Signature: x3tx1cju8aaxaa6g5w73tmw6ujuapcrs X-HE-Tag: 1678117334-976029 X-HE-Meta: U2FsdGVkX1+bhWMQR1zxjKmc7x8QlavkY51gMOdxvM/gFrVTSKzZ3/h04LJq39+oO4Lm1FYLf/hhRrAZh8KLCkgSRAAaUD5bqTBY5JWhfeM/aPCf5kcYnYBVvlJD/Xo6Opzlk2D2F3A/2gvbowGKkr2E49OY0D6LA5+wgNRwHddZ/ujp0IwdNqaeEzlxfTStpbweohDTgX70T11I1t81jxboMVdXR5qSN/u/jl6zWvYf+Po0k7Yh30h8nFXoeHhh+VqIcUh8+RsjsRuNiFix20kjlQACHD2GMhK6B19fAVbtT8kU9KwZ5xg4F72UWjZoJFbSGs/7lo4bwhZl3eZV5AxCOxoIN5Dc2EP0RDLO7e7REkxfFzIE4L8kMb7bm2xlhYSvmftn/LSwIqL0g0ExfF3zlBHFsM2oltaVnCZJoc9Ug2lLirqHtP5JkmsE43jk0dyNzuGZEhZttgfWvxp6BGrVMkQoE4JAHyUTqnhwCGx4UnzSny/bL1/J0K9tWfoaFFTYW/oHmsJWFPzAD73Ha7ia76lvm6I+dbnUsjWgk77ecrR7Ofe4WFIBYS/nZKByMAtB1IgL1EPLnhNsyZYXh9pYOk2Rh2kXFBZ5lH/6RAMwCcbHYbbJq25Zqm1bnCaxEPtwu78C28bbKT5Y/k2NR1YLnPsDq4Sxm+IBkgHvx8Rbb+rb/pbWFSkAA04M1E6eFJvbw9RR86ojl0jXHJR1ljqEYFfZNKQZOD5HSJfF/AvQ7Vc641CNc/HyWGNxgncRb2OlQU218vh3YTrcBpKolm7AqeXefpo9q5MaORwnplOpKuctRmKvhPn6EhysUMVYgVimyYd9gaAuzm6qZYQOkI687TVTZAhsZx15JLTz4Jsqm7baP78zdhK8jTMEtc0dhwWOkfWKrBSISv7Bs46WDP3yldCR29QXI3jv/Y1qOo4AKrLiui0yWN0kFf0ImvyiWqfC1hP6cFrW/CFse2A jS+01Q0Y B/fqQ0KjJqqZDAvxHhZOdxiNNA+auYytzxxrR4k7Hu8FyysjWYBqn8S3DSAJfYcD/2NTyql9lBgSzNaGHlzsoPO/muWdfQEJN+3sWVJjaMmb8CgI4IL3+SS1Rt4iWqpqgF1yyGvQtAxF5HOmcDK4lOrktYS18NDmh61UcqCl5QSshlSFYaU3vC+lGqWPnqqJOjbHGZZKw4md18KPz5vFrNfp/6luEZOfBlDURIfbXOAIG4SWVPMQXuIKfRjdcD77tRhWSu6jUZPfhUXhCQmQ/6V8MENHNbzgDqeK8rOJCi8vAYbq0xvmGV5vnwqgA8+9t9vJ3l55qRp4U5lTfuuRcKloamWFFc3drQ7bas86D+rCF0hVi6DyLV7ZBEWBrRhnV/m4CfvBllUKm3OVAO0niCTODnA+3jUqvgiEaulOnVjuq0KY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The knob for cgroup v1 memory controller: memory.swappiness is not protected by any locking so it can be modified while it is used. This is not an actual problem because races are unlikely. But it is better to use READ_ONCE/WRITE_ONCE to prevent compiler from doing anything funky. The access of memcg->swappiness and vm_swappiness is lockless, so both of them can be concurrently set at the same time as we are trying to read them. Signed-off-by: Yue Zhao --- include/linux/swap.h | 8 ++++---- mm/memcontrol.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 209a425739a9..3f3fe43d1766 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -620,18 +620,18 @@ static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) { /* Cgroup2 doesn't have per-cgroup swappiness */ if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) - return vm_swappiness; + return READ_ONCE(vm_swappiness); /* root ? */ if (mem_cgroup_disabled() || mem_cgroup_is_root(memcg)) - return vm_swappiness; + return READ_ONCE(vm_swappiness); - return memcg->swappiness; + return READ_ONCE(memcg->swappiness); } #else static inline int mem_cgroup_swappiness(struct mem_cgroup *mem) { - return vm_swappiness; + return READ_ONCE(vm_swappiness); } #endif diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 06821e5f7604..dca895c66a9b 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4179,9 +4179,9 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css, return -EINVAL; if (!mem_cgroup_is_root(memcg)) - memcg->swappiness = val; + WRITE_ONCE(memcg->swappiness, val); else - vm_swappiness = val; + WRITE_ONCE(vm_swappiness, val); return 0; } -- 2.17.1