From patchwork Sun Dec 22 23:20:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 11307711 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE64C17EE for ; Sun, 22 Dec 2019 23:22:11 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8AA8420684 for ; Sun, 22 Dec 2019 23:22:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q4DC7tfL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AA8420684 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ijAWr-0004Nz-19; Sun, 22 Dec 2019 23:20:53 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ijAWp-0004Ns-Ex for xen-devel@lists.xenproject.org; Sun, 22 Dec 2019 23:20:51 +0000 X-Inumbo-ID: ac453b24-2511-11ea-b6f1-bc764e2007e4 Received: from mail-wm1-x341.google.com (unknown [2a00:1450:4864:20::341]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ac453b24-2511-11ea-b6f1-bc764e2007e4; Sun, 22 Dec 2019 23:20:42 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id u2so14570208wmc.3 for ; Sun, 22 Dec 2019 15:20:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bZpuZmd6fIfuinL0mRo6fZJ/f9CPQalqM5bK+XV8b+4=; b=Q4DC7tfLLN24s9bEzQGjaAnYPGCPR3Y0BzWRgFV3McbLg8xTkks8s3beG53Ll2dM8I PX5N1N0ulo/yxiqFM0454SYuvrocH7FN3HC4TaSEojy1v8M5TrqoChRvLqPiIwFYQfRd BlQgSKaTy1kNSYzQrx3V9SoDV6mGtqVNYSMv+UMdJ8CJFt9jsOAH5J8dqaS6L8JCDiVs lN1+Ewy+InvG/dCIvPSCwbkU2tPclqSNRe+hSVZpENZaQZycSVyDOd9XBetM9+mN9UQW WtAwGsQBz/mjEN+BI3AVNR50spqUw1TEChvqYriaMOin5TRjGTc8foWVUWjoBC9HiVAV EJjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bZpuZmd6fIfuinL0mRo6fZJ/f9CPQalqM5bK+XV8b+4=; b=uAd1i3J4WSROF+YlfRt6HOTQ7+AXUh4iF8lAppuHI77c8KqEyE5mEyd1AwLmHUHZAH n4+ceoz7RYQAqpHmfOp8X5W6O7iVbiJ7wuymEPYdjSy91XfbBZku/3KO7etZls+vbRBz b4vL+XjNuJH1dB5H7R+DZ+RVMwXhuhqa1L6ThPBxEmUJzY1VyN6zlSUFp9wGWrh/H3da 8R7cxGRRd0geL2hYsfKeINAStfi0UhqgMs2BrIzeI7sMOo+WPCyGAbW8TwJH2tJeZLF2 annrnKhhss1Lo7Wnmdczg6ujC8N718BSrxD/OdX/X+8VfTRioe39G2UWH9UR1zJSnoFx Lyeg== X-Gm-Message-State: APjAAAWQa13dr/plKpMfrPs0eNCH8kx0dtfDTWAJHezSRlcL++FMyHkZ clAvDUiRq0pvi4Iy6dGxutImD/jD X-Google-Smtp-Source: APXvYqxxhCmZyarVg+GLhxA27BLoLKLkLDB1MlVnPVdow8T1ACK3j7eoaDrcSrqQr0o12ryD6DIDUA== X-Received: by 2002:a1c:b603:: with SMTP id g3mr27333377wmf.133.1577056841800; Sun, 22 Dec 2019 15:20:41 -0800 (PST) Received: from debian.mshome.net (38.163.200.146.dyn.plus.net. [146.200.163.38]) by smtp.gmail.com with ESMTPSA id h2sm19925613wrt.45.2019.12.22.15.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2019 15:20:41 -0800 (PST) From: Wei Liu X-Google-Original-From: Wei Liu To: Xen Development List Date: Sun, 22 Dec 2019 23:20:34 +0000 Message-Id: <20191222232035.31613-3-liuwe@microsoft.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191222232035.31613-1-liuwe@microsoft.com> References: <20191222232035.31613-1-liuwe@microsoft.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 2/3] x86/viridian: drop virdian_sint_msr X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Wei Liu , Wei Liu , Paul Durrant , Andrew Cooper , Paul Durrant , Michael Kelley , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Use hv_synic_sint in hyperv-tlfs.h instead. This requires adding the missing "polling" member to hv_synic_sint. No functional change. Signed-off-by: Wei Liu Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian/synic.c | 20 ++++++++++---------- xen/include/asm-x86/guest/hyperv-tlfs.h | 3 ++- xen/include/asm-x86/hvm/viridian.h | 16 +--------------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c index 54c62f843f..94a2b88733 100644 --- a/xen/arch/x86/hvm/viridian/synic.c +++ b/xen/arch/x86/hvm/viridian/synic.c @@ -143,7 +143,7 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: { unsigned int sintx = idx - HV_X64_MSR_SINT0; - union viridian_sint_msr new, *vs = + union hv_synic_sint new, *vs = &array_access_nospec(vv->sint, sintx); uint8_t vector; @@ -151,7 +151,7 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) return X86EMUL_EXCEPTION; /* Vectors must be in the range 0x10-0xff inclusive */ - new.raw = val; + new.as_uint64 = val; if ( new.vector < 0x10 ) return X86EMUL_EXCEPTION; @@ -256,13 +256,13 @@ int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val) case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: { unsigned int sintx = idx - HV_X64_MSR_SINT0; - const union viridian_sint_msr *vs = + const union hv_synic_sint *vs = &array_access_nospec(vv->sint, sintx); if ( !(viridian_feature_mask(d) & HVMPV_synic) ) return X86EMUL_EXCEPTION; - *val = vs->raw; + *val = vs->as_uint64; break; } @@ -284,7 +284,7 @@ int viridian_synic_vcpu_init(const struct vcpu *v) * initally masked. */ for ( i = 0; i < ARRAY_SIZE(vv->sint); i++ ) - vv->sint[i].mask = 1; + vv->sint[i].masked = 1; /* Initialize the mapping array with invalid values */ for ( i = 0; i < ARRAY_SIZE(vv->vector_to_sintx); i++ ) @@ -321,7 +321,7 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v, unsigned int sintx, uint64_t delivery) { struct viridian_vcpu *vv = v->arch.hvm.viridian; - const union viridian_sint_msr *vs = &vv->sint[sintx]; + const union hv_synic_sint *vs = &vv->sint[sintx]; struct hv_message *msg = vv->simp.ptr; struct { uint32_t TimerIndex; @@ -360,7 +360,7 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v, unsigned int sintx, BUILD_BUG_ON(sizeof(payload) > sizeof(msg->u.payload)); memcpy(msg->u.payload, &payload, sizeof(payload)); - if ( !vs->mask ) + if ( !vs->masked ) vlapic_set_irq(vcpu_vlapic(v), vs->vector, 0); return true; @@ -371,7 +371,7 @@ bool viridian_synic_is_auto_eoi_sint(const struct vcpu *v, { const struct viridian_vcpu *vv = v->arch.hvm.viridian; unsigned int sintx = vv->vector_to_sintx[vector]; - const union viridian_sint_msr *vs = + const union hv_synic_sint *vs = &array_access_nospec(vv->sint, sintx); if ( sintx >= ARRAY_SIZE(vv->sint) ) @@ -401,7 +401,7 @@ void viridian_synic_save_vcpu_ctxt(const struct vcpu *v, BUILD_BUG_ON(ARRAY_SIZE(vv->sint) != ARRAY_SIZE(ctxt->sint_msr)); for ( i = 0; i < ARRAY_SIZE(vv->sint); i++ ) - ctxt->sint_msr[i] = vv->sint[i].raw; + ctxt->sint_msr[i] = vv->sint[i].as_uint64; ctxt->simp_msr = vv->simp.msr.raw; @@ -430,7 +430,7 @@ void viridian_synic_load_vcpu_ctxt( { uint8_t vector; - vv->sint[i].raw = ctxt->sint_msr[i]; + vv->sint[i].as_uint64 = ctxt->sint_msr[i]; vector = vv->sint[i].vector; if ( vector < 0x10 ) diff --git a/xen/include/asm-x86/guest/hyperv-tlfs.h b/xen/include/asm-x86/guest/hyperv-tlfs.h index 4402854c80..fe9fb232d0 100644 --- a/xen/include/asm-x86/guest/hyperv-tlfs.h +++ b/xen/include/asm-x86/guest/hyperv-tlfs.h @@ -819,7 +819,8 @@ union hv_synic_sint { u64 reserved1:8; u64 masked:1; u64 auto_eoi:1; - u64 reserved2:46; + u64 polling:1; + u64 reserved2:45; } __packed; }; diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index cfbaede158..d694d83521 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -28,20 +28,6 @@ struct viridian_page void *ptr; }; -union viridian_sint_msr -{ - uint64_t raw; - struct - { - uint64_t vector:8; - uint64_t reserved_preserved1:8; - uint64_t mask:1; - uint64_t auto_eoi:1; - uint64_t polling:1; - uint64_t reserved_preserved2:45; - }; -}; - union viridian_stimer_config_msr { uint64_t raw; @@ -77,7 +63,7 @@ struct viridian_vcpu uint64_t scontrol; uint64_t siefp; struct viridian_page simp; - union viridian_sint_msr sint[16]; + union hv_synic_sint sint[16]; uint8_t vector_to_sintx[256]; struct viridian_stimer stimer[4]; unsigned int stimer_enabled;