From patchwork Sun Feb 9 22:30:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Weisbecker X-Patchwork-Id: 13967155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA376C0219B for ; Sun, 9 Feb 2025 22:30:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 647156B008C; Sun, 9 Feb 2025 17:30:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F5E96B008A; Sun, 9 Feb 2025 17:30:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D4056B008C; Sun, 9 Feb 2025 17:30:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 290D16B0089 for ; Sun, 9 Feb 2025 17:30:22 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A0D69B2B4A for ; Sun, 9 Feb 2025 22:30:21 +0000 (UTC) X-FDA: 83101851042.08.856DA8B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id 0A8CBC0003 for ; Sun, 9 Feb 2025 22:30:19 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EwO/kDlD"; spf=pass (imf28.hostedemail.com: domain of frederic@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=frederic@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739140220; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=sbVVcl65vVigDl2Jx5EfhHJZQbi3xtIqgRGat45nlfM=; b=i279osf5/Cxb0IIDZRrdUn9DcN9FHskfG0wpKBuchSsYLNagZuFd31HeOf5gKu9ZvVx16r G6LhvVae/n1y8Z6YfvIfWBGprDS5LUTpgDwTmEXa4GNKyZbaIVB1o97GmKVwsTxeujsfkW XVaqOj5GIxFzpCuhyCqLXiA/C0sY55w= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EwO/kDlD"; spf=pass (imf28.hostedemail.com: domain of frederic@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=frederic@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739140220; a=rsa-sha256; cv=none; b=6/2ltJ4cqG3uWfJCPYGOCd/zb8Tr/AubQP+QJ5H7GKK6dHgVmIjASi8l6AZHnXLkCaXGf5 dAJ/chl72sG/4UZWd1JplXH1cp9DYxGiKI7qRl8shR4c58HoQcN4HFvKUllscPhM0gii0w f7zxWjQTfVwkWnkjqF72UpIdKcan90s= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A81EF5C5AA8; Sun, 9 Feb 2025 22:29:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 960E4C4CEE5; Sun, 9 Feb 2025 22:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739140219; bh=ZSwI4jjw4GwkwAYOaWT3SF4KhLf9zm4bvh5Jlfu1Q2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EwO/kDlDiWWnwTYOvc8Wn8BZKybBl8uluDwXw+J8N/hg8bPkRKhsgmNiGp96wemhW pK9lDV47kMS4n9Q9dVw7HhKnYg5h6s+YZTZw9Cfo23iUx0wgHGiMeUmOm/kLmSjmCH EtXXDe6Oyuvv8wTXW2OEfMWsrIiCM0JlEpKMRyoc5ERxfiBW/wZQ31kenSphOApFmF 96QgMhFEQuNq0gGlKvCZauQLWQVQZd9rwHiRQdoUwM2sdD+gY+1H+O44p8J7VokeEt jDbHxzNwUMnuFEm9LfXRfs4n5e9xWmozs7DdkyXijWLGxrhjbp0fX0Rax8A5Y9SpFn wYbMkbB7Vm0Bw== From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Peter Zijlstra , Ingo Molnar , Valentin Schneider , Marcelo Tosatti , Vlastimil Babka , Andrew Morton , Michal Hocko , Thomas Gleixner , Oleg Nesterov , linux-mm@kvack.org Subject: [PATCH 2/6 v2] sched/fair: Use task_work_queued() on numa_work Date: Sun, 9 Feb 2025 23:30:00 +0100 Message-ID: <20250209223005.11519-3-frederic@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250209223005.11519-1-frederic@kernel.org> References: <20250209223005.11519-1-frederic@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 0A8CBC0003 X-Stat-Signature: ghe4x5jz4cxy5ciybx6rs1tj5ipx6axx X-HE-Tag: 1739140219-961675 X-HE-Meta: U2FsdGVkX18eZeBxq5YEk3mw1Hy6vA413nwS9pwN4ENiOlwbv+WsgdHO8jgVGJM2r6C8TqNyFrLHwp+rbL5QqfJVcElCyydfxRt84IwrSicQXVTMboTdzrX2sN0lIUYQ1vbloVYhJscUGQUqGQbnZu3dDcuhjU+PjSHxtdRmnH2NVAeePZHacLVCAprlFx5Wmz/PJif8cUGlTIUUg2qHeoW4cOiTE9mUFALJOFN9ABQblc/4h58Nh/Q6rMCgwKy0lDYMgRnTpKgSvwP6R/UxHGK+nNYD3PO0i7KK/tbBgHsc8Sv/UBtKrQKc9Utg2Yqo3NfOxqKmaLcAX9s9XT+v5r3Zk6Xn1XUGlXdKBx5aHRIWCZnNhDtiEb7MpzXdAQ7KfF+P0Ts+dhIhfkXT6g23ta/Y4K0Naw5WCf+MqLf4h3mk/98vuX1VYHUeM4Zbr5RtUdWlSn8ycQpfAvCoSk1KdTU0uyol155ZHTV3+DXCwlusHScXS0F5N6TWbpuzPg4V0jkfOnS/BVgN2kmiKsWsdZ2fpeif26uBCa26dPOnsckYubDeI/B8IGsg/T2+oPYzVF2mNT04C13Y27jU22UF+I4x6qj0PRhpO+/JXluEKvw9nnJwcKfDb9lLWkzlZ6FrzsxhTspr6E1i9L/XSRuMDMmIZZkwqboYZVz5DoHsSJQrc7K/u99Sw1lKVWjxkwNG5JJdbJgoy/wSMb3+mlUUpB23hPdD4+YR1TP1+M786Vy2Qd8fGf299ViXXSh68+S6CKlRrSBqca1IBqnyPHW81cwW3x3fjsKto/XPH6fyuICY67BmAkvHgrzqAGm5fJXEG1WUDo5eJ28ZEa3GsQI9hd0GOCUFNlCDCetBIoHtQERkY3rLhhFJ36HSoLmqT2Y3IO1hWQg0JGxqspP79qhAPfLAKlMvukNyvogRhxjPvtnV1OAbmPvmYFFvKIZtWbVgzwtuzBhHnjl+FBkuHpI a9A63bUu cGfztpK0ootl0OQkfZO5DbymJFFfCopDj78ZoLzfRUkqQWzgHGrOR7xemfC7bhj0M2kbJzg4b1KLD0tdGHh1yxoc3O2RmxHGBy8LDDfEF5PEWt34tsIKtQT4YlhX0hfAuMJFJkA0u1jg1PGwbMU7Y51QnCxFUv4RbWL1cbuwP0PUOSdvmAVqdNf5WBbXJX3f+Jvjyvn+NHAQ26pGr5L/j7vNpOWygA4DwfW2KuV7vddh/YsLs0l3ox72BJpdOTAOlV+F7y/x8xPsQ7vk2yUW9WnE4agM4wkGZJjQD X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Remove the ad-hoc implementation of task_work_queued(). Signed-off-by: Frederic Weisbecker Reviewed-by: Oleg Nesterov --- kernel/sched/fair.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index ce2e94ccad0c..6a2f45821dc0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3303,7 +3303,6 @@ static void task_numa_work(struct callback_head *work) SCHED_WARN_ON(p != container_of(work, struct task_struct, numa_work)); - work->next = work; /* * Who cares about NUMA placement when they're dying. * @@ -3551,8 +3550,6 @@ void init_numa_balancing(unsigned long clone_flags, struct task_struct *p) p->numa_scan_seq = mm ? mm->numa_scan_seq : 0; p->numa_scan_period = sysctl_numa_balancing_scan_delay; p->numa_migrate_retry = 0; - /* Protect against double add, see task_tick_numa and task_numa_work */ - p->numa_work.next = &p->numa_work; p->numa_faults = NULL; p->numa_pages_migrated = 0; p->total_numa_faults = 0; @@ -3593,7 +3590,7 @@ static void task_tick_numa(struct rq *rq, struct task_struct *curr) /* * We don't care about NUMA placement if we don't have memory. */ - if (!curr->mm || (curr->flags & (PF_EXITING | PF_KTHREAD)) || work->next != work) + if (!curr->mm || (curr->flags & (PF_EXITING | PF_KTHREAD)) || task_work_queued(work)) return; /*