From patchwork Fri Sep 9 14:45:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 12971888 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 05450C6FA82 for ; Fri, 9 Sep 2022 14:47:35 +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:Date:Subject:CC :To:From: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=THu6i1j98Jg02CmL396Xyi3vS1avDDelGrBFEt9WDu0=; b=cVDxsMhGUVfE7P Jfh0VzeaO6sO1l5kXqEVFm3vP6Cj2f2hwusNbNsYVlgXXrxtbIVU/Fk7OeJHHslfrX8NsRXIJKDQR dinGFrNGlpm/hn+Aw5/feT/vH0vGBhCjrbcDtsF2HEPIo4Dj24abT6u7xdMDG9sf4CL6TkEsUoD/G lbKuTY/esr/9pU80MfNx+h0p1c6fHpNfreFQgu1Akh9fu45nvtReVPRCxxEyUp3LB/6Lh34/ISC+B jGTKjY5sIcI+t5HTp9DBQCXoaCndmJyMAExDBDwcNmXo2jrwJXMsLm5x4Y4Tn9ou6EJsFq4fnVUay nO13zBjDDoZP2GQhTtLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWfGu-00GqC8-Dt; Fri, 09 Sep 2022 14:46:20 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWfGq-00Gq8r-Gt for linux-arm-kernel@lists.infradead.org; Fri, 09 Sep 2022 14:46:18 +0000 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 289Ei4ZX002803; Fri, 9 Sep 2022 14:46:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=pNr4hQb+JRu+4w1VuR78KoAZItBcUt49PAzbKmqpMcc=; b=UpQA3U6wvdCiZWKR8Pqx+yjBTZ+d5EnNSC0V4/+QeMiGo2Qoq2Pft10ZMUOxmaYfGi4o F7LcskMavkKZTruRyqj4cORfTmQKdXQtB72x0Dq421ocox2qh4CbJaM8/lBUbxOxqPWS jxzPjZo049A0G8AuclGs8oINMSuV8ES+/YWROyr6+9GN7v+xuOYwbGaSrvOi+EX3os4D ni+ADLt275encxtWTbaYESoR9EIefYgqfCsONqslkJ8HHJVdHon0uSgd7GZ4SOB43Udn 2Wfuwkb5s+sqrcBcLo2VndTzxYa7rm1LOr/FZH9PN9iQUGju1cTYi/giC+upfgco75+U jQ== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3jg5uq09ju-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Sep 2022 14:46:02 +0000 Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 289Ek1go006489 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 9 Sep 2022 14:46:01 GMT Received: from hu-eberman-lv.qualcomm.com (10.49.16.6) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Fri, 9 Sep 2022 07:46:01 -0700 From: Elliot Berman To: Catalin Marinas , Will Deacon , Marc Zyngier , James Morse , "Alexandru Elisei" , Suzuki K Poulose CC: Elliot Berman , , , Subject: [PATCH v2] KVM: arm64: Only set KVM_MODE_PROTECTED if is_hyp_mode_available() Date: Fri, 9 Sep 2022 07:45:52 -0700 Message-ID: <20220909144552.3000716-1-quic_eberman@quicinc.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: tLwa4QKuo59sSsPVGKdBidMjGzXEWi6h X-Proofpoint-ORIG-GUID: tLwa4QKuo59sSsPVGKdBidMjGzXEWi6h X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-09_08,2022-09-09_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 mlxlogscore=635 impostorscore=0 clxscore=1015 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2209090051 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_074616_716806_BBB36AFE X-CRM114-Status: GOOD ( 17.34 ) 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 Do not switch kvm_mode to KVM_MODE_PROTECTED if hypervisor mode is not available. This prevents "Protected KVM" cpu capability being reported when Linux is booting in EL1 and would not have KVM enabled. Signed-off-by: Elliot Berman --- arch/arm64/kvm/arm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: 0982c8d859f8f7022b9fd44d421c7ec721bb41f9 diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 8fe73ee5fa84..861f4b388879 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -2272,7 +2272,9 @@ static int __init early_kvm_mode_cfg(char *arg) return -EINVAL; if (strcmp(arg, "protected") == 0) { - if (!is_kernel_in_hyp_mode()) + if (!is_hyp_mode_available()) + kvm_mode = KVM_MODE_DEFAULT; + else if (!is_kernel_in_hyp_mode()) kvm_mode = KVM_MODE_PROTECTED; else pr_warn_once("Protected KVM not available with VHE\n");