From patchwork Mon Apr 25 15:55:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 12825905 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 20CD7C433F5 for ; Mon, 25 Apr 2022 15:55:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E8A56B0074; Mon, 25 Apr 2022 11:55:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 297F26B0075; Mon, 25 Apr 2022 11:55:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 15FC76B0078; Mon, 25 Apr 2022 11:55:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id 083936B0074 for ; Mon, 25 Apr 2022 11:55:25 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D0BF521DD6 for ; Mon, 25 Apr 2022 15:55:24 +0000 (UTC) X-FDA: 79395850968.25.8FB8070 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id ADE034003F for ; Mon, 25 Apr 2022 15:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650902123; 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: content-transfer-encoding:content-transfer-encoding; bh=PVSYP5Mpz/Q9il9/k10rbzttz20c1zE5kV+uNj/q4Vs=; b=ZiwkWS92wKZzwc8apWDTcJ/sC2FbK0qtuttlw6XoEsy1WRLuYLld/H+4ldmuYRnLQnzqSR r342uCbi3uCElfDxKbkh3MZrLgT3W2TgGKkWnlMsJgKALI8RGZpCzMacWZmfKETJtylTaH s94lrSgj5C2e6LcrTo4eEc1IUp66A8o= 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-470-bSGNyslVMsafW4i05ZIK1A-1; Mon, 25 Apr 2022 11:55:21 -0400 X-MC-Unique: bSGNyslVMsafW4i05ZIK1A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8B183C025B7; Mon, 25 Apr 2022 15:55:20 +0000 (UTC) Received: from llong.com (unknown [10.22.9.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0667A404D2DB; Mon, 25 Apr 2022 15:55:18 +0000 (UTC) From: Waiman Long To: Tejun Heo , Zefan Li , Johannes Weiner Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Feng Tang , Andrew Morton , Michal Hocko , Dave Hansen , ying.huang@intel.com, Waiman Long , stable@vger.kernel.org Subject: [PATCH v2] cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp() Date: Mon, 25 Apr 2022 11:55:05 -0400 Message-Id: <20220425155505.1292896-1-longman@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: ADE034003F X-Stat-Signature: uafjitgbk5fkcno1n4txy7hrfwztbcsy Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZiwkWS92; spf=none (imf11.hostedemail.com: domain of longman@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1650902121-982227 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: There are 3 places where the cpu and node masks of the top cpuset can be initialized in the order they are executed: 1) start_kernel -> cpuset_init() 2) start_kernel -> cgroup_init() -> cpuset_bind() 3) kernel_init_freeable() -> do_basic_setup() -> cpuset_init_smp() The first cpuset_init() function just sets all the bits in the masks. The last one executed is cpuset_init_smp() which sets up cpu and node masks suitable for v1, but not v2. cpuset_bind() does the right setup for both v1 and v2. For systems with cgroup v2 setup, cpuset_bind() is called once. For systems with cgroup v1 setup, cpuset_bind() is called twice. It is first called before cpuset_init_smp() in cgroup v2 mode. Then it is called again when cgroup v1 filesystem is mounted in v1 mode after cpuset_init_smp(). [ 2.609781] cpuset_bind() called - v2 = 1 [ 3.079473] cpuset_init_smp() called [ 7.103710] cpuset_bind() called - v2 = 0 As a result, cpu and memory node hot add may fail to update the cpu and node masks of the top cpuset to include the newly added cpu or node in a cgroup v2 environment. smp_init() is called after the first two init functions. So we don't have a complete list of active cpus and memory nodes until later in cpuset_init_smp() which is the right time to set up effective_cpus and effective_mems. To fix this problem, the potentially incorrect cpus_allowed & mems_allowed setup in cpuset_init_smp() are removed. For cgroup v2 systems, the initial cpuset_bind() call will set them up correctly. For cgroup v1 systems, the second call to cpuset_bind() will do the right setup. cc: stable@vger.kernel.org Signed-off-by: Waiman Long Reviewed-by: Michal Koutný --- kernel/cgroup/cpuset.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 9390bfd9f1cd..6bd8f5ef40fe 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -3390,8 +3390,9 @@ static struct notifier_block cpuset_track_online_nodes_nb = { */ void __init cpuset_init_smp(void) { - cpumask_copy(top_cpuset.cpus_allowed, cpu_active_mask); - top_cpuset.mems_allowed = node_states[N_MEMORY]; + /* + * cpus_allowd/mems_allowed will be properly set up in cpuset_bind(). + */ top_cpuset.old_mems_allowed = top_cpuset.mems_allowed; cpumask_copy(top_cpuset.effective_cpus, cpu_active_mask);