Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795056300; b=iBYxgJ/m5OaN4+L77qpT1gYQVGJvRCKfUwsESVp3C/Nj49HoUoelDD/8eUSg4u9eHpg7 wvexS7hBSPmgLaadFHFf9QOBsIbfTx7JI8MayS9PsaU97UJjF50qpqOpy7B6YSewDNv5H 4mMzfpng7cWYrzPx6DDBJoEaBqM+Eu16sxkuyzYDQKxvw8Oc4UT10A1G6absR4IinGXxC qmizMbc5iqco9brjWyKqOLb1ss2eR4UaKBWH5oqoxWtrX3uAyVARyu4Gse1jjFndFdutl UVYJBdePuIXR/bJvQhaqEgO7+VTcgMuv913yvvIPrqXAWq68yXfoitbT5WQnRo5fEHg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056300; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=3iz5nAlAbVg6vURWahwNcge93eGpLDil4y3dteU1/ko=; b=Jtj2OKnnscI3mByvs93+GNhgBShG2orCi7QIqDLTtDWJN6cIToMeNrYLFqhwYZhedEa3 sdJUxSAOOkCEOcJnWMAZ+fsOTwTtSbuWgURKP3iJOxf+Q1tbne5JhiwRagmk5CTvZQtkQ 7KYWNcLMr5vLi1Kf5WqK2XvvO8CiqNmWaAsrylROtcTb1ocG06OeFPm2gJ2rhsG3HHHsW JiVrl0lXQ56koPj1VtbzhPpv/p5DxTwWq23zXs5VmIMh4ORLfR4t0SOOyPcAszODjUP3x 4jhpBoXi4dpTWIFjQP0gZtYh/FOn/9UKh3jsuFrky3d3sPdyfknT1tkGNvq0NPOcXKg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=eubhhalt; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3515606A320; Thu, 19 Nov 2026 02:44:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=eubhhalt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D4DC1F000C4; Thu, 19 Nov 2026 02:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056299; bh=3iz5nAlAbVg6vURWahwNcge93eGpLDil4y3dteU1/ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eubhhaltwKxrvwRLtKRvBA+xRODpXlMXODpXOKsvRIlI16zU18ryNgMdGY4ry4H4e zEmVS/nGzp0OASmdEP18h9H2QoJWcL1KIoTJyhGsUmIHfDJNPpaiCT7FO0JvdfgWg1 sQ41g45wRnqzkcdq6Uuy/fF+N202lI/49Afo0NSc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hitalo Souza , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 5.15 1937/2214] Bluetooth: Add missing newline to bt_dev_{err,warn}_ratelimited() Date: Wed, 18 Nov 2026 16:00:13 +0100 Message-ID: <20261118150128.475230123@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hitalo Souza [ Upstream commit f51ee3bb5fbe9c2019c31befe330bddd3aee39c2 ] bt_dev_err_ratelimited() and bt_dev_warn_ratelimited() pass the format string to bt_err_ratelimited()/bt_warn_ratelimited() without appending a newline, unlike bt_dev_err() and bt_dev_warn(), which go through BT_ERR()/BT_WARN() and add one. Only 2 of the 22 in-tree callers (both in virtio_bt) put the newline in their own format string. A printk record without a trailing newline is stored with prb_commit() instead of prb_final_commit(), and readers of the log buffer (/dev/kmsg, syslog) do not see it until it is finalized, which only happens when the next record is reserved. These messages therefore stay invisible until some unrelated message is printed, and journald, which timestamps a record when it reads it, logs them with the time of that later message. This was observed with a MediaTek MT7921 controller (USB 04ca:3802): when an eSCO link is closed, the host still receives a few SCO packets for the handle after Disconnection Complete, so hci_scodata_packet() logs "SCO packet for unknown connection handle". Comparing the record's kernel timestamp (_SOURCE_MONOTONIC_TIMESTAMP) with the time journald received it, over one capture: emitted logged delay 15:36:52.896 15:37:00.214 7.3 s 15:37:03.410 15:39:05.574 122.2 s 15:39:05.574 15:39:12.506 6.9 s 15:39:19.791 15:40:54.109 94.3 s 15:41:22.021 15:41:24.647 2.6 s Each message showed up together with the next kernel message; the 94 s one looked as if it had been logged in the middle of a later, healthy eSCO connection. bt_dev_err_ratelimited() lost its newline in commit 657cc646475b ("Bluetooth: Remove usage of BT_ERR_RATELIMITED macro"), which replaced BT_ERR_RATELIMITED(), the variant that appended "\n", with a direct call to bt_err_ratelimited(). bt_dev_warn_ratelimited() never had one. Append the newline in both macros, as BT_ERR() and BT_WARN() do, and drop it from the two virtio_bt format strings so that their messages do not gain an empty line. Fixes: 36278a5d4d35 ("Bluetooth: Adding a bt_dev_warn_ratelimited macro.") Fixes: 657cc646475b ("Bluetooth: Remove usage of BT_ERR_RATELIMITED macro") Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Hitalo Souza Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/virtio_bt.c | 4 ++-- include/net/bluetooth/bluetooth.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/virtio_bt.c b/drivers/bluetooth/virtio_bt.c index ed7d4ed4b575e..84161db5e4e24 100644 --- a/drivers/bluetooth/virtio_bt.c +++ b/drivers/bluetooth/virtio_bt.c @@ -220,7 +220,7 @@ static void virtbt_rx_handle(struct virtio_bluetooth *vbt, struct sk_buff *skb) if (skb->len < min_hdr) { bt_dev_err_ratelimited(vbt->hdev, - "rx pkt_type 0x%02x payload %u < hdr %zu\n", + "rx pkt_type 0x%02x payload %u < hdr %zu", pkt_type, skb->len, min_hdr); kfree_skb(skb); return; @@ -243,7 +243,7 @@ static void virtbt_rx_work(struct work_struct *work) if (!len || len > VIRTBT_RX_BUF_SIZE) { bt_dev_err_ratelimited(vbt->hdev, - "rx reply len %u outside [1, %u]\n", + "rx reply len %u outside [1, %u]", len, VIRTBT_RX_BUF_SIZE); kfree_skb(skb); } else { diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index a5fe5743ea35d..e88746c0a8941 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -192,9 +192,9 @@ void bt_err_ratelimited(const char *fmt, ...); BT_DBG("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) #define bt_dev_warn_ratelimited(hdev, fmt, ...) \ - bt_warn_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + bt_warn_ratelimited("%s: " fmt "\n", bt_dev_name(hdev), ##__VA_ARGS__) #define bt_dev_err_ratelimited(hdev, fmt, ...) \ - bt_err_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + bt_err_ratelimited("%s: " fmt "\n", bt_dev_name(hdev), ##__VA_ARGS__) /* Connection and socket states */ enum { -- 2.53.0