From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16A04C433ED for ; Fri, 30 Apr 2021 20:43:09 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 987D4613DC for ; Fri, 30 Apr 2021 20:43:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 987D4613DC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ilay2o3cEjzYqa8xbdPIzh68IDz0ONDerWp27D3cdjI=; b=c8gUkLGdOzCB1f7UEnxZvCltL GdyZ5mw70v94cmapeC+D1uOSvLlWuTzbL+B2hOQQaRQCArdZ/l05Z5+QPDCUn5Q+IBkhFx/F8Etqf E4+GcMMm/GPFIVlcFyrlvWli/geKPyzkhHYpJ8mQqU63HVM32900KtxXw2ztJHe59QhcS4qQKzOS+ IKoUJAKStUHtWUCgBehxxD457ucAMTn1qJUHs/FbFIWc4aFze21AH097LwX3DQQMS8t6zc2SpHUV+ bAPmBCq31NARong4l4MPfM787OJHRGWve6vCDxd6gYbqI7IthJhSTPFR56wZ2uhx7tQgWPNlHIT1k 2geRYNbcg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcZwI-008Yet-GB; Fri, 30 Apr 2021 20:40:42 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcZty-008YEZ-Mj for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 20:38:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=wp7Rsa3dbFK1Rt2HaXcIflNA2UCoRc1Jacf2kiGOD4Y=; b=IKdSD5tEOid1vtf3barFC5y8l5 9urFl6iXAKRTeMsNXs0vqBae1i0pidGc6wN4WzqU1Uq2aItcKkTOA6q9D2SYHoUQ8ZyQvjy84+D4z xsdOrxQFz4TF03eWRAiP6t+WUsQsKcB+LBTmB8GnCP63navEmr52kr3yyfMsRvQr24svo5++pQnQY CLzPDih+5cJkzhtJy2PI+OI422eXCtH3H1O37WPuv06LifhaeyBvbdU5+QEh5TQjnHGWmiHQO1L3a bIsZmYEf08XmtY6Gr8vZs7tD/Hn0MIAx6AOr31HKXoI3SXh6kq8XbLqDHq/9mzeVYGgVLErmd63bJ bXdIrtjA==; Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcZtv-001ekk-Uo for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 20:38:17 +0000 Received: by mail-wr1-x42b.google.com with SMTP id h4so62900683wrt.12 for ; Fri, 30 Apr 2021 13:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wp7Rsa3dbFK1Rt2HaXcIflNA2UCoRc1Jacf2kiGOD4Y=; b=fTWIgIXXXBicM8mkR4e+jMmoMkXLMfXIPA8qQJfimikpqNo4e6OavH5E2OFZQldeFV wdFu2C17LBu3ZAafS1DpnRtyU4zQ1q7hL/DdUZUopyaPYWKVkOnAOVxVT7gmhzihNhkA RpwpPqwn/JyMXn7bsws+DE6vi1jEZxsi1D6DQpfPSaHA3VYErEIxGP10opO3WQRGovzW T/gZAAry1kzu0qIbeQif93P8myozy7i4SphAn7qrDDyLLQv9S7SYSkKQkEa1nvU7F0fu P87agY0+PtB1lGoj+4fEcJ0rH2pAb6xB6djbUyfg4cZoHgAYFjtdJxqY/OGX56xL2bHV yc4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wp7Rsa3dbFK1Rt2HaXcIflNA2UCoRc1Jacf2kiGOD4Y=; b=MnA+XxRzu52tL2zgvpaoKrC6zQxbwiSnn+dKx1YsVckSVslhXfbUqROCFYn7w3mxiw 5Z/LMtm180navw5QZPJW7cn4eS4BpU6QKDrhh8U/LyDNWiyalFASbfEoMhIqKraogGgn fl4seerz0EUqq5FhoJamLQw25J/KEunQK8W2LvwZfe5O5Ze/X29CvVNt0TgVU+4kZ5ho Eby+Oo0R+TRfNT5Sigigfd7URgIDqlNKbz/yGyCdtmuAWyJVWoWRoN7g+ChPEHQYl3fT ZmOMpqw8bdLQemRQlN1nZdLyypzYkhJ7hBQAS/XvujmbyJYvjCJOerbrtH0os52E2n2g gJPw== X-Gm-Message-State: AOAM532s+iVosq8PwJAuNMqOO8DB/hFEKTx+DiPKMSkf42XJwFD5gj2Y RXxheAaaDhBM/sON3s4t67s= X-Google-Smtp-Source: ABdhPJwsNZHj8NpnDYRZa7EoRD8F5v2Z3j4FTMvwiwmwQHZqMamEq3kqT32JAYW/vdBQAdOO2UmHUw== X-Received: by 2002:adf:f8cb:: with SMTP id f11mr9644074wrq.168.1619815094834; Fri, 30 Apr 2021 13:38:14 -0700 (PDT) Received: from amanieu-desktop.home ([2a00:23c6:f081:f801:93ef:94e:9f8:1f0]) by smtp.gmail.com with ESMTPSA id r5sm4384239wmh.23.2021.04.30.13.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 13:38:14 -0700 (PDT) From: Amanieu d'Antras To: Cc: Amanieu d'Antras , Ryan Houdek , Catalin Marinas , Will Deacon , Mark Rutland , Steven Price , Arnd Bergmann , David Laight , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 6/8] arm64: Add a compat syscall flag to thread_info Date: Fri, 30 Apr 2021 21:37:55 +0100 Message-Id: <20210430203757.47653-5-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210430202810.44092-1-amanieu@gmail.com> References: <20210430202810.44092-1-amanieu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210430_133816_017088_AA29E746 X-CRM114-Status: GOOD ( 15.80 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This flag is used by in_compat_syscall to handle compat syscalls coming from 64-bit tasks. Signed-off-by: Amanieu d'Antras Co-developed-by: Ryan Houdek Signed-off-by: Ryan Houdek --- arch/arm64/include/asm/compat.h | 4 ++-- arch/arm64/include/asm/elf.h | 13 ++++++++++++- arch/arm64/include/asm/thread_info.h | 6 ++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index a2f5001f7793..124f4487dfee 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -190,13 +190,13 @@ static inline bool is_compat_thread(struct thread_info *thread) static inline bool in_compat_syscall(void) { - return is_compat_task(); + return current_thread_info()->use_compat_syscall; } #define in_compat_syscall in_compat_syscall /* override the generic impl */ static inline bool thread_in_compat_syscall(struct thread_info *thread) { - return is_compat_thread(thread); + return thread->use_compat_syscall; } #else /* !CONFIG_COMPAT */ diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index e21964898d06..49a9a9db612c 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -158,10 +158,20 @@ typedef struct user_fpsimd_state elf_fpregset_t; */ #define ELF_PLAT_INIT(_r, load_addr) (_r)->regs[0] = 0 +#ifdef CONFIG_COMPAT +#define CLEAR_COMPAT_SYSCALL() \ +({ \ + current_thread_info()->use_compat_syscall = false; \ +}) +#else +#define CLEAR_COMPAT_SYSCALL() ((void)0) +#endif + #define SET_PERSONALITY(ex) \ ({ \ clear_thread_flag(TIF_32BIT); \ current->personality &= ~READ_IMPLIES_EXEC; \ + CLEAR_COMPAT_SYSCALL(); \ }) /* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */ @@ -228,7 +238,8 @@ typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG]; #define COMPAT_SET_PERSONALITY(ex) \ ({ \ set_thread_flag(TIF_32BIT); \ - }) + current_thread_info()->use_compat_syscall = true; \ +}) #ifdef CONFIG_COMPAT_VDSO #define COMPAT_ARCH_DLINFO \ do { \ diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index 6623c99f0984..02310b45900d 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -42,6 +42,12 @@ struct thread_info { void *scs_base; void *scs_sp; #endif +#ifdef CONFIG_COMPAT + /* + * compat task or inside a compat syscall from a 64-bit task + */ + bool use_compat_syscall; +#endif }; #define thread_saved_pc(tsk) \ -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel