From patchwork Wed Mar 8 16:25:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yue Zhao X-Patchwork-Id: 13166101 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 38147C6FD1E for ; Wed, 8 Mar 2023 16:26:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C47026B0075; Wed, 8 Mar 2023 11:26:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BCFDB6B0078; Wed, 8 Mar 2023 11:26:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4A706B007B; Wed, 8 Mar 2023 11:26:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9457D6B0075 for ; Wed, 8 Mar 2023 11:26:22 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 600C0C0F02 for ; Wed, 8 Mar 2023 16:26:22 +0000 (UTC) X-FDA: 80546258604.22.3A903E2 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by imf18.hostedemail.com (Postfix) with ESMTP id 9E3901C0011 for ; Wed, 8 Mar 2023 16:26:20 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=McRkR1Wh; spf=pass (imf18.hostedemail.com: domain of findns94@gmail.com designates 209.85.219.49 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=1678292780; 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=pobmz56zWKXlv9VCRaNaOZMVD/RL8QxL/evDPGbbBYE=; b=Oe271HGCFaqce3QROyxjHyfJ4AGmhu/LO224tnCB8RnvSPSrlV0n3XXG5VyDTe0ojlYk5f escZ2xVea6BJjPpOClgocz1Udw+Cv8uIK9mHbIlsMG/OL3GAw9nnPREM3ejQ7bGVWdprWi UjVnU7ChYlRjoPJx+XwvTqpPv70f7KM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=McRkR1Wh; spf=pass (imf18.hostedemail.com: domain of findns94@gmail.com designates 209.85.219.49 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=1678292780; a=rsa-sha256; cv=none; b=WnomuPlB04PtQP9gNtlo4mym9RtQIA7BxA48L7xamwC8AxqpiydO6uvs0689Kk9u8iO9b8 i/0btoEHE3WGH0VZ7jq0EqJbryQwO2TgHJfYfNKjK/9zRGcboFR4tVncnnWKwxQ8Rny1Fg yNECVtOW9IyTf/oyJJDcM4byGbOtaOM= Received: by mail-qv1-f49.google.com with SMTP id f1so11396503qvx.13 for ; Wed, 08 Mar 2023 08:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678292780; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=pobmz56zWKXlv9VCRaNaOZMVD/RL8QxL/evDPGbbBYE=; b=McRkR1WhMXjVktc5aTw6T5/gz6rhdeR71Ukow2/ZzU1pNGgYskeBNM0STRwyIy0Hfm VTjxzQlU7sNL+v1NTYRQO8byhGn8P2ftwg0bNZl33Yx1hL90jCxOR3bvGXjNkeWh9G+m C3j8eWUiMVJgELYTg2oJkgiUFs3xb8VJ3e0o8SI1++jbALmILsUgu9mjOqkVEbP7RbIl TMWTLq/3F2oYXfLXSG/GLKvyAmjIjvn95772zy1qiECDYhLI3hP7yw575MZeEwjnopoj KCscHtCaCIVPuwZUB7vRCpSp6eQz5bg1OXfrbbiYqWy19G0Ga3XuBmYXT4rGuhEJ20xZ Vryg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678292780; 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=pobmz56zWKXlv9VCRaNaOZMVD/RL8QxL/evDPGbbBYE=; b=lCVGgFGU+0PJwOHUEth3L6zdbQPGiUoCoer8Omdy7HYNkO8FHl0bf75NqrBA/pEnCA oZ5yuOioL5InDp93YorILn4f3d0rWOltpJyGeYV/6XRXorlLnHZxRMR6MO3fvLhU9eg/ LxpoWoJSSMAipKiO0Jl7uPQpWOkTa149dVoR44qLoF1u/pKqB2duT+GnBAeKy0LMZlND BT0vAFl5Q5V5nC00jNqdi9YJxeg4Q19SVIFm0S8fhj89ppvpPIk9XcxsEQNZOM5XCSd+ /pkGg372BLxQA9ygVJX4s3SNT5B6kvoZ6BNvOfYopjuQjtoN9gvAQs0N1QZKvZ9j5I/P OQWw== X-Gm-Message-State: AO0yUKWU9gYDJPRh3vdOZrGsblAXDMKWwUbfER21QNdJFmqB5H7YKop3 YROAo7Z2XL5w8Bcc5eH4fa0= X-Google-Smtp-Source: AK7set9fJpkEVxDTECYsrfoWBBWoQm1UPxTBvv9OtImj+CJODpxx724Aby+U/JKlSJDy6TUKlKt6aA== X-Received: by 2002:ad4:5de1:0:b0:56b:f09e:9ab0 with SMTP id jn1-20020ad45de1000000b0056bf09e9ab0mr28752380qvb.5.1678292779760; Wed, 08 Mar 2023 08:26:19 -0800 (PST) Received: from MSI-FindNS.localdomain ([107.191.40.138]) by smtp.gmail.com with ESMTPSA id w20-20020a05620a0e9400b0073b8459d221sm11619813qkm.31.2023.03.08.08.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 08:26:19 -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 v3, 2/4] mm, memcg: Prevent memory.swappiness load/store tearing Date: Thu, 9 Mar 2023 00:25:53 +0800 Message-Id: <20230308162555.14195-3-findns94@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230308162555.14195-1-findns94@gmail.com> References: <20230308162555.14195-1-findns94@gmail.com> X-Stat-Signature: xwa1oaktqttbbcirnhgorxxpmy1onneh X-Rspam-User: X-Rspamd-Queue-Id: 9E3901C0011 X-Rspamd-Server: rspam06 X-HE-Tag: 1678292780-355472 X-HE-Meta: U2FsdGVkX182GDGCOrZtXxQlb7lds6fZpE/mp0Xfv1I8K/ESdnr2FucPofrPr11LwMbyMqTdjN2YxHuNIEjVU5V37Lx1nCKRxQkeJUMD5zPsYAdCWgt/sqStfoN9KCj6zgSdXvJXnkKW2lEg9AkY5wZ9Ssv/lpGT7R92tESorUGy76bpScVEOU6QaRUDPsqR1/g4QAOC8CxnRFxooSSumkff2s43K1dQfipoxZSR+eFPILz0XD6tp7vxOVw1cATuw6VLpAHRVINVwLmeE2awBVfOkMRLfIJYWn9SOFUZftUCboZ8elWjrLZEZRv7WJQDybwwAS2XiNeq/ez+3S0ekY1KXQC/7zJBHpKogtCpeoeybX7POzlWkIEzfHgCNtLKS8gsRf6bsbttk4mYB2ZOBdI0IEuDPUbBBXXotG0qIpETbGoXlYBzIdCaLOnsutFxcvpzJvpftko14KsXIIoi2HzXLnhk8gpSSkddGxY4V1UhSwcPiBoTgRUp7W8Haat3ESuim2aimxxGuaCRIsEd2/bQLomE2I2dSo8L8HNZ7lZfeWdI20gsJzy2UaQa2MySA6DDYcvlYBLIUlB8bQg0t9mI011PYGthi0thXh0jNIMFP/5vPf9shB3d3PJNuNSaXyN2fn+LY1VlutvGydjzr+oZClziPOa6zKb4F4JS1AM3EpC5DJEGCXyYt27g2C8izDtP0/qzGTMCSQYHIX1TsD/T8mx2Ptm00FF7fta40rfuB9uaJ8ZEH3Bd1NsHF5Y9WyHs/vALDKYfTim0z+B6XffExpeRXrUYwTSb+qa2vdIoEQMfgdVHp20L51j8vQarJVPv6TeSbIMr3cvO2Z02Ykx6fdR14NVQmPV5VtwO50XuDVmhe3CEWkEE3DtEXvvo48vlc4maaOHnfnieW1NWtpGAhoHKjJDAvxPjlxIIH0ploDlD/JI793n17kmx/O9mxeN7ic1+WycwLFs7l3c AwMgVwN8 XXw7ztXbl3sJydUJg9GT2r4cOx2tApTUVETeR0tf+fwBHNDjuFex2WAazU+cwHv6oxu2X2fPRrNr6nBWEYv+JFlUMA6X9RJ22nP0lSA5LHnOBpMZqrMKehO75M4MEZg2bb3nd79HvGHTcE6inydODux9D7a0e5zKTvGoM5saq9xcX8PFPq7ZXn0sHIQMsK/hN+Pcw+kDWK8HJDTBjOK/XDBiU05Wio02E7JGh2yOHmO2AeHyqfFMsGQQpOWz2krny1aPcfSpMuIy+3AIMIAzCwEizA/V2GLvU58+HoJc+/ez3/Tr4NPCNVWeXIRYlVfrIqIGq20CwX6Px+66g199QzmFvlI1HUjrq8hMc3KMwmDQzx4X+U4Wg6A8s9mA78VZJAN0y7FLDhKrvY3oEqq69ZkZisyXRMeQIDM4+2TWpjvrpA1L4dpWu9itFZCCLUmcZZvJVNL0zLvBLcYPtAfCTlrmDVG9jbb/oLSFC4m7xiN7G3Ys= 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|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. All occurrences of memcg->swappiness and vm_swappiness are updated with [READ|WRITE]_ONCE. Signed-off-by: Yue Zhao --- include/linux/swap.h | 8 ++++---- mm/memcontrol.c | 6 +++--- 2 files changed, 7 insertions(+), 7 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..1b0112afcad3 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; } @@ -5353,7 +5353,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) #endif page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX); if (parent) { - memcg->swappiness = mem_cgroup_swappiness(parent); + WRITE_ONCE(memcg->swappiness, mem_cgroup_swappiness(parent)); memcg->oom_kill_disable = parent->oom_kill_disable; page_counter_init(&memcg->memory, &parent->memory);