From patchwork Tue Jun 6 14:38:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 103937 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3483905vqr; Tue, 6 Jun 2023 08:35:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4opEkUSwNf/oDabpAwvyjavzIRtydrLpBupyWp86PNI4yZFpnU+ED/s6PZHzp0Gg0Fmyc/ X-Received: by 2002:a05:622a:3cf:b0:3f9:b88c:1e14 with SMTP id k15-20020a05622a03cf00b003f9b88c1e14mr18996qtx.23.1686065729917; Tue, 06 Jun 2023 08:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686065729; cv=none; d=google.com; s=arc-20160816; b=KsyKBaCjcdflBVEGVgDMQLKsoBuXMEsjlo4Ck0gkOslsG8KJUJebMp0C4X9KqBdwLp ELMgkAtZnh/BgAyMlPbDfu65166qB88dXkepGWzbDqlUGvbtXNzzSdRuuyuGrO+sNqtb ALf7+fI2HZEsYsxUjJiRJ40dgiN1hwdJuEm4lU0MyoPa+MroYWpmJP18cDjlmRY9V4vE /muvWe0eTz4tTFX4O1hIZNuKCBcK2QlY9SfpsD77HOX+4iDZjJc8/25tv/NNCVP0lFW9 0ZYG8XX2ajUVpM5W28Pshnpu/hAvW+ImrKAyhHxMw7IWCp2X0hSVdNtu1w5ecH3JQ/fE SY+A== 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=tGjZhkMVQyRr4XnKiVSbNfTqylPySohR9BvGVWy+/yU=; b=QEHA8NwCgh9B0sObDUyEsYM+6K7/FpIG50nSWuvKeSX8FkjA11oP23vY5KNBC8nGdC 9jLO24iuL8bt4kFBuws7v2yMQ5Roo/pmht/oE8K3EuYF17w+y23JsmkC1X2VKhm8dS+e Pva3i1Scev//lJsbvvX3XWRzZzWgpr7gwPMfDfg4A1gzl6vFJMKbijlGw63FYy6PwxNV xvwPI5vBWNcyRIED25CD6hDAbxok2EzdDajsJbSydvNIjgEz7q9CJtNctl+5dbYvNazE g8LSEBPJTl6D/JZDtlLPI1RCHAgUg1Oyq6n8GyIqHfX7wbo+tLVR9TbTUH1M5AbWWa+O 5Hxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Js0F1AHE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 f13-20020a05622a104d00b003f719daf2cbsi6515572qte.730.2023.06.06.08.35.15; Tue, 06 Jun 2023 08:35:29 -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=Js0F1AHE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S238160AbjFFOlN (ORCPT + 99 others); Tue, 6 Jun 2023 10:41:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238384AbjFFOj7 (ORCPT ); Tue, 6 Jun 2023 10:39:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BF811FFC for ; Tue, 6 Jun 2023 07:38:44 -0700 (PDT) Message-ID: <20230606142032.710699683@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686062287; 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=tGjZhkMVQyRr4XnKiVSbNfTqylPySohR9BvGVWy+/yU=; b=Js0F1AHEaIizBcWa7NPJK4AlSsrHSTctCJtwd7EXPcaUDu6Iw0MFE4A2cVWrts6eEMwuLg F0D+hYNNMgqX6YW61nxInrcWTjNchojQ0rjcHf/BWCmOdcvOiQv3hN763kS6Win12saETu v4bxvCeUQkEe0talgjedYqgUHMqzQvVorHTMwki7YpcRa2qXLZyI7d/qkfQ89IbnjWs3Og FGXLTAUUbYTYdE42MXg5P0RzT1CekezHUrsHZmXWPgcI6ALGDtnVzhrL9fUMzrjPi+gCcf /slyhGEhuzLxSk33oQ9jbmqf+Kfmfdwv4plghTsCMlyw0VtxgEjEAguNo90zRg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686062287; 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=tGjZhkMVQyRr4XnKiVSbNfTqylPySohR9BvGVWy+/yU=; b=4JlCTJy514LpWzmZGXVL9Qe2KOlRSWplLy8k9tNqv1tE/OCU7Bc0O3PvAhCBFshCffOYrT MeXFQfA9/r/LRqBA== 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 30/45] posix-cpu-timers: Use dedicated flag for CPU timer nanosleep References: <20230606132949.068951363@linutronix.de> MIME-Version: 1.0 Date: Tue, 6 Jun 2023 16:38:06 +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?1767968058460277137?= X-GMAIL-MSGID: =?utf-8?q?1767968058460277137?= POSIX CPU timer nanosleep creates a k_itimer on stack and uses the sigq pointer to detect the nanosleep case in the expiry function. Prepare for embedding sigqueue into struct k_itimer by using a dedicated flag for nanosleep. Signed-off-by: Thomas Gleixner --- include/linux/posix-timers.h | 4 +++- kernel/time/posix-cpu-timers.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -66,6 +66,7 @@ static inline int clockid_to_fd(const cl * @pid: Pointer to target task PID * @elist: List head for the expiry list * @firing: Timer is currently firing + * @nanosleep: Timer is used for nanosleep and is not a regular posix-timer * @handling: Pointer to the task which handles expiry */ struct cpu_timer { @@ -73,7 +74,8 @@ struct cpu_timer { struct timerqueue_head *head; struct pid *pid; struct list_head elist; - int firing; + bool firing; + bool nanosleep; struct task_struct __rcu *handling; }; --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -586,7 +586,7 @@ static void cpu_timer_fire(struct k_itim { struct cpu_timer *ctmr = &timer->it.cpu; - if (unlikely(timer->sigq == NULL)) { + if (unlikely(ctmr->nanosleep)) { /* * This a special case for clock_nanosleep, * not a normal timer from sys_timer_create. @@ -1471,6 +1471,7 @@ static int do_cpu_nanosleep(const clocki timer.it_overrun = -1; error = posix_cpu_timer_create(&timer); timer.it_process = current; + timer.it.cpu.nanosleep = true; if (!error) { static struct itimerspec64 zero_it;