From patchwork Wed Mar 18 21:50:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 11446127 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF79814B4 for ; Wed, 18 Mar 2020 21:50:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF3442076C for ; Wed, 18 Mar 2020 21:50:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CJLxJHgO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727070AbgCRVuY (ORCPT ); Wed, 18 Mar 2020 17:50:24 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:42561 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727041AbgCRVuY (ORCPT ); Wed, 18 Mar 2020 17:50:24 -0400 Received: by mail-pl1-f196.google.com with SMTP id t3so81784plz.9 for ; Wed, 18 Mar 2020 14:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VVQ7vhvCR/dzXjhnVWZBKnsMGVGyca6I+XsQHNIPA+E=; b=CJLxJHgONRzuK73+T+Robt/S4uDq075ur+3vN29mF4YW6k+JGvNhhYewhEn/Dzto3p 0tBeyp5nM7/BA9EMWjAFiIivjxs/zw4qGnhvGJkfhXRcLE9CGC/3Y6mb8lYCvLg5n1xP NN18K3yVfBMOMISZsExJvwrTaUgoKpVHqlnn0FHMHwLshGoHiVo3W8osNAp9TvjS6rXE XVCdAwhq60WRNDs+N6C0KA5a5k6Tv7meoxJZDu5OXqQu4TT44B3cpiAJlNaeYDJwU4Jd E4vqZZse/zWiTRkjkbHnCTE1HG1lPeAdzAbRahA7YRBUdwGE6FSdwEqnI4U2McTM90Ul q2tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VVQ7vhvCR/dzXjhnVWZBKnsMGVGyca6I+XsQHNIPA+E=; b=tAwa2KMW3H8CohF24w2S76FZ61CGfR5kxGePZY1xaEFg7jb1XwRgEwGQueoklrAGTH f/Pl/3kZAV1udqtH324+nNyjnQFo76NC6oQF8TgSmBjUf+Y/wPfAZfA7iNX0sD/n6LRs CKS//TsSw7BYX1Vba1yxYZS7ZpyaMbnqNv1loQF94K7lLMEhxnBbUhdpNRNKix4ibBit Js80DiFr5/1EmI1pFErgShNaqCi6L/pY2Q/LcuLi8JRBENDaqZSVcdZqSCKNf0MiAdid HOQg//dZdJFSaxWoylqAO6Uij2ErVx4j1rDBvwrVpuwT9ob2fXeGHHsyFZUd0KcvB044 CbDA== X-Gm-Message-State: ANhLgQ01SzxwhVfU6Ql61dY57zrOWhNyB2+X+jPhtLkjsiqQWgkIQnB2 zSRqnlp2di3Tnp6j78DPndfle/o4 X-Google-Smtp-Source: ADFU+vtxv4OM0vh+Q78Pe9+TYuqoxLek5RE6PelFugEK8fFawR/M71yCDNdBkZLu3J2eIXQTWuLo/A== X-Received: by 2002:a17:90b:8f:: with SMTP id bb15mr247075pjb.186.1584568222424; Wed, 18 Mar 2020 14:50:22 -0700 (PDT) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id l11sm3273191pjy.44.2020.03.18.14.50.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2020 14:50:21 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v3 1/3] Bluetooth: L2CAP: Add get_peer_pid callback Date: Wed, 18 Mar 2020 14:50:17 -0700 Message-Id: <20200318215019.21494-2-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200318215019.21494-1-luiz.dentz@gmail.com> References: <20200318215019.21494-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This adds a callback to read the socket pid. Signed-off-by: Luiz Augusto von Dentz --- include/net/bluetooth/l2cap.h | 1 + net/bluetooth/l2cap_sock.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 537aaead259f..2d7d28474d34 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -660,6 +660,7 @@ struct l2cap_ops { void (*suspend) (struct l2cap_chan *chan); void (*set_shutdown) (struct l2cap_chan *chan); long (*get_sndtimeo) (struct l2cap_chan *chan); + struct pid *(*get_peer_pid) (struct l2cap_chan *chan); struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan, unsigned long hdr_len, unsigned long len, int nb); diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 40fb10b591bd..117ba20ea194 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1504,6 +1504,13 @@ static long l2cap_sock_get_sndtimeo_cb(struct l2cap_chan *chan) return sk->sk_sndtimeo; } +static struct pid *l2cap_sock_get_peer_pid_cb(struct l2cap_chan *chan) +{ + struct sock *sk = chan->data; + + return sk->sk_peer_pid; +} + static void l2cap_sock_suspend_cb(struct l2cap_chan *chan) { struct sock *sk = chan->data; @@ -1525,6 +1532,7 @@ static const struct l2cap_ops l2cap_chan_ops = { .suspend = l2cap_sock_suspend_cb, .set_shutdown = l2cap_sock_set_shutdown_cb, .get_sndtimeo = l2cap_sock_get_sndtimeo_cb, + .get_peer_pid = l2cap_sock_get_peer_pid_cb, .alloc_skb = l2cap_sock_alloc_skb_cb, }; From patchwork Wed Mar 18 21:50:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 11446129 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E79D14B4 for ; Wed, 18 Mar 2020 21:50:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55AA220772 for ; Wed, 18 Mar 2020 21:50:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WOlOe/A+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727132AbgCRVu0 (ORCPT ); Wed, 18 Mar 2020 17:50:26 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:33480 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727041AbgCRVuZ (ORCPT ); Wed, 18 Mar 2020 17:50:25 -0400 Received: by mail-pf1-f196.google.com with SMTP id n7so221545pfn.0 for ; Wed, 18 Mar 2020 14:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ax6LJvZifxs+Jz4PFhlO8B8liSrqW0rQiTisJ5Q7W3U=; b=WOlOe/A+MgVrLSAHAgHTgZZhBTzEjpA1SM0d79PG7OFhbCoIgxkPxFUATTNbMWLgxs GiUVz/Srpxa+YyuaGhq1fXcFwMfFUdmblnUPuKJEwy51CsJobbgbmllMP3i/RrG9Oa1z NpIURvhM9s6YbllU2SvvTi9aK6mT+PhL1cbuS132e6sWS78qL7GIK6H0RNAxfTwuO0Fo qhzg2zQnyWLVLNDjIO76gxLUu63xE73xukFreyrYUywvztVOW40cFRXw/hJTKcE/Zxcz 95snpQ5pk5cAAQh2DHzCamuWGmwZhQaE08h5/Y/crtne/DdkMDljpHuzqlScE6fs7fib K+7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ax6LJvZifxs+Jz4PFhlO8B8liSrqW0rQiTisJ5Q7W3U=; b=FD4MJSrgtEmYwXxxkxohaMIGjBIF2PZwPeLbBjizsNRe7KCEOxydFwVsv+3X9PW44u h8qj/I5oaZq5Jom/vfUhZGYxc9RLdjU2fQ7HWo5qgps7U2748J1kk48qwnFcBD8IsSWw v13GfoBqYACQObVUDQeh2V2bJsRFbDtD2YDDONG/gUiGyLd3K/TVJRuYepXdMwpOOSIS zZyEQy2TK7htVWe3ST1YZAWlqfQ/DrdElmbVW8VzGb7wJ8WCT+l+Cpp5vo6e3msJTBzo 0f7USkPVwXWinbwY48jzjlbCHmoeqR0s2rr4gUYNPX7+aAevjCT6+gg9ihu/SUE61NOV Juag== X-Gm-Message-State: ANhLgQ0CDc5tGdwHpso093/q5beHsV6GFBAmIkrJz/DV2HJn3NDIb50a j1H5KqiidkM4pCLgvmUk/HMPRDbd X-Google-Smtp-Source: ADFU+vudO09+E9cp1kjydreV+bxv9rchPcAYDiSK01nuIHiF+BsEUeeFZGLMtnLpX+AXW6BW2o2h9Q== X-Received: by 2002:a62:1d1:: with SMTP id 200mr452141pfb.8.1584568223559; Wed, 18 Mar 2020 14:50:23 -0700 (PDT) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id l11sm3273191pjy.44.2020.03.18.14.50.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2020 14:50:22 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v3 2/3] Bluetooth: L2CAP: Use DEFER_SETUP to group ECRED connections Date: Wed, 18 Mar 2020 14:50:18 -0700 Message-Id: <20200318215019.21494-3-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200318215019.21494-1-luiz.dentz@gmail.com> References: <20200318215019.21494-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This uses the DEFER_SETUP flag to group channels with L2CAP_CREDIT_BASED_CONNECTION_REQ. Signed-off-by: Luiz Augusto von Dentz --- include/net/bluetooth/l2cap.h | 4 + net/bluetooth/l2cap_core.c | 136 +++++++++++++++++++++++++++++++--- 2 files changed, 130 insertions(+), 10 deletions(-) diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 2d7d28474d34..dada14d0622c 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -47,6 +47,7 @@ #define L2CAP_DEFAULT_ACC_LAT 0xFFFFFFFF #define L2CAP_BREDR_MAX_PAYLOAD 1019 /* 3-DH5 packet */ #define L2CAP_LE_MIN_MTU 23 +#define L2CAP_ECRED_CONN_SCID_MAX 5 #define L2CAP_DISC_TIMEOUT msecs_to_jiffies(100) #define L2CAP_DISC_REJ_TIMEOUT msecs_to_jiffies(5000) @@ -984,6 +985,9 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan); int l2cap_ertm_init(struct l2cap_chan *chan); void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); +typedef void (*l2cap_chan_func_t)(struct l2cap_chan *chan, void *data); +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, + void *data); void l2cap_chan_del(struct l2cap_chan *chan, int err); void l2cap_send_conn_req(struct l2cap_chan *chan); void l2cap_move_start(struct l2cap_chan *chan); diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 5e6e35ab44dd..9f699d09d973 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -678,6 +678,29 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) } EXPORT_SYMBOL_GPL(l2cap_chan_del); +static void __l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, + void *data) +{ + struct l2cap_chan *chan; + + list_for_each_entry(chan, &conn->chan_l, list) { + func(chan, data); + } +} + +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, + void *data) +{ + if (!conn) + return; + + mutex_lock(&conn->chan_lock); + __l2cap_chan_list(conn, func, data); + mutex_unlock(&conn->chan_lock); +} + +EXPORT_SYMBOL_GPL(l2cap_chan_list); + static void l2cap_conn_update_id_addr(struct work_struct *work) { struct l2cap_conn *conn = container_of(work, struct l2cap_conn, @@ -1356,29 +1379,79 @@ static void l2cap_le_connect(struct l2cap_chan *chan) sizeof(req), &req); } -static void l2cap_ecred_connect(struct l2cap_chan *chan) -{ - struct l2cap_conn *conn = chan->conn; +struct l2cap_ecred_conn_data { struct { struct l2cap_ecred_conn_req req; - __le16 scid; + __le16 scid[5]; } __packed pdu; + struct l2cap_chan *chan; + struct pid *pid; + int count; +}; + +static void l2cap_ecred_defer_connect(struct l2cap_chan *chan, void *data) +{ + struct l2cap_ecred_conn_data *conn = data; + struct pid *pid; + + if (chan == conn->chan) + return; + + if (!test_and_clear_bit(FLAG_DEFER_SETUP, &chan->flags)) + return; + + pid = chan->ops->get_peer_pid(chan); + + /* Only add deferred channels with the same PID/PSM */ + if (conn->pid != pid || chan->psm != conn->chan->psm || chan->ident || + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) + return; + + if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) + return; + + l2cap_ecred_init(chan, 0); + + /* Set the same ident so we can match on the rsp */ + chan->ident = conn->chan->ident; + + /* Include all channels deferred */ + conn->pdu.scid[conn->count] = cpu_to_le16(chan->scid); + + conn->count++; +} + +static void l2cap_ecred_connect(struct l2cap_chan *chan) +{ + struct l2cap_conn *conn = chan->conn; + struct l2cap_ecred_conn_data data; + + if (test_bit(FLAG_DEFER_SETUP, &chan->flags)) + return; if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) return; l2cap_ecred_init(chan, 0); - pdu.req.psm = chan->psm; - pdu.req.mtu = cpu_to_le16(chan->imtu); - pdu.req.mps = cpu_to_le16(chan->mps); - pdu.req.credits = cpu_to_le16(chan->rx_credits); - pdu.scid = cpu_to_le16(chan->scid); + data.pdu.req.psm = chan->psm; + data.pdu.req.mtu = cpu_to_le16(chan->imtu); + data.pdu.req.mps = cpu_to_le16(chan->mps); + data.pdu.req.credits = cpu_to_le16(chan->rx_credits); + data.pdu.scid[0] = cpu_to_le16(chan->scid); chan->ident = l2cap_get_ident(conn); + data.pid = chan->ops->get_peer_pid(chan); + + data.count = 1; + data.chan = chan; + data.pid = chan->ops->get_peer_pid(chan); + + __l2cap_chan_list(conn, l2cap_ecred_defer_connect, &data); l2cap_send_cmd(conn, chan->ident, L2CAP_ECRED_CONN_REQ, - sizeof(pdu), &pdu); + sizeof(data.pdu.req) + data.count * sizeof(__le16), + &data.pdu); } static void l2cap_le_start(struct l2cap_chan *chan) @@ -7694,6 +7767,33 @@ static bool is_valid_psm(u16 psm, u8 dst_type) { return ((psm & 0x0101) == 0x0001); } +struct l2cap_chan_data { + struct l2cap_chan *chan; + struct pid *pid; + int count; +}; + +static void l2cap_chan_by_pid(struct l2cap_chan *chan, void *data) +{ + struct l2cap_chan_data *d = data; + struct pid *pid; + + if (chan == d->chan) + return; + + if (!test_bit(FLAG_DEFER_SETUP, &chan->flags)) + return; + + pid = chan->ops->get_peer_pid(chan); + + /* Only count deferred channels with the same PID/PSM */ + if (d->pid != pid || chan->psm != d->chan->psm || chan->ident || + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) + return; + + d->count++; +} + int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *dst, u8 dst_type) { @@ -7813,6 +7913,22 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, goto done; } + if (chan->mode == L2CAP_MODE_EXT_FLOWCTL) { + struct l2cap_chan_data data; + + data.chan = chan; + data.pid = chan->ops->get_peer_pid(chan); + data.count = 0; + + l2cap_chan_list(conn, l2cap_chan_by_pid, &data); + /* Check if there isn't too many channels being connected */ + if (!(data.count < L2CAP_ECRED_CONN_SCID_MAX - 1)) { + hci_conn_drop(hcon); + err = -EPROTO; + goto done; + } + } + mutex_lock(&conn->chan_lock); l2cap_chan_lock(chan); From patchwork Wed Mar 18 21:50:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 11446131 X-Patchwork-Delegate: marcel@holtmann.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1100C17E6 for ; Wed, 18 Mar 2020 21:50:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E573920773 for ; Wed, 18 Mar 2020 21:50:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ofja3qwT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727134AbgCRVu0 (ORCPT ); Wed, 18 Mar 2020 17:50:26 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33479 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727113AbgCRVu0 (ORCPT ); Wed, 18 Mar 2020 17:50:26 -0400 Received: by mail-pf1-f193.google.com with SMTP id n7so221559pfn.0 for ; Wed, 18 Mar 2020 14:50:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZAyGOugfIgw0cKIX3yXfkJNq+sqpEzA47kWp1D5i46E=; b=Ofja3qwTAHWaUzxM2VN2QMR8N8fhLJtDycTxUCi/4cehDzkd8USgX2sqAJEsmIzrCx ZcBN9RtGK3qOSWqwXzCMmXfdtk9wKn4Gl/7nBwIhZoJYmHxAFzKjcGkdZNUXWlkM414U YbczF9eHvwvejIG3Os33wx5mn2Zzg1/NwhhtKqJiz/7XUnNKFmslhhlRuliXs16e6Tn3 vqlMlw+QFC4R3KsoRzqPH4rbJDOHlGWea6QvCXGHGw7HwafTWWokgAcI4aCZzlaB+kab WxSIVhtEcuKC606P1gkPlRx6JGPUSXl8IbUlUVIZrdrBN1h0Tv9EjSnqDFzUx96Zs39V xfqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZAyGOugfIgw0cKIX3yXfkJNq+sqpEzA47kWp1D5i46E=; b=PAaSvUGtMgKfBj7UyoAg6i8iwb4d1mi/Zw4C8hAfkOQDDhApPcZ29PYPtYr4Qah2uZ 8XTBppQmYhtV5DXADuizp/7Dwv43lKzuij54jC0P5gRlSP5/VSR89Vv80/q4EaGxAbDa o/+ds13e4bEPq4l/TUcHe+zx0unMzai8fxrO540lOrSoziqpXOSAUAGfEs6WxK82ukpK HqOr1Iv9Md0TJ6QFMX1i4IcQntdS/91+/yLdfabIRmaLIpRPlMaPENFOsoFls05sPKBY n18vi0Bpvb4PjATvuo3ZxzyHvnqvfA1JxRuz2zd743mcz1XlNYFGmQeuuK1+D/KmdNEg nTUw== X-Gm-Message-State: ANhLgQ18+BifilSw4W6Uk6bxpYqEI5sXQj6T9Z00t3ZejHB9DZNQv7FW ttuBKTk2/8yGaNZfZ7pDjpJxJPtv X-Google-Smtp-Source: ADFU+vtOd3cqkMoOUghvH5eJ11ArEd0HG7fJSk5fPJIdozUGFiwJCgqvHJ5Bhv+gm5JXQdg8OumKXA== X-Received: by 2002:aa7:9511:: with SMTP id b17mr370890pfp.243.1584568224441; Wed, 18 Mar 2020 14:50:24 -0700 (PDT) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id l11sm3273191pjy.44.2020.03.18.14.50.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2020 14:50:23 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v3 3/3] Bluetooth: Add BT_MODE socket option Date: Wed, 18 Mar 2020 14:50:19 -0700 Message-Id: <20200318215019.21494-4-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200318215019.21494-1-luiz.dentz@gmail.com> References: <20200318215019.21494-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This adds BT_MODE socket option which can be used to set L2CAP modes, including modes only supported over LE which were not supported using the L2CAP_OPTIONS. Signed-off-by: Luiz Augusto von Dentz --- include/net/bluetooth/bluetooth.h | 11 ++++ net/bluetooth/l2cap_sock.c | 96 +++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 1576353a2773..34191e34bfdc 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -139,6 +139,17 @@ struct bt_voice { #define BT_PHY_LE_CODED_TX 0x00002000 #define BT_PHY_LE_CODED_RX 0x00004000 +#define BT_MODE 15 + +#define BT_MODE_BASIC 0x00 +#define BT_MODE_RETRANS 0x01 +#define BT_MODE_FLOWCTL 0x02 +#define BT_MODE_ERTM 0x03 +#define BT_MODE_STREAMING 0x04 +#define BT_MODE_EXT_FLOWCTL 0x05 + +#define BT_MODE_LE_FLOWCTL 0x80 + __printf(1, 2) void bt_info(const char *fmt, ...); __printf(1, 2) diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 117ba20ea194..f2bb376c699f 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -500,6 +500,25 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, return err; } +static u8 l2cap_get_mode(struct l2cap_chan *chan) +{ + switch (chan->mode) { + case L2CAP_MODE_BASIC: + case L2CAP_MODE_RETRANS: + case L2CAP_MODE_FLOWCTL: + case L2CAP_MODE_ERTM: + case L2CAP_MODE_STREAMING: + /* Mode above are the same on both old and new sockopt */ + return chan->mode; + case L2CAP_MODE_LE_FLOWCTL: + return BT_MODE_FLOWCTL; + case L2CAP_MODE_EXT_FLOWCTL: + return BT_MODE_EXT_FLOWCTL; + } + + return chan->mode; +} + static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen) { @@ -508,6 +527,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, struct bt_security sec; struct bt_power pwr; u32 phys; + u8 mode; int len, err = 0; BT_DBG("sk %p", sk); @@ -624,6 +644,23 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, err = -EFAULT; break; + case BT_MODE: + if (!enable_ecred) { + err = -ENOPROTOOPT; + break; + } + + if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { + err = -EINVAL; + break; + } + + mode = l2cap_get_mode(chan); + + if (put_user(mode, (u8 __user *) optval)) + err = -EFAULT; + break; + default: err = -ENOPROTOOPT; break; @@ -763,6 +800,36 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, return err; } +static int l2cap_set_mode(struct l2cap_chan *chan, u8 mode) +{ + switch (mode) { + case BT_MODE_BASIC: + clear_bit(CONF_STATE2_DEVICE, &chan->conf_state); + break; + case BT_MODE_FLOWCTL: + if (bdaddr_type_is_le(chan->src_type)) + mode = L2CAP_MODE_LE_FLOWCTL; + break; + case BT_MODE_EXT_FLOWCTL: + /* TODO: Add support for ECRED PDUs to BR/EDR */ + if (!bdaddr_type_is_le(chan->src_type)) + return -EINVAL; + mode = L2CAP_MODE_EXT_FLOWCTL; + break; + case BT_MODE_ERTM: + case BT_MODE_STREAMING: + if (!disable_ertm || bdaddr_type_is_le(chan->src_type)) + break; + /* fall through */ + default: + return -EINVAL; + } + + chan->mode = mode; + + return 0; +} + static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) { @@ -968,6 +1035,35 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, break; + case BT_MODE: + if (!enable_ecred) { + err = -ENOPROTOOPT; + break; + } + + if (sk->sk_state != BT_BOUND) { + err = -EINVAL; + break; + } + + if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { + err = -EINVAL; + break; + } + + if (get_user(opt, (u8 __user *) optval)) { + err = -EFAULT; + break; + } + + err = l2cap_set_mode(chan, opt); + if (err) + break; + + BT_DBG("mode 0x%2.2x", chan->mode); + + break; + default: err = -ENOPROTOOPT; break;