Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1305104pxb; Fri, 20 Aug 2021 02:42:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUuPwK01yZXqCkt8hhCg/ozyxfxBWw5DYnrrwhTOTSLLw3dUSytJJ3HAxAQuAUegASCKWd X-Received: by 2002:a05:6e02:1bac:: with SMTP id n12mr13176083ili.151.1629452544945; Fri, 20 Aug 2021 02:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629452544; cv=none; d=google.com; s=arc-20160816; b=BR//gDds2cSvKB8fbO6sUYYTQtBpTtUKRr+QClJ/Ez80Yl/1N1ib01rAVyGa7TA/hs wT4RTaQMkdRkQQUd9lkIlBvRlHJK5lY2yiP/SgpyykjLfSq4UZsUgV/fB0OPbGlEef+9 QYhuaLLbQnX5lfu070aToM4RaKe+xKwG2QygBzf2mZ8bqftBBRG6oou6gRtbxNn/OfJU 2hN/GksF3MD87oynsPNENgqkwVQj3fYc2dLJOHSkOTw/IlaGmBrG+uZVoXy+sWaJnVtz Kzn3NtXp475Y/eNxVFnDVmLwUq9/MXCM4PSbnQBHCpd0jHucXYqaD+O4HxcrDSrnuOTg /jSA== 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=mk3pzEbe7hMn1PKFNH+h5kr4+QThbJ4FJbuURvEL6qs=; b=TCceMtBTcn1kQRzqmmOPh8v+YM/RVVWwWR7Wdq9JqPp0ImVTtD2VQZYecmoF8P8ugL tzC2Syq24LKmKmJz0BixecHbXCJ1sW9fDjY2Uz0mcM+u6/Bc7A3ejY4UDgjh0SHmkcJH vHgylDy8C1gE0NbbYVJdj1sOg8JAgUWmEJVJBa5UjYSL9NPWch0I/HzPKy4+zkbZOu7C +hIfsps0+VO7Haz7BbBYKcmzrTH6Ua0kmR/nixCcDiBIVEU8/PfZj3xwAE7Niev6nmWD HYSuDHdvgDzZfpEMqyR/uctCYwmD8opeso492e9DMFYQ1DUpRCp8UJiimAInqlH5L6u1 PV9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex-team.com header.s=default header.b=g0VyrVHa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w14si6626574ill.17.2021.08.20.02.42.13; Fri, 20 Aug 2021 02:42:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@yandex-team.com header.s=default header.b=g0VyrVHa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex-team.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237638AbhHTJkv (ORCPT + 99 others); Fri, 20 Aug 2021 05:40:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233976AbhHTJkr (ORCPT ); Fri, 20 Aug 2021 05:40:47 -0400 Received: from forwardcorp1p.mail.yandex.net (forwardcorp1p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b6:217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C569DC061756; Fri, 20 Aug 2021 02:40:09 -0700 (PDT) Received: from sas1-3cba3404b018.qloud-c.yandex.net (sas1-3cba3404b018.qloud-c.yandex.net [IPv6:2a02:6b8:c08:bd26:0:640:3cba:3404]) by forwardcorp1p.mail.yandex.net (Yandex) with ESMTP id 0292C2E14D0; Fri, 20 Aug 2021 12:40:06 +0300 (MSK) Received: from sas1-9d43635d01d6.qloud-c.yandex.net (sas1-9d43635d01d6.qloud-c.yandex.net [2a02:6b8:c08:793:0:640:9d43:635d]) by sas1-3cba3404b018.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id M5FCuBHUdG-e4uqxH64; Fri, 20 Aug 2021 12:40:05 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1629452405; bh=mk3pzEbe7hMn1PKFNH+h5kr4+QThbJ4FJbuURvEL6qs=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=g0VyrVHaOuAMmjd2ZJWhXG2vo65VTUvXvchTdCfP2AfxefsmvcYahKaaGiUfmKExi ZB+KhnnPoK4UUcnxXFVFSULaYzfNO59fiGR51VkiItQM9p2b83oVYzBYLRRPhscEHw yMvN4iH1D3EBfDV0Sx2Y98v9HCmkwxuL3kGvcVQE= Authentication-Results: sas1-3cba3404b018.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.com Received: from dynamic-red3.dhcp.yndx.net (dynamic-red3.dhcp.yndx.net [2a02:6b8:0:107:3e85:844d:5b1d:60a]) by sas1-9d43635d01d6.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id G4f2cCJGSV-e424BS5u; Fri, 20 Aug 2021 12:40:04 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Andrey Ryabinin To: Tejun Heo , Zefan Li , Johannes Weiner , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot Cc: Daniel Jordan , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, bharata@linux.vnet.ibm.com, boris@bur.io, Andrey Ryabinin Subject: [PATCH v2 2/5] cpuacct: convert BUG_ON() to WARN_ON_ONCE() Date: Fri, 20 Aug 2021 12:40:02 +0300 Message-Id: <20210820094005.20596-2-arbn@yandex-team.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210820094005.20596-1-arbn@yandex-team.com> References: <20210217120004.7984-1-arbn@yandex-team.com> <20210820094005.20596-1-arbn@yandex-team.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace fatal BUG_ON() with more safe WARN_ON_ONCE() in cpuacct_cpuusage_read(). Signed-off-by: Andrey Ryabinin --- kernel/sched/cpuacct.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c index 893eece65bfd..f347cf9e4634 100644 --- a/kernel/sched/cpuacct.c +++ b/kernel/sched/cpuacct.c @@ -106,7 +106,8 @@ static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu, * We allow index == CPUACCT_STAT_NSTATS here to read * the sum of usages. */ - BUG_ON(index > CPUACCT_STAT_NSTATS); + if (WARN_ON_ONCE(index > CPUACCT_STAT_NSTATS)) + return 0; #ifndef CONFIG_64BIT /* -- 2.31.1