From patchwork Wed Mar 13 08:46:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 1911563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=STSZYFMt; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=AHANtcU6; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tvkdy2jhRz1yWy for ; Wed, 13 Mar 2024 19:47:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LGhmGI0aoaAu4L5caL185VyX5Gf0XoIrRX/z6SoaAJg=; b=STSZYFMta2No7M Sv0iEeKkGZheJmaF0WXFVem6AizCnZ4sLTPOlFFmL3wIfhahAYiBlLXV0wSg6dUhgWHVWHDOAtqxR oMV1bgOtgXnV+csVAj9Suri89eJ7UBY8Rd269tsoCT/tNIw/nLIDF7qgWgJlpxmEoW05DPbPj+Q8v 5tQERUrtZGk7q3MGhm4JvNQRo4rYxMT8Lbs2AymCqzdJgOxrM71xSR7Ih0IE4NAU4cYhddoIaGayu KfYTy1kC1oFHiLi5aGQDtM24t7CVzHJmAB7rsMQgXKY45+o/x73+prY2RQgst8LQGdnmnr9wQHxi0 RwXln94/3Cla9QABI1Ow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkKGL-00000009MzX-03Co; Wed, 13 Mar 2024 08:47:01 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkKGH-00000009MxH-2LCG for kvm-riscv@lists.infradead.org; Wed, 13 Mar 2024 08:46:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0213661411; Wed, 13 Mar 2024 08:46:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B28B5C433F1; Wed, 13 Mar 2024 08:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710319616; bh=I/a5CY7CklhxoSRBI9p5ECF7P+sEaVbNTS5lYvVU4zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AHANtcU6JP1wSjmYydi91snTP3KX1rw/KN3Quplr4dKcwWuwUuBTFdOLDir/wYZML FPYwBVWkirjQQGRZgP00ycG3woTmgZQA/mK1m2dyMp4ax1kh8O1bAFX2JRcDw8lVhy N4DC99JmPx6+7lwOkdXvAh8p83SKqOdZeIU/JxIBossyr9Wu3nxsEJ1R5gj83gfeCD Dwj+6WgGO3eN3wDcrkeFjrBQOVbmPD390mR2KVH9Ve9dLo35bthmXDxuSF9LE9Im5I JY2hGze836JgzW+7+7N5ufdPl/tf4Ccfuan/avbPxXvWa2UN9McT0wDzMgxlXj3W8H ZZs49ZPQfcuyw== From: cem@kernel.org To: kvm-riscv@lists.infradead.org Cc: ajones@ventanamicro.com, tech-prs@lists.riscv.org Subject: [PATCH V2 4/6] riscv: Enable gen_report() to print the wrong value in case of failure Date: Wed, 13 Mar 2024 09:46:22 +0100 Message-ID: <20240313084644.277426-5-cem@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240313084644.277426-1-cem@kernel.org> References: <20240313084644.277426-1-cem@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240313_014657_886893_D4B86B57 X-CRM114-Status: UNSURE ( 9.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.5 (---) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Carlos Maiolino If the test fails because the expected value doesn't match, it's useful to know what value was actually printed. Signed-off-by: Carlos Maiolino --- V2: - Reduce subject to fit 70 chars - Use report_info() to output expected vs received values, leaving only necessary information for parsers [...] Content analysis details: (-3.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [2604:1380:4641:c500:0:0:0:1 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: kvm-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kvm-riscv" Errors-To: kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Carlos Maiolino If the test fails because the expected value doesn't match, it's useful to know what value was actually printed. Signed-off-by: Carlos Maiolino --- V2: - Reduce subject to fit 70 chars - Use report_info() to output expected vs received values, leaving only necessary information for parsers on report() riscv/sbi.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/riscv/sbi.c b/riscv/sbi.c index 76f6111d..bc0f5c68 100644 --- a/riscv/sbi.c +++ b/riscv/sbi.c @@ -25,10 +25,15 @@ static bool env_or_skip(const char *env) return true; } -static void gen_report(struct sbiret *ret, long expected) +static void gen_report(struct sbiret *ret, + long expected_error, long expected_value) { - report(!ret->error, "no sbi.error"); - report(ret->value == expected, "expected sbi.value"); + if (ret->value != expected_value) + report_info("expected (error: %ld, value: %ld), received: (error: %ld, value %ld)\n", + expected_error, expected_value, ret->error, ret->value); + + report(ret->error == expected_error, "expected sbi.error"); + report(ret->value == expected_value, "expected sbi.value"); } static void check_base(void) @@ -42,14 +47,14 @@ static void check_base(void) if (env_or_skip("MVENDORID")) { expected = strtol(getenv("MVENDORID"), NULL, 0); ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_GET_MVENDORID, 0, 0, 0, 0, 0, 0); - gen_report(&ret, expected); + gen_report(&ret, 0, expected); } report_prefix_pop(); report_prefix_push("probe_ext"); expected = getenv("PROBE_EXT") ? strtol(getenv("PROBE_EXT"), NULL, 0) : 1; ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_PROBE_EXT, SBI_EXT_BASE, 0, 0, 0, 0, 0); - gen_report(&ret, expected); + gen_report(&ret, 0, expected); report_prefix_pop(); report_prefix_push("marchid"); @@ -57,7 +62,7 @@ static void check_base(void) expected = strtol(getenv("MARCHID"), NULL, 0); ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_PROBE_EXT, SBI_EXT_BASE_GET_MARCHID, 0, 0, 0, 0, 0); - gen_report(&ret, expected); + gen_report(&ret, 0, expected); } report_prefix_pop();