From nobody Tue Apr 7 20:08:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773289103; cv=none; d=zohomail.com; s=zohoarc; b=j6mFjgtdOV0PgP7IpG38HH6FglTZnMhJTf/L7Fr2mmQtRvilKp5vpR3lrS2t1wWehvwCKuegG2VTE+l9/sZI5ui83j8TUy/UlBY1bKYZVQzbB0c+HzahjOxkZ8fjDGQXe2JbuNzj4N5OGzDYIskmX/0GrRWiwKp41gAxzj5PAtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773289103; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IxzOKiF8RPBv/6bl3AO49sH9RYZ73DNdYBieKZ2Pg+Y=; b=E4XcuyxVuzW19RiAJplIDd+TWP3rDH9vMVtkL9AFL+DlbNP8nB6ydZu65owQovEONxUQgrjFWXvL6eNbrm21vZ+axNhEQvjeo9He52lzG1yf5jXOt3X/hO+QkVtpM+qU/AouvLfkEhb6CHlQLsz19Pavr7ZNPYt4uSsnhqMMOMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773289103929551.7693902223235; Wed, 11 Mar 2026 21:18:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0XUL-00009e-Pl; Thu, 12 Mar 2026 00:17:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0XU9-00007v-Pd for qemu-devel@nongnu.org; Thu, 12 Mar 2026 00:17:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0XU7-0008No-KE for qemu-devel@nongnu.org; Thu, 12 Mar 2026 00:17:21 -0400 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-394-fsb07u6wO0yetgQnrJ8BCQ-1; Thu, 12 Mar 2026 00:17:16 -0400 Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c70ea91bfe1so345081a12.1 for ; Wed, 11 Mar 2026 21:17:16 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.110.66]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c73cdf0e498sm3634490a12.3.2026.03.11.21.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 21:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773289037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IxzOKiF8RPBv/6bl3AO49sH9RYZ73DNdYBieKZ2Pg+Y=; b=WgZnkgNGTx5MdGbporyysRYnduqtgYGmJ6hHtxfCoeGFbpAJZhjqjAHXFFbZ0VOEyiEwZI KsfxdwaBbXEf7NMYxW1eb9hwiOfFZIFLwwmty3BNF3MjJeKLJdOi5kDh/iD6eVpCcc7RLJ xDkSmYOEbguzp0skCwlctGW9Fh+k3Sc= X-MC-Unique: fsb07u6wO0yetgQnrJ8BCQ-1 X-Mimecast-MFC-AGG-ID: fsb07u6wO0yetgQnrJ8BCQ_1773289036 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773289035; x=1773893835; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IxzOKiF8RPBv/6bl3AO49sH9RYZ73DNdYBieKZ2Pg+Y=; b=BfQ8axE44rBCsBEB4tuzTaApZSWgvJM4ME2MKlCq1YMgKD+PlpcZbVxZt8dBz8Mnea jYzyk0s1jnjGhRGs/Rlv1m7HUOnpbCMDBIaKXTNMuLRDCar+I9wJ+k94QukbGHYGcufJ rCDPCJNVoJlWec/7ZWmoLMrdD91fYkcrpuq4SlbPkd9qFjND7l221TTcuTBP+qBOEy93 uSuYXYxWcxBSB+p4gKqd78NttdM+Lt5JGRn0ka3Ks8fY2h7WY6rrpG54zS/IN99Qb0vx nM/mJaFo7yX1USI457EwfIuC/i0KIEKeHN1nnBZjsRgNWjQHn6Uy/68rZdZl1jjauI84 yI8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773289035; x=1773893835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IxzOKiF8RPBv/6bl3AO49sH9RYZ73DNdYBieKZ2Pg+Y=; b=TrVXu7jZgm0pQu/sLT6uKURXG3PzwxRWOplRZAlcydeNFL6PfuIsGk1YbhYGJaNmZ6 9qmaiiqQRLRCo4X+5NjmXc2QUDPO64a5JBPvz8U8tcB4nJoTgK/BSfTweK0URutpXfWW x1PyCh5uF/HpAEtYfqKkfyBMLUKPrOYRIXVadmlu/MTsl8YvmTbE4jzqbtW0WILS7SJl 0dz3fBfQM9Wuxd0XiGsx/3VaiWIJo4LdDn2kSBSLUI+OLJF72RRCUMGDxruqr3YvuRiY vQq0pck0xxKGnxKVwYPLnvZQe2qesblR+e1bMJcWG93Pj27navcty8vmPQeQKFMgUd8V Nu+w== X-Gm-Message-State: AOJu0YzU2/ruqIBfcZHA9lJdi3E78oV7BgMlE0ufou9yqilNimghOzQ3 8dUKlGjc1hokliVSQZnL6nFpJqWBwvoAHf03UPE6M2DUa4gy0AFUvBcyneLk1umWpcr6lV+kT66 20wEcnxJ+g6sPwcRhHpRohc35jwVU1UDEMtl5GOc32sC2vamlSz4XSNXEg9lN1eNBzrj94UwWs1 J5keji7gFymx8O2hfSy9T+LEi3dC7zC/B5kP+981g= X-Gm-Gg: ATEYQzy9NNcmPXWI1ZSRi0IDGgu5w05nnq4LiC23Mx79oLZIFKNGCovp+hxXm95vfkD xmKl4YYECh9vlXt7ElFSAz8iu97heINon9TfcZGmwdEoN2Sb9cqLMlwFOt0ZcYGSP9f6UBLgvse ZmjMJVWHTQAkyo7dUC/zJtjAYDCijDISgnSZdD2UQzhMPQsZQSDQLJ2Q0o2ICyZpWHXi/CaG5Kg vj89XA5ZSED8xpNdEPRL0q9Q/5NLcmVxaWZFATWWej/XRM+7oCRhOm1cJVsB1+6yfUrSrCFGQbN o5fYEra28UXfNXGXzXQE7sVwcvalAo39d8qqUMiCOuuW6nUXMC3wFXJG+4rHNVyNsZe+IrSaHdo Nm2uDWMMhmK7yNkWxfm+lsHiK/K+F3msSq2JbQQNu/rJWInjUDwinPzJlOfyDfg== X-Received: by 2002:a05:6a21:1309:b0:38e:9220:ebbe with SMTP id adf61e73a8af0-398c5f49f5dmr4698944637.23.1773289035301; Wed, 11 Mar 2026 21:17:15 -0700 (PDT) X-Received: by 2002:a05:6a21:1309:b0:38e:9220:ebbe with SMTP id adf61e73a8af0-398c5f49f5dmr4698918637.23.1773289034799; Wed, 11 Mar 2026 21:17:14 -0700 (PDT) From: Arun Menon To: qemu-devel@nongnu.org Cc: Stefan Berger , Ani Sinha , Paolo Bonzini , marcandre.lureau@redhat.com, Fabiano Rosas , Laurent Vivier , "Michael S. Tsirkin" , Igor Mammedov , Arun Menon Subject: [RFC 5/5] test/qtest: Add test for tpm crb chunking Date: Thu, 12 Mar 2026 09:46:50 +0530 Message-ID: <20260312041650.181411-6-armenon@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260312041650.181411-1-armenon@redhat.com> References: <20260312041650.181411-1-armenon@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=armenon@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773289105959154100 Content-Type: text/plain; charset="utf-8" - New test case added to the swtpm test. Data is written and read from the buffer in chunks. - The chunk size is dynamically calculated by reading the CRB_CTRL_CMD_SIZE address. This can be changed manually to test. - Add a helper function tpm_wait_till_bit_clear() Signed-off-by: Arun Menon --- tests/qtest/tpm-crb-swtpm-test.c | 10 +++ tests/qtest/tpm-util.c | 106 ++++++++++++++++++++++++++----- tests/qtest/tpm-util.h | 5 ++ 3 files changed, 106 insertions(+), 15 deletions(-) diff --git a/tests/qtest/tpm-crb-swtpm-test.c b/tests/qtest/tpm-crb-swtpm-t= est.c index ffeb1c396b..050c7b0c1f 100644 --- a/tests/qtest/tpm-crb-swtpm-test.c +++ b/tests/qtest/tpm-crb-swtpm-test.c @@ -33,6 +33,14 @@ static void tpm_crb_swtpm_test(const void *data) "tpm-crb", NULL); } =20 +static void tpm_crb_chunk_swtpm_test(const void *data) +{ + const TestState *ts =3D data; + + tpm_test_swtpm_test(ts->src_tpm_path, tpm_util_crb_chunk_transfer, + "tpm-crb", NULL); +} + static void tpm_crb_swtpm_migration_test(const void *data) { const TestState *ts =3D data; @@ -54,6 +62,8 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); =20 qtest_add_data_func("/tpm/crb-swtpm/test", &ts, tpm_crb_swtpm_test); + qtest_add_data_func("/tpm/crb-chunk-swtpm/test", &ts, + tpm_crb_chunk_swtpm_test); qtest_add_data_func("/tpm/crb-swtpm-migration/test", &ts, tpm_crb_swtpm_migration_test); ret =3D g_test_run(); diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c index 2cb2dd4796..0a861a9e69 100644 --- a/tests/qtest/tpm-util.c +++ b/tests/qtest/tpm-util.c @@ -14,16 +14,42 @@ =20 #include "qemu/osdep.h" #include +#include "system/memory.h" =20 #include "hw/acpi/tpm.h" #include "libqtest.h" #include "tpm-util.h" #include "qobject/qdict.h" =20 +#define CRB_ADDR_START (TPM_CRB_ADDR_BASE + A_CRB_CTRL_START) +#define CRB_CTRL_STS (TPM_CRB_ADDR_BASE + A_CRB_CTRL_STS) +#define CRB_CTRL_CMD_SIZE (TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_SIZE) + +#define BIT_START_INVOKE (1 << 0) +#define BIT_RETRY_RESPONSE (1 << 1) +#define BIT_NEXT_CHUNK (1 << 2) + +void tpm_wait_till_bit_clear(QTestState *s, uint64_t addr, uint32_t mask) +{ + uint32_t sts; + uint64_t end_time =3D g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; + + while (true) { + sts =3D qtest_readl(s, addr); + if ((sts & mask) =3D=3D 0) { + break; + } + if (g_get_monotonic_time() >=3D end_time) { + break; + } + } +} + void tpm_util_crb_transfer(QTestState *s, const unsigned char *req, size_t req_size, unsigned char *rsp, size_t rsp_size) { + uint32_t tpmSts; uint64_t caddr =3D qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_L= ADDR); uint64_t raddr =3D qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_RSP_A= DDR); =20 @@ -31,24 +57,74 @@ void tpm_util_crb_transfer(QTestState *s, =20 qtest_memwrite(s, caddr, req, req_size); =20 - uint32_t sts, start =3D 1; - uint64_t end_time =3D g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; - qtest_writel(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_START, start); - while (true) { - start =3D qtest_readl(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_START); - if ((start & 1) =3D=3D 0) { - break; + qtest_writel(s, CRB_ADDR_START, BIT_START_INVOKE); + tpm_wait_till_bit_clear(s, CRB_ADDR_START, BIT_START_INVOKE); + + tpmSts =3D qtest_readl(s, CRB_CTRL_STS); + g_assert_cmpint(tpmSts & 1, =3D=3D, 0); + + qtest_memread(s, raddr, rsp, rsp_size); +} + +void tpm_util_crb_chunk_transfer(QTestState *s, + const unsigned char *req, size_t req_size, + unsigned char *rsp, size_t rsp_size) +{ + uint32_t tpmSts; + + uint64_t caddr =3D qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_L= ADDR); + uint64_t raddr =3D qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_RSP_A= DDR); + uint32_t crb_ctrl_cmd_size =3D qtest_readl(s, CRB_CTRL_CMD_SIZE); + + size_t chunk_size =3D crb_ctrl_cmd_size; + + qtest_writeb(s, TPM_CRB_ADDR_BASE + A_CRB_LOC_CTRL, 1); + + for (size_t i =3D 0 ; i < req_size; i +=3D chunk_size) { + bool last_chunk =3D false; + size_t current_chunk_size =3D chunk_size ; + + if (i + chunk_size > req_size) { + last_chunk =3D true; + current_chunk_size =3D req_size - i; } - if (g_get_monotonic_time() >=3D end_time) { - break; + + qtest_memwrite(s, caddr, req + i, current_chunk_size); + + if (last_chunk) { + qtest_writel(s, CRB_ADDR_START , BIT_START_INVOKE); + tpm_wait_till_bit_clear(s, CRB_ADDR_START, BIT_START_INVOKE); + } else { + qtest_writel(s, CRB_ADDR_START , BIT_NEXT_CHUNK); + tpm_wait_till_bit_clear(s, CRB_ADDR_START, BIT_NEXT_CHUNK); } - }; - start =3D qtest_readl(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_START); - g_assert_cmpint(start & 1, =3D=3D, 0); - sts =3D qtest_readl(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_STS); - g_assert_cmpint(sts & 1, =3D=3D, 0); + } + tpmSts =3D qtest_readl(s, CRB_CTRL_STS); + g_assert_cmpint(tpmSts & 1, =3D=3D, 0); =20 - qtest_memread(s, raddr, rsp, rsp_size); + /* + * Read response in chunks + */ + + unsigned char header[10]; + qtest_memread(s, raddr, header, sizeof(header)); + + uint32_t actual_response_size =3D ldl_be_p(&header[2]); + + if (actual_response_size > rsp_size) { + actual_response_size =3D rsp_size; + } + + for (size_t i =3D 0; i < actual_response_size; i +=3D chunk_size) { + size_t to_read =3D i + chunk_size > actual_response_size + ? (actual_response_size - i) + : chunk_size; + if (i > 0) { + qtest_writel(s, CRB_ADDR_START, BIT_NEXT_CHUNK); + tpm_wait_till_bit_clear(s, CRB_ADDR_START, BIT_NEXT_CHUNK); + } + qtest_memread(s, raddr, rsp + i, to_read); + } } =20 void tpm_util_startup(QTestState *s, tx_func *tx) diff --git a/tests/qtest/tpm-util.h b/tests/qtest/tpm-util.h index 0cb28dd6e5..681544e7d8 100644 --- a/tests/qtest/tpm-util.h +++ b/tests/qtest/tpm-util.h @@ -24,10 +24,15 @@ typedef void (tx_func)(QTestState *s, const unsigned char *req, size_t req_size, unsigned char *rsp, size_t rsp_size); =20 +void tpm_wait_till_bit_clear(QTestState *s, uint64_t addr, uint32_t mask); void tpm_util_crb_transfer(QTestState *s, const unsigned char *req, size_t req_size, unsigned char *rsp, size_t rsp_size); =20 +void tpm_util_crb_chunk_transfer(QTestState *s, + const unsigned char *req, size_t req_size, + unsigned char *rsp, size_t rsp_size); + void tpm_util_startup(QTestState *s, tx_func *tx); void tpm_util_pcrextend(QTestState *s, tx_func *tx); void tpm_util_pcrread(QTestState *s, tx_func *tx, --=20 2.53.0