From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B58F53368A9; Fri, 5 Jun 2026 07:22:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780644139; cv=none; b=BEHjq6XQIFY2B3rRoSGqaynR3C4lqH1W0J5qYMaj9hTUtpNtb6Juau2cHYvai9K1CGHv7bplIRxhj+GIWHgBASur+SXU38tCFSWlAeq62/vS1wbxfaiMLedObyYTm/rc6PXkrEDR4LPuO/c1fY5uxYtWI901ld/guwL8kNzUWPk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780644139; c=relaxed/simple; bh=BjI1/fzWnUJogGz5GSW1YkeKuXMLwYIsfnOXKfTp0f4=; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=hlA2tI/j7PYIupZkepDfT0aBdV4yoPcfBgqkzrYIBJniu5s3nyhLUAJMOz3DL1e0GXl4Lz4S3K7lyvcCvBNjytZK33Bl/hICw9zCu9GYnA42qsEjPOgaJnKWy0qnIqMFiOXXh8xXVV9G1Xage5c3XfYfZ4QwidfXR8u/Q1Xa4Gw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.20.42.62]) by gateway (Coremail) with SMTP id _____8CxCHkleSJqrd4QAA--.21743S3; Fri, 05 Jun 2026 15:22:13 +0800 (CST) Received: from [10.20.42.62] (unknown [10.20.42.62]) by front1 (Coremail) with SMTP id qMiowJCxWeAieSJqm62cAA--.35476S3; Fri, 05 Jun 2026 15:22:12 +0800 (CST) Subject: Re: [PATCH] LoongArch: KVM: return full old CSR value from kvm_emu_xchg_csr() To: Qiang Ma , zhaotianrui@loongson.cn, chenhuacai@kernel.org, kernel@xen0n.name Cc: kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20260604123433.3182173-1-maqianga@uniontech.com> From: Bibo Mao Message-ID: <6a2009fc-d96a-70f7-49c6-2f6f6aec94b9@loongson.cn> Date: Fri, 5 Jun 2026 15:19:05 +0800 User-Agent: Mozilla/5.0 (X11; Linux loongarch64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20260604123433.3182173-1-maqianga@uniontech.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-CM-TRANSID:qMiowJCxWeAieSJqm62cAA--.35476S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoW7WF4kKrW7ZF13Wr1rCF4xZrc_yoW8Jw1xp3 9rC3Wj9w40gr1Uta47W398Xrs8ArWDGryIqFWqyFy7Xr9IqFyrXFyFgryDWF1DKw4rKF1I qrZaqwn2van8t3XCm3ZEXasCq-sJn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Sb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E87Iv 67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lc7I2V7IY0VAS07 AlzVAYIcxG8wCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwCFI7km07C2 67AKxVWUtVW8ZwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI 8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWU CwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r 1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBI daVFxhVjvjDU0xZFpf9x07jYSoJUUUUU= On 2026/6/4 下午8:34, Qiang Ma wrote: > The LoongArch CSRXCHG instruction returns the full old CSR value in rd > after applying the masked update. kvm_emu_xchg_csr() currently masks > the saved value before returning it to the guest, so rd receives only > the bits selected by the write mask. > > That breaks the architectural behavior and makes a zero mask return 0 > instead of the previous CSR value. Keep the masked CSR update, but > return the unmodified old CSR value. > > Fixes: da50f5a693ff ("LoongArch: KVM: Implement handle csr exception") > Cc: stable@vger.kernel.org > Signed-off-by: Qiang Ma > --- > arch/loongarch/kvm/exit.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c > index 3b95cd0f989b..264813d45cbe 100644 > --- a/arch/loongarch/kvm/exit.c > +++ b/arch/loongarch/kvm/exit.c > @@ -103,7 +103,6 @@ static unsigned long kvm_emu_xchg_csr(struct kvm_vcpu *vcpu, int csrid, > old = kvm_read_sw_gcsr(csr, csrid); > val = (old & ~csr_mask) | (val & csr_mask); > kvm_write_sw_gcsr(csr, csrid, val); > - old = old & csr_mask; > } else > pr_warn_once("Unsupported csrxchg 0x%x with pc %lx\n", csrid, vcpu->arch.pc); > > Reviewed-by: Bibo Mao