Message ID | 20230413104034.1086717-3-yosryahmed@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp938870vqo; Thu, 13 Apr 2023 03:48:46 -0700 (PDT) X-Google-Smtp-Source: AKy350Z3cgu7zRPSO/v980YPX9YX+DQng2rT4Cu3oGgo0a7UI4Y/t05wGUxCu9v4jXvdJYmk6mUh X-Received: by 2002:a17:906:811:b0:94a:5ace:46b6 with SMTP id e17-20020a170906081100b0094a5ace46b6mr2334431ejd.65.1681382926419; Thu, 13 Apr 2023 03:48:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681382926; cv=none; d=google.com; s=arc-20160816; b=aqUOXJBDEhs+EwmijPqiSCnpqsnUi1U8mbeGgFsKVPNp30cb3+1128IZzwAOyynZl/ Rr6/84cfTXGIwb6DT6XrnrpMt0UgdvgHLCaVIUVBUcLkBIzg57EDU/9+Tx+aaWbavpaJ Y+AOLeRKwQijxpU0kluSNb2W3GKhC7UsOB/9ZZC74h/ifU42F4GwiGnK2glylbIkViSC UT/Q1a2/D/tXOIiMN1BrGTmJksYOy7OqyZtx3RRmDK5KBKUzt14mMQ6AhzJU6U0DnPkg Bl+OpxkTgdlsYljRKW21dk315h8d/yTGM5xMbXK95AOsZb18LOaIbpMeUI8HMCYg3b6U mYlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=I6Nt0ZH454lLp6ex7hg7kbI+ex/azfnI8thXAXjWVq8=; b=L4DSPnZmt9aLQgXLpZpX4QXRAvEJxApBXJT4a0cYKq17i6zzybtz1uk6rn+Qkh1kCL wSS02QI37tcF8bsdztIZ1/Eq6TfxfNBN9rSzhgctVasWCIHe+MFYW8QFENI3KU6yWbZF d22LX6IZdtcriv5occkcdc8w0DG7RMtMApmVSwPej2CcJeim6nLuwbw48d2oRH7QXgsv PNZIesA4LIOjz+vUj2fTtkMUpnPTFKWezh8fUyGevTIDI3Qi39Ic3bbE9BkIqfCHF3or gcNTEtO2jvt8RjUio1Lsh74z8pI9wRBxOiy5H2d9eKmOFeTsvbJejDXlb23FbZaEuyV8 y+sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=G81CdUEm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l4-20020a170907914400b0093033954892si1420295ejs.512.2023.04.13.03.48.21; Thu, 13 Apr 2023 03:48:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=G81CdUEm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231137AbjDMKkx (ORCPT <rfc822;peter110.wang@gmail.com> + 99 others); Thu, 13 Apr 2023 06:40:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230364AbjDMKkl (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 13 Apr 2023 06:40:41 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12229170C for <linux-kernel@vger.kernel.org>; Thu, 13 Apr 2023 03:40:41 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-63238dcbb44so1024936b3a.0 for <linux-kernel@vger.kernel.org>; Thu, 13 Apr 2023 03:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681382440; x=1683974440; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=I6Nt0ZH454lLp6ex7hg7kbI+ex/azfnI8thXAXjWVq8=; b=G81CdUEmMWAR7s/uUh1o00+dki8yY8e8KOGduTMJ10Ih63YAx82qvcDq20SAZSx+g/ ueZ3Msj52pKD1lqBImwulf/tYkqr/iT+UOeW4fd3KBZv547W+MwD6xwGD67DaW0HpcOa cz9n6Ru3its9gZbaaSThe+VV0hYHOvVD9yp2j0yltd9IKliEUrjXqAr+OK7m03l2qytF xr+P3ML7/b+lezaU3DwMQukf+O+TPg5UG2i07gjQlaxwJnTBDRcJhvP64M/wiFfrpZzz h7ozlZBA7r8DTpqJhi25AoIblQhs+3bOV3uTp+JguZijEY3iI74Y975Ed/lYiOS4TnGE iVnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681382440; x=1683974440; 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=I6Nt0ZH454lLp6ex7hg7kbI+ex/azfnI8thXAXjWVq8=; b=Ec995AsrUY1GgEtNaFVGVdI4J+rIqpQLm3TUnWIX1G5rol7f1RYY4FpJLqETWERXUw 0zXdisdozEeZsTc4Bs0+j+VX4Acbj7FjamLG2dSxClraE/we0xWGAMHdb6GmT1VVjLZP KpSX+g7Pln7flYGKQLN+1njv2QsJo54P8fCTx2wJGadKdLEhSAc91eok9htWAiIF/82s mVvph4t0EbwaUDhAaWon4QvtRIfDAdzPK13BOz5zPkto3hWCKJmNxauvTjEL7lO1Olj8 M2cdQhrNLqliBWvyat7RxQ89PjybH7Ej64gujd+inzuCbMcnzeyHIWi21gTlV8dOyCwJ dSmA== X-Gm-Message-State: AAQBX9ekYIdyjd41mIktVwtQWc5odoRxAA9Ut2RNX9FgoIzJznIzZxR9 GXvcReAL7GrwZiIgX3eAf3Qe0rklSYCVWeaF X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a05:6a00:2e1d:b0:63b:234e:d641 with SMTP id fc29-20020a056a002e1d00b0063b234ed641mr975833pfb.4.1681382440554; Thu, 13 Apr 2023 03:40:40 -0700 (PDT) Date: Thu, 13 Apr 2023 10:40:33 +0000 In-Reply-To: <20230413104034.1086717-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230413104034.1086717-1-yosryahmed@google.com> X-Mailer: git-send-email 2.40.0.577.gac1e443424-goog Message-ID: <20230413104034.1086717-3-yosryahmed@google.com> Subject: [PATCH v6 2/3] mm: vmscan: move set_task_reclaim_state() near flush_reclaim_state() From: Yosry Ahmed <yosryahmed@google.com> To: Andrew Morton <akpm@linux-foundation.org>, Alexander Viro <viro@zeniv.linux.org.uk>, "Darrick J. Wong" <djwong@kernel.org>, Christoph Lameter <cl@linux.com>, David Rientjes <rientjes@google.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Vlastimil Babka <vbabka@suse.cz>, Roman Gushchin <roman.gushchin@linux.dev>, Hyeonggon Yoo <42.hyeyoo@gmail.com>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, Miaohe Lin <linmiaohe@huawei.com>, David Hildenbrand <david@redhat.com>, Johannes Weiner <hannes@cmpxchg.org>, Peter Xu <peterx@redhat.com>, NeilBrown <neilb@suse.de>, Shakeel Butt <shakeelb@google.com>, Michal Hocko <mhocko@kernel.org>, Yu Zhao <yuzhao@google.com>, Dave Chinner <david@fromorbit.com>, Tim Chen <tim.c.chen@linux.intel.com> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed <yosryahmed@google.com> Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763057783866397865?= X-GMAIL-MSGID: =?utf-8?q?1763057783866397865?= |
Series |
Ignore non-LRU-based reclaim in memcg reclaim
|
|
Commit Message
Yosry Ahmed
April 13, 2023, 10:40 a.m. UTC
Move set_task_reclaim_state() near flush_reclaim_state() so that all
helpers manipulating reclaim_state are in close proximity.
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
mm/vmscan.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Comments
On 13.04.23 12:40, Yosry Ahmed wrote: > Move set_task_reclaim_state() near flush_reclaim_state() so that all > helpers manipulating reclaim_state are in close proximity. > > Signed-off-by: Yosry Ahmed <yosryahmed@google.com> > --- Hm, it's rather a simple helper to set the reclaim_state for a task, not to modify it. No strong opinion, but I'd just leave it as it.
On Thu, Apr 13, 2023 at 4:19 AM David Hildenbrand <david@redhat.com> wrote: > > On 13.04.23 12:40, Yosry Ahmed wrote: > > Move set_task_reclaim_state() near flush_reclaim_state() so that all > > helpers manipulating reclaim_state are in close proximity. > > > > Signed-off-by: Yosry Ahmed <yosryahmed@google.com> > > --- > > Hm, it's rather a simple helper to set the reclaim_state for a task, not > to modify it. > > No strong opinion, but I'd just leave it as it. It's just personal taste to have helpers acting on the same data structure next to one another. I don't feel strongly about it either, I left it as a separate patch so that we can simply drop it. Peter also thought the same, so maybe I should just drop it. > > -- > Thanks, > > David / dhildenb >
On Thu 13-04-23 10:40:33, Yosry Ahmed wrote: > Move set_task_reclaim_state() near flush_reclaim_state() so that all > helpers manipulating reclaim_state are in close proximity. > > Signed-off-by: Yosry Ahmed <yosryahmed@google.com> Acked-by: Michal Hocko <mhocko@suse.com>
diff --git a/mm/vmscan.c b/mm/vmscan.c index be657832be48..cb7d5a17c2b2 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; +} + /* * flush_reclaim_state(): add pages reclaimed outside of LRU-based reclaim to * scan_control->nr_reclaimed.