From nobody Fri May 17 19:53:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@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.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659354965; cv=none; d=zohomail.com; s=zohoarc; b=NhNH3p/OMmchRApQ/41W3WdqPg5j8lJwh3/LyTWaA/rjf/jSn/+uZPgpFMlsfsgsXV/COMGbkE1ihq34vIvouNqgk7EWEtxgV36qexdf4eHc6bwmGXHxc4imgDJlGQuFa/u0+A6j9nC7O9ZksLTXOaaJZaMjWl5AgPkJ1jR3lm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659354965; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Xuo/K03xmJTUEI1KpkpxuLvc1eOxhSu0kkLoGAO5y88=; b=YBaq3JqObmneaCCRB5q5A/MsB8Dh9t4bOG87ImPTK5rxJ1XAuyNjWiD4R9L6oUUa+PP1BEK2mZLGlzzCdJl98a8cyP/UywOq+96z14Lwtu509rRXBJyFi7CLpUfZQ4yAcSbR/RunbZNEPI+XLFaNCr3WnNuF2SJtJEywDtnCPMY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1659354965930247.96120480440686; Mon, 1 Aug 2022 04:56:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-563-GELF_C9DOZKid1aUqhG4hw-1; Mon, 01 Aug 2022 07:55:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 031571C1F1E5; Mon, 1 Aug 2022 11:55:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC5492026D64; Mon, 1 Aug 2022 11:54:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7D12B1946A44; Mon, 1 Aug 2022 11:54:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 44BDE1946A40 for ; Mon, 1 Aug 2022 11:54:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2776790A11; Mon, 1 Aug 2022 11:54:58 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id A06AB90A00 for ; Mon, 1 Aug 2022 11:54:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659354962; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Xuo/K03xmJTUEI1KpkpxuLvc1eOxhSu0kkLoGAO5y88=; b=OFtHpXiHuRz2ZaPewezJXTUO77oIfFW+a3PTHZOZTLL98VBvq2OYzwKzf6O7BLErCsVo3y MqBH7iHIxQY6sHRRYoYdFIHS+3WRWtkI+qbNMppSXvefeUhoZk+M0VTablt8gFffIgmIqK FABwB8dZKQFIK0AhVYzJH7FDhWvQgDs= X-MC-Unique: GELF_C9DOZKid1aUqhG4hw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] tpm: Refactor open-coded bitmap 'activePcrBanks' to virBitmap Date: Mon, 1 Aug 2022 13:54:56 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659354967624100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- Applies on top of Michal's series to fix 'activePcrBank' handling. src/conf/domain_conf.c | 17 +++++++++-------- src/conf/domain_conf.h | 2 +- src/qemu/qemu_tpm.c | 21 +++++++++------------ 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ddd6fe1c90..fccb29bc63 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3255,6 +3255,7 @@ void virDomainTPMDefFree(virDomainTPMDef *def) virObjectUnref(def->data.emulator.source); g_free(def->data.emulator.storagepath); g_free(def->data.emulator.logfile); + virBitmapFree(def->data.emulator.activePcrBanks); break; case VIR_DOMAIN_TPM_TYPE_LAST: break; @@ -10442,6 +10443,8 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, if ((nnodes =3D virXPathNodeSet("./backend/active_pcr_banks/*", ct= xt, &nodes)) < 0) break; + if (nnodes > 0) + def->data.emulator.activePcrBanks =3D virBitmapNew(0); for (i =3D 0; i < nnodes; i++) { if ((bank =3D virDomainTPMPcrBankTypeFromString((const char *)= nodes[i]->name)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -10449,7 +10452,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, nodes[i]->name); goto error; } - def->data.emulator.activePcrBanks |=3D (1 << bank); + virBitmapSetBitExpand(def->data.emulator.activePcrBanks, bank); } break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -20671,7 +20674,8 @@ virDomainTPMDefCheckABIStability(virDomainTPMDef *s= rc, return false; } - if (src->data.emulator.activePcrBanks !=3D dst->data.emulator.acti= vePcrBanks) { + if (!virBitmapEqual(src->data.emulator.activePcrBanks, + dst->data.emulator.activePcrBanks)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Target active PCR banks doesn't match source= ")); return false; @@ -24235,13 +24239,10 @@ virDomainTPMDefFormat(virBuffer *buf, } if (def->data.emulator.activePcrBanks) { g_auto(virBuffer) activePcrBanksBuf =3D VIR_BUFFER_INIT_CHILD(= &backendChildBuf); - size_t i; + ssize_t bank =3D -1; - for (i =3D VIR_DOMAIN_TPM_PCR_BANK_SHA1; i < VIR_DOMAIN_TPM_PC= R_BANK_LAST; i++) { - if ((def->data.emulator.activePcrBanks & (1 << i))) - virBufferAsprintf(&activePcrBanksBuf, "<%s/>\n", - virDomainTPMPcrBankTypeToString(i)); - } + while ((bank =3D virBitmapNextSetBit(def->data.emulator.active= PcrBanks, bank)) > -1) + virBufferAsprintf(&activePcrBanksBuf, "<%s/>\n", virDomain= TPMPcrBankTypeToString(bank)); virXMLFormatElement(&backendChildBuf, "active_pcr_banks", NULL= , &activePcrBanksBuf); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 200a75d705..724265b6b5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1451,7 +1451,7 @@ struct _virDomainTPMDef { unsigned char secretuuid[VIR_UUID_BUFLEN]; bool hassecretuuid; bool persistent_state; - unsigned int activePcrBanks; + virBitmap *activePcrBanks; } emulator; } data; }; diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index f28dd2e1e9..c08b0851da 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -444,19 +444,16 @@ qemuTPMEmulatorRunSetup(const char *storagepath, static char * -qemuTPMPcrBankBitmapToStr(unsigned int pcrBanks) +qemuTPMPcrBankBitmapToStr(virBitmap *activePcrBanks) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - const char *comma =3D ""; - size_t i; - - for (i =3D VIR_DOMAIN_TPM_PCR_BANK_SHA1; i < VIR_DOMAIN_TPM_PCR_BANK_L= AST; i++) { - if (pcrBanks & (1 << i)) { - virBufferAsprintf(&buf, "%s%s", - comma, virDomainTPMPcrBankTypeToString(i)); - comma =3D ","; - } - } + ssize_t bank =3D -1; + + while ((bank =3D virBitmapNextSetBit(activePcrBanks, bank)) > -1) + virBufferAsprintf(&buf, "%s,", virDomainTPMPcrBankTypeToString(ban= k)); + + virBufferTrim(&buf, ","); + return virBufferContentAndReset(&buf); } @@ -481,7 +478,7 @@ static int qemuTPMEmulatorReconfigure(const char *storagepath, uid_t swtpm_user, gid_t swtpm_group, - unsigned int activePcrBanks, + virBitmap *activePcrBanks, const char *logfile, const virDomainTPMVersion tpmversion, const unsigned char *secretuuid) --=20 2.36.1