From patchwork Wed Dec 8 04:48:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 12695281 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 14DFBC433F5 for ; Wed, 8 Dec 2021 04:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=G4V3Dqh4s7XjeK3YLdXlWB+f+liXmIuI/NfVy7nXeuA=; b=B/pPKxnWdAYytJnfJ0bowUBqL5 EOHBhqB/QfrOFymK3dAJaqvuHGBYhaGGWXTDdggbT3jwPxT7ROF34eje/6cOp6g6vwQuMt7mryjRX wnW7brsWfgtS2R0NGgIGx8Y6pJhCDul/Fn3HRsjW+xnOnmTBGScpcNpsZRS/RODoGQ3TkuQxuAyHQ y6/HXrkkTkoz86Xm7rRj1bm7glsacgMvxePXqRFv2ycggLVSgg2uIc2DKogVd7D7UlQ1h7Q7DZ1lH z5t1iiqK3ss6jIFPOPrkS2zYyrVg8KCtg8555MAnjkmjcJ1x9Y9qDmwt5RXDKCyNrjwfITEvx5jl8 DN31TLIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muotn-00BEvL-1x; Wed, 08 Dec 2021 04:49:47 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muosZ-00BEQS-6n for linux-arm-kernel@lists.infradead.org; Wed, 08 Dec 2021 04:48:32 +0000 Received: by mail-yb1-xb49.google.com with SMTP id t1-20020a5b03c1000000b005f6ee3e97easo2427153ybp.16 for ; Tue, 07 Dec 2021 20:48:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BuYVt4Wv0/mLVwaaIxyzVOdtPDNx8nrlLULo3MVy2n8=; b=esxrbETmeoGQWN9deNhNumZ4ezPBGwub8BltXaTBLncqXRRn6ZLXDQuYvzcISWEMZ8 OJfaQMEAQ1dMEx77LfsOeP9simnlFHwdwgWVNds8dtw7WZG93B8gpskLMxq8cxNXbQ8m FvBnChTEvCeEzenHzLRjDE+QEH07lo1iFeSnrY4jx+wNCLWoF3Z/4fXFEj3/7NcvS20N mlunZVCYlA2Hc5OAbFZeVjjygqcKvg1Vh+ShwXgnWvtiYJsCySEGi2LuJdwoGwKyh/HL vjUI9TQHkf37ecKRW2F/rhhlY1H2oy9RLmyBh8810ArZR4H5BeHqYY/rcewpl/+AXVUB 5YVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BuYVt4Wv0/mLVwaaIxyzVOdtPDNx8nrlLULo3MVy2n8=; b=MvFWy2ZibtmEVqBUiEuBL8sYr53XAZIgHqYuUH9ZqUUFQvqDxy0dyNCpgRGJOz/ixz 50pkSFPwdrNOUFKuCSX4Bro5+rL7p4KZkOTC3CvdR3JxLivDPv7dbYg7nzoY94xLIirU atkaHo9JKfatsgD8/ohz4+hkKZRbwlNUD9Er7kJ2fWusbCMR1WOPhduwlIED0l5EI1EG ay6sRPrnftN4TW2+0LwTYTC7lJmFLHR1VHIJKXf/es/iiiZAZ+kKnygYGasKmAuerDHP F7zyK0zsNVMM1iZlsFCmKZwe2x37PZTct/Xmn1/ERlxinMa9wzWg5NZaKHj+muDHB64p UB8Q== X-Gm-Message-State: AOAM533Jf3xQpvFld5q1tagSM7hL1YfaqyjQlXmADZ6RQJxEwphj2ybD amsLVTdzWDg7l+nlzsMBD49q0mw= X-Google-Smtp-Source: ABdhPJzx+21RSReSvHN2cMMCfhyMY8AHK5hhszYJj+Y0g7m/jMQnXVXj89q9SluIIeHYaDzCTtmhne8= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:200:be2d:924d:844b:d2fa]) (user=pcc job=sendgmr) by 2002:a25:b0a8:: with SMTP id f40mr54053245ybj.125.1638938909697; Tue, 07 Dec 2021 20:48:29 -0800 (PST) Date: Tue, 7 Dec 2021 20:48:07 -0800 In-Reply-To: <20211208044808.872554-1-pcc@google.com> Message-Id: <20211208044808.872554-6-pcc@google.com> Mime-Version: 1.0 References: <20211208044808.872554-1-pcc@google.com> X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog Subject: [PATCH v3 5/6] arm64: add support for uaccess logging From: Peter Collingbourne To: Catalin Marinas , Will Deacon , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Thomas Gleixner , Andy Lutomirski , Kees Cook , Andrew Morton , Masahiro Yamada , Sami Tolvanen , YiFei Zhu , Mark Rutland , Frederic Weisbecker , Viresh Kumar , Andrey Konovalov , Peter Collingbourne , Gabriel Krisman Bertazi , Chris Hyser , Daniel Vetter , Chris Wilson , Arnd Bergmann , Dmitry Vyukov , Christian Brauner , "Eric W. Biederman" , Alexey Gladkov , Ran Xiaokai , David Hildenbrand , Xiaofeng Cao , Cyrill Gorcunov , Thomas Cedeno , Marco Elver , Alexander Potapenko Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Evgenii Stepanov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_204831_287732_F9A70C82 X-CRM114-Status: GOOD ( 19.54 ) 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 arm64 does not use CONFIG_GENERIC_ENTRY, so add the support for uaccess logging directly to the architecture. Link: https://linux-review.googlesource.com/id/I88de539fb9c4a9d27fa8cccbe201a6e4382faf89 Signed-off-by: Peter Collingbourne --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/thread_info.h | 7 ++++++- arch/arm64/kernel/ptrace.c | 7 +++++++ arch/arm64/kernel/signal.c | 5 +++++ arch/arm64/kernel/syscall.c | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c4207cf9bb17..6023946abe4a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -161,6 +161,7 @@ config ARM64 select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE + select HAVE_ARCH_UACCESS_BUFFER select HAVE_ARCH_VMAP_STACK select HAVE_ARM_SMCCC select HAVE_ASM_MODVERSIONS diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index e1317b7c4525..0461b36251ea 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -82,6 +82,8 @@ int arch_dup_task_struct(struct task_struct *dst, #define TIF_SVE_VL_INHERIT 24 /* Inherit SVE vl_onexec across exec */ #define TIF_SSBD 25 /* Wants SSB mitigation */ #define TIF_TAGGED_ADDR 26 /* Allow tagged user addresses */ +#define TIF_UACCESS_BUFFER_ENTRY 27 /* thread has non-zero uaccess_desc_addr_addr */ +#define TIF_UACCESS_BUFFER_EXIT 28 /* thread has non-zero kcur */ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) @@ -98,6 +100,8 @@ int arch_dup_task_struct(struct task_struct *dst, #define _TIF_SVE (1 << TIF_SVE) #define _TIF_MTE_ASYNC_FAULT (1 << TIF_MTE_ASYNC_FAULT) #define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL) +#define _TIF_UACCESS_BUFFER_ENTRY (1 << TIF_UACCESS_BUFFER_ENTRY) +#define _TIF_UACCESS_BUFFER_EXIT (1 << TIF_UACCESS_BUFFER_EXIT) #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \ @@ -106,7 +110,8 @@ int arch_dup_task_struct(struct task_struct *dst, #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \ - _TIF_SYSCALL_EMU) + _TIF_SYSCALL_EMU | _TIF_UACCESS_BUFFER_ENTRY | \ + _TIF_UACCESS_BUFFER_EXIT) #ifdef CONFIG_SHADOW_CALL_STACK #define INIT_SCS \ diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 88a9034fb9b5..283372eccaeb 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -1854,6 +1855,9 @@ int syscall_trace_enter(struct pt_regs *regs) if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) trace_sys_enter(regs, regs->syscallno); + if (flags & _TIF_UACCESS_BUFFER_ENTRY) + uaccess_buffer_syscall_entry(); + audit_syscall_entry(regs->syscallno, regs->orig_x0, regs->regs[1], regs->regs[2], regs->regs[3]); @@ -1866,6 +1870,9 @@ void syscall_trace_exit(struct pt_regs *regs) audit_syscall_exit(regs); + if (flags & _TIF_UACCESS_BUFFER_EXIT) + uaccess_buffer_syscall_exit(); + if (flags & _TIF_SYSCALL_TRACEPOINT) trace_sys_exit(regs, syscall_get_return_value(current, regs)); diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 8f6372b44b65..5bbd98e5c257 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -919,6 +920,8 @@ static void do_signal(struct pt_regs *regs) void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags) { + bool uaccess_buffer_pending = uaccess_buffer_pre_exit_loop(); + do { if (thread_flags & _TIF_NEED_RESCHED) { /* Unmask Debug and SError for the next task */ @@ -950,6 +953,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags) local_daif_mask(); thread_flags = READ_ONCE(current_thread_info()->flags); } while (thread_flags & _TIF_WORK_MASK); + + uaccess_buffer_post_exit_loop(uaccess_buffer_pending); } unsigned long __ro_after_init signal_minsigstksz; diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c index 50a0f1a38e84..d59022b594f2 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include