@@ -27,6 +27,10 @@
/* Per spec, the maximum COS register number is 128. */
#define MAX_COS_REG_NUM 128
+#define CBM_LEN 0
+#define COS_MAX 1
+#define CDP_FLAG 2
+
enum psr_feat_type {
PSR_SOCKET_L3_CAT = 0,
PSR_SOCKET_L3_CDP,
@@ -45,6 +49,9 @@ struct feat_ops {
unsigned int ecx, unsigned int edx,
struct feat_node *feat,
struct psr_cat_socket_info *info);
+ /* get_feat_info is used to get feature HW info. */
+ bool (*get_feat_info)(const struct feat_node *feat, enum cbm_type type,
+ uint32_t dat[], uint32_t array_len);
};
/* CAT/CDP HW info data structure. */
@@ -209,8 +216,37 @@ static void l3_cat_init_feature(unsigned int eax, unsigned int ebx,
test_bit(PSR_SOCKET_L3_CDP, &info->feat_mask) ? "on" : "off");
}
+static bool l3_cat_get_feat_info(const struct feat_node *feat,
+ enum cbm_type type,
+ uint32_t dat[], uint32_t array_len)
+{
+ if ( !dat || 3 > array_len )
+ return false;
+
+ switch ( type ) {
+ case PSR_CBM_TYPE_L3:
+ case PSR_CBM_TYPE_L3_DATA:
+ case PSR_CBM_TYPE_L3_CODE:
+ if ( feat->feature == PSR_SOCKET_L3_CDP )
+ dat[CDP_FLAG] |= XEN_SYSCTL_PSR_CAT_L3_CDP;
+ else
+ dat[CDP_FLAG] = 0;
+ break;
+
+ default:
+ /* This feature is not requested feature. */
+ return false;
+ }
+
+ dat[CBM_LEN] = feat->info.cbm_len;
+ dat[COS_MAX] = feat->info.cos_max;
+
+ return true;
+}
+
struct feat_ops l3_cat_ops = {
.init_feature = l3_cat_init_feature,
+ .get_feat_info = l3_cat_get_feat_info,
};
static unsigned int get_socket_cpu(unsigned int socket)
@@ -434,8 +470,8 @@ static inline bool_t cdp_is_enabled(unsigned int socket)
return test_bit(PSR_SOCKET_L3_CDP, &cat_socket_info[socket].feat_mask);
}
-int psr_get_cat_l3_info(unsigned int socket, uint32_t *cbm_len,
- uint32_t *cos_max, uint32_t *flags)
+int psr_get_info(unsigned int socket, enum cbm_type type,
+ uint32_t dat[], uint32_t array_len)
{
struct psr_cat_socket_info *info = get_cat_socket_info(socket);
struct feat_node *feat_tmp;
@@ -443,18 +479,11 @@ int psr_get_cat_l3_info(unsigned int socket, uint32_t *cbm_len,
if ( IS_ERR(info) )
return PTR_ERR(info);
- feat_tmp = get_feat_l3(info);
- if ( !feat_tmp )
- return -ENOENT;
-
- *cbm_len = feat_tmp->info.cbm_len;
- *cos_max = feat_tmp->info.cos_max;
-
- *flags = 0;
- if ( cdp_is_enabled(socket) )
- *flags |= XEN_SYSCTL_PSR_CAT_L3_CDP;
+ list_for_each_entry(feat_tmp, &info->feat_list, list)
+ if ( feat_tmp->ops.get_feat_info(feat_tmp, type, dat, array_len) )
+ return 0;
- return 0;
+ return -ENOENT;
}
int psr_get_l3_cbm(struct domain *d, unsigned int socket,
@@ -83,6 +83,9 @@ void arch_do_physinfo(xen_sysctl_physinfo_t *pi)
pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm_directio;
}
+#define CBM_LEN 0
+#define COS_MAX 1
+#define CDP_FLAG 2
long arch_do_sysctl(
struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
{
@@ -176,15 +179,19 @@ long arch_do_sysctl(
switch ( sysctl->u.psr_cat_op.cmd )
{
case XEN_SYSCTL_PSR_CAT_get_l3_info:
- ret = psr_get_cat_l3_info(sysctl->u.psr_cat_op.target,
- &sysctl->u.psr_cat_op.u.l3_info.cbm_len,
- &sysctl->u.psr_cat_op.u.l3_info.cos_max,
- &sysctl->u.psr_cat_op.u.l3_info.flags);
+ {
+ uint32_t dat[3];
+ ret = psr_get_info(sysctl->u.psr_cat_op.target,
+ PSR_CBM_TYPE_L3, dat, 3);
+
+ sysctl->u.psr_cat_op.u.l3_info.cbm_len = dat[CBM_LEN];
+ sysctl->u.psr_cat_op.u.l3_info.cos_max = dat[COS_MAX];
+ sysctl->u.psr_cat_op.u.l3_info.flags = dat[CDP_FLAG];
if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) )
ret = -EFAULT;
break;
-
+ }
default:
ret = -EOPNOTSUPP;
break;
@@ -63,8 +63,8 @@ int psr_alloc_rmid(struct domain *d);
void psr_free_rmid(struct domain *d);
void psr_ctxt_switch_to(struct domain *d);
-int psr_get_cat_l3_info(unsigned int socket, uint32_t *cbm_len,
- uint32_t *cos_max, uint32_t *flags);
+int psr_get_info(unsigned int socket, enum cbm_type type,
+ uint32_t dat[], uint32_t array_len);
int psr_get_l3_cbm(struct domain *d, unsigned int socket,
uint64_t *cbm, enum cbm_type type);
int psr_set_l3_cbm(struct domain *d, unsigned int socket,
Get feature HW info is an interface provided by psr.c. This can be abstracted as an operation. This patch defines 'get_feat_info' callback function to get the feature HW info and implement the callback function for L3 CAT/CDP. It also modifies the sysctl interface to make it general. Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com> --- xen/arch/x86/psr.c | 55 ++++++++++++++++++++++++++++++++++++----------- xen/arch/x86/sysctl.c | 17 ++++++++++----- xen/include/asm-x86/psr.h | 4 ++-- 3 files changed, 56 insertions(+), 20 deletions(-)