Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1565465
| Path | csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news2.arglkargh.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Jeffy Chen <jeffy.chen@rock-chips.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 1/3] Bluetooth: bnep: fix possible might sleep error in bnep_session |
| Date | Tue, 24 Jan 2017 05:10:01 +0100 |
| Message-ID | <t30AF-7RQ-3@gated-at.bofh.it> (permalink) |
| X-Original-To | linux-bluetooth@vger.kernel.org |
| X-263anti-Spam | KSV:0; |
| X-Mail-Delivery | 1 |
| X-Abs-Checked | 4 |
| X-Rl-Sender | jeffy.chen@rock-chips.com |
| X-Fst-To | linux-bluetooth@vger.kernel.org |
| X-Sender-IP | 103.29.142.67 |
| X-Login-Name | jeffy.chen@rock-chips.com |
| X-Unique-Tag | <78370688389cc38720b70cfff5d02bdc> |
| X-Sender | cjf@rock-chips.com |
| X-Mailer | git-send-email 2.1.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 74 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Brian Norris <briannorris@chromium.org>, Douglas Anderson <dianders@chromium.org>, Johan Hedberg <johan.hedberg@intel.com>, Peter Hurley <peter@hurleysoftware.com>, Jeffy Chen <jeffy.chen@rock-chips.com>, Johan Hedberg <johan.hedberg@gmail.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" <davem@davemloft.net>, Marcel Holtmann <marcel@holtmann.org>, Gustavo Padovan <gustavo@padovan.org> |
| X-Original-Date | Tue, 24 Jan 2017 12:07:49 +0800 |
| X-Original-Message-ID | <1485230871-22828-1-git-send-email-jeffy.chen@rock-chips.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1565465 |
Show key headers only | View raw
It looks like bnep_session has same pattern as the issue reported in
old rfcomm:
while (1) {
set_current_state(TASK_INTERRUPTIBLE);
if (condition)
break;
// may call might_sleep here
schedule();
}
__set_current_state(TASK_RUNNING);
Which fixed at:
dfb2fae Bluetooth: Fix nested sleeps
So let's fix it at the same way, also follow the suggestion of:
https://lwn.net/Articles/628628/
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
net/bluetooth/bnep/core.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index fbf251f..da04d51 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -484,16 +484,16 @@ static int bnep_session(void *arg)
struct net_device *dev = s->dev;
struct sock *sk = s->sock->sk;
struct sk_buff *skb;
- wait_queue_t wait;
+ DEFINE_WAIT_FUNC(wait, woken_wake_function);
BT_DBG("");
set_user_nice(current, -15);
- init_waitqueue_entry(&wait, current);
add_wait_queue(sk_sleep(sk), &wait);
while (1) {
- set_current_state(TASK_INTERRUPTIBLE);
+ /* Ensure session->terminate is updated */
+ smp_mb__before_atomic();
if (atomic_read(&s->terminate))
break;
@@ -515,9 +515,8 @@ static int bnep_session(void *arg)
break;
netif_wake_queue(dev);
- schedule();
+ wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
}
- __set_current_state(TASK_RUNNING);
remove_wait_queue(sk_sleep(sk), &wait);
/* Cleanup session */
@@ -666,7 +665,11 @@ int bnep_del_connection(struct bnep_conndel_req *req)
s = __bnep_get_session(req->dst);
if (s) {
atomic_inc(&s->terminate);
- wake_up_process(s->task);
+
+ /* Ensure session->terminate is updated */
+ smp_mb__after_atomic();
+
+ wake_up_interruptible(sk_sleep(s->sock->sk));
} else
err = -ENOENT;
--
2.1.4
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH 1/3] Bluetooth: bnep: fix possible might sleep error in bnep_session Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-01-24 05:10 +0100 [PATCH 2/3] Bluetooth: cmtp: fix possible might sleep error in cmtp_session Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-01-24 05:10 +0100 [PATCH 3/3] Bluetooth: hidp: fix possible might sleep error in hidp_session_thread Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-01-24 05:20 +0100
csiph-web