From nobody Sat Feb 7 18:32:39 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A52321B9C6 for ; Wed, 16 Apr 2025 18:05:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826723; cv=none; b=qx8JrIeykQNS3vsPc0gRhxUCPClufMUlhZ6aSO50FInkeirk9i3neai0nGFowG0kQM8M4jjB58w3GhPw8+I/XySc6EJqZ2rlZWjL21mruvexVsKK/D/DJd9MlAg9+h8Eaz+ZVxuJpRYZlm+CrPcGv6ZEbxV+AUsHkhU3aGB8qwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826723; c=relaxed/simple; bh=HuYM3NTjVtNvVmUfTJyuc9HW9TP1DbEzDgukU0Okvnc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LFFnUI/CcjJSFLac3kLZSL+Bf1L3pHhNeN19Ab9Xowj+o3JnwvQxBk5pSQBMCT31XDcI7eSnuAtEfWNUsb3/q+R/FAvAAgjBhBUhfQaZiUMGzZSQ0qc2PyoHsI/8xIg2RJabczSvH17ye/iOeVimVFT9OkdLr5RH8L6d4OrwXLw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=CH+uDNVG; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CH+uDNVG" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43d5ca7c86aso42327425e9.0 for ; Wed, 16 Apr 2025 11:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744826719; x=1745431519; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=cig4j4B59mGrHXUscIMbyQJ5aIiV+Rf6+4/as61+W8M=; b=CH+uDNVGC/9NwseJ81Ztn6dPO94l/3MM8nLkdrxIB235nnPw4SRNE5Nc+4/nvC4SX5 lzRKU+spqHgdNInJZ02gHCfEtYl/ig+S+cqU/nPkEqBUp1XiijcS9i7RBBfRHZ7QFeB2 GziBYHaXbhs1eVZdbXIjAUoowGIrtbamX6rrWjNi9WAVx0aTebd0m1son6k/hNfElGj4 XVb0UmbRKsWNOVUAUmAnU53uQttAKUxRHlegNB5oGyaDL0ILLlk7VPSBiJrPij0qAGml QEGMgVADZg9vE++mWuA2K6EBh3Ot95kpo2xKvdCRSucNMiDT+PPYnfSIyOjN2ytGrlD6 qcRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744826719; x=1745431519; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cig4j4B59mGrHXUscIMbyQJ5aIiV+Rf6+4/as61+W8M=; b=wt+cfbpN15RN0I8OWyu7mrJZ8SobIhBqtgEbv+6vPpd34NaV537fSL7g2YKrSuAdUW CD2pj8qeA4gverD5U7ZqVRA0fBymKGBFyKpcr4VlbrMhyyxZlW/ypY3CWwZn/UcY5L3T v0UpW3QabZgUQAcEkTgJqzmFEKSwuNHR9fGEbi9CRI/WnqssIMEPeHZR2Yz259sEWBu0 US/YzbHMf9QHCMfNC48WkV1vzhNTubzolCP2UIDs3Hnif5fR2Dcua3r0leAj33wNHZjq 7JLxXXOC8Luv1dgzpgi7BMpwCt6Q1PtJ8R5SFC5Dk/cKFgYF1PtHoV59WOJN7W9sHLVI /2OA== X-Forwarded-Encrypted: i=1; AJvYcCULczLvrnBipuX56b5lgBjJbzYHaNlRhQ8z095tPjwyg/+HnUZYAcC09TTfQAgAnwWay+PSURoL89VI6Ck=@vger.kernel.org X-Gm-Message-State: AOJu0Yw896SOu1dTWQwLCNCrDX3zN9twwmMD9oR4+gp/G+fFAlGE9wdG K6nV6vJrhLgRuC1z4LCScPuNPRBprpHAdUcHyFaWEn+0yoguH0xRCxxRvhSj54yFeoWg3omOw8y beWZjLJVY5A== X-Google-Smtp-Source: AGHT+IEiPUfN9S/47HXHkhZb5HxXPnfUW71Ci+ZV97xZnZ+QKkE230TNxvDfhI7LnVtAM5BZRKK50jEgq3SU8A== X-Received: from wmhu10.prod.google.com ([2002:a05:600c:a36a:b0:43d:44cf:11f8]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c07:b0:43c:f616:f08 with SMTP id 5b1f17b1804b1-4405d61cdccmr26873015e9.8.1744826719680; Wed, 16 Apr 2025 11:05:19 -0700 (PDT) Date: Wed, 16 Apr 2025 18:04:31 +0000 In-Reply-To: <20250416180440.231949-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250416180440.231949-1-smostafa@google.com> X-Mailer: git-send-email 2.49.0.777.g153de2bbd5-goog Message-ID: <20250416180440.231949-2-smostafa@google.com> Subject: [PATCH 1/4] arm64: Introduce esr_is_ubsan_brk() From: Mostafa Saleh To: kvmarm@lists.linux.dev, kasan-dev@googlegroups.com, linux-hardening@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, broonie@kernel.org, catalin.marinas@arm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kees@kernel.org, elver@google.com, andreyknvl@gmail.com, ryabinin.a.a@gmail.com, akpm@linux-foundation.org, yuzenghui@huawei.com, suzuki.poulose@arm.com, joey.gouly@arm.com, masahiroy@kernel.org, nathan@kernel.org, nicolas.schier@linux.dev, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Soon, KVM is going to use this logic for hypervisor panics, so add it in a wrapper that can be used by the hypervisor exit handler to decode hyp panics. Signed-off-by: Mostafa Saleh --- arch/arm64/include/asm/esr.h | 5 +++++ arch/arm64/kernel/traps.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index e4f77757937e..350f02bf437d 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -440,6 +440,11 @@ static inline bool esr_is_cfi_brk(unsigned long esr) (esr_brk_comment(esr) & ~CFI_BRK_IMM_MASK) =3D=3D CFI_BRK_IMM_BASE; } =20 +static inline bool esr_is_ubsan_brk(unsigned long esr) +{ + return (esr_brk_comment(esr) & ~UBSAN_BRK_MASK) =3D=3D UBSAN_BRK_IMM; +} + static inline bool esr_fsc_is_translation_fault(unsigned long esr) { esr =3D esr & ESR_ELx_FSC; diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 529cff825531..224f927ac8af 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -1145,7 +1145,7 @@ int __init early_brk64(unsigned long addr, unsigned l= ong esr, return kasan_handler(regs, esr) !=3D DBG_HOOK_HANDLED; #endif #ifdef CONFIG_UBSAN_TRAP - if ((esr_brk_comment(esr) & ~UBSAN_BRK_MASK) =3D=3D UBSAN_BRK_IMM) + if (esr_is_ubsan_brk(esr)) return ubsan_handler(regs, esr) !=3D DBG_HOOK_HANDLED; #endif return bug_handler(regs, esr) !=3D DBG_HOOK_HANDLED; --=20 2.49.0.604.gff1f9ca942-goog From nobody Sat Feb 7 18:32:39 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DBA621C162 for ; Wed, 16 Apr 2025 18:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826725; cv=none; b=XmKdBMDsMi6DfpItmja9fo9Sqs03rJtjkl/HoB6s0II9BYb70PiJJ693pbzW2utgleMNm2IEI0xCxHdSbIPd+V+1rmY6j+zjTkok9KPeFgNRbRWGMof+vUZK0u/YHHEx+bvFa0biGPxeJAFaXDZNdEM7TqhlLqJUxLrTTmMpgsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826725; c=relaxed/simple; bh=D/VurCqLb27guso/GqkYusIvZ2SnsZDyUpD9nIbj4iE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SRWDtIV2IAYf2z2I1yi5qkDRdxz1QPOGMhrxNdTVy847Uf4EqBY+NmlSwaDPMMRSvvoeqsc834z/236AZ0F9rmE+Tf0f7QK8lr8fRycgpfD+04NY39kcOZsul3L8RHFxHJEhbGpiuNOFEnEs6gKHkye5YspNr+bd5pxTNjcEai4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=eBpQibhv; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="eBpQibhv" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43cf5196c25so42927695e9.0 for ; Wed, 16 Apr 2025 11:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744826721; x=1745431521; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=EWRjEDjHgnGUTAO1fUxX0nlQ73sblTBfWxiyoAckCmI=; b=eBpQibhva8cpm7O70uQni1x6t3Hhh+lUhf574VZhrObwHVPbLaawV8cr1rxZI6JbBE TwOgf2skQCgVJhXtESY4LF7O0XzJzHIXBz+zdH9ftXcUr1AwnbzXee6WVa+TT99AV6mc eg7/aTvDMFWzVD0UanI/nYn1m1zZd1EydYs8mOwcBKm/1O8QtO0ZD/tFPVZ476s8c2rA 5cgvA3iaUWfTvhkLdczmHoAkcC2vMXpsJxgB+4AvonfrOs8eFsx8P8o1gqf5aYVeLteB 8TEDlA4NFdrhuks6bgoYiyrItnKllSQkizAgJW9JaWr7daqVaeQw37d7KoZ93J1hZr+z Wy+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744826721; x=1745431521; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EWRjEDjHgnGUTAO1fUxX0nlQ73sblTBfWxiyoAckCmI=; b=hQds+IHbGn/iOBqQwyrFVa2g26DKg7eW7fC++PBZuAmdbW/Lbb3AFTmw/iFAhZL1E4 D+1ng8fOktUgSHFR+1kdRPODb24KUFI+YWgRlh9AHWaQLWbkDpZPoWgJcaBjigl+41Ld KVAGo6l/+JsGiVf/E8EyWoIu9XVHiO6FqMfi1uPbCbpe1tpF+U4C5j5+drjg0J5qt/Fu bPrLF7FZ8DurIl6vVotN+IVWszefPpjf99eLKeuhbQhe+Gk81d5/1z1pW/sIGXvUKfKD vWfB0kbqDNZ6SKKsyPk9JfLHKbjEZ5M6nTVeh6UHorxHgB6ezwTV1HEyosEn9tiPF5Vm g9Ww== X-Forwarded-Encrypted: i=1; AJvYcCWwt6QDIETsrhKi+brp+hMm9b39ZnpCrYPRCH+DUsfMdyxTa3APJbCxi+XHOd6GJJaUnC2w4CIcIfR6q0Q=@vger.kernel.org X-Gm-Message-State: AOJu0YywhOEiTscGUfcY+5SSoOod/IDfx7R9kmzpGL6nyyBmI+9+snQ/ +Wnjs3Dn2lthmwOdSKEQ/CsT8Ay64hk1AXRDTOF+GzQEmBSZysMMzDiuEFEQKnsMcl6W/yMCyOD 6kB7i3InAeQ== X-Google-Smtp-Source: AGHT+IGKfernDkJiPcq9aGD5Ngb6rDQ85prFSXMtxNjAKHAqgi+juJeLLNi5fr5EDrdbF7a6RZez8kPLKAZvew== X-Received: from wmbev17.prod.google.com ([2002:a05:600c:8011:b0:43d:4055:98e3]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3487:b0:43c:f70a:2af0 with SMTP id 5b1f17b1804b1-4405d62a49cmr36178345e9.16.1744826721678; Wed, 16 Apr 2025 11:05:21 -0700 (PDT) Date: Wed, 16 Apr 2025 18:04:32 +0000 In-Reply-To: <20250416180440.231949-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250416180440.231949-1-smostafa@google.com> X-Mailer: git-send-email 2.49.0.777.g153de2bbd5-goog Message-ID: <20250416180440.231949-3-smostafa@google.com> Subject: [PATCH 2/4] ubsan: Remove regs from report_ubsan_failure() From: Mostafa Saleh To: kvmarm@lists.linux.dev, kasan-dev@googlegroups.com, linux-hardening@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, broonie@kernel.org, catalin.marinas@arm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kees@kernel.org, elver@google.com, andreyknvl@gmail.com, ryabinin.a.a@gmail.com, akpm@linux-foundation.org, yuzenghui@huawei.com, suzuki.poulose@arm.com, joey.gouly@arm.com, masahiroy@kernel.org, nathan@kernel.org, nicolas.schier@linux.dev, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" report_ubsan_failure() doesn't use argument regs, and soon it will be called from the hypervisor context were regs are not available. So, remove the unused argument. Signed-off-by: Mostafa Saleh Acked-by: Kees Cook --- arch/arm64/kernel/traps.c | 2 +- arch/x86/kernel/traps.c | 2 +- include/linux/ubsan.h | 4 ++-- lib/ubsan.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 224f927ac8af..9bfa5c944379 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -1118,7 +1118,7 @@ static struct break_hook kasan_break_hook =3D { #ifdef CONFIG_UBSAN_TRAP static int ubsan_handler(struct pt_regs *regs, unsigned long esr) { - die(report_ubsan_failure(regs, esr & UBSAN_BRK_MASK), regs, esr); + die(report_ubsan_failure(esr & UBSAN_BRK_MASK), regs, esr); return DBG_HOOK_HANDLED; } =20 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 9f88b8a78e50..4b5a7a1a8dde 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -351,7 +351,7 @@ static noinstr bool handle_bug(struct pt_regs *regs) case BUG_UD1_UBSAN: if (IS_ENABLED(CONFIG_UBSAN_TRAP)) { pr_crit("%s at %pS\n", - report_ubsan_failure(regs, ud_imm), + report_ubsan_failure(ud_imm), (void *)regs->ip); } break; diff --git a/include/linux/ubsan.h b/include/linux/ubsan.h index d8219cbe09ff..c843816f5f68 100644 --- a/include/linux/ubsan.h +++ b/include/linux/ubsan.h @@ -3,9 +3,9 @@ #define _LINUX_UBSAN_H =20 #ifdef CONFIG_UBSAN_TRAP -const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type); +const char *report_ubsan_failure(u32 check_type); #else -static inline const char *report_ubsan_failure(struct pt_regs *regs, u32 c= heck_type) +static inline const char *report_ubsan_failure(u32 check_type) { return NULL; } diff --git a/lib/ubsan.c b/lib/ubsan.c index cdc1d31c3821..17993727fc96 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -25,7 +25,7 @@ * The mappings of struct SanitizerKind (the -fsanitize=3Dxxx args) to * enum SanitizerHandler (the traps) in Clang is in clang/lib/CodeGen/. */ -const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type) +const char *report_ubsan_failure(u32 check_type) { switch (check_type) { #ifdef CONFIG_UBSAN_BOUNDS --=20 2.49.0.604.gff1f9ca942-goog From nobody Sat Feb 7 18:32:39 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BE5521CA1E for ; Wed, 16 Apr 2025 18:05:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826727; cv=none; b=I5JH5FLOysXDUEFMHLF7gdY0QFJsC56dKKvC9xSD5kNvPk0KMF+9qVN2zm3mcttn0eoZYI1V7b4rl6KunQ5+xRR+bea91NRMAsXsX22dlvgvBBnMRow9zyG/FZXGIcEqHMwZnfdgy1y9ByI5lLpUUY9Fk00QBB+lJX8jZ7cW0rg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826727; c=relaxed/simple; bh=qVVOFWI4tG2f1bA/OejP77Yl7mmiUbbBq6BO8Hxczz4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Y6ojYTCwRQ7GbLJ8IvoHmRFqBFDwVpJj3lomHhkbYzWzGEbplEYDGk83meWoPK26a1y5xh61WXhGY3VpEKVC23hw6EgRxAwMt38kjW6Ck4sub4SwHq+UHPVdzAGeC0N7DaC/mpxkN1HD6KsAYY4qRozW2rgQ/ES/oMAubiuRwBo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gUThi2Cs; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gUThi2Cs" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43f405810b4so28603195e9.1 for ; Wed, 16 Apr 2025 11:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744826724; x=1745431524; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=KCvuX6D9+WTa2u7saZuKw/wens1B8oyovtAYHu1B0nk=; b=gUThi2CsZv6cn9rD5GxHlimluGrg1EnTcuzVHkn1X4kqIzs2ZZdtoFGQWa/NzLMO+a RgJJUoEPkV+bSYqlvyl64MZkuDD3rN7SFcE2M64u6HSOa7kr8cEDhf7fFRnBXpDrjQj4 750r6r5++NbmWEoiVU4dTDWYAKlqT92zm8bV3s3nUnKYLktT01IG3EcgkcoGavbd4fnF LIoaTiU413g/KGVNm5GXQfoG2PfsVOUl41JjgxA0x3JTBy2xHdLcZsXM29PU6Jo9TZiA xZuWrueyaBtt5kMg4ncVIqIpwAxVGIjVx/FNd2ml4UqpAhDxw1BugHkWXxpeCk/GK1GG kYRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744826724; x=1745431524; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KCvuX6D9+WTa2u7saZuKw/wens1B8oyovtAYHu1B0nk=; b=K2SI+2OYQrsfxGjuvsgmc9x6jKUPd2qDdr8VaAvYo5B8s0nK0hrXnu7A9dasOQDMuI j6q2dRHzCEziGeWGrCEO+/5v+BKkDyVkjOu38kAtcHsDHjUvDHMJH4NSZEOMMM4TWKyO eBUXaTc9xmlRVr0Q3vQIHjCzGWGflUuTMEGViXbyeXwZjnuL+auKXahYHXwIoV6bPgIA BUHhQ0e0gLjSwllil3O0PI3knPMRIUH+B4kDbCwKUVdVMTaUQIW5V37tfXFt41OMbXzt gn/yE9XEU2q30YEQScPDFNu7KmoITa/tWDM5wmxwk3Utcv7xMXL/4FrsVaxuRSM4GT+y 3zFg== X-Forwarded-Encrypted: i=1; AJvYcCWYwStsIbbZNXRzOjV9tJB4yVX1TrCTh6xuVZL9921fng3bhqDgDdgMwsBKLNzUtTXG7fPCmbuWfGof0M8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9d8oC1jSmXDFKfTk4Jnyo3858jwRgl17X74TiwS4s8e3ZGS0s zpCA/cPqmKCghxYuA8lRwX/zHCm9GWJ4U+TFeM9/gfsejGZMKZaDUhRsys5iiBxspLkd901M03i k0LGL+XPSew== X-Google-Smtp-Source: AGHT+IE5cwvkKnuP/EFD2BCghKQMI7oHyo8gaZc3cJ97rDzljSXNx93RTJNUG9F85eyGCrsPnHVKzg/isUAoOA== X-Received: from wmbh25.prod.google.com ([2002:a05:600c:a119:b0:43d:586a:9bcb]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a0e:b0:43d:d06:3798 with SMTP id 5b1f17b1804b1-4405d6adc5emr27421125e9.20.1744826723681; Wed, 16 Apr 2025 11:05:23 -0700 (PDT) Date: Wed, 16 Apr 2025 18:04:33 +0000 In-Reply-To: <20250416180440.231949-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250416180440.231949-1-smostafa@google.com> X-Mailer: git-send-email 2.49.0.777.g153de2bbd5-goog Message-ID: <20250416180440.231949-4-smostafa@google.com> Subject: [PATCH 3/4] KVM: arm64: Introduce CONFIG_UBSAN_KVM_EL2 From: Mostafa Saleh To: kvmarm@lists.linux.dev, kasan-dev@googlegroups.com, linux-hardening@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, broonie@kernel.org, catalin.marinas@arm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kees@kernel.org, elver@google.com, andreyknvl@gmail.com, ryabinin.a.a@gmail.com, akpm@linux-foundation.org, yuzenghui@huawei.com, suzuki.poulose@arm.com, joey.gouly@arm.com, masahiroy@kernel.org, nathan@kernel.org, nicolas.schier@linux.dev, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a new Kconfig CONFIG_UBSAN_KVM_EL2 for KVM which enables UBSAN for EL2 code (in protected/nvhe/hvhe) modes. This will re-use the same checks enabled for the kernel for the hypervisor. The only difference is that for EL2 it always emits a "brk" instead of implementing hooks as the hypervisor can't print reports. The KVM code will re-use the same code for the kernel "report_ubsan_failure()" so #ifdefs are changed to also have this code for CONFIG_UBSAN_KVM_EL2 Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/hyp/nvhe/Makefile | 6 ++++++ include/linux/ubsan.h | 2 +- lib/Kconfig.ubsan | 9 +++++++++ lib/ubsan.c | 6 ++++-- scripts/Makefile.ubsan | 5 ++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Mak= efile index b43426a493df..cbe7e12752bc 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -99,3 +99,9 @@ KBUILD_CFLAGS :=3D $(filter-out $(CC_FLAGS_FTRACE) $(CC_F= LAGS_SCS), $(KBUILD_CFLAG # causes a build failure. Remove profile optimization flags. KBUILD_CFLAGS :=3D $(filter-out -fprofile-sample-use=3D% -fprofile-use=3D%= , $(KBUILD_CFLAGS)) KBUILD_CFLAGS +=3D -fno-asynchronous-unwind-tables -fno-unwind-tables + +ifeq ($(CONFIG_UBSAN_KVM_EL2),y) +UBSAN_SANITIZE :=3D y +# Always use brk and not hooks +ccflags-y +=3D $(CFLAGS_UBSAN_FOR_TRAP) +endif diff --git a/include/linux/ubsan.h b/include/linux/ubsan.h index c843816f5f68..3ab8d38aedb8 100644 --- a/include/linux/ubsan.h +++ b/include/linux/ubsan.h @@ -2,7 +2,7 @@ #ifndef _LINUX_UBSAN_H #define _LINUX_UBSAN_H =20 -#ifdef CONFIG_UBSAN_TRAP +#if defined(CONFIG_UBSAN_TRAP) || defined(CONFIG_UBSAN_KVM_EL2) const char *report_ubsan_failure(u32 check_type); #else static inline const char *report_ubsan_failure(u32 check_type) diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan index 4216b3a4ff21..3878858eb473 100644 --- a/lib/Kconfig.ubsan +++ b/lib/Kconfig.ubsan @@ -166,4 +166,13 @@ config TEST_UBSAN This is a test module for UBSAN. It triggers various undefined behavior, and detect it. =20 +config UBSAN_KVM_EL2 + bool "UBSAN for KVM code at EL2" + depends on ARM64 + help + Enable UBSAN when running on ARM64 with KVM in a split mode + (nvhe/hvhe/protected) for the hypervisor code running in EL2. + In this mode, any UBSAN violation in EL2 would panic the kernel + and information similar to UBSAN_TRAP would be printed. + endif # if UBSAN diff --git a/lib/ubsan.c b/lib/ubsan.c index 17993727fc96..a6ca235dd714 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -19,7 +19,7 @@ =20 #include "ubsan.h" =20 -#ifdef CONFIG_UBSAN_TRAP +#if defined(CONFIG_UBSAN_TRAP) || defined(CONFIG_UBSAN_KVM_EL2) /* * Only include matches for UBSAN checks that are actually compiled in. * The mappings of struct SanitizerKind (the -fsanitize=3Dxxx args) to @@ -97,7 +97,9 @@ const char *report_ubsan_failure(u32 check_type) } } =20 -#else +#endif + +#ifndef CONFIG_UBSAN_TRAP static const char * const type_check_kinds[] =3D { "load of", "store to", diff --git a/scripts/Makefile.ubsan b/scripts/Makefile.ubsan index 9e35198edbf0..68af6830af0f 100644 --- a/scripts/Makefile.ubsan +++ b/scripts/Makefile.ubsan @@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 =20 +#Shared with KVM/arm64 +export CFLAGS_UBSAN_FOR_TRAP :=3D $(call cc-option,-fsanitize-trap=3Dundef= ined,-fsanitize-undefined-trap-on-error) + # Enable available and selected UBSAN features. ubsan-cflags-$(CONFIG_UBSAN_ALIGNMENT) +=3D -fsanitize=3Dalignment ubsan-cflags-$(CONFIG_UBSAN_BOUNDS_STRICT) +=3D -fsanitize=3Dbounds-strict @@ -10,7 +13,7 @@ ubsan-cflags-$(CONFIG_UBSAN_DIV_ZERO) +=3D -fsanitize=3D= integer-divide-by-zero ubsan-cflags-$(CONFIG_UBSAN_UNREACHABLE) +=3D -fsanitize=3Dunreachable ubsan-cflags-$(CONFIG_UBSAN_BOOL) +=3D -fsanitize=3Dbool ubsan-cflags-$(CONFIG_UBSAN_ENUM) +=3D -fsanitize=3Denum -ubsan-cflags-$(CONFIG_UBSAN_TRAP) +=3D $(call cc-option,-fsanitize-trap= =3Dundefined,-fsanitize-undefined-trap-on-error) +ubsan-cflags-$(CONFIG_UBSAN_TRAP) +=3D $(CFLAGS_UBSAN_FOR_TRAP) =20 export CFLAGS_UBSAN :=3D $(ubsan-cflags-y) =20 --=20 2.49.0.604.gff1f9ca942-goog From nobody Sat Feb 7 18:32:39 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAD4F21D011 for ; Wed, 16 Apr 2025 18:05:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826729; cv=none; b=eq+pycTMT4LjznJF65PYqW1an34FGvXe9hhYFfwTcIiaYHxQcHTRuEJ9wRex+7LwLOSDawO5oeyh3U21XdiExfa4URbyNXE0IHkBXYUppGzZJxxaCk5e3YqYhruSXxLpHxAnm4NZgdci0Tp5o58rrPz8ZuXcNO4xkFLKGLABrSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744826729; c=relaxed/simple; bh=YF46acwvxQZbvh+RKbVxSqYbt3n7AeN8CBy/samnYi8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MOI1pMvisIjrpTpReeFhUUAzuVRt23MqRb8fOC6PHKYbMTMRAviNI15bDZgodm5ta0m75RkdKBWEoII8UTThUFu0pS7tTM8cCl8+kNocYzPvgDgdSI7GUgHtLPrQ1qgD2zj87VdhvIZ+jmp4jv6OUQ3/mELT10vWXrVFqoDmssg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=cC7883lH; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cC7883lH" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43ceeaf1524so6038225e9.1 for ; Wed, 16 Apr 2025 11:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744826726; x=1745431526; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xO8p3wWnMTFzkHmEwWDOeYMg/xjqFsfP9HNTtGIh/qY=; b=cC7883lHchJz5AIkmC44j1rVv/r6Bw0NPOcQ1H5ZyOvmAcWVDQbM5vjbnN56z2QpGt cthSuDEUo8FNq26kjHgIzeZRqRlGlnZTnuMM83e0uCjjK4gIsqTW8JUvVqxO2M9i6zA9 1RR8Kin0REtCRasGEQ7s/OJf65oEmFOh4QW1zuoSmzUHpxPXgvlf/fMg7WWPcjndob1m inXL26z767k60cOHd/45GA1WqGDkEdskt+tENXh9rY6DRXVvbqm5MP4lo3VZaV1IL3rs kNzImyGxAFZidg1rkTaUkAMMm0CYOXD02MvDBIp/UO/AjG1zBDaJ8JeDqCmgfG1yiOGT XhOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744826726; x=1745431526; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xO8p3wWnMTFzkHmEwWDOeYMg/xjqFsfP9HNTtGIh/qY=; b=oY7iPhyVKTLgYHsA8Doz2C4iD25zSgUMUmlZfFobWRmV1YNt9ueMu5UKNilawS0OpU VaDx5V2xiLGPAO7eB21uttYhaRV7InnVityYSx5W2Dw/gL09Bv6C1Nmj1dsmhh/haeNO vzpx4oseN3ufaAeVDrCSFhuEgF4aFs+zDKh43LbNcowzMsQopCbaiEJsqwjPGL0DKJ02 nxX5wJlmpAfbsTDAQVDTNZvkrPcHvUcnARAzU2lUX20DgFuWoJbndJ5PyFUW38LFZNLf VY8FLMtn8TfgupFMP0XVYlQnBYExBNYIk5KeFFAF9PHghC8O95FdPr1TXT4JX7s2eeTl xz0w== X-Forwarded-Encrypted: i=1; AJvYcCXRNc6MF7gJUTHIrXL+YYJoqlBOHNg7WtB9n4Nvh0vw/abReRhQNrKqd1hawGeX0R+hNK/QcvMEeoscbrc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxnr4JrReFwQcnBiCZqmCuStJI+iqtJA1tPIBrx673BflP/jexJ zAxbknOcsHg360ZTP3vnf5P8V95rsHNxjRfvxXuDWcuCshkW7IwxrPEdiRJItPSgZxL4dE0wkbQ af4gZ/8NVew== X-Google-Smtp-Source: AGHT+IFu4srZxpATOjlO2rI6vko1n4XKZtERHwJbfnOezh1jE9LHVVBUHBqm8Y3anm1ST1HCKXtYf3N4xz9VaA== X-Received: from wmbh25.prod.google.com ([2002:a05:600c:a119:b0:43d:586a:9bcb]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a4b:b0:43b:4829:8067 with SMTP id 5b1f17b1804b1-44062421bd7mr3209925e9.6.1744826726256; Wed, 16 Apr 2025 11:05:26 -0700 (PDT) Date: Wed, 16 Apr 2025 18:04:34 +0000 In-Reply-To: <20250416180440.231949-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250416180440.231949-1-smostafa@google.com> X-Mailer: git-send-email 2.49.0.777.g153de2bbd5-goog Message-ID: <20250416180440.231949-5-smostafa@google.com> Subject: [PATCH 4/4] KVM: arm64: Handle UBSAN faults From: Mostafa Saleh To: kvmarm@lists.linux.dev, kasan-dev@googlegroups.com, linux-hardening@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, broonie@kernel.org, catalin.marinas@arm.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kees@kernel.org, elver@google.com, andreyknvl@gmail.com, ryabinin.a.a@gmail.com, akpm@linux-foundation.org, yuzenghui@huawei.com, suzuki.poulose@arm.com, joey.gouly@arm.com, masahiroy@kernel.org, nathan@kernel.org, nicolas.schier@linux.dev, Mostafa Saleh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As now UBSAN can be enabled, handle brk64 exits from UBSAN. Re-use the decoding code from the kernel, and panic with UBSAN message. Signed-off-by: Mostafa Saleh --- arch/arm64/kvm/handle_exit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index b73dc26bc44b..5c49540883e3 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -10,6 +10,7 @@ =20 #include #include +#include =20 #include #include @@ -474,6 +475,11 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr,= u64 spsr, print_nvhe_hyp_panic("BUG", panic_addr); } else if (IS_ENABLED(CONFIG_CFI_CLANG) && esr_is_cfi_brk(esr)) { kvm_nvhe_report_cfi_failure(panic_addr); + } else if (IS_ENABLED(CONFIG_UBSAN_KVM_EL2) && + ESR_ELx_EC(esr) =3D=3D ESR_ELx_EC_BRK64 && + esr_is_ubsan_brk(esr)) { + print_nvhe_hyp_panic(report_ubsan_failure(esr & UBSAN_BRK_MASK), + panic_addr); } else { print_nvhe_hyp_panic("panic", panic_addr); } --=20 2.49.0.604.gff1f9ca942-goog