From: Nick Desaulniers <nick.desaulniers@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: "Nick Desaulniers" <nick.desaulniers@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] KVM: x86: dynamically allocate large struct in em_fxrstor
Date: Tue, 23 May 2017 23:24:33 -0700 [thread overview]
Message-ID: <20170524062433.20680-1-nick.desaulniers@gmail.com> (raw)
Fixes the warning:
arch/x86/kvm/emulate.c:4018:12: warning: stack frame size of 1080 bytes in
function
'em_fxrstor' [-Wframe-larger-than=]
static int em_fxrstor(struct x86_emulate_ctxt *ctxt)
^
Found with CONFIG_FRAME_WARN set to 1024.
Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
---
arch/x86/kvm/emulate.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 0816ab2e8adc..1d7c9ceeff56 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -4017,30 +4017,38 @@ static int fxrstor_fixup(struct x86_emulate_ctxt *ctxt,
static int em_fxrstor(struct x86_emulate_ctxt *ctxt)
{
- struct fxregs_state fx_state;
+ struct fxregs_state *fx_state;
int rc;
rc = check_fxsr(ctxt);
if (rc != X86EMUL_CONTINUE)
return rc;
- rc = segmented_read_std(ctxt, ctxt->memop.addr.mem, &fx_state, 512);
+ fx_state = kmalloc(sizeof(*fx_state), GFP_KERNEL);
+ if (!fx_state)
+ return -ENOMEM;
+
+ rc = segmented_read_std(ctxt, ctxt->memop.addr.mem, fx_state, 512);
if (rc != X86EMUL_CONTINUE)
- return rc;
+ goto out;
- if (fx_state.mxcsr >> 16)
- return emulate_gp(ctxt, 0);
+ if (fx_state->mxcsr >> 16) {
+ rc = emulate_gp(ctxt, 0);
+ goto out;
+ }
ctxt->ops->get_fpu(ctxt);
if (ctxt->mode < X86EMUL_MODE_PROT64)
- rc = fxrstor_fixup(ctxt, &fx_state);
+ rc = fxrstor_fixup(ctxt, fx_state);
if (rc == X86EMUL_CONTINUE)
- rc = asm_safe("fxrstor %[fx]", : [fx] "m"(fx_state));
+ rc = asm_safe("fxrstor %[fx]", : [fx] "m"(*fx_state));
ctxt->ops->put_fpu(ctxt);
+out:
+ kfree(fx_state);
return rc;
}
--
2.11.0
next reply other threads:[~2017-05-24 6:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 6:24 Nick Desaulniers [this message]
2017-05-24 14:19 ` [PATCH] KVM: x86: dynamically allocate large struct in em_fxrstor Radim Krčmář
2017-05-25 1:36 ` Nick Desaulniers
2017-05-25 14:07 ` Paolo Bonzini
2017-05-26 4:13 ` Nick Desaulniers
2017-05-26 7:18 ` Paolo Bonzini
2017-05-29 19:55 ` [PATCH v2] KVM: x86: avoid large stack allocations " Nick Desaulniers
2017-05-29 20:14 ` kbuild test robot
2017-05-29 20:29 ` Nick Desaulniers
2017-05-29 20:39 ` [PATCH v3] " Nick Desaulniers
2017-05-29 22:40 ` Nick Desaulniers
2017-05-29 22:48 ` [PATCH v4] " Nick Desaulniers
2017-05-30 10:15 ` Paolo Bonzini
2017-05-30 14:05 ` Radim Krčmář
2017-05-31 3:08 ` [PATCH v5] " Nick Desaulniers
2017-05-31 11:01 ` Paolo Bonzini
2017-06-01 1:05 ` Nick Desaulniers
2017-06-01 7:36 ` Paolo Bonzini
2017-06-02 2:10 ` Nick Desaulniers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170524062433.20680-1-nick.desaulniers@gmail.com \
--to=nick.desaulniers@gmail.com \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).