Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp3149557pxb; Sat, 9 Oct 2021 03:11:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFu1ykg7h77Klgp3uJQtsKPv3OECy88xWMnHZhvjQTFiWxhhoWcU11jBIYL0L6Ck6i5tts X-Received: by 2002:a17:906:5689:: with SMTP id am9mr10995909ejc.416.1633774265236; Sat, 09 Oct 2021 03:11:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633774265; cv=none; d=google.com; s=arc-20160816; b=vx32NhyCAiDKsHjB3LgVX3COcl6fYJIyWBs7F5ws+tIohiZ+ku3/+vH4+TogXPwIjt 6D8CcEXXaD5RHCtPCPmsj1sontJKxbwzUEY3RtNKTTeNA01iIrk0LS38dnko3flo/nR6 BfuulcG+sl/REBcOw51qxQE112yx3Xv0q1EHt49XTkkjVZPvE5fpMv8knKk1zr366s42 OgGtV+n5jKdn3OL3qgOaYSP50tbjbulCoQSRyaV6zsU2FVVa3qMpJLX3uJ/IYGosu++B xhiy3cP+PkRvpOB7WdmgVOXb5i7C2fGnxaomz2qpm2+JQ6sWdAFbya5+z6kkoqQRNi6R tdHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=oWymYsKNx0jaXlfButPbehp1bOF+ne9g31jbbs7KNHI=; b=P3OaL3japDekxWClrjYSIDzS/sNeXQlZkyQx4vCoo28pcARXP4WCRvEKv0UV4TTlIA BbaR3fbz2c4OEQkqpImceMOrjlUR62YingbDU5mYuXwYNmw1/sXoya0+2Mr3Y+N7BDBk ogyVSad45GgI5w5eui6lrvD1Fz9xsCnKB3E02VGmIgmqSKDHejNIcAT6cnWFNhbj8YMr YGhm0n8Yhmwuhzs3e1CRgyKFR4LIVY2SUDvFIuZ9ebbHOIcrbUPM3AAo4V99r4SV2xl5 9eETVhWKU43W12eAUUpQDpz/80uZUtoECl58Hys9nlp6urpwcAIvKF2/X0off/90rUsh HOAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wNJkcC4E; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q6si3752247edd.367.2021.10.09.03.10.42; Sat, 09 Oct 2021 03:11:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wNJkcC4E; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244727AbhJIKKd (ORCPT + 99 others); Sat, 9 Oct 2021 06:10:33 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:49598 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244544AbhJIKJf (ORCPT ); Sat, 9 Oct 2021 06:09:35 -0400 Date: Sat, 09 Oct 2021 10:07:36 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1633774057; h=from:from:sender:sender:reply-to: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oWymYsKNx0jaXlfButPbehp1bOF+ne9g31jbbs7KNHI=; b=wNJkcC4ENH+QjchaYvp/tJwwLX2zqbDAPpPO6efOnbhuiTQa0ctQHNcfnaVy2UP1JVBLGp M6n0Y7/CN0mguMkfYsO2ASihJY56tRBdeGmlGYDoZb0MaIHs8lfZsrhfcwOg5nAqWF2ElM x3+mSJDaP3OVY+gle7a3jJ2McJdYReWEUPLP5kAOfvrldppJhgyqJec64QaI/BRpABaUgF Mdg8R7+AVV0bVgfPsr6y6dKvNPhbe3YMaBXu1Kiu8LkyLBpcmmfmvl2vAWNXETnS46XJ08 OVu2FUQWX2Wkr76nJYus5PCV4IpHv+DxaGrbjwCZXkLaJqhWIUuE4w/acs6EOA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1633774057; h=from:from:sender:sender:reply-to: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oWymYsKNx0jaXlfButPbehp1bOF+ne9g31jbbs7KNHI=; b=o8w/7DApq9APKiPtalrLcY3UWMZsQJvL/G4WFbILDPKR+RY8KilW6OtPc2Cmi21H+y3+nY f1nzgmrwww8pl1Aw== From: "tip-bot2 for Bharata B Rao" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/numa: Remove the redundant member numa_group::fault_cpus Cc: Bharata B Rao , "Peter Zijlstra (Intel)" , Mel Gorman , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20211004105706.3669-3-bharata@amd.com> References: <20211004105706.3669-3-bharata@amd.com> MIME-Version: 1.0 Message-ID: <163377405650.25758.13805560642192283335.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: 00c034108a76e8282809b7f25fa6ff147a9c6893 Gitweb: https://git.kernel.org/tip/00c034108a76e8282809b7f25fa6ff147a9c6893 Author: Bharata B Rao AuthorDate: Mon, 04 Oct 2021 16:27:04 +05:30 Committer: Peter Zijlstra CommitterDate: Thu, 07 Oct 2021 13:51:16 +02:00 sched/numa: Remove the redundant member numa_group::fault_cpus numa_group::fault_cpus is actually a pointer to the region in numa_group::faults[] where NUMA_CPU stats are located. Remove this redundant member and use numa_group::faults[NUMA_CPU] directly like it is done for similar per-process numa fault stats. There is no functionality change due to this commit. Signed-off-by: Bharata B Rao Signed-off-by: Peter Zijlstra (Intel) Acked-by: Mel Gorman Link: https://lkml.kernel.org/r/20211004105706.3669-3-bharata@amd.com --- kernel/sched/fair.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index fc0a0ed..cfbd5ef 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1038,11 +1038,12 @@ struct numa_group { unsigned long total_faults; unsigned long max_faults_cpu; /* + * faults[] array is split into two regions: faults_mem and faults_cpu. + * * Faults_cpu is used to decide whether memory should move * towards the CPU. As a consequence, these stats are weighted * more by CPU use than by memory faults. */ - unsigned long *faults_cpu; unsigned long faults[]; }; @@ -1216,8 +1217,8 @@ static inline unsigned long group_faults(struct task_struct *p, int nid) static inline unsigned long group_faults_cpu(struct numa_group *group, int nid) { - return group->faults_cpu[task_faults_idx(NUMA_MEM, nid, 0)] + - group->faults_cpu[task_faults_idx(NUMA_MEM, nid, 1)]; + return group->faults[task_faults_idx(NUMA_CPU, nid, 0)] + + group->faults[task_faults_idx(NUMA_CPU, nid, 1)]; } static inline unsigned long group_faults_priv(struct numa_group *ng) @@ -2384,7 +2385,7 @@ static void task_numa_placement(struct task_struct *p) * is at the beginning of the numa_faults array. */ ng->faults[mem_idx] += diff; - ng->faults_cpu[mem_idx] += f_diff; + ng->faults[cpu_idx] += f_diff; ng->total_faults += diff; group_faults += ng->faults[mem_idx]; } @@ -2450,9 +2451,6 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags, grp->max_faults_cpu = 0; spin_lock_init(&grp->lock); grp->gid = p->pid; - /* Second half of the array tracks nids where faults happen */ - grp->faults_cpu = grp->faults + NR_NUMA_HINT_FAULT_TYPES * - nr_node_ids; for (i = 0; i < NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++) grp->faults[i] = p->numa_faults[i];