From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 BA8081BBBC8 for ; Thu, 23 Jan 2025 19:15:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659726; cv=none; b=nF4c66enN3VKMcw2BUUYf/nWItBCFbM4pRumnQ+YtXF7F+Bo/HyFBASKuSWYcb64Loj28DXmU6ASMXpoCm5ouqFuALvqTr7d7rWMaMp2I7fzmOHowS9v6L1IMPY4Tf+Hibe3Tho+pvRNRlCd0HcvVnuYd8WC5mE5v2QNikek0Wo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737659726; c=relaxed/simple; bh=sNZ3kRgQB3K0rJNT54yR9TpYcWCb1xtle/FG6x9msOc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DOI23GeXMWLC282f3rqFGUSiY+zzyeioejhaeU68IIeEHinz9qxvLsKd3DVE6NfxTwZ6dQjlGUBdgZt1vY+b8zMZKoz4zTshMRhpze6fEoB9VhCVg/+0gzqDT2yetTQ8oKbQHkVS12uAgkzC+K+gp1c1N5ZFol8AWJwRwNZwZr0= 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=gkG48DU1; arc=none smtp.client-ip=209.85.214.169 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="gkG48DU1" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21654fdd5daso22424375ad.1 for ; Thu, 23 Jan 2025 11:15:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1737659724; x=1738264524; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OT7EL7aXHj5Qe8OT6w++iL8CLZKTuGLA5KeWTFGIQzY=; b=gkG48DU1PySSWMFCC9KF3UFBpSCM0dWIfzKW/f9yVDKyrVC0QjYGkfMRLse4A9H4Jq P2YKdGpZtj44fPGMEexUPacNo3ZanSrF8eRDV1aOHTcQVQExrZfZ3RHWpu2GwyGMeEKb akccOaVMVPRpulMyHruuzxdzZmYXqY5EQGtyxCrkVRi2DXTEOzWuQdXzqz2XVTQKcrgX fJmY9yJN02CUpDfo8Qo8p2R/1aM/9MavVuk3o1OVqL/THPprzgb4aG7BhojmEjyeyKl7 7vgMX3G+DYh2LXb3Ra3QVqgL67IpFmYGUm7M2yrRTFyVNr8L+fS/XxZB4XrDic/W6StH 9G7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737659724; x=1738264524; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OT7EL7aXHj5Qe8OT6w++iL8CLZKTuGLA5KeWTFGIQzY=; b=gH/fV5GruMSrMWyptoNlcLKQD/2Lvo1M+jhLR4OFRQH7FbXKWRzycIrwsGr3EpuaXZ A0IB55BYGXFW4W6PzUX8rFZr4UdIgHUt1fi9XPvuN/AXumgOKtcgWCceV6wK2m6MPiOF qYRtqi+yBB9EG+37ut9U9huR51kjKB5AgkAe1QYNpEjUwyzEY22icrO3ojdwPTYWQSmb GZ2xdEfSlR717d25kQnS8Dz0nxMoJ0AXdkBcaaBSIQybQa9AH/Hm3VCDw/LlLUDNyXyb d/3ROU+j8Ng7wWHPIv9qWMykF3yHiThrw5K1TofRaZziQOE7SVML3xGn2xE0+8Vpnjop yh8g== X-Forwarded-Encrypted: i=1; AJvYcCXZIykCLFQVWw63+26d2jjTQXDbHAUyIcVqY+DmoP3RuLk9cTQ00ROmCXoQLy1U+HSWHgGtpxtbrnur00o=@vger.kernel.org X-Gm-Message-State: AOJu0YwSl7xLZzKrLFRvXUqQSgXTIwlM0OjOvvl10wPPViYz7REm719U WVt1UrtBASb0wobX8cUL2j4pYXRD+VSXvvsggdXXcFohuWGQqTtR0w0ZEDKfntA= X-Gm-Gg: ASbGncvj+ZeNtlU1qUTQjJp8t65DbEjaPh//rgGpNkqmxagPNwriWHDjU/0D8mTpcej Gz/yx5xbq+eojYwIsWN9j2fC3lcdyRXWvIWn8GNdB7/VPg7iU/85dIBCAZf1AXFFrv6K5vNdrV+ lnymVKPyLRwKHfuu3TTxZfa1b/FBUK3XJfCsToLpaQJU8aRcGiX9jSygti2lRbsfMTo57GLPmby VTSyb+3MVE03SquxyO1cSfpfn6Lv/ru29tgimc2KlDGBuy9x5mUXjSuondWUFCSRQo2ckxc3UQr YC3WrEciA498bHIksi5w X-Google-Smtp-Source: AGHT+IEYNOhlEJXPQBtWi85GhJgHV9Yrk3PSdmPAVSOzqlnq4qLhaCE8KgNu8jpQHMIt2g3t9EdDpA== X-Received: by 2002:a17:902:ce0c:b0:21c:e34:c8c3 with SMTP id d9443c01a7336-21c35540560mr481214975ad.24.1737659723835; Thu, 23 Jan 2025 11:15:23 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea3cb2sm2504645ad.90.2025.01.23.11.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 11:15:22 -0800 (PST) From: Charlie Jenkins Date: Thu, 23 Jan 2025 11:14:32 -0800 Subject: [PATCH v2 4/4] entry: Inline syscall_exit_to_user_mode() 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: 7bit Message-Id: <20250123-riscv_optimize_entry-v2-4-7c259492d508@rivosinc.com> References: <20250123-riscv_optimize_entry-v2-0-7c259492d508@rivosinc.com> In-Reply-To: <20250123-riscv_optimize_entry-v2-0-7c259492d508@rivosinc.com> To: Paul Walmsley , Palmer Dabbelt , Huacai Chen , WANG Xuerui , Thomas Gleixner , Peter Zijlstra , Andy Lutomirski , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Charlie Jenkins X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5145; i=charlie@rivosinc.com; h=from:subject:message-id; bh=sNZ3kRgQB3K0rJNT54yR9TpYcWCb1xtle/FG6x9msOc=; b=owGbwMvMwCXWx5hUnlvL8Y3xtFoSQ/qkqU53TuRtTHj3fNe5lfPyE/IEpc/3RlRNFXlhaxe/Q 9wmfbFCRykLgxgXg6yYIgvPtQbm1jv6ZUdFyybAzGFlAhnCwMUpABNZZs/wT7++1v5d9o4WnqBP p6Tbpq2w1IqbmD7lttHvQ9uM3U10tzP8D1grdbP/UmxWhqVs6beLTJv/6C04VHugw9nyjL1s4wE rZgA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 Architectures using the generic entry code can be optimized by having syscall_exit_to_user_mode inlined. Signed-off-by: Charlie Jenkins --- include/linux/entry-common.h | 43 ++++++++++++++++++++++++++++++++++++-- kernel/entry/common.c | 49 +------------------------------------------- 2 files changed, 42 insertions(+), 50 deletions(-) diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h index fc61d0205c97084acc89c8e45e088946f5e6d9b2..ee1c400bc0eb0ebb5850f95e856b819fca7b3577 100644 --- a/include/linux/entry-common.h +++ b/include/linux/entry-common.h @@ -14,6 +14,7 @@ #include #include +#include /* * Define dummy _TIF work flags if not defined by the architecture or for @@ -366,6 +367,15 @@ static __always_inline void exit_to_user_mode(void) lockdep_hardirqs_on(CALLER_ADDR0); } +/** + * syscall_exit_work - Handle work before returning to user mode + * @regs: Pointer to current pt_regs + * @work: Current thread syscall work + * + * Do one-time syscall specific work. + */ +void syscall_exit_work(struct pt_regs *regs, unsigned long work); + /** * syscall_exit_to_user_mode_work - Handle work before returning to user mode * @regs: Pointer to currents pt_regs @@ -379,7 +389,30 @@ static __always_inline void exit_to_user_mode(void) * make the final state transitions. Interrupts must stay disabled between * return from this function and the invocation of exit_to_user_mode(). */ -void syscall_exit_to_user_mode_work(struct pt_regs *regs); +static __always_inline void syscall_exit_to_user_mode_work(struct pt_regs *regs) +{ + unsigned long work = READ_ONCE(current_thread_info()->syscall_work); + unsigned long nr = syscall_get_nr(current, regs); + + CT_WARN_ON(ct_state() != PERF_CONTEXT_KERNEL); + + if (IS_ENABLED(CONFIG_PROVE_LOCKING)) { + if (WARN(irqs_disabled(), "syscall %lu left IRQs disabled", nr)) + local_irq_enable(); + } + + rseq_syscall(regs); + + /* + * Do one-time syscall specific work. If these work items are + * enabled, we want to run them exactly once per syscall exit with + * interrupts enabled. + */ + if (unlikely(work & SYSCALL_WORK_EXIT)) + syscall_exit_work(regs, work); + local_irq_disable_exit_to_user(); + exit_to_user_mode_prepare(regs); +} /** * syscall_exit_to_user_mode - Handle work before returning to user mode @@ -410,7 +443,13 @@ void syscall_exit_to_user_mode_work(struct pt_regs *regs); * exit_to_user_mode(). This function is preferred unless there is a * compelling architectural reason to use the separate functions. */ -void syscall_exit_to_user_mode(struct pt_regs *regs); +static __always_inline void syscall_exit_to_user_mode(struct pt_regs *regs) +{ + instrumentation_begin(); + syscall_exit_to_user_mode_work(regs); + instrumentation_end(); + exit_to_user_mode(); +} /** * irqentry_enter_from_user_mode - Establish state before invoking the irq handler diff --git a/kernel/entry/common.c b/kernel/entry/common.c index e33691d5adf7aab4af54cf2bf8e5ef5bd6ad1424..f55e421fb196dd5f9d4e34dd85ae096c774cf879 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -146,7 +146,7 @@ static inline bool report_single_step(unsigned long work) return work & SYSCALL_WORK_SYSCALL_EXIT_TRAP; } -static void syscall_exit_work(struct pt_regs *regs, unsigned long work) +void syscall_exit_work(struct pt_regs *regs, unsigned long work) { bool step; @@ -173,53 +173,6 @@ static void syscall_exit_work(struct pt_regs *regs, unsigned long work) ptrace_report_syscall_exit(regs, step); } -/* - * Syscall specific exit to user mode preparation. Runs with interrupts - * enabled. - */ -static void syscall_exit_to_user_mode_prepare(struct pt_regs *regs) -{ - unsigned long work = READ_ONCE(current_thread_info()->syscall_work); - unsigned long nr = syscall_get_nr(current, regs); - - CT_WARN_ON(ct_state() != CT_STATE_KERNEL); - - if (IS_ENABLED(CONFIG_PROVE_LOCKING)) { - if (WARN(irqs_disabled(), "syscall %lu left IRQs disabled", nr)) - local_irq_enable(); - } - - rseq_syscall(regs); - - /* - * Do one-time syscall specific work. If these work items are - * enabled, we want to run them exactly once per syscall exit with - * interrupts enabled. - */ - if (unlikely(work & SYSCALL_WORK_EXIT)) - syscall_exit_work(regs, work); -} - -static __always_inline void __syscall_exit_to_user_mode_work(struct pt_regs *regs) -{ - syscall_exit_to_user_mode_prepare(regs); - local_irq_disable_exit_to_user(); - exit_to_user_mode_prepare(regs); -} - -void syscall_exit_to_user_mode_work(struct pt_regs *regs) -{ - __syscall_exit_to_user_mode_work(regs); -} - -__visible noinstr void syscall_exit_to_user_mode(struct pt_regs *regs) -{ - instrumentation_begin(); - __syscall_exit_to_user_mode_work(regs); - instrumentation_end(); - exit_to_user_mode(); -} - noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) { enter_from_user_mode(regs); -- 2.43.0