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 5F1D4C77B6D for ; Fri, 31 Mar 2023 07:08:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B28026B0075; Fri, 31 Mar 2023 03:08:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A89766B0078; Fri, 31 Mar 2023 03:08:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 903D66B007D; Fri, 31 Mar 2023 03:08:26 -0400 (EDT) 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 827CF6B0075 for ; Fri, 31 Mar 2023 03:08:26 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4D366A0BB2 for ; Fri, 31 Mar 2023 07:08:26 +0000 (UTC) X-FDA: 80628315012.05.01C15BB Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf27.hostedemail.com (Postfix) with ESMTP id 8E63F4001A for ; Fri, 31 Mar 2023 07:08:24 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=k4Nyjagi; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf27.hostedemail.com: domain of 354YmZAoKCLYukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@flex--yosryahmed.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=354YmZAoKCLYukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@flex--yosryahmed.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680246504; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=B2pWBeS3GCf3oNfr31dlSqb/2UGMYxzBqyAxEtHKHDE=; b=ka8Cj7r00wrAe/fx0vsRqBeKS74cxxWnIqgM7oQ5uJIUcBy+fU3HDnZKORXOkgVH8hsTd5 hD/tAMU7b+3G1RCYOACa6rObfwJq8NvcB4jX2hjdr5J6WDVnupi1ZY5e0TwEh95YwKb35a lksUS7fLYsULycZuMnELhwmRlXYR2to= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=k4Nyjagi; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf27.hostedemail.com: domain of 354YmZAoKCLYukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@flex--yosryahmed.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=354YmZAoKCLYukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@flex--yosryahmed.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680246504; a=rsa-sha256; cv=none; b=ZYIT93L+7U2Hi1AaBexLICFz4PimNHF0vM5vAEjLHUuAn0Ui4pgozsJj+73WAX62Tkz+y7 il1qYUHbm6GO/oGV3G/6KYBNL5c/a0uEizdrlqtMZ1fR658jQnxcGQ/LdtneqocfKolNXM pRW7lHFSMqO9iuyqYaAk+IbvyN2+JmY= Received: by mail-pf1-f202.google.com with SMTP id t67-20020a628146000000b0062d6d838243so7628461pfd.21 for ; Fri, 31 Mar 2023 00:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680246503; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=B2pWBeS3GCf3oNfr31dlSqb/2UGMYxzBqyAxEtHKHDE=; b=k4NyjagiGkCklbJVsqIMtonbdCMcTupGTS8hoHaC0gv8FOGuM+Bs5S57llv7e0EaSv Cdr8aYY+xrBbCtFlM6wcVGLHr43sIVgLRjo6N9VGVd6RPJWbRRFixWbs+ilYQFqKNFaX XmIjhQjyQd9NZkc3tv9rRK0BApt1ddgQG5Hmi7auJiptlkO709XlGaRHtR6d3pQ9Avj3 N34PvmS9EWNDok32raE4oK5g8hggDeU3zDAViHIjtdEdByWnmMFFSaEjcfkCBkO01CnD 9fsOaBbQNmSszl6BuqVSwa5jOVOxj6sT1Ok05l7fpvj5jCSBxdjsIIURvPSg0lRWYZMb t+xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680246503; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=B2pWBeS3GCf3oNfr31dlSqb/2UGMYxzBqyAxEtHKHDE=; b=wWR7NcSiJeMkycPwFbjZk1YXo6je6kTtw9DxtmUPsn86ykNptVnU6Yw1vqXZPQjvQX jOEEFstL1j8JFdUdIMqf7PC/ChL8jFPCkY4ziJUjifRdw615BsugQLsSq8A/B2fi/O89 1vdc7mmApxiVIJvG3H2P7rotZE6EaTCyISQfoPhCX0XajZerj29kY5rAyECy0UceX3c/ o9d1q/MHuhc2AA/fQ5zBYtF7kZQUaOMEsjx4AA0rd/0su+igI2DN3V1nwZbtTwxAtmpk WtwBoG+t6V3LscFTr7ruexyxblzN6KrXlQDr6aHnLIu30M+ZlTJ3ba+UWnxeE/pLp06P POHA== X-Gm-Message-State: AAQBX9csx+rm/SIo5oJ2T7oP3xd6BH0U3r0lRIgsJTqUmAIazWu97wr3 Y8Hl914tbjpDMHeK/uqzhvd9MnwI9PkmF1he X-Google-Smtp-Source: AKy350bRvjgd15ALJuao0xdVFVls0BdarK49AoD9W3kOxaJ3kd852in4QhALpf6ZkL2aYK5+VCe3mI8yGkJLtLkv X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a17:902:9b87:b0:1a2:1c7:1c1b with SMTP id y7-20020a1709029b8700b001a201c71c1bmr8812952plp.5.1680246503444; Fri, 31 Mar 2023 00:08:23 -0700 (PDT) Date: Fri, 31 Mar 2023 07:08:16 +0000 In-Reply-To: <20230331070818.2792558-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230331070818.2792558-1-yosryahmed@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230331070818.2792558-2-yosryahmed@google.com> Subject: [PATCH v3 1/3] mm: vmscan: move set_task_reclaim_state() after cgroup_reclaim() From: Yosry Ahmed To: Andrew Morton , Alexander Viro , "Darrick J. Wong" , Christoph Lameter , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, "Matthew Wilcox (Oracle)" , Miaohe Lin , David Hildenbrand , Johannes Weiner , Peter Xu , NeilBrown , Shakeel Butt , Michal Hocko , Yu Zhao , Dave Chinner Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 8E63F4001A X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: x8crz6pu468dgabnf1h7r3xodchwfd4y X-HE-Tag: 1680246504-489859 X-HE-Meta: U2FsdGVkX19aJceH0aWriaACqLnKFSSZUlNQsuX28/FVF44TrFRKibcHbeuZbSQQOdt57MoY2PDjRDRSHzMJMdy8DK75QyFCyt5ZHdTGjG3GS/acxKfnEWDKFd90tJZo2KEqops2W3lmqhkgJ62SeSKFUqiCWbRmCuBZ6yc7qH/bBA9IVLXDoDYnGtd2szOiRJUeYyzDaNc+9QAd8E1dgfzZ3YeZPAoNvWw7LCVaGBasQb25xdmgJkqLx5NF+goLw9o3a48mbsCAjHduJgH1dgzV2Mu5XLaR0PeKLzHzBZ8ga0V2aP7dWvepHrcC6qL34V9PkvNBsL5kvh43DoanmR551p1nn4LB9G4gde0yYSL56TFC9RfJ0JbefOl1+3Jp8N+OgBL0Nqcx8qTn2JapvOktwd8rq9Rwkl3jRz3GLZW2PEPruIz8fKcBbl2tZNwlEJ6MP10acuFDkG7DKcEktCLLsFaEuPo/ZfRJOdTTyRVcsfnFPI+cRJYCXDupKlzu4aqx2X/Q9O4/SI4B21K4XHT0HdheT0e7mXkew1EZk3lhPyKoS0BuJ+mpdRIPdPh8qESzBjQpoGs5DyUl7MNGXeLVqvwACnEyKIeyCf1Sjqze6dFENDnY2oCIq1gt0Ev0m9ijkRORJ9dbWhXxmJsx6388MgWMriSRpLfmOY3TWFwgH6Smiwpcar1aR9AEBZu0hh8qQvl0vzVchjHqPWhvgaY0U0x82dZ/fFHINXeV1qrdfVkLfM19Dobi0cLBZ7DSyQFFif2xLgG0MtO6S3DgwizMcy/aJFPxbb+i6PfF2SNdr1N7KW3+XVbZw9LGnmRJThIfYTkNt8g/ugt1cZwCRmgO+9tbYsc1apjZ1P0kceSbxDC83wC97eyXPaIAGU9SoG9sVIgfzhBaVkewII9zJvQuQEoo1juhNxt+NDqVktRCssPEa/LduoocXeiQYqOUx/S7Gxrkxskm6Lplvrv m3R9UxS5 +yJonvnZjl9x3Kv7LwqVsQ8/Vi7NA3aX58w8WylajkXGExJebwab5IvFqUO79RKucrBxgH/FScRN0TgLagDl7XdhgvFAGl9B69KBzcGHY9MY9Mb0LXmK0PCY2uFbKlsjLr27GsjbTsSAXzKxrCWEBviq6OQYkriRwyOi4Ihvb/9wZ+WWQiWiPsPT7Q+iDDhbHpd6ooKp+0LTElTEItN6n1uXRlMczx03BAvO9Bg1HjC3B6r/j63GaAsP7QstoXq9lV91t0BXixBjCoGBIOXH2WZvYul76R0LtmiRPLwBiIhADmu7gp1IngdIKMWbE4zY4oUoAQ5ErGxeeCfoFpAERHwT7CYEwjT5dPIxnEC1Hhv31BR4rtoIVIwMsuUs4m7fLB6ppmLRvfPaUk3Qe0R5RCThHKodxXyT3LBSV5zavYbqTdlh4R1Abh0Nl7A3O1Zq6HHSGBbKjO3X4eioQn6fMjwLKGVcWW/KUtDqXNYNdWIcxur1bcWcYta7CpE8BSAng4Xuy1BiCNcK6XkkUQcUdSLSilLoyKqvVxllTtlNUif6Glr19iVLmRuTnhtks2LEocr7Y/HOJmqiz0/ozhU16ewbPdcdZSQvU8OkPb9FALHspgsLq6AEl8GDru56WegZHxiiDygvPQEHTqJYVeE8OlnzbPp/XRq1/4EexyZCdIgUZxpTki7HFJgFm3taaLZ93rXHw26EfwlE8oE3P5Zcj0PzoU7X9buWhFztQxiIBocxdFnu6+n3vY/80WftIeBueucwFwM4+q4OJHMA= 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: set_task_reclaim_state() is currently defined in mm/vmscan.c above an #ifdef CONFIG_MEMCG block where cgroup_reclaim() is defined. We are about to add some more helpers that operate on reclaim_state, and will need to use cgroup_reclaim(). Move set_task_reclaim_state() after the #ifdef CONFIG_MEMCG block containing the definition of cgroup_reclaim() to keep helpers operating on reclaim_state together. Signed-off-by: Yosry Ahmed --- mm/vmscan.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9c1c5e8b24b8f..fef7d1c0f82b2 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -188,18 +188,6 @@ struct scan_control { */ int vm_swappiness = 60; -static void set_task_reclaim_state(struct task_struct *task, - struct reclaim_state *rs) -{ - /* Check for an overwrite */ - WARN_ON_ONCE(rs && task->reclaim_state); - - /* Check for the nulling of an already-nulled member */ - WARN_ON_ONCE(!rs && !task->reclaim_state); - - task->reclaim_state = rs; -} - LIST_HEAD(shrinker_list); DECLARE_RWSEM(shrinker_rwsem); @@ -511,6 +499,18 @@ static bool writeback_throttling_sane(struct scan_control *sc) } #endif +static void set_task_reclaim_state(struct task_struct *task, + struct reclaim_state *rs) +{ + /* Check for an overwrite */ + WARN_ON_ONCE(rs && task->reclaim_state); + + /* Check for the nulling of an already-nulled member */ + WARN_ON_ONCE(!rs && !task->reclaim_state); + + task->reclaim_state = rs; +} + static long xchg_nr_deferred(struct shrinker *shrinker, struct shrink_control *sc) { -- 2.40.0.348.gf938b09366-goog