From patchwork Sat Nov 12 22:19:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 19267 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1454642wru; Sat, 12 Nov 2022 14:48:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf5+eIQD+w3ZnqerBDm1NJVz+2YgsyB9f//HusDXsWnO3MpU/aPsa01xEdog0luI+EV+MW6f X-Received: by 2002:a63:c001:0:b0:46f:e657:7d25 with SMTP id h1-20020a63c001000000b0046fe6577d25mr6505424pgg.347.1668293298823; Sat, 12 Nov 2022 14:48:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668293298; cv=none; d=google.com; s=arc-20160816; b=A1AEF8O0t+owahezfC3o/HU6VRY/EfQrwwZm3TMwoVxVchbgAEov43ecL1a5Q3KKZ9 dJGwmODSrOUpPoYbGBhiZh4zjVw7qZ3S72XbFenbc8h4D+uDbyDy+rC1Ng7NDW1InG84 Khhwvi6k4gu1inZfhEjnP3oZvr48h+t9PahFV/yf8EO90E516GSbRISPvfHnkiogYcWP OMC4JJVltRPqHIKf3yL9YCdManT/juRqWTFAJbb28Xj3NyuwGXucGGDotL3ll7LdEvQK cDfjff+/QxubApIaxpHG5xZMgGF7DC5nbjoXSyMH84StB3swCTrX7qdgpB+aKP8+S+0w roLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BEeh1aXYPMoNUSRUbgR3jz4w6CXvrkqhiV75ZDaEEV4=; b=TDIZnaNDc79EXuQNGyrrmWjbsp/bBtDGklnZV/Ek+a77Yd6IaSkgrbO2Mc87SCmv9I 5C3XWK9kVG06xnb9rapWV+Dtzufn3dCbK3Yiz6FVZ1b/VspKBqA9duXj9g5dUNUxrg0t wK9EaMkleRQw2Us0VFPGXt1+oQOKF4EqKUFJFN3o8WOBN7euVnDya8cSN3f37NbrP5Cv bU/OZMGe6iOTAWcXCKeyADBXYjxLgVgdqxEtmA9EpwY5cQgrVgcPLJQsRZkNNJIeAkT4 vmhjycVWcweLgSBTHE4z/156kCmWuW+yNMsVH0EyurVqnbojGKvr0H/rS5pLi9zRYRvG kn+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bG1Dr5JX; 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=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oc4-20020a17090b1c0400b00213cb58e47bsi3882544pjb.8.2022.11.12.14.48.04; Sat, 12 Nov 2022 14:48:18 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=bG1Dr5JX; 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=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235139AbiKLWWG (ORCPT + 99 others); Sat, 12 Nov 2022 17:22:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234941AbiKLWWE (ORCPT ); Sat, 12 Nov 2022 17:22:04 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C00D3FCC3 for ; Sat, 12 Nov 2022 14:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668291615; 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=BEeh1aXYPMoNUSRUbgR3jz4w6CXvrkqhiV75ZDaEEV4=; b=bG1Dr5JX9LKI7mF1SvOUrNIelMNkpMPjku/e17sIRR5PTtpdUNZ32VZ0yD2Xb6l3+0xJcQ TFxuNCpGe3eR5GBN4QTEKzGZs2gPBZ0Zxn4f1gJm7WN0B16xK6aT9xBw8j25BT9kLIenqu TDGwFh2EZB5oTOROw1su28dpTNTgx3M= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-654-8zaKV3QnNFCJ7_2jNM1Ukw-1; Sat, 12 Nov 2022 17:20:09 -0500 X-MC-Unique: 8zaKV3QnNFCJ7_2jNM1Ukw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F25DE3806703; Sat, 12 Nov 2022 22:20:08 +0000 (UTC) Received: from llong.com (unknown [10.22.8.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id A31B8C15BB2; Sat, 12 Nov 2022 22:20:08 +0000 (UTC) From: Waiman Long To: Tejun Heo , Zefan Li , Johannes Weiner Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Andrzej Siewior , Waiman Long Subject: [PATCH 1/2] cgroup/cpuset: Skip spread flags update on v2 Date: Sat, 12 Nov 2022 17:19:38 -0500 Message-Id: <20221112221939.1272764-2-longman@redhat.com> In-Reply-To: <20221112221939.1272764-1-longman@redhat.com> References: <20221112221939.1272764-1-longman@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1749332314205235929?= X-GMAIL-MSGID: =?utf-8?q?1749332314205235929?= Cpuset v2 has no spread flags to set. So we can skip spread flags update if cpuset v2 is being used. Also change the name to cpuset_update_task_spread_flags() to indicate that there are multiple spread flags. Signed-off-by: Waiman Long --- kernel/cgroup/cpuset.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index b474289c15b8..2525905cdf48 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -550,11 +550,15 @@ static void guarantee_online_mems(struct cpuset *cs, nodemask_t *pmask) /* * update task's spread flag if cpuset's page/slab spread flag is set * - * Call with callback_lock or cpuset_rwsem held. + * Call with callback_lock or cpuset_rwsem held. The check can be skipped + * if on default hierarchy. */ -static void cpuset_update_task_spread_flag(struct cpuset *cs, +static void cpuset_update_task_spread_flags(struct cpuset *cs, struct task_struct *tsk) { + if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys)) + return; + if (is_spread_page(cs)) task_set_spread_page(tsk); else @@ -2153,7 +2157,7 @@ static void update_tasks_flags(struct cpuset *cs) css_task_iter_start(&cs->css, 0, &it); while ((task = css_task_iter_next(&it))) - cpuset_update_task_spread_flag(cs, task); + cpuset_update_task_spread_flags(cs, task); css_task_iter_end(&it); } @@ -2530,7 +2534,7 @@ static void cpuset_attach(struct cgroup_taskset *tset) WARN_ON_ONCE(set_cpus_allowed_ptr(task, cpus_attach)); cpuset_change_task_nodemask(task, &cpuset_attach_nodemask_to); - cpuset_update_task_spread_flag(cs, task); + cpuset_update_task_spread_flags(cs, task); } /*