From patchwork Wed Nov 16 01:38:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13044323 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 C976AC433FE for ; Wed, 16 Nov 2022 01:39:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED20B6B0072; Tue, 15 Nov 2022 20:39:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E826D6B0073; Tue, 15 Nov 2022 20:39:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D49226B0074; Tue, 15 Nov 2022 20:39:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C836B6B0072 for ; Tue, 15 Nov 2022 20:39:03 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9F8F1AB85E for ; Wed, 16 Nov 2022 01:39:03 +0000 (UTC) X-FDA: 80137596966.14.12ED49B Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf11.hostedemail.com (Postfix) with ESMTP id 5100B40004 for ; Wed, 16 Nov 2022 01:39:03 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id j73-20020a25d24c000000b006dca101748bso14762549ybg.14 for ; Tue, 15 Nov 2022 17:39:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8qam/FxTvQ3VR0qeGq43naiB//AdnyQdmZle38abayk=; b=jGqN8aefFs6zNLkGLnpSlnnXZi9tjRjpMUeCGOHy8aO3vjCDZnRxuMfnt9ear0Jb+m 1a4asto4isLp6IL2/q37OWUfm7mnoGRjw3PJQ2ntFs+jIMz1i74mov/nV3S56BjhvKQj SguB7uoHXxkWbtdRXuBMXDa1YBsUolmIWjO1XpxmaaO6Pmj4CT/81+jgUEk6AexMjO9u rLGUzSgNr1VK32Az1Z0HRjEFo+1cFI8U/sWg4tzfb8ZHCxu4UbCxsmjNBXtdv0tXLXzz ARvgaRrbKwraUOuQBx+Z8BrcmcPUfW9lFbwF1+uxO9iNyPU1A7Q6qyjoxNfejqJjBrHT 62yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8qam/FxTvQ3VR0qeGq43naiB//AdnyQdmZle38abayk=; b=a8cg8XVjt7ESCB3q8MqoUf7rg1c/Tl+YCC65wVPIyr06w0kaHxZTXnF6bPWZV+KrwT PIRbITmr0FQ6hfCR93OXIZX8dCUuXNwOswYIGZkmXbM18h/616KY5gAhpIa4rNac/K35 jkxodFRnaHFnyq9MLACQgWsOHMdqW78BhppElRDvtYPIZWRumhdiSFGLADIQU0KlSPB0 XzCk17c8Whv0/Jn2q6dxrFBES/pA8CAW7M1xkx51FiwBJRyM5mm10dUc9KwYaCax9X0s 5rzLB8eNBTh8J1TOFQzkQvXTb/XdQ2YP+5/rNSx4t/VSXCbwUU9D7D17fHcdrtOMjbxA WonA== X-Gm-Message-State: ANoB5pncN4qi+appni1HHt82PBi30DXcSuel302feypnrUzBJzM1W6RS 9smZY14Vd3zx9VZNmMBF+VmDGEclFU4= X-Google-Smtp-Source: AA0mqf5WS+A1TvwtfuOYScKCu90IN4Zy853rnSmsas5yBOQl1zbQMy6CSlUp7gbTrVwKOXyIGofGlVwwp4c= X-Received: from yuzhao.bld.corp.google.com ([2620:15c:183:200:1c9f:5aae:a1b2:1ae0]) (user=yuzhao job=sendgmr) by 2002:a0d:d596:0:b0:36a:bc93:587c with SMTP id x144-20020a0dd596000000b0036abc93587cmr20750607ywd.59.1668562742534; Tue, 15 Nov 2022 17:39:02 -0800 (PST) Date: Tue, 15 Nov 2022 18:38:08 -0700 In-Reply-To: <20221116013808.3995280-1-yuzhao@google.com> Message-Id: <20221116013808.3995280-2-yuzhao@google.com> Mime-Version: 1.0 References: <20221116013808.3995280-1-yuzhao@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH 2/2] mm: multi-gen LRU: remove NULL checks on NODE_DATA() From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, Yu Zhao ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668562743; 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=8qam/FxTvQ3VR0qeGq43naiB//AdnyQdmZle38abayk=; b=2VfgIvY7ml7OMT2o3uOYNoeshjzoIVK+evAeM7EOWigVbKN4l/tHF9hSlxbmiLaix2Rs2G 8dj/au1jPH4YmMCaQigK1Nk1JXs17ZSPz9QvpQTgD9qabFKqqGBXcgvVqMsWpox67UJHSn BpB6ELtJJCmF1k70RtdJXttLpsZ19lY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jGqN8aef; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3Nj90YwYKCKcfbgOHVNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--yuzhao.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3Nj90YwYKCKcfbgOHVNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--yuzhao.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668562743; a=rsa-sha256; cv=none; b=SHfwybHIC13aNI/B9r+8nJvQXjZ+nSTPgIyUtEb1Pf8nLS4NNZWo5IVVoVZsPshQQBjEoG lYwhHYBVIsLe/LgfIiUd+1aDNqlvxCjWVKSNKfW3ymuWosrfgLqsBdE5OBX8czbaSAtdRm pKSfeDoiCUt4Id1aG6eLa5kOH69sSGU= X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5100B40004 X-Rspam-User: Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jGqN8aef; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3Nj90YwYKCKcfbgOHVNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--yuzhao.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3Nj90YwYKCKcfbgOHVNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--yuzhao.bounces.google.com X-Stat-Signature: dhwu3dcse4drmbm433jo1i1wnhi1abqk X-HE-Tag: 1668562743-919528 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: NODE_DATA() is preallocated for all possible nodes after commit 09f49dca570a ("mm: handle uninitialized numa nodes gracefully"). Checking its return value against NULL is now unnecessary. Signed-off-by: Yu Zhao --- mm/vmscan.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index dc6ebafa0a37..f7c02faf3a07 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3133,7 +3133,7 @@ static struct lruvec *get_lruvec(struct mem_cgroup *memcg, int nid) if (memcg) { struct lruvec *lruvec = &memcg->nodeinfo[nid]->lruvec; - /* for hotadd_new_pgdat() */ + /* see the comment in mem_cgroup_lruvec() */ if (!lruvec->pgdat) lruvec->pgdat = pgdat; @@ -3142,7 +3142,7 @@ static struct lruvec *get_lruvec(struct mem_cgroup *memcg, int nid) #endif VM_WARN_ON_ONCE(!mem_cgroup_disabled()); - return pgdat ? &pgdat->__lruvec : NULL; + return &pgdat->__lruvec; } static int get_swappiness(struct lruvec *lruvec, struct scan_control *sc) @@ -3206,9 +3206,6 @@ void lru_gen_add_mm(struct mm_struct *mm) for_each_node_state(nid, N_MEMORY) { struct lruvec *lruvec = get_lruvec(memcg, nid); - if (!lruvec) - continue; - /* the first addition since the last iteration */ if (lruvec->mm_state.tail == &mm_list->fifo) lruvec->mm_state.tail = &mm->lru_gen.list; @@ -3238,9 +3235,6 @@ void lru_gen_del_mm(struct mm_struct *mm) for_each_node(nid) { struct lruvec *lruvec = get_lruvec(memcg, nid); - if (!lruvec) - continue; - /* where the last iteration ended (exclusive) */ if (lruvec->mm_state.tail == &mm->lru_gen.list) lruvec->mm_state.tail = lruvec->mm_state.tail->next; @@ -5315,9 +5309,6 @@ static void lru_gen_change_state(bool enabled) for_each_node(nid) { struct lruvec *lruvec = get_lruvec(memcg, nid); - if (!lruvec) - continue; - spin_lock_irq(&lruvec->lru_lock); VM_WARN_ON_ONCE(!seq_is_valid(lruvec));