Bluetooth: Fix __hci_req_sync (bc4445c7) · Commits · 戴 / test

If hci_req_run returns error, we erroneously leave the current process in TASK_INTERRUPTABLE state. If we leave the process in TASK_INTERRUPTABLE and it is preempted, this process will never be scheduled again. This patch fixes this issue by moving the preparation for scheduling (add to waitqueue and set process state) to just after the hci_req_run call. Signed-off-by:

Andre Guedes <andre.guedes@openbossa.org> Acked-by:

Johan Hedberg <johan.hedberg@intel.com> Signed-off-by:

Gustavo Padovan <gustavo.padovan@collabora.co.uk>

net/bluetooth/hci_core.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -95,15 +95,11 @@ static int __hci_req_sync(struct hci_dev *hdev,

		hdev->req_status = HCI_REQ_PEND;

		add_wait_queue(&hdev->req_wait_q, &wait);
		set_current_state(TASK_INTERRUPTIBLE);

		func(&req, opt);

		err = hci_req_run(&req, hci_req_sync_complete);
		if (err < 0) {
		hdev->req_status = 0;
		remove_wait_queue(&hdev->req_wait_q, &wait);
		/* req_run will fail if the request did not add any
		* commands to the queue, something that can happen when
		* a request with conditionals doesn't trigger any
		@@ -113,6 +109,9 @@ static int __hci_req_sync(struct hci_dev *hdev,
		return 0;
		}

		add_wait_queue(&hdev->req_wait_q, &wait);
		set_current_state(TASK_INTERRUPTIBLE);

		schedule_timeout(timeout);

		remove_wait_queue(&hdev->req_wait_q, &wait);

Admin message