From patchwork Thu Aug 10 16:24:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 134109 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp550859vqi; Thu, 10 Aug 2023 09:51:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFA352vpvoc+PFpFv5gjIhqtzvvxGvAurAiid4Y9XlUjqkzRYJEytPK/l3XvqLx1i3iD7ib X-Received: by 2002:a05:6a00:a94:b0:676:20f8:be41 with SMTP id b20-20020a056a000a9400b0067620f8be41mr3403727pfl.16.1691686310714; Thu, 10 Aug 2023 09:51:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691686310; cv=none; d=google.com; s=arc-20160816; b=yIOHUmQG7iuP+7bxsfkwXcKVxZI3sn9u9jidWexrGehDOT9DpGgv6hCBIfYYhCX3Za C1+kqaUJO9PQomJRMEpnu2SbwUM1eYIbiYBwTHtMEYjw18s/fGQ2oZo5ZhhcDqMMFVff z5479O4f6aKYxHhlp9MzUkx31/9IaF+kfFVUr1gaQd3FF0dg2KhoE1PcVhP3RPiNeAg2 4RF3ZNMaovpNWWBtyjWIob8HEucB+F/p1f5uhbs2A90uAnwvJZXDV/nK6lzjG2mbNVAg 3fq3fr9Oiw9qQJZhg4DaySWLaJeXOeATUleMt/WsI+fjSE3ZPGRYuCfKehnQbupNbX6C nBDQ== 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=Nt6CR9HHeK7zgBz6fcScWFIY0NBszh7vNKMQXcDtos0=; fh=9qAGUL3Hf1ACcvxfUO+VSYVV5xOK4ai1JwhJLmbXGtM=; b=GGITMK5AVoW/zxvM6aGizDF9ImD73TfRaGqMTwznNivtAScfaojj2Zic1IvxEkgcJJ +2HhClH2pcWdLMZo8wSxTrgfIu+EfOm43iEZMiAYsKWNYPhd2VaYScj5SYLp9uGn0j6R l7rax7LNUzby6U9tWR6WATonEM1yadYgdV3hdNLG9nWbqM+CPByw16BqwXU5FZjtI9xT sg0E29xdIXX9l3Ab1mHCqSQAaTsthzpRk00gcPD/qU+/3vOD1l2qWDrh/3R/xz4O4DmK f/I4FhQgz4LXhUMve/l7y4/3dxPe7GmQY0vou21M7FAhiCHDVcTWChrNlxOREBJld07A h8qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=XFsFzQqd; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bz17-20020a056a02061100b00553ebb05d25si1957389pgb.80.2023.08.10.09.51.36; Thu, 10 Aug 2023 09:51:50 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=XFsFzQqd; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235291AbjHJQY4 (ORCPT + 99 others); Thu, 10 Aug 2023 12:24:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234983AbjHJQYv (ORCPT ); Thu, 10 Aug 2023 12:24:51 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2223103 for ; Thu, 10 Aug 2023 09:24:50 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-68783004143so844048b3a.2 for ; Thu, 10 Aug 2023 09:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691684690; x=1692289490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nt6CR9HHeK7zgBz6fcScWFIY0NBszh7vNKMQXcDtos0=; b=XFsFzQqdaTaPQRn6vyEKmgGKISYvFL/a6YMDa77xCoXUJFV6954HgACo6As6lTmO69 ZKjDlc1V8S38EIFNwQ0yt7lx8Z747kn6RUFY4Q5T9mQSdTsnHof2DwQo90tMjIUhcmhF 1NhyZ+FgbibFcbOArCPbbApw3NYcJ4Vrut4/yslOdF0A4ayO1+QkunBxsDzw0LkGKSKx mQ+LFHEM/UbfAFr4g/ODj6M2NkfxFAisnT6/viOipN9H1YfSFKNeqk2mG0glgsX+ERvC b7qSUha5wggKGIAq/HTrx7uiVRJD5SS5OTzVVL1sKQOUZEaeG1gNeiU/HMRGYAp8JkJg fLBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691684690; x=1692289490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nt6CR9HHeK7zgBz6fcScWFIY0NBszh7vNKMQXcDtos0=; b=JJ6Xsg5IecJC11THrWqZaCIufMHrdW0WaQv7iaVwGxdEM1LSEKa/22uI9cbgHP44tM qAU1p2IfWJSblQ6cMXDLOeykDwoJav/nLCwq+vkJPqDHgxn381U2hetX4ozTq0Jakv5V tptLWmQqBz6Iu/wo19k8zQER4yscSsZoW2dWdm7cC4z2PO+SLITnUO6TAwsfuWuOx1zD XK08vuvZBW/hCXkD7r6VJXqu1NLBPsxzdnRhvx36BGENnA4sIxWVt4hsgYa6/7F1Zgx7 zIs404DxE7t48RQrAj0s0UX5Q9jBp+S4TfwtottTm1AIqGttCXV2yf0PET+rjO0kWuOl Lf9Q== X-Gm-Message-State: AOJu0YwpwaB2kxDv6hLVMlbl9kS1W4nvQoa8dkTgGFpiQsVeRwdzDe68 zEsTlTUW5M5Bkscriy+yitBfrtXZ814= X-Received: by 2002:a05:6a21:3e0a:b0:13a:fa9e:787b with SMTP id bk10-20020a056a213e0a00b0013afa9e787bmr2366502pzc.12.1691684689654; Thu, 10 Aug 2023 09:24:49 -0700 (PDT) Received: from localhost ([216.228.127.129]) by smtp.gmail.com with ESMTPSA id l6-20020a62be06000000b0066f37665a63sm1724928pff.73.2023.08.10.09.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Aug 2023 09:24:49 -0700 (PDT) From: Yury Norov To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Yury Norov , Ingo Molnar , Peter Zijlstra , Andrew Morton , Ben Segall , Daniel Bristot de Oliveira , Dietmar Eggemann , Jacob Keller , Jakub Kicinski , Juri Lelli , Mel Gorman , Peter Lafreniere , Steven Rostedt , Tariq Toukan , Valentin Schneider , Vincent Guittot , shiju.jose@huawei.com, jonathan.cameron@huawei.com, prime.zeng@huawei.com, linuxarm@huawei.com, yangyicong@hisilicon.com, Andy Shevchenko , Rasmus Villemoes Subject: [PATCH 1/4] numa: generalize numa_map_to_online_node() Date: Thu, 10 Aug 2023 09:24:39 -0700 Message-Id: <20230810162442.9863-2-yury.norov@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230810162442.9863-1-yury.norov@gmail.com> References: <20230810162442.9863-1-yury.norov@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: INBOX X-GMAIL-THRID: 1773861664670699567 X-GMAIL-MSGID: 1773861664670699567 The function is in fact searches for the nearest node for a given one, based on a N_ONLINE state. This is a common pattern to search for a nearest node. This patch converts numa_map_to_online_node(node) to numa_nearest_node(node, state), so that others won't need opencode the logic. The following patches apply it where applicable. Signed-off-by: Yury Norov --- include/linux/numa.h | 7 +++++-- mm/mempolicy.c | 18 +++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/include/linux/numa.h b/include/linux/numa.h index 59df211d051f..fb30a42f0700 100644 --- a/include/linux/numa.h +++ b/include/linux/numa.h @@ -25,7 +25,7 @@ #include /* Generic implementation available */ -int numa_map_to_online_node(int node); +int numa_nearest_node(int node, unsigned int state); #ifndef memory_add_physaddr_to_nid static inline int memory_add_physaddr_to_nid(u64 start) @@ -44,10 +44,11 @@ static inline int phys_to_target_node(u64 start) } #endif #else /* !CONFIG_NUMA */ -static inline int numa_map_to_online_node(int node) +static inline int numa_nearest_node(int node, unsigned int state) { return NUMA_NO_NODE; } + static inline int memory_add_physaddr_to_nid(u64 start) { return 0; @@ -58,6 +59,8 @@ static inline int phys_to_target_node(u64 start) } #endif +#define numa_map_to_online_node(node) numa_nearest_node(node, N_ONLINE) + #ifdef CONFIG_HAVE_ARCH_NODE_DEV_GROUP extern const struct attribute_group arch_node_dev_group; #endif diff --git a/mm/mempolicy.c b/mm/mempolicy.c index c53f8beeb507..db74dd957d2c 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -131,22 +131,26 @@ static struct mempolicy default_policy = { static struct mempolicy preferred_node_policy[MAX_NUMNODES]; /** - * numa_map_to_online_node - Find closest online node + * numa_nearest_node - Find nearest node by state * @node: Node id to start the search + * @state: State to filter the search * - * Lookup the next closest node by distance if @nid is not online. + * Lookup the closest node by distance if @nid is not in state. * - * Return: this @node if it is online, otherwise the closest node by distance + * Return: this @node if it is in state, otherwise the closest node by distance */ -int numa_map_to_online_node(int node) +int numa_nearest_node(int node, unsigned int state) { int min_dist = INT_MAX, dist, n, min_node; - if (node == NUMA_NO_NODE || node_online(node)) + if (state >= NR_NODE_STATES) + return -EINVAL; + + if (node == NUMA_NO_NODE || node_state(node, state)) return node; min_node = node; - for_each_online_node(n) { + for_each_node_state(n, state) { dist = node_distance(node, n); if (dist < min_dist) { min_dist = dist; @@ -156,7 +160,7 @@ int numa_map_to_online_node(int node) return min_node; } -EXPORT_SYMBOL_GPL(numa_map_to_online_node); +EXPORT_SYMBOL_GPL(numa_nearest_node); struct mempolicy *get_task_policy(struct task_struct *p) { From patchwork Thu Aug 10 16:24:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 134151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp616028vqi; Thu, 10 Aug 2023 11:49:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSP3IR4g/eFqnd3jWAkHBRrtcpOirYWd+mYpUH2B36k8AzFMGd51We+bOkQxzFUIkBBTCP X-Received: by 2002:a05:6a00:2d23:b0:682:95ab:32f with SMTP id fa35-20020a056a002d2300b0068295ab032fmr3194680pfb.1.1691693348195; Thu, 10 Aug 2023 11:49:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691693348; cv=none; d=google.com; s=arc-20160816; b=XzXbY/TvX0T5RaiWdeZ5RyJkPvK6X5awWohmKgFoTJg5czxVs80PzS2ciEwka35esx Gh8pTUuNy1Mnkiq+J7jwWfSQIAZmRlZNcT8p3iXI/SVk3+QwvHkPsdSMFd0lu36YH7dm AFHuWgeY1dgstGWDXEyzib7bcH0BvD+TavJmemlnYY+ChVuySXCFvdqHxmMT5ODQGezE Y7tUkSo3Ape37kh+VpGZ67/2Ntcy2BCFzdpE3un/Hl1bouue9Wy5pSA3BuK1ucXXJ/MT RDENqSNphakBZ6yY0qHIxtIJr4e/A8xBYyg7yFSyPSIeqOUQJjVJjLSEpCAOkrait2dO l0WA== 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=97Np0Dq1sjh/AlJqPoAcdype5uG/AKghnCitY+NNEhM=; fh=9qAGUL3Hf1ACcvxfUO+VSYVV5xOK4ai1JwhJLmbXGtM=; b=f+WcJtQCGAodVr7yv6TvbbgNRToLGO5hHKxwOEeK8uEK2OO1eMHZPRLXzImLkhC1AQ PJu61ekHTOpn7vzz+2UtdXqrL3s0iIzK7qjndy/iS5A1rIGWCEMCuxWz5N+VZIaVC9sI sYrSQuN0PhG2WYLUPSxhBVASo5d3+XL4HcCYjUOtuuNsrJ3l1oS3k4kboLD1XYwdfq9p ZyraLw2ahtmRRCUgLtWUo7UIU4aL7Ct+fgBc/YOrEEEmgs75zGWCuivF2StSFw5nsTtQ p58GH/+z1V3Q0yOouc7dsVlyBjuZkJhflblTSLRf1wWqLXKTv7Ir3iZ+pww/WOeuZEhc igCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=A28IsFYW; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a056a0023c900b0064d3e917a90si2023299pfc.180.2023.08.10.11.48.54; Thu, 10 Aug 2023 11:49:08 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=A28IsFYW; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232046AbjHJQY5 (ORCPT + 99 others); Thu, 10 Aug 2023 12:24:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235494AbjHJQYy (ORCPT ); Thu, 10 Aug 2023 12:24:54 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B6CE2698 for ; Thu, 10 Aug 2023 09:24:54 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6873a30d02eso807792b3a.3 for ; Thu, 10 Aug 2023 09:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691684693; x=1692289493; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=97Np0Dq1sjh/AlJqPoAcdype5uG/AKghnCitY+NNEhM=; b=A28IsFYWvTZlltxjPz79uMSyOph+88G9Ft3TaE6hmpdwtTjAbpLjj36Y8D1rDP5tsx gqNrKYT1WaVWHMwBgHXzOMScx0r58umABHAX7X4pOuPQYd591n7NqkzmlhOTkIYVBQ3E MUZPgcWKB0YzfP6uKnviDTG4+uKLPED3865QUmLUUL7UFawQ2V0wm4gVkkAZcpfi5rZH cwyvQA7rOIFLZu455sw2Oy9pbys4jHsxVhgUieAUKjUp7qbRHT83k5UbKOy1ArvX0tRy d7aMj1rbYp4sZIB56MqBWrF+cJL6gbbrA1ROBmN+zF9kgt+n7OS35AsGnir2YZyx7kAE cl8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691684693; x=1692289493; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=97Np0Dq1sjh/AlJqPoAcdype5uG/AKghnCitY+NNEhM=; b=FM922jVPdeUL4kiZNOfQYnI1kCq3AJSUviTohxZ09ftK2NCbCkq8sCbhWCuyKE6Nzs R5b5mwK3eHQFRJoO+2z3f2UMLgLP2jkTYn+l0KkNw5ABdmTMY6vWPzle7tQP4Yn0iiWe MFc2rHF8vpqPIct3imxv0eC6vtCTNUegcRkk1l1LbbT1CmZ+Hg04K0P46xFQ6XtsyA4+ WliFjCrMKwrgySjvFlUH/qYJYKt6+DZ6iJikKKRFtOAPB8K+67kdXx1uvYcHGkoGnkS+ CN7fB9R3b7vCJKBh539sJi45WUBuEiddhhO0oTkBVm4QwcqfA88mfbXFGttZFEsiSUBQ dSFg== X-Gm-Message-State: AOJu0YzHRMlGSMSeFBEzILWTMzvefPQij+GjRsbbeoS/EGtGHRGSrFny UI7zMpnDkbyLZHXxJ9E8ljaTDIJl8J0= X-Received: by 2002:a05:6a20:325a:b0:134:a8a1:3bf with SMTP id hm26-20020a056a20325a00b00134a8a103bfmr2389040pzc.30.1691684693125; Thu, 10 Aug 2023 09:24:53 -0700 (PDT) Received: from localhost ([216.228.127.129]) by smtp.gmail.com with ESMTPSA id f15-20020aa782cf000000b00686a80f431dsm1711885pfn.126.2023.08.10.09.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Aug 2023 09:24:52 -0700 (PDT) From: Yury Norov To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Yury Norov , Ingo Molnar , Peter Zijlstra , Andrew Morton , Ben Segall , Daniel Bristot de Oliveira , Dietmar Eggemann , Jacob Keller , Jakub Kicinski , Juri Lelli , Mel Gorman , Peter Lafreniere , Steven Rostedt , Tariq Toukan , Valentin Schneider , Vincent Guittot , shiju.jose@huawei.com, jonathan.cameron@huawei.com, prime.zeng@huawei.com, linuxarm@huawei.com, yangyicong@hisilicon.com, Andy Shevchenko , Rasmus Villemoes Subject: [PATCH 2/4] sched/fair: fix opencoded numa_nearest_node() Date: Thu, 10 Aug 2023 09:24:40 -0700 Message-Id: <20230810162442.9863-3-yury.norov@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230810162442.9863-1-yury.norov@gmail.com> References: <20230810162442.9863-1-yury.norov@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: INBOX X-GMAIL-THRID: 1773869044342925674 X-GMAIL-MSGID: 1773869044342925674 task_numa_placement() searches for a nearest node by calling for_each_node_state(). Now that we have numa_nearest_node(), switch to using it. Signed-off-by: Yury Norov --- kernel/sched/fair.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b3e25be58e2b..e7b7cf87937b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2645,19 +2645,7 @@ static void task_numa_placement(struct task_struct *p) } /* Cannot migrate task to CPU-less node */ - if (max_nid != NUMA_NO_NODE && !node_state(max_nid, N_CPU)) { - int near_nid = max_nid; - int distance, near_distance = INT_MAX; - - for_each_node_state(nid, N_CPU) { - distance = node_distance(max_nid, nid); - if (distance < near_distance) { - near_nid = nid; - near_distance = distance; - } - } - max_nid = near_nid; - } + max_nid = numa_nearest_node(max_nid, N_CPU); if (ng) { numa_group_count_active_nodes(ng); From patchwork Thu Aug 10 16:24:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 134168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp632417vqi; Thu, 10 Aug 2023 12:18:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4UWap9y0iTS1JMox1x/393qjhIWicqPBGtaCEOdegKtDlvGHJDgtEoXEhEiFwtUWpYeWz X-Received: by 2002:a17:902:b084:b0:1bb:3406:a612 with SMTP id p4-20020a170902b08400b001bb3406a612mr2569139plr.57.1691695108059; Thu, 10 Aug 2023 12:18:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691695108; cv=none; d=google.com; s=arc-20160816; b=gj+8Pgf9ywbMqM8VRLmFVUvvvO++sQqqhhYfVVJLcR9ZDs1VV15eP+eDTT+r24uxvO aqJPClj4VaSVobCRXrnByI0EpBsw3MdHhOS8aDtvjdCk9YyqFwV1GGk1ttCUtlU1Rz4i ykVpGsZ70sgA321fnLOZUsMovubIv8ySuEJPZaxXnqEt/LlHp+xg7xMCPK0tBcguwxoG sQ4XUVoorOnCzl2v5dpCtUwGq+AL1Db2vIIIrKkFnZeqJch8faV/4FvGcd2kVsDXzh4h TuQyC7w2SXnNGhkPCNZnJQ/BAJc3xJtr6Us2suH0VBXRQr1JEk+rk2XoaOkqup8swvEO o3Ng== 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=ZQk4oJI+dzYiJ4RogHTgjWRfeAMe6bXV6Pd7fbAJYxU=; fh=7RsnnZV17RjkPqZtPkkOH8i8TwE7qt8QBvLbKiyMrd4=; b=yQWlcBnMMDUlOZF6EbRRjcuI2/idF1SYESrqd7tTQV1lybW7cJaClIKbUCb8+4V1v1 uERslv3GK+QjrCPTyfS6vblyruC90NGQuz9LyYGIjHfL7zZOHx1CLWqSvQAojq6s6dcm TFUF/1P7u1DacvTZzBm1X8+a57u4frLaHyXKEtqoDWpBtVwrKGOSPtz26N4jVWez/FLG VRmVQ8mzAPj8aWCpeLXMfFjgyttpENajfszM+t+noLCjkoHapkDeLwLKJ92jRW0n/Cdy Mr32wgk1PqUVvRraqd9VXe6gv3mfAUa336Xw7DplvmxamqeGPCi2UXnEf/lhPE6Y0dIT X42A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=M6sZ2J4R; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l7-20020a170902f68700b001b887c89a8dsi1988041plg.521.2023.08.10.12.17.50; Thu, 10 Aug 2023 12:18:28 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=M6sZ2J4R; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236771AbjHJQZG (ORCPT + 99 others); Thu, 10 Aug 2023 12:25:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235458AbjHJQY6 (ORCPT ); Thu, 10 Aug 2023 12:24:58 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77D6426B9 for ; Thu, 10 Aug 2023 09:24:57 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1bc73a2b0easo8793645ad.0 for ; Thu, 10 Aug 2023 09:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691684696; x=1692289496; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZQk4oJI+dzYiJ4RogHTgjWRfeAMe6bXV6Pd7fbAJYxU=; b=M6sZ2J4RqvlOD26FWyHUZkJEL4FbixgRpcY7K5Qx7CRSteyzAk5jEZZ3/nSPOURWur xcSHtBDVDtXtT9UMg52UVtPwO0QW8YKpfYXUalKV+OjXLuAXZDRiFksuPQTN9TUxg8+i acSXvrkexfeLi8DqZ7kHNO98YwAfh6HJSsX5un/0hBI/J1NfQ08+TGhJeXlRZKeSUtlJ ysKOCebZZJiOVVIulL83NG/0ZacXvYct0AyBjluLQVjG6Ny72+8lqqCgScSAnHTYF3/A pdJGSITa/qbFccDnMfseTM3MqRfO8Kq/mwaqrFxvSlmYyBl+Cmymt3+FrfbDP0NHrBZn H49g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691684696; x=1692289496; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZQk4oJI+dzYiJ4RogHTgjWRfeAMe6bXV6Pd7fbAJYxU=; b=O1TmntaEt6TY7RGjbuyluOHlH3fT+JVcaxx9cIG6/L5Saynofr/IHjyQx4zN/myQwS 71nbyQHwDPvsvUlu2r4sd2Tf0wAT0rwuoNpn/mX/W0HhwTiFz1N6k2ZaIS5MT7MQsF1K l7GN8yKlI9GA8Wc+smLmnFgLlrYqT3Iin8LQz4mYJOG7yB8sQs/hZm2TYh8GOkkdoLfM Na21kP/+PKFSq1ba3bqPhQvvyYWxqNvLV/iQ3OKNxxSV7/wuFeIpFOzEPaRQ+/mBMI7r 4+iz8NE5JHoPfGdut4EeCCR/u78PkJj44UljvLcFj64yp2bnIqdpftUKj6Bp7ZgBvO+j Z44A== X-Gm-Message-State: AOJu0YwW70+Q2DZ8Ry4hHP+fvJahM27LA+xknIRok1yHOOYGfGpPg1Lk akhsRbV74I1Uu28dOBHYbhB1nXkxj2w= X-Received: by 2002:a17:902:d483:b0:1b5:1787:d23f with SMTP id c3-20020a170902d48300b001b51787d23fmr2773609plg.5.1691684696416; Thu, 10 Aug 2023 09:24:56 -0700 (PDT) Received: from localhost ([216.228.127.129]) by smtp.gmail.com with ESMTPSA id r10-20020a170902be0a00b001bbab888ba0sm1967879pls.138.2023.08.10.09.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Aug 2023 09:24:56 -0700 (PDT) From: Yury Norov To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Yury Norov , Ingo Molnar , Peter Zijlstra , Andrew Morton , Ben Segall , Daniel Bristot de Oliveira , Dietmar Eggemann , Jacob Keller , Jakub Kicinski , Juri Lelli , Mel Gorman , Peter Lafreniere , Steven Rostedt , Tariq Toukan , Valentin Schneider , Vincent Guittot , shiju.jose@huawei.com, jonathan.cameron@huawei.com, prime.zeng@huawei.com, linuxarm@huawei.com, yangyicong@hisilicon.com, Andy Shevchenko , Rasmus Villemoes , Guenter Roeck Subject: [PATCH 3/4] sched: fix sched_numa_find_nth_cpu() in CPU-less case Date: Thu, 10 Aug 2023 09:24:41 -0700 Message-Id: <20230810162442.9863-4-yury.norov@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230810162442.9863-1-yury.norov@gmail.com> References: <20230810162442.9863-1-yury.norov@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: INBOX X-GMAIL-THRID: 1773870889633625912 X-GMAIL-MSGID: 1773870889633625912 When the node provided by user is CPU-less, corresponding record in sched_domains_numa_masks is not set. Trying to dereference it in the following code leads to kernel crash. To avoid it, start searching from the nearest node with CPUs. Fixes: cd7f55359c90 ("sched: add sched_numa_find_nth_cpu()") Reported-by: Yicong Yang Closes: https://lore.kernel.org/lkml/CAAH8bW8C5humYnfpW3y5ypwx0E-09A3QxFE1JFzR66v+mO4XfA@mail.gmail.com/T/ Reported-by: Guenter Roeck Closes: https://lore.kernel.org/lkml/ZMHSNQfv39HN068m@yury-ThinkPad/T/#mf6431cb0b7f6f05193c41adeee444bc95bf2b1c4 Signed-off-by: Yury Norov --- This has been discovered and fixed by Yicong Yang: https://lore.kernel.org/lkml/CAAH8bW8C5humYnfpW3y5ypwx0E-09A3QxFE1JFzR66v+mO4XfA@mail.gmail.com/T/ When discovering Guenter's failure report for sparc64, I found it's due to the same problem. And while fixing, I found an opportunity to generalize nearest NUMA node search and avoid code duplication. Yicong, if you like this approach, please feel free to add your co-developed-by or any appropriate tags. kernel/sched/topology.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index d3a3b2646ec4..66b387172b6f 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -2113,10 +2113,14 @@ static int hop_cmp(const void *a, const void *b) */ int sched_numa_find_nth_cpu(const struct cpumask *cpus, int cpu, int node) { - struct __cmp_key k = { .cpus = cpus, .node = node, .cpu = cpu }; + struct __cmp_key k = { .cpus = cpus, .cpu = cpu }; struct cpumask ***hop_masks; int hop, ret = nr_cpu_ids; + /* CPU-less node entries are uninitialized in sched_domains_numa_masks */ + node = numa_nearest_node(node, N_CPU); + k.node = node; + rcu_read_lock(); k.masks = rcu_dereference(sched_domains_numa_masks); From patchwork Thu Aug 10 16:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 134124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp576774vqi; Thu, 10 Aug 2023 10:34:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEM7MIPtY4M7mlKqJ9A5Sk61Ju/M13ePEBe6/z8HZ5L8w+Mgoj9ArkF6c1UNMXlDz2eEL0 X-Received: by 2002:a17:902:e88a:b0:1b8:a3e8:51d0 with SMTP id w10-20020a170902e88a00b001b8a3e851d0mr3480144plg.45.1691688898557; Thu, 10 Aug 2023 10:34:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691688898; cv=none; d=google.com; s=arc-20160816; b=0T4cnI1gXFaL7oeJ62zdBSveMMwO7Vn5ObfJnLpIeX8LfcZznDqrz7p5qA6YBmwGjy zHhLh62u/9KzBsAeDufqOCV12Ydh/E2oQVmBhKUyNEWgtismU6NdoLdzCqSNLYip0j2c Jaxg7Xq4xJQhxINhjOslG6V0BtMltDprQobW0cQiXfi7FtpUVEO8U12mA1WJpgc52Q67 RQnGxAbe3KUfktw3KpVJQVdT9bYnA1LJ1D27pZ99zw0dHAyxd3j10Ew/VDKf/AHs6rL1 s7SAHpTWR7B5kZdh0uKENsllMDJroOc4PRVtGBu0G7cJfy5D3lmE6WWKAoAmwkbUs0bO F5Kg== 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=SmmjHmVn6ls0sfUQEL2MtTTuL3JIkk0EADWsp1ssJ1I=; fh=9qAGUL3Hf1ACcvxfUO+VSYVV5xOK4ai1JwhJLmbXGtM=; b=sLKmxLZ4XmOc+WkxDS/F9nLZOM2gN7vQ648vIoL2vBmNTRQ86G9Q/uj2lQbqEhaNSt MTUtjwhQYr28Cp9esvpunEv5inNnpiZs7mm3sMat7jBCTDtKsCieZDkB1rVMdAHsrhUw DVSo4hvo2h/VEl/OI/zEctzf1JutxRPhGSYfEygtkJOc0Gl796jsgSdC7fu13CY2j2dX z9MwLGU7T9C+x93IlL42kaGEoGO2gNIPhHaw+JTk+N6rLa7tMrKPh8cT43HkL9LAAqgG hSDQfDI+qgs0K8U+QmdnRFh8rrWZfXD9Xp5fIT5FkEKPLm2/LacWugzU0Hwwjak4EjJ7 cRAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Bfx08UPq; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ik25-20020a170902ab1900b001bdb3876a11si116249plb.133.2023.08.10.10.34.43; Thu, 10 Aug 2023 10:34:58 -0700 (PDT) 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=@gmail.com header.s=20221208 header.b=Bfx08UPq; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236754AbjHJQZJ (ORCPT + 99 others); Thu, 10 Aug 2023 12:25:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236731AbjHJQZF (ORCPT ); Thu, 10 Aug 2023 12:25:05 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37AF3271E for ; Thu, 10 Aug 2023 09:25:01 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-55b0e7efb1cso748396a12.1 for ; Thu, 10 Aug 2023 09:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691684700; x=1692289500; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SmmjHmVn6ls0sfUQEL2MtTTuL3JIkk0EADWsp1ssJ1I=; b=Bfx08UPqSGUA5kMzlG6c1gKFPujJymFxHHEcbncpgTNXWfilym9jS0kJbo5BDAWSAt D9mUQJQct3QouTQHkHkPrBDMCKnWAqpbreP6nPj61t/mOCWJMUiU9SBgEkrua+TY2WvN RQ5wEy+PuxBPt8ZoFj5D2HGw+0EHyLI1z4DoNLoS5QRQ61C+28JBYhQSRil/n4cmq226 +7wHPiq3FSMBXOYZHozHHb530CuwJI/i1j1XgNJxE8OzuAkHE9j+84kXPMYw7IqXs9K/ EXbvqacZmwYzBoSTAuKgMu8XWHjH7xGtl86RqyboalPaLOIF5AyV51Wm78Vn2A7DNWzT lIsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691684700; x=1692289500; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SmmjHmVn6ls0sfUQEL2MtTTuL3JIkk0EADWsp1ssJ1I=; b=N/W3aJ0xf21clczBs2B5V0PPmERg2NcMzvsqk0OX27k5ygRkqbCPjQKlBC+vEw/4wN 21oZOEZhZWs4eQpw55ZyFiPrA2GX3dqUC9l5/eV1q73JnHbAAkopsyMLJ7YoW9KbkLQC rkzq3e8rj94BNuJV1duArmQ89pa1YszSgZUJGKEzZH6C332Zmnu/ykoY1/OjkqQuCDoa U2IU0FWjIPMX0MZpj8Sj3b/ds82VD2QFpqJ7OcCv/aaUclLcPZH1EVAvRxomJFvVYwDr is/fTNbPvDpX+chMVDr8q/Xdvh6wH4IJtTJfZWyPBBhlOrQ/s5o6m0Iq+iJU6U214QCC +R7Q== X-Gm-Message-State: AOJu0YwRtw7ttvcZaTzfLvXeOhXkqtu1n66XL+MSjqh1LhAi7A7NkpoM KHSv1+SmcK3XDl2HoNL6GcdvOfs/l+M= X-Received: by 2002:a17:90b:4f8a:b0:267:f8a2:300a with SMTP id qe10-20020a17090b4f8a00b00267f8a2300amr2362896pjb.7.1691684700106; Thu, 10 Aug 2023 09:25:00 -0700 (PDT) Received: from localhost ([216.228.127.129]) by smtp.gmail.com with ESMTPSA id l9-20020a17090a070900b00267b38f5e13sm1811075pjl.2.2023.08.10.09.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Aug 2023 09:24:59 -0700 (PDT) From: Yury Norov To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Yury Norov , Ingo Molnar , Peter Zijlstra , Andrew Morton , Ben Segall , Daniel Bristot de Oliveira , Dietmar Eggemann , Jacob Keller , Jakub Kicinski , Juri Lelli , Mel Gorman , Peter Lafreniere , Steven Rostedt , Tariq Toukan , Valentin Schneider , Vincent Guittot , shiju.jose@huawei.com, jonathan.cameron@huawei.com, prime.zeng@huawei.com, linuxarm@huawei.com, yangyicong@hisilicon.com, Andy Shevchenko , Rasmus Villemoes Subject: [PATCH 4/4] sched: fix sched_numa_find_nth_cpu() in non-NUMA case Date: Thu, 10 Aug 2023 09:24:42 -0700 Message-Id: <20230810162442.9863-5-yury.norov@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230810162442.9863-1-yury.norov@gmail.com> References: <20230810162442.9863-1-yury.norov@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: INBOX X-GMAIL-THRID: 1773864378141005535 X-GMAIL-MSGID: 1773864378141005535 When CONFIG_NUMA is enabled, sched_numa_find_nth_cpu() searches for a CPU in sched_domains_numa_masks. The masks includes only online CPUs, so effectively offline CPUs are skipped. When CONFIG_NUMA is disabled, the fallback function should be consistent. Fixes: cd7f55359c90 ("sched: add sched_numa_find_nth_cpu()") Signed-off-by: Yury Norov --- include/linux/topology.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/topology.h b/include/linux/topology.h index fea32377f7c7..52f5850730b3 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -251,7 +251,7 @@ extern const struct cpumask *sched_numa_hop_mask(unsigned int node, unsigned int #else static __always_inline int sched_numa_find_nth_cpu(const struct cpumask *cpus, int cpu, int node) { - return cpumask_nth(cpu, cpus); + return cpumask_nth_and(cpu, cpus, cpu_online_mask); } static inline const struct cpumask *