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=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 55FD7C4363A for ; Thu, 29 Oct 2020 17:20:44 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 D532F20790 for ; Thu, 29 Oct 2020 17:20:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T6UK2uug"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="DU+kVbYm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D532F20790 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Hft51m85xy+MznWZV6z6PH278eK1UNvYn1mg+br+xsM=; b=T6UK2uugrFhMR8opVTHoR1chX hfK8/Vg0xQZ6lUcKZ2RBOJlgFYh0QJQXfk7xFuZ4h5DvgZeOmsXPIfurEN/ZLjatlqZTxzWEmO5Wj wRiYzcDfvhtM1ibM6WLXyX4E0RwFswtkT8QEEsOZYQnBpt4kW+5DXai/x6VXGD9JZsO/DIl5zspl5 9RSEodrHbUJHsX5QLI6/KgyAcyw/enpFIUJcmWiwbYwQnW573CXJLP8ATOBo1D0Vgz2M9gbuxd4xT 8NURSUAryLm7L3BrY3NEkfclN38G5/fXdQiY+xGJAaj0ENsN0iexrrAculfXlpvT+3JyL3ocIH0Qf Y80oPfwaw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYBav-0005Wk-L3; Thu, 29 Oct 2020 17:20:13 +0000 Received: from mail-il1-x143.google.com ([2607:f8b0:4864:20::143]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYBat-0005WG-CU for linux-arm-kernel@lists.infradead.org; Thu, 29 Oct 2020 17:20:12 +0000 Received: by mail-il1-x143.google.com with SMTP id p10so3843790ile.3 for ; Thu, 29 Oct 2020 10:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=1/1EThcH8lL03Nkg/ldomJxpn4Pfh9oO+kgtxmn7s9I=; b=DU+kVbYm6b5V/gDo3OHLYz0zkpWV0sAIJ0FSSsuDNwgqK9XZUH+vumdBAwqpE084dx 60IaebUzBCU+6NcNpOZ0L14xmC80pFyvlrwI4t0X/E9gBsRp7ro0jCyqt3I4A9IZMgTi mJHIHbNC+En3AWjCbJLG9PPebRGohSNCIbwWvxRzqQlKklvuBFFGlqls7GFOfyqkif0l qFAjsJlego+MmiQJkmLCXJdv6pKs/IsnTxUBJIT6JkRc5oW1TUtaJkhcGW/F7jNhz5ia hyyNlo24v9wyDVaOU81pq99gtOnp16mV5Q7IRCqIx15NKI8jz+W36dvpVIaPUTX9Cvjn aDSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=1/1EThcH8lL03Nkg/ldomJxpn4Pfh9oO+kgtxmn7s9I=; b=aK/I5nXzPR9lCBqkKFFYleYBvidNlRlwxZSmggg01a1mVIHyzUYNPdonBqPbDZZ5Qc LAj+uYmibUUjphBN2GTeUf/5DSYjCRUV5wI0pCU++1BCDu8zcU8Wfd3jMesCh/a03IHV SqHnjwpn/Phio/U7/Df5gfYdbaRwg2c8thueWiJkxE+n6Ew/LJu3+OkIKoJTbU1GU+m3 sDQagP7/JYBB/m02Y+mWPVXHZRLPohpibGaSqrZYQJmk9zaVtUqA7AH/09cSEsnz6v2P I9whReyRXJ0TSDsQZXjh0ORXIdJAjG1buDUlLg+7N3LrDQNdsTibKfVqgRNs9AOLJgYl skzQ== X-Gm-Message-State: AOAM532TPIptmYe3diGvEcM6WSTJsg3+CPnotoM7MwwpQNy4es4eS9tC qkt4i/26K7iXewniQu16XJrfTiPS6pmPkg== X-Google-Smtp-Source: ABdhPJwgi8AY+vNKbvaTcMu7es9Ij9ceohEHqOFVses2EFnYIg7CHQa6213A5yqjgD1LR2x7qrbsqQ== X-Received: by 2002:a92:d6cf:: with SMTP id z15mr4346401ilp.82.1603992009096; Thu, 29 Oct 2020 10:20:09 -0700 (PDT) Received: from [192.168.1.30] ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id i14sm2843506ilb.2.2020.10.29.10.20.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Oct 2020 10:20:08 -0700 (PDT) Subject: Re: [PATCH] arm: add support for TIF_NOTIFY_SIGNAL To: Russell King - ARM Linux admin References: <3c1ebfa5-38d9-e6b2-fcf7-d8b17c0fa515@kernel.dk> <20201029162934.GX1551@shell.armlinux.org.uk> <20201029170110.GY1551@shell.armlinux.org.uk> <3a512c06-8387-e989-af5c-d9698d42cb11@kernel.dk> <20201029171738.GZ1551@shell.armlinux.org.uk> From: Jens Axboe Message-ID: Date: Thu, 29 Oct 2020 11:20:07 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201029171738.GZ1551@shell.armlinux.org.uk> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_132011_482422_3C756727 X-CRM114-Status: GOOD ( 23.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linux-arm-kernel@lists.infradead.org" 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 On 10/29/20 11:17 AM, Russell King - ARM Linux admin wrote: > On Thu, Oct 29, 2020 at 11:15:37AM -0600, Jens Axboe wrote: >> How about this? >> >> commit c03932936d8f99ff7c1c6c7d984e7a457284396c >> Author: Jens Axboe >> Date: Fri Oct 9 16:00:49 2020 -0600 >> >> arm: add support for TIF_NOTIFY_SIGNAL >> >> Wire up TIF_NOTIFY_SIGNAL handling for arm. >> >> Cc: linux-arm-kernel@lists.infradead.org >> Signed-off-by: Jens Axboe >> >> diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h >> index 536b6b979f63..eb7ce2747eb0 100644 >> --- a/arch/arm/include/asm/thread_info.h >> +++ b/arch/arm/include/asm/thread_info.h >> @@ -126,6 +126,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp *, >> * thread information flags: >> * TIF_USEDFPU - FPU was used by this task this quantum (SMP) >> * TIF_POLLING_NRFLAG - true if poll_idle() is polling TIF_NEED_RESCHED >> + * >> + * Any bit in the range of 0..15 will cause do_work_pending() to be invoked. >> */ >> #define TIF_SIGPENDING 0 /* signal pending */ >> #define TIF_NEED_RESCHED 1 /* rescheduling necessary */ >> @@ -135,6 +137,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp *, >> #define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */ >> #define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */ >> #define TIF_SECCOMP 7 /* seccomp syscall filtering active */ >> +#define TIF_NOTIFY_SIGNAL 8 /* signal notifications exist */ >> >> #define TIF_USING_IWMMXT 17 >> #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ >> @@ -148,6 +151,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp *, >> #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) >> #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) >> #define _TIF_SECCOMP (1 << TIF_SECCOMP) >> +#define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL) >> #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT) >> >> /* Checks for any syscall work in entry-common.S */ >> @@ -158,7 +162,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp *, >> * Change these and you break ASM code in entry-common.S >> */ >> #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ >> - _TIF_NOTIFY_RESUME | _TIF_UPROBE) >> + _TIF_NOTIFY_RESUME | _TIF_UPROBE | \ >> + _TIF_NOTIFY_SIGNAL) >> >> #endif /* __KERNEL__ */ >> #endif /* __ASM_ARM_THREAD_INFO_H */ >> diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S >> index 271cb8a1eba1..77d16390a524 100644 >> --- a/arch/arm/kernel/entry-common.S >> +++ b/arch/arm/kernel/entry-common.S >> @@ -53,7 +53,7 @@ __ret_fast_syscall: >> cmp r2, #TASK_SIZE >> blne addr_limit_check_failed >> ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing >> - tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK >> + movs r1, r1, lsl #16 >> bne fast_work_pending >> >> >> @@ -90,7 +90,7 @@ __ret_fast_syscall: >> cmp r2, #TASK_SIZE >> blne addr_limit_check_failed >> ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing >> - tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK >> + movs r1, r1, lsl #16 >> beq no_work_pending >> UNWIND(.fnend ) >> ENDPROC(ret_fast_syscall) >> @@ -131,7 +131,7 @@ ENTRY(ret_to_user_from_irq) >> cmp r2, #TASK_SIZE >> blne addr_limit_check_failed >> ldr r1, [tsk, #TI_FLAGS] >> - tst r1, #_TIF_WORK_MASK >> + movs r1, r1, lsl #16 >> bne slow_work_pending >> no_work_pending: >> asm_trace_hardirqs_on save = 0 >> diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S >> index de1f20624be1..d0e898608d30 100644 >> --- a/arch/arm/kernel/entry-v7m.S >> +++ b/arch/arm/kernel/entry-v7m.S >> @@ -59,7 +59,7 @@ __irq_entry: >> >> get_thread_info tsk >> ldr r2, [tsk, #TI_FLAGS] >> - tst r2, #_TIF_WORK_MASK >> + movs r2, r2, lsl #16 >> beq 2f @ no work pending >> mov r0, #V7M_SCB_ICSR_PENDSVSET >> str r0, [r1, V7M_SCB_ICSR] @ raise PendSV >> diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c >> index 585edbfccf6d..9d2e916121be 100644 >> --- a/arch/arm/kernel/signal.c >> +++ b/arch/arm/kernel/signal.c >> @@ -655,7 +655,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) >> if (unlikely(!user_mode(regs))) >> return 0; >> local_irq_enable(); >> - if (thread_flags & _TIF_SIGPENDING) { >> + if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) { >> int restart = do_signal(regs, syscall); >> if (unlikely(restart)) { >> /* >> > > Looks perfect to me, thanks! I assume the pre-requisits for this are > already in mainline or linux-next? Great! Thanks for your expedient attention and help. The bits using this are queued in tip for 5.11, so not in mainline yet, but should be in linux-next tomorrow I guess. But it was done such that arch patches could be queued up independently, so we didn't have weird cross dependencies. -- Jens Axboe _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel