From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 729951547F3; Mon, 14 Oct 2024 14:25:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915938; cv=none; b=BKs6Ojv29v0+6sWxxnt16ZC/KGadFhvz4NcZSjp8F4O3nPJ63vQMPvUXdXXCK8m2K1AO+XjPO8a0nnuQwBfLST/Ifz3aPFbsVLeTF0ZIsnPMKmOF41kwppgDmMxE0dTU10qCBoX1hX4GrhEMf8O/GS+2bSxfrTkmXTSSk+fpIcI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728915938; c=relaxed/simple; bh=pItyfJqN6DLVH3L5vNjbiaLzTj2OSIfy7L5vUIM4QDk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d8VYcOTfVGpayserrbgYGmFVa4JyjOQULhOHldXOyB/tHNCMQ+4iXTnmFd/tOCs+vxO4dYsxyDmPeNNWr2J7fTEr0KTqZ8ZfhwmdIv8/31UKY0zg4qPklm/ZD1rL1cW+lqEclF8axVcMbiRXU9K5pHo2UrcywaBzI/uj46tM6J0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kvheOxMT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kvheOxMT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8044C4CEC3; Mon, 14 Oct 2024 14:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728915938; bh=pItyfJqN6DLVH3L5vNjbiaLzTj2OSIfy7L5vUIM4QDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kvheOxMT5F0XHg6FM7aqrRrN+zD5ghxoE1KZLSTXbvietycvLKxM7dsogIIZ6txM7 LEIA9PFUJChPIfPdA1dirc7B6g9eMfZH4EdDWTF0xgB9bouCcS5P3AnOixYPanuTrg 6+dM3Zm0OXcELOstFQy8MXYAASHkDOxWC7q/s7AQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Richter , Sumanth Korikkar , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sasha Levin Subject: [PATCH 6.11 025/214] s390/cpum_sf: Remove WARN_ON_ONCE statements Date: Mon, 14 Oct 2024 16:18:08 +0200 Message-ID: <20241014141045.975030598@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141044.974962104@linuxfoundation.org> References: <20241014141044.974962104@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Richter [ Upstream commit b495e710157606889f2d8bdc62aebf2aa02f67a7 ] Remove WARN_ON_ONCE statements. These have not triggered in the past. Signed-off-by: Thomas Richter Acked-by: Sumanth Korikkar Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- arch/s390/kernel/perf_cpum_sf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c index 736c1d9632dd5..48fa9471660a8 100644 --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -1463,7 +1463,7 @@ static int aux_output_begin(struct perf_output_handle *handle, unsigned long range, i, range_scan, idx, head, base, offset; struct hws_trailer_entry *te; - if (WARN_ON_ONCE(handle->head & ~PAGE_MASK)) + if (handle->head & ~PAGE_MASK) return -EINVAL; aux->head = handle->head >> PAGE_SHIFT; @@ -1642,7 +1642,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw) unsigned long num_sdb; aux = perf_get_aux(handle); - if (WARN_ON_ONCE(!aux)) + if (!aux) return; /* Inform user space new data arrived */ @@ -1661,7 +1661,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw) num_sdb); break; } - if (WARN_ON_ONCE(!aux)) + if (!aux) return; /* Update head and alert_mark to new position */ @@ -1896,12 +1896,8 @@ static void cpumsf_pmu_start(struct perf_event *event, int flags) { struct cpu_hw_sf *cpuhw = this_cpu_ptr(&cpu_hw_sf); - if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED))) + if (!(event->hw.state & PERF_HES_STOPPED)) return; - - if (flags & PERF_EF_RELOAD) - WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE)); - perf_pmu_disable(event->pmu); event->hw.state = 0; cpuhw->lsctl.cs = 1; -- 2.43.0