Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3190626imu; Fri, 23 Nov 2018 23:43:40 -0800 (PST) X-Google-Smtp-Source: AFSGD/UqBct5W+Nb4EsBKlg3S+xt/ZRPNClJHYE/p4cuTPN5U5ahnEmLVdpykbkqmXFnoo4EJum/ X-Received: by 2002:a63:d655:: with SMTP id d21mr17016966pgj.280.1543045420112; Fri, 23 Nov 2018 23:43:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543045420; cv=none; d=google.com; s=arc-20160816; b=QEuw+yZkGL/xsAfcLfgy8rwJpmCOiBHuXcjiizwf7nK+0iIK/e54d4spS64nW5t5K1 +c4PTxAev5H5K/YVJaid3c5R4TmYgAbEfqgglLCVke8SedR7TL5XWA82esDR0IU80yEG n6aMgSnrSwHE9pkACF6zEGmGONr/Zl8Aj/1LAgYw6EYn0zorVLQz0+ueKzEhvIR9v8mv v+fTPI0xqwnbVswVMENlPXUeztYuH/U8MciBnJccFAnuwtr9ewT5vEA5wTkaxQ/b+NcY 8ygxfnxWAgh1Oi0ortQ/NxzFp6YERGgsiJMNvVDOjIiYKcdR898ZTONisPgaTxWT/nnt UoEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date; bh=KXaidws707THRPaT+2YqE621bK2cpCUuhyCRSsL9Z34=; b=rwBWg3XxDqNUqxP1E8DBu0XzSk8dmwqFAWkWF3jughAJZDf7+lZAX4X0gF4l7YWUbv fYTO+Vfh1u6mEhr85R74EScOoVtdiGKPbNaeYvw3FvmkCK2QOkDFWkj+zg/jbyk52Xk0 G6o46K8V7FvCtVCxD6C+esHTC0WIUCdeJW7Iy/7nAjWQ9u7B346t9gjcof0V40plzbZh +k7Lh72gdR4hLjvDsygwl8QG2pcwnXul5UPzA/ireAV7l2XiIjq4t0IA1/F2aL9UbAbU XO1uhuAdTQLxycZDqPgS/lnAAjbq1zTGxJuJLDo9FyUnHCxbNJPvE6hNjCLtdG17T+TY 3lZw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j22si49793626pgj.244.2018.11.23.23.43.25; Fri, 23 Nov 2018 23:43:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438874AbeKWId5 (ORCPT + 99 others); Fri, 23 Nov 2018 03:33:57 -0500 Received: from terminus.zytor.com ([198.137.202.136]:54859 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730054AbeKWId5 (ORCPT ); Fri, 23 Nov 2018 03:33:57 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id wAMLpefr3948138 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 22 Nov 2018 13:51:40 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id wAMLpejk3948134; Thu, 22 Nov 2018 13:51:40 -0800 Date: Thu, 22 Nov 2018 13:51:40 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Babu Moger Message-ID: Cc: mchehab+samsung@kernel.org, luto@kernel.org, akpm@linux-foundation.org, puwen@hygon.cn, bp@suse.de, suravee.suthikulpanit@amd.com, rafael@kernel.org, sherry.hurwitz@amd.com, linux-kernel@vger.kernel.org, rian@alum.mit.edu, jannh@google.com, arnd@arndb.de, davem@davemloft.net, corbet@lwn.net, kstewart@linuxfoundation.org, vkuznets@redhat.com, jpoimboe@redhat.com, gregkh@linuxfoundation.org, kirill.shutemov@linux.intel.com, dima@arista.com, mingo@redhat.com, qianyue.zj@alibaba-inc.com, peterz@infradead.org, Babu.Moger@amd.com, xiaochen.shen@intel.com, Thomas.Lendacky@amd.com, jroedel@suse.de, tglx@linutronix.de, tony.luck@intel.com, pombredanne@nexb.com, chang.seok.bae@intel.com, hpa@zytor.com, reinette.chatre@intel.com, linux-doc@vger.kernel.org, fenghua.yu@intel.com, babu.moger@amd.com, dwmw2@infradead.org, pbonzini@redhat.com, mingo@kernel.org, brijesh.singh@amd.com Reply-To: dwmw2@infradead.org, pbonzini@redhat.com, mingo@kernel.org, brijesh.singh@amd.com, fenghua.yu@intel.com, babu.moger@amd.com, linux-doc@vger.kernel.org, reinette.chatre@intel.com, tony.luck@intel.com, pombredanne@nexb.com, hpa@zytor.com, chang.seok.bae@intel.com, Thomas.Lendacky@amd.com, jroedel@suse.de, tglx@linutronix.de, xiaochen.shen@intel.com, peterz@infradead.org, Babu.Moger@amd.com, kirill.shutemov@linux.intel.com, dima@arista.com, mingo@redhat.com, qianyue.zj@alibaba-inc.com, kstewart@linuxfoundation.org, vkuznets@redhat.com, jpoimboe@redhat.com, gregkh@linuxfoundation.org, corbet@lwn.net, rian@alum.mit.edu, jannh@google.com, arnd@arndb.de, davem@davemloft.net, sherry.hurwitz@amd.com, linux-kernel@vger.kernel.org, mchehab+samsung@kernel.org, akpm@linux-foundation.org, luto@kernel.org, bp@suse.de, puwen@hygon.cn, rafael@kernel.org, suravee.suthikulpanit@amd.com In-Reply-To: <20181121202811.4492-12-babu.moger@amd.com> References: <20181121202811.4492-12-babu.moger@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cache] x86/resctrl: Introduce AMD QOS feature Git-Commit-ID: 4d05bf71f157d756932e77cdee16dc99e235d636 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_DATE_IN_FUTURE_96_Q autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4d05bf71f157d756932e77cdee16dc99e235d636 Gitweb: https://git.kernel.org/tip/4d05bf71f157d756932e77cdee16dc99e235d636 Author: Babu Moger AuthorDate: Wed, 21 Nov 2018 20:28:45 +0000 Committer: Borislav Petkov CommitDate: Thu, 22 Nov 2018 20:16:20 +0100 x86/resctrl: Introduce AMD QOS feature Enable QOS feature on AMD. Following QoS sub-features are supported on AMD if the underlying hardware supports it: - L3 Cache allocation enforcement - L3 Cache occupancy monitoring - L3 Code-Data Prioritization support - Memory Bandwidth Enforcement (Allocation) The specification is available at: https://developer.amd.com/wp-content/resources/56375.pdf There are differences in the way some of the features are implemented. Separate those functions and add those as vendor specific functions. The major difference is in MBA feature: - AMD uses CPUID leaf 0x80000020 to initialize the MBA features. - AMD uses direct bandwidth value instead of delay based on bandwidth values. - MSR register base addresses are different for MBA. - AMD allows non-contiguous L3 cache bit masks. Signed-off-by: Babu Moger Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Brijesh Singh Cc: "Chang S. Bae" Cc: David Miller Cc: David Woodhouse Cc: Dmitry Safonov Cc: Fenghua Yu Cc: Greg Kroah-Hartman Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jann Horn Cc: Joerg Roedel Cc: Jonathan Corbet Cc: Josh Poimboeuf Cc: Kate Stewart Cc: "Kirill A. Shutemov" Cc: Cc: Mauro Carvalho Chehab Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Philippe Ombredanne Cc: Pu Wen Cc: Cc: "Rafael J. Wysocki" Cc: Reinette Chatre Cc: Rian Hunter Cc: Sherry Hurwitz Cc: Suravee Suthikulpanit Cc: Thomas Gleixner Cc: Thomas Lendacky Cc: Tony Luck Cc: Vitaly Kuznetsov Cc: Link: https://lkml.kernel.org/r/20181121202811.4492-12-babu.moger@amd.com --- arch/x86/kernel/cpu/resctrl/core.c | 69 ++++++++++++++++++++++++++++-- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 71 +++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/resctrl/internal.h | 5 +++ 3 files changed, 142 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index ba5a5b8c4681..2ec252be4ed9 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -61,6 +61,9 @@ mba_wrmsr_intel(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r); static void cat_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r); +static void +mba_wrmsr_amd(struct rdt_domain *d, struct msr_param *m, + struct rdt_resource *r); #define domain_init(id) LIST_HEAD_INIT(rdt_resources_all[id].domains) @@ -255,7 +258,7 @@ static inline bool rdt_get_mb_table(struct rdt_resource *r) return false; } -static bool __get_mem_config(struct rdt_resource *r) +static bool __get_mem_config_intel(struct rdt_resource *r) { union cpuid_0x10_3_eax eax; union cpuid_0x10_x_edx edx; @@ -281,6 +284,30 @@ static bool __get_mem_config(struct rdt_resource *r) return true; } +static bool __rdt_get_mem_config_amd(struct rdt_resource *r) +{ + union cpuid_0x10_3_eax eax; + union cpuid_0x10_x_edx edx; + u32 ebx, ecx; + + cpuid_count(0x80000020, 1, &eax.full, &ebx, &ecx, &edx.full); + r->num_closid = edx.split.cos_max + 1; + r->default_ctrl = MAX_MBA_BW_AMD; + + /* AMD does not use delay */ + r->membw.delay_linear = false; + + r->membw.min_bw = 0; + r->membw.bw_gran = 1; + /* Max value is 2048, Data width should be 4 in decimal */ + r->data_width = 4; + + r->alloc_capable = true; + r->alloc_enabled = true; + + return true; +} + static void rdt_get_cache_alloc_cfg(int idx, struct rdt_resource *r) { union cpuid_0x10_1_eax eax; @@ -340,6 +367,15 @@ static int get_cache_id(int cpu, int level) return -1; } +static void +mba_wrmsr_amd(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r) +{ + unsigned int i; + + for (i = m->low; i < m->high; i++) + wrmsrl(r->msr_base + i, d->ctrl_val[i]); +} + /* * Map the memory b/w percentage value to delay values * that can be written to QOS_MSRs. @@ -793,8 +829,13 @@ static bool __init rdt_cpu_has(int flag) static __init bool get_mem_config(void) { - if (rdt_cpu_has(X86_FEATURE_MBA)) - return __get_mem_config(&rdt_resources_all[RDT_RESOURCE_MBA]); + if (!rdt_cpu_has(X86_FEATURE_MBA)) + return false; + + if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) + return __get_mem_config_intel(&rdt_resources_all[RDT_RESOURCE_MBA]); + else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + return __rdt_get_mem_config_amd(&rdt_resources_all[RDT_RESOURCE_MBA]); return false; } @@ -893,10 +934,32 @@ static __init void rdt_init_res_defs_intel(void) } } +static __init void rdt_init_res_defs_amd(void) +{ + struct rdt_resource *r; + + for_each_rdt_resource(r) { + if (r->rid == RDT_RESOURCE_L3 || + r->rid == RDT_RESOURCE_L3DATA || + r->rid == RDT_RESOURCE_L3CODE || + r->rid == RDT_RESOURCE_L2 || + r->rid == RDT_RESOURCE_L2DATA || + r->rid == RDT_RESOURCE_L2CODE) + r->cbm_validate = cbm_validate_amd; + else if (r->rid == RDT_RESOURCE_MBA) { + r->msr_base = MSR_IA32_MBA_BW_BASE; + r->msr_update = mba_wrmsr_amd; + r->parse_ctrlval = parse_bw_amd; + } + } +} + static __init void rdt_init_res_defs(void) { if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) rdt_init_res_defs_intel(); + else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + rdt_init_res_defs_amd(); } static enum cpuhp_state rdt_online; diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c index bfd7bdf8a156..43ee3cee6494 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -28,6 +28,53 @@ #include #include "internal.h" +/* + * Check whether MBA bandwidth percentage value is correct. The value is + * checked against the minimum and maximum bandwidth values specified by + * the hardware. The allocated bandwidth percentage is rounded to the next + * control step available on the hardware. + */ +static bool bw_validate_amd(char *buf, unsigned long *data, + struct rdt_resource *r) +{ + unsigned long bw; + int ret; + + ret = kstrtoul(buf, 10, &bw); + if (ret) { + rdt_last_cmd_printf("Non-decimal digit in MB value %s\n", buf); + return false; + } + + if (bw < r->membw.min_bw || bw > r->default_ctrl) { + rdt_last_cmd_printf("MB value %ld out of range [%d,%d]\n", bw, + r->membw.min_bw, r->default_ctrl); + return false; + } + + *data = roundup(bw, (unsigned long)r->membw.bw_gran); + return true; +} + +int parse_bw_amd(struct rdt_parse_data *data, struct rdt_resource *r, + struct rdt_domain *d) +{ + unsigned long bw_val; + + if (d->have_new_ctrl) { + rdt_last_cmd_printf("Duplicate domain %d\n", d->id); + return -EINVAL; + } + + if (!bw_validate_amd(data->buf, &bw_val, r)) + return -EINVAL; + + d->new_ctrl = bw_val; + d->have_new_ctrl = true; + + return 0; +} + /* * Check whether MBA bandwidth percentage value is correct. The value is * checked against the minimum and max bandwidth values specified by the @@ -123,6 +170,30 @@ bool cbm_validate_intel(char *buf, u32 *data, struct rdt_resource *r) return true; } +/* + * Check whether a cache bit mask is valid. AMD allows non-contiguous + * bitmasks + */ +bool cbm_validate_amd(char *buf, u32 *data, struct rdt_resource *r) +{ + unsigned long val; + int ret; + + ret = kstrtoul(buf, 16, &val); + if (ret) { + rdt_last_cmd_printf("Non-hex character in the mask %s\n", buf); + return false; + } + + if (val > r->default_ctrl) { + rdt_last_cmd_puts("Mask out of range\n"); + return false; + } + + *data = val; + return true; +} + /* * Read one cache bit mask (hex). Check that it is valid for the current * resource type. diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 599cad34a6a8..822b7db634ee 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -11,6 +11,7 @@ #define MSR_IA32_L3_CBM_BASE 0xc90 #define MSR_IA32_L2_CBM_BASE 0xd10 #define MSR_IA32_MBA_THRTL_BASE 0xd50 +#define MSR_IA32_MBA_BW_BASE 0xc0000200 #define MSR_IA32_QM_CTR 0x0c8e #define MSR_IA32_QM_EVTSEL 0x0c8d @@ -34,6 +35,7 @@ #define MAX_MBA_BW 100u #define MBA_IS_LINEAR 0x4 #define MBA_MAX_MBPS U32_MAX +#define MAX_MBA_BW_AMD 0x800 #define RMID_VAL_ERROR BIT_ULL(63) #define RMID_VAL_UNAVAIL BIT_ULL(62) @@ -448,6 +450,8 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r, struct rdt_domain *d); int parse_bw_intel(struct rdt_parse_data *data, struct rdt_resource *r, struct rdt_domain *d); +int parse_bw_amd(struct rdt_parse_data *data, struct rdt_resource *r, + struct rdt_domain *d); extern struct mutex rdtgroup_mutex; @@ -579,5 +583,6 @@ void cqm_handle_limbo(struct work_struct *work); bool has_busy_rmid(struct rdt_resource *r, struct rdt_domain *d); void __check_limbo(struct rdt_domain *d, bool force_free); bool cbm_validate_intel(char *buf, u32 *data, struct rdt_resource *r); +bool cbm_validate_amd(char *buf, u32 *data, struct rdt_resource *r); #endif /* _ASM_X86_RESCTRL_INTERNAL_H */