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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A9EAC001E0 for ; Tue, 25 Jul 2023 12:45:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229496AbjGYMpD (ORCPT ); Tue, 25 Jul 2023 08:45:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230089AbjGYMpB (ORCPT ); Tue, 25 Jul 2023 08:45:01 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A26AC4 for ; Tue, 25 Jul 2023 05:44:59 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-98e39784a85so1388103866b.1 for ; Tue, 25 Jul 2023 05:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1690289098; x=1690893898; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=DVe5kbgnFh2Y4eGHfjCzHKbLu04TQkYMB7dsKJm3Umo=; b=GpcyljcjU7Qr5dRNNYfizZwrwBd4cnjkvyHTuvC/QsN3XiYBpHJim9y0Fwhwc12FfD aXUdwC4S44xNeyqhfcrwKMKZn14++9A7dS881Sg+Nm6Rp55TRzJuABW3jgcxoetQ82KS rdPHpg0b0w+Cu7zrIR6V80QMY49a17Up7GMpMri0hlbFbJ/e85dQN/8v9LUhnjzptMP2 I1rLEsN8NAbBHL6D2Z4ZsHzrPphtmuQjq1BmY4zHbzxWwUm57J72SMevDz7P6ChP9tkh 1bWV1k8SOuFyF7PNNO2I0iyrpY/3VczpraJ9h6dwsNUtCnP2hQGAMKzOgSjG1qKB+O+3 SQ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690289098; x=1690893898; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DVe5kbgnFh2Y4eGHfjCzHKbLu04TQkYMB7dsKJm3Umo=; b=PUenlkNft48lVXOaeQZplThIZWBWNiiI7oN4ZUQdjme6eZZY1k0r4iaoc+1xDHgEpX lpCHLu2oChTGDxxMIqwRlyPeIagU69337GqjTxV7Sz9mr/Qc+pZuPpYAOHWXnezGt53X UOg6SUiNb8pPBwREfz4CJEPuufeLSQJffArg9ccuYNQfXP3KgJ5leZzvBZ2JIyVDy97S FcDMit13NynvlrHHcwTejb6h27EEk/ixuljMAH4Ul1vAPnsdHnCtCQazfUnX+AFJx8fq 6qvSf/bKzZBwcCbZZVbQIGc9CVlme7bGa0fXx8K/Jf6DUtaXcnPRHj0UnOWsq9MOgE60 BfVA== X-Gm-Message-State: ABy/qLZ1JNidB9y4MCKo2gZqg0CBEVOgCIDagL8jv6riOaKDy1Fhjzjj KaeZWGtW9VWbLOlpECQZYcqvIA== X-Google-Smtp-Source: APBJJlGRSB+oOdzfbHk1XswFZQ6sXyZlhMpraB1keFiipvJqv7JZBaK38TlZAFpu/NEWGgF+T3sqfA== X-Received: by 2002:a17:906:5dd8:b0:99b:4d3d:c9b7 with SMTP id p24-20020a1709065dd800b0099b4d3dc9b7mr2464164ejv.31.1690289098120; Tue, 25 Jul 2023 05:44:58 -0700 (PDT) Received: from localhost (2001-1ae9-1c2-4c00-20f-c6b4-1e57-7965.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:20f:c6b4:1e57:7965]) by smtp.gmail.com with ESMTPSA id qp7-20020a170907206700b00992b66e54e9sm8134209ejb.214.2023.07.25.05.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 05:44:57 -0700 (PDT) Date: Tue, 25 Jul 2023 14:44:56 +0200 From: Andrew Jones To: Haibo Xu Cc: Haibo Xu , maz@kernel.org, oliver.upton@linux.dev, seanjc@google.com, Paolo Bonzini , Jonathan Corbet , Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , Shuah Khan , James Morse , Suzuki K Poulose , Zenghui Yu , Ricardo Koller , Vishal Annapurve , Vipin Sharma , David Matlack , Colton Lewis , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Subject: Re: [PATCH v6 06/13] KVM: arm64: selftests: Split get-reg-list test code Message-ID: <20230725-f5cf47c63abd8673d22b4936@orel> References: <1f25f27d1316bc91e1e31cd3d50a1d20f696759a.1690273969.git.haibo1.xu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org On Tue, Jul 25, 2023 at 04:50:36PM +0800, Haibo Xu wrote: > On Tue, Jul 25, 2023 at 4:37 PM Haibo Xu wrote: > > > > From: Andrew Jones > > > > Split the arch-neutral test code out of aarch64/get-reg-list.c into > > get-reg-list.c. To do this we invent a new make variable > > $(SPLIT_TESTS) which expects common parts to be in the KVM selftests > > root and the counterparts to have the same name, but be in > > $(ARCH_DIR). > > > > There's still some work to be done to de-aarch64 the common > > get-reg-list.c, but we leave that to the next patch to avoid > > modifying too much code while moving it. > > > > Signed-off-by: Andrew Jones > > Signed-off-by: Haibo Xu > > --- > > tools/testing/selftests/kvm/Makefile | 12 +- > > .../selftests/kvm/aarch64/get-reg-list.c | 367 +---------------- > > tools/testing/selftests/kvm/get-reg-list.c | 377 ++++++++++++++++++ > > 3 files changed, 398 insertions(+), 358 deletions(-) > > create mode 100644 tools/testing/selftests/kvm/get-reg-list.c > > > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > > index c692cc86e7da..95f180e711d5 100644 > > --- a/tools/testing/selftests/kvm/Makefile > > +++ b/tools/testing/selftests/kvm/Makefile > > @@ -140,7 +140,6 @@ TEST_GEN_PROGS_EXTENDED_x86_64 += x86_64/nx_huge_pages_test > > TEST_GEN_PROGS_aarch64 += aarch64/aarch32_id_regs > > TEST_GEN_PROGS_aarch64 += aarch64/arch_timer > > TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions > > -TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list > > TEST_GEN_PROGS_aarch64 += aarch64/hypercalls > > TEST_GEN_PROGS_aarch64 += aarch64/page_fault_test > > TEST_GEN_PROGS_aarch64 += aarch64/psci_test > > @@ -152,6 +151,7 @@ TEST_GEN_PROGS_aarch64 += access_tracking_perf_test > > TEST_GEN_PROGS_aarch64 += demand_paging_test > > TEST_GEN_PROGS_aarch64 += dirty_log_test > > TEST_GEN_PROGS_aarch64 += dirty_log_perf_test > > +TEST_GEN_PROGS_aarch64 += get-reg-list > > TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus > > TEST_GEN_PROGS_aarch64 += kvm_page_table_test > > TEST_GEN_PROGS_aarch64 += memslot_modification_stress_test > > @@ -181,6 +181,8 @@ TEST_GEN_PROGS_riscv += kvm_page_table_test > > TEST_GEN_PROGS_riscv += set_memory_region_test > > TEST_GEN_PROGS_riscv += kvm_binary_stats_test > > > > +SPLIT_TESTS += get-reg-list > > + > > TEST_PROGS += $(TEST_PROGS_$(ARCH_DIR)) > > TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH_DIR)) > > TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH_DIR)) > > @@ -228,11 +230,14 @@ LIBKVM_C_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_C)) > > LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S)) > > LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING)) > > LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ) > > +SPLIT_TESTS_TARGETS := $(patsubst %, $(OUTPUT)/%, $(SPLIT_TESTS)) > > +SPLIT_TESTS_OBJS := $(patsubst %, $(ARCH_DIR)/%.o, $(SPLIT_TESTS)) > > > > TEST_GEN_OBJ = $(patsubst %, %.o, $(TEST_GEN_PROGS)) > > TEST_GEN_OBJ += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED)) > > TEST_DEP_FILES = $(patsubst %.o, %.d, $(TEST_GEN_OBJ)) > > TEST_DEP_FILES += $(patsubst %.o, %.d, $(LIBKVM_OBJS)) > > +TEST_DEP_FILES += $(patsubst %.o, %.d, $(SPLIT_TESTS_OBJS)) > > -include $(TEST_DEP_FILES) > > > > $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): %: %.o > > @@ -240,7 +245,10 @@ $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): %: %.o > > $(TEST_GEN_OBJ): $(OUTPUT)/%.o: %.c > > $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ > > > > -EXTRA_CLEAN += $(LIBKVM_OBJS) $(TEST_DEP_FILES) $(TEST_GEN_OBJ) cscope.* > > +$(SPLIT_TESTS_TARGETS): %: %.o $(SPLIT_TESTS_OBJS) > > + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ > > + > > +EXTRA_CLEAN += $(LIBKVM_OBJS) $(TEST_DEP_FILES) $(TEST_GEN_OBJ) $(SPLIT_TESTS_OBJS) cscope.* > > > > x := $(shell mkdir -p $(sort $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ)))) > > $(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c > > Hi @Andrew Jones, > > After rebasing to v6.5-rc3, some changes are needed to the SPLIT_TESTS > target, or the make would fail. > Please help have a look. > I took a look and then remembered why I hate looking at Makefiles... I guess it's fine, but it's a pity we need to repeat the $(CC) line. Thanks, drew