From patchwork Wed May 3 08:44:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9708993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5E8D960387 for ; Wed, 3 May 2017 08:55:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40F6F28602 for ; Wed, 3 May 2017 08:55:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35BFB28604; Wed, 3 May 2017 08:55:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D063B28606 for ; Wed, 3 May 2017 08:55:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5q3L-00018j-Va; Wed, 03 May 2017 08:54:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5q3K-00015T-9m for xen-devel@lists.xenproject.org; Wed, 03 May 2017 08:54:30 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 9E/E0-02181-5CA99095; Wed, 03 May 2017 08:54:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRWlGSWpSXmKPExsXS1tYhoXtoFme kwaplzBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b0zj3MBVvlKg4s/MPYwPhNtIuRi0NIYDqj xJa+G+xdjJwcEgK8EkeWzWCFsP0lpi6czgZR1MAosf7sYhaQBJuAusTjrz1MILaIgJLEvVWTm UCKmAV2MkmsO/2duYuRg0NYwFni6GdhkBoWAVWJtucPwHp5BTwlpmxZxwixQE7i5LHJYMs4ge LPv2wEO0JIwEPi0LP3TBMYeRcwMqxiVC9OLSpLLdI11ksqykzPKMlNzMzRNTQw1ctNLS5OTE/ NSUwq1kvOz93ECAwHBiDYwbj3n9MhRkkOJiVRXvVX7JFCfEn5KZUZicUZ8UWlOanFhxhlODiU JHgfzuSMFBIsSk1PrUjLzAEGJkxagoNHSYS3CyTNW1yQmFucmQ6ROsWoKCXOOx0kIQCSyCjNg 2uDRcMlRlkpYV5GoEOEeApSi3IzS1DlXzGKczAqCfMmg0zhycwrgZv+CmgxE9DiZlkOkMUliQ gpqQbG7UVsl+4qKt/7es1TMnT7UoUbj9T0dnPHpLIw7Sp6P/lsyqoFj85bOn2o2XVq+1Ybph0 ntVPnhbQdbehQ/8ChU3v10P8o9av9v0/MfaPtEVHPo8W798Tuf3bTYpQDFqgn35v89W17eduP Ch7Fo8ZPp939WcS5zzpSo1tt2uab0x53WzLIlyUWKrEUZyQaajEXFScCAAOrSweBAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1493801620!75519330!18 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14424 invoked from network); 3 May 2017 08:54:25 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-2.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 3 May 2017 08:54:25 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2017 01:54:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,283,1491289200"; d="scan'208";a="852347678" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.39]) by FMSMGA003.fm.intel.com with ESMTP; 03 May 2017 01:54:22 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 3 May 2017 16:44:17 +0800 Message-Id: <1493801063-38513-18-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493801063-38513-1-git-send-email-yi.y.sun@linux.intel.com> References: <1493801063-38513-1-git-send-email-yi.y.sun@linux.intel.com> Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, he.chen@linux.intel.com, ian.jackson@eu.citrix.com, Yi Sun , mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v11 17/23] x86: L2 CAT: implement get hw info flow. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch implements L2 CAT get HW info flow and interface in sysctl. Signed-off-by: Yi Sun --- v10: - modify macro name according to previous patch change. (suggested by Jan Beulich) - modify commit message. v9: - reuse 'cat_get_feat_info' for L2 CAT to reduce redundant codes. (suggested by Roger Pau) - modify sysctl implementation of L2 CAT to input data[3] to use 'cat_get_feat_info'. (suggested by Roger Pau) - modify macros names to newly defined ones. (suggested by Jan Beulich) - remove 'l2_info' to reuse 'l3_info'. (suggested by Jan Beulich) - modify macro name according to previous patch change. (suggested by Jan Beulich) v5: - rename 'dat[]' to 'data[]' (suggested by Jan Beulich) - remove type check in callback function. (suggested by Jan Beulich) v4: - create this patch because of codes architecture change. (suggested by Jan Beulich) --- xen/arch/x86/psr.c | 5 +++++ xen/arch/x86/sysctl.c | 23 +++++++++++++++++++++-- xen/include/public/sysctl.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 75ebb39..5e07d04 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -231,6 +231,10 @@ static enum psr_feat_type psr_cbm_type_to_feat_type( feat_type = PSR_SOCKET_L3_CDP; break; + case PSR_CBM_TYPE_L2: + feat_type = PSR_SOCKET_L2_CAT; + break; + default: ASSERT_UNREACHABLE(); } @@ -375,6 +379,7 @@ static struct feat_props l3_cdp_props = { /* L2 CAT props */ static struct feat_props l2_cat_props = { .cos_num = 1, + .get_feat_info = cat_get_feat_info, }; static void __init parse_psr_bool(char *s, char *value, char *feature, diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index c23270d..5e91755 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -174,10 +174,10 @@ long arch_do_sysctl( case XEN_SYSCTL_psr_cat_op: switch ( sysctl->u.psr_cat_op.cmd ) { - case XEN_SYSCTL_PSR_CAT_get_l3_info: - { uint32_t data[PSR_INFO_ARRAY_SIZE]; + case XEN_SYSCTL_PSR_CAT_get_l3_info: + { ret = psr_get_info(sysctl->u.psr_cat_op.target, PSR_CBM_TYPE_L3, data, ARRAY_SIZE(data)); if ( ret ) @@ -195,6 +195,25 @@ long arch_do_sysctl( break; } + case XEN_SYSCTL_PSR_CAT_get_l2_info: + { + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L2, data, ARRAY_SIZE(data)); + if ( ret ) + break; + + sysctl->u.psr_cat_op.u.l3_info.cos_max = + data[PSR_INFO_IDX_COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.cbm_len = + data[PSR_INFO_IDX_CAT_CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.flags = + data[PSR_INFO_IDX_CAT_FLAG]; + + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) + ret = -EFAULT; + break; + } + default: ret = -EOPNOTSUPP; break; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index ee76a66..4c76d3a 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -744,6 +744,7 @@ typedef struct xen_sysctl_pcitopoinfo xen_sysctl_pcitopoinfo_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_pcitopoinfo_t); #define XEN_SYSCTL_PSR_CAT_get_l3_info 0 +#define XEN_SYSCTL_PSR_CAT_get_l2_info 1 struct xen_sysctl_psr_cat_op { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_CAT_* */ uint32_t target; /* IN */