From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 0CA5F1FBEBE for ; Wed, 6 Aug 2025 19:44:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754509447; cv=none; b=kWnRHo5slv4xzNJ1LcwuzBARELi2k2e7b43ybQxidx26VQu8UCqS7S3sRrm/QFaTDsb7pscc68TG9Iyx5WGKbw6ikjZVI2NUseOd69aCc466vn6V5UW5d7l50CmWIjtGj2Dbi9Ma2gEePkLAYmrAvoP8TPupRL6mAXGf418FipA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754509447; c=relaxed/simple; bh=jeo7QCPQKOw+GmDQcDoNbUwbP4YWYbMmHOdqRewcV7o=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=tPaAwb6/JCnOJry3gpoHgZPIKAam5aPfOsAGoXJR8ueGgrlWPFnODkJXuWEpKBVh7qH5Yy8UHzdnG15L2hJO1GqHLTGfcJJcBA+ZGoXZZ2jmhctVxKOp7X2nchX1le1YhXxL726gwFLUziyTV5T2Bh1SkNgK5p92ZTO+E/EeIM8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=QhT11w+g; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QhT11w+g" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754509444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=pBlXLdMVS9+42WdjrfWhCvpkY35dKzexiVfH6Ml4CIM=; b=QhT11w+g9GkSOA8HiNI42T57pGThIhEKeNYxSJxGkJ6qckhyu8XQoBSWySZES3FTvVWfdo o8CoboGAIEVUH2jsPS5QdDooKN5kFlQk5+E7EruvCa3hzadzAuwSNFT2es5dalbSpNpYRC uFyvXztEPMtJ/Boh7NKJjWf5sh5/+ZM= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-5BoV10lpNOu-eFPFIfLZug-1; Wed, 06 Aug 2025 15:44:01 -0400 X-MC-Unique: 5BoV10lpNOu-eFPFIfLZug-1 X-Mimecast-MFC-AGG-ID: 5BoV10lpNOu-eFPFIfLZug_1754509439 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2011119560AF; Wed, 6 Aug 2025 19:43:59 +0000 (UTC) Received: from localhost (unknown [10.22.80.109]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9C7961800281; Wed, 6 Aug 2025 19:43:56 +0000 (UTC) Date: Wed, 6 Aug 2025 16:43:55 -0300 From: "Luis Claudio R. Goncalves" To: Oleg Nesterov , Peter Zijlstra , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt , Tejun Heo , David Vernet , Barret Rhoden , Josh Don , Crystal Wood , linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, Juri Lelli , Ben Segall , Dietmar Eggemann , Ingo Molnar , Mel Gorman , Valentin Schneider , Vincent Guittot , Thomas Gleixner , Wander Lairson Costa Subject: [RESEND PATCH] sched: restore the behavior of put_task_struct() for non-rt Message-ID: Precedence: bulk X-Mailing-List: linux-rt-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Commit 8671bad873eb ("sched: Do not call __put_task_struct() on rt if pi_blocked_on is set") changed the behavior of put_task_struct() unconditionally, even when PREEMPT_RT was not enabled, in clear mismatch with the commit description. Restore the previous behavior of put_task_struct() for the PREEMPT_RT disabled case. Fixes: 8671bad873eb ("sched: Do not call __put_task_struct() on rt if pi_blocked_on is set") Acked-by: Oleg Nesterov Signed-off-by: Luis Claudio R. Goncalves --- diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index ea41795a352b..51678a541477 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -130,6 +133,16 @@ static inline void put_task_struct(struct task_struct *t) if (!refcount_dec_and_test(&t->usage)) return; + /* In !RT, it is always safe to call __put_task_struct(). */ + if (!IS_ENABLED(CONFIG_PREEMPT_RT)) { + static DEFINE_WAIT_OVERRIDE_MAP(put_task_map, LD_WAIT_SLEEP); + + lock_map_acquire_try(&put_task_map); + __put_task_struct(t); + lock_map_release(&put_task_map); + return; + } + /* * Under PREEMPT_RT, we can't call __put_task_struct * in atomic context because it will indirectly @@ -137,10 +150,6 @@ static inline void put_task_struct(struct task_struct *t) * current process has a mutex enqueued (blocked on * a PI chain). * - * In !RT, it is always safe to call __put_task_struct(). - * Though, in order to simplify the code, resort to the - * deferred call too. - * * call_rcu() will schedule __put_task_struct_rcu_cb() * to be called in process context. *