From patchwork Tue Jun 6 14:37:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 103886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3451451vqr; Tue, 6 Jun 2023 07:51:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7M45JC8unt+C+O88R3ofbvFOKb4ylyoZSUT5+pAppTHgB3ZyhTzqyDQQLpBKxabKA9pxh4 X-Received: by 2002:a05:6214:20ec:b0:624:c497:526a with SMTP id 12-20020a05621420ec00b00624c497526amr2392725qvk.24.1686063108211; Tue, 06 Jun 2023 07:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686063108; cv=none; d=google.com; s=arc-20160816; b=fsJBD2u4RZfFNMtR+bQVvQSSo6UoS/iFXxrIpgr8e9x1YREa9ZDvZmUI2YvNJFGda4 SduxM/xSRRIQybJiD1v3l7A4LMRngWAKe8iy9eo9ZJTxrj6KB5CQBkoUNDj14RrWqooq pU5HlrPEAtqwUhYxRuA/tyizpK0MuYjkm+PDmv2mmo2S6HRfkuYGOBABbvvhpLJ5lJ36 D9mvym1NAxiMZnYbkETi8Q5EClwfYqeIt+2F6DQCU5bC+Ge/h9VR58Bx78B7bgL0DI0X k+b+MEwe/wyLpN+pMZzqmnNgxHl7CA3M1oiATRa6FSU7m5PDVpXyln5ICoItuY2W+Nra khug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=pTwgQriJEXYz/BGSH2oQaAJz9q8TYA27uj1w2y/zcJc=; b=zQfbMSjUQW9ytrNCsizDs+Nlnn2rL0WVzGN6wT+vyHSvL2lkG2ETA2j/hGJOd0FDxu gvun0s1bKivXFOtkc2+BSD/3lkcH161cEOfklIzo4Jk1R1HmuYdKvOVQuZ/7VePHpAJC N05dSMMmYmViCvAkh1FlQYBDiEKJIG/mapl85s6BKd/2RKv4t5h1Z/JjrcT1zfNvg39d E6clZKgq8hmVa5CmqWf9Gc7S0MQJUgg46td0Vw/O8GzGT9p7lf9FlLEGd5XWGaJfwi+F WnKWju3gumbhaPSMFC898HwIDDbt+o9jAmLsHS8AZVbP4E62VsSndgUmKQ5obcObmaqo vgdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0IRnAHwI; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jo10-20020a056214500a00b0062827f7f1bbsi5006608qvb.245.2023.06.06.07.51.34; Tue, 06 Jun 2023 07:51:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0IRnAHwI; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238223AbjFFOjM (ORCPT + 99 others); Tue, 6 Jun 2023 10:39:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238130AbjFFOi3 (ORCPT ); Tue, 6 Jun 2023 10:38:29 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C07791BCC for ; Tue, 6 Jun 2023 07:37:55 -0700 (PDT) Message-ID: <20230606142032.265274690@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686062274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=pTwgQriJEXYz/BGSH2oQaAJz9q8TYA27uj1w2y/zcJc=; b=0IRnAHwIhJIqglZvpXDrkZu/M/QwBgEWV0yLKYPAXoPN4kfedaIOLiuO2Z5c5hn3FtPUuu QGE7N7o7rl5iQg6iHrhjKFaYtTqIYjNsJ6DOC5S4bM6SAHBATUCGLkAfbT6FK3BzBe5nFL Toi2QxVGSgU74Ak5v8wR34tC742JhdqyFhqjxrji1CFbDYfrtvN7/O7kEy7xIlJgu+BgAm mXFgL6K7p6gPkpg9uQ87lk9akugxVrSUwIAa8xb2ye54ygC3fodE8dLn+4A76CIHznpTrr sEcWOjihR7swEfGfh9xix9cOzwsBw/E7KojqlxpE3vxK3kVlvU5nDusbj6TCTw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686062274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=pTwgQriJEXYz/BGSH2oQaAJz9q8TYA27uj1w2y/zcJc=; b=JRFbBcCjP4x4iocN+ozTdkGi1p1nb01JhhQ6f5PJp6rE0q/eY9U36wAeEw+i+XMHN5fnK4 KpBY5EooAmYsNODQ== From: Thomas Gleixner To: LKML Cc: Frederic Weisbecker , Anna-Maria Behnsen , John Stultz , Peter Zijlstra , Ingo Molnar , Stephen Boyd , Eric Biederman , Oleg Nesterov Subject: [patch 22/45] signal: Get rid of resched_timer logic References: <20230606132949.068951363@linutronix.de> MIME-Version: 1.0 Date: Tue, 6 Jun 2023 16:37:53 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767965309860358250?= X-GMAIL-MSGID: =?utf-8?q?1767965309860358250?= There is no reason for handing the *resched pointer argument through several functions just to check whether the signal is related to a self rearming posix timer. SI_TIMER is only used by the posix timer code and cannot be queued from user space. The only extra check in collect_signal() to verify whether the queued signal is preallocated is not really useful. Some other places already check purely the SI_TIMER type. Signed-off-by: Thomas Gleixner --- kernel/signal.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) --- a/kernel/signal.c +++ b/kernel/signal.c @@ -529,8 +529,7 @@ bool unhandled_signal(struct task_struct return !tsk->ptrace; } -static void collect_signal(int sig, struct sigpending *list, kernel_siginfo_t *info, - bool *resched_timer) +static void collect_signal(int sig, struct sigpending *list, kernel_siginfo_t *info) { struct sigqueue *q, *first = NULL; @@ -552,12 +551,6 @@ static void collect_signal(int sig, stru still_pending: list_del_init(&first->list); copy_siginfo(info, &first->info); - - *resched_timer = - (first->flags & SIGQUEUE_PREALLOC) && - (info->si_code == SI_TIMER) && - (info->si_sys_private); - __sigqueue_free(first); } else { /* @@ -574,13 +567,12 @@ static void collect_signal(int sig, stru } } -static int __dequeue_signal(struct sigpending *pending, sigset_t *mask, - kernel_siginfo_t *info, bool *resched_timer) +static int __dequeue_signal(struct sigpending *pending, sigset_t *mask, kernel_siginfo_t *info) { int sig = next_signal(pending, mask); if (sig) - collect_signal(sig, pending, info, resched_timer); + collect_signal(sig, pending, info); return sig; } @@ -592,17 +584,15 @@ static int __dequeue_signal(struct sigpe int dequeue_signal(sigset_t *mask, kernel_siginfo_t *info, enum pid_type *type) { struct task_struct *tsk = current; - bool resched_timer = false; int signr; lockdep_assert_held(&tsk->sighand->siglock); *type = PIDTYPE_PID; - signr = __dequeue_signal(&tsk->pending, mask, info, &resched_timer); + signr = __dequeue_signal(&tsk->pending, mask, info); if (!signr) { *type = PIDTYPE_TGID; - signr = __dequeue_signal(&tsk->signal->shared_pending, - mask, info, &resched_timer); + signr = __dequeue_signal(&tsk->signal->shared_pending, mask, info); if (unlikely(signr == SIGALRM)) posixtimer_rearm_itimer(tsk); @@ -629,7 +619,7 @@ int dequeue_signal(sigset_t *mask, kerne } if (IS_ENABLED(CONFIG_POSIX_TIMERS)) { - if (unlikely(resched_timer)) + if (unlikely(info->si_code == SI_TIMER && info->si_sys_private)) posixtimer_rearm(info); } @@ -1015,6 +1005,9 @@ static int __send_signal_locked(int sig, lockdep_assert_held(&t->sighand->siglock); + if (WARN_ON_ONCE(!is_si_special(info) && info->si_code == SI_TIMER)) + return 0; + result = TRACE_SIGNAL_IGNORED; if (!prepare_signal(sig, t, force)) goto ret;