Re: [PATCH v2 0/2] KVM: selftests: Use $(SRCARCH) and share definition with top-level Makefile

From: Sean Christopherson <seanjc@google.com>
To: David Matlack <dmatlack@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Albert Ou <aou@eecs.berkeley.edu>,
	 Alexandre Ghiti <alex@ghiti.fr>,
	kvm@vger.kernel.org, linux-riscv@lists.infradead.org,
	 Muhammad Usama Anjum <usama.anjum@collabora.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	 Paul Walmsley <paul.walmsley@sifive.com>
Subject: Re: [PATCH v2 0/2] KVM: selftests: Use $(SRCARCH) and share definition with top-level Makefile
Date: Tue, 7 Oct 2025 09:40:56 -0700	[thread overview]
Message-ID: <aOVCmIu0Dv7vJ0M5@google.com> (raw)
In-Reply-To: <CALzav=c0Wgcc60_dGJuYffS3f3vD9mpdSjFguaE00L1Zr-YcbA@mail.gmail.com>

On Mon, Sep 15, 2025, David Matlack wrote:
> On Thu, Jul 24, 2025 at 2:31 PM David Matlack <dmatlack@google.com> wrote:
> >
> > This series switches the KVM selftests Makefile to use $(SRCARCH)
> > instead of $(ARCH) to fix a build issue when ARCH=x86_64 is specified on
> > the command line.
> >
> > v1: https://lore.kernel.org/kvm/20250430224720.1882145-1-dmatlack@google.com/
> >  - Split out the revert of commit 9af04539d474 ("KVM: selftests:
> >    Override ARCH for x86_64 instead of using ARCH_DIR") from the rename
> >    to SRCARCH
> >
> > David Matlack (2):
> >   Revert "KVM: selftests: Override ARCH for x86_64 instead of using
> >     ARCH_DIR"
> >   KVM: selftests: Rename $(ARCH_DIR) to $(SRCARCH)
> 
> Gentle ping. Paolo and Sean do you think this could get merged
> upstream at some point?
> 
> Google's kernel build tools unconditionally set ARCH=x86_64 when
> building selftests, which causes the KVM selftests to fail to build.

I'm pretty sure we can simply override the user.  Does this fix things on your
end?

diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index d9fffe06d3ea..f2b223072b62 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -6,7 +6,7 @@ ARCH            ?= $(SUBARCH)
 ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64 loongarch))
 # Top-level selftests allows ARCH=x86_64 :-(
 ifeq ($(ARCH),x86_64)
-       ARCH := x86
+       override ARCH := x86
 endif
 include Makefile.kvm
 else
