From patchwork Thu Oct 10 11:33:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13829991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 54649CF11D2 for ; Thu, 10 Oct 2024 11:40:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OxEtYMLSB1QX4C5qcE83rstSx0FEcAVbxyG1Gu9/c1s=; b=P8ALwNhKvz3ae9K751Zi6dTsn1 ufWwFdD3OhHUrdB0lE9WiSPq8/Gec1CuloKVrLYFnFOMI/sEg8+Y22ubUqzQ1fTlw+HAxdltL+GAj J/cVl5Sq/L/0qlyMG7f3e2edpjUu0EwbAMjeNIlxsf+GBFsoW6MOyqxp1dRPoLAeM+3YkwjDi8EDE cqYpvf9BOi9mLTELh/VMb3cm1nyC7zv8fqqXn64w6S5gyHYadDTfiX6ixbVteR3jM6TLj13WRkKDl A4D+u6+rPmqjAtBeu+iwe81TagD+Ig3+FiMBwrVWz+5+7E75FGxyCpAhaOAiM0zsah0KzyPMKXdBW sGUrHhWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1syrWX-0000000CZzL-2meW; Thu, 10 Oct 2024 11:40:05 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1syrQT-0000000CYA5-3YVF for linux-arm-kernel@lists.infradead.org; Thu, 10 Oct 2024 11:33:53 +0000 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5c903f5bd0eso1046350a12.3 for ; Thu, 10 Oct 2024 04:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728560028; x=1729164828; darn=lists.infradead.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=OxEtYMLSB1QX4C5qcE83rstSx0FEcAVbxyG1Gu9/c1s=; b=jLp82/UDEB/V6ZO/o+4KIxuTLIG+9/1OmytPp9OVKq3Bp6krIB8xMlB4EkwbVtnPuD goD6nx9NWPfHIoMGpkbk5SoRJmR0nH7sfJ1fTGWzI+qEkEkX5GB/J3MrJ5GFk5+xBMz3 3LleEip6aPKx9uRU09f/yZRmlpDru3t579F1NLXV9VvzIUZPGCAxV3R0Kn1RtmQ6bR8S lRLCAXxPlPTKEHDzEu+1goG0CyD4I5WubMvEqgQg5Rq1iaGkjTYE5b6NPetdPRoJFZ8+ hZMgL4l88iixq7+KBqm3scvqcdJyWCsGEFcH5Fh2IuZ1V/9oOADwOMvHvTuxeFq/Y6Bc RHQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728560028; x=1729164828; 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=OxEtYMLSB1QX4C5qcE83rstSx0FEcAVbxyG1Gu9/c1s=; b=ddkiN/nrSdjxwLcr9ZuPVIURqUpzMzCLs65sgSJIZtPHgl50SMKxNXkl6kALQndg1j XbUj42l0D1/s7HmugIs5Dq+2tuhZ5zzMNnoaT1MJvEZNrRFc/XtJGWoCEQxgXVNq/eLp OusMemAgTvAiUWxlz3k/ZLyfWaKfx9Pm5U6eVULVOo6HURM3EqykUlETUBuH1xL8yHmn NY5Pj+XgfsT0uQogZOWusoJwaJv4z7MC1WPn6WT97pGIadft/AIgoLzdWNlkZxVetsea PQSnd8wmtHNG6pmJaAQwb/NVsPj9WuY5+btLzOLVZndLbPDoCN5+R1UXUoIuCPTfecu5 mcvQ== X-Gm-Message-State: AOJu0YwMTSJnsnhgSKY/xcHKyHBaHoMxo0EehaK6qmYC83h8NYZiFcbH 8qA9g5MbeBwfnn+mXnIhLZacDGjYaH6kFu4KNIpv0YqUZ7xlVGt6PgZ4EaQPbEk= X-Google-Smtp-Source: AGHT+IGmKNJPIbWGBVZJfO8+b8zw8XAoQP29rf5wbFh2YjSEj93didfv6G/hdQTs2PTJu3Y9jhUpkw== X-Received: by 2002:a17:907:360d:b0:a99:adc1:1432 with SMTP id a640c23a62f3a-a99adc11551mr84023666b.65.1728560028080; Thu, 10 Oct 2024 04:33:48 -0700 (PDT) Received: from lino.lan ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99a7f25406sm77619066b.69.2024.10.10.04.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2024 04:33:46 -0700 (PDT) From: Linus Walleij Date: Thu, 10 Oct 2024 13:33:41 +0200 Subject: [PATCH RFC 03/28] ARM: entry: Skip ret_slow_syscall label MIME-Version: 1.0 Message-Id: <20241010-arm-generic-entry-v1-3-b94f451d087b@linaro.org> References: <20241010-arm-generic-entry-v1-0-b94f451d087b@linaro.org> In-Reply-To: <20241010-arm-generic-entry-v1-0-b94f451d087b@linaro.org> To: Oleg Nesterov , Russell King , Kees Cook , Andy Lutomirski , Will Drewry , Frederic Weisbecker , "Paul E. McKenney" , Jinjie Ruan , Arnd Bergmann , Ard Biesheuvel , Al Viro Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij X-Mailer: b4 0.14.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241010_043349_992294_CE1E49B5 X-CRM114-Status: GOOD ( 11.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Don't introduce this extra label anymore now that we have a clearly defined entry point for ret_to_user. Signed-off-by: Linus Walleij --- arch/arm/kernel/entry-common.S | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index f379c852dcb7..2f93c2f6d5b8 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -102,7 +102,6 @@ ENDPROC(ret_fast_syscall) * do_work_pending() will update this state if necessary. */ ENTRY(ret_to_user) -ret_slow_syscall: #if IS_ENABLED(CONFIG_DEBUG_RSEQ) /* do_rseq_syscall needs interrupts enabled. */ enable_irq_notrace @ enable interrupts @@ -136,7 +135,7 @@ ENTRY(ret_from_fork) badrne lr, 1f retne r5 1: get_thread_info tsk - b ret_slow_syscall + b ret_to_user ENDPROC(ret_from_fork) /*============================================================================= @@ -310,13 +309,13 @@ __sys_trace_return_nosave: enable_irq_notrace mov r0, sp bl syscall_trace_exit - b ret_slow_syscall + b ret_to_user __sys_trace_return: str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 mov r0, sp bl syscall_trace_exit - b ret_slow_syscall + b ret_to_user .macro syscall_table_start, sym .equ __sys_nr, 0