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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4775EC433E0 for ; Tue, 9 Feb 2021 22:49:36 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC8C964DE7 for ; Tue, 9 Feb 2021 22:49:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC8C964DE7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mTrQubX8vm+IxgmXM5Cy9ldjwTih6Z9DQ0t6P6179+o=; b=ln4XNWYEAhJfzzpI/b8SFcdKO aWZVkvdK+wWE2qLhlJF4LwOf2TgRzA7Am++al3AOmCMpGp+lLmlaphhoi44ZeqnsDWl5xvh2Snslr YBn6FDrijq6GHb3hUwpVG36+L1woduO3DW20YXR8Zx7ovUfcHybDH4Y3ieIoI2nO1RQc6Nj4VEGjG 9g+NClA2+X5Qg1XlLgaPIDmCov1oT357d4H+0W96VJtoaW/UjOCz8o7pHxqpndAhTLCzEyD9Ehnu8 h6TzvMbJEqzf81m7giodl0fC3fzyqw4+N1CcO8yBvWHNCja+cQUnaISBlE+qzXGeCXA+XbFkPKSNz ag90I5lgA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9bo1-00037B-1M; Tue, 09 Feb 2021 22:48:25 +0000 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9bny-00036C-I9 for linux-arm-kernel@lists.infradead.org; Tue, 09 Feb 2021 22:48:23 +0000 Received: by mail-qv1-xf2b.google.com with SMTP id a1so9498107qvd.13 for ; Tue, 09 Feb 2021 14:48:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=6IRubA7TTNClirT+hB/10ffmOLH+PQXPZ7yX4dK2jA4=; b=dM7kLPp8/C/UWyO63F87+/b+M2Ibtglv6crAUeUXBabjzdt1gu50E6L1JER4ynu3GP sajQCr9QB/LLSNN3NlALwY5kC/iPrjgshWqjFfwApuhx8f3fo4yU1+IFtFvpXvGmpQln kBvk6qYbNCTnVHkt9jJ3mqd11dU7ZF+RoqiPORSvgPUeXFDYyRKxpOabPuT40Och3uD5 NfPjfSNfdRPtUqHkZclNUTTwD1lRm/WOwvskB4va+DFeim6Zvtnj5fr3zZcBwDg9ukoW 7aJP1tN9HuSRo6/nEbZvwrOHuDYHgOzcDbIHK1PQBZ2H9+yBiAEEKMpqAyrlGkO7pJDB 5i1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=6IRubA7TTNClirT+hB/10ffmOLH+PQXPZ7yX4dK2jA4=; b=Kqt/CqRfaK7MPmbiYghFRNu+o9VYeagvc8MNY00J3hayyNnKjuo2tagd0y9Uno5Mkn uPovhwpLlXGZcuKV2XMv8WUXm5KckL/+4Dh0haLUC103GoKnnHmnP2oiJG3qnWc2Oign aL7CvPRRENdp08u5aJr6xdShQSfWG9F2lAk7m15Cn9hxU1YcLa8H+1USsK5Q0yVfxu+g dfpJoT8Ca4/Y1KfPEuT+TjcQ0xMXl5MR9tMyby6qt7SdXfIjQCsn8ubh/BqfQDcdSDgf gtHs2ay8m3LEvfxFd3xgOYerIF/57W6IBBMegvBzzNQnE9a3NV3AUSWHfGkpsUDN58vx SSOA== X-Gm-Message-State: AOAM532/YQ3CGo55pRZN1GMPMSmux5+Dc5MBu3oX1aOvFht+l2KYnnNo rBXyz5lqbZ3ykNQ5q+FcCQ== X-Google-Smtp-Source: ABdhPJydEFjEFNUsczgSsGEyA9kp5gG6YKKkrIHiikCKDCnMsROSdk2CL06s26iZA8gVuCKYxyZMvQ== X-Received: by 2002:a0c:fe0b:: with SMTP id x11mr248366qvr.18.1612910899263; Tue, 09 Feb 2021 14:48:19 -0800 (PST) Received: from gabell (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id 82sm137774qkd.48.2021.02.09.14.48.17 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Feb 2021 14:48:18 -0800 (PST) Date: Tue, 9 Feb 2021 17:48:15 -0500 From: Masayoshi Mizuma To: Barry Song Subject: Re: [RFC PATCH v3 1/2] topology: Represent clusters of CPUs within a die. Message-ID: <20210209224815.duxcnlu2ra64xb4b@gabell> References: <20210106083026.40444-1-song.bao.hua@hisilicon.com> <20210106083026.40444-2-song.bao.hua@hisilicon.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210106083026.40444-2-song.bao.hua@hisilicon.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210209_174822_667512_8FA5A2DD X-CRM114-Status: GOOD ( 36.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: juri.lelli@redhat.com, mark.rutland@arm.com, peterz@infradead.org, catalin.marinas@arm.com, bsegall@google.com, xuwei5@huawei.com, will@kernel.org, vincent.guittot@linaro.org, aubrey.li@linux.intel.com, linux-acpi@vger.kernel.org, mingo@redhat.com, mgorman@suse.de, valentin.schneider@arm.com, lenb@kernel.org, linuxarm@openeuler.org, rostedt@goodmis.org, prime.zeng@hisilicon.com, jonathan.cameron@huawei.com, dietmar.eggemann@arm.com, linux-arm-kernel@lists.infradead.org, gregkh@linuxfoundation.org, rjw@rjwysocki.net, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, tiantao6@hisilicon.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Jan 06, 2021 at 09:30:25PM +1300, Barry Song wrote: > From: Jonathan Cameron > > Both ACPI and DT provide the ability to describe additional layers of > topology between that of individual cores and higher level constructs > such as the level at which the last level cache is shared. > In ACPI this can be represented in PPTT as a Processor Hierarchy > Node Structure [1] that is the parent of the CPU cores and in turn > has a parent Processor Hierarchy Nodes Structure representing > a higher level of topology. > > For example Kunpeng 920 has 6 clusters in each NUMA node, and each > cluster has 4 cpus. All clusters share L3 cache data, but each cluster > has local L3 tag. On the other hand, each clusters will share some > internal system bus. > > +-----------------------------------+ +---------+ > | +------+ +------+ +---------------------------+ | > | | CPU0 | | cpu1 | | +-----------+ | | > | +------+ +------+ | | | | | > | +----+ L3 | | | > | +------+ +------+ cluster | | tag | | | > | | CPU2 | | CPU3 | | | | | | > | +------+ +------+ | +-----------+ | | > | | | | > +-----------------------------------+ | | > +-----------------------------------+ | | > | +------+ +------+ +--------------------------+ | > | | | | | | +-----------+ | | > | +------+ +------+ | | | | | > | | | L3 | | | > | +------+ +------+ +----+ tag | | | > | | | | | | | | | | > | +------+ +------+ | +-----------+ | | > | | | | > +-----------------------------------+ | L3 | > | data | > +-----------------------------------+ | | > | +------+ +------+ | +-----------+ | | > | | | | | | | | | | > | +------+ +------+ +----+ L3 | | | > | | | tag | | | > | +------+ +------+ | | | | | > | | | | | ++ +-----------+ | | > | +------+ +------+ |---------------------------+ | > +-----------------------------------| | | > +-----------------------------------| | | > | +------+ +------+ +---------------------------+ | > | | | | | | +-----------+ | | > | +------+ +------+ | | | | | > | +----+ L3 | | | > | +------+ +------+ | | tag | | | > | | | | | | | | | | > | +------+ +------+ | +-----------+ | | > | | | | > +-----------------------------------+ | | > +-----------------------------------+ | | > | +------+ +------+ +--------------------------+ | > | | | | | | +-----------+ | | > | +------+ +------+ | | | | | > | | | L3 | | | > | +------+ +------+ +---+ tag | | | > | | | | | | | | | | > | +------+ +------+ | +-----------+ | | > | | | | > +-----------------------------------+ | | > +-----------------------------------+ ++ | > | +------+ +------+ +--------------------------+ | > | | | | | | +-----------+ | | > | +------+ +------+ | | | | | > | | | L3 | | | > | +------+ +------+ +--+ tag | | | > | | | | | | | | | | > | +------+ +------+ | +-----------+ | | > | | +---------+ > +-----------------------------------+ > > That means the cost to transfer ownership of a cacheline between CPUs > within a cluster is lower than between CPUs in different clusters on > the same die. Hence, it can make sense to tell the scheduler to use > the cache affinity of the cluster to make better decision on thread > migration. > > This patch simply exposes this information to userspace libraries > like hwloc by providing cluster_cpus and related sysfs attributes. > PoC of HWLOC support at [2]. > > Note this patch only handle the ACPI case. > > Special consideration is needed for SMT processors, where it is > necessary to move 2 levels up the hierarchy from the leaf nodes > (thus skipping the processor core level). > > Currently the ID provided is the offset of the Processor > Hierarchy Nodes Structure within PPTT. Whilst this is unique > it is not terribly elegant so alternative suggestions welcome. > > Note that arm64 / ACPI does not provide any means of identifying > a die level in the topology but that may be unrelate to the cluster > level. > > [1] ACPI Specification 6.3 - section 5.2.29.1 processor hierarchy node > structure (Type 0) > [2] https://github.com/hisilicon/hwloc/tree/linux-cluster > > Signed-off-by: Jonathan Cameron > Signed-off-by: Barry Song > --- > -v3: > * no real change(v2 comments not addressed); > * rebased againest 5.11-rc2; > > Documentation/admin-guide/cputopology.rst | 26 +++++++++++--- > arch/arm64/kernel/topology.c | 2 ++ > drivers/acpi/pptt.c | 60 +++++++++++++++++++++++++++++++ > drivers/base/arch_topology.c | 14 ++++++++ > drivers/base/topology.c | 10 ++++++ > include/linux/acpi.h | 5 +++ > include/linux/arch_topology.h | 5 +++ > include/linux/topology.h | 6 ++++ > 8 files changed, 124 insertions(+), 4 deletions(-) > > diff --git a/Documentation/admin-guide/cputopology.rst b/Documentation/admin-guide/cputopology.rst > index b90dafc..f9d3745 100644 > --- a/Documentation/admin-guide/cputopology.rst > +++ b/Documentation/admin-guide/cputopology.rst > @@ -24,6 +24,12 @@ core_id: > identifier (rather than the kernel's). The actual value is > architecture and platform dependent. > > +cluster_id: > + > + the Cluster ID of cpuX. Typically it is the hardware platform's > + identifier (rather than the kernel's). The actual value is > + architecture and platform dependent. > + > book_id: > > the book ID of cpuX. Typically it is the hardware platform's > @@ -56,6 +62,14 @@ package_cpus_list: > human-readable list of CPUs sharing the same physical_package_id. > (deprecated name: "core_siblings_list") > > +cluster_cpus: > + > + internal kernel map of CPUs within the same cluster. > + > +cluster_cpus_list: > + > + human-readable list of CPUs within the same cluster. > + > die_cpus: > > internal kernel map of CPUs within the same die. > @@ -96,11 +110,13 @@ these macros in include/asm-XXX/topology.h:: > > #define topology_physical_package_id(cpu) > #define topology_die_id(cpu) > + #define topology_cluster_id(cpu) > #define topology_core_id(cpu) > #define topology_book_id(cpu) > #define topology_drawer_id(cpu) > #define topology_sibling_cpumask(cpu) > #define topology_core_cpumask(cpu) > + #define topology_cluster_cpumask(cpu) > #define topology_die_cpumask(cpu) > #define topology_book_cpumask(cpu) > #define topology_drawer_cpumask(cpu) > @@ -116,10 +132,12 @@ not defined by include/asm-XXX/topology.h: > > 1) topology_physical_package_id: -1 > 2) topology_die_id: -1 > -3) topology_core_id: 0 > -4) topology_sibling_cpumask: just the given CPU > -5) topology_core_cpumask: just the given CPU > -6) topology_die_cpumask: just the given CPU > +3) topology_cluster_id: -1 > +4) topology_core_id: 0 > +5) topology_sibling_cpumask: just the given CPU > +6) topology_core_cpumask: just the given CPU > +7) topology_cluster_cpumask: just the given CPU > +8) topology_die_cpumask: just the given CPU > > For architectures that don't support books (CONFIG_SCHED_BOOK) there are no > default definitions for topology_book_id() and topology_book_cpumask(). > diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c > index f6faa69..fe076b3 100644 > --- a/arch/arm64/kernel/topology.c > +++ b/arch/arm64/kernel/topology.c > @@ -103,6 +103,8 @@ int __init parse_acpi_topology(void) > cpu_topology[cpu].thread_id = -1; > cpu_topology[cpu].core_id = topology_id; > } > + topology_id = find_acpi_cpu_topology_cluster(cpu); > + cpu_topology[cpu].cluster_id = topology_id; > topology_id = find_acpi_cpu_topology_package(cpu); > cpu_topology[cpu].package_id = topology_id; > > diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c > index 4ae9335..8646a93 100644 > --- a/drivers/acpi/pptt.c > +++ b/drivers/acpi/pptt.c > @@ -737,6 +737,66 @@ int find_acpi_cpu_topology_package(unsigned int cpu) > } > > /** > + * find_acpi_cpu_topology_cluster() - Determine a unique CPU cluster value > + * @cpu: Kernel logical CPU number > + * > + * Determine a topology unique cluster ID for the given CPU/thread. > + * This ID can then be used to group peers, which will have matching ids. > + * > + * The cluster, if present is the level of topology above CPUs. In a > + * multi-thread CPU, it will be the level above the CPU, not the thread. > + * It may not exist in single CPU systems. In simple multi-CPU systems, > + * it may be equal to the package topology level. > + * > + * Return: -ENOENT if the PPTT doesn't exist, the CPU cannot be found > + * or there is no toplogy level above the CPU.. > + * Otherwise returns a value which represents the package for this CPU. > + */ > + > +int find_acpi_cpu_topology_cluster(unsigned int cpu) > +{ > + struct acpi_table_header *table; > + acpi_status status; > + struct acpi_pptt_processor *cpu_node, *cluster_node; > + int retval; > + int is_thread; > + > + status = acpi_get_table(ACPI_SIG_PPTT, 0, &table); > + if (ACPI_FAILURE(status)) { > + acpi_pptt_warn_missing(); > + return -ENOENT; > + } > + cpu_node = acpi_find_processor_node(table, cpu); The second argument of acpi_find_processor_node() expects ACPI Processor ID, not the logical cpu number. How about the following? acpi_cpu_id = get_acpi_id_for_cpu(cpu); cpu_node = acpi_find_processor_node(table, acpi_cpu_id); Thanks, Masa > + if (cpu_node == NULL || !cpu_node->parent) { > + retval = -ENOENT; > + goto put_table; > + } > + > + is_thread = cpu_node->flags & ACPI_PPTT_ACPI_PROCESSOR_IS_THREAD; > + cluster_node = fetch_pptt_node(table, cpu_node->parent); > + if (cluster_node == NULL) { > + retval = -ENOENT; > + goto put_table; > + } > + if (is_thread) { > + if (!cluster_node->parent) { > + retval = -ENOENT; > + goto put_table; > + } > + cluster_node = fetch_pptt_node(table, cluster_node->parent); > + if (cluster_node == NULL) { > + retval = -ENOENT; > + goto put_table; > + } > + } > + retval = ACPI_PTR_DIFF(cluster_node, table); > +put_table: > + acpi_put_table(table); > + > + return retval; > +} > + > +/** > * find_acpi_cpu_topology_hetero_id() - Get a core architecture tag > * @cpu: Kernel logical CPU number > * > diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c > index de8587c..3079232 100644 > --- a/drivers/base/arch_topology.c > +++ b/drivers/base/arch_topology.c > @@ -506,6 +506,11 @@ const struct cpumask *cpu_coregroup_mask(int cpu) > return core_mask; > } > > +const struct cpumask *cpu_clustergroup_mask(int cpu) > +{ > + return &cpu_topology[cpu].cluster_sibling; > +} > + > void update_siblings_masks(unsigned int cpuid) > { > struct cpu_topology *cpu_topo, *cpuid_topo = &cpu_topology[cpuid]; > @@ -523,6 +528,11 @@ void update_siblings_masks(unsigned int cpuid) > if (cpuid_topo->package_id != cpu_topo->package_id) > continue; > > + if (cpuid_topo->cluster_id == cpu_topo->cluster_id) { > + cpumask_set_cpu(cpu, &cpuid_topo->cluster_sibling); > + cpumask_set_cpu(cpuid, &cpu_topo->cluster_sibling); > + } > + > cpumask_set_cpu(cpuid, &cpu_topo->core_sibling); > cpumask_set_cpu(cpu, &cpuid_topo->core_sibling); > > @@ -541,6 +551,9 @@ static void clear_cpu_topology(int cpu) > cpumask_clear(&cpu_topo->llc_sibling); > cpumask_set_cpu(cpu, &cpu_topo->llc_sibling); > > + cpumask_clear(&cpu_topo->cluster_sibling); > + cpumask_set_cpu(cpu, &cpu_topo->cluster_sibling); > + > cpumask_clear(&cpu_topo->core_sibling); > cpumask_set_cpu(cpu, &cpu_topo->core_sibling); > cpumask_clear(&cpu_topo->thread_sibling); > @@ -571,6 +584,7 @@ void remove_cpu_topology(unsigned int cpu) > cpumask_clear_cpu(cpu, topology_core_cpumask(sibling)); > for_each_cpu(sibling, topology_sibling_cpumask(cpu)) > cpumask_clear_cpu(cpu, topology_sibling_cpumask(sibling)); > + > for_each_cpu(sibling, topology_llc_cpumask(cpu)) > cpumask_clear_cpu(cpu, topology_llc_cpumask(sibling)); > > diff --git a/drivers/base/topology.c b/drivers/base/topology.c > index 4d254fc..7157ac0 100644 > --- a/drivers/base/topology.c > +++ b/drivers/base/topology.c > @@ -46,6 +46,9 @@ static DEVICE_ATTR_RO(physical_package_id); > define_id_show_func(die_id); > static DEVICE_ATTR_RO(die_id); > > +define_id_show_func(cluster_id); > +static DEVICE_ATTR_RO(cluster_id); > + > define_id_show_func(core_id); > static DEVICE_ATTR_RO(core_id); > > @@ -61,6 +64,10 @@ define_siblings_show_func(core_siblings, core_cpumask); > static DEVICE_ATTR_RO(core_siblings); > static DEVICE_ATTR_RO(core_siblings_list); > > +define_siblings_show_func(cluster_cpus, cluster_cpumask); > +static DEVICE_ATTR_RO(cluster_cpus); > +static DEVICE_ATTR_RO(cluster_cpus_list); > + > define_siblings_show_func(die_cpus, die_cpumask); > static DEVICE_ATTR_RO(die_cpus); > static DEVICE_ATTR_RO(die_cpus_list); > @@ -88,6 +95,7 @@ static DEVICE_ATTR_RO(drawer_siblings_list); > static struct attribute *default_attrs[] = { > &dev_attr_physical_package_id.attr, > &dev_attr_die_id.attr, > + &dev_attr_cluster_id.attr, > &dev_attr_core_id.attr, > &dev_attr_thread_siblings.attr, > &dev_attr_thread_siblings_list.attr, > @@ -95,6 +103,8 @@ static struct attribute *default_attrs[] = { > &dev_attr_core_cpus_list.attr, > &dev_attr_core_siblings.attr, > &dev_attr_core_siblings_list.attr, > + &dev_attr_cluster_cpus.attr, > + &dev_attr_cluster_cpus_list.attr, > &dev_attr_die_cpus.attr, > &dev_attr_die_cpus_list.attr, > &dev_attr_package_cpus.attr, > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 2630c2e..8f603cd 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1325,6 +1325,7 @@ static inline int lpit_read_residency_count_address(u64 *address) > #ifdef CONFIG_ACPI_PPTT > int acpi_pptt_cpu_is_thread(unsigned int cpu); > int find_acpi_cpu_topology(unsigned int cpu, int level); > +int find_acpi_cpu_topology_cluster(unsigned int cpu); > int find_acpi_cpu_topology_package(unsigned int cpu); > int find_acpi_cpu_topology_hetero_id(unsigned int cpu); > int find_acpi_cpu_cache_topology(unsigned int cpu, int level); > @@ -1337,6 +1338,10 @@ static inline int find_acpi_cpu_topology(unsigned int cpu, int level) > { > return -EINVAL; > } > +static inline int find_acpi_cpu_topology_cluster(unsigned int cpu) > +{ > + return -EINVAL; > +} > static inline int find_acpi_cpu_topology_package(unsigned int cpu) > { > return -EINVAL; > diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h > index 0f6cd6b..987c7ea 100644 > --- a/include/linux/arch_topology.h > +++ b/include/linux/arch_topology.h > @@ -49,10 +49,12 @@ void topology_set_thermal_pressure(const struct cpumask *cpus, > struct cpu_topology { > int thread_id; > int core_id; > + int cluster_id; > int package_id; > int llc_id; > cpumask_t thread_sibling; > cpumask_t core_sibling; > + cpumask_t cluster_sibling; > cpumask_t llc_sibling; > }; > > @@ -60,13 +62,16 @@ struct cpu_topology { > extern struct cpu_topology cpu_topology[NR_CPUS]; > > #define topology_physical_package_id(cpu) (cpu_topology[cpu].package_id) > +#define topology_cluster_id(cpu) (cpu_topology[cpu].cluster_id) > #define topology_core_id(cpu) (cpu_topology[cpu].core_id) > #define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_sibling) > #define topology_sibling_cpumask(cpu) (&cpu_topology[cpu].thread_sibling) > +#define topology_cluster_cpumask(cpu) (&cpu_topology[cpu].cluster_sibling) > #define topology_llc_cpumask(cpu) (&cpu_topology[cpu].llc_sibling) > void init_cpu_topology(void); > void store_cpu_topology(unsigned int cpuid); > const struct cpumask *cpu_coregroup_mask(int cpu); > +const struct cpumask *cpu_clustergroup_mask(int cpu); > void update_siblings_masks(unsigned int cpu); > void remove_cpu_topology(unsigned int cpuid); > void reset_cpu_topology(void); > diff --git a/include/linux/topology.h b/include/linux/topology.h > index ad03df1..bf2cc3c 100644 > --- a/include/linux/topology.h > +++ b/include/linux/topology.h > @@ -185,6 +185,9 @@ static inline int cpu_to_mem(int cpu) > #ifndef topology_die_id > #define topology_die_id(cpu) ((void)(cpu), -1) > #endif > +#ifndef topology_cluster_id > +#define topology_cluster_id(cpu) ((void)(cpu), -1) > +#endif > #ifndef topology_core_id > #define topology_core_id(cpu) ((void)(cpu), 0) > #endif > @@ -194,6 +197,9 @@ static inline int cpu_to_mem(int cpu) > #ifndef topology_core_cpumask > #define topology_core_cpumask(cpu) cpumask_of(cpu) > #endif > +#ifndef topology_cluster_cpumask > +#define topology_cluster_cpumask(cpu) cpumask_of(cpu) > +#endif > #ifndef topology_die_cpumask > #define topology_die_cpumask(cpu) cpumask_of(cpu) > #endif > -- > 2.7.4 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel