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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5B44C4332F for ; Tue, 12 Dec 2023 20:47:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F4F16B02F0; Tue, 12 Dec 2023 15:47:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 656F06B02F6; Tue, 12 Dec 2023 15:47:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 371696B02F9; Tue, 12 Dec 2023 15:47:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 19D7E6B02F0 for ; Tue, 12 Dec 2023 15:47:04 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E4DD41A0A85 for ; Tue, 12 Dec 2023 20:47:03 +0000 (UTC) X-FDA: 81559350726.17.4394BDA Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf02.hostedemail.com (Postfix) with ESMTP id 29FFB80002 for ; Tue, 12 Dec 2023 20:47:01 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PXI07Sh3; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of 3xcZ4ZQUKCGgYGMOYMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--sagis.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3xcZ4ZQUKCGgYGMOYMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--sagis.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702414022; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mIyNCwZuG05oGqfsGJdjuxWZ9bJhVxMnAF0jWTMuK/Y=; b=E1xQL8ejdyIHFw82pZ2kddTLv9nOEGizWezC+tzsUPOfGssfxhJsEJWYwWBwa6q7CVy/hG lsW5fYKE0wzUrCNQxu0uiyYJwhlxNYaFu5FHtUY2c9esoOozFwAdXCs15bA8wVSS4axRZ8 3yHxWlYwk49q4k67SkkDIlIOWQ3dqlc= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PXI07Sh3; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of 3xcZ4ZQUKCGgYGMOYMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--sagis.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3xcZ4ZQUKCGgYGMOYMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--sagis.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702414022; a=rsa-sha256; cv=none; b=3xJqLFUNcckILfist6UsBwoycP0R5CC8ECGoyTI9XoNVts9Qd5HEN939cNiF5f5Imii6k5 IfX7ISOyhTquLtQ8MWYOKmA0dIA79ZE9Nu0yXfWrClaqPf7VIm/mTq2Wu/P0lw3IrQqVgi urw4QymEmtv1gE/q1mZriG4u32h/p38= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5df9f98994bso22941767b3.0 for ; Tue, 12 Dec 2023 12:47:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702414021; x=1703018821; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mIyNCwZuG05oGqfsGJdjuxWZ9bJhVxMnAF0jWTMuK/Y=; b=PXI07Sh3xJLqvvHA9CTgLKleZFBcZBYtOwX8iErK9RX4Ke8ZLkM+Urdw5A1xiRdSk3 8kccjF4S0Q2G7V3v3jOBlwN0FCJxUw/ynvxij3ZnHgMr1ltA9O7vUPzOkfltCZhVcx1Q 0vi97KGMN0aFO5sbk6uka6Sbjy1EQANr+gB2BPu035DQh+yKtRCxv+bl7qF/q4eBghhZ RvR7RlkYezLHETk+YLgwDjy3IolKr6bDN85yHCc0xS3/Z+XHzy4Pbdaq4nzMxYIAfRt7 3R30Ys09Q4k2x9B8aEbctPXycjJSk1OpbqrqDSmL6RiOIUX0rwpYmjma/O9jVw+7+Dkq wD/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702414021; x=1703018821; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mIyNCwZuG05oGqfsGJdjuxWZ9bJhVxMnAF0jWTMuK/Y=; b=Kxa6K0cvwDw3zVzC5MMPXw8+PU+3M4lGjsjLGSV0tzxbBZZVkdTwiCUtAADkapyp/M DQxBmDffddt40VqrI5TcGnP6uNjJWaeg0CqJo0J0cUUdY3aq7duOlKD0GRYlJoA14AqM saiCmroNX7FhfWfTLVJHkJVdsbvozHpR8sd/jkGc7m6TfXi8sG79PO3stbTpfFPnveqB gcD2wmrVIYRhVoLF0+cd9QwcQSp4SWOTVpssqaKLjNG9+TKFqh8aw9cQ2014KJCL5Ib6 x2fbUMFns2fvhvLgjHfZSQmROY57bNly5sm2c/pO5LOkAwjPm5wBHzWIvWNLxvUHtyZ2 hXHw== X-Gm-Message-State: AOJu0YzW/8Fjje+G5lrtFFFpWhSPofj/D6W/3UkfFXzo7SOZs5x1DwRl qYE0jBALXu4lHyF46rakrIThrBEnqg== X-Google-Smtp-Source: AGHT+IHEJxnUHSPsv9KIXDu3heSKIoacV+x0M8UFkzddC1cs8FogPFrD0AfIFp+QKPSNxV4NPrVCkUJUTA== X-Received: from sagi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:241b]) (user=sagis job=sendgmr) by 2002:a05:690c:2e8a:b0:5d8:ef49:748 with SMTP id eu10-20020a05690c2e8a00b005d8ef490748mr107655ywb.5.1702414021164; Tue, 12 Dec 2023 12:47:01 -0800 (PST) Date: Tue, 12 Dec 2023 12:46:17 -0800 In-Reply-To: <20231212204647.2170650-1-sagis@google.com> Mime-Version: 1.0 References: <20231212204647.2170650-1-sagis@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231212204647.2170650-3-sagis@google.com> Subject: [RFC PATCH v5 02/29] KVM: selftests: Expose function that sets up sregs based on VM's mode From: Sagi Shahar To: linux-kselftest@vger.kernel.org, Ackerley Tng , Ryan Afranji , Erdem Aktas , Sagi Shahar , Isaku Yamahata Cc: Sean Christopherson , Paolo Bonzini , Shuah Khan , Peter Gonda , Haibo Xu , Chao Peng , Vishal Annapurve , Roger Wang , Vipin Sharma , jmattson@google.com, dmatlack@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 29FFB80002 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: ozgakzmninee5dwp8j64hhgfb4n1unxw X-HE-Tag: 1702414021-528765 X-HE-Meta: U2FsdGVkX19od6CQ6HkLek5XaxqhV3dshFm+q73Xa3w/M2KRA6nAPjLiQdNiRUiI6Dole+x4X8gpmvDt7NhAWwTxeknoX3gGYQKpYLQjeTjxl0ZG2ji3DZYKisvgIwld4oJ6sj0n+/LENrupMhXwnMyXpvR6YgPMvuwfs+5d8DbrL7wTvnQli2smmtqllUDheRmO8JDCk/eavzPQcEfRLbh67tCgnm+mvQWFQwRWCW3C3gDO94vvOKzD6sY/C8ZgdK3FDhvPRyyNNBs7fP6af40wSI0lQqo4QUfvMsAPwqtvTgj+PnumWzQJXNjRFEXJahCYJWdedk5VspPLJvaYX+VaEZwgWlj7iaFG343spC9CbkWInIhcdr3SFmE5e6+Yehne3Q/vblT7nfv0EUvN2/0Y5ustrzeqOQR4GhlCjm5BZG351ivyJMsSkbvRVqWb52WlZVCvns53neEACKU7BLp+9cD7wbFmHZVRFH87FLvCzL2NmBiHWba5RdWMCo1EonNgGsCIIAwQtiusdqKeCnNkRxR2gtGM3qD9fM3eWqPDo27OhmQFhwDgeeeso3M0reumV4hByL95qZSlzJiiii74dP4fuBAMyY7H8TUVhdr6JY/OG35lMJgeviEkgCOSzrccPfnMIa6mR9Qt07Ys4BfwlfBeq8pZx9ux59tiXTk9LTAajjg8tklbOs99kJIjZ0nQe/DatVLgXpHy9C+1YUd0ToHkNxsFp5+Z6AQLEgfDbymUE6wsidbyAjui9GCKa+Zc3lvWqLLr+7Lzetku9nDeW5KSriLUhimPazj+l9aKhS5N49kuJFsehQ1gZ3Kgq0c5QPTz3P+E1+MTi+8MWjqP3DVaIw/Q7K3QelKCDKMDO9tB558MNs/C4qdv0i9Y4D4TMTgAOsQYkSPBsH/D83YWmmwwztBhouXD3lAOl+3j51HOCUIUZZDD+lb8IAvuZZ6kstj/BzRyOsc58kp nNB4Liqe FjL1rGIVj+YSsH6HR28j64AJ/RPLA2bbNvcuMWXc3uqLsBMmseD3k48GWZ1EalJ4FugHg6MiFAD2xeDqNDSWXxeh6nDNNHnPKfU7ChxbPFJq4GwVEpxXSeeIbOAzWm0hsSoVqhS2dCuAiQ3mYEvAi/Fz/yUByK/bhOwYmV5MxfJcxcGYdeSUx9mHrE8Xy7vsBK1tRKAVtURNDhbq+xPH4CyKsnhhF0ngfTBkRsjvjua4V6kR+U8rxjfoU392CTDA9gy3LJoUJHxYuKZLX+j56npoG8OyqWW8RzAV77Ym6aPfpCPEeRQn7HTpwbYcSzIrFghbBw7UEbpttp9YJ15SSWslSpvaEgY2IOl+gvRekDClRNfeYm7jO2gr0wXacw1AtI5KNRNzqd8wJju0EpKPutGnGF9qNRDBvAYHhlQJHAAEbiC93WzLDSmhVpt+1Mk1LRnTdqMcWuptvQfaO5mWtxNFgeOt966xJOl1hbZ0V/oHK8mm+HdwpPOAQxYYCEK0sLkNyUsy2UDaIVD5ERfw9zWfNNm5fMvxeI21Q012QEzekhMv10eLhciC6kS5xSgFqIZC9m2KVbXXf5JYyD7rPZKmqLQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000360, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Ackerley Tng This allows initializing sregs without setting vCPU registers in KVM. No functional change intended. Signed-off-by: Ackerley Tng Signed-off-by: Ryan Afranji Signed-off-by: Sagi Shahar --- .../selftests/kvm/include/x86_64/processor.h | 2 + .../selftests/kvm/lib/x86_64/processor.c | 39 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h index 35fcf4d78dfa..0b8855d68744 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h @@ -958,6 +958,8 @@ static inline struct kvm_cpuid2 *allocate_kvm_cpuid2(int nr_entries) void vcpu_init_cpuid(struct kvm_vcpu *vcpu, const struct kvm_cpuid2 *cpuid); void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu); +void vcpu_setup_mode_sregs(struct kvm_vm *vm, struct kvm_sregs *sregs); + static inline struct kvm_cpuid_entry2 *__vcpu_get_cpuid_entry(struct kvm_vcpu *vcpu, uint32_t function, uint32_t index) diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c index aef1c021c4bb..f130f78a4974 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -543,36 +543,39 @@ static void kvm_setup_tss_64bit(struct kvm_vm *vm, struct kvm_segment *segp, kvm_seg_fill_gdt_64bit(vm, segp); } -static void vcpu_setup(struct kvm_vm *vm, struct kvm_vcpu *vcpu) +void vcpu_setup_mode_sregs(struct kvm_vm *vm, struct kvm_sregs *sregs) { - struct kvm_sregs sregs; - - /* Set mode specific system register values. */ - vcpu_sregs_get(vcpu, &sregs); - - sregs.idt.limit = 0; + sregs->idt.limit = 0; - kvm_setup_gdt(vm, &sregs.gdt); + kvm_setup_gdt(vm, &sregs->gdt); switch (vm->mode) { case VM_MODE_PXXV48_4K_SEV: case VM_MODE_PXXV48_4K: - sregs.cr0 = X86_CR0_PE | X86_CR0_NE | X86_CR0_PG; - sregs.cr4 |= X86_CR4_PAE | X86_CR4_OSFXSR; - sregs.efer |= (EFER_LME | EFER_LMA | EFER_NX); - - kvm_seg_set_unusable(&sregs.ldt); - kvm_seg_set_kernel_code_64bit(vm, DEFAULT_CODE_SELECTOR, &sregs.cs); - kvm_seg_set_kernel_data_64bit(vm, DEFAULT_DATA_SELECTOR, &sregs.ds); - kvm_seg_set_kernel_data_64bit(vm, DEFAULT_DATA_SELECTOR, &sregs.es); - kvm_setup_tss_64bit(vm, &sregs.tr, 0x18); + sregs->cr0 = X86_CR0_PE | X86_CR0_NE | X86_CR0_PG; + sregs->cr4 |= X86_CR4_PAE | X86_CR4_OSFXSR; + sregs->efer |= (EFER_LME | EFER_LMA | EFER_NX); + + kvm_seg_set_unusable(&sregs->ldt); + kvm_seg_set_kernel_code_64bit(vm, DEFAULT_CODE_SELECTOR, &sregs->cs); + kvm_seg_set_kernel_data_64bit(vm, DEFAULT_DATA_SELECTOR, &sregs->ds); + kvm_seg_set_kernel_data_64bit(vm, DEFAULT_DATA_SELECTOR, &sregs->es); + kvm_setup_tss_64bit(vm, &sregs->tr, 0x18); break; default: TEST_FAIL("Unknown guest mode, mode: 0x%x", vm->mode); } - sregs.cr3 = vm->pgd; + sregs->cr3 = vm->pgd; +} + +static void vcpu_setup(struct kvm_vm *vm, struct kvm_vcpu *vcpu) +{ + struct kvm_sregs sregs; + + vcpu_sregs_get(vcpu, &sregs); + vcpu_setup_mode_sregs(vm, &sregs); vcpu_sregs_set(vcpu, &sregs); } -- 2.43.0.472.g3155946c3a-goog