lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 65/71] mips: cacheinfo: report shared CPU map
    Date
    From: Vladimir Kondratiev <vladimir.kondratiev@intel.com>

    [ Upstream commit 3b1313eb32c499d46dc4c3e896d19d9564c879c4 ]

    Report L1 caches as shared per core; L2 - per cluster.

    This fixes "perf" that went crazy if shared_cpu_map attribute not
    reported on sysfs, in form of

    /sys/devices/system/cpu/cpu*/cache/index*/shared_cpu_list
    /sys/devices/system/cpu/cpu*/cache/index*/shared_cpu_map

    Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@intel.com>
    Signed-off-by: Paul Burton <paulburton@kernel.org>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: James Hogan <jhogan@kernel.org>
    Cc: linux-mips@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/mips/kernel/cacheinfo.c | 27 ++++++++++++++++++++++++++-
    1 file changed, 26 insertions(+), 1 deletion(-)

    diff --git a/arch/mips/kernel/cacheinfo.c b/arch/mips/kernel/cacheinfo.c
    index 428ef2189203..3ea95568ece4 100644
    --- a/arch/mips/kernel/cacheinfo.c
    +++ b/arch/mips/kernel/cacheinfo.c
    @@ -61,6 +61,25 @@ static int __init_cache_level(unsigned int cpu)
    return 0;
    }

    +static void fill_cpumask_siblings(int cpu, cpumask_t *cpu_map)
    +{
    + int cpu1;
    +
    + for_each_possible_cpu(cpu1)
    + if (cpus_are_siblings(cpu, cpu1))
    + cpumask_set_cpu(cpu1, cpu_map);
    +}
    +
    +static void fill_cpumask_cluster(int cpu, cpumask_t *cpu_map)
    +{
    + int cpu1;
    + int cluster = cpu_cluster(&cpu_data[cpu]);
    +
    + for_each_possible_cpu(cpu1)
    + if (cpu_cluster(&cpu_data[cpu1]) == cluster)
    + cpumask_set_cpu(cpu1, cpu_map);
    +}
    +
    static int __populate_cache_leaves(unsigned int cpu)
    {
    struct cpuinfo_mips *c = &current_cpu_data;
    @@ -68,14 +87,20 @@ static int __populate_cache_leaves(unsigned int cpu)
    struct cacheinfo *this_leaf = this_cpu_ci->info_list;

    if (c->icache.waysize) {
    + /* L1 caches are per core */
    + fill_cpumask_siblings(cpu, &this_leaf->shared_cpu_map);
    populate_cache(dcache, this_leaf, 1, CACHE_TYPE_DATA);
    + fill_cpumask_siblings(cpu, &this_leaf->shared_cpu_map);
    populate_cache(icache, this_leaf, 1, CACHE_TYPE_INST);
    } else {
    populate_cache(dcache, this_leaf, 1, CACHE_TYPE_UNIFIED);
    }

    - if (c->scache.waysize)
    + if (c->scache.waysize) {
    + /* L2 cache is per cluster */
    + fill_cpumask_cluster(cpu, &this_leaf->shared_cpu_map);
    populate_cache(scache, this_leaf, 2, CACHE_TYPE_UNIFIED);
    + }

    if (c->tcache.waysize)
    populate_cache(tcache, this_leaf, 3, CACHE_TYPE_UNIFIED);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-17 00:34    [W:5.140 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site