From nobody Fri May 17 03:39:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620803239; cv=none; d=zohomail.com; s=zohoarc; b=hBVDQk5RXtcFdTp4wDfKqkATFgAwK7GSwZrtGNw7/1uDxZ5WUBoT675NAtgf32Jfa7tWh1Ko8gXUbyWO2Ctn2WvwAFwxa1HQ682EUuI4Iu2Hnt6pgPw597ME/pzvufpHyW/eyYbIC3hWn8u+cj7j1YwOp0WBQEQ35CQJOZoA6RU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620803239; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=+WOfYdVRGGFXTGfPsi4NkvxnlL28c3Y4OEsAOzytlxo=; b=AdiAuehbrJXObmwI1mjm0d0eRd5HAn0UJq1aJ324BE4Uj4/ehDnsuuDJRXerViirk6vm5FxkUcQQktv1P/+Zy3P7jx1cuTZb5OZ0DIRzvRUb1vCIGBrVme+AQUHwPZFIVbQKe7L8Pnc+3Ok2vfatwRKaW6ab4upL57Sa6E3fA9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620803239687149.32469065336772; Wed, 12 May 2021 00:07:19 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-10-nP2N2VuKOcOLFDheaoN_tQ-1; Wed, 12 May 2021 03:07:16 -0400 Received: by mail-wm1-f69.google.com with SMTP id g206-20020a1c39d70000b029016ac627fbe9so613873wma.9 for ; Wed, 12 May 2021 00:07:16 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id i2sm35171165wro.0.2021.05.12.00.07.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 00:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620803238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WOfYdVRGGFXTGfPsi4NkvxnlL28c3Y4OEsAOzytlxo=; b=SOQuunLUkJsSkGsC2fN8K+QRmmH3SxwQ1Fb3k2bzZYaXhQor+aZgnu7wngica+gYUDMU/9 aRFHpDvCAa6JGSAX4jawUAjEf04GOXWHGTOC79bBGJ9+SnceKAVsu0jrEWecj9sIfVobyo j4P2EmHy4AMj58VoBXDvIbtf/eX6K8o= X-MC-Unique: nP2N2VuKOcOLFDheaoN_tQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+WOfYdVRGGFXTGfPsi4NkvxnlL28c3Y4OEsAOzytlxo=; b=ggLXCnQhM5dV2ZTVNKsnRmkKmPiiSP/g5aEk+igA99vUL6TU6mrcyS4LESpK3iH+qn ld0ccw1BbrzxgdsAaOdbVxQj7cQcM6tmbZ2hUn0UfPYlUg9hNFA6Fktw0iiLcbl5pKG6 xoiiTOOGmNmNA4jM6yM74Obz3vNQdppiwKe4mOaF3ZA5+QxKIAwkjG2TyY6SjV5lhQre d90298x3kTRN0cNLQSyW6Y6+RGtG7cTHeZrl6Eo89eZ1ABbqkEAE8uxdCekr671FFfU+ 1i6eyVTLeCI1+7Z0Sqie08jNPFU6Lh7eRYjqLWykEkuXPZc/+0B16ScwXS/AOXg6PW4c di6Q== X-Gm-Message-State: AOAM532XiwMq2ny+bC40T+volqYklpRiosO7VSzAkITlAwni+lSKsYs8 hZc8uATI1um2Vg1p6z16tLsZdiS8qkQZwKE3hWNw2FTECkkKC6dZ9ufQNfkMyQGsuaMFlk+jpu1 O+MqJH7akgMmUvg== X-Received: by 2002:a05:600c:2cd2:: with SMTP id l18mr13844007wmc.142.1620803235520; Wed, 12 May 2021 00:07:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKNw9EQ5nYfUPZ/q9G6qxX/cj+mGCOKf+69GWkQwHQP/PgD2zbT0QXiOvyP2tXiaUzuVB4vA== X-Received: by 2002:a05:600c:2cd2:: with SMTP id l18mr13843990wmc.142.1620803235335; Wed, 12 May 2021 00:07:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Berger , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger , Christophe de Dinechin Subject: [PATCH] backends/tpm: Replace qemu_mutex_lock calls with QEMU_LOCK_GUARD Date: Wed, 12 May 2021 09:07:13 +0200 Message-Id: <20210512070713.3286188-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Simplify the tpm_emulator_ctrlcmd() handler by replacing a pair of qemu_mutex_lock/qemu_mutex_unlock calls by the WITH_QEMU_LOCK_GUARD macro. Reviewed-by: Stefan Berger Reviewed-by: Christophe de Dinechin Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- backends/tpm/tpm_emulator.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index a012adc1934..e5f1063ab6c 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -30,6 +30,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/sockets.h" +#include "qemu/lockable.h" #include "io/channel-socket.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm_util.h" @@ -124,31 +125,26 @@ static int tpm_emulator_ctrlcmd(TPMEmulator *tpm, uns= igned long cmd, void *msg, uint32_t cmd_no =3D cpu_to_be32(cmd); ssize_t n =3D sizeof(uint32_t) + msg_len_in; uint8_t *buf =3D NULL; - int ret =3D -1; =20 - qemu_mutex_lock(&tpm->mutex); + WITH_QEMU_LOCK_GUARD(&tpm->mutex) { + buf =3D g_alloca(n); + memcpy(buf, &cmd_no, sizeof(cmd_no)); + memcpy(buf + sizeof(cmd_no), msg, msg_len_in); =20 - buf =3D g_alloca(n); - memcpy(buf, &cmd_no, sizeof(cmd_no)); - memcpy(buf + sizeof(cmd_no), msg, msg_len_in); - - n =3D qemu_chr_fe_write_all(dev, buf, n); - if (n <=3D 0) { - goto end; - } - - if (msg_len_out !=3D 0) { - n =3D qemu_chr_fe_read_all(dev, msg, msg_len_out); + n =3D qemu_chr_fe_write_all(dev, buf, n); if (n <=3D 0) { - goto end; + return -1; + } + + if (msg_len_out !=3D 0) { + n =3D qemu_chr_fe_read_all(dev, msg, msg_len_out); + if (n <=3D 0) { + return -1; + } } } =20 - ret =3D 0; - -end: - qemu_mutex_unlock(&tpm->mutex); - return ret; + return 0; } =20 static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_emu, --=20 2.26.3