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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham 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 54011C433E0 for ; Tue, 23 Feb 2021 20:57:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 121E064E7A for ; Tue, 23 Feb 2021 20:57:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233855AbhBWU5W (ORCPT ); Tue, 23 Feb 2021 15:57:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230001AbhBWU5S (ORCPT ); Tue, 23 Feb 2021 15:57:18 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BCF0C061574 for ; Tue, 23 Feb 2021 12:56:35 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id m4so6349715pfd.20 for ; Tue, 23 Feb 2021 12:56:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=VjQqR/dV9CmTvhJpIjv+GuV8z4P1stvvAwZgqfJoGxA=; b=mbSLgPRCosw1LgNbfZCQnOf60JkRnE/oZ2dfceOMIrdTSFDoq5FVwWZlenlEN3duNu LohQcoryhXyJfYxvHKWMDVRZhlyTZN7TguKnQS+JgyeHcABPQA1vfuCU7zw9y6PF1NOv vGNMRvc4MSRHE6B10Jeh5MZeB0RSzfOZyOgAKPzC3jN/FH0WswJOXI6mLvbQZC2XS8eW CD7xkAu51CFETtgUy622hl5ARPc+8WRj+WqSjXWQPSYcsO4OkXu6hPon8zk01OvAKWke aFpjOavUMmudXnqIgS/YEaSbEtC8nBwWU4YEvd78Nyscbp3L6S+HxqkqJOSntxdwCHId MHBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=VjQqR/dV9CmTvhJpIjv+GuV8z4P1stvvAwZgqfJoGxA=; b=bu2B90d5BYoDqGr6njBTqOLYhwvKTTl8rXMx7JdHPMrFml4FPLzmQucLKqxi1yGBc1 Q1Dji0n0MPX8p26Zlu8Fts0BUPysWqRdRXzW98WZFhz5i8c2nnT9wYxxLdkrCa+svZFp ZlT/pAIHpgr9PSYylrbLfYtKTNNzg4ZQNuPgjQ77wWDaP+kSHWashKlJB3igVnXNw4Gs /2N2IDXtt/0oaBsdG2sKXfcciJdCPy1Wwfnm0b+jW6iOI4MI8LR2WUdGV6jrqQz5gFXs Cf6nR1alcqnkTBxgUG3OVXiCHoR2o30CknEGJBpCuoLAM+wZTKtYZqmxrVIxAh1tAvTa HzLQ== X-Gm-Message-State: AOAM533sCLYR8GLI82Iqz8fQd29+O1yTgoV5qKcBF5CW1snqIs/ADpOB t2cJbyS7DuMrxL+84SNOtovf25ypXlJmFg== X-Google-Smtp-Source: ABdhPJwty35ymd10NafwoqU0YOhxPbcs9qNH9tWIjjldDeiHkjvYzVWjgVg+F5/TZM+guUKIA4j6kxGHHK/4sw== Sender: "shakeelb via sendgmr" X-Received: from shakeelb.svl.corp.google.com ([2620:15c:2cd:202:8ccd:3283:c85b:61eb]) (user=shakeelb job=sendgmr) by 2002:a17:90a:ab8b:: with SMTP id n11mr607117pjq.85.1614113794713; Tue, 23 Feb 2021 12:56:34 -0800 (PST) Date: Tue, 23 Feb 2021 12:56:25 -0800 Message-Id: <20210223205625.2792891-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH] memcg: cleanup root memcg checks From: Shakeel Butt To: Johannes Weiner , Roman Gushchin , Michal Hocko Cc: Andrew Morton , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Shakeel Butt Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace the implicit checking of root memcg with explicit root memcg checking i.e. !css->parent with mem_cgroup_is_root(). Signed-off-by: Shakeel Butt --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index dcb5665aeb69..79046ad3eec0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4141,7 +4141,7 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css, if (val > 100) return -EINVAL; - if (css->parent) + if (!mem_cgroup_is_root(memcg)) memcg->swappiness = val; else vm_swappiness = val; @@ -4491,7 +4491,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, struct mem_cgroup *memcg = mem_cgroup_from_css(css); /* cannot set to root cgroup and only 0 and 1 are allowed */ - if (!css->parent || !((val == 0) || (val == 1))) + if (mem_cgroup_is_root(memcg) || !((val == 0) || (val == 1))) return -EINVAL; memcg->oom_kill_disable = val; -- 2.30.0.617.g56c4b15f3c-goog