From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D3FAC4332F for ; Wed, 9 Nov 2022 20:55:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231967AbiKIUzV (ORCPT ); Wed, 9 Nov 2022 15:55:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231833AbiKIUyD (ORCPT ); Wed, 9 Nov 2022 15:54:03 -0500 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CEBF30565; Wed, 9 Nov 2022 12:54:02 -0800 (PST) Received: by mail-pj1-x102e.google.com with SMTP id gw22so17833963pjb.3; Wed, 09 Nov 2022 12:54:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0l9afkkKeSOzI6mzq1htMqRSlzdNXqGpUKUcuz2i9ek=; b=Xf0UA0v5jga/BS1GAxSGBzwObMMxAeZc8CKxagSCalOMTcj0DBkL0Yzb/MDc6ZkYkF 7sTJRTTn29+xlFjZrgukjpqfO5XzL9tpg52MNvCr4O+6pnl632kMCi2x4hnKjj+zz5fQ LTNCzvfc+fCdOzY7hsVlorwRBuZHhUq4oZ8VVzyT8gmFQvC79fnzH2ozgFlk6Y/Q3mNA 53SHo30KwDkZz0GmbTzHFD7EaRgbIMwT3OVcCGaUTvURC1laNU/ZGG3+RBmxaFIef5eS 72K6mrujsk5ha+eR4ud7KZff73JOjbQ1girLjQnscRvXtjx8SRiN21tg4akJofUEi0ma xs2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0l9afkkKeSOzI6mzq1htMqRSlzdNXqGpUKUcuz2i9ek=; b=BZjDfB5ECpjZCj0KWddlyEAkamm7mJAlqmaZZZKdU18+ZAb8vjWojh+j0ftMQP9Ryi wIFhTA5hOWyR/ykCz3n1HxCJ8CLVqRd0zuRCfEhWUHXVseQHIbqJk/7OyupQwkczJKiF XTB29Mrd7mlqyFiLoclqTkdyqggakIHfmHorxuhOfdzZRMRO/FtaLNEbTw7F+oO7muhK b/aEDBvktfF340moofXAxqfi+diY4qhBxll1gU0vs+eSjbUR8Tw6xUbIgELT+30ctQOL n21n9Pz3oK5eeLrR+a0u37cCnn/IlfYW6/tgu+qqpncN5JG6PvAcsVdzTUZAi1ghmVHo muvw== X-Gm-Message-State: ACrzQf1EbJ7cVDHPzvJF2bd3MC7RJh+6TSw+I5cQyUPZpCB8yJIuZYU/ UcqWBifeYQ0zV9jIiVzzPV4= X-Google-Smtp-Source: AMsMyM7tRYy8c6jGKBUAElQ+uVtMfnfFLT8C5PLwWvwgaQw4hc9oKXFtDvfLkWwEfSbG40eQbHIBUg== X-Received: by 2002:a17:90a:d586:b0:213:de8f:4d6 with SMTP id v6-20020a17090ad58600b00213de8f04d6mr56087727pju.31.1668027242262; Wed, 09 Nov 2022 12:54:02 -0800 (PST) Received: from ubuntu-Virtual-Machine.corp.microsoft.com ([2001:4898:80e8:a:c616:2003:6c97:8057]) by smtp.gmail.com with ESMTPSA id c2-20020a17090a108200b002137d3da760sm1633984pja.39.2022.11.09.12.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 12:54:01 -0800 (PST) From: Tianyu Lan To: luto@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, seanjc@google.com, pbonzini@redhat.com, jgross@suse.com, tiala@microsoft.com, kirill@shutemov.name, jiangshan.ljs@antgroup.com, peterz@infradead.org, ashish.kalra@amd.com, srutherford@google.com, akpm@linux-foundation.org, anshuman.khandual@arm.com, pawan.kumar.gupta@linux.intel.com, adrian.hunter@intel.com, daniel.sneddon@linux.intel.com, alexander.shishkin@linux.intel.com, sandipan.das@amd.com, ray.huang@amd.com, brijesh.singh@amd.com, michael.roth@amd.com, thomas.lendacky@amd.com, venu.busireddy@oracle.com, sterritt@google.com, tony.luck@intel.com, samitolvanen@google.com, fenghua.yu@intel.com Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-arch@vger.kernel.org Subject: [RFC PATCH 04/17] x86/hyperv: apic change for sev-snp enlightened guest Date: Wed, 9 Nov 2022 15:53:39 -0500 Message-Id: <20221109205353.984745-5-ltykernel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221109205353.984745-1-ltykernel@gmail.com> References: <20221109205353.984745-1-ltykernel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tianyu Lan Hyperv sev-snp enlightened guest doesn't support x2apic and apic page read/write operation. Bypass these requests. ipi request maybe returned with timeout error code and add retry mechanism. Signed-off-by: Tianyu Lan --- arch/x86/hyperv/hv_apic.c | 79 ++++++++++++++++++++++++------- include/asm-generic/hyperv-tlfs.h | 1 + 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c index fb8b2c088681..214354d20833 100644 --- a/arch/x86/hyperv/hv_apic.c +++ b/arch/x86/hyperv/hv_apic.c @@ -66,9 +66,15 @@ static u32 hv_apic_read(u32 reg) rdmsr(HV_X64_MSR_TPR, reg_val, hi); (void)hi; return reg_val; - + case APIC_ID: + if (hv_isolation_type_en_snp()) + return smp_processor_id(); + fallthrough; default: - return native_apic_mem_read(reg); + if (!hv_isolation_type_en_snp()) + return native_apic_mem_read(reg); + else + return 0; } } @@ -82,7 +88,8 @@ static void hv_apic_write(u32 reg, u32 val) wrmsr(HV_X64_MSR_TPR, val, 0); break; default: - native_apic_mem_write(reg, val); + if (!hv_isolation_type_en_snp()) + native_apic_mem_write(reg, val); } } @@ -106,6 +113,7 @@ static bool __send_ipi_mask_ex(const struct cpumask *mask, int vector, struct hv_send_ipi_ex *ipi_arg; unsigned long flags; int nr_bank = 0; + int retry = 5; u64 status = HV_STATUS_INVALID_PARAMETER; if (!(ms_hyperv.hints & HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED)) @@ -144,8 +152,10 @@ static bool __send_ipi_mask_ex(const struct cpumask *mask, int vector, ipi_arg->vp_set.format = HV_GENERIC_SET_ALL; } - status = hv_do_rep_hypercall(HVCALL_SEND_IPI_EX, 0, nr_bank, + do { + status = hv_do_rep_hypercall(HVCALL_SEND_IPI_EX, 0, nr_bank, ipi_arg, NULL); + } while (status == HV_STATUS_TIME_OUT && retry--); ipi_mask_ex_done: local_irq_restore(flags); @@ -159,6 +169,7 @@ static bool __send_ipi_mask(const struct cpumask *mask, int vector, struct hv_send_ipi ipi_arg; u64 status; unsigned int weight; + int retry = 5; trace_hyperv_send_ipi_mask(mask, vector); @@ -212,8 +223,11 @@ static bool __send_ipi_mask(const struct cpumask *mask, int vector, __set_bit(vcpu, (unsigned long *)&ipi_arg.cpu_mask); } - status = hv_do_fast_hypercall16(HVCALL_SEND_IPI, ipi_arg.vector, - ipi_arg.cpu_mask); + do { + status = hv_do_fast_hypercall16(HVCALL_SEND_IPI, ipi_arg.vector, + ipi_arg.cpu_mask); + } while (status == HV_STATUS_TIME_OUT && retry--); + return hv_result_success(status); do_ex_hypercall: @@ -224,6 +238,7 @@ static bool __send_ipi_one(int cpu, int vector) { int vp = hv_cpu_number_to_vp_number(cpu); u64 status; + int retry = 5; trace_hyperv_send_ipi_one(cpu, vector); @@ -236,26 +251,48 @@ static bool __send_ipi_one(int cpu, int vector) if (vp >= 64) return __send_ipi_mask_ex(cpumask_of(cpu), vector, false); - status = hv_do_fast_hypercall16(HVCALL_SEND_IPI, vector, BIT_ULL(vp)); + do { + status = hv_do_fast_hypercall16(HVCALL_SEND_IPI, vector, BIT_ULL(vp)); + } while (status == HV_STATUS_TIME_OUT || retry--); + return hv_result_success(status); } static void hv_send_ipi(int cpu, int vector) { - if (!__send_ipi_one(cpu, vector)) - orig_apic.send_IPI(cpu, vector); + if (!__send_ipi_one(cpu, vector)) { + if (!hv_isolation_type_en_snp()) + orig_apic.send_IPI(cpu, vector); + else + WARN_ON_ONCE(1); + } } static void hv_send_ipi_mask(const struct cpumask *mask, int vector) { - if (!__send_ipi_mask(mask, vector, false)) - orig_apic.send_IPI_mask(mask, vector); + if (!__send_ipi_mask(mask, vector, false)) { + if (!hv_isolation_type_en_snp()) + orig_apic.send_IPI_mask(mask, vector); + else + WARN_ON_ONCE(1); + } } static void hv_send_ipi_mask_allbutself(const struct cpumask *mask, int vector) { - if (!__send_ipi_mask(mask, vector, true)) - orig_apic.send_IPI_mask_allbutself(mask, vector); + unsigned int this_cpu = smp_processor_id(); + struct cpumask new_mask; + const struct cpumask *local_mask; + + cpumask_copy(&new_mask, mask); + cpumask_clear_cpu(this_cpu, &new_mask); + local_mask = &new_mask; + if (!__send_ipi_mask(local_mask, vector, true)) { + if (!hv_isolation_type_en_snp()) + orig_apic.send_IPI_mask_allbutself(mask, vector); + else + WARN_ON_ONCE(1); + } } static void hv_send_ipi_allbutself(int vector) @@ -265,14 +302,22 @@ static void hv_send_ipi_allbutself(int vector) static void hv_send_ipi_all(int vector) { - if (!__send_ipi_mask(cpu_online_mask, vector, false)) - orig_apic.send_IPI_all(vector); + if (!__send_ipi_mask(cpu_online_mask, vector, false)) { + if (!hv_isolation_type_en_snp()) + orig_apic.send_IPI_all(vector); + else + WARN_ON_ONCE(1); + } } static void hv_send_ipi_self(int vector) { - if (!__send_ipi_one(smp_processor_id(), vector)) - orig_apic.send_IPI_self(vector); + if (!__send_ipi_one(smp_processor_id(), vector)) { + if (!hv_isolation_type_en_snp()) + orig_apic.send_IPI_self(vector); + else + WARN_ON_ONCE(1); + } } void __init hv_apic_init(void) diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h index fdce7a4cfc6f..6e2a090e2649 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -208,6 +208,7 @@ enum HV_GENERIC_SET_FORMAT { #define HV_STATUS_INVALID_PORT_ID 17 #define HV_STATUS_INVALID_CONNECTION_ID 18 #define HV_STATUS_INSUFFICIENT_BUFFERS 19 +#define HV_STATUS_TIME_OUT 0x78 /* * The Hyper-V TimeRefCount register and the TSC -- 2.25.1