Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

HCI: coredump: Log devcd dumps into the monitor

This logs the devcd dumps with hci_recv_diag so they appear in the
monitor traces with proper timestamps which can then be used to relate
the HCI traffic that caused the dump:

= Vendor Diagnostic (len 174)
42 6c 75 65 74 6f 6f 74 68 20 64 65 76 63 6f 72 Bluetooth devcor
65 64 75 6d 70 0a 53 74 61 74 65 3a 20 32 0a 00 edump.State: 2..
43 6f 6e 74 72 6f 6c 6c 65 72 20 4e 61 6d 65 3a Controller Name:
20 76 68 63 69 5f 63 74 72 6c 0a 46 69 72 6d 77 vhci_ctrl.Firmw
61 72 65 20 56 65 72 73 69 6f 6e 3a 20 76 68 63 are Version: vhc
69 5f 66 77 0a 44 72 69 76 65 72 3a 20 76 68 63 i_fw.Driver: vhc
69 5f 64 72 76 0a 56 65 6e 64 6f 72 3a 20 76 68 i_drv.Vendor: vh
63 69 0a 2d 2d 2d 20 53 74 61 72 74 20 64 75 6d ci.--- Start dum
70 20 2d 2d 2d 0a 74 65 73 74 20 64 61 74 61 00 p ---.test data.
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 ..............

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

+23 -5
+23 -5
net/bluetooth/coredump.c
··· 240 240 bt_dev_dbg(hdev, "Failed to set pattern"); 241 241 } 242 242 243 + static void hci_devcd_dump(struct hci_dev *hdev) 244 + { 245 + struct sk_buff *skb; 246 + u32 size; 247 + 248 + bt_dev_dbg(hdev, "state %d", hdev->dump.state); 249 + 250 + size = hdev->dump.tail - hdev->dump.head; 251 + 252 + /* Emit a devcoredump with the available data */ 253 + dev_coredumpv(&hdev->dev, hdev->dump.head, size, GFP_KERNEL); 254 + 255 + /* Send a copy to monitor as a diagnostic packet */ 256 + skb = bt_skb_alloc(size, GFP_ATOMIC); 257 + if (skb) { 258 + skb_put_data(skb, hdev->dump.head, size); 259 + hci_recv_diag(hdev, skb); 260 + } 261 + } 262 + 243 263 static void hci_devcd_handle_pkt_complete(struct hci_dev *hdev, 244 264 struct sk_buff *skb) 245 265 { ··· 276 256 bt_dev_dbg(hdev, "complete with size %u (expect %zu)", dump_size, 277 257 hdev->dump.alloc_size); 278 258 279 - dev_coredumpv(&hdev->dev, hdev->dump.head, dump_size, GFP_KERNEL); 259 + hci_devcd_dump(hdev); 280 260 } 281 261 282 262 static void hci_devcd_handle_pkt_abort(struct hci_dev *hdev, ··· 295 275 bt_dev_dbg(hdev, "aborted with size %u (expect %zu)", dump_size, 296 276 hdev->dump.alloc_size); 297 277 298 - /* Emit a devcoredump with the available data */ 299 - dev_coredumpv(&hdev->dev, hdev->dump.head, dump_size, GFP_KERNEL); 278 + hci_devcd_dump(hdev); 300 279 } 301 280 302 281 /* Bluetooth devcoredump state machine. ··· 410 391 bt_dev_dbg(hdev, "timeout with size %u (expect %zu)", dump_size, 411 392 hdev->dump.alloc_size); 412 393 413 - /* Emit a devcoredump with the available data */ 414 - dev_coredumpv(&hdev->dev, hdev->dump.head, dump_size, GFP_KERNEL); 394 + hci_devcd_dump(hdev); 415 395 416 396 hci_devcd_reset(hdev); 417 397