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: 13349707 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 6178FC04A6A for ; Thu, 10 Aug 2023 16:24:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A1B5D6B0078; Thu, 10 Aug 2023 12:24:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CC366B007B; Thu, 10 Aug 2023 12:24:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86C946B007D; Thu, 10 Aug 2023 12:24:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7869B6B0078 for ; Thu, 10 Aug 2023 12:24:53 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 297351610B5 for ; Thu, 10 Aug 2023 16:24:49 +0000 (UTC) X-FDA: 81108718866.05.0B84A59 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf28.hostedemail.com (Postfix) with ESMTP id 099FAC0008 for ; Thu, 10 Aug 2023 16:24:50 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=XFsFzQqd; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691684691; 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=Nt6CR9HHeK7zgBz6fcScWFIY0NBszh7vNKMQXcDtos0=; b=WTDS+7jMU3KUli3KDjEzWLrqahM1jEP0AdFqO5XCvfKO/xFnFYRlF8kJ9Hoejta+d+RCPh DbRXGXIPRKhmBWPvttsVqclXzKYF0wfj22QiGlHHK2CASPwjqsosPIBNAk6VzJjLfTRWWr UesHxiGyaaLB4WQHoQfPmRepYKxNWwo= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=XFsFzQqd; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf28.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691684691; a=rsa-sha256; cv=none; b=70mPhbHUIy6JAiIBg5IoWC0R+cZqoan9xHGGTKE0Qu6gnzB1XhVJJVpelayczt5tN0HQ4i mK1BE1ZOdOOaeyNRUDAHjmTwxfGU6tiLuT6qjkLXTRlSEoo0eNl8E/rvE0rTM00IyCGqR6 xbB1u9MQISQ6+z85DKT52ODxZap/49k= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-686b9964ae2so841247b3a.3 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=ZJEzGusL9Hy32kDdYUNFS7Xir6k2B7hvPK+8Oeqy0CmCTrLOWT3awFUWxyI/0eASoK YERAgK6jvqIcHmPg+ZfuebW29kPALr76jlDW0EVvwScGBaap2CU7GK8AtVFj2CXpNsIg j15hZaDiR3Q9dLVAjn/ZlW/WExzx5EV2IZwZq9DVMFJMx06ajLia++klxkyntHiRSLAf Tv99Q8CEPLpUEulx+RtrZ7uM/Upbdj1emQfnCx7oZlXOQXdftQSzCjHatpOjWi8GN8MN M50ouN8/XdeeqtquvofId1IVj6c9Oq6egPy/YfHRU6W9q4fBHhIgtZTbtHaAeGMJqSPw Nvvg== X-Gm-Message-State: AOJu0YzeS4ikYfpfmg9GbhcFLOgCSpReXgY2pNQIaKzDoCZ982QZKVI2 G7WHrn/dYVZFi9gkFXgI7KU= X-Google-Smtp-Source: AGHT+IF+HSKdTxdkxlmBxL9la1pCFwMfvcL9kLyLQbU13M/krB/0NdbxKsUiSjtnGTzzM/pJoXXx/A== 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-Rspam-User: X-Stat-Signature: 766gic4um64gjtc8hgczjxpdmxnwk7su X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 099FAC0008 X-HE-Tag: 1691684690-907769 X-HE-Meta: U2FsdGVkX1+TNyGLn3xxsce8Tn7BXXWm0UgCMAxdtHh8bXAk1FuBvi2PydhoOxJEuUCB4MDH5QLDEqtizZ8G2MQs10rIzQ31KyvN57WNIUJMO4E6MDwFTK0/fGQLWbJ5axTjsfOpCu5KSGYD7UUOTDJMvhPniKOr7zutogNLZLbEfhM+iJc0gjxEcZyC6rnpPY4QnwPfOQb4ZmItIsXss0LWl62MgEJ/BM5p654Rv2cq3KZmqjpzOCKuIDH3bpZxco7Wa585yyoDvtZEriAfUPAAbFEQoEfSMuhr+BJFUXJ3IbLW8CMxlv841Xo3wgdshapGkuMc0F2hqjkxJs1t0Hg39D/0hwGKZYQD3IhYQN1CtIrGU06oFQNMuD1Na2gceHenrnLvfOtI0544O61DGKabYvBBIbsqqfOF5uLvM3XjXT4iimiiTSc+zpHcwgZv6ASjdx34g1sg8Aumr6Rk3a3i0+XutFSQ6GR55fSt7GiwwD6h4isFULpKEQuPLRy68pHLyUYWYbYTT/QA3VvX3HGL/HCU0/XiNITwAA4jrjPP62U+h2hHWHq+Furcb9Anb43okxDZ+7stFkdV7N/ntp8EfSgVlb7ZSNCIHy4IcBD3q9N8G+Ohcn0PGwV6OQcKq6gPXPL4zPiXdHXalBUKO2p0Z4EbvVjheyQqLLxRUtC6z+sVj89Z2wuWVRmVC6cQZZSDL4UAPbps3Ka2iJPg3Pkp8ubJt/aDPMt9QgzOW1RDEcKk+PKRDnTIsmAFGJkFW7d8NlNwtFk5jfcM9yBHFkfhZd/khksifLWCZD89bpMmDna1wcbp2NQb07mGsesn5vUULBF7TjD2zfLDFBnePD0ubqO8fHa2Fmek7qfuit0HbcenPFyFQ6CW2QOMLcQ6+0I4jSG71Md4UAPx6c01vIXsf4BQJZ0lMn4J3C3q2jTo5Z3HV2BrF/Qs1Ztnvaoyi818KcVhrki6jcth0d/ 8Djfl3PO 2iCV1hgzHKLUQQpzCxJtVKfq021jVMWVUPi+UFiopP73W8DhS2XyGF8tcvwD3PYdplHoqoTSCfHvrP/+ft/ARzodamqesI0WIf7Ku2BGH5xeoiJW/l+o92wN6WnZz2mkUGlv9XoZSJ2IMP3UZSgs8+8Nfxa79Xx57hutnqnO1c4Q3YVOz8CLcXYriZdX6vU8VZKNF7YuZqLhPITr58BMafbj/iBOzvnomG6dMyIee4rL3L8M11y4ytibv1MtHorrDBH2beX0AgcLU10WIw6nILl6wkBuWt08z7x12Mv6B0r2JQTMijw/2knwtPhSwO7h7FpR0z1ilSrd4tcBd3fVQmypZTfAZP5jgCb2lApNUEd3hFG9G6r89iYSO5n/N8kN7zX+JDsPNQ7HostHmsdquwTyNciphQlIaPebi8Qs2u+SXmd1tUGQV3rg5h9YVvzJSkfp1hRnjOYOxpL0LWtRDMcIUeg7WHYs9LX8nMeK9Ibl3eH4yYjiY19E7L3ea4mVqKr0iAB4krPHNxAssYg6at1fAjKHvGTfIsZXSKZZ89NxzFRSuNm2DQpkztG5MRpk+SZqAiasWwsRh47weB9WKkqIePw== 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: 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: 13349708 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 4D2D2C04FDF for ; Thu, 10 Aug 2023 16:24:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC90B6B007B; Thu, 10 Aug 2023 12:24:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B79B86B007D; Thu, 10 Aug 2023 12:24:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A41D16B007E; Thu, 10 Aug 2023 12:24:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 963B56B007B for ; Thu, 10 Aug 2023 12:24:56 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3821CB29BA for ; Thu, 10 Aug 2023 16:24:52 +0000 (UTC) X-FDA: 81108718992.04.BEA0B49 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by imf09.hostedemail.com (Postfix) with ESMTP id 795D6140024 for ; Thu, 10 Aug 2023 16:24:54 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=A28IsFYW; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.210.180 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691684694; 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=97Np0Dq1sjh/AlJqPoAcdype5uG/AKghnCitY+NNEhM=; b=maMlggT6kNaurZh9K6hCALHIulfDXtQSeXoREJbFVdrYjvGRuG8v1MWkkuDko616hizO1N WeZWwztHI6v/GZzyIDf+bVySc3IQ25LhQEiE39X3K0GFae2yInFLs8Kw/WI1igeXqnIiMV y+RMw9Ncl67hZQMsGJM1IBak09EO2Uk= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=A28IsFYW; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.210.180 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691684694; a=rsa-sha256; cv=none; b=PzdvSaTHFqMt9nE3gUDb8T9rQZdt2AH74e+I4af1PG/oP2+RXdldohbn8KnYlOU0JzNcgT jXhuP897uL8n9POUEBdl5+TiemY8x9tUBfukyfLmjKoCzVRhyQm9LYHiU7RkG6XYMOQ80O JqNye9qOjprcjxEP+2ihG2z76K4t5fA= Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6873a30d02eso807782b3a.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=O/xacvtw+9KqC0o828Ycf1w0Y3JHh+lWXMnx2niedsM7DpXELdfVhZns9PYzEwYIRl 2F9JUwSdLTjZFMVQyVaeGQ2XktAw0+HudmTgXSapQ76+ZkR2EynLw1AuZMpFzKtbqB81 V0KFzR0G2kb/rZOppcWzE7XVHM6/4sTSvq3xdWj9fyKDytm70pDZKAyn1Vk+AS0Lvlcz 81Y4pVK9UkGcLAk72Ola7R+lH+17Q6QKRRYRQHstJZUVzlJo7XBe+N29cLhgAvJvCow0 IsOjnrmQuHxK/Zj8oeEx1tPG9bQmGfRUHFdTZzSUzvnRZH6u6IW15tZU1gfNrzCNhTVT scJg== X-Gm-Message-State: AOJu0YwCTUHgAPTw+gTFaWiRR5ngLVUdFQ/kSjFARBXl+L1E4F7x4tIB /ZcZYyVSkAjqow3VglZxq0s= X-Google-Smtp-Source: AGHT+IHsk0h5rwGZHG4cMG39kTlHSH3djuCACl1aU9H9G7Tq9XIknzH67+DdDoStnlXXCDW22OILnQ== 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-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 795D6140024 X-Stat-Signature: sfa4p6akmampb5mo3a5mfurarnq89uk8 X-Rspam-User: X-HE-Tag: 1691684694-805549 X-HE-Meta: U2FsdGVkX1+SjZeYK2qhBMBwtHY112MTGc+XjVVdbQFQBEEbeEizzEDnIXJMgIGY4ChPZRdZaWfxmzxx2iGIIhuziOhhaxybbnDFNZUCaRTkhy1laLRklKkKk63/10g12pNchg7Dg0wFz+aAJdvjadyioT2FPyuysBd3OmT4QwNPXwK4+7gQVsaIepwU6Gt6ZmNfP3BueG4jgTNi55IipBEsHBNNXXWqQXKyO1K81JY6/vxh3Hxtqf/3Or3e8e0avqm+lFgFKmvaLG6coHroXwKJx2bOhDjr2HvUymJbxRA4Jy8jaa6Tu1Y5LY1H9RH9fbVR0uZM76zMFcdDaJe+akd7pJ66Z6wfbjoOa0GPXqKNTdXwfzy4SsAq8F8QzAldNz5VfebrROkTbQob32jwskt4R/Mkm3/62LSHHhFiBtXFzkEwqim5wvXPRaWYMsgdrj/NezWJOfxVErAFjby74sld00+JGd7uuY5Nc+XjGigrC6oH5UNPStbyS9Rtgy3VrfC9oWdUhVi2brZiaaWpEarxneupVwXetR4/t8ajC5Izf/JN8pbqepvseUt4JgVt5HfY8CkJdRIP5PnwHG/NzYC2swd5/HWjyzxL8mX+AyrdzqtOW1hXSUIBxjKNEG0O7j+AJt/yW03+Xmzsttf3rHZTpfZQ6R+hbQuc2iDmF+f0oQwIMOeIhjzKOW5dXRdq5A1aG49DYTvXAE86ythBr9OzHIGse+UIStzcu24gSbQP9Sft3ci58o0TMoeZ/+fs36G5uY25GnhNKu7eZYdLi6cN2DWwojBbEDnReaEL6nfdbSiDKFFzkcvNu3di1NXIDT0z6b5L6XilDoKLxlLaKICCaZFDu61SojSrnk9sAf5B/yZcOQMovtyo4qYuDDw91e0rKe5lYz6hhpYMiLGTBp4LKzBADRQBwWIkdHvIOe9awER5p64NyvyRcpAAVuzaOs9s/145DXXWHS37eJg dlqlXErp a/qSNBkFpZoXMDRqfdkOi1/8YQ2nnQ8orPtYYM3zFP3yRy5N13iPPSRDBwxv0IxeBfm2a5XmzdlXGZ+hnYHkX9psYDVCU8WwYCo17L6jripN3R0aKfTnYcs80DtmxjLPU5sJAyeIHrvMzmwmOTgssO9jRvLmRRvN9OalKNb4eRbbVM05BQdLP4Z1iaAGKDgBhmQgu/1vb59zRnJsXDX/41U4vSTSw6xcdmrx0/H6j8JMie4tSKbVetA7CrkWoAsioLFTlHHukVUkz4tqOK1qVvyGJKHN/XZaIP6MlRzQMLsBpVkyW/5JmqpH0fz/yI2xhtBrGPHeA0ZmXzFGdhICryGjs9/77D8cq3xqxpAPm6nwoN+QkYwHf8xJ3XyH+5rcgySdppj3vuDAVHf2SFjMFtE02N1H82DkfTY8/9rJADM5wpV5JjAJ5hyagRvcDpPlA/0MLuEAwk2pRwEVtd4u7cQAfF29+NAUC6Zuywp4GuyFGY3OX+A7wI/8HmPt1CI6cOa6dXW9VMAQhwz20XJ2DV3sShGvrqufVBaskR/Qfd/dmVoDsPsHPHAmWuHX/sJ4ZRHQRgTDXhYrbon6kDnkeGOv2dQ== 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: 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: 13349709 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 85DDBC001B0 for ; Thu, 10 Aug 2023 16:25:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB3AC6B007D; Thu, 10 Aug 2023 12:24:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C644A6B007E; Thu, 10 Aug 2023 12:24:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B041D6B0080; Thu, 10 Aug 2023 12:24:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9FF0F6B007D for ; Thu, 10 Aug 2023 12:24:59 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 839FF1A10CF for ; Thu, 10 Aug 2023 16:24:59 +0000 (UTC) X-FDA: 81108719118.08.6633BB4 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf07.hostedemail.com (Postfix) with ESMTP id A843A4000B for ; Thu, 10 Aug 2023 16:24:57 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=M6sZ2J4R; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691684697; 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=ZQk4oJI+dzYiJ4RogHTgjWRfeAMe6bXV6Pd7fbAJYxU=; b=bskLC8Q5ogYuUqygxomN80BcqFq9HEhffkTjV6QglhfiRfltcTVF/nMHfJNZayzSB4mIfV LsZLRTkR7O8AJlPAGMa1ZGQiyMek6Z7XLnj16swQ8aVNptK0LMzTjDLlMyM5tm3D6VOrTs NQXsUlrQ/8vflzJlDQz32uGvcgVgX+s= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=M6sZ2J4R; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691684697; a=rsa-sha256; cv=none; b=f71hEB0ThFMFaUThj+yImpuuCMJigPJ8derhc2VJErziRpMn+oCGTUq/I/qa2+avMellFF DrwZHVuYj7gRAbUtjX1XW9ytPVOyrnR0hH1VLbIxoEoupRQw2mToRpj6Hfby7t2qVNfs3O KxWWI2pAnI/GCCBLkWnAzC/0JNgZXXc= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1bb7b8390e8so8594875ad.2 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=frwNynlnvS+UL0pVRMNho13JJtvAZuFrIPu/wLXou9Bx8sLEx4ZrY4BIAiJq/XApMh +hS39t38DMtP/9emp53fcU8FyfPlzEvCOz1zbqLfXlZuC6aSmUTxMBdAmXhE6vVMP8u6 N4fuWZ2mEzHnUAHby4n4sUCyrcPhU/c2iareusZZ4WHOOM6BJYDe7vFQsWjkcYZn/HQS pk2blNEn3QypFlR1cy+csFuLWaQWSKpFao6J6xss3lrsfPN5qhSn7lX9h3hgjGzsSRms qrU6x/bCBgTHD6yn0jRqYNPoLnbmoUf8/86NQBpRssvotE9q3lGGC344G5uMdAhqPUlO ia2Q== X-Gm-Message-State: AOJu0YwsdsVOt+wOK95m6nhz6ocQ5V2xYc79NEIQeSwsDcdgZfH+44OX TMIkkeVNAoxIpZnwta/teEA= X-Google-Smtp-Source: AGHT+IGpw06hn3MFB4Nmd0fxqwgYy6O+F1jeSuXuJNEsYw+C2EQLFpRj4Hz94ivhfKYOnMQUVqg2+Q== 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-Rspamd-Queue-Id: A843A4000B X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 6ib1buawdu97xey4wtn14dgir43upzs4 X-HE-Tag: 1691684697-149982 X-HE-Meta: U2FsdGVkX1+SL4LWM97A9qej40v0L7BDwNl9lU6v++NeBUvZyn2P8d3cZScfrkYkCtZtBIlo+NRdY3dnTYQQ16EJ0Wpk5m0dhd/H59CeJXBjUIqWrrcmJLuYaQL48qzF0cVEdZKtB5LRaCB7ljNmirEl9BwqU1Q3bH4Qdu9CoAgfRIP659iRKVLUd3cxbyUF8itnWTgRIi6H+08yGob4VpxhfHTFI4Ynq3+BR8JahSsKvjrab7AJ3fgMqQdCSuBHOxvl0D8We/QLgizW/KjCnzWfhuNqMCYnnbI4iqJ3jAY0YiDHvrUmBZiRBiUgwD/7heAZ2PpOk7S8Z3PZjtgz32CG5npx7vb8DpNQEEDmNhIC+gDSbi5zqpgMEHOcHOifa3zNdGZbLDPoILM74NYAqtAEcSRReaiq+rYgrLhSmZ8lL3ZkJmDbNkY0ivxJkPUiDkIHMYKwmsEXfkwN828oPkdnuEvseL8usppPe8mLtgQrRJ052L9Zl4aUy9cH8eSJ/i/3QjymKyxQsxhbHruIMPJc0VrN46VOiOoDWtIuDBcKZ1MG5KK/45MkfptxAORoC0g4TcCNl+YXlRJur9j8W3JhFAN4UYWxb1WbUlUbucn2lJ7v1B6xYrHxaowxJqsNZtKeJm6U+Cd3C9JZZzAGyG2ZQA2zxRZQHQty80FJ0xyIBJqoPcrqfN4LB3xKWf22QUZkZ8FYyp+ODounqdjkqLw8fUGsc2MJVqgnvMWdahdhfijn4ndRHOg0uHcOwIArrOSw1BsfRtgTKapdIb1uIpJ78ap28M4oh5YIu0DisvScu7zSkoPxNbGDIfhjLC4puZ/6cArfeP64Hw/h3CquKLeBEO14OCZfgj0POvhinQHzxGViDVytoVF/CmQ1PGMolmnpe4ZvrJi3llyvisOAXJgQtJf70x98g9lJ17JTYwHmeo3IrlINyW09NI0fsP5+v9qHoaBblgKoDyf5Mwd BdJLy6PS Kn9dUNO4vYPal16llX7x6EY37IUxJsCSUqB3yHCVmc7jV7D1M2sKBJeqHgKV6t798bB+KdV7ZKGcHt4+wB8x3N4FBoR+nfyrK59p9rjfnomSgI+7ToNhrYYo44QS+GYLhuKkQEcoFgBb0d1wqDQGqEYIbhXfbaKnOP0mBIHZbI6rmMklCprdEfIRY8OUOGb+1KsML240di+iHnV0xxkBtt+jdkgA6ZbCR3DkSjtDMy0DGFlzdg0u7fb8nwIZFbqXvdjTgbNoGLRM9cjnJvZb0oM/xHLvqlJodaCQAmB6O+6Uz6XT1ruAjDf0/MQ+v3AUDQVPw7rI9zaZ+62sqjmI06j/U4HyQr5eEVC5VHouFzU50NNSaMb4YCxE3UHUJAyJSj+cBm0JEACyOGAcb1I0cvn4GGPY7kJG+5OhW+os6jzEm7ttEcoER8izSCx2dH7T/j71hbsqv+CFZPsDMKuC2SRpg20RQUyIMzw8qMUIUmO06ff9QaNOpY0tNTdarPDPYq0xLLaRxHy0uwQQfmv587bdZDPOdIa6vQWbQGRUzpb+3IIF2IxOza3u1CFklcuLLf06Lt+1pEVTq3vFWydT0TRpUxCZqOXMP8pSqtmb+KEO2emU7M58/Ycr4excV4Wn7WT9luGT/6sEfm5X+dSVzKFavpv0GDhgW5xTCX5B6AmsGk5ps4ItTfG97RoKZuz+B6nafikgdYkFA+vBT+jtgigyqzzCFkvnn7QQbfyRekIKEbG54XnZVwDtqjSOH1h+ayneimM1eSIyzaa9q6AYwUDjauw== 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: 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 Reviewed-by: Yicong Yang --- 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: 13349710 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 EF326C001B0 for ; Thu, 10 Aug 2023 16:25:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E3416B007E; Thu, 10 Aug 2023 12:25:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 893A96B0080; Thu, 10 Aug 2023 12:25:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7348A6B0081; Thu, 10 Aug 2023 12:25:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 649416B007E for ; Thu, 10 Aug 2023 12:25:03 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3DA31C02C3 for ; Thu, 10 Aug 2023 16:25:03 +0000 (UTC) X-FDA: 81108719286.03.78C630F Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf17.hostedemail.com (Postfix) with ESMTP id 6DAB440013 for ; Thu, 10 Aug 2023 16:25:01 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Bfx08UPq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691684701; 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=SmmjHmVn6ls0sfUQEL2MtTTuL3JIkk0EADWsp1ssJ1I=; b=F+0bGYwwZGmf0YA/0L0U+wptrqXuE/+ly84DG9C57lScIma1hjCe4W0rX3gIQWXivuwIkk /DnC02bvVxKVtwPIwZC3uvVvNVbhsefiE3VWg63vnYNXlKcBFqtX/IIhKiPNSHz2uusjtC +bhgKqY5NlcaWZwotTejJzDa9E+YCj0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Bfx08UPq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of yury.norov@gmail.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=yury.norov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691684701; a=rsa-sha256; cv=none; b=nbfFanyvso/H8BOGPULtClp5Hsg4BYp8PVqVucXOmLTE+qTJDGLLLY/8XcUDHUfD/aw22H XGH+8wM5LmLhaHI2T10k8NTaXJjp+mCkiT2ebTW7XZ+OwboaTVyrDpl1zdhCFXIzHZPrcy sBjsfvSecS1+fc4+jquGbBAxT6MLy+U= Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-55b0e7efb1cso748392a12.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=UEIX0gRFkc8LaqRkqiaIssMByDs0h3CtTaMNJ/NfKY3DkGztE0JPKw3to5yT8cndiw TMYLfhGcV9LZZOfP5xeo22B/Sspo0VvAHhXSlWoE3n23J756NDJyGIkyARitVtd4vhB0 eOROnEQVeDHfVTwCetl7nn+FmsX/9BMKRgEyh/CYmRmr8qmAQsA0xVO12nb2myguK2qD VLbmZSidF5YRK0EDfJNkbohNZnsg9VOx/vJPkM7bzWjegqcpp5Mfgo3TfFe6bnL7lj5i PziYSVYjdr4+kayQ9TOBtm7O9/oBixid/eZt8jg0aO9bEyOc2mFSF37LAMlOOmLGUDQD rlWg== X-Gm-Message-State: AOJu0YwE8enTeH0kKed7V4WKSwN7pStHQgfBO3ZKe73LY5ONxDRDG8GJ sSijxZfUnzjDRPcEPCehw3c= X-Google-Smtp-Source: AGHT+IH4taXK3kC2OJr25PCWrlpW+eWTUdvnoQR0cwNL04PBbBOADtjdA//KwLTk44jREORqIyxPQQ== 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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 6DAB440013 X-Stat-Signature: 3nneuxbqzib5etyo8j7yso6e7an7qsnf X-HE-Tag: 1691684701-322501 X-HE-Meta: U2FsdGVkX181ROMgtwKv4wbUDAfmJ8/SPm3lTNbdM39lcgjIz6Q/qxfCKbHo8VQSEuV6C+y49Mx9wbebp6dj5MiMwNH0C6x4+nWHnEW8J1W3ojSSw/cKeQipFQ++e4jHyZBscVCSuRysCICZpFw7TzsQf0SiuyrQjcaOfcA3AgDNcg/vjaBRpEa/oeWpNQunYpPkHgNF3l/pQXwf4hpZLF392RYt9bBQPo5uZhqMuzq6CmF5/BRNxrxQApy/sEGGFaV53ji58iaRADgH0qaEvoL/5jE5ZYSvw942WcdOK4rjU+JsSfw4R6wbzPLkfOA1MpEGi05sYAFcT2YJKJsqabZ67VfLZTy8jSlEO1EvSQ4VxFBzj+LLAt8WNJEhyH9Sq/DT4EjE/8Q5kFrMQofzpEkVglrX1xyk/nIbB2fOq623P7JRHshYxMlqOHlMJRum60zhcYQTNPT+XQe7j9jkGg7daKEzK32sfG+w9MXCpxtMZBsnW6nwLHrhwe7CyxSUOpze/xe0TAP2RTot4hwcjbZRhzfvWSQu8z32G2QTvSykFkC2y+YCgI/bMSQMpVpmrZ+eAYQ47FnuCnoW1bCl1RNz0rKLo8j5Q/Q9nVFb2JZB+ShVP0Q9HNlSwpTqgpPiETW71vQMU25a+Ddv+BKwquGA1zEyEW4tREqfiGvNBJK7M2tfJFvD0hzJKg6oPePjX3kyLBd8efi+HVXdFR6cwjZh/oOl5zTHayRi+VMrxSy0utX296S4wj8Ar0kHcWnNE5Yfq9Y2l4vDMiq9kVRivxMXr55EoNJ5ZeZvVC9PXUifnVtFLp+XB5FXnaDHJvNSAoazJCH6MtVNgJnksOp3jZMsbNwC2ufkyue0vJIvaxaUv0JYBQPHX9U82A3QK3ZJXJeM9HLDgHvxdaQIN274O9qgL7DJ6yCtduQve4SOQiy4j6tUl1nKKH+UlXOHL8XGe0DhhSLXxcEUhPMEwXW oEPEsEvB apNfqC8HxlWfmW2E++6FVEn9dpPy7Ce2F1AhWn87aS/Lt2nUO3Akixw1aJ4mZqSXF8RdtBpmjPNsggVTLHf/ZYZfwbom2+Q7/8rz5Xie9oaGzp4Mx4dzOB0zDmdSq45Vbcnq/eJ4byX3+ytBS6u63iKou90ZXE9fAt55jWrMRMhVcAHPK9jyEn5BP9BCbIMAMrk80dZW9dQ6z00seopPrKYQZ7UpPRabBGVHc59QgOanOHyQ7tbGGsEUhW3GHu413mjiT2yiMS3+TDbdwJ9IAV2QPI9YqSYYnSakQ+0+VwkU9CmfrJiXVQhD+a85/8mqwLadTxUauIRXdjCEGVZfwJPeuqTniji8HHLmM3uQbfBqPISizD7qUSvgAvwrCdzUDQZ10CK8QGU/qclW1w55miq63BpmxuD2h01s1aH0p0PsLBNgK6SchAnHmSeoA3Rd8asHZ84r5NvSNVwWKMFLr02jf0i27yt9GuQGa/9O0ineBzymIN6F3OryHLhgB6Kghcu5SHSDw7LbFu+sBDWqjdBVuOBA3c645vpmENXpmsMBrQGbGrUab0bQUmHFe/KIEtSY2CNFRhO0+lJBs+6FTV50OMA== 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: 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 *