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 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 2DF9FC61DB3 for ; Sat, 7 Jan 2023 09:54:39 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Lq60dFzVkomVbxFLh+DYFlv6zAA8/xy2uIU/C7HCV1U=; b=3G8bj2FStHbcOA 2YsLiE0DTQnRGFEdIh05F6qGyrMX3GVcKPTRdjCXJckVVaH7eLY7osg9wrEUfFLvH9MDVQEnTTGzx MR15ExBqCvCq+Bm6uluVFxF2EYFI+WyHiXjgRqzayRxI8hCs2u6fflkL1JeDOAixSsciSx9sIqoRo iDYxNsse8zpGUOBVtKgFwOF94aE7gE82kPKhq6W5SB8mNIy6mUmaPBvNKqz1LjDOgz+e0vKDtmStL uCJ/9IBveGNTsQxL7Ji4RvjjXPFLvz3pa1FyXikzLEbpkwMQhbQQECIHc25pWwTYzvtqAsdBP64sq tV5AGX02CZBWwhxSTU0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pE5tS-003zOf-GM; Sat, 07 Jan 2023 09:53:38 +0000 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pE5tP-003zLV-JV for linux-arm-kernel@lists.infradead.org; Sat, 07 Jan 2023 09:53:36 +0000 Received: by mail-pl1-x62c.google.com with SMTP id c4so4256373plc.5 for ; Sat, 07 Jan 2023 01:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZvpXpT1Ky1e5AYlFd/MAc5bKweGcXE3957nMDydsC48=; b=D95m4YQXS8WHfRC3jEEq7PHeAUm47ibQ9hLFdTpWAfsKicrq1c4eoEWt64dkl+HlZ/ DimaYNWNHmj7Eqy67H0VHcCyHZWfazX9EMjd3mAtzYJee8uW75ZNKmaJf5aPfgTYBOvN ITZJuqIJ/LocP15/MBe+jupY7ApZ/GH5SkJdLmX6oa3pAUd2Rgpa+02Hn+IX52KR8fiW JjEd3nwhuj+cmwoQWPzLznkXXkcpYaMOR2n5JELfgPB7Cm6nc3asBM/QyJk40brNywqu OH05M6x730rLUKVuEiWAtE54j0KnQ0W9V2xtvCmRMWkWZEz0SFsUZiFYxikIJV6ePkRi 2psA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZvpXpT1Ky1e5AYlFd/MAc5bKweGcXE3957nMDydsC48=; b=mW34Y0TvpJu9FG7kK59xBw5JXGQM+DmiTcsP4sUizs3nMuZBBNjAmEsC2BDhc5hse4 KH/w4gh5dA7rr/C3Hh+QljsZGqzupiloDd4N3Hkt+GXNMwv3BEuw7C23yPnNBBfmy/kE gdSIgKzFJSikz3rZWsXQrfs8ihCo6ou/Rb0MbVylBMPC2g5NFQ0NhkvR8AFKexqZrjNV PaofE34sk4AHbNo40jm/3fVbtIveTSdA2jCdrEF/7bLHVis1dEHdbQZ0MLe2oqv3MZRX z0DuobFI5baOddMQ7iZ3aGCnuQdaXqnDJ9XMxaZLc3QMzdXga20uVH5CYWcDG/Re7oiB q0gQ== X-Gm-Message-State: AFqh2kqAeFl+zFFzsiSfGGJ92tW2524YtbpYbfOFCPigLOVUiG3Mcogt bv16mfzy68jWuqWJHu/lNkdGmQ== X-Google-Smtp-Source: AMrXdXv5SBuUSPC6/xJKA93nQCS9A3SD15xbEP57fF5p/kQgc/6pznyw9eQ6sulp/19xM9s9+7LjQw== X-Received: by 2002:a17:90b:23c8:b0:226:db61:c8ae with SMTP id md8-20020a17090b23c800b00226db61c8aemr6318211pjb.20.1673085213573; Sat, 07 Jan 2023 01:53:33 -0800 (PST) Received: from ?IPV6:2400:4050:a840:1e00:d54:e521:8bac:7bed? ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id i7-20020a655b87000000b0049f476e9906sm2074487pgr.53.2023.01.07.01.53.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 07 Jan 2023 01:53:33 -0800 (PST) Message-ID: Date: Sat, 7 Jan 2023 18:53:28 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH v5 6/7] KVM: arm64: Mask FEAT_CCIDX To: Oliver Upton Cc: Mark Brown , Marc Zyngier , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Mathieu Poirier , Suzuki K Poulose , Alexandru Elisei , James Morse , Will Deacon , Catalin Marinas , asahi@lists.linux.dev, Alyssa Rosenzweig , Sven Peter , Hector Martin References: <20221230095452.181764-1-akihiko.odaki@daynix.com> <20221230095452.181764-7-akihiko.odaki@daynix.com> Content-Language: en-US From: Akihiko Odaki In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230107_015335_693926_FB52AEDA X-CRM114-Status: GOOD ( 19.14 ) 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2023/01/06 7:22, Oliver Upton wrote: > On Fri, Dec 30, 2022 at 06:54:51PM +0900, Akihiko Odaki wrote: >> The CCSIDR access handler masks the associativity bits according to the >> bit layout for processors without FEAT_CCIDX. KVM also assumes CCSIDR is >> 32-bit where it will be 64-bit if FEAT_CCIDX is enabled. Mask FEAT_CCIDX >> so that these assumptions hold. >> >> Suggested-by: Marc Zyngier >> Signed-off-by: Akihiko Odaki > > FYI, I'm an idiot and replied to v4 of this patch... Forwarding comments > below: > >> --- >> arch/arm64/kvm/sys_regs.c | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> >> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c >> index f4a7c5abcbca..aeabf1f3370b 100644 >> --- a/arch/arm64/kvm/sys_regs.c >> +++ b/arch/arm64/kvm/sys_regs.c >> @@ -1124,6 +1124,12 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu, struct sys_reg_desc const *r >> ID_DFR0_PERFMON_SHIFT, >> kvm_vcpu_has_pmu(vcpu) ? ID_DFR0_PERFMON_8_4 : 0); >> break; >> + case SYS_ID_AA64MMFR2_EL1: >> + val &= ~ID_AA64MMFR2_EL1_CCIDX_MASK; >> + break; >> + case SYS_ID_MMFR4_EL1: >> + val &= ~ARM64_FEATURE_MASK(ID_MMFR4_CCIDX); >> + break; > > Not that it is necessarily worth addressing, but I wanted to point > something out. > > This change breaks migration from older kernels on implementations w/ > FEAT_CCIDX. There is most likely exactly 0 of those in the wild, but > we need to be careful changing user-visible stuff like this. > > -- > Thanks, > Oliver I also don't think whether FEAT_CCIDX is visible matters for any guest because the line size a guest would care is held in the same bits whether FEAT_CCIDX is implemented. But if it concerns you I can write a bit more code so that it won't mask CCIDX bit if it's set from the userspace. Regards, Akihiko Odaki _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel