From patchwork Tue Jan 2 18:59:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jonas_Dre=C3=9Fler?= X-Patchwork-Id: 184434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4630323dyb; Tue, 2 Jan 2024 11:01:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgqLAE0mlzU3Gv/nFzEBt6L6CfuG5fiKysKhcjKbp/fPlzTvNQuL6SA4b3ujCDwp3iR4tZ X-Received: by 2002:a17:902:d5cd:b0:1d3:485a:833d with SMTP id g13-20020a170902d5cd00b001d3485a833dmr19442295plh.39.1704222095352; Tue, 02 Jan 2024 11:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704222095; cv=none; d=google.com; s=arc-20160816; b=RSnpBs88h3KoyXPO3EuDrF6Y31jejr2irRfMDbbCrR9xbcH8XlubqxGvqA4tm9zU1n a1bxs13i5M6VW029FNgg7nweOicBZ4X2J1qiO68+0IdOKD2JiSQDfQlu23o5RovvGCZi mgpuclkzEc3UWItL+HCZGlLc6CDo4RVs/53X/yftAD/2zLOZT1ZNUhkf6sauT7mifVh3 2SRK0gflDpbYFPMMI5kQtop5X+zqP3NJ78x3H22+tx/Vul5AM+aCBtPLAzUzKa5o1SGT 6i3tl/LTU/NcD9BETNT9dY6kyfx7qBUZ+uHvZcz38wVe6UF3RTpIeXMqQKXyPQxkOyo9 ywPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=gooZhh7JPQWGYYCXVr4EkSSJBp4Ez14i+QXmjsCifbA=; fh=3AqDzvZy8BuFcn015+g5AB3sGQnZc/edyFwniXfpO+U=; b=aEBuqaGFxQDJoHM4ro3QO+f1Q1LBuIDSrn0yIyWFY7XrodaT/M5ilsS3v8qG8JXtNO d1XkhHeub8kJp7MCxgiA8LQt+DI8/kixuB44Y6TamAH7EQ+jEqOf/03PbAf+dIkQ8dgE Y9Ah9dhqcrLJ19VM6ff/4jm0EF4vnzxuKLPBR6WzA8FirXGI4hGgXFILcYWm1dQKqNUw Z8El6cZB3w29japrdq+KBz5cTDOLrgfSra/dtNeVPmmUbqzzxQhKrTQBBkHA+h/2eQgR rm23cV6z14Hsce6C4te5LsqhyaTqmhwiQ4KA2FE1pdeelFm/ZA8Fhw0nFUAYIvPDuQzQ UgOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14753-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14753-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id q10-20020a170902daca00b001d3c4df5004si16753413plx.151.2024.01.02.11.01.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 11:01:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14753-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-14753-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14753-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id AA3B0B22862 for ; Tue, 2 Jan 2024 19:01:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 78ABE171B6; Tue, 2 Jan 2024 18:59:47 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A3F516415; Tue, 2 Jan 2024 18:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=v0yd.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=v0yd.nl Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4T4Mbc4QNnz9sQb; Tue, 2 Jan 2024 19:59:40 +0100 (CET) From: =?utf-8?q?Jonas_Dre=C3=9Fler?= To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz Cc: =?utf-8?q?Jonas_Dre=C3=9Fler?= , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 3/5] Bluetooth: hci_event: Remove limit of 2 reconnection attempts Date: Tue, 2 Jan 2024 19:59:30 +0100 Message-ID: <20240102185933.64179-4-verdre@v0yd.nl> In-Reply-To: <20240102185933.64179-1-verdre@v0yd.nl> References: <20240102185933.64179-1-verdre@v0yd.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4T4Mbc4QNnz9sQb X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787006387843018230 X-GMAIL-MSGID: 1787006387843018230 Since commit 4c67bc74f016b0d360b8573e18969c0ff7926974, we retry connecting later when we get a "Command Disallowed" error returned by "Create Connection". In this commit the intention was to retry only once, and give up if we see "Command Disallowed" again on the second try. This made sense back then when the retry was initiated *only* from the "Connect Complete" event. If we received that event, we knew that now the card now must have a "free slot" for a new connection request again. These days we call hci_conn_check_pending() from a few more places though, and in these places we can't really be sure that there's a "free slot" on the card, so the second try to "Create Connection" might fail again. Deal with this by being less strict about these retries and try again every time we get "Command Disallowed" errors, removing the limitation to only two attempts. Since this can potentially cause us to enter an endless cycle of reconnection attempts, we'll add some guarding against that with the next commit. Signed-off-by: Jonas Dreßler --- net/bluetooth/hci_event.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index e8b4a0126..e1f5b6f90 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2323,12 +2323,13 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) if (status) { if (conn && conn->state == BT_CONNECT) { - if (status != HCI_ERROR_COMMAND_DISALLOWED || conn->attempt > 2) { + if (status == HCI_ERROR_COMMAND_DISALLOWED) { + conn->state = BT_CONNECT2; + } else { conn->state = BT_CLOSED; hci_connect_cfm(conn, status); hci_conn_del(conn); - } else - conn->state = BT_CONNECT2; + } } } else { if (!conn) {