From nobody Wed May 15 16:37:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633973569450603.7255702220692; Mon, 11 Oct 2021 10:32:49 -0700 (PDT) Received: from localhost ([::1]:60248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZzAO-0005js-BN for importer@patchew.org; Mon, 11 Oct 2021 13:32:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZz8V-0003h1-0O for qemu-devel@nongnu.org; Mon, 11 Oct 2021 13:30:51 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:47128) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZz8Q-0001sa-7E for qemu-devel@nongnu.org; Mon, 11 Oct 2021 13:30:50 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19BH1ViR015159; Mon, 11 Oct 2021 13:30:40 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3bmsa9rhc4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Oct 2021 13:30:40 -0400 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 19BHUdaf009210; Mon, 11 Oct 2021 13:30:39 -0400 Received: from ppma05wdc.us.ibm.com (1b.90.2fa9.ip4.static.sl-reverse.com [169.47.144.27]) by mx0a-001b2d01.pphosted.com with ESMTP id 3bmsa9rhbt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Oct 2021 13:30:39 -0400 Received: from pps.filterd (ppma05wdc.us.ibm.com [127.0.0.1]) by ppma05wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 19BHDFQA003417; Mon, 11 Oct 2021 17:30:38 GMT Received: from b03cxnp07027.gho.boulder.ibm.com (b03cxnp07027.gho.boulder.ibm.com [9.17.130.14]) by ppma05wdc.us.ibm.com with ESMTP id 3bk2qahuvh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Oct 2021 17:30:38 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp07027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 19BHUb8f27656452 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 Oct 2021 17:30:37 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1E51978077; Mon, 11 Oct 2021 17:30:37 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7DF9678060; Mon, 11 Oct 2021 17:30:36 +0000 (GMT) Received: from amdrome3.watson.ibm.com (unknown [9.2.130.16]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Mon, 11 Oct 2021 17:30:36 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=6h4YUhheiyP8tOEI/uuPv2pnBxI4mnmenVPhwuGLJXo=; b=qRqM0xVS+3F/9Akv1D6ffNYgtCeFcXnLQFtPnetterCwCe6mSXY3LlVWoP2btwRcT7U1 Bq7uM1pbbLBXVvq/qJk6iDdBqGRoPQe33IA7sXYR2Z03PcoUPGuzl0DYwMiBDZiRdZW2 XY3kEQB5TeyJIbnG/AWeBERIrHk3LaXrdin90Z7Fb24XU5wX287bM55nvUWgi0Er9sgW fGJvPvNTCT8QbdCS1RBWmJ5oPzre6cZSO9zt2khjbK7HyetitOoRCubpsZZOVV87rGV+ BGOelatmwQ19xUQRmo9bYadF2NuXCieh/B3XDTDUBFV9NvqOK99wAKK+4Dt5K+mNmkeM Ug== From: Dov Murik To: qemu-devel@nongnu.org Subject: [PATCH 1/2] target/i386/sev: Use local variable for kvm_sev_launch_start Date: Mon, 11 Oct 2021 17:30:25 +0000 Message-Id: <20211011173026.2454294-2-dovmurik@linux.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211011173026.2454294-1-dovmurik@linux.ibm.com> References: <20211011173026.2454294-1-dovmurik@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: YVtFCr6Nmmym2_vUeNbrGvNRghJSs_Mr X-Proofpoint-ORIG-GUID: Od0NqgnUzM8ommii7bvlg0h1GaFGKxbw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-11_06,2021-10-11_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 priorityscore=1501 mlxlogscore=999 impostorscore=0 bulkscore=0 suspectscore=0 clxscore=1015 malwarescore=0 phishscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110110101 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=dovmurik@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brijesh Singh , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , James Bottomley , "Dr. David Alan Gilbert" , Dov Murik , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633974471380100001 Content-Type: text/plain; charset="utf-8" The struct kvm_sev_launch_start has a constant and small size, and therefore we can use a regular local variable for it instead of allocating and freeing heap memory for it. Signed-off-by: Dov Murik Reviewed-by: Dr. David Alan Gilbert --- target/i386/sev.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/target/i386/sev.c b/target/i386/sev.c index 4c64c68244..0062566c71 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -647,31 +647,29 @@ sev_launch_start(SevGuestState *sev) gsize sz; int ret =3D 1; int fw_error, rc; - struct kvm_sev_launch_start *start; + struct kvm_sev_launch_start start =3D { + .handle =3D sev->handle, .policy =3D sev->policy + }; guchar *session =3D NULL, *dh_cert =3D NULL; =20 - start =3D g_new0(struct kvm_sev_launch_start, 1); - - start->handle =3D sev->handle; - start->policy =3D sev->policy; if (sev->session_file) { if (sev_read_file_base64(sev->session_file, &session, &sz) < 0) { goto out; } - start->session_uaddr =3D (unsigned long)session; - start->session_len =3D sz; + start.session_uaddr =3D (unsigned long)session; + start.session_len =3D sz; } =20 if (sev->dh_cert_file) { if (sev_read_file_base64(sev->dh_cert_file, &dh_cert, &sz) < 0) { goto out; } - start->dh_uaddr =3D (unsigned long)dh_cert; - start->dh_len =3D sz; + start.dh_uaddr =3D (unsigned long)dh_cert; + start.dh_len =3D sz; } =20 - trace_kvm_sev_launch_start(start->policy, session, dh_cert); - rc =3D sev_ioctl(sev->sev_fd, KVM_SEV_LAUNCH_START, start, &fw_error); + trace_kvm_sev_launch_start(start.policy, session, dh_cert); + rc =3D sev_ioctl(sev->sev_fd, KVM_SEV_LAUNCH_START, &start, &fw_error); if (rc < 0) { error_report("%s: LAUNCH_START ret=3D%d fw_error=3D%d '%s'", __func__, ret, fw_error, fw_error_to_str(fw_error)); @@ -679,11 +677,10 @@ sev_launch_start(SevGuestState *sev) } =20 sev_set_guest_state(sev, SEV_STATE_LAUNCH_UPDATE); - sev->handle =3D start->handle; + sev->handle =3D start.handle; ret =3D 0; =20 out: - g_free(start); g_free(session); g_free(dh_cert); return ret; --=20 2.25.1 From nobody Wed May 15 16:37:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633973569555335.15454523631774; Mon, 11 Oct 2021 10:32:49 -0700 (PDT) Received: from localhost ([::1]:60234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZzAO-0005jE-9D for importer@patchew.org; Mon, 11 Oct 2021 13:32:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZz8U-0003gq-Up for qemu-devel@nongnu.org; Mon, 11 Oct 2021 13:30:51 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52476) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZz8Q-0001sg-7J for qemu-devel@nongnu.org; Mon, 11 Oct 2021 13:30:50 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19BHE5wt015997; Mon, 11 Oct 2021 13:30:41 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3bmfsuevcy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Oct 2021 13:30:40 -0400 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 19BH0fkl018572; Mon, 11 Oct 2021 13:30:40 -0400 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com with ESMTP id 3bmfsuevcj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Oct 2021 13:30:40 -0400 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 19BHDHI2015584; Mon, 11 Oct 2021 17:30:39 GMT Received: from b03cxnp07027.gho.boulder.ibm.com (b03cxnp07027.gho.boulder.ibm.com [9.17.130.14]) by ppma02wdc.us.ibm.com with ESMTP id 3bk2qahs4n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Oct 2021 17:30:39 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp07027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 19BHUbeh15270208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 Oct 2021 17:30:37 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C2A867805E; Mon, 11 Oct 2021 17:30:37 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 37E177807C; Mon, 11 Oct 2021 17:30:37 +0000 (GMT) Received: from amdrome3.watson.ibm.com (unknown [9.2.130.16]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Mon, 11 Oct 2021 17:30:37 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=xqrOaB1tSQt8ScnXdwklRnDgayqblurglwANibrXrLc=; b=lHeUx9AQxYuqHsOdzig2pBi0aMosh1cDvvb8a+jQitwiiJ8F4Juogg1S8bBKTjmijiWS sDkxCcbHF/703NLLhKMzmDRQ3GWM1OQX+7Fl12ddWp3Au5mejOq7bulF8jml5qNYMFvu cwvlWk+TT8s8KBtWoSNUT7feWTNDp7E9msPHl2fUVguOfDZdIMAIX+PrF4kV4jxuyaLr g2TVo4vRN9H4yTW2jrpku0mpjZ1PWvaOBzHFpuDYrA2rcVTFybpgjVrL2wMrktLzIPEf uQLvGwnP/VJht5lc6Tn7SabYuCsz2EIawwrKfoFeBQu121GV8RoX9C3DBkMmddmeUsqO 1A== From: Dov Murik To: qemu-devel@nongnu.org Subject: [PATCH 2/2] target/i386/sev: Use local variable for kvm_sev_launch_measure Date: Mon, 11 Oct 2021 17:30:26 +0000 Message-Id: <20211011173026.2454294-3-dovmurik@linux.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211011173026.2454294-1-dovmurik@linux.ibm.com> References: <20211011173026.2454294-1-dovmurik@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: gMLg5R0XBhdnOr3jVY-KeGJge-Twww9h X-Proofpoint-ORIG-GUID: GbEoxtjeZY7vP2tuM_7tGeASMDupvXIq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-11_05,2021-10-11_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 phishscore=0 mlxlogscore=999 spamscore=0 clxscore=1015 mlxscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110110101 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=dovmurik@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brijesh Singh , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , James Bottomley , "Dr. David Alan Gilbert" , Dov Murik , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633973570498100001 Content-Type: text/plain; charset="utf-8" The struct kvm_sev_launch_measure has a constant and small size, and therefore we can use a regular local variable for it instead of allocating and freeing heap memory for it. Signed-off-by: Dov Murik Reviewed-by: Dr. David Alan Gilbert --- target/i386/sev.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/target/i386/sev.c b/target/i386/sev.c index 0062566c71..eede07f11d 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -729,7 +729,7 @@ sev_launch_get_measure(Notifier *notifier, void *unused) SevGuestState *sev =3D sev_guest; int ret, error; g_autofree guchar *data =3D NULL; - g_autofree struct kvm_sev_launch_measure *measurement =3D NULL; + struct kvm_sev_launch_measure measurement =3D {}; =20 if (!sev_check_state(sev, SEV_STATE_LAUNCH_UPDATE)) { return; @@ -743,23 +743,21 @@ sev_launch_get_measure(Notifier *notifier, void *unus= ed) } } =20 - measurement =3D g_new0(struct kvm_sev_launch_measure, 1); - /* query the measurement blob length */ ret =3D sev_ioctl(sev->sev_fd, KVM_SEV_LAUNCH_MEASURE, - measurement, &error); - if (!measurement->len) { + &measurement, &error); + if (!measurement.len) { error_report("%s: LAUNCH_MEASURE ret=3D%d fw_error=3D%d '%s'", __func__, ret, error, fw_error_to_str(errno)); return; } =20 - data =3D g_new0(guchar, measurement->len); - measurement->uaddr =3D (unsigned long)data; + data =3D g_new0(guchar, measurement.len); + measurement.uaddr =3D (unsigned long)data; =20 /* get the measurement blob */ ret =3D sev_ioctl(sev->sev_fd, KVM_SEV_LAUNCH_MEASURE, - measurement, &error); + &measurement, &error); if (ret) { error_report("%s: LAUNCH_MEASURE ret=3D%d fw_error=3D%d '%s'", __func__, ret, error, fw_error_to_str(errno)); @@ -769,7 +767,7 @@ sev_launch_get_measure(Notifier *notifier, void *unused) sev_set_guest_state(sev, SEV_STATE_LAUNCH_SECRET); =20 /* encode the measurement value and emit the event */ - sev->measurement =3D g_base64_encode(data, measurement->len); + sev->measurement =3D g_base64_encode(data, measurement.len); trace_kvm_sev_launch_measurement(sev->measurement); } =20 --=20 2.25.1