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 7E40EC352A1 for ; Tue, 6 Dec 2022 19:27:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbiLFT1x (ORCPT ); Tue, 6 Dec 2022 14:27:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbiLFT1o (ORCPT ); Tue, 6 Dec 2022 14:27:44 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7C9326DA for ; Tue, 6 Dec 2022 11:27:43 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 28385617A4 for ; Tue, 6 Dec 2022 19:27:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D4F0C433C1; Tue, 6 Dec 2022 19:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670354862; bh=Lw7xP4Yc04PzmCy078UrA43cqbrbxWLZTAM1UvQS0OU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=enGHd1j9qLJwQrgaY86qoxtRYq3MdaMJuvp++/TqAEfHO4ERoj3orahD8+n0zasxg HTJF3dPHVd3fM9lo5SVcz5AhVXMKUbSr8/nmBpimrcKtkcpDsBObAHyVIPluL1gk8P cIMpsKf1LXSwHL+w4BpKZTct7do3xMp36YELRL9NYexjBO+Zaoh4gXCMaaiXtaayNq ULomoN9dh14/GtEot6hw7J+IpVFswlSdoZ1q0khIgULQLjYgkZ4kzE8H2kHbGra0Qu q6IIg8d1g6eXet1f8Sh7moO8LzTPxgkMto9ll5Pk8Mr/33pu3sp/CrP66PmEJx6SFS 6M7Qrvtk4mWdA== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p2dbP-00Av4O-T7; Tue, 06 Dec 2022 19:27:39 +0000 Date: Tue, 06 Dec 2022 19:27:39 +0000 Message-ID: <86lenkl4d0.wl-maz@kernel.org> From: Marc Zyngier To: Paolo Bonzini Cc: Andrew Jones , Andrew Morton , Anshuman Khandual , Arnaldo Carvalho de Melo , Bagas Sanjaya , Ben Gardon , Catalin Marinas , Cornelia Huck , Fuad Tabba , Gavin Shan , Jakub Kicinski , James Morse , "Maciej S . Szmigiero" , Marek Szyprowski , Mark Brown , Mark Rutland , Oliver Upton , Peter Collingbourne , Peter Xu , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , Quentin Perret , Reiji Watanabe , Ricardo Koller , Ryan Roberts , Sean Christopherson , Steven Price , Usama Arif , Vincent Donnefort , Will Deacon , Zhiyuan Dai , Suzuki K Poulose , Alexandru Elisei , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvmarm@lists.linux.dev, kvm@vger.kernel.org Subject: Re: [GIT PULL] KVM/arm64 updates for 6.2 In-Reply-To: <3230b8bd-b763-9ad1-769b-68e6555e4100@redhat.com> References: <20221205155845.233018-1-maz@kernel.org> <3230b8bd-b763-9ad1-769b-68e6555e4100@redhat.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: pbonzini@redhat.com, andrew.jones@linux.dev, akpm@linux-foundation.org, anshuman.khandual@arm.com, acme@kernel.org, bagasdotme@gmail.com, bgardon@google.com, catalin.marinas@arm.com, cohuck@redhat.com, tabba@google.com, gshan@redhat.com, kuba@kernel.org, james.morse@arm.com, maciej.szmigiero@oracle.com, m.szyprowski@samsung.com, broonie@kernel.org, mark.rutland@arm.com, oliver.upton@linux.dev, pcc@google.com, peterx@redhat.com, philmd@linaro.org, qperret@google.com, reijiw@google.com, ricarkol@google.com, ryan.roberts@arm.com, seanjc@google.com, steven.price@arm.com, usama.arif@bytedance.com, vdonnefort@google.com, will@kernel.org, daizhiyuan@phytium.com.cn, suzuki.poulose@arm.com, alexandru.elisei@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvmarm@lists.linux.dev, kvm@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, 06 Dec 2022 17:41:21 +0000, Paolo Bonzini wrote: > > On 12/5/22 16:58, Marc Zyngier wrote: > > - There is a lot of selftest conflicts with your own branch, see: > > > > https://lore.kernel.org/r/20221201112432.4cb9ae42@canb.auug.org.au > > https://lore.kernel.org/r/20221201113626.438f13c5@canb.auug.org.au > > https://lore.kernel.org/r/20221201115741.7de32422@canb.auug.org.au > > https://lore.kernel.org/r/20221201120939.3c19f004@canb.auug.org.au > > https://lore.kernel.org/r/20221201131623.18ebc8d8@canb.auug.org.au > > > > for a rather exhaustive collection. > > Yeah, I saw them in Stephen's messages but missed your reply. > > In retrospect, at least Gavin's series for memslot_perf_test should have > been applied by both of us with a topic branch, but there's so many > conflicts all over the place that it's hard to single out one series. > It just happens. I generally queue things on topic branches for my own sanity, happy to make them available in the future. > > The only conflict in non-x86 code is the following one, please check > if I got it right. > > diff --git a/tools/testing/selftests/kvm/aarch64/page_fault_test.c b/tools/testing/selftests/kvm/aarch64/page_fault_test.c > index 05bb6a6369c2..0cda70bef5d5 100644 > --- a/tools/testing/selftests/kvm/aarch64/page_fault_test.c > +++ b/tools/testing/selftests/kvm/aarch64/page_fault_test.c > @@ -609,6 +609,8 @@ static void setup_memslots(struct kvm_vm *vm, struct test_params *p) > data_size / guest_page_size, > p->test_desc->data_memslot_flags); > vm->memslots[MEM_REGION_TEST_DATA] = TEST_DATA_MEMSLOT; > + > + ucall_init(vm, data_gpa + data_size); > } > static void setup_default_handlers(struct test_desc *test) > @@ -704,8 +706,6 @@ static void run_test(enum vm_guest_mode mode, void *arg) > setup_gva_maps(vm); > - ucall_init(vm, NULL); > - > reset_event_counts(); > /* > > > Special care is needed here because the test uses ____vm_create(). > > I haven't pushed to kvm/next yet to give you time to check, so the > merge is currently in kvm/queue only. There has been a couple of -next failures reported by broonie: https://lore.kernel.org/r/20221206175916.250104-1-broonie@kernel.org https://lore.kernel.org/r/20221206181506.252537-1-broonie@kernel.org which I think you've received as well. The second patch is definitely needed, but you've already solved the first one. At least things do build. > > > - For the 6.3 cycle, we are going to experiment with Oliver taking > > care of most of the patch herding. I'm sure he'll do a great job, > > but if there is the odd mistake, please cut him some slack and blame > > me instead. > > Absolutely - you both have all the slack you need, synchronization > is harder than it seems. Thanks, M. -- Without deviation from the norm, progress is not possible.