From patchwork Mon Mar 7 19:59:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 549698 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDD38C433FE for ; Mon, 7 Mar 2022 20:00:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245236AbiCGUBL (ORCPT ); Mon, 7 Mar 2022 15:01:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245222AbiCGUBJ (ORCPT ); Mon, 7 Mar 2022 15:01:09 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EB426E547 for ; Mon, 7 Mar 2022 12:00:14 -0800 (PST) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 383113F7E5 for ; Mon, 7 Mar 2022 20:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646683212; bh=wYDSBk7iUMWwKBfS03BdFKJC7SiK0s9WxGrCHtrTAag=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z+gjvDtsAH1x9Yxf+0BiY0koF+3CTWZXVyAHiKRSRORf4HziAyr+PvGeEr/Wq99Ew Myf//mzy3rw/N5iGIOU7WaVuPN2aRhivNX5LjlogxwIJMD9dQCcrZiwcaLHm0PXL10 /1dopKCBT487XBjVqHuTLZokkxLObTVf+FonoIUkccAPbLM8w7tLSMnv7+m7Cn+R5D GrTM/2gcmg7i1CZsiKG2FSxsr/MOE9XytIJ57YFsLEVKwaEyfXIJEGl1DrdztbtzwQ EAbbtWLFEWbLs7ol95OWzMX+Oqv9mTM0ct3hz+CulU04idoFtSxiNCIzot+UWisZ8x U9oMjNix40Gtw== Received: by mail-io1-f70.google.com with SMTP id x9-20020a0566022c4900b0064289c98bf8so11411827iov.12 for ; Mon, 07 Mar 2022 12:00:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wYDSBk7iUMWwKBfS03BdFKJC7SiK0s9WxGrCHtrTAag=; b=nDwQ7sky3gPBlInuAvLQJILbCpxbwLbG4P0xhK1OIT5h62O4c8nxqlirscKAwxYtwV ficFjFjrk0qVVpOYjl8kRBjfOYIL1tpU7QogeppLcqdy/MxDF8pa9UoMPjJ1BxyRmxbH K8yx5CFuOGrTquMpJsqbZ7vcAKLiiq1DRngd3mSsFb3zhOPihs5aLo7atx4Mt87OcGNQ zQtw8V3H2sf6VbKkFJS6/kT6H3nr6yxpFsEkqGdShY2pgJNLu/qIRcVglWNQgm+h+KZf FreOt7lTZ9GLDNruTXpiqgyfcDY1W7xzbMCAxxx95cuQA0cO51YvODc4mCtgkOi5Gq2B HhOQ== X-Gm-Message-State: AOAM5317sdr+F4qiBMuVLyd7RmHziEyRMNxbHyJSOOeGlLCtcYmwoAHy 1PScy0d93xfSSTN0JDbc0hwULjsL60VlbS335W2in+DPiEsa8xYVpUM+L3yA70EQtVw7rRVvr/Q HEfWL0PoxhzremMmDN1AcYa+/YdcFEAJfng== X-Received: by 2002:a05:6e02:1445:b0:2c2:ea36:dcab with SMTP id p5-20020a056e02144500b002c2ea36dcabmr12631738ilo.200.1646683209843; Mon, 07 Mar 2022 12:00:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbeq+Fz7xNxAbYLluyLiyZsv49d7uCqaI9YqSyxJQyitO22Zue0ppVtoVt+VkT1pgMZIoG+w== X-Received: by 2002:a05:6e02:1445:b0:2c2:ea36:dcab with SMTP id p5-20020a056e02144500b002c2ea36dcabmr12631715ilo.200.1646683209602; Mon, 07 Mar 2022 12:00:09 -0800 (PST) Received: from localhost (c-71-196-238-11.hsd1.co.comcast.net. [71.196.238.11]) by smtp.gmail.com with ESMTPSA id w6-20020a056e021c8600b002c602537ab9sm11255624ill.54.2022.03.07.12.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 12:00:05 -0800 (PST) From: dann frazier To: stable@vger.kernel.org Cc: Valentin Schneider , Dietmar Eggemann , Peter Zijlstra , Ingo Molnar , Vincent Guittot , John Paul Adrian Glaubitz , Sergei Trofimovich , Anatoly Pugachev , Andrew Morton , Linus Torvalds , linux-kernel@vger.kernel.org Subject: [PATCH 4.19 2/3] sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa() Date: Mon, 7 Mar 2022 12:59:40 -0700 Message-Id: <20220307195941.459076-3-dann.frazier@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307195941.459076-1-dann.frazier@canonical.com> References: <20220307195941.459076-1-dann.frazier@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dietmar Eggemann commit 71e5f6644fb2f3304fcb310145ded234a37e7cc1 upstream. Commit "sched/topology: Make sched_init_numa() use a set for the deduplicating sort" allocates 'i + nr_levels (level)' instead of 'i + nr_levels + 1' sched_domain_topology_level. This led to an Oops (on Arm64 juno with CONFIG_SCHED_DEBUG): sched_init_domains build_sched_domains() __free_domain_allocs() __sdt_free() { ... for_each_sd_topology(tl) ... sd = *per_cpu_ptr(sdd->sd, j); <-- ... } Signed-off-by: Dietmar Eggemann Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Vincent Guittot Tested-by: Barry Song Link: https://lkml.kernel.org/r/6000e39e-7d28-c360-9cd6-8798fd22a9bf@arm.com Signed-off-by: dann frazier --- kernel/sched/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 0826f3f4920a..02e85cd233d4 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1428,7 +1428,7 @@ void sched_init_numa(void) /* Compute default topology size */ for (i = 0; sched_domain_topology[i].mask; i++); - tl = kzalloc((i + nr_levels) * + tl = kzalloc((i + nr_levels + 1) * sizeof(struct sched_domain_topology_level), GFP_KERNEL); if (!tl) return;