From patchwork Wed Oct 26 13:47:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirudh Rayabharam X-Patchwork-Id: 11280 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp279306wru; Wed, 26 Oct 2022 06:52:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4wAnLV/SogTbYcYwo4r4yxU56DoxGTsTAkSNKK4eFGynce0NUcvtv6rwH4173RhrGwS78I X-Received: by 2002:a17:902:dac4:b0:186:c372:732a with SMTP id q4-20020a170902dac400b00186c372732amr8399888plx.174.1666792344877; Wed, 26 Oct 2022 06:52:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666792344; cv=none; d=google.com; s=arc-20160816; b=f2I5/ya27HAC+WZdZlbh2d+lyuPGOa2WfsuOZG52ZKyW38T/ZI/bmu7ccWMWU5YD5a UWrRG4fhLIJq9NmJna3UY2x/NYeT4VW1ZVvJQvJYb2cMvtjgAelRJFDr39OhDAcygcH2 G+Fme4IUh2f2g/plUh420RgFoPGJ03ro6lJyWWYcULa/2pTbb15qq9MXGz9r3tMqC1ER UgQoG5GYno9OY5RVqer7M4nvzFfFTR++EEVisIGHDQt3g/0+SKmsU9UFwP4GHSm83Mwp RIOgEpSieRbgQO8DLByrmpFAvZ3983gQ4Tbe6lJGOBAj+An7J8lo9XVgJRuzsEHuZAUC UFqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=jLGstakCq9S33uzmp4509MKhTHZdg717E6kd8XaghHM=; b=T9S7kHTuAlKW7KLQrptZ4/LywSrTyabjUpWj8oxvm9ctRnCzvv3XVHO40MR8vV8+XC wLenYLWDNe9MVBGgxjE0sMyKCPnJrUMJ9XXJWbHJFHQWodOV9DZwna8LDDzcWQueidxa ANXkT+XqVJcZwwQsdyNiSKtLx8ebfAZeDDgv9qpa7fvj7nOb01zpEs1v/db1/Rhn0obp o4K2A0NhcMfmEBkAUez4BEum/1UlCvk91+cDLhjOjukUNFKNbV8veAl8y/Oxm9pH1AP/ mjzi3KOU2mwcNfvpc4U7KriMIiRJnEsuW9HRsSCxRql6X5j/8MdyOQol0uWPY4mT46Qb uBsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=V28NrchL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a656944000000b0043cad841eb1si6792848pgq.827.2022.10.26.06.51.58; Wed, 26 Oct 2022 06:52:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=V28NrchL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233868AbiJZNsw (ORCPT + 99 others); Wed, 26 Oct 2022 09:48:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233784AbiJZNsJ (ORCPT ); Wed, 26 Oct 2022 09:48:09 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 002C08BBB2; Wed, 26 Oct 2022 06:48:08 -0700 (PDT) Received: from anrayabh-desk.corp.microsoft.com (unknown [167.220.238.193]) by linux.microsoft.com (Postfix) with ESMTPSA id 33CBC2109450; Wed, 26 Oct 2022 06:48:03 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 33CBC2109450 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1666792088; bh=jLGstakCq9S33uzmp4509MKhTHZdg717E6kd8XaghHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V28NrchLL0/cxXjeEmrw1fkhrdeYTX4oxTaG2cE374/NzbC24nlsfT3KaJOYQM8nv B6b68znl+SiM2xtyzozf+XG/8as8x2ye9Ufip1Ad2VW9q143QRSW5a+svIi/0IQPkQ /1i0PumPEX2nzhhPewBK52PKrQmb2eF+TB1Byl24= From: Anirudh Rayabharam To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, daniel.lezcano@linaro.org, Arnd Bergmann , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Anirudh Rayabharam , kumarpraveen@linux.microsoft.com, mail@anirudhrb.com Subject: [PATCH 1/2] x86/hyperv: fix invalid writes to MSRs during root partition kexec Date: Wed, 26 Oct 2022 19:17:14 +0530 Message-Id: <20221026134715.1438789-2-anrayabh@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026134715.1438789-1-anrayabh@linux.microsoft.com> References: <20221026134715.1438789-1-anrayabh@linux.microsoft.com> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747758449791994877?= X-GMAIL-MSGID: =?utf-8?q?1747758449791994877?= hv_cleanup resets the hypercall page by setting the MSR to 0. However, the root partition is not allowed to write to the GPA bits of the MSR. Instead, it uses the hypercall page provided by the MSR. Similar is the case with the reference TSC MSR. Clear only the enable bit instead of zeroing the entire MSR to make the code valid for root partition too. Signed-off-by: Anirudh Rayabharam --- arch/x86/hyperv/hv_init.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 29774126e931..76ff63d69461 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -537,6 +537,7 @@ void __init hyperv_init(void) void hyperv_cleanup(void) { union hv_x64_msr_hypercall_contents hypercall_msr; + u64 tsc_msr; unregister_syscore_ops(&hv_syscore_ops); @@ -552,12 +553,14 @@ void hyperv_cleanup(void) hv_hypercall_pg = NULL; /* Reset the hypercall page */ - hypercall_msr.as_uint64 = 0; + rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64); + hypercall_msr.enable = 0; wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64); /* Reset the TSC page */ - hypercall_msr.as_uint64 = 0; - wrmsrl(HV_X64_MSR_REFERENCE_TSC, hypercall_msr.as_uint64); + rdmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr); + tsc_msr &= ~BIT_ULL(0); + wrmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr); } void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die) From patchwork Wed Oct 26 13:47:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirudh Rayabharam X-Patchwork-Id: 11281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp279682wru; Wed, 26 Oct 2022 06:53:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7nvO9OyxlbOgfg+QbGYysuw5crDaY4YNhinaijwimIa+DrSNo/5/LP4AQyznK82AlDcX+r X-Received: by 2002:a63:4a41:0:b0:452:bab5:156a with SMTP id j1-20020a634a41000000b00452bab5156amr37578493pgl.486.1666792401036; Wed, 26 Oct 2022 06:53:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666792401; cv=none; d=google.com; s=arc-20160816; b=AKlJwwsuWC5oMfze7sjiEfTUuzHvWR2dWojB4HtSOdxDutkWUmJ916APcU4mFeIHap HK5dbeOkNyquhY2aWO2KM7wxqkvW2RBVwJApJyGiLAINlccjMg2gdExtbTuQ8qMyE8ZI CR19FkGhzIinG6fAD9n8+dzbGgtoqHqrVKFKnwOTPM7Ab/KtYYZrG0koReH2yStlpxAy Sqhj/1ZUflJGfj5TSZHHlDFINiYeSBmQcttMzZBQ9itVrYJvXdfImQhkKpow0hEDTIVY pbYLkyjbKKEMkNpMt2lwRAKtyfIgOEATstZuudTCTzQXqMx2dVmzi5ZIZutFnj1c1ZFR eoYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=XpK1X4zhf3TiHKLaOrNIEobrLMtZr0H214Cll4f/OsA=; b=kc1amRDKUJOT0Sb3Qu6WSzrbnINwfIa6Z1l4GU0r1/gKYWLmb3TxVNbGG0GESnBjiY POGCw/3dz/NJv5v78HCnN55zRt36Hx6mrR7eCLUGnVIhoDWg7mOZTI7pGkNKCD6n7YDC wo/rw3sThm34cbMvdt7bfkny/l7RWiTikv8eCi3yMzgCs2xm5cxb/WtjdRcIZF9dq8h8 fNJmU+Evh8ixHk/9wcOKBP86y+r0p/+TL2OkfVPYeyBmEnRuI/exfcScZMZLfyjBKJ95 EpRDYgd2Y/uEnBSdtS2Nr9LexPrTjW/YuimWCF8UMWH+8QuogmEyVnZxkIrTakKZROsX gVnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=BbMgTmVD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y12-20020a1709027c8c00b001869581f7eesi5869071pll.154.2022.10.26.06.53.03; Wed, 26 Oct 2022 06:53:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=BbMgTmVD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233552AbiJZNtJ (ORCPT + 99 others); Wed, 26 Oct 2022 09:49:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233671AbiJZNsR (ORCPT ); Wed, 26 Oct 2022 09:48:17 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 260754DB44; Wed, 26 Oct 2022 06:48:17 -0700 (PDT) Received: from anrayabh-desk.corp.microsoft.com (unknown [167.220.238.193]) by linux.microsoft.com (Postfix) with ESMTPSA id 5E5BC210AF1E; Wed, 26 Oct 2022 06:48:12 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5E5BC210AF1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1666792097; bh=XpK1X4zhf3TiHKLaOrNIEobrLMtZr0H214Cll4f/OsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BbMgTmVDjRypDBMGQCoY/WEcjAKoYiqGtbMw7VkVQCYwmx96GFslPqIgK9LXhWMkD KoOtLQIBZT6ugsXoEcRBbketkQoxa5gk4b3zu7wasD7XT3GcqAUvbMkx6qnGYjp8k5 EigtvY+winLAwR0gxpSi4HqGK/bXuoqTj6d5aUCc= From: Anirudh Rayabharam To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, daniel.lezcano@linaro.org, Arnd Bergmann , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Anirudh Rayabharam , kumarpraveen@linux.microsoft.com, mail@anirudhrb.com Subject: [PATCH 2/2] clocksource/drivers/hyperv: add data structure for reference TSC MSR Date: Wed, 26 Oct 2022 19:17:15 +0530 Message-Id: <20221026134715.1438789-3-anrayabh@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026134715.1438789-1-anrayabh@linux.microsoft.com> References: <20221026134715.1438789-1-anrayabh@linux.microsoft.com> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747758508814116348?= X-GMAIL-MSGID: =?utf-8?q?1747758508814116348?= Add a data structure to represent the reference TSC MSR similar to other MSRs. This simplifies the code for updating the MSR. Signed-off-by: Anirudh Rayabharam --- arch/x86/hyperv/hv_init.c | 10 +++++----- drivers/clocksource/hyperv_timer.c | 28 ++++++++++++++-------------- include/asm-generic/hyperv-tlfs.h | 9 +++++++++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 76ff63d69461..78993148d14c 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -537,7 +537,7 @@ void __init hyperv_init(void) void hyperv_cleanup(void) { union hv_x64_msr_hypercall_contents hypercall_msr; - u64 tsc_msr; + union hv_reference_tsc_msr tsc_msr; unregister_syscore_ops(&hv_syscore_ops); @@ -557,10 +557,10 @@ void hyperv_cleanup(void) hypercall_msr.enable = 0; wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64); - /* Reset the TSC page */ - rdmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr); - tsc_msr &= ~BIT_ULL(0); - wrmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr); + /* Reset the TSC page. */ + rdmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64); + tsc_msr.enable = 0; + wrmsrl(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64); } void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die) diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c index bb47610bbd1c..11332c82d1af 100644 --- a/drivers/clocksource/hyperv_timer.c +++ b/drivers/clocksource/hyperv_timer.c @@ -395,25 +395,25 @@ static u64 notrace read_hv_sched_clock_tsc(void) static void suspend_hv_clock_tsc(struct clocksource *arg) { - u64 tsc_msr; + union hv_reference_tsc_msr tsc_msr; /* Disable the TSC page */ - tsc_msr = hv_get_register(HV_REGISTER_REFERENCE_TSC); - tsc_msr &= ~BIT_ULL(0); - hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr); + tsc_msr.as_uint64 = hv_get_register(HV_REGISTER_REFERENCE_TSC); + tsc_msr.enable = 0; + hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr.as_uint64); } static void resume_hv_clock_tsc(struct clocksource *arg) { phys_addr_t phys_addr = virt_to_phys(&tsc_pg); - u64 tsc_msr; + union hv_reference_tsc_msr tsc_msr; /* Re-enable the TSC page */ - tsc_msr = hv_get_register(HV_REGISTER_REFERENCE_TSC); - tsc_msr &= GENMASK_ULL(11, 0); - tsc_msr |= BIT_ULL(0) | (u64)phys_addr; - hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr); + tsc_msr.as_uint64 = hv_get_register(HV_REGISTER_REFERENCE_TSC); + tsc_msr.enable = 1; + tsc_msr.pfn = __phys_to_pfn(phys_addr); + hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr.as_uint64); } #ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK @@ -495,7 +495,7 @@ static __always_inline void hv_setup_sched_clock(void *sched_clock) {} static bool __init hv_init_tsc_clocksource(void) { - u64 tsc_msr; + union hv_reference_tsc_msr tsc_msr; phys_addr_t phys_addr; if (!(ms_hyperv.features & HV_MSR_REFERENCE_TSC_AVAILABLE)) @@ -530,10 +530,10 @@ static bool __init hv_init_tsc_clocksource(void) * (which already has at least the low 12 bits set to zero since * it is page aligned). Also set the "enable" bit, which is bit 0. */ - tsc_msr = hv_get_register(HV_REGISTER_REFERENCE_TSC); - tsc_msr &= GENMASK_ULL(11, 0); - tsc_msr = tsc_msr | 0x1 | (u64)phys_addr; - hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr); + tsc_msr.as_uint64 = hv_get_register(HV_REGISTER_REFERENCE_TSC); + tsc_msr.enable = 1; + tsc_msr.pfn = __phys_to_pfn(phys_addr); + hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr.as_uint64); clocksource_register_hz(&hyperv_cs_tsc, NSEC_PER_SEC/100); diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h index fdce7a4cfc6f..b17c6eeb9afa 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -102,6 +102,15 @@ struct ms_hyperv_tsc_page { volatile s64 tsc_offset; } __packed; +union hv_reference_tsc_msr { + u64 as_uint64; + struct { + u64 enable:1; + u64 reserved:11; + u64 pfn:52; + } __packed; +}; + /* * The guest OS needs to register the guest ID with the hypervisor. * The guest ID is a 64 bit entity and the structure of this ID is