From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Brijesh Singh <brijesh.singh@amd.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
John Allen <john.allen@amd.com>
Cc: Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org, Borislav Petkov <bp@suse.de>,
Christophe Leroy <christophe.leroy@csgroup.eu>
Subject: [PATCH v2 7/8] crypto: ccp: Use the stack and common buffer for INIT command
Date: Tue, 6 Apr 2021 15:49:51 -0700 [thread overview]
Message-ID: <20210406224952.4177376-8-seanjc@google.com> (raw)
In-Reply-To: <20210406224952.4177376-1-seanjc@google.com>
Drop the dedicated init_cmd_buf and instead use a local variable. Now
that the low level helper uses an internal buffer for all commands,
using the stack for the upper layers is safe even when running with
CONFIG_VMAP_STACK=y.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
drivers/crypto/ccp/sev-dev.c | 10 ++++++----
drivers/crypto/ccp/sev-dev.h | 1 -
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index e54774b0d637..9ff28df03030 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -233,6 +233,7 @@ static int sev_do_cmd(int cmd, void *data, int *psp_ret)
static int __sev_platform_init_locked(int *error)
{
struct psp_device *psp = psp_master;
+ struct sev_data_init data;
struct sev_device *sev;
int rc = 0;
@@ -244,6 +245,7 @@ static int __sev_platform_init_locked(int *error)
if (sev->state == SEV_STATE_INIT)
return 0;
+ memset(&data, 0, sizeof(data));
if (sev_es_tmr) {
u64 tmr_pa;
@@ -253,12 +255,12 @@ static int __sev_platform_init_locked(int *error)
*/
tmr_pa = __pa(sev_es_tmr);
- sev->init_cmd_buf.flags |= SEV_INIT_FLAGS_SEV_ES;
- sev->init_cmd_buf.tmr_address = tmr_pa;
- sev->init_cmd_buf.tmr_len = SEV_ES_TMR_SIZE;
+ data.flags |= SEV_INIT_FLAGS_SEV_ES;
+ data.tmr_address = tmr_pa;
+ data.tmr_len = SEV_ES_TMR_SIZE;
}
- rc = __sev_do_cmd_locked(SEV_CMD_INIT, &sev->init_cmd_buf, error);
+ rc = __sev_do_cmd_locked(SEV_CMD_INIT, &data, error);
if (rc)
return rc;
diff --git a/drivers/crypto/ccp/sev-dev.h b/drivers/crypto/ccp/sev-dev.h
index 0fd21433f627..666c21eb81ab 100644
--- a/drivers/crypto/ccp/sev-dev.h
+++ b/drivers/crypto/ccp/sev-dev.h
@@ -46,7 +46,6 @@ struct sev_device {
unsigned int int_rcvd;
wait_queue_head_t int_queue;
struct sev_misc_dev *misc;
- struct sev_data_init init_cmd_buf;
u8 api_major;
u8 api_minor;
--
2.31.0.208.g409f899ff0-goog
next prev parent reply other threads:[~2021-04-06 22:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 22:49 [PATCH v2 0/8] ccp: KVM: SVM: Use stack for SEV command buffers Sean Christopherson
2021-04-06 22:49 ` [PATCH v2 1/8] crypto: ccp: Free SEV device if SEV init fails Sean Christopherson
2021-04-06 22:49 ` [PATCH v2 2/8] crypto: ccp: Detect and reject "invalid" addresses destined for PSP Sean Christopherson
2021-04-06 22:49 ` [PATCH v2 3/8] crypto: ccp: Reject SEV commands with mismatching command buffer Sean Christopherson
2021-04-06 22:49 ` [PATCH v2 4/8] crypto: ccp: Play nice with vmalloc'd memory for SEV command structs Sean Christopherson
2021-04-06 22:49 ` [PATCH v2 5/8] crypto: ccp: Use the stack for small SEV command buffers Sean Christopherson
2021-04-07 5:18 ` Christophe Leroy
2021-04-17 12:40 ` Paolo Bonzini
2021-04-06 22:49 ` [PATCH v2 6/8] crypto: ccp: Use the stack and common buffer for status commands Sean Christopherson
2021-04-06 22:49 ` Sean Christopherson [this message]
2021-04-07 5:20 ` [PATCH v2 7/8] crypto: ccp: Use the stack and common buffer for INIT command Christophe Leroy
2021-04-17 12:42 ` Paolo Bonzini
2021-04-06 22:49 ` [PATCH v2 8/8] KVM: SVM: Allocate SEV command structures on local stack Sean Christopherson
2021-04-07 5:24 ` Christophe Leroy
2021-04-07 10:24 ` Borislav Petkov
2021-04-07 17:05 ` Sean Christopherson
2021-04-07 17:06 ` Christophe Leroy
2021-04-07 17:34 ` Borislav Petkov
2021-04-17 12:45 ` Paolo Bonzini
2021-04-07 17:16 ` [PATCH v2 0/8] ccp: KVM: SVM: Use stack for SEV command buffers Brijesh Singh
2021-04-07 18:00 ` Tom Lendacky
2021-04-15 16:09 ` Paolo Bonzini
2021-04-15 18:15 ` Tom Lendacky
2021-04-16 0:28 ` Herbert Xu
2021-04-17 12:47 ` Paolo Bonzini
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=20210406224952.4177376-8-seanjc@google.com \
--to=seanjc@google.com \
--cc=bp@suse.de \
--cc=brijesh.singh@amd.com \
--cc=christophe.leroy@csgroup.eu \
--cc=jmattson@google.com \
--cc=john.allen@amd.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thomas.lendacky@amd.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/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).