Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp434569imu; Wed, 21 Nov 2018 23:16:35 -0800 (PST) X-Google-Smtp-Source: AJdET5f5Qo4hdmpDdz4wUJerIXbv9gDbcqFIllAgUZBE15bqz4oZsm/P5R5KZWWj+rfNtedMqS3D X-Received: by 2002:a62:1a44:: with SMTP id a65mr10494507pfa.30.1542870995219; Wed, 21 Nov 2018 23:16:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542870995; cv=none; d=google.com; s=arc-20160816; b=Kfjv9Z5iIv2jzBRSVVqLw06/scbYd6NXZNSH8ZPkEHHEca3XZUh4U/c/bOPfQ+ja/3 kU/oVr6eVGBM+GwlaMW5CRuzu/bT2D1fen5LoGawvKGUkM7m2Vt25yK8BYYdBXZZBl9b Oh/F2gEYVOvlHJAkGw/ElSxL16bmXzsV+E2JmVVQ/5VpB3GEl0JuZTuic4/GsKh9++TC mb9aiyk4/+4du37HoXFV4Ejy9P2OC7R/oG98TeD2r6fh6C8M/u0Y0S6oU4J30AARt1Eq KM3lVpfoscC18pdx6bnvmBor6EwkZnF9OrtPWJYg5Arou2qr+4JsoYJZLmyiE8C/9+cq glXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=YfqUi3jRmWWE5RJG+Q6AvZgRdwgYBcLwv4lgA207Xtk=; b=WGu6+RBArvA6+OC2aD9+aVoFiJlLIzE0Xtmm1zrqQKzQd0uqDvepzvE2SSpipIExxu HyJytRZLAUVlRKsiGK1Ad5eyHinK5dRHLi/Vo4rPhDstPsaBswE/Ui2cw2O6Z3Jjt0hN DB+kW9wrGw5Z7w043qb6OeGiSx2PObZQfKdbmu98AVKOxA7U/qAkABXRZIWHvaT32/E0 Ftpx9mPAME0D3zoYwk5ckZNyUP5FSz+LPx5qdZl4wyQze6J3sfwfqp7RMBOyrjRcj8TH Yo5pVLT+JYp8jUWQk2hrbmLhUHSYi6hMtSQIFVqr3Qb6Fz6fWZ+ZXjeCqDvVV2Rwov6j U+7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=pqkWnzFV; 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 bh6-v6si49169788plb.66.2018.11.21.23.16.20; Wed, 21 Nov 2018 23:16:35 -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; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=pqkWnzFV; 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 S2389605AbeKVHFd (ORCPT + 99 others); Thu, 22 Nov 2018 02:05:33 -0500 Received: from mail-eopbgr690075.outbound.protection.outlook.com ([40.107.69.75]:42050 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1733188AbeKVHEh (ORCPT ); Thu, 22 Nov 2018 02:04:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YfqUi3jRmWWE5RJG+Q6AvZgRdwgYBcLwv4lgA207Xtk=; b=pqkWnzFVL41W/xHEDj4vm0kXmAViS+jocZLk4bBexz1SPdWcPbpUBKRY4T1URfZRbNli3nD34EjJa9WpO9rKg/c3+CeUkeYdeQNLivAoUgBOc+phLSoqiSx+RdBP+pdFxd2gEUnmKhzBPQlndhey05xx5RViuMgzfo0OKzHYSBA= Received: from DM5PR12MB2471.namprd12.prod.outlook.com (52.132.141.138) by DM5PR12MB1610.namprd12.prod.outlook.com (10.172.40.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.28; Wed, 21 Nov 2018 20:28:33 +0000 Received: from DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::7def:eb99:298c:2952]) by DM5PR12MB2471.namprd12.prod.outlook.com ([fe80::7def:eb99:298c:2952%2]) with mapi id 15.20.1339.027; Wed, 21 Nov 2018 20:28:33 +0000 From: "Moger, Babu" To: "tglx@linutronix.de" , "mingo@redhat.com" , "bp@alien8.de" , "corbet@lwn.net" , "fenghua.yu@intel.com" , "reinette.chatre@intel.com" , "peterz@infradead.org" , "gregkh@linuxfoundation.org" , "davem@davemloft.net" , "akpm@linux-foundation.org" CC: "hpa@zytor.com" , "x86@kernel.org" , "mchehab+samsung@kernel.org" , "arnd@arndb.de" , "kstewart@linuxfoundation.org" , "pombredanne@nexb.com" , "rafael@kernel.org" , "kirill.shutemov@linux.intel.com" , "tony.luck@intel.com" , "qianyue.zj@alibaba-inc.com" , "xiaochen.shen@intel.com" , "pbonzini@redhat.com" , "Singh, Brijesh" , "Hurwitz, Sherry" , "dwmw2@infradead.org" , "Lendacky, Thomas" , "luto@kernel.org" , "joro@8bytes.org" , "jannh@google.com" , "vkuznets@redhat.com" , "rian@alum.mit.edu" , "jpoimboe@redhat.com" , "Moger, Babu" , "linux-kernel@vger.kernel.org" , "linux-doc@vger.kernel.org" Subject: [PATCH v9 05/13] x86/resctrl: Initialize the resource functions that are different Thread-Topic: [PATCH v9 05/13] x86/resctrl: Initialize the resource functions that are different Thread-Index: AQHUgdjGFmVTtqsqTUCzf526Xi2SMQ== Date: Wed, 21 Nov 2018 20:28:33 +0000 Message-ID: <20181121202811.4492-6-babu.moger@amd.com> References: <20181121202811.4492-1-babu.moger@amd.com> In-Reply-To: <20181121202811.4492-1-babu.moger@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN2PR01CA0084.prod.exchangelabs.com (2603:10b6:800::52) To DM5PR12MB2471.namprd12.prod.outlook.com (2603:10b6:4:b5::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [165.204.78.1] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR12MB1610;20:MYjzQtqdnw05U2UCc7eCVXZa8jLNdA0/wFpbCXapvU04gVCrZQ6kvp7mUc4Ko3Je5X5b3jgdg+DyotgOzNMqUgA2xn3i1Ivqv1YQrhEjIQ9uUAJEjGZ3sL4Xs5vSe94uixQRbj0k6FuuMm7hsBEqGlaFkZhrmw8JrV5CDD2zVkhCr4cKOLpRieLGG7wE7khZUYBUduHhrugNOYDjURyd/OPaBMPm4ZAGitH0HKNC2AzptM1+SaM2ZgdK0ae+2lpD x-ms-office365-filtering-correlation-id: c9d16314-bebf-4e26-c893-08d64fefe87a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:DM5PR12MB1610; x-ms-traffictypediagnostic: DM5PR12MB1610: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823302103)(3002001)(3231442)(944501410)(52105112)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095);SRVR:DM5PR12MB1610;BCL:0;PCL:0;RULEID:;SRVR:DM5PR12MB1610; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(366004)(346002)(376002)(136003)(396003)(199004)(189003)(54906003)(76176011)(52116002)(256004)(71200400001)(71190400001)(5660300001)(6436002)(36756003)(68736007)(6486002)(99286004)(486006)(7416002)(26005)(2201001)(66066001)(14444005)(7406005)(102836004)(6506007)(186003)(386003)(476003)(7736002)(6512007)(3846002)(2501003)(6116002)(478600001)(2900100001)(8936002)(305945005)(11346002)(53936002)(14454004)(97736004)(81156014)(81166006)(316002)(2616005)(110136005)(105586002)(446003)(106356001)(86362001)(8676002)(1076002)(25786009)(72206003)(4326008)(2906002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1610;H:DM5PR12MB2471.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 3H+A+wbBzUYjQPPkK2h0Puj/Paf0lCh8rRDbonzCHLPbhCowJV50JKXSHQa+qn39xc5s382NIL86SnYGa8m+zp4ZHE49RB9DUsI3i0fQlhsHVlSLXSuYVy7cXCsy0XI8nV+nVnl4pR390IdUf5ZlOEXXW+fTx8zAvcr3GzS0de6snETSWzs6PvNes32tOelbnNGFW61f83SwMQmkmWYn2zH3II+hEWsNvjrUo4nX+MbWc1UHnSQjriiher8B+fN9+Y7czuLxC4Re1/RlJdkbfcmo8IEZUXcUB+gSD0l2zoztvQpiFFRGumLMqCS7QBan5ycMi+cEUpCynBpp5TkzIncpLgHlBuU8m0nvrFdTVL8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9d16314-bebf-4e26-c893-08d64fefe87a X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 20:28:33.7674 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1610 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Initialize the resource functions that are different between the vendors. Some features are initialized differently between the vendors. Add _intel suffix to Intel specific functions. For example, MBA feature varies significantly between Intel and AMD. Separate the initialization of these resource functions. That way we can easily add AMD's functions later. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/core.c | 34 +++++++++++++++++++---- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 4 +-- arch/x86/kernel/cpu/resctrl/internal.h | 8 ++++-- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resct= rl/core.c index cf6491eeadc6..3bd245b057c4 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -57,7 +57,8 @@ int max_name_width, max_data_width; bool rdt_alloc_capable; =20 static void -mba_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *= r); +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); =20 @@ -171,10 +172,7 @@ struct rdt_resource rdt_resources_all[] =3D { .rid =3D RDT_RESOURCE_MBA, .name =3D "MB", .domains =3D domain_init(RDT_RESOURCE_MBA), - .msr_base =3D MSR_IA32_MBA_THRTL_BASE, - .msr_update =3D mba_wrmsr, .cache_level =3D 3, - .parse_ctrlval =3D parse_bw, .format_str =3D "%d=3D%*u", .fflags =3D RFTYPE_RES_MB, }, @@ -357,7 +355,8 @@ u32 delay_bw_map(unsigned long bw, struct rdt_resource = *r) } =20 static void -mba_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *= r) +mba_wrmsr_intel(struct rdt_domain *d, struct msr_param *m, + struct rdt_resource *r) { unsigned int i; =20 @@ -874,6 +873,25 @@ static __init bool get_rdt_resources(void) return (rdt_mon_capable || rdt_alloc_capable); } =20 +static __init void rdt_init_res_defs_intel(void) +{ + struct rdt_resource *r; + + for_each_rdt_resource(r) { + if (r->rid =3D=3D RDT_RESOURCE_MBA) { + r->msr_base =3D MSR_IA32_MBA_THRTL_BASE; + r->msr_update =3D mba_wrmsr_intel; + r->parse_ctrlval =3D parse_bw_intel; + } + } +} + +static __init void rdt_init_res_defs(void) +{ + if (boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_INTEL) + rdt_init_res_defs_intel(); +} + static enum cpuhp_state rdt_online; =20 static int __init resctrl_late_init(void) @@ -881,6 +899,12 @@ static int __init resctrl_late_init(void) struct rdt_resource *r; int state, ret; =20 + /* + * Initialize functions(or definitions) that are different + * between vendors here. + */ + rdt_init_res_defs(); + check_quirks(); =20 if (!get_rdt_resources()) diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cp= u/resctrl/ctrlmondata.c index 407d2179bfcb..a8ae87e756e9 100644 --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c @@ -64,8 +64,8 @@ static bool bw_validate(char *buf, unsigned long *data, s= truct rdt_resource *r) return true; } =20 -int parse_bw(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) { unsigned long bw_val; =20 diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index cac360169205..7a7eeba55a1f 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -444,8 +444,8 @@ struct rdt_resource { =20 int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r, struct rdt_domain *d); -int parse_bw(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); =20 extern struct mutex rdtgroup_mutex; =20 @@ -468,6 +468,10 @@ enum { RDT_NUM_RESOURCES, }; =20 +#define for_each_rdt_resource(r) \ + for (r =3D rdt_resources_all; r < rdt_resources_all + RDT_NUM_RESOURCES;\ + r++) + #define for_each_capable_rdt_resource(r) \ for (r =3D rdt_resources_all; r < rdt_resources_all + RDT_NUM_RESOURCES;\ r++) \ --=20 2.17.1