Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0D7F9463 for ; Sun, 25 Jun 2023 23:07:51 +0000 (UTC) Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-39e86b3da59so2532736b6e.3 for ; Sun, 25 Jun 2023 16:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687734470; x=1690326470; 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=h7oWc9wSs7s043FQcLimHSRTeXEF/XHk5/+kEWBjS/c=; b=pqvibM9Ffgkw4ZAQyk1xHojANTwVtiIS5hRfZMFg52S8Cg0wwSe9XF0waWvOzUZ3uH +A4MGphX3vZX6zIK150E+uNRBcxpaZhVJezkqQBi3N4ac9p3LUlbYV2B2Fxp+uvrp0lP BvKQh2YbpRUqVtN69W7HbsMqNvuuqffL3MWT0WeLNoKGbI7dgy00IjtQ1bHmggIPSKYU y6eEVr9b6qMWTKR2DBwoikf2tmbvBdxK/PVhIfyvfQJ0zJogEnZ6LvOto3tFlel6qsk3 qRChWV7fbWA4uSBP7anYY924zkvKjQwNgjor+ykR3ndO6FBWl/LrW8PIuu3HnvDB9vSy 5tJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687734470; x=1690326470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h7oWc9wSs7s043FQcLimHSRTeXEF/XHk5/+kEWBjS/c=; b=Tqm+PoUfYRGuQHcS1Oq0CGeFOVaCEMfAFRHkjmM3qglc5IoHE/12ZRlN0Qxp3luxB4 vlq+EaZn5TmxMlORFyCQALMLQELuTRBA5NQZxL+PCZke2aXfUurb/iXiemMpY5SIQrwQ mi32dDJhqCev8K10dJgc03FyEendzPVM4YVbSrVSHkAqJnyx9f6VFek1J3uH6UtKxM/R fwvq81s+l84YcCFeRQ1NqxaWWjDZmhFrkMQ7BFayWBSyjbW0K7cxUf9DwaSBcGyEi2r3 yZuv0cN/m04Nl5BhJUQNjVU2SMuR70n3wGMQF1b4ISqdrchzIuGv7U3wzzvWrF7AQJec GULw== X-Gm-Message-State: AC+VfDy2bw6tV9ohrz52wcR3k9Uk1WqJzfeVsbUAKk1/4pb3MrBwjatm 97q0iuFmPvyjQUyW/s6EM20= X-Google-Smtp-Source: ACHHUZ5dqO0X8bwSvx9fSgWCyvTPMYV1XorM/j0fmfwzYYbEorfh1Fp3o54fEXtpwtHf66B12UfBkg== X-Received: by 2002:a05:6808:285:b0:3a1:b638:9c2c with SMTP id z5-20020a056808028500b003a1b6389c2cmr7607809oic.55.1687734470386; Sun, 25 Jun 2023 16:07:50 -0700 (PDT) Received: from sc9-mailhost1.vmware.com (c-24-6-216-183.hsd1.ca.comcast.net. [24.6.216.183]) by smtp.gmail.com with ESMTPSA id x20-20020aa79194000000b006668f004420sm2716397pfa.148.2023.06.25.16.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 16:07:49 -0700 (PDT) From: Nadav Amit X-Google-Original-From: Nadav Amit To: Andrew Jones Cc: kvmarm@lists.linux.dev, kvm@vger.kernel.org, Nikos Nikoleris , Paolo Bonzini , Nadav Amit Subject: [kvm-unit-tests PATCH v2 2/6] lib/stack: print base addresses on efi Date: Sun, 25 Jun 2023 23:07:12 +0000 Message-Id: <20230625230716.2922-3-namit@vmware.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230625230716.2922-1-namit@vmware.com> References: <20230625230716.2922-1-namit@vmware.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nadav Amit Making sense from dumped stacks when running EFI tests is very hard due to the relocation. Fix it by adjusting the address back to the original address. Introduce CONFIG_RELOC, which would be set on arm64 and on EFI configs. Signed-off-by: Nadav Amit --- v1->v2: Introduce CONFIG_RELOC to support ARM64 [Andrew] --- configure | 3 +++ lib/stack.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b665f7d..8a3c8fe 100755 --- a/configure +++ b/configure @@ -416,6 +416,9 @@ EOF if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then echo "TARGET=$target" >> config.mak fi +if [ "$efi" = "y" ] || [ "$arch" = "arm64" ]; then + echo "CONFIG_RELOC=y" >> config.mak +fi cat < lib/config.h #ifndef _CONFIG_H_ diff --git a/lib/stack.c b/lib/stack.c index bdb23fd..dd6bfa8 100644 --- a/lib/stack.c +++ b/lib/stack.c @@ -6,13 +6,38 @@ */ #include +#include #include #define MAX_DEPTH 20 +#ifdef CONFIG_RELOC +extern char _text, _etext; + +static bool base_address(const void *rebased_addr, unsigned long *addr) +{ + unsigned long ra = (unsigned long)rebased_addr; + unsigned long start = (unsigned long)&_text; + unsigned long end = (unsigned long)&_etext; + + if (ra < start || ra >= end) + return false; + + *addr = ra - start; + return true; +} +#else +static bool base_address(const void *rebased_addr, unsigned long *addr) +{ + *addr = (unsigned long)rebased_addr; + return true; +} +#endif + static void print_stack(const void **return_addrs, int depth, bool top_is_return_address) { + unsigned long addr; int i = 0; printf("\tSTACK:"); @@ -20,12 +45,14 @@ static void print_stack(const void **return_addrs, int depth, /* @addr indicates a non-return address, as expected by the stack * pretty printer script. */ if (depth > 0 && !top_is_return_address) { - printf(" @%lx", (unsigned long) return_addrs[0]); + if (base_address(return_addrs[0], &addr)) + printf(" @%lx", addr); i++; } for (; i < depth; i++) { - printf(" %lx", (unsigned long) return_addrs[i]); + if (base_address(return_addrs[i], &addr)) + printf(" %lx", addr); } printf("\n"); } -- 2.34.1