From patchwork Wed Apr 21 19:02:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amanieu d'Antras X-Patchwork-Id: 12216875 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=ham 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 B06C2C433ED for ; Wed, 21 Apr 2021 19:05:29 +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 3572B61454 for ; Wed, 21 Apr 2021 19:05:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3572B61454 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=x7nkZyVUtLDMAtl5Lq1F2e3clFYepyMzPfo+gwtpE98=; b=qmjQIYfXDOQMPeVGtBqfDqeSF yKMbetuO766dJF3pd3SCPfrHHMjWUvOAZWpURt239L8n7blDjB1+uNT0G0/JPYimy0elUuRbSGr1+ 8CL2WWDqIzvpbG8UpXwN4K64+R5JnPAIqr239lkWZPJJ6u3iBfYSHs8zXwUsr4fV2Y3QJGM+m37kA LrP2AkJzIytAp7gyfkxZetyYGds57AAJcG+qXJ7kgmyNn4yGkqmg+VF7TcP5oEj3Dhn3ZUluvygHX js6RjP5sPpib9D0uQ1AGngSG4ZAP40MFPgHUBI9N844o3h34qBlyKFnCXXJAD84CHe9BZfEgh0li+ 01Gf4ZQWg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZI87-00EzMM-PH; Wed, 21 Apr 2021 19:03:20 +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 1lZI7R-00EzJX-6g for linux-arm-kernel@desiato.infradead.org; Wed, 21 Apr 2021 19:02:37 +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=ui6DkSfSUHVuV2NqDDwW1VpfGUapkm0wPnlAdb6e2cM=; b=qyI7h8eBKsTwAleVCGiIelNPVd RD9nrIkbnLZcFdTteBwUJkzhXCpZ5Sc7EOFMDP7opHCRuFOYnt8LHuYsw/7en6Dq6gRK28riTzmNo bQoIsqKFg3qnFejmJ7VlACDkvqj483nPBSSk6oZJoR5eVJsmkn0LV4iHQ2V+R//HC/r7e94xolqlS UQzPdffWlEl7NULWILkn1IjnsC20HZWwGLxXDZOmHJQBPNsQaT2/I83YbuYYAIIcmYYtV5lLHKnWP iAZnGcl4CVzOaQPoikqIiMriGGDSxhxkiegyPM+Ro/U3vu70MuPe5b1kP8sXWfG8EygVk0zgFMrDZ MHEz+X4A==; Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZI7N-00D7SY-Ks for linux-arm-kernel@lists.infradead.org; Wed, 21 Apr 2021 19:02:35 +0000 Received: by mail-wm1-x32c.google.com with SMTP id i21-20020a05600c3555b029012eae2af5d4so1843734wmq.4 for ; Wed, 21 Apr 2021 12:02:33 -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=ui6DkSfSUHVuV2NqDDwW1VpfGUapkm0wPnlAdb6e2cM=; b=PtdcNeaShHJiALeWBmSlgeyl15VI37x20cXVnQblvq0HcfaDfrLOgnRVk9Ko1ITdSe oGEgOvkafQqnPCD/RXqbA+5RVpsqljZlo4TDGSfjnS0CQ8lu2ohFaFpRh3LmRsWA3NU5 bRrpPphxdgYUxx0pR+jIn+HQdAZwsp+jLO6CcRfYmxrDySqtdrQ7c//o43ycta8V3qZw SWlkd52qi6ihMJTL5w4/QTk82ZWCBf0PpaXy+ed/oGE+BjxVDhovf8nxxKIwDHCQ0vAO mYm4AA5vVilE+EBQMNr5JJEorEavOfXflhsORDtBqXFcCNEFB/TmyZ6XLx1izzQyngmj BaXA== 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=ui6DkSfSUHVuV2NqDDwW1VpfGUapkm0wPnlAdb6e2cM=; b=hGOmFJboVJFvlKlNpXjluNvcjKB3Srz74bjrBacxQqi4wLekgZjSSGbpqLwtoGmrSG UL57DO3ddB77WQwQjU7R2sKded2GGHASyRhoTBFiHlEsD9wOJz3tRw7RMj8pOuPQPEq1 n9UJwe9vnrwQiZD35TQVmS8ewb4D2icflDPhcOcWs+/7uCYhMq+XAh6w3Qkzw3KbZ20q NcgQEE3XrF63qLcppMiWMDAivBc9+IDzgbdtcV/ObtKQe1QupYo9gxT0MUL7AzzVA13x mIR0cKdrJNdDqA2fcsv8MVwIxtDEOeKW0OUMCRt9763dcFL6N2Q/sibwDYMFjBp1IiNe IRuw== X-Gm-Message-State: AOAM530dObwVhA3oLUaeAyHFLdZEVTK8gAfM0G8eY5HGMKLP8dDIbn2z 6uvApZPWbCwuFGajzMdp0ALX0TYFkylxFwPR X-Google-Smtp-Source: ABdhPJxlUpBGMBsJO8xVyL8rvXjYTPBvhAqqfNyFb2alyterJwv4QdVB65lSpSddjQNtM6/u2mqdCA== X-Received: by 2002:a1c:bb46:: with SMTP id l67mr11150961wmf.103.1619031752062; Wed, 21 Apr 2021 12:02:32 -0700 (PDT) Received: from amanieu-desktop.home ([2a00:23c6:f081:f801:93ef:94e:9f8:1f0]) by smtp.gmail.com with ESMTPSA id d10sm310829wri.41.2021.04.21.12.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 12:02:31 -0700 (PDT) From: Amanieu d'Antras To: linux-arm-kernel@lists.infradead.org Cc: Amanieu d'Antras , Ryan Houdek , Catalin Marinas , Will Deacon , Mark Rutland , Steven Price , Arnd Bergmann , David Laight , Mark Brown Subject: [RFC PATCH v3 4/8] arm64: Separate in_compat_syscall from is_compat_task Date: Wed, 21 Apr 2021 20:02:03 +0100 Message-Id: <20210421190207.1803139-5-amanieu@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210421190207.1803139-1-amanieu@gmail.com> References: <20210421190207.1803139-1-amanieu@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210421_120233_704701_4CAEDA8B X-CRM114-Status: GOOD ( 17.20 ) 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 This is preliminary work for allowing 64-bit processes to invoke compat syscalls. Signed-off-by: Amanieu d'Antras Co-developed-by: Ryan Houdek Signed-off-by: Ryan Houdek --- arch/arm64/include/asm/compat.h | 24 ++++++++++++++++++++---- arch/arm64/include/asm/ftrace.h | 2 +- arch/arm64/include/asm/syscall.h | 6 +++--- arch/arm64/kernel/ptrace.c | 2 +- arch/arm64/kernel/syscall.c | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 23a9fb73c04f..a2f5001f7793 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -178,21 +178,37 @@ struct compat_shmid64_ds { compat_ulong_t __unused5; }; -static inline int is_compat_task(void) +static inline bool is_compat_task(void) { return test_thread_flag(TIF_32BIT); } -static inline int is_compat_thread(struct thread_info *thread) +static inline bool is_compat_thread(struct thread_info *thread) { return test_ti_thread_flag(thread, TIF_32BIT); } +static inline bool in_compat_syscall(void) +{ + return is_compat_task(); +} +#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); +} + #else /* !CONFIG_COMPAT */ -static inline int is_compat_thread(struct thread_info *thread) +static inline bool is_compat_thread(struct thread_info *thread) +{ + return false; +} + +static inline bool thread_in_compat_syscall(struct thread_info *thread) { - return 0; + return false; } #endif /* CONFIG_COMPAT */ diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h index 91fa4baa1a93..f41aad92c67a 100644 --- a/arch/arm64/include/asm/ftrace.h +++ b/arch/arm64/include/asm/ftrace.h @@ -88,7 +88,7 @@ int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec); #define ARCH_TRACE_IGNORE_COMPAT_SYSCALLS static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs) { - return is_compat_task(); + return in_compat_syscall(); } #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index cfc0672013f6..0dfc01ea386c 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -35,7 +35,7 @@ static inline long syscall_get_error(struct task_struct *task, { unsigned long error = regs->regs[0]; - if (is_compat_thread(task_thread_info(task))) + if (thread_in_compat_syscall(task_thread_info(task))) error = sign_extend64(error, 31); return IS_ERR_VALUE(error) ? error : 0; @@ -54,7 +54,7 @@ static inline void syscall_set_return_value(struct task_struct *task, if (error) val = error; - if (is_compat_thread(task_thread_info(task))) + if (thread_in_compat_syscall(task_thread_info(task))) val = lower_32_bits(val); regs->regs[0] = val; @@ -88,7 +88,7 @@ static inline void syscall_set_arguments(struct task_struct *task, */ static inline int syscall_get_arch(struct task_struct *task) { - if (is_compat_thread(task_thread_info(task))) + if (thread_in_compat_syscall(task_thread_info(task))) return AUDIT_ARCH_ARM; return AUDIT_ARCH_AARCH64; diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 170f42fd6101..017a82b24f49 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1721,7 +1721,7 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task) * 32-bit children use an extended user_aarch32_ptrace_view to allow * access to the TLS register. */ - if (is_compat_task()) + if (in_compat_syscall()) return &user_aarch32_view; else if (is_compat_thread(task_thread_info(task))) return &user_aarch32_ptrace_view; diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c index b9cf12b271d7..e0e9d54de0a2 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -51,7 +51,7 @@ static void invoke_syscall(struct pt_regs *regs, unsigned int scno, ret = do_ni_syscall(regs, scno); } - if (is_compat_task()) + if (in_compat_syscall()) ret = lower_32_bits(ret); regs->regs[0] = ret;