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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (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 F02DDCDB479 for ; Thu, 25 Jun 2026 02:00:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcZNX-0005QJ-7p; Wed, 24 Jun 2026 21:59:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcZNW-0005Mp-4r for qemu-devel@nongnu.org; Wed, 24 Jun 2026 21:59:42 -0400 Received: from out-172.mta0.migadu.com ([2001:41d0:1004:224b::ac]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcZNT-0002Qu-MQ for qemu-devel@nongnu.org; Wed, 24 Jun 2026 21:59:41 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1782352777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4nJlkRv21mHq5T6N1v8u6I+6uC06vcKDMbrKXIs0KEQ=; b=ZI35xIkAFXr7enL4zOObd38qagzTKfQ8sOVTRHUdmh+YocOsj65KywNPc8AiUZ/sMjHsjh mhfcFdYc1p7Zb3YHVniyXl1nJDFKpfoNeGYiNKKbDqVCTZCP/jrA4ewMhtioYZVLUmXEDZ 3bDYvI6nC0Ix76wNCr5C6BSEDTfIQco= From: Tao Cui To: qemu-devel@nongnu.org Cc: Song Gao , Bibo Mao , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Qiang Ma , Tao Cui Subject: [PATCH 4/4] target/loongarch/kvm: fix cpucfg sync error handling Date: Thu, 25 Jun 2026 09:58:34 +0800 Message-ID: <20260625015835.678819-5-cui.tao@linux.dev> In-Reply-To: <20260625015835.678819-1-cui.tao@linux.dev> References: <20260625015835.678819-1-cui.tao@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:1004:224b::ac; envelope-from=cui.tao@linux.dev; helo=out-172.mta0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Tao Cui In kvm_loongarch_get_cpucfg() and kvm_loongarch_put_cpucfg(), ret is overwritten on each iteration, so only the last register's result is returned and earlier failures are lost. On a failed read, env->cpucfg[i] is stored from a stale or uninitialized val. Accumulate errors with ret |=, matching kvm_loongarch_get_csr()/put_csr(), and only update env->cpucfg[i] on a successful read. Keep the cpucfg2 negotiation check in put_cpucfg() on a separate variable so its early return does not overwrite the accumulated result. Signed-off-by: Tao Cui --- target/loongarch/kvm/kvm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c index 6c3eea87b0..a60c99227f 100644 --- a/target/loongarch/kvm/kvm.c +++ b/target/loongarch/kvm/kvm.c @@ -713,8 +713,11 @@ static int kvm_loongarch_get_cpucfg(CPUState *cs) CPULoongArchState *env = cpu_env(cs); for (i = 0; i < 21; i++) { - ret = kvm_get_one_reg(cs, KVM_IOC_CPUCFG(i), &val); - env->cpucfg[i] = (uint32_t)val; + int r = kvm_get_one_reg(cs, KVM_IOC_CPUCFG(i), &val); + ret |= r; + if (!r) { + env->cpucfg[i] = (uint32_t)val; + } } return ret; } @@ -762,13 +765,13 @@ static int kvm_loongarch_put_cpucfg(CPUState *cs) for (i = 0; i < 21; i++) { if (i == 2) { - ret = kvm_check_cpucfg2(cs); - if (ret) { - return ret; + int r = kvm_check_cpucfg2(cs); + if (r) { + return r; } } val = env->cpucfg[i]; - ret = kvm_set_one_reg(cs, KVM_IOC_CPUCFG(i), &val); + ret |= kvm_set_one_reg(cs, KVM_IOC_CPUCFG(i), &val); } return ret; } -- 2.43.0