From patchwork Wed May 4 00:07:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1626061 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=SpfIU+WU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KtKpR2vBRz9sG0 for ; Wed, 4 May 2022 12:02:22 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nm4LE-0006uh-S4; Wed, 04 May 2022 02:02:12 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nm4LB-0006tr-Q2 for kernel-team@lists.ubuntu.com; Wed, 04 May 2022 02:02:09 +0000 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) (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-0.canonical.com (Postfix) with ESMTPS id CC5B73F6F0 for ; Wed, 4 May 2022 02:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1651629728; bh=ZBwyWUjsSfG2ybQrdF34pntmpGt9dxnPukjvy1YrUgQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SpfIU+WU9EUxg5/FRxAk64EDRBKHXFOuv9hUs523Jy7toXsZn8jhm9RwBuNIanebI Jgedw1azXEbq1+y0aWg3H5gXMUhwcaG8Zi4PMr4PJPJdtW8ze6enA2fTMj+VHwJoly ocMDmHcD32zdR8ltebOND6LFXWv10HlZIcPWSHsMJ5YYQ9L5hxnw4OD0/0ekxyoBZ9 obbsj2HKeCea3cHpHbMRKDHtswiA9yC2CJVqUSsGxfGnlOjSn6aC3JSsBXbOY0R2nq CTRLn58GIJeWQ9rvOnSK3LQDdpE3ih2JtwXgw1S7cJw7BJIKy9nrefOshz+G1vFD5T NeI9nh0G4910A== Received: by mail-il1-f198.google.com with SMTP id g11-20020a056e021a2b00b002cf48b48824so24519ile.21 for ; Tue, 03 May 2022 19:02:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZBwyWUjsSfG2ybQrdF34pntmpGt9dxnPukjvy1YrUgQ=; b=ZitURy1Db4Bpz2GyQ+c+6n2aIGvuVBevRC3HCDYnUKVsG5CG8KPpbO3YUNS6xWiIGm FEPiFbPUpz1U2CLEGhOUYTXm1CLm0yYPx1m6DYBb1jTSFh/GaR4jJfv3Z37YU38GBU4G EJD7CEUzw+1T9PAnAj0Q0QUoxp1xAgvh7ogk0Pev0yeaIlDBGl9cF4S2pO6+osXDdRZj XbBJgYg1rokBOMJ1Aq+ze54oLMoVPNUdAd//xyX3Pd3ZzeLqFxJEzZJaHfV8N4wJN/Pg 2kSRlgIgew6aQxXlQe0b06eF+Z+4gf8wTrsJcF4p2YhFh0xE+NSXFm/VItN65ibjHo5D 6mXg== X-Gm-Message-State: AOAM530jZpR0yWcGrJiifFQq2douSatHVj3nKvQO4Vbd6M5HvYmaguH1 784mmtSLrItmYRuzjCBVTqjm+2cCjCq3Ee3FwAgK31WZSONcHWD2a6kw8XYqevyalyWNZDMyRRV 24oMrhjP0X46bKTwHetbKZqF+xwGL6VvxMogPuT27eg== X-Received: by 2002:a05:6e02:1c0c:b0:2cc:1757:ebbe with SMTP id l12-20020a056e021c0c00b002cc1757ebbemr7262745ilh.205.1651629727706; Tue, 03 May 2022 19:02:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7NPfXM04jlEd/FPj9+FYpqraJU+c2P2Bf7mY3+R2VJwFcZqNwtQfbHq/aQXUTAS06qV6J9g== X-Received: by 2002:a05:6e02:1c0c:b0:2cc:1757:ebbe with SMTP id l12-20020a056e021c0c00b002cc1757ebbemr7262738ilh.205.1651629727374; Tue, 03 May 2022 19:02:07 -0700 (PDT) Received: from localhost (c-73-14-97-161.hsd1.co.comcast.net. [73.14.97.161]) by smtp.gmail.com with ESMTPSA id i34-20020a026022000000b0032b3a78173dsm4322757jac.1.2022.05.03.19.02.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 19:02:05 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH SRU Bionic 2/3] sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa() Date: Tue, 3 May 2022 18:07:33 -0600 Message-Id: <20220504000734.1128688-3-dann.frazier@canonical.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504000734.1128688-1-dann.frazier@canonical.com> References: <20220504000734.1128688-1-dann.frazier@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dietmar Eggemann BugLink: https://bugs.launchpad.net/bugs/1951289 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 Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 6d93ffef8ccdc1f3da616c71ef1fe580c7a4a3af linux-4.19.y) 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 2f94a02b45f9..4f49b941be34 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1433,7 +1433,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;