Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1575234pxb; Thu, 16 Sep 2021 10:12:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHq7slTzF7bM/6zCbnJVVEv+hN7RAdNl7zk7RRqc9FJpM99tuVKw2oed9Pb6lrtaf7wjKH X-Received: by 2002:a50:aa9c:: with SMTP id q28mr7513780edc.199.1631812359635; Thu, 16 Sep 2021 10:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631812359; cv=none; d=google.com; s=arc-20160816; b=sXQMf0IJj1E5jgWQIuaDE6qCSEU6vYDSwUmrNa70CI8vh1E24LhuCUCJJ8gk+DkYBw ly7GoY8SxOPVZYYGcCerALwGuCRU99rdBZ3SvyOXkeIlvqzBHxXpRMxV0thdh5ZTnWz+ NaftVamPvAdHWMgtX0ryr77mcTv+5HGCS0Rn1F0mzOs8B2VFq6yWgFH9WOwYiF//aXLr VNPJhH/7Ws73j8o8sAidYoPYXQBKJ4o9aYZ0gkdMJeMN2WRBHYGM8+33VnaaQ8Tzkoef one+wAkCOLtiNxpgRhjxxU4OvKtzCQJOtm2WqvaA8v/GGHcQmw3eyCAoxwmY83i0L/pE 71Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KBAkCW98I1fxzekaUx4gkIov2bSOtCXxQppvdYeX0Jg=; b=zBqdT90r4prhheIj40CFilLxmh0rdqRyD5ulB8zwvOIsf3NIsyNsbULeL/bbku6yjr PE1tJ5d+JE++X4N9TxVSvRlGYKYDzQ10Znlg1L9ds5UGVAh3VMViJKrwbIC0v+3cbhDR fXdxeK8GTOjQmiHrD2GxLfPWzhsY9jxvgwiAi9AaPPWB7cuvrHRU9cxhqgUg+F+jsL9R 0aMl1KEgfNnsEJLtSM73H0nFaR+KNv4rcOBVBcxRtMDOeVW7y72LQRgrcSQ5n6LyanBi P1/o0zvyPCzwPoLffO0k/iULSRhm+ecfCw+N2kvSAwDb52PIstkRJEDS6A1D25bssFFk Sc6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KhKkRRYe; 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=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bi14si3884458ejb.441.2021.09.16.10.12.12; Thu, 16 Sep 2021 10:12:39 -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=@linuxfoundation.org header.s=korg header.b=KhKkRRYe; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347416AbhIPRLH (ORCPT + 99 others); Thu, 16 Sep 2021 13:11:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:34162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348880AbhIPRDS (ORCPT ); Thu, 16 Sep 2021 13:03:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 741FD61B03; Thu, 16 Sep 2021 16:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810062; bh=+bY31dPJFtqpT+8jYpHZApMb6m8ON71lfddpGc5hhac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KhKkRRYeFTLMR/wHVS/VDxPV9CLnplgu801WtIZdIgJthcLjhvMQYyYOSR9mtNXzQ rxPmI9a97BNhrpTH8WOBOiZEfrbmTadt+MWrnEkZJ8FKNZUiHlPBPQK5gDt/r9VTcm OWZVxgPo8Q3RNqcauEqJDhlXiqrQo44jXWl9zd5o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shirisha Ganta , "Pratik R. Sampat" , "Gautham R. Shenoy" , Michael Ellerman Subject: [PATCH 5.13 354/380] cpufreq: powernv: Fix init_chip_info initialization in numa=off Date: Thu, 16 Sep 2021 18:01:51 +0200 Message-Id: <20210916155816.100646424@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pratik R. Sampat commit f34ee9cb2c5ac5af426fee6fa4591a34d187e696 upstream. In the numa=off kernel command-line configuration init_chip_info() loops around the number of chips and attempts to copy the cpumask of that node which is NULL for all iterations after the first chip. Hence, store the cpu mask for each chip instead of derving cpumask from node while populating the "chips" struct array and copy that to the chips[i].mask Fixes: 053819e0bf84 ("cpufreq: powernv: Handle throttling due to Pmax capping at chip level") Cc: stable@vger.kernel.org # v4.3+ Reported-by: Shirisha Ganta Signed-off-by: Pratik R. Sampat Reviewed-by: Gautham R. Shenoy [mpe: Rename goto label to out_free_chip_cpu_mask] Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20210728120500.87549-2-psampat@linux.ibm.com Signed-off-by: Greg Kroah-Hartman --- drivers/cpufreq/powernv-cpufreq.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) --- a/drivers/cpufreq/powernv-cpufreq.c +++ b/drivers/cpufreq/powernv-cpufreq.c @@ -36,6 +36,7 @@ #define MAX_PSTATE_SHIFT 32 #define LPSTATE_SHIFT 48 #define GPSTATE_SHIFT 56 +#define MAX_NR_CHIPS 32 #define MAX_RAMP_DOWN_TIME 5120 /* @@ -1051,12 +1052,20 @@ static int init_chip_info(void) unsigned int *chip; unsigned int cpu, i; unsigned int prev_chip_id = UINT_MAX; + cpumask_t *chip_cpu_mask; int ret = 0; chip = kcalloc(num_possible_cpus(), sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; + /* Allocate a chip cpu mask large enough to fit mask for all chips */ + chip_cpu_mask = kcalloc(MAX_NR_CHIPS, sizeof(cpumask_t), GFP_KERNEL); + if (!chip_cpu_mask) { + ret = -ENOMEM; + goto free_and_return; + } + for_each_possible_cpu(cpu) { unsigned int id = cpu_to_chip_id(cpu); @@ -1064,22 +1073,25 @@ static int init_chip_info(void) prev_chip_id = id; chip[nr_chips++] = id; } + cpumask_set_cpu(cpu, &chip_cpu_mask[nr_chips-1]); } chips = kcalloc(nr_chips, sizeof(struct chip), GFP_KERNEL); if (!chips) { ret = -ENOMEM; - goto free_and_return; + goto out_free_chip_cpu_mask; } for (i = 0; i < nr_chips; i++) { chips[i].id = chip[i]; - cpumask_copy(&chips[i].mask, cpumask_of_node(chip[i])); + cpumask_copy(&chips[i].mask, &chip_cpu_mask[i]); INIT_WORK(&chips[i].throttle, powernv_cpufreq_work_fn); for_each_cpu(cpu, &chips[i].mask) per_cpu(chip_info, cpu) = &chips[i]; } +out_free_chip_cpu_mask: + kfree(chip_cpu_mask); free_and_return: kfree(chip); return ret;