From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C5F55C433F5 for ; Tue, 31 May 2022 12:48:25 +0000 (UTC) Received: from localhost ([::1]:40842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nw1IO-0008MU-NW for qemu-devel@archiver.kernel.org; Tue, 31 May 2022 08:48:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nw19i-0007tz-VN for qemu-devel@nongnu.org; Tue, 31 May 2022 08:39:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nw19f-0007zK-LS for qemu-devel@nongnu.org; Tue, 31 May 2022 08:39:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654000762; 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: in-reply-to:in-reply-to:references:references; bh=oO+4id77hQDqv02Dgq9jEWQXvh27c0K5OZ/U5ceB1MI=; b=XtX+8rOrosKoksBsSYFb4WXWn+H/Z6ykgF3D/OMmSwGKtpGDfg1gW/aV4vim+Yp7i9LWAh ZWE4qbXTo7S1nsxxONHRuQQcj2JRkk8IRuQ11j+UU0LBirybUk8Ab6oKvwml9NrvjwlvUT bGGBsC1OiiMhReOtZ2G+4MZpGkGRFkc= Received: from mail-oa1-f69.google.com (mail-oa1-f69.google.com [209.85.160.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-604-ieSUlZrxOLax6rosTqQqbQ-1; Tue, 31 May 2022 08:39:21 -0400 X-MC-Unique: ieSUlZrxOLax6rosTqQqbQ-1 Received: by mail-oa1-f69.google.com with SMTP id 586e51a60fabf-f2af089a48so9336614fac.19 for ; Tue, 31 May 2022 05:39:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=oO+4id77hQDqv02Dgq9jEWQXvh27c0K5OZ/U5ceB1MI=; b=tdUwNjmTKDTmKlNtQbBLleluEx9Divau67P26Qr+Fx4aVHxhv/DWbFxHis+ca4Bqzt PrVwtRwTfH0tlQgSjIesiqZmh5zP5VpMqwEsqYHP7qZqT824iSBiFO/iDFXy2Nd7TRAW biuVqmc0A5nlzRIAmeyHHTXMMGAuGr2ZusiSCD49R4bO91k0W30f0I8mJACwwFUcn0kw 0O+Hn2iPpe4vpNWsUhpASA/iTRdWcncBohT4uCNSEahulDUwUZ4M54FOLqcbIRk34j0/ 0oejvuT4ntZ6bIuONDyL4K+iNovILNxmY0+2kLRSWAXvJefQQJLqsDFC8s+pyMOmPuYB Y0hQ== X-Gm-Message-State: AOAM532cwPW15FtS33MktN8ta3R2+y8AngonGX47gOl0/qe/rbd4MPKx Tke89JJMGTWbpqDvY2/cgyJAMQ84k3ejU0YNggUXnKZhm7v2BWgMuSWyBU6GlPVo07vHgtmww7v L7B5vX3Bfc2tuKB15ys9yRNmMuiavuBE= X-Received: by 2002:a05:6808:1719:b0:2f9:ab58:73db with SMTP id bc25-20020a056808171900b002f9ab5873dbmr12381954oib.201.1654000760213; Tue, 31 May 2022 05:39:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwN7IdEerRzAjeJC3phHk/AqmtzuRbV7FVD7W1In9qJrYH+W0IY0rAd68y3cwYDgKzOozeiXasL+2C87mSBTTw= X-Received: by 2002:a05:6808:1719:b0:2f9:ab58:73db with SMTP id bc25-20020a056808171900b002f9ab5873dbmr12381940oib.201.1654000759789; Tue, 31 May 2022 05:39:19 -0700 (PDT) MIME-Version: 1.0 References: <20220527165651.28092-1-jusual@redhat.com> <20220527165651.28092-3-jusual@redhat.com> In-Reply-To: From: Julia Suvorova Date: Tue, 31 May 2022 14:39:08 +0200 Message-ID: Subject: Re: [PATCH 2/5] bios-tables-test: teach test to use smbios 3.0 tables To: Ani Sinha Cc: QEMU Developers , "Michael S. Tsirkin" , Igor Mammedov Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsuvorov@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, May 30, 2022 at 8:11 AM Ani Sinha wrote: > > On Fri, May 27, 2022 at 10:27 PM Julia Suvorova wrote: > > > > Introduce the 64-bit entry point. Since we no longer have a total > > number of structures, stop checking for the new ones at the EOF > > structure (type 127). > > > > Signed-off-by: Julia Suvorova > > --- > > tests/qtest/bios-tables-test.c | 101 ++++++++++++++++++++++++--------- > > 1 file changed, 75 insertions(+), 26 deletions(-) > > > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > > index a4a46e97f0..0ba9d749a5 100644 > > --- a/tests/qtest/bios-tables-test.c > > +++ b/tests/qtest/bios-tables-test.c > > @@ -75,6 +75,14 @@ > > #define OEM_TEST_ARGS "-machine x-oem-id=" OEM_ID ",x-oem-table-id=" \ > > OEM_TABLE_ID > > > > +#define SMBIOS_VER21 0 > > +#define SMBIOS_VER30 1 > > + > > +typedef struct { > > + struct smbios_21_entry_point ep21; > > + struct smbios_30_entry_point ep30; > > +} smbios_entry_point; > > + > > typedef struct { > > bool tcg_only; > > const char *machine; > > @@ -88,8 +96,8 @@ typedef struct { > > uint64_t rsdp_addr; > > uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; > > GArray *tables; > > - uint32_t smbios_ep_addr; > > - struct smbios_21_entry_point smbios_ep_table; > > + uint64_t smbios_ep_addr[2]; > > + smbios_entry_point smbios_ep_table; > > uint16_t smbios_cpu_max_speed; > > uint16_t smbios_cpu_curr_speed; > > uint8_t *required_struct_types; > > @@ -533,10 +541,10 @@ static void test_acpi_asl(test_data *data) > > free_test_data(&exp_data); > > } > > > > -static bool smbios_ep_table_ok(test_data *data) > > +static bool smbios_ep2_table_ok(test_data *data) > > { > > - struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; > > - uint32_t addr = data->smbios_ep_addr; > > + struct smbios_21_entry_point *ep_table = &data->smbios_ep_table.ep21; > > + uint32_t addr = data->smbios_ep_addr[SMBIOS_VER21]; > > > > qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table)); > > if (memcmp(ep_table->anchor_string, "_SM_", 4)) { > > @@ -559,29 +567,59 @@ static bool smbios_ep_table_ok(test_data *data) > > return true; > > } > > > > -static void test_smbios_entry_point(test_data *data) > > +static bool smbios_ep3_table_ok(test_data *data) > > +{ > > + struct smbios_30_entry_point *ep_table = &data->smbios_ep_table.ep30; > > + uint64_t addr = data->smbios_ep_addr[SMBIOS_VER30]; > > + > > + qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table)); > > + if (memcmp(ep_table->anchor_string, "_SM3_", 5)) { > > + return false; > > + } > > + > > + if (acpi_calc_checksum((uint8_t *)ep_table, sizeof *ep_table)) { > > + return false; > > + } > > + > > + return true; > > +} > > + > > +static int test_smbios_entry_point(test_data *data) > > { > > uint32_t off; > > + bool found_ep2 = false, found_ep3 = false; > > > > /* find smbios entry point structure */ > > for (off = 0xf0000; off < 0x100000; off += 0x10) { > > - uint8_t sig[] = "_SM_"; > > + uint8_t sig[] = "_SM3_"; > > int i; > > > > for (i = 0; i < sizeof sig - 1; ++i) { > > sig[i] = qtest_readb(data->qts, off + i); > > } > > > > - if (!memcmp(sig, "_SM_", sizeof sig)) { > > + if (!found_ep2 && !memcmp(sig, "_SM_", sizeof sig - 2)) { > > /* signature match, but is this a valid entry point? */ > > - data->smbios_ep_addr = off; > > - if (smbios_ep_table_ok(data)) { > > - break; > > + data->smbios_ep_addr[SMBIOS_VER21] = off; > > + if (smbios_ep2_table_ok(data)) { > > + found_ep2 = true; > > + } > > + } else if (!found_ep3 && !memcmp(sig, "_SM3_", sizeof sig - 1)) { > > + data->smbios_ep_addr[SMBIOS_VER30] = off; > > + if (smbios_ep3_table_ok(data)) { > > + found_ep3 = true; > > } > > } > > + > > + if (found_ep2 || found_ep3) { > > + break; > > + } > > } > > > > - g_assert_cmphex(off, <, 0x100000); > > + g_assert_cmphex(data->smbios_ep_addr[SMBIOS_VER21], <, 0x100000); > > + g_assert_cmphex(data->smbios_ep_addr[SMBIOS_VER30], <, 0x100000); > > + > > + return found_ep3 ? SMBIOS_VER30 : SMBIOS_VER21; > > } > > > > static inline bool smbios_single_instance(uint8_t type) > > @@ -625,16 +663,23 @@ static bool smbios_cpu_test(test_data *data, uint32_t addr) > > return true; > > } > > > > -static void test_smbios_structs(test_data *data) > > +static void test_smbios_structs(test_data *data, int ver) > > { > > DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) = { 0 }; > > - struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; > > - uint32_t addr = le32_to_cpu(ep_table->structure_table_address); > > - int i, len, max_len = 0; > > + > > + smbios_entry_point *ep_table = &data->smbios_ep_table; > > + int i = 0, len, max_len = 0; > > uint8_t type, prv, crt; > > + uint64_t addr; > > + > > + if (ver == SMBIOS_VER21) { > > + addr = le32_to_cpu(ep_table->ep21.structure_table_address); > > + } else { > > + addr = le64_to_cpu(ep_table->ep30.structure_table_address); > > + } > > > > /* walk the smbios tables */ > > - for (i = 0; i < le16_to_cpu(ep_table->number_of_structures); i++) { > > + do { > > > > /* grab type and formatted area length from struct header */ > > type = qtest_readb(data->qts, addr); > > @@ -660,19 +705,23 @@ static void test_smbios_structs(test_data *data) > > } > > > > /* keep track of max. struct size */ > > - if (max_len < len) { > > + if (ver == SMBIOS_VER21 && max_len < len) { > > max_len = len; > > - g_assert_cmpuint(max_len, <=, ep_table->max_structure_size); > > + g_assert_cmpuint(max_len, <=, ep_table->ep21.max_structure_size); > > } > > > > /* start of next structure */ > > addr += len; > > - } > > > > - /* total table length and max struct size must match entry point values */ > > - g_assert_cmpuint(le16_to_cpu(ep_table->structure_table_length), ==, > > - addr - le32_to_cpu(ep_table->structure_table_address)); > > - g_assert_cmpuint(le16_to_cpu(ep_table->max_structure_size), ==, max_len); > > + } while (ver == SMBIOS_VER21 ? > > + (++i < le16_to_cpu(ep_table->ep21.number_of_structures)) : (type != 127)); > > This is quite an unreadable way to specify the loop condition. I > wonder if there is a better way to structure this. > Secondly, instead of hardcoding 127 why do we not say (type < SMBIOS_MAX_TYPE) ? Here we are looking for a special structure type 127. There can be up to 256 structure types, and they can be placed before the final structure. But it seems like we need to change SMBIOS_MAX_TYPE in the test. > > + > > + if (ver == SMBIOS_VER21) { > > + /* total table length and max struct size must match entry point values */ > > + g_assert_cmpuint(le16_to_cpu(ep_table->ep21.structure_table_length), ==, > > + addr - le32_to_cpu(ep_table->ep21.structure_table_address)); > > + g_assert_cmpuint(le16_to_cpu(ep_table->ep21.max_structure_size), ==, max_len); > > + } > > > > /* required struct types must all be present */ > > for (i = 0; i < data->required_struct_types_len; i++) { > > @@ -756,8 +805,8 @@ static void test_acpi_one(const char *params, test_data *data) > > * https://bugs.launchpad.net/qemu/+bug/1821884 > > */ > > if (!use_uefi) { > > - test_smbios_entry_point(data); > > - test_smbios_structs(data); > > + int ver = test_smbios_entry_point(data); > > + test_smbios_structs(data, ver); > > } > > > > qtest_quit(data->qts); > > -- > > 2.35.1 > > >