From patchwork Wed Oct 31 23:49:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Orr X-Patchwork-Id: 10663357 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 9619014E2 for ; Wed, 31 Oct 2018 23:49:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 807122B943 for ; Wed, 31 Oct 2018 23:49:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73FD62B9C2; Wed, 31 Oct 2018 23:49:41 +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 037052B943 for ; Wed, 31 Oct 2018 23:49:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B3E466B0006; Wed, 31 Oct 2018 19:49:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AC96D6B0007; Wed, 31 Oct 2018 19:49:39 -0400 (EDT) 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 8C9E46B0008; Wed, 31 Oct 2018 19:49:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it1-f199.google.com (mail-it1-f199.google.com [209.85.166.199]) by kanga.kvack.org (Postfix) with ESMTP id 608906B0006 for ; Wed, 31 Oct 2018 19:49:39 -0400 (EDT) Received: by mail-it1-f199.google.com with SMTP id y144-v6so10239616itc.5 for ; Wed, 31 Oct 2018 16:49:39 -0700 (PDT) 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=sag5MWmUMVeJlNMpxbgpOCQmQo4Ok3FbocF8rLJTZCg=; b=s/i76W9UFxWMGo6QYqIL/B+v1dNQjfOoCiQwjYmiim6dRUdf+RF+DNe+kYqLUQklLD ONFhatezrlo/OiJYyxWRH4GzbHhX1NQLTbbQBeXy0pr3/smKKGnlBIeV/6ZW09IHZzO+ o8Q6rEPryRn4t+Yx3YdPexPm2oD3zDf4h9t3TaBHLeIqKeRolnj9ncVrFdAkWQQgiGdM pTqxkBlYZJHRjyVfH5uGKJkZXeUWhKCitUFPMUUJvdGUl1JXeWSAMdgak5sSf6UDhyVL R8TaEKZ46fPniXcg0W301NeRpq4O024gQp3EHklwar4KoWvJhoKE2DSg+37uTsME3YV/ zSog== X-Gm-Message-State: AGRZ1gJ4fF7VNAsGipu+/GIaEGBBx1Ai5ojBRM63fFzyUOd3Om+LxMoL owD2xmX45dtTpfsTWRHyMPPmSqWEzVe/XfKFR7NhvcaPs5UzO5nO8FAL5wDxysZ2NNlUr+eczoA mAfgQjk7e4pk5RQkoths7H98MNl3SetWsyW6y+gQy83tf8B8bzSLRi1D2tM/1OA9WMs6rzAiD24 3MgetbYoOVUWnnr62j3jLAgUzBVU/XKN2DLi3wpjitn4yABx794pbcSZJ6wu3D8eim4cmu647EH 39bGMdo/rRUJHunmqD49wXW81QcYKNxPRmEJpoL7vTNBGvJ3TrAZNoeJVMpHMWh7t+tQTfUDZDJ WzVyqWonkr4kkTFPSaWagjXGmEfMAuGUqaCgeTL7KNpv/CDY7Xzt3rHaBhh5K0IKkVeDIs9HRG8 p X-Received: by 2002:a6b:710b:: with SMTP id q11-v6mr3166436iog.138.1541029779063; Wed, 31 Oct 2018 16:49:39 -0700 (PDT) X-Received: by 2002:a6b:710b:: with SMTP id q11-v6mr3166420iog.138.1541029778325; Wed, 31 Oct 2018 16:49:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541029778; cv=none; d=google.com; s=arc-20160816; b=rOTYw8hQwa1ws99f1eHLXOTkJyIDcKRFQJuPK2i45K+k7NZtWljsvdr07xWBdAGMGS qmjH6nlJwm6O1Ttc0VIXe25cRlVJ4jim/tk8QxPuswubGM6WHI2W4blUFb6H8vP/NwbA jDd+DWt5ceISSunBaZJxTXaAzLcLBui2YDXBIUxcwA1Lkj2Uf3/kBkXP0HlGz9HYO8kS 4XKibs3s/FyiiIU6IQAq8xdRX0gNrClV/MnJGcg0Z9tq86Tu3rlsiSOARZ9arG+tyrt3 7YRN5bi0FJ+MIuGRakKBwqS/0kqDkjkvAUWqeM9U405fh0v5VxD+HsfH3Iph0KoqFupC jV6w== 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=sag5MWmUMVeJlNMpxbgpOCQmQo4Ok3FbocF8rLJTZCg=; b=l7S2NgV7b1yPE4egSTtqniFcH/VDwY4A0UTuCN6CNlfN8Y3fji8x+V7E0Aau+gO+8v Kw9IC0QRLErgA4bVA5taacyzDSAfmjxRghoP8TMr/i/R9WazQyfR4tvqcyqQbWCtLqgg gK+4w6pTPwzYeqaAmDJumgrz6i+qrXL57VCpTBlW2oRFvnf27E0cb7cPOTdZKT+XQxhq SEjiP1H8P5qzCb/gDbE2wX3XU0LvfR319Y0KKfIH5l3kHKuLi90Hw2Vw2Zbk3FJn34Jm C8C9XlJDuhTsCJCaAmerHL7fvhRBGzOq4Olh10gFwr7n2wXSPWpV+lUWaJduoPy4/DFB esrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=rqTZMcav; spf=pass (google.com: domain of 3kt_awwckcf4i6n8knnckkcha.8kihejqt-iigr68g.knc@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3kT_aWwcKCF4I6N8KNNCKKCHA.8KIHEJQT-IIGR68G.KNC@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 t17-v6sor26825349itf.4.2018.10.31.16.49.38 for (Google Transport Security); Wed, 31 Oct 2018 16:49:38 -0700 (PDT) Received-SPF: pass (google.com: domain of 3kt_awwckcf4i6n8knnckkcha.8kihejqt-iigr68g.knc@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=rqTZMcav; spf=pass (google.com: domain of 3kt_awwckcf4i6n8knnckkcha.8kihejqt-iigr68g.knc@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3kT_aWwcKCF4I6N8KNNCKKCHA.8KIHEJQT-IIGR68G.KNC@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=sag5MWmUMVeJlNMpxbgpOCQmQo4Ok3FbocF8rLJTZCg=; b=rqTZMcavNyyovzMSxcAu4EhLXbC9QzFt8tV/BXPWZL+RZIpxT5xlT7Of078dzGWhLz uoFQiXGyj3ZH/ifAt0o5iT0klxRvip96jBej7PRQcldWXZ9fWWpEkHdOXSrRine4DhHB W7ozWF+PT6mt1UgsM0GzhGGDVkLwPtFInebqB6DrzW1PVFu9ERTj4NdqAs6Ar1REbW4W KGXweL1v5a9gIhf2QZB0li/KYj+nY8pJ6upsnTFMzfCB24M6AJ3kSrU33jwl+cGbZ7Hn BoKB+4MWRNEv69cneVnU4PnoXP4QkOt1O4dcuc3vM4m+vyaa31uF0Q+TTG93RC5MNXaz TRvA== X-Google-Smtp-Source: AJdET5flk7ooqaejTMsXXqjIwACRiUCqESKS/OHGre4mffs1Ve/56ZxSoyJK3Tdl6GTp4Hs9n+94pKlke+af X-Received: by 2002:a05:660c:145:: with SMTP id r5mr1666008itk.25.1541029777968; Wed, 31 Oct 2018 16:49:37 -0700 (PDT) Date: Wed, 31 Oct 2018 16:49:27 -0700 In-Reply-To: <20181031234928.144206-1-marcorr@google.com> Message-Id: <20181031234928.144206-2-marcorr@google.com> Mime-Version: 1.0 References: <20181031234928.144206-1-marcorr@google.com> X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [kvm PATCH v6 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 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);