From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F622C282CE for ; Wed, 22 May 2019 19:29:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED2B521851 for ; Wed, 22 May 2019 19:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553346; bh=gv+FR0rS2TJQ3fIyX/u06tYIbVz2HjKxwq4USBy5tlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2JNFrGNSWx/grsRqBdkgR8D2awcmxaZ/L5M4h6CewfBflYEOaCpkM6y5ZU1OKBLo3 jJ2vl2W35AbHPiNC++hYxdf+OehYeF6Vu1XX9NQ3zA9CGhpEZXlEjFOfmAUvy0ueKr xslrEM9gdEODhtbzqE+GdQ96AeD6b+BzrXrrj18U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731882AbfEVT3F (ORCPT ); Wed, 22 May 2019 15:29:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:51898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732736AbfEVT3E (ORCPT ); Wed, 22 May 2019 15:29:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C2ED720675; Wed, 22 May 2019 19:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553343; bh=gv+FR0rS2TJQ3fIyX/u06tYIbVz2HjKxwq4USBy5tlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lFfuDgi3si7YfYsImlzdZOKcr3H2kQ05m1/enwjhyDWU0DSPlmef/PzdLtZOSJ63+ CBoIZGcYBb+MKftQAQsfnKbBXolp0qKjsCt6E0E3Pe+iQC8iXfuxa7rQYcHKAmZjJG a9OtBvZRuEzHGveDeW7ESgnWO+8CP9/vyZfy7Svc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anju T Sudhakar , Dan Carpenter , Madhavan Srinivasan , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.14 014/167] powerpc/perf: Return accordingly on invalid chip-id in Date: Wed, 22 May 2019 15:26:09 -0400 Message-Id: <20190522192842.25858-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522192842.25858-1-sashal@kernel.org> References: <20190522192842.25858-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anju T Sudhakar [ Upstream commit a913e5e8b43be1d3897a141ce61c1ec071cad89c ] Nest hardware counter memory resides in a per-chip reserve-memory. During nest_imc_event_init(), chip-id of the event-cpu is considered to calculate the base memory addresss for that cpu. Return, proper error condition if the chip_id calculated is invalid. Reported-by: Dan Carpenter Fixes: 885dcd709ba91 ("powerpc/perf: Add nest IMC PMU support") Reviewed-by: Madhavan Srinivasan Signed-off-by: Anju T Sudhakar Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/perf/imc-pmu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index b73961b95c345..994e4392cac5c 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -481,6 +481,11 @@ static int nest_imc_event_init(struct perf_event *event) * Get the base memory addresss for this cpu. */ chip_id = cpu_to_chip_id(event->cpu); + + /* Return, if chip_id is not valid */ + if (chip_id < 0) + return -ENODEV; + pcni = pmu->mem_info; do { if (pcni->id == chip_id) { -- 2.20.1