From patchwork Tue Nov 6 22:53:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Orr X-Patchwork-Id: 10671599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C65CE14BD for ; Tue, 6 Nov 2018 22:54:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B99BB2A6B9 for ; Tue, 6 Nov 2018 22:54:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADA742A826; Tue, 6 Nov 2018 22:54:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E1CF2A714 for ; Tue, 6 Nov 2018 22:54:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A1626B04A3; Tue, 6 Nov 2018 17:54:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3755B6B04A5; Tue, 6 Nov 2018 17:54:05 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28BDF6B04A6; Tue, 6 Nov 2018 17:54:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id DA00E6B04A3 for ; Tue, 6 Nov 2018 17:54:04 -0500 (EST) Received: by mail-pl1-f200.google.com with SMTP id s24-v6so14471853plp.12 for ; Tue, 06 Nov 2018 14:54:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=m2iqjlD99uhLk3TcwseOpc1O1utdKyZJoe8g5b3aQf4=; b=jJMezNxEWEmGezAZmp/b2wbnAWyiTzl315cJe1udq5/kPihHg+H+8PyHx27JnLmv7j 32xJ2+Ozw7obZd27MLCt+m2MZl1seh2WKysVCs/8scignfcL952D+k4fggevnfMUywbg ENq9C/aeEBrrYwWyDuazX6wYb4boFY1BN3EOXFzdhrvfzeYCqNRanoj+6N9qIMAr5oIt kBRYHgqe95lPcHYgM7xMGMCEcNhCw/UhaRQRm34G+xXhFbvMggK0UfGLt1G/Ga6EBjCx TJ4CCuzQi8pvm+UO9DWF8deIBgathqxvpQu6NFrA1P3mjjgVYHm9t1/Cqx+4MQKrJb16 3i5Q== X-Gm-Message-State: AGRZ1gKihH5WMlA2efoHZm6KvdYgHe2IrdBqseqrTBHexPfYnY9ceQft pE6Up+v4xLywk6l0SdWdMGp5oFY2Cte1iVHImAhkPs8UDx602uRRbJbN2psO3CMc9VE5rCRTlHK eiBv3hQy10Dmq+znlXEnwkrIG1p0j3KAbikmK3jqYWweuhTz+TljADucCkwBya66/hqVUzfy//e a4K+2qf9zq+y9LqErqirsffykkoY9D+HnKjlT+suwfy00B4qStD4d9V86iE+uZCemJqcqDPdl8+ ytHXja9TAhr4XTA0LjwBXmPNuztidxMycgSJ4Y4F5DbTuROFo/5yvK0KIBjDUdSF1H86yfJSKJ4 MdvBtjMYKwbm/zRqnK/yZDgJ7+PVBtfItgw6CspB4C9M9nCRNi+OYeDASV2G7KKUqdghTFgiCmw Y X-Received: by 2002:a62:4681:: with SMTP id o1-v6mr2137081pfi.172.1541544844513; Tue, 06 Nov 2018 14:54:04 -0800 (PST) X-Received: by 2002:a62:4681:: with SMTP id o1-v6mr2137050pfi.172.1541544843707; Tue, 06 Nov 2018 14:54:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541544843; cv=none; d=google.com; s=arc-20160816; b=T9KT1uuegy7sAjA0BE/lfgfD8EtMZ46BAwVdKsj2JPb0WSMSKasxZWxsxC/sMTwhX+ JobAWTeC7a0q6k+f6G9QHB53AaHH90s4OcaB8ngWqeB3d/cXgHSD5Mxy09APM1fTDRrg ELRbxKyNQ6Yq53lapuzmzUmLWUJi+WaXdqLbyCyIUnZU0vFk9pP/FZGecloNJE8BPDGo XmTu8HtiYlBmvD220WKnqzuHE9lzOK4qqymGpMpFJAzuKus4BCA3OAzV7gNNynNARbGO L133Qdc5FWWjjErSMkNC4uJOAY7bBGCuDzjp0zkdQwlRS4SU/MkuODjtQMXtQJu4ZOYz IDpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:dkim-signature; bh=m2iqjlD99uhLk3TcwseOpc1O1utdKyZJoe8g5b3aQf4=; b=r+CqPZz8lFafRpg1Kgiqg0mbBmw6x3YDTdGc+3tZAzXrBPpVRyiYHZyMLVZGmc7nX5 R6p4l9jS9BQLKBrJTZkfRc+KZV4iSqES0/Whrv9dCgOOgOsZTPCzCobzuMz4Si9lyrOR FgAGD9ysGgEjjaMVVNb6FCg3KDJu6TV/v5O8nPe6vfDyiz7/kk71ZRA9wAPMPLHN+1ZR 4bHVaTRhFkMUMPKpCmtd6svPKCJmSk0n3ClVR0UL5cSFmG0etMw4UKqidiEH2CSSoF0N blaJca5gtWRD99ebH3kEB9SjAGnudog6wqxQk8KXloT2as6AyKh8it3/Vv8TxneHIrYN fG7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ifPS7Mhz; spf=pass (google.com: domain of 3ixviwwckcdaymdoaddsaasxq.oayxuzgj-yywhmow.ads@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3ixviWwcKCDAYMdOaddSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--marcorr.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id t132sor9273688pgc.85.2018.11.06.14.54.03 for (Google Transport Security); Tue, 06 Nov 2018 14:54:03 -0800 (PST) Received-SPF: pass (google.com: domain of 3ixviwwckcdaymdoaddsaasxq.oayxuzgj-yywhmow.ads@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ifPS7Mhz; spf=pass (google.com: domain of 3ixviwwckcdaymdoaddsaasxq.oayxuzgj-yywhmow.ads@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3ixviWwcKCDAYMdOaddSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--marcorr.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=m2iqjlD99uhLk3TcwseOpc1O1utdKyZJoe8g5b3aQf4=; b=ifPS7MhzVizUOweRcJ08ApedWLa8jvGU4NFZniAjTZDGDYIDRxzYbheuj2BrDAV1r9 hbBCpz8GB+jHuQjzb+7q2oW1kjim8NTqjEL748WLmqg09dXgq4O5E4gOuWJMGBaF5Udr mnFqG4H5hxYmaXrylo0fDWy7SEUhgegyZqRvvi6kylf8LsBeGESEfIcD4A4kY99Jlmb7 3srRBqOCGgtjQ9WjoYdNvoE5IQ/ocTK5utdMjsdzbOrz5Xn6hJYOuPDPfxAp19ng3UiY m8TYW0RzvZNbl+v5JIJ2+oMQ6qg1tEyORGCvDnVxIEJ3X54I7819NpbTWtRwszmt3frj 0Pew== X-Google-Smtp-Source: AJdET5d1+zAjQ9j899y9SMNG1fEc7GEveRH95r5ecnojc9i2CGMwlqdoma3Rv3CxhqPMB3RXhF9DfWsCgfmK X-Received: by 2002:a63:6c8a:: with SMTP id h132mr415pgc.56.1541544843175; Tue, 06 Nov 2018 14:54:03 -0800 (PST) Date: Tue, 6 Nov 2018 14:53:55 -0800 In-Reply-To: <20181106225356.119901-1-marcorr@google.com> Message-Id: <20181106225356.119901-2-marcorr@google.com> Mime-Version: 1.0 References: <20181106225356.119901-1-marcorr@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog Subject: [kvm PATCH v8 1/2] kvm: x86: Use task structs fpu field for user From: Marc Orr To: kvm@vger.kernel.org, jmattson@google.com, rientjes@google.com, konrad.wilk@oracle.com, linux-mm@kvack.org, akpm@linux-foundation.org, pbonzini@redhat.com, rkrcmar@redhat.com, willy@infradead.org, sean.j.christopherson@intel.com, dave.hansen@linux.intel.com, kernellwp@gmail.com Cc: Marc Orr , Dave Hansen X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Previously, x86's instantiation of 'struct kvm_vcpu_arch' added an fpu field to save/restore fpu-related architectural state, which will differ from kvm's fpu state. However, this is redundant to the 'struct fpu' field, called fpu, embedded in the task struct, via the thread field. Thus, this patch removes the user_fpu field from the kvm_vcpu_arch struct and replaces it with the task struct's fpu field. This change is significant because the fpu struct is actually quite large. For example, on the system used to develop this patch, this change reduces the size of the vcpu_vmx struct from 23680 bytes down to 19520 bytes, when building the kernel with kvmconfig. This reduction in the size of the vcpu_vmx struct moves us closer to being able to allocate the struct at order 2, rather than order 3. Suggested-by: Dave Hansen Signed-off-by: Marc Orr --- arch/x86/include/asm/kvm_host.h | 7 +++---- arch/x86/kvm/x86.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 55e51ff7e421..ebb1d7a755d4 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -601,16 +601,15 @@ struct kvm_vcpu_arch { /* * QEMU userspace and the guest each have their own FPU state. - * In vcpu_run, we switch between the user and guest FPU contexts. - * While running a VCPU, the VCPU thread will have the guest FPU - * context. + * In vcpu_run, we switch between the user, maintained in the + * task_struct struct, and guest FPU contexts. While running a VCPU, + * the VCPU thread will have the guest FPU context. * * Note that while the PKRU state lives inside the fpu registers, * it is switched out separately at VMENTER and VMEXIT time. The * "guest_fpu" state here contains the guest FPU context, with the * host PRKU bits. */ - struct fpu user_fpu; struct fpu guest_fpu; u64 xcr0; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bdcb5babfb68..ff77514f7367 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7999,7 +7999,7 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu) static void kvm_load_guest_fpu(struct kvm_vcpu *vcpu) { preempt_disable(); - copy_fpregs_to_fpstate(&vcpu->arch.user_fpu); + copy_fpregs_to_fpstate(¤t->thread.fpu); /* PKRU is separately restored in kvm_x86_ops->run. */ __copy_kernel_to_fpregs(&vcpu->arch.guest_fpu.state, ~XFEATURE_MASK_PKRU); @@ -8012,7 +8012,7 @@ static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) { preempt_disable(); copy_fpregs_to_fpstate(&vcpu->arch.guest_fpu); - copy_kernel_to_fpregs(&vcpu->arch.user_fpu.state); + copy_kernel_to_fpregs(¤t->thread.fpu.state); preempt_enable(); ++vcpu->stat.fpu_reload; trace_kvm_fpu(0);