From patchwork Thu Jan 19 06:01:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9525233 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 28D316045A for ; Thu, 19 Jan 2017 06:05:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15B572860C for ; Thu, 19 Jan 2017 06:05:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A9BD2862A; Thu, 19 Jan 2017 06:05:39 +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 A397E28610 for ; Thu, 19 Jan 2017 06:05:38 +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 1cU5oo-0007Jo-6Q; Thu, 19 Jan 2017 06:03:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cU5om-0007Ex-Fh for xen-devel@lists.xenproject.org; Thu, 19 Jan 2017 06:03:28 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id EA/C4-25360-FA650885; Thu, 19 Jan 2017 06:03:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVywNykWHddWEO Ewb5TJhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aE5V0sBb9kKmavDW9gvCPaxcjFISQwnVHi XncHSxcjJ4eEAK/EkWUzWCFsf4kFay4wQxQ1MEos3fWYESTBJqAu8fhrDxOILSKgJHFv1WQmk CJmgW4miZUPt4JNEhbwlPh/diXYJBYBVYnpJ1vZQWxeAQ+JI9/OQG2Qkzh5bDKYzQkUvzL/Al iNkIC7xJYVl5gmMPIuYGRYxahRnFpUllqka2iol1SUmZ5RkpuYmaNraGCql5taXJyYnpqTmFS sl5yfu4kRGBAMQLCDcWW78yFGSQ4mJVFee8uGCCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvHNC gXKCRanpqRVpmTnA0IRJS3DwKInwVoGkeYsLEnOLM9MhUqcYFaXEeaNAEgIgiYzSPLg2WDxcY pSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjBvDcgUnsy8Erjpr4AWMwEttlKuB1lckoiQkmpgnH 92vkbc3EdT5rA8+nHEr/v5rYV+vPvem26QdJj5Z/v73ImPI6PjL+x8ViW7MThBWpSJN4/p4nx Jr7yzN2efcHxoESd5rrkxhHl9z/Pj5nzm1zdGtWhU5e/g3Xx4Uad3RZfW+qmxvbvu36hZvEuy uHdC6pTw532VDsGbsvbGHfGr678q9vuxkhJLcUaioRZzUXEiAEwjg2qCAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1484805803!62873879!2 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11749 invoked from network); 19 Jan 2017 06:03:26 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-11.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Jan 2017 06:03:26 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2017 22:03:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,252,1477983600"; d="scan'208";a="215119608" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 18 Jan 2017 22:03:21 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 19 Jan 2017 14:01:20 +0800 Message-Id: <1484805686-7249-19-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> References: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> Cc: wei.liu2@citrix.com, konrad.wilk@oracle.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 Subject: [Xen-devel] [PATCH RESEND v5 18/24] 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 get HW info flow for L2 CAT including L2 CAT callback function. Signed-off-by: Yi Sun --- v5: - rename 'dat[]' to 'data[]' - remove type check in callback function. --- xen/arch/x86/psr.c | 16 ++++++++++++++++ xen/arch/x86/sysctl.c | 15 +++++++++++++++ xen/include/asm-x86/psr.h | 1 + xen/include/public/sysctl.h | 6 ++++++ 4 files changed, 38 insertions(+) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 5320ae6..b630c48 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -268,6 +268,9 @@ static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) case PSR_CBM_TYPE_L3_CODE: feat_type = PSR_SOCKET_L3_CDP; break; + case PSR_CBM_TYPE_L2: + feat_type = PSR_SOCKET_L2_CAT; + break; default: feat_type = 0xFFFF; break; @@ -715,8 +718,21 @@ static unsigned int l2_cat_get_cos_max(const struct feat_node *feat) return feat->info.l2_cat_info.cos_max; } +static bool l2_cat_get_feat_info(const struct feat_node *feat, + uint32_t data[], uint32_t array_len) +{ + if ( !data || 2 > array_len ) + return false; + + data[CBM_LEN] = feat->info.l2_cat_info.cbm_len; + data[COS_MAX] = feat->info.l2_cat_info.cos_max; + + return true; +} + struct feat_ops l2_cat_ops = { .get_cos_max = l2_cat_get_cos_max, + .get_feat_info = l2_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 a4c8cfe..ae3600a 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -207,6 +207,21 @@ long arch_do_sysctl( ret = -EFAULT; break; } + case XEN_SYSCTL_PSR_CAT_get_l2_info: + { + uint32_t dat[2]; + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L2, dat, 2); + if ( ret ) + break; + + sysctl->u.psr_cat_op.u.l2_info.cbm_len = dat[CBM_LEN]; + sysctl->u.psr_cat_op.u.l2_info.cos_max = dat[COS_MAX]; + + 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/asm-x86/psr.h b/xen/include/asm-x86/psr.h index d2c7a13..31aa332 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -56,6 +56,7 @@ enum cbm_type { PSR_CBM_TYPE_L3, PSR_CBM_TYPE_L3_CODE, PSR_CBM_TYPE_L3_DATA, + PSR_CBM_TYPE_L2, }; extern struct psr_cmt *psr_cmt; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 00f5e77..cbf5372 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 */ @@ -754,6 +755,11 @@ struct xen_sysctl_psr_cat_op { #define XEN_SYSCTL_PSR_CAT_L3_CDP (1u << 0) uint32_t flags; /* OUT: CAT flags */ } l3_info; + + struct { + uint32_t cbm_len; /* OUT: CBM length */ + uint32_t cos_max; /* OUT: Maximum COS */ + } l2_info; } u; }; typedef struct xen_sysctl_psr_cat_op xen_sysctl_psr_cat_op_t;