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 2CE8C7997D; Mon, 18 Dec 2023 12:46:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Wk1/jasA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 311ADC433C9; Mon, 18 Dec 2023 12:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702903588; bh=VWnIu+WkNZks4LOZn/vhtaKKcUgKASqWyWvf8hOEb64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wk1/jasAv/J2W4CErPcP0NmLSnQT2SRf92g0M/BtUsGtY0RsfPBfb1twaCf7ObO2x 6d2Hb+xgsY+y/wACGdtHTK/yaF4z1OL0W1Yd3WZxcC3E6tM0+vIEJXw0MO+PpXH1QH 6yIuU64EzEPSnRN9bqWAD7rAQzJQEf+qhBKdcOsMx7RV5wMYLH9LP8U/AT6R00GlWO oKenw4g2XXxT8uASar0pD692mMJCVln3KjUHlCu685fNmVps+Ek6xbvyPP8OjhSRB2 O3sld40Tt1qjZV/RnieAc10IvXYC5ypeD45ltPHZ4TW4JATnulWT949yijlswR/cje JRfSWdWRKuyKw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Steven Rostedt (Google)" , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Sasha Levin , linux-trace-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 13/13] ring-buffer: Do not record in NMI if the arch does not support cmpxchg in NMI Date: Mon, 18 Dec 2023 07:45:46 -0500 Message-ID: <20231218124557.1380724-13-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231218124557.1380724-1-sashal@kernel.org> References: <20231218124557.1380724-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.143 Content-Transfer-Encoding: 8bit From: "Steven Rostedt (Google)" [ Upstream commit 712292308af2265cd9b126aedfa987f10f452a33 ] As the ring buffer recording requires cmpxchg() to work, if the architecture does not support cmpxchg in NMI, then do not do any recording within an NMI. Link: https://lore.kernel.org/linux-trace-kernel/20231213175403.6fc18540@gandalf.local.home Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/ring_buffer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 16fce72a7601c..3f80497ac60ff 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -3668,6 +3668,12 @@ rb_reserve_next_event(struct trace_buffer *buffer, int nr_loops = 0; int add_ts_default; + /* ring buffer does cmpxchg, make sure it is safe in NMI context */ + if (!IS_ENABLED(CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG) && + (unlikely(in_nmi()))) { + return NULL; + } + rb_start_commit(cpu_buffer); /* The commit page can not change after this */ -- 2.43.0