From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 58AA82918F0 for ; Tue, 22 Apr 2025 16:24:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745339048; cv=none; b=SLxln/DkHURgy3/9Qhxx2yLMPLX90C+l2a/Loox+tBZfm8H0toz+v06PENTB8IA1atcnV5QgzvPCuyNbY/xU9yMG006l99jf6BEGfI/Az6tlqc9t4s1BMZuyqnMVLOmc1mO2KoLbBOO+WUKKkQ8Nx48OcOM0f5Cgzw61KO1PEWo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745339048; c=relaxed/simple; bh=3c04UkOrUox/J2FZTkrec1ceD/ayEJGwE5Hr0AcuBg0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oXe+3o6wEfMmIK/GoXV9k4PWAVIYGSjC1QReNNtm/GJW7mjYCcnuRddBQmLlzxBKBeyi98Xy1w2JK9n790E9bf2A0ZrzXPmuZyV2Mz216g9ZS4NPkPJ9Zi42lsgGNRSlmnjjiGPBDlmEtwVaSAimTgEb6ytkUZIB/p40yQJRLwE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=b5tYUKJZ; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="b5tYUKJZ" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-736dd9c4b40so37195b3a.0 for ; Tue, 22 Apr 2025 09:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745339046; x=1745943846; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZCsItzx1CW8cAI7eK80VGXHXyDDk8PWaNf7CXRhWciY=; b=b5tYUKJZW+Q+l8NimwxxdYqUK1a+y7fImJBjdhs1yiiVfMkZ/QhQ5kfBj+pUABfNGV 9wQ4hRDc9b2MBOGcTkqeE+rAwQSD9DeWtWg/YFrbDJ7fBz/X/PqOlS2R9WMajqGmp1gd 7SScYOVJndZv55id4twCSVqOJl093XQVDrXRqz8znaejBBZCE6sXhCEHulIoS5zJO/Uv 83uO79OFdsVc6nzQ7pu+YcNBswNWY+MsIWfOvuiJgaeftlT9YpjEASLDahOjBqTYPhO+ F5j1BlBsqpnyMOw2FNyG84amjSs8YVQBzPy5zFzkPVLUQiF/Hbhj+8wstHjskNhdllUV P0KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745339046; x=1745943846; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZCsItzx1CW8cAI7eK80VGXHXyDDk8PWaNf7CXRhWciY=; b=oeu1IEF8ppQ75FRG+H5Rpq2t81y/VX9ahd90u54Wc4TtuTP/rTujjATi3iupiQzHmo g+LewlN4gsBmfir6FGcw9cTDRQGqWP/EPINBXhefuzbwjjoklHo9f9Ws8BLmDjRHYnnf FYRjUS6PBsDL/kLCeww9X3tylYRmWnyOVjuPMb2Nj+XawAWL7HpTgdsVWw1yCOsOxEPd lWXTXtGCMLgTCnAXL4SxtSo5VUTs3ne7KBRZxuhCjM8lKagHmud8ip8O3FPHAuyA/qnU sk1HVnfsda/VJU/yezDdjFD9ptF5AfgtpY8pmybtNkDBV+UDkb0PHoukPA93xYZ14PUo 5y8w== X-Forwarded-Encrypted: i=1; AJvYcCUCTWJVIhwRKQAqI+3XSojSDY/V5LGHe/Jmph1SkEmDi4ENBBQdQvA7L3ebK/spem8jvRZ1QPPZHJ8UqNU=@vger.kernel.org X-Gm-Message-State: AOJu0YxVvG7c7QY0+O1ZpZMMEl+Ya4s29whLgjFOS1WjqL7IqrCpwlco 39h3YpVLtLpNK2L4rCxrBAuXCckBuqCyD+EFCKKcNwyqWrjasJKnixtN7ZFO58c= X-Gm-Gg: ASbGncsuLkmGEWP9bCftIaBPfE0hEP1Q1TKCWlSBfbVgZLs6lmzhjyA2NNLcNta56pL sjttBezZDv+JGLxFtRsgkb/O/JodCqBpl0A99eMeHw7Uq3joVhOwUblnRxnG7rFcuem/SQWwejQ 7ABBnrddoZqmN6QiA1m/UWi10OkNvxM2Rn4pRzr57eXOjkHXJZxVoe1hR1fQrYk4p56hzmhBE4Z E5jU5dvhUeu1ft+8NUQhoMDjtgLw4HzAOeUk28IB1faajtyJQXAE/dVh2Zu68wS3m74DhdSS6p1 KdmqoRA85Q4wcAi3Bq1Lu5FIO2b+aVo1Dfjb8ZWKUNudCgb69pnt X-Google-Smtp-Source: AGHT+IGpp8Vb3J0UHalvNL44o+7PVRW8uyjzoX0zSKYSZndRHv6HkVGApSau1aMm3e/cFnTOOl9eew== X-Received: by 2002:a05:6a00:6c92:b0:732:56a7:a935 with SMTP id d2e1a72fcca58-73dbe638b2bmr27078656b3a.12.1745339046287; Tue, 22 Apr 2025 09:24:06 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8e13e1sm8850825b3a.46.2025.04.22.09.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 09:24:05 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-kernel@vger.kernel.org (open list), linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK) Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Shuah Khan , Andrew Jones , Samuel Holland Subject: [PATCH v2 2/5] riscv: misaligned: enable IRQs while handling misaligned accesses Date: Tue, 22 Apr 2025 18:23:09 +0200 Message-ID: <20250422162324.956065-3-cleger@rivosinc.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250422162324.956065-1-cleger@rivosinc.com> References: <20250422162324.956065-1-cleger@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can safely reenable IRQs if coming from userspace. This allows to access user memory that could potentially trigger a page fault. Fixes: b686ecdeacf6 ("riscv: misaligned: Restrict user access to kernel memory") Signed-off-by: Clément Léger --- arch/riscv/kernel/traps.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index b1d991c78a23..9c83848797a7 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -220,19 +220,23 @@ static void do_trap_misaligned(struct pt_regs *regs, enum misaligned_access_type { irqentry_state_t state; - if (user_mode(regs)) + if (user_mode(regs)) { irqentry_enter_from_user_mode(regs); - else + local_irq_enable(); + } else { state = irqentry_nmi_enter(regs); + } if (misaligned_handler[type].handler(regs)) do_trap_error(regs, SIGBUS, BUS_ADRALN, regs->epc, misaligned_handler[type].type_str); - if (user_mode(regs)) + if (user_mode(regs)) { + local_irq_disable(); irqentry_exit_to_user_mode(regs); - else + } else { irqentry_nmi_exit(regs, state); + } } asmlinkage __visible __trap_section void do_trap_load_misaligned(struct pt_regs *regs) -- 2.49.0