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 X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9754C43219 for ; Wed, 1 May 2019 16:17:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 98279208C3 for ; Wed, 1 May 2019 16:17:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="A7wqUAXH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98279208C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qcYZUo8wyY7G8ZEabu4VAyPl8Jh14C9HzFOXow1H0PY=; b=A7wqUAXHQ8V00r GsshJz/l8w687p218KPx/QIewenaHNqW5D8l6gVTRjEiaNy/WdW54pQPlBY6y8Ho8cHdor7Rqovhn nD6KOIqdC/TOMi6UsFTMu5FzxgXSSc0G4EYN0AOKOu3Rw1IxrUHQnyjTJ+tFWfLdoz+HnDB0nyyUb 4TEUSP/hsTvz9UTFu4TOiOhlh76hAkxh+ADDF10KAL4PKP505FyCV/V7Fm42GPrzcd8wKBHhYrvE/ EtMoSZ0Ks1jgIM+0gBRfkRRB//7ES3YgkbRawXBrqnSrYgHGjeLr8Y/cjdUDl7P+ETAfHaAXj8lDs PToKSM9E/6wEoQUJ1rRg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLrus-00062L-GM; Wed, 01 May 2019 16:17:06 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLrup-000622-94 for linux-arm-kernel@lists.infradead.org; Wed, 01 May 2019 16:17:04 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CE878A78; Wed, 1 May 2019 09:17:01 -0700 (PDT) Received: from fuggles.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7ED883F719; Wed, 1 May 2019 09:16:59 -0700 (PDT) Date: Wed, 1 May 2019 17:16:57 +0100 From: Will Deacon To: Kristina Martsenko Subject: Re: [PATCH] KVM: arm64: fix ptrauth ID register masking logic Message-ID: <20190501161657.GD28109@fuggles.cambridge.arm.com> References: <20190501161008.31498-1-kristina.martsenko@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190501161008.31498-1-kristina.martsenko@arm.com> User-Agent: Mutt/1.11.1+86 (6f28e57d73f2) () X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190501_091703_321012_C8B9C121 X-CRM114-Status: GOOD ( 12.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Julien Thierry , Marc Zyngier , Catalin Marinas , Suzuki K Poulose , Christoffer Dall , kvmarm@lists.cs.columbia.edu, James Morse , Amit Kachhap , Andrew Murray , Dave P Martin , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, May 01, 2019 at 05:10:08PM +0100, Kristina Martsenko wrote: > When a VCPU doesn't have pointer auth, we want to hide all four pointer > auth ID register fields from the guest, not just one of them. > > Fixes: 384b40caa8af ("KVM: arm/arm64: Context-switch ptrauth registers") > Reported-by: Andrew Murray > Fsck-up-by: Marc Zyngier Past tense is "fscked" ;) With that: Acked-by: Will Deacon Will > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 9d02643bc601..857b226bcdde 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -1088,10 +1088,10 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu, > if (id == SYS_ID_AA64PFR0_EL1 && !vcpu_has_sve(vcpu)) { > val &= ~(0xfUL << ID_AA64PFR0_SVE_SHIFT); > } else if (id == SYS_ID_AA64ISAR1_EL1 && !vcpu_has_ptrauth(vcpu)) { > - val &= ~(0xfUL << ID_AA64ISAR1_APA_SHIFT) | > - (0xfUL << ID_AA64ISAR1_API_SHIFT) | > - (0xfUL << ID_AA64ISAR1_GPA_SHIFT) | > - (0xfUL << ID_AA64ISAR1_GPI_SHIFT); > + val &= ~((0xfUL << ID_AA64ISAR1_APA_SHIFT) | > + (0xfUL << ID_AA64ISAR1_API_SHIFT) | > + (0xfUL << ID_AA64ISAR1_GPA_SHIFT) | > + (0xfUL << ID_AA64ISAR1_GPI_SHIFT)); > } > > return val; > -- > 2.11.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel