From patchwork Thu Feb 22 10:51:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WANG Xuerui X-Patchwork-Id: 204678 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp169583dyb; Thu, 22 Feb 2024 02:54:07 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW5WhWRe6HaylAKTS9FmuE4cIndzhlhN6MxN7TeLsbnL9R/tfVqpHtHzMM6Y6xXW2euZ3/ntOPqpRXS8mM8N72dqfhUfA== X-Google-Smtp-Source: AGHT+IEDSal89/z8PpDvS7cYuY4nr2xX0nwuK6SH4rBA6oHYM8Kx/P2yhFaZnVVlpIwcYP9SWdfg X-Received: by 2002:a17:906:b354:b0:a3e:d128:673f with SMTP id cd20-20020a170906b35400b00a3ed128673fmr8235749ejb.2.1708599247347; Thu, 22 Feb 2024 02:54:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708599247; cv=pass; d=google.com; s=arc-20160816; b=n7xQnVdlNWSGpAGgRXy7UwkQXg/ei2xdSFI2DAsDfSQaH5BP5nO3DcMK6PdaG/pS+b oc2FDT8P84nHn40j5pXEWLPPjsV2q5xAHvZaY/twRwBCqDBq5ExfM2N05isfI5UbBwcj WiPpOlXTZ+ycQdDZRjYMOhVA7sIwZ8bNcGwuxuvPt3PJz1D2STKHhyWZWYX6w4+ijMNQ 5KPTvBpc4f1U1KQUtif61nu3iO5S0tGw60L/8u/TsRU1ppNc36B86Qx6hvFMzttSsuO5 QMIpjHHC/tZGkq8wJvK2kKEs0mp8YCNfIopzaa6H3nC+ZV/tAsWRxciJP6zgLrFmMsFi DfSg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=mGUAd3s7HxCuO/5HquQETnCuJtaw9r+7WVTrkOAtc7s=; fh=mBf034bH8hBnsBxAupk5xQQrUQuaJjqEyteqgdDSbfg=; b=fn2jh7D6XiZLXwoFrnutFEXNDs3Xq3U12oMSbi3E9jBLg2GlrbsgRkWgnTk2civabE K3gRF2YNzSNPmag1UyOZubJf2mx+2Noh/DI5MIBbbglgxI4lAyPsN0Wf/lCENLdccwmL 4mHcSVmTJoa0bHkP166huW4QgQBGvyXtC6pwckHtK6zJienXse16ab0/zFswOgD1sru7 ffsnWBPWnDNhxYpGX0z0ny4ZLHXkswvYYJ/ezu0ywssgaMo+L5gPjiAMfolxN/Sx4Kq8 Kd+6mK7NYUnXs/cb2EdAmKSfNZlcmSB5Bpx0+y7AM39G8YRfbzZyUsnUaVjIF4Kv7Tqy aZdg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=oUphH2G+; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76360-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76360-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id gb32-20020a170907962000b00a3e977ab053si3608928ejc.941.2024.02.22.02.54.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:54:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76360-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=oUphH2G+; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76360-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76360-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id F118E1F26247 for ; Thu, 22 Feb 2024 10:54:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EA91E4CB55; Thu, 22 Feb 2024 10:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="oUphH2G+" Received: from mailbox.box.xen0n.name (mail.xen0n.name [115.28.160.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B134C41238; Thu, 22 Feb 2024 10:51:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.28.160.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599080; cv=none; b=qI6sMZViEp5pdzsw9FcdOqMBSjjJn60h8HtpXaBGMoKcBEdPvgOuKNvIPiSJfBr1JYo06yi4Xx5X3aiDEhWQjAmNccSJbYJQyfT4+1mhY3PPFzc1El9WIDdsODkOTe+SdnY2kFIn3G8t3FAfBBVZ41KeS8bETXwg7LNJppXGy5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599080; c=relaxed/simple; bh=mIM5+uGanlPrOHLZO0tD/F5TByLX/tkNjX3Vya5rHJM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aJHVtc8oYkgsroqzzFRyMCaPr8CfCY4a/GELB/25eOn/zmZaFVym/M1qewVkszfsQ3UJf1xR8ffvfwFrNBH+iQ/ThaSFQBin+Ahi5rzpUmKCkz43f+YyCEys/lsHuwpYtftaOXNBkDiTbO7E1w9pciwYlVi8q2bOiElzfXGgAcY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name; spf=pass smtp.mailfrom=xen0n.name; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b=oUphH2G+; arc=none smtp.client-ip=115.28.160.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen0n.name DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xen0n.name; s=mail; t=1708599076; bh=mIM5+uGanlPrOHLZO0tD/F5TByLX/tkNjX3Vya5rHJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oUphH2G+rxFnKG54JbclBjdbJwbNXnlrHZHW5wp4J9UhaiXAi+ZL99kzmMlddZXoK n6QG80KovrJlyq/187jU2TIOCMzN/H+DHbY3HXCRA/+JBmsEyIc8lXjZec/bDkiiy1 ZS4TYzIwSz77QbZ4LbjRUaDQmnY/+X5zrukUOepg= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:58fe:4c0e:8c24:2aff]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailbox.box.xen0n.name (Postfix) with ESMTPSA id 8847960164; Thu, 22 Feb 2024 18:51:16 +0800 (CST) From: WANG Xuerui To: Paolo Bonzini , Huacai Chen Cc: Tianrui Zhao , Bibo Mao , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, WANG Xuerui Subject: [PATCH for-6.8 v4 1/3] LoongArch: KVM: Fix input validation of _kvm_get_cpucfg and kvm_check_cpucfg Date: Thu, 22 Feb 2024 18:51:07 +0800 Message-ID: <20240222105109.2042732-2-kernel@xen0n.name> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240222105109.2042732-1-kernel@xen0n.name> References: <20240222105109.2042732-1-kernel@xen0n.name> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791596164181830586 X-GMAIL-MSGID: 1791596164181830586 From: WANG Xuerui The range check for the CPUCFG ID is wrong (should have been a || instead of &&) and useless in effect, so fix the obvious mistake. Furthermore, the juggling of the temp return value is unnecessary, because it is semantically equivalent and more readable to just return at every switch case's end. This is done too to avoid potential bugs in the future related to the unwanted complexity. Also, the return value of _kvm_get_cpucfg is meant to be checked, but this was not done, so bad CPUCFG IDs wrongly fall back to the default case and 0 is incorrectly returned; check the return value to fix the UAPI behavior. While at it, also remove the redundant range check in kvm_check_cpucfg, because out-of-range CPUCFG IDs are already rejected by the -EINVAL as returned by _kvm_get_cpucfg. Fixes: db1ecca22edf ("LoongArch: KVM: Add LSX (128bit SIMD) support") Fixes: 118e10cd893d ("LoongArch: KVM: Add LASX (256bit SIMD) support") Signed-off-by: WANG Xuerui Reviewed-by: Bibo Mao --- arch/loongarch/kvm/vcpu.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 27701991886d..7fd32de6656b 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -300,9 +300,7 @@ static int _kvm_setcsr(struct kvm_vcpu *vcpu, unsigned int id, u64 val) static int _kvm_get_cpucfg(int id, u64 *v) { - int ret = 0; - - if (id < 0 && id >= KVM_MAX_CPUCFG_REGS) + if (id < 0 || id >= KVM_MAX_CPUCFG_REGS) return -EINVAL; switch (id) { @@ -324,32 +322,35 @@ static int _kvm_get_cpucfg(int id, u64 *v) if (cpu_has_lasx) *v |= CPUCFG2_LASX; - break; + return 0; default: - ret = -EINVAL; - break; + /* + * No restrictions on other valid CPUCFG IDs' values, but + * CPUCFG data is limited to 32 bits as the LoongArch ISA + * manual says (Volume 1, Section 2.2.10.5 "CPUCFG"). + */ + *v = U32_MAX; + return 0; } - return ret; } static int kvm_check_cpucfg(int id, u64 val) { - u64 mask; - int ret = 0; - - if (id < 0 && id >= KVM_MAX_CPUCFG_REGS) - return -EINVAL; + u64 mask = 0; + int ret; - if (_kvm_get_cpucfg(id, &mask)) + ret = _kvm_get_cpucfg(id, &mask); + if (ret) return ret; + if (val & ~mask) + /* Unsupported features and/or the higher 32 bits should not be set */ + return -EINVAL; + switch (id) { case 2: /* CPUCFG2 features checking */ - if (val & ~mask) - /* The unsupported features should not be set */ - ret = -EINVAL; - else if (!(val & CPUCFG2_LLFTP)) + if (!(val & CPUCFG2_LLFTP)) /* The LLFTP must be set, as guest must has a constant timer */ ret = -EINVAL; else if ((val & CPUCFG2_FP) && (!(val & CPUCFG2_FPSP) || !(val & CPUCFG2_FPDP))) From patchwork Thu Feb 22 10:51:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WANG Xuerui X-Patchwork-Id: 204680 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp171025dyb; Thu, 22 Feb 2024 02:57:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXb6TZWUmpqPEYIE30a5+02HIoAibKd3RYd54phU9NmpcEoKeATW1MWcgVdrVLA/yKPefqsNUGhgYwVzYHAkm4MqNq1Uw== X-Google-Smtp-Source: AGHT+IH6662ZTjuytSH7RzzXa4hDCYyfKIG3ZUE2Calb18pd5PEdeA21hjVjFCk/F8eP0dE/vy2t X-Received: by 2002:a17:90b:386:b0:299:10d8:31cb with SMTP id ga6-20020a17090b038600b0029910d831cbmr17605029pjb.12.1708599470196; Thu, 22 Feb 2024 02:57:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708599470; cv=pass; d=google.com; s=arc-20160816; b=ZTD6uMmwP/Wvgp8JKdCtyN6zxUN1wFQqiY1WQeQ0n3ee0KIE85UeQBXaeUPKBAv54A 1lHq0HShqD7YK6Z/uWfNvQ4J5Yst0KNZHzRt4ecRZORveNM8ZypmMHLK2M+KT/lFz/sV CViSGUs6N0bYtcpBLFJTlNDssb5hBIsWNCucsJj8+zu+elHwFWgSU1UlmLnU4Op7nuMR A/hbxLSf2mUVhKkwB2p83jkpisjUa69lgDlY5ihRHoVHGgFgtq3giYXbTh0vx2r1jcjN tg4GbDweZf4+sU4zZa1JxzilI5LiRYNS5mO4SanNpiNo2OturVFRYqw8eoHtuz3aZ/09 qIcw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=gEsIZug05BOdNSyzPXaq8w+pK7vxmJqGJNj4PRReNdU=; fh=mBf034bH8hBnsBxAupk5xQQrUQuaJjqEyteqgdDSbfg=; b=qTavlBf5Dc3yoS+lTEWCyEdOgOeJo/ZEoNZkX8LnuWC3iOgDAarFLoQK/Oeogbgmd1 81GDh2B8skVYBR6nj0FRmAS4EcxSaT9KhtF2sKpslMCDBWZggQE5fYSET85Be52wjnVy oRfMufluTgjvkwPnIhfPKEhdwyf3bvSOj5PawQ3YwDxnwVJNuGwT47kzPYZG9Za6v3ul 6Xnr5TcHKx6ncPhthk5VNY/qUSJSph2mSQkkb+DjfrlY3esSk9Ho+44CSIC/hUX2ck1L EgwfFjpOORzUgg0aO3laKHffrSJPw1+ekZGRsIdOTcdxZ0KqvKy6Tc/RV1w+uAfAUZCx I6cQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=t0TbktWh; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id me13-20020a17090b17cd00b002993be51a7dsi3431514pjb.163.2024.02.22.02.57.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:57:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=t0TbktWh; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76362-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 68046B26DB3 for ; Thu, 22 Feb 2024 10:54:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B9FEB4D137; Thu, 22 Feb 2024 10:51:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="t0TbktWh" Received: from mailbox.box.xen0n.name (mail.xen0n.name [115.28.160.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E2853EA7B; Thu, 22 Feb 2024 10:51:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.28.160.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599081; cv=none; b=RyhqdIWGnlnM/1a+vqydvrpkoK0eq0jmI257uwaJq0vVtLU7v6D2c312YYhs9lzp9ecoOr+GdHBV33GZZvKq6MQ2Jc2U+eRCRaV3ly+eetNGKewhzHgeS3a3P4nxF2/YWp50zQtygDKd0qq0tbUavIMOLycr/YQClC52/yWmWEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599081; c=relaxed/simple; bh=+kB69uQHwSK7H63LamYjOdOPcWFCgJ8ZtDGfI9wdO64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UWwIyr7zo3L4R28al2xAOaGBKNZJVhoX70PLZjrZZALM8i7uhLzs4VEPGrmaKbCl+tQvvte0AOjQO650QVPcnhAmtrgaKZ/f5h4ENXbkjeybcc9K4A+x/QRZDMJM2kBI8r/BRBX4WOm4lDEOCubMt01wjE07KORRkzuHjtEWruU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name; spf=pass smtp.mailfrom=xen0n.name; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b=t0TbktWh; arc=none smtp.client-ip=115.28.160.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen0n.name DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xen0n.name; s=mail; t=1708599077; bh=+kB69uQHwSK7H63LamYjOdOPcWFCgJ8ZtDGfI9wdO64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t0TbktWhrWL0jXKnKQgj+Dhjo1VjhW4k5oVFbL7zAudpKZrF/6OC0li9EW+HZpDuk wyIvd9efy4trVP3UvrVOWOZStSgss21zDa/QyXneVl0UKZBftaYgcJqM8UoZaF3RY5 8MllbF/de0Ks0vQRFQ7vdhDJpJKVS1fyF51+Bqrc= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:58fe:4c0e:8c24:2aff]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailbox.box.xen0n.name (Postfix) with ESMTPSA id 78495601C8; Thu, 22 Feb 2024 18:51:17 +0800 (CST) From: WANG Xuerui To: Paolo Bonzini , Huacai Chen Cc: Tianrui Zhao , Bibo Mao , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, WANG Xuerui Subject: [PATCH for-6.8 v4 2/3] LoongArch: KVM: Rename _kvm_get_cpucfg to _kvm_get_cpucfg_mask Date: Thu, 22 Feb 2024 18:51:08 +0800 Message-ID: <20240222105109.2042732-3-kernel@xen0n.name> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240222105109.2042732-1-kernel@xen0n.name> References: <20240222105109.2042732-1-kernel@xen0n.name> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791596398275849391 X-GMAIL-MSGID: 1791596398275849391 From: WANG Xuerui The function is not actually a getter of guest CPUCFG, but rather validation of the input CPUCFG ID plus information about the supported bit flags of that CPUCFG leaf. So rename it to avoid confusion. Signed-off-by: WANG Xuerui Reviewed-by: Bibo Mao --- arch/loongarch/kvm/vcpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 7fd32de6656b..9f63bbaf19c1 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -298,7 +298,7 @@ static int _kvm_setcsr(struct kvm_vcpu *vcpu, unsigned int id, u64 val) return ret; } -static int _kvm_get_cpucfg(int id, u64 *v) +static int _kvm_get_cpucfg_mask(int id, u64 *v) { if (id < 0 || id >= KVM_MAX_CPUCFG_REGS) return -EINVAL; @@ -339,7 +339,7 @@ static int kvm_check_cpucfg(int id, u64 val) u64 mask = 0; int ret; - ret = _kvm_get_cpucfg(id, &mask); + ret = _kvm_get_cpucfg_mask(id, &mask); if (ret) return ret; @@ -567,7 +567,7 @@ static int kvm_loongarch_get_cpucfg_attr(struct kvm_vcpu *vcpu, uint64_t val; uint64_t __user *uaddr = (uint64_t __user *)attr->addr; - ret = _kvm_get_cpucfg(attr->attr, &val); + ret = _kvm_get_cpucfg_mask(attr->attr, &val); if (ret) return ret; From patchwork Thu Feb 22 10:51:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WANG Xuerui X-Patchwork-Id: 204679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp169753dyb; Thu, 22 Feb 2024 02:54:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV1lWXrtyUWRl105suIht+y+SglzzxMb/gHAtCRuB0vbzb/usY8VozJW0/jNnxd2xSZl28NnKRathKeIyoc0+BnW+KXnQ== X-Google-Smtp-Source: AGHT+IGjwnrpl3stW4pTs1eyUedZ7Y4vzqduxPddTdNdkVUdKzUO8mfZnQzwfMF6Mtpcsv3mjOfk X-Received: by 2002:a05:6a21:3994:b0:19e:c7d8:6246 with SMTP id ad20-20020a056a21399400b0019ec7d86246mr23166002pzc.13.1708599273964; Thu, 22 Feb 2024 02:54:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708599273; cv=pass; d=google.com; s=arc-20160816; b=u+jOP4d1vusGjzrrgRh/IS7d50p/8cu5llufge/ASugf5UaPf90CFJJQRi8lFqU3dG IQvVpXmflO1OVGlwdz13aKxXwCjWtkKo5GLNKbnRBM28kuHVYkHt/9HEEO69lp4q8NMY 7+XltqcIt1IK/GBp9mjE8jwb2vV/Tc3e0ZpsIFvbfOCb8TOxbGUqHgAtAXaxfCWi2gJT 6jBszeyRbU5CR8sK249iI7Q3KWQhJ9XnrlFeYtNrI8C43DYDA/8klq9uVjE9qc5ccIWx cJw3Mbc8/pfR1IEdaKNddU2+UV/sEY5TSNt1WAeI6JStt9ZXLPMQiw5mIHuOm3RZqMYh Zbvg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=C+0Ge+cJ+LpgrqLewl6HK6oug7J0T5MjPLVvoIIdaGk=; fh=mBf034bH8hBnsBxAupk5xQQrUQuaJjqEyteqgdDSbfg=; b=OyHZlXZtG3QvRP57add4RA7ZUsp/6W9Ci+X6jU5JKwSCzltOd6dPjaQsNvAWaOj7xL 9aXExOb3/V5URM5guNjNIpF5+WU6Pm+3jwH1P7k3DOQWVkbPFhXbPPs2TlQvrgspJwx3 My7rO13aoKVqG3j+J6rbFuRNJXD+y1OynmqqpLAS2zYSMoSjg48u7B++jrjPo5Xyv/PO 9AIy9YSVVJJ3YbC/TB+ftX0APdoQxNkkXD641xEDrbjeFfo+bghQczgFsvsCzD/bxBy+ QW93Z+HOmuqhRi7w6spAgRmjvnbY0LkvqbQxb67rFI5OVRiyk2XUUIspUO+j8XUg30Wb prBw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=SkrHJcYL; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w16-20020a170902e89000b001dbf91098bdsi7120710plg.369.2024.02.22.02.54.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:54:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=SkrHJcYL; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76363-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C4392287B21 for ; Thu, 22 Feb 2024 10:54:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C30F54D5A6; Thu, 22 Feb 2024 10:51:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="SkrHJcYL" Received: from mailbox.box.xen0n.name (mail.xen0n.name [115.28.160.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80E0A3EA97; Thu, 22 Feb 2024 10:51:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.28.160.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599082; cv=none; b=MUPN5aqGWu5c1MHLgXMjhoTxAtOys7ThjDyoe1QYhN/feGWA4F09wkw1abpGSi1dB1bWzVz8JPbZguQsWOcmIOE6LKtFp0kv9wSkIGxEqV7GBQH7zluluy4YFTzQgegOe+XcwCBdM9XZE07PrxvIevpj/SmDfVWGtM+V1kyQSeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708599082; c=relaxed/simple; bh=VJZfbAVi6WlL1YN41uqTvRQi/gfcPVL7ShPRTBNjidw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Op4qyLs1oD2ENuVGdBFDbGRCqWBw+7Vv/nVXXUc3BXfkXSRVYmM+7JgKBTLg68xxI/3OrCKBe55U4UZbTCVXOtcFrKJAbQSTrL8WwIHKbLH0Rxvdbjv+gL10zPf6lZI9UabHDNpIZJbAKNyT2kKEYz9DVPmqBp71XBUILVdYdA8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name; spf=pass smtp.mailfrom=xen0n.name; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b=SkrHJcYL; arc=none smtp.client-ip=115.28.160.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen0n.name DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xen0n.name; s=mail; t=1708599078; bh=VJZfbAVi6WlL1YN41uqTvRQi/gfcPVL7ShPRTBNjidw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SkrHJcYLlHbX9i49HFsfw3cdsjRm/JmT+e1KQlpmqpjdVg2V58AoaatShElR/C+GJ vpUM6YifqA9gquqPIAIBaAcbcm0LEE7jOPk98Q7wLDFVExVnE9a1vwrBkMZIYvDbzp Z9U6m+DZ1BON8R1UMnKqFs3CAokYPzeQOJj06Vtk= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:58fe:4c0e:8c24:2aff]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailbox.box.xen0n.name (Postfix) with ESMTPSA id 4A45460562; Thu, 22 Feb 2024 18:51:18 +0800 (CST) From: WANG Xuerui To: Paolo Bonzini , Huacai Chen Cc: Tianrui Zhao , Bibo Mao , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, WANG Xuerui Subject: [PATCH for-6.8 v4 3/3] LoongArch: KVM: Streamline kvm_check_cpucfg and improve comments Date: Thu, 22 Feb 2024 18:51:09 +0800 Message-ID: <20240222105109.2042732-4-kernel@xen0n.name> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240222105109.2042732-1-kernel@xen0n.name> References: <20240222105109.2042732-1-kernel@xen0n.name> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791596192210627954 X-GMAIL-MSGID: 1791596192210627954 From: WANG Xuerui All the checks currently done in kvm_check_cpucfg can be realized with early returns, so just do that to avoid extra cognitive burden related to the return value handling. While at it, clean up comments of _kvm_get_cpucfg_mask and kvm_check_cpucfg, by removing comments that are merely restatement of the code nearby, and paraphrasing the rest so they read more natural for English speakers (that likely are not familiar with the actual Chinese-influenced grammar). No functional changes intended. Signed-off-by: WANG Xuerui Reviewed-by: Bibo Mao --- arch/loongarch/kvm/vcpu.c | 42 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 9f63bbaf19c1..128b89d00ced 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -305,20 +305,16 @@ static int _kvm_get_cpucfg_mask(int id, u64 *v) switch (id) { case 2: - /* Return CPUCFG2 features which have been supported by KVM */ + /* CPUCFG2 features unconditionally supported by KVM */ *v = CPUCFG2_FP | CPUCFG2_FPSP | CPUCFG2_FPDP | CPUCFG2_FPVERS | CPUCFG2_LLFTP | CPUCFG2_LLFTPREV | CPUCFG2_LAM; /* - * If LSX is supported by CPU, it is also supported by KVM, - * as we implement it. + * For the ISA extensions listed below, if one is supported + * by the host, then it is also supported by KVM. */ if (cpu_has_lsx) *v |= CPUCFG2_LSX; - /* - * if LASX is supported by CPU, it is also supported by KVM, - * as we implement it. - */ if (cpu_has_lasx) *v |= CPUCFG2_LASX; @@ -349,24 +345,26 @@ static int kvm_check_cpucfg(int id, u64 val) switch (id) { case 2: - /* CPUCFG2 features checking */ if (!(val & CPUCFG2_LLFTP)) - /* The LLFTP must be set, as guest must has a constant timer */ - ret = -EINVAL; - else if ((val & CPUCFG2_FP) && (!(val & CPUCFG2_FPSP) || !(val & CPUCFG2_FPDP))) - /* Single and double float point must both be set when enable FP */ - ret = -EINVAL; - else if ((val & CPUCFG2_LSX) && !(val & CPUCFG2_FP)) - /* FP should be set when enable LSX */ - ret = -EINVAL; - else if ((val & CPUCFG2_LASX) && !(val & CPUCFG2_LSX)) - /* LSX, FP should be set when enable LASX, and FP has been checked before. */ - ret = -EINVAL; - break; + /* Guests must have a constant timer */ + return -EINVAL; + if ((val & CPUCFG2_FP) && (!(val & CPUCFG2_FPSP) || !(val & CPUCFG2_FPDP))) + /* Single and double float point must both be set when FP is enabled */ + return -EINVAL; + if ((val & CPUCFG2_LSX) && !(val & CPUCFG2_FP)) + /* LSX architecturally implies FP but val does not satisfy that */ + return -EINVAL; + if ((val & CPUCFG2_LASX) && !(val & CPUCFG2_LSX)) + /* LASX architecturally implies LSX and FP but val does not satisfy that */ + return -EINVAL; + return 0; default: - break; + /* + * Values for the other CPUCFG IDs are not being further validated + * besides the mask check above. + */ + return 0; } - return ret; } static int kvm_get_one_reg(struct kvm_vcpu *vcpu,