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,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 D8CA6C433ED for ; Tue, 18 May 2021 09:12:11 +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 6E66D60720 for ; Tue, 18 May 2021 09:12:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E66D60720 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=WdA/tl1WaW+rr9mVXXUcRq39G OEXLuAiM8PPPjUoJx9T4QkUIO4+g1ZP5DN3XYDasCjbv/SZfazhlLD2rvpBH2sMBSZSwEW389wnGQ jI4He8m75/1EjINBO2VsZVgFFW8vlTiTs0PkwzMq0JXWKJEsR/qKye1YAJLheyUUNn1wjEHLbc6Ua i/IZHxsCl3e2rSK35esqZt8CZINuYRzKPR/9kPTCw8tZY7gQB+LrfqTuFmB1sj5kM9Eutk5mwvVsK 6C5jiZu43FvwzV3b25B1Sxa+hpB2dwF8dTibMvygvjxXDNcx41l+GKrgEfHvoayEpNH+iSesL517s ebAATIS2w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1livkI-0003oU-Uz; Tue, 18 May 2021 09:10:35 +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 1livhB-0002cY-5m for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:07:21 +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=y9RsP7aKLGFOxM/mb9Lt/ch4sA HqsG+eVvaZTY2gGma3jUna0ebnONV//QnMVmOTH+l9RHQXpR2KpFe1moagm6vVE/PbotO9O4BN1CG SX79FOmu4lc+SINNiv/i3ZEDWqxWy35YDaeLw6uuzrUphMxeEpNUd+gE+r1d8Slfs6nj+pu8ZQ09n ukTne9r1neL1TvhRxF8Z8vHpDve9SOY0ifq29J+Rj5Y3E8gf3UwELcbWC2k/2/A0Qf0hwUvZ+NO0A 9Kwf9amIaR0EPOImbdzFEOoWwQMs1i215NxVIHqKJ99gD2Eaq73+9GnnrgNptPC3ZV0ZRTQOt9cqq w+1wI6Pw==; Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1livh3-00EUW5-Fd for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:07:19 +0000 Received: by mail-wm1-x32e.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so1059607wmk.1 for ; Tue, 18 May 2021 02:07:12 -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=ff0261f4Hko1waXn6rNO/FtWFyjFfVyqzR/nJiZ3YbrHr8a+uxlj92umxGVEHT7Rt9 p7Nq32ktvBjGCor012fDkLVAqz7tSaQ20lSavshJ2VCUUqljyNqk0l+VOOXSnWKmRdz9 Aq8PgdJZSlFkh77zNfyCew+AZQvhdaJ8l+xcn4ZaxysJIKLjtRYr4qadcWnVpeDSPf0r xkfliCW42GMftD84B/E5qGVDZ5M/5i6FjYsAqwqXgE96DrjBaTF0taaZnbNZfplnNLyY q6heNIttlsHO+OuPperd2nY0U+xA0KpZx+JtuNX0CPxBItkloqBJVxSXLe4RmjfZU50Z tXww== 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=k0AjayMowE2aFFIQxUAHOTYxCt/CqYNrMSPafS9Gd48M01H1ItJ9n8mRG1bex3wVsO 9qp5ThMpbL5wxrdqKjrfcHF4T3zmlvLU3MBA/PmvbyrcdJmIkSk5xxVvxeY2U0OYmUUz 385LKwtM8tLkSiU3QybzeNF7J9WMdEE8stnaz2e/Im71gL5SjZ2L8s/8utIGxBdN+Me+ qdeT+EPPEwnWHyMO+ZGMeXwhETNpSlAE7Ordy6xIPWSZeD5ktUoWnjOI9ZR+us8FWNj6 rVfYhrs66ovezgOVWv60EAWxGE3bJzvaJ2h85PhmC6n0anNidOXjHKMS/icK3SJ+83h4 lq0A== X-Gm-Message-State: AOAM5316wEj8za7JjOuBBFd5rFcy0WcT2HXJb/eZB+KUiTCjUcKaZxJC 2A5xLGqnl1bia7hvFo27fzM= X-Google-Smtp-Source: ABdhPJw1APcsYlGJ45XHsowAtoxXAPYrvMyzUxHQYFHWRpZRviO9X6zJ63aXS7UiWJjupn+s3oHHcA== X-Received: by 2002:a7b:cbd4:: with SMTP id n20mr4335730wmi.187.1621328831729; Tue, 18 May 2021 02:07:11 -0700 (PDT) Received: from amanieu-laptop.home ([2a00:23c6:f081:f801:91cf:b949:c46c:f5a9]) by smtp.gmail.com with ESMTPSA id z17sm7520306wrt.81.2021.05.18.02.07.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 02:07:11 -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: [RESEND PATCH v4 6/8] arm64: Add a compat syscall flag to thread_info Date: Tue, 18 May 2021 10:06:56 +0100 Message-Id: <20210518090658.9519-7-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518090658.9519-1-amanieu@gmail.com> References: <20210518090658.9519-1-amanieu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_020713_570712_B750F669 X-CRM114-Status: GOOD ( 15.93 ) 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