From nobody Fri Nov 29 00:48:32 2024 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2974C1B07B2 for ; Fri, 27 Sep 2024 08:48:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727426935; cv=none; b=TWtSK+3VB71nBUVjohLPLWcPaKczhNvnCkq3651beQsjO/QjKXIrM0hvbmzFFRkkajg8jbtmpI86+hSh65+6uz/sZyWQ4/aNpS0ZuCUT5Hi9v+dHadi6+tJ/ScPDRHVBboU6Ez9jv35hBkt1/OR99aThnf+xbX3w/DNR+GGA4w0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727426935; c=relaxed/simple; bh=JS8OTIugV54U4c9TnOdGFMqXhSz/nJrdTvMchyD+w/M=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=RwKadS9JkYnlrmooP0w/U8UK6FZc1vkpk9Y+FlMjzB2xzgaNJl0YZeme6IQD1C9S4pHoy0Li8MmuYirMWvGpNUagYysu9hXdPhYHGLACii7SlgGNpHh1/6rxJmkMpHv5SGZb343NZIFGvBSa44VL4kbIdMgjrNxZjiopgVR+uCw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=hvH70WKl; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=kE9l8ejV; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="hvH70WKl"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="kE9l8ejV" Message-ID: <20240927084817.574566710@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1727426932; 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=KgET3aIT9+OZMdI/ErQ6Q2EVM4fWSh0RVcwU7MumU1s=; b=hvH70WKlWaFoy9bj9Sgw3w/MNFQCjofPpIHt9YELmRARDIFwI9s1Sh2ooPwm7eetsb2X7s HPk3zpBaWwfH84dx3haOtT/iCItrta4jG1QVYxzSK1fkEVzYcsL19Jmjw4DLT3WV7S6buF U0lNI1ZQaVSuT7Uu//JQL9uVCXpnI3coJoaHugZhpCyP1Rn98dPBypqeSRCm3MBPc4oY60 dlIyPS/8VdpdB9FDqT0E18yWbvGR3Zy67bJvUxL1Fi/9h3PRGXgiKDwmm6MU4YHLo0cnOe 6cOkB11cAM0cGxmSY0bxZMl08lHFglLL4+08kaYzHx1tuSso3et+Tv8RMqtxyw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1727426932; 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=KgET3aIT9+OZMdI/ErQ6Q2EVM4fWSh0RVcwU7MumU1s=; b=kE9l8ejVONf+ZP2MJ4v0C67x0GtN0KRaeBwK61NqxvSz6gJexzbHIfZbtCaZxepbbK4pM7 1FQzOQIX+Ew9H6Bw== From: Thomas Gleixner To: LKML Cc: Anna-Maria Behnsen , Frederic Weisbecker , John Stultz , Peter Zijlstra , Ingo Molnar , Stephen Boyd , Eric Biederman , Oleg Nesterov Subject: [patch v4 11/27] posix-cpu-timers: Use dedicated flag for CPU timer nanosleep References: <20240927083900.989915582@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Fri, 27 Sep 2024 10:48:52 +0200 (CEST) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Thomas Gleixner 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 Acked-by: Peter Zijlstra (Intel) --- include/linux/posix-timers.h | 4 +++- kernel/time/posix-cpu-timers.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 8c6d97412526..bcd01208d795 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -42,6 +42,7 @@ static inline int clockid_to_fd(const clockid_t clk) * @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 { @@ -49,7 +50,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; }; =20 diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index bc2cd32b7a40..ea1835cb541a 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -588,7 +588,7 @@ static void cpu_timer_fire(struct k_itimer *timer) =20 timer->it_status =3D POSIX_TIMER_DISARMED; =20 - if (unlikely(timer->sigq =3D=3D NULL)) { + if (unlikely(ctmr->nanosleep)) { /* * This a special case for clock_nanosleep, * not a normal timer from sys_timer_create. @@ -1479,6 +1479,7 @@ static int do_cpu_nanosleep(const clockid_t which_clo= ck, int flags, timer.it_overrun =3D -1; error =3D posix_cpu_timer_create(&timer); timer.it_process =3D current; + timer.it.cpu.nanosleep =3D true; =20 if (!error) { static struct itimerspec64 zero_it;