From patchwork Tue Oct 31 18:48:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 13442187 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C017BC4167B for ; Tue, 31 Oct 2023 18:49:13 +0000 (UTC) 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:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=dqh57V4Fn9+X+7oD+DtYl/KOtJeH45qWT9/2dXEy4n0=; b=ZKJV23u3b/bpiv wuiIvy6PHOvBqwUVCs/KzdKvSAz0ExtHrgQT9OwpAsj+bnkLeKoAER/SbEfNdYACO2z/1c+FmqAZO VqEJsROg7RBdD8wcrFR5lQN8d8hzixhXXYy8fpJkD+B3oUteWy1SOD0BTXzjB/x+gmD1dRl4Dynf9 CiBaQ/3xU3nzw3OuL7qvL/rNCoKjDl45WBfqVpuLomgyg9u5nOXa/1nahXHlBmZpC2D0YUMVU1jUW nT3o4IDYOvG2IUUcK3dpThHL+nRvS6OOXdo9n70RJV4z+pnS5cy2ygCitPt3n/h9v/UkivfhNxA/1 2z/x5s396kVodqV8in4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qxtn5-005ykE-0q; Tue, 31 Oct 2023 18:48:39 +0000 Received: from out-188.mta1.migadu.com ([95.215.58.188]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qxtmz-005yjk-2T for linux-arm-kernel@lists.infradead.org; Tue, 31 Oct 2023 18:48:36 +0000 Date: Tue, 31 Oct 2023 11:48:20 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698778107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=F52dpzxQTPPk/FaCOWtBXUXkQp0gcrrYXYChduY6NvI=; b=xEhJ4no/xpHh1E7x2rGc8KVPqJqNHC6p7lvG5dtQyHFojFjOa9ZofLU38I7re2nFTkvtmI Y8ISoiSYMTcQQIv+Z3hLLxKtJxVW644xrIuc8mooSVaOgbhGWUYQb+Z4Ew2r0LuLJO+xZG ndXNu4y5qGLPrK7ggHCBM1EBztK4Yvg= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Paolo Bonzini Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, Marc Zyngier , James Morse , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Will Deacon , Jing Zhang , Raghavendra Rao Ananta , Vincent Donnefort , Kristina Martsenko , Miguel Luis Subject: [GIT PULL] KVM/arm64 updates for 6.7 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231031_114834_222813_B2B84A09 X-CRM114-Status: GOOD ( 21.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Paolo, Here's the pile of KVM/arm64 changes for 6.7. Almost all of these changes have been baking in -next for a while, although I did need to rebase to back out a broken change last minute. I'm only aware of a single (trivial) conflict with the arm64 tree resulting from a moved cpucap check, resolution below. Please pull. diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 49ce32d3d6f7..e5f75f1f1085 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1298,12 +1298,6 @@ static int kvm_vcpu_init_check_features(struct kvm_vcpu *vcpu, if (!test_bit(KVM_ARM_VCPU_EL1_32BIT, &features)) return 0; -<<<<<<< HEAD -======= - if (!cpus_have_final_cap(ARM64_HAS_32BIT_EL1)) - return -EINVAL; - ->>>>>>> arm64-upstream /* MTE is incompatible with AArch32 */ if (kvm_has_mte(vcpu->kvm)) return -EINVAL;