From patchwork Thu Jul 11 12:59:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 13730665 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 88CAD15FD16 for ; Thu, 11 Jul 2024 13:01:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720702875; cv=none; b=nOimIwFyHJ/iog4tuRK/0QBxYxsGdIjAS5/ff9QAbeoZ6MDRSr0ddESBVAbmvi07F5FYr1YDiVThNW0kKkS6Xkp95R79UOQs/M//Jb7UMDSzC9km/36TNjatC1lDIMrEIX9Z/6mSGinlS8J4Za2Vg39m8XfP83EzDf/IY1RmwPE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720702875; c=relaxed/simple; bh=tk3/eU+VtYT+/UhY7nwOfNv0uD4Ewrnc70U2kX7qZDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DHovpTxOy6eW+/V8+JfrDW+WqP500w0JLKPcgCwdeb6SSNj5tfnZbP1tWbkYG/Zh7bsCj/IgKqahA5dvKTKLdE8NtiR28lEpTBjXcjhc50+eh2yqbV7ZjIYh71QYoCarQQrv98X627axlc7nv2Y6Xq6aENI85W8SdWNPg5zYlLo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=WwbL78iQ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="WwbL78iQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720702872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oe3ZcX+q5foJNAvfJR3Gr4N1bW3UV6I6D4EkwWMO3O0=; b=WwbL78iQOiz883EF+LRWhvHUCh+8F5B5Pt6j+jJMjpPdr7zZYWaljBcWruGzOVuKlUdCbE /PkcumG9v8O0haYewWjRY+HK0MA/boc8itI8G/y8jXWxucbIuJhqyty4WN+ZB4N7EvbqhS BzQlr+5kUTA37kj/ftoO/QmmV/ScAgM= Received: from mx-prod-mc-03.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-324-fdulkfqJNUmCkKIxHRvfTg-1; Thu, 11 Jul 2024 09:01:07 -0400 X-MC-Unique: fdulkfqJNUmCkKIxHRvfTg-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63A4F19560B6; Thu, 11 Jul 2024 13:01:01 +0000 (UTC) Received: from vschneid-thinkpadt14sgen2i.remote.csb (unknown [10.39.192.211]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 391341955E8E; Thu, 11 Jul 2024 13:00:54 +0000 (UTC) From: Valentin Schneider To: linux-kernel@vger.kernel.org, rcu@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Phil Auld , Clark Williams , Tomas Glozar , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Alexander Gordeev , Catalin Marinas , Arnd Bergmann , Guo Ren , Palmer Dabbelt , Andrew Morton , Oleg Nesterov , Jens Axboe Subject: [RFC PATCH v3 03/10] task_work, sched: Add a _locked variant to task_work_cancel() Date: Thu, 11 Jul 2024 14:59:57 +0200 Message-ID: <20240711130004.2157737-4-vschneid@redhat.com> In-Reply-To: <20240711130004.2157737-1-vschneid@redhat.com> References: <20240711130004.2157737-1-vschneid@redhat.com> Precedence: bulk X-Mailing-List: rcu@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Later commits will need to issue a task_work_cancel() from within the scheduler with the task's ->pi_lock held. Add a _locked variant that expects p->pi_lock to be held. Expose it in a separate scheduler header file, as this really is a scheduler-only interface. Signed-off-by: Valentin Schneider Reviewed-by: Oleg Nesterov --- kernel/sched/task_work_sched.h | 14 +++++++ kernel/task_work.c | 67 ++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 kernel/sched/task_work_sched.h diff --git a/kernel/sched/task_work_sched.h b/kernel/sched/task_work_sched.h new file mode 100644 index 0000000000000..e235da456427f --- /dev/null +++ b/kernel/sched/task_work_sched.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Scheduler internal task_work methods + */ +#ifndef _KERNEL_TASK_WORK_SCHED_H +#define _KERNEL_TASK_WORK_SCHED_H + +#include +#include + +struct callback_head * +task_work_cancel_locked(struct task_struct *task, task_work_func_t func); + +#endif diff --git a/kernel/task_work.c b/kernel/task_work.c index 95a7e1b7f1dab..81092bc2e7371 100644 --- a/kernel/task_work.c +++ b/kernel/task_work.c @@ -3,6 +3,8 @@ #include #include +#include "sched/task_work_sched.h" + static struct callback_head work_exited; /* all we need is ->next == NULL */ /** @@ -74,33 +76,20 @@ int task_work_add(struct task_struct *task, struct callback_head *work, return 0; } -/** - * task_work_cancel_match - cancel a pending work added by task_work_add() - * @task: the task which should execute the work - * @match: match function to call - * @data: data to be passed in to match function - * - * RETURNS: - * The found work or NULL if not found. - */ -struct callback_head * -task_work_cancel_match(struct task_struct *task, +static struct callback_head * +task_work_cancel_match_locked(struct task_struct *task, bool (*match)(struct callback_head *, void *data), void *data) { struct callback_head **pprev = &task->task_works; struct callback_head *work; - unsigned long flags; - if (likely(!task_work_pending(task))) - return NULL; /* * If cmpxchg() fails we continue without updating pprev. * Either we raced with task_work_add() which added the * new entry before this work, we will find it again. Or * we raced with task_work_run(), *pprev == NULL/exited. */ - raw_spin_lock_irqsave(&task->pi_lock, flags); work = READ_ONCE(*pprev); while (work) { if (!match(work, data)) { @@ -109,6 +98,32 @@ task_work_cancel_match(struct task_struct *task, } else if (try_cmpxchg(pprev, &work, work->next)) break; } + + return work; +} + +/** + * task_work_cancel_match - cancel a pending work added by task_work_add() + * @task: the task which should execute the work + * @match: match function to call + * @data: data to be passed in to match function + * + * RETURNS: + * The found work or NULL if not found. + */ +struct callback_head * +task_work_cancel_match(struct task_struct *task, + bool (*match)(struct callback_head *, void *data), + void *data) +{ + unsigned long flags; + struct callback_head *work; + + if (likely(!task_work_pending(task))) + return NULL; + + raw_spin_lock_irqsave(&task->pi_lock, flags); + work = task_work_cancel_match_locked(task, match, data); raw_spin_unlock_irqrestore(&task->pi_lock, flags); return work; @@ -136,6 +151,28 @@ task_work_cancel(struct task_struct *task, task_work_func_t func) return task_work_cancel_match(task, task_work_func_match, func); } +/** + * task_work_cancel - cancel a pending work added by task_work_add() + * @task: the task which should execute the work + * @func: identifies the work to remove + * + * Find the last queued pending work with ->func == @func and remove + * it from queue. + * + * RETURNS: + * The found work or NULL if not found. + */ +struct callback_head * +task_work_cancel_locked(struct task_struct *task, task_work_func_t func) +{ + lockdep_assert_held(&task->pi_lock); + + if (likely(!task_work_pending(task))) + return NULL; + + return task_work_cancel_match_locked(task, task_work_func_match, func); +} + /** * task_work_run - execute the works added by task_work_add() *