From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2A72D189BAF; Mon, 28 Oct 2024 06:44:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097889; cv=none; b=O2vj8BjJ6d24YDNgFt1C/Xd0tqxAHIHBor8bMPTjYS9aeuRzOaqrEjEdn8RKYy/3HKpQKOXoOh09GbjMmQNvWrN4V7kTWBoLO2GKdxDx3o39rSjuDhbdEEJx8x+j+lkSTSlhKt1GA/xggdHvcHyVZ8MgfUxeOIxYW1kWgQM1U+0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097889; c=relaxed/simple; bh=I226rhJ6X1n1R6xPysnUELEI9RkQkMgWWVsvI2Fe6Fg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AV1+alnJum1rbMDLLF9x613OI3vWzo3uyJgVL3oYwgUcBfRMuEpZlEUhPq1ZYXjtl4KVCfBDRF8MTP6dM1I8eFHVfhZTH/t3JJUhy57tLpuddTXIe+a4LdBSyF3lj2ZIpvyNe/e8xAHWCzNszvwas3XNobXQMkjDq2wIVgFTuvY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=koS+LFnz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="koS+LFnz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C066CC4CEC3; Mon, 28 Oct 2024 06:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730097889; bh=I226rhJ6X1n1R6xPysnUELEI9RkQkMgWWVsvI2Fe6Fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=koS+LFnzCtrLrsnCHurKP917dLV3gbgWVx8KeqRiV03N3iy/fwckxfonM8Dp6X3UN hC/9uTqe70LOpMByRCDDztWcPLG7copwB/1bQ+KCvWiqr8gOWVHSdWAbZ1m3lNAU/N tZcWFoqP9Xr3yhxJYJ8nB5ICubrSy2Cc9D+oEsbQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kanglong Wang , Huacai Chen Subject: [PATCH 6.6 193/208] LoongArch: Make KASAN usable for variable cpu_vabits Date: Mon, 28 Oct 2024 07:26:13 +0100 Message-ID: <20241028062311.386018387@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062306.649733554@linuxfoundation.org> References: <20241028062306.649733554@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Huacai Chen commit 3c252263be801f937f56b4bcd8e8e2b5307c1ce5 upstream. Currently, KASAN on LoongArch assume the CPU VA bits is 48, which is true for Loongson-3 series, but not for Loongson-2 series (only 40 or lower), this patch fix that issue and make KASAN usable for variable cpu_vabits. Solution is very simple: Just define XRANGE_SHADOW_SHIFT which means valid address length from VA_BITS to min(cpu_vabits, VA_BITS). Cc: stable@vger.kernel.org Signed-off-by: Kanglong Wang Signed-off-by: Huacai Chen Signed-off-by: Greg Kroah-Hartman --- arch/loongarch/include/asm/kasan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/loongarch/include/asm/kasan.h +++ b/arch/loongarch/include/asm/kasan.h @@ -16,7 +16,7 @@ #define XRANGE_SHIFT (48) /* Valid address length */ -#define XRANGE_SHADOW_SHIFT (PGDIR_SHIFT + PAGE_SHIFT - 3) +#define XRANGE_SHADOW_SHIFT min(cpu_vabits, VA_BITS) /* Used for taking out the valid address */ #define XRANGE_SHADOW_MASK GENMASK_ULL(XRANGE_SHADOW_SHIFT - 1, 0) /* One segment whole address space size */