From patchwork Mon Mar 24 14:15:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027434 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2D0F2F5A for ; Mon, 24 Mar 2025 14:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825756; cv=none; b=O5CwU6/aApuHsq+h08wmjFvyYBrFktvJ1XqFBFAu5xzoP5vafWXyVCvimPj5dzZ9DTa8njIkYsSLmN4uXD8ZHUgE4q1ras9DkbsQ9rFPAW/UkxyZWXPjQNpJUqyR8gOe+1s2ohC94oeBj2tvCh7+kcotiAa9m78VoDqro6m7qG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825756; c=relaxed/simple; bh=vDMF1T7eOH6GKRhUt+QPWTp09g7OL2BHBiDtBRsFApw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Lng819V0nrsMy53At8s2vlj+hxXXtKhLi5+r/wqoXcnVgLxyLpUZ5gEkoJvvwuunmIl2Mz9y1LSwjflLgQdSfOP1kz+nIGsuSKuth36HTC8EdlY4qKL/cknaxALMS79iEZaX1KGdpXRLQkyX0gou3WqNtSDLTzXM3kT+mZU+kyg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FTuKsjdC; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FTuKsjdC" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2279915e06eso28348835ad.1 for ; Mon, 24 Mar 2025 07:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825753; x=1743430553; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fo6eEo8vd4Ttv2jHt80DI0ch0RyPh6KEYVVJ7ym4bGI=; b=FTuKsjdCcVSTlLQs8b+vHMLgNMcJeXohGLiOoxQTy9JuOA0zcKWO1aHLiUSwIv/EKF ySfj1/CwZBeAqqu77S0tBbRQKF2FnTor00r/SfPuvRlvl3+pXbV2uR/aUM+zPisKjbZF ISFBqqT6B7556H/pS+CObA+TNjENSvojJxpM2EwJLRi3IV/qsjJSulmTTgNd/y5Gq6nl CjJnd/wZZuTpUaokDp6LWJhsF2WzRl5bWofJ9Jz2ySNP0nO57cS0pyF0Q/vgUc+eC9RD 3wM0biNWidC88pbJkU5ThQKmGLuQSg3K0tTYVUdHSqDnwl2FpmqpZyGF5UUZrEum1t3H 6Vaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825753; x=1743430553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fo6eEo8vd4Ttv2jHt80DI0ch0RyPh6KEYVVJ7ym4bGI=; b=jNrm7pRe33MqM5VePtfMdeb4CHibovOLCzkOp46igQCwC1D54vhcdDDM1Z1u7THgvR qX2cZopW3Wcx3jNMLjPro7yLcumZyNT3aWXewUBu544ocVXxCcEaxs9hFjl5TGXU93wR A1/7stQk9UBjU5sRfYFax6GMAiLRnD2sc1fB+YhSDe1w5/vBRbWwHSUolhfgkShdSKLE nMef2goxjsX3aF36mXWv7xY/Dwu7mv9R//CZh6zihlwEP6q1vi36s9+hB4doPBvqhZdY ZkkxpFaMOA06wTJdxaN6+GRlMBVEdWZZcAGCPCUXECfwKuQbofh43RQuyN1yJdZMc8bY zMlg== X-Gm-Message-State: AOJu0YwOUkydOLTwnFxKvfjpEb7q+wuMugmwUMJiE9au0jz6Uq/93xmm uRZvFl75JrDm++c43tCk9PHPbofli7UG5ICIjG+RCDml00Uwr+lo3BJCmQ== X-Gm-Gg: ASbGncsJX/Alb5E6GGIh+b4Ln7Kw5u5c4MHD/6wSvYKFfI6UMximeABAkSk2asc9lPB GJUFMLp9mArP/q5UPkA3whI9koieConGyJwVmVM3AvAqUnDeddhygOcxsFNI0I7Y94zvub/FpP8 qXnldWAvfAdtmCxSlfeSQIlI+sGgkTM5uLMzytey47fgz3u/QXTgYuhAA3pDOJg2iZO/HW1l0Nj V1lAV4G5kIfmiRs7jt5NTt4wCCLUOHFZL3TX3pxqslpjOrMg5ThnDtygIw+F0ncEGewdVOuVUhV SamaxRAMTOYChnHtmiyj/Z8v7eTxCN+VqDg/4KepcT+cj5LNqQJgu7k= X-Google-Smtp-Source: AGHT+IGsMa1WNA5KNiq35/z2rXg/5Du330zhbZcXR4eAQYbneXA7EYALaiv5d2weWKpAD3MTTNnHeg== X-Received: by 2002:a05:6a00:179f:b0:736:a4ca:62e1 with SMTP id d2e1a72fcca58-7390597ec8fmr20386424b3a.6.1742825752448; Mon, 24 Mar 2025 07:15:52 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:15:52 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 01/13] station: always network (temp) blacklist on failure Date: Mon, 24 Mar 2025 07:15:26 -0700 Message-Id: <20250324141538.144578-2-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Allowing the timeout blacklist to be disabled has introduced a bug where a failed connection will not result in the BSS list to be traversed. This causes IWD to retry the same BSS over and over which be either a) have some issue preventing a connection or b) may simply be unreachable/out of range. This is because IWD was inherently relying on the timeout blacklist to flag BSS's on failures. With it disabled there was nothing to tell network_bss_select that we should skip the BSS and it would return the same BSS indefinitely. To fix this some of the blacklisting logic was re-worked in station. Now, a BSS will always get network blacklisted upon a failure. This allows network.c to traverse to the next BSS upon failure. For auth/assoc failures we will then only timeout blacklist under certain conditions, i.e. the status code was not in the temporary list. Fixes: 77639d2d452e ("blacklist: allow configuration to disable the blacklist") --- src/station.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/station.c b/src/station.c index 5403c332..0b20e785 100644 --- a/src/station.c +++ b/src/station.c @@ -3402,6 +3402,13 @@ static bool station_retry_with_reason(struct station *station, blacklist_add_bss(station->connected_bss->addr); + /* + * Network blacklist the BSS as well, since the timeout blacklist could + * be disabled + */ + network_blacklist_add(station->connected_network, + station->connected_bss); + try_next: return station_try_next_bss(station); } @@ -3449,6 +3456,10 @@ static bool station_pmksa_fallback(struct station *station, uint16_t status) static bool station_retry_with_status(struct station *station, uint16_t status_code) { + /* If PMKSA failed don't blacklist so we can retry this BSS */ + if (station_pmksa_fallback(station, status_code)) + goto try_next; + /* * Certain Auth/Assoc failures should not cause a timeout blacklist. * In these cases we want to only temporarily blacklist the BSS until @@ -3459,12 +3470,18 @@ static bool station_retry_with_status(struct station *station, * specific BSS on our next attempt. There is currently no way to * obtain that IE, but this should be done in the future. */ - if (IS_TEMPORARY_STATUS(status_code)) - network_blacklist_add(station->connected_network, - station->connected_bss); - else if (!station_pmksa_fallback(station, status_code)) + if (!IS_TEMPORARY_STATUS(status_code)) blacklist_add_bss(station->connected_bss->addr); + /* + * Unconditionally network blacklist the BSS if we are retrying. This + * will allow network_bss_select to traverse the BSS list and ignore + * BSS's which have previously failed + */ + network_blacklist_add(station->connected_network, + station->connected_bss); + +try_next: iwd_notice(IWD_NOTICE_CONNECT_FAILED, "status: %u", status_code); return station_try_next_bss(station); From patchwork Mon Mar 24 14:15:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027435 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C88AD2E3380 for ; Mon, 24 Mar 2025 14:15:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825757; cv=none; b=XfmtbRe1jSHUhtz44ltUjhu+3ROCTggQHNPFxcK9Z+7MSSaFn1DB+Ce5D24jbcfOCqnBxG4dYUgfa+BMYgC+5GARDYHrLbjfTpuqNTT/nTEoMSvfGrFMJ9y+YzcBRqI5I3BcS+oUu3qiVIP/JrQxZDMCyX8I916TW5WB3yzpmdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825757; c=relaxed/simple; bh=RuQY+rH5cxO4piN6+5wH8ICIX8e/hooGS/Quj3DEKgs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E1U7co4KjrGBWD8ULFoNq7s+Gi3SSEChyde+f4Got4+oHB1DnNgxohQnAzqa1XfpL786qbCD/PSMrRWa0Ct6/8wokkJjFb/zMNlpbi6KxaJq/1GJP0+k+buhpFa6eUI9P2GKyRlF8du6XQnIviDcc8Tf4bb36SmArW/1Pt22DZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FO4fLdel; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FO4fLdel" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-227a8cdd241so5676395ad.3 for ; Mon, 24 Mar 2025 07:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825755; x=1743430555; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/Y8J2vmE79n+rammSb68Vx/t2JXWMbDjn+1OH9GUK8w=; b=FO4fLdeltQqknM0ACKJgO91rHBgdEDcFrSyug5T4d0yDLDnIVmz4nMOJQrSZz56Qhj MC9P1UEGhq/wKyi1j1jKLwNWDWqDfzXzet0E8GvgIF+V+Wi/mBe7n0uQ+BN6eDwNhUET FdqE8iyisac6cA4yow8kfMQh4NevRaD0ANh5f5D3ku6Tle7HbZ7h0nNfDuzInyDCQqtz rRNxq0x3jQTqPj/F80NqbanZKDHcCSw4Y+MCcW4zLPrffHy0VPp8Cl3gXiP/8PbCibU+ ozIFTa2Yh2kd9l74vKUCKyS16ZHWt7XDdztpW+m0MCvLLN1l2Bdr/W857bs7JyGX3UcF K3zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825755; x=1743430555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Y8J2vmE79n+rammSb68Vx/t2JXWMbDjn+1OH9GUK8w=; b=SECz9jc5nPXE5hBS7Wr4Wwe7IQoZoj9MRo913WJ4fnpUU+So4P6vAzjSs4KJ82uo2J SrwXLG7HdCnkHPuSbvuJHsCk5SDsIbSSGuEqWx2rluyoYCxFY/xbAiADXylls9Tk7NfD Ezg/P/T1b/KP7CvWF2DlnvMXsA5a26OwO75SKbK9ZP7D0RqSMk5kciQQAAN/m9XoBApj 7qX+210lq6e54RcknsxWjeT5O+91myQnWKuLKuL960TmL5Id8gL0DhSCWFoWYLncFVv0 nZP3Tcq//coRZIdBe5ROveFTEDlZYnZCPAJoaygGOIic9/edsWx4uKrIU7GcpEgyYw1a 5FZg== X-Gm-Message-State: AOJu0YyYoh3ZJPtEiB2ZH9uD3O1qAWBnVpO85qOYDvLfTNUC2qXmgECM 0W0cWO+vGSs0ntKLlmf3TxuhFJCPqQsQtyvnqExdZbsyS2v6WZIqnELeoA== X-Gm-Gg: ASbGncsBQ97d7FDzFEIl/kN0SOJSspphBxlMBXyD+YTxOzmwFjzg7byHwicQoN8FNAe AfWq+cPqrzLQm+2GXOd5Z62WoGx4lswnmLsu49R3BbeVvHNU+N6s/PhdGpRa9i0pe5r6STVv7Kt D8MrC6PaM4Cs4A927SYUPtDbBn6Nk8HtpF8kGpcPF8PLK0ezP4ssp/o1pRj0b2xPw6yW5LIg6cY UazlTOKWM+hsmf/MQBu4JswZe90biCTUiP/K4ttaS+/Gc3E1Jui9819MTFzuXPI02nS1Ktp1t64 v5L5X0VXOGyk7QqVbCQd2AkOUwMfJFdN9vvNLEcgG1TENFWlNdnXMTs= X-Google-Smtp-Source: AGHT+IGFxwx5PsGnkrAWU/oX56KaRmCmOpyUrL7SEPnp5pCj7Ej57/Qp10a+N+gANmQqZJlY8tQImg== X-Received: by 2002:a05:6a20:3942:b0:1f5:7007:9ea5 with SMTP id adf61e73a8af0-1fe42f2a027mr22172859637.2.1742825754505; Mon, 24 Mar 2025 07:15:54 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:15:53 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 02/13] auto-t: add test for disabling the timeout blacklist Date: Mon, 24 Mar 2025 07:15:27 -0700 Message-Id: <20250324141538.144578-3-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- autotests/testBSSBlacklist/TestBlacklist.psk | 2 + autotests/testBSSBlacklist/connection_test.py | 57 +++++++++++++++++++ .../{main.conf => main.conf.default} | 0 autotests/testBSSBlacklist/main.conf.disabled | 2 + 4 files changed, 61 insertions(+) create mode 100644 autotests/testBSSBlacklist/TestBlacklist.psk rename autotests/testBSSBlacklist/{main.conf => main.conf.default} (100%) create mode 100644 autotests/testBSSBlacklist/main.conf.disabled diff --git a/autotests/testBSSBlacklist/TestBlacklist.psk b/autotests/testBSSBlacklist/TestBlacklist.psk new file mode 100644 index 00000000..abafdb66 --- /dev/null +++ b/autotests/testBSSBlacklist/TestBlacklist.psk @@ -0,0 +1,2 @@ +[Security] +Passphrase=secret123 diff --git a/autotests/testBSSBlacklist/connection_test.py b/autotests/testBSSBlacklist/connection_test.py index 9631a322..ac1cb86d 100644 --- a/autotests/testBSSBlacklist/connection_test.py +++ b/autotests/testBSSBlacklist/connection_test.py @@ -260,12 +260,69 @@ class Test(unittest.TestCase): self.wd.unregister_psk_agent(psk_agent) + def test_blacklist_disabled(self): + wd = self.wd + bss_hostapd = self.bss_hostapd + + rule0 = self.rule0 + rule1 = self.rule1 + rule2 = self.rule2 + + psk_agent = PSKAgent(["secret123", 'secret123']) + wd.register_psk_agent(psk_agent) + + devices = wd.list_devices(1) + device = devices[0] + + rule0.drop = True + rule0.enabled = True + + device.autoconnect = True + + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) + + ordered_network = device.get_ordered_network("TestBlacklist", full_scan=True) + + self.assertEqual(ordered_network.type, NetworkType.psk) + + # The first BSS should fail, and we should connect to the second. This + # should not result in a connection blacklist though since its disabled. + bss_hostapd[1].wait_for_event('AP-STA-CONNECTED %s' % device.address) + + device.disconnect() + + rule0.drop = False + device.autoconnect = True + + # Verify the first BSS wasn't blacklisted. + bss_hostapd[0].wait_for_event('AP-STA-CONNECTED %s' % device.address) + def setUp(self): + _, _, name = self.id().split(".") + + # TODO: If we have this pattern elsewhere it might be nice to turn this + # into a decorator e.g. + # + # @config("main.conf.disabled") + # @profile("TestBlacklist.psk") + # def test_blacklist_disabled(self) + # ... + # + if name == "test_blacklist_disabled": + IWD.copy_to_storage("main.conf.disabled", IWD_CONFIG_DIR, "main.conf") + IWD.copy_to_storage("TestBlacklist.psk") + else: + IWD.copy_to_storage("main.conf.default", IWD_CONFIG_DIR, "main.conf") + self.wd = IWD(True) def tearDown(self): IWD.clear_storage() self.wd = None + self.rule0.drop = False + self.rule1.drop = False + self.rule2.drop = False @classmethod def setUpClass(cls): diff --git a/autotests/testBSSBlacklist/main.conf b/autotests/testBSSBlacklist/main.conf.default similarity index 100% rename from autotests/testBSSBlacklist/main.conf rename to autotests/testBSSBlacklist/main.conf.default diff --git a/autotests/testBSSBlacklist/main.conf.disabled b/autotests/testBSSBlacklist/main.conf.disabled new file mode 100644 index 00000000..aae6bc12 --- /dev/null +++ b/autotests/testBSSBlacklist/main.conf.disabled @@ -0,0 +1,2 @@ +[Blacklist] +InitialTimeout=0 From patchwork Mon Mar 24 14:15:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027436 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C9A225F7A1 for ; Mon, 24 Mar 2025 14:15:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825759; cv=none; b=adT/PWzy+5DkqTmzPinmZLAU/t8pQUugGtwdfi+6O/opY7ime+vCKg6dKgtdVdpGXbGy4cONFidfTnjrCyEIpUtguS8ZbOpeFTDZ2T4F4oxOp5alI32lp3n1sUE/zae5u0/27f35dk/b9f+Bxh56uGcvWHiDOghZckEsofZZIWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825759; c=relaxed/simple; bh=kDbBHa7dv/2J/wsyl5QeuwjBGgEup1aWI8pNSyvLLP4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dd7Cpr+C/2CyifO1oIxPCZutpzAER9hxMUvlUsosARaX7rWmOotnIomkLL3zI4RVTtX8P0B1MTWDvsLutanO8h/zKfaEBudR4V+C6YmdBteY5qJOqVrF0ihWgDKJtWuFVJI+/vwAnD6gESr6hCdk9A5Y4eTFd/HejnIhh7C/JJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b8/Toqtx; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b8/Toqtx" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-227c7e57da2so15104915ad.0 for ; Mon, 24 Mar 2025 07:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825756; x=1743430556; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+wlR5HXvNId2KnttetbOYOmB/J+YldI9plWWPNRcDxI=; b=b8/ToqtxWKFVdqoynoQTHqZeTmqTPP3xFz5gzgkvvB8scTvLXAXNVJ9pFCLURjJEIC HlvfjtvTGCiiFH3WkvTFM5oie0+wv74xkfJ49RYDbTSaIBATaBGYGGh0+X/P/XL6MQuB 4eKkMLlP7WtmfDTDB2PrbJpDwQsLp1p99fMZPS2Mfvf/sQcrEAt1g5fi4pj+Zej4XyVD XlDjfqbaT+exrDqqKyWZNx9/Tk9V6gBdieMQDz89Jb/m9IfxBhGyVXa88vuAqjuwoJzl pKI64Trls+PhuDY3UT86F1CJS8H5t/ZPSKifyKdGO1EWZHABrbTs3O888EbgYzqtCMMC M7dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825756; x=1743430556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+wlR5HXvNId2KnttetbOYOmB/J+YldI9plWWPNRcDxI=; b=KQi56Ivd15xSFZbWHGkCquwhEdtJg1FwRDD4uStpl2Xm8BD8lWs7zU/2lZYwyZXAwH akti1jXf+uYhfLO09gH2gcoOAuNK9CNODLEysrDs6/SNrkAma4nXt/+bkmJxeRoCTiOX pbmPzKsxTmdu6jtphrbSvp92N5R7nB66T7bLPQpbOIKfuc6RyICjbbvtVQZTrjfmaOrc MVPAYDAGar7wjRCDrY/HNkpxzOjGQdxtrJE9PvUiMzPsMhZpUIyePHe0B924EOu5jLbL xzBzQwgo73wzJLha0G7eHUaova9DM5vCQ4wVYfrK1HMCWu6e6OETiBFnEhf01xMSqIBs rm6w== X-Gm-Message-State: AOJu0Yx6flcgxSuArAjJSOrr8YaIxfRQR1ya3CW9pUaJ1vXUnILgm8a5 HM4brwPJF2lrfczAZK9LbpxxqbBeC/4Cp+QDzNFkMM6w7+U2Q+T0EVWJFA== X-Gm-Gg: ASbGncuxRFwhAgCG5aLmKh1neKa20qgR2HIaRhmkBwAya4Mo5nSjnyAzDZUAfYXBfBu KFX7lTXdbucleCfo2NxjV50UN0tUoZW1J8pBrWSJBpcyqwpDDGKHgq7Xgz3tJ3qX3RRl4fxX9xl 9HUkMoMWniz7Y2+CeLDg/ASC4tky0r769NPJVhelhlRCgyqj3wgmahWbTO2QBFn//3Lta45Tal8 DcdI3DMhFsOwJ7U7W4iMWqYDvTdfO/Hp650GbpChxMbFqSd8AoM42JC3BobzAVVmjYAEvyzLcl1 Atg/xBlwYxMvk1apwCfJnCWW7nWEvdc8U5ARlyr0porLOJzpIIdO3OU= X-Google-Smtp-Source: AGHT+IElN6Tv8FnTom/G0kL4ciWkVlJiPwFgHNkIhVv38wCknlw17lRDBiklfupxBHIGiWSD2CnHYA== X-Received: by 2002:a05:6a00:218b:b0:736:7a00:e522 with SMTP id d2e1a72fcca58-7390593b7f2mr19654657b3a.2.1742825756107; Mon, 24 Mar 2025 07:15:56 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:15:55 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 03/13] blacklist: include a blacklist reason when adding/finding Date: Mon, 24 Mar 2025 07:15:28 -0700 Message-Id: <20250324141538.144578-4-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To both prepare for some new blacklisting behavior and allow for easier consolidation of the network-specific blacklist include a reason enum for each entry. This allows IWD to differentiate between multiple blacklist types. For now only the existing "permanent" type is being added which prevents connections to that BSS via autoconnect until it expires. By including a type into each entry we now have additional search criteria and can have multiple entires of the same BSS with different reasons. This was done versus a bitmask because each blacklist reason may have a different expiration time. We want to maintain individual expirations to have the best "memory" of past events rather than overwriting them. Future patches will lump in the temporary network blacklist as well as a new roaming blacklist type. --- src/blacklist.c | 81 +++++++++++++++++++++++++++++++++++++------------ src/blacklist.h | 14 +++++++-- src/network.c | 3 +- src/station.c | 12 +++++--- 4 files changed, 83 insertions(+), 27 deletions(-) diff --git a/src/blacklist.c b/src/blacklist.c index 21f85a75..eb722de5 100644 --- a/src/blacklist.c +++ b/src/blacklist.c @@ -51,10 +51,46 @@ struct blacklist_entry { uint8_t addr[6]; uint64_t added_time; uint64_t expire_time; + enum blacklist_reason reason; +}; + +struct blacklist_search { + const uint8_t *addr; + enum blacklist_reason reason; }; static struct l_queue *blacklist; +static struct blacklist_entry *blacklist_entry_new(const uint8_t *addr, + enum blacklist_reason reason) +{ + struct blacklist_entry *entry; + uint64_t added; + uint64_t expires; + + switch (reason) { + case BLACKLIST_REASON_CONNECT_FAILED: + if (!blacklist_initial_timeout) + return NULL; + + added = l_time_now(); + expires = l_time_offset(added, blacklist_initial_timeout); + break; + default: + l_warn("Unhandled blacklist reason: %u", reason); + return NULL; + } + + entry = l_new(struct blacklist_entry, 1); + + entry->added_time = added; + entry->expire_time = expires; + entry->reason = reason; + memcpy(entry->addr, addr, 6); + + return entry; +} + static bool check_if_expired(void *data, void *user_data) { struct blacklist_entry *entry = data; @@ -79,24 +115,28 @@ static void blacklist_prune(void) static bool match_addr(const void *a, const void *b) { const struct blacklist_entry *entry = a; - const uint8_t *addr = b; + const struct blacklist_search *search = b; + + if (entry->reason != search->reason) + return false; - if (!memcmp(entry->addr, addr, 6)) + if (!memcmp(entry->addr, search->addr, 6)) return true; return false; } -void blacklist_add_bss(const uint8_t *addr) +void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason) { struct blacklist_entry *entry; - - if (!blacklist_initial_timeout) - return; + struct blacklist_search search = { + .addr = addr, + .reason = reason + }; blacklist_prune(); - entry = l_queue_find(blacklist, match_addr, addr); + entry = l_queue_find(blacklist, match_addr, &search); if (entry) { uint64_t offset = l_time_diff(entry->added_time, @@ -112,25 +152,24 @@ void blacklist_add_bss(const uint8_t *addr) return; } - entry = l_new(struct blacklist_entry, 1); - - entry->added_time = l_time_now(); - entry->expire_time = l_time_offset(entry->added_time, - blacklist_initial_timeout); - memcpy(entry->addr, addr, 6); - - l_queue_push_tail(blacklist, entry); + entry = blacklist_entry_new(addr, reason); + if (entry) + l_queue_push_tail(blacklist, entry); } -bool blacklist_contains_bss(const uint8_t *addr) +bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason) { bool ret; uint64_t time_now; struct blacklist_entry *entry; + struct blacklist_search search = { + .addr = addr, + .reason = reason + }; blacklist_prune(); - entry = l_queue_find(blacklist, match_addr, addr); + entry = l_queue_find(blacklist, match_addr, &search); if (!entry) return false; @@ -142,13 +181,17 @@ bool blacklist_contains_bss(const uint8_t *addr) return ret; } -void blacklist_remove_bss(const uint8_t *addr) +void blacklist_remove_bss(const uint8_t *addr, enum blacklist_reason reason) { struct blacklist_entry *entry; + struct blacklist_search search = { + .addr = addr, + .reason = reason + }; blacklist_prune(); - entry = l_queue_remove_if(blacklist, match_addr, addr); + entry = l_queue_remove_if(blacklist, match_addr, &search); if (!entry) return; diff --git a/src/blacklist.h b/src/blacklist.h index 56260e20..a87e5eca 100644 --- a/src/blacklist.h +++ b/src/blacklist.h @@ -20,6 +20,14 @@ * */ -void blacklist_add_bss(const uint8_t *addr); -bool blacklist_contains_bss(const uint8_t *addr); -void blacklist_remove_bss(const uint8_t *addr); +enum blacklist_reason { + /* + * When a BSS is blacklisted using this reason IWD will refuse to + * connect to it via autoconnect + */ + BLACKLIST_REASON_CONNECT_FAILED, +}; + +void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason); +bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason); +void blacklist_remove_bss(const uint8_t *addr, enum blacklist_reason reason); diff --git a/src/network.c b/src/network.c index 0a40a6c5..4602a110 100644 --- a/src/network.c +++ b/src/network.c @@ -1280,7 +1280,8 @@ struct scan_bss *network_bss_select(struct network *network, if (l_queue_find(network->blacklist, match_bss, bss)) continue; - if (blacklist_contains_bss(bss->addr)) + if (blacklist_contains_bss(bss->addr, + BLACKLIST_REASON_CONNECT_FAILED)) continue; /* OWE Transition BSS */ diff --git a/src/station.c b/src/station.c index 0b20e785..e2ed78f3 100644 --- a/src/station.c +++ b/src/station.c @@ -2880,7 +2880,8 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, if (network_can_connect_bss(network, bss) < 0) goto next; - if (blacklist_contains_bss(bss->addr)) + if (blacklist_contains_bss(bss->addr, + BLACKLIST_REASON_CONNECT_FAILED)) goto next; rank = bss->rank; @@ -3400,7 +3401,8 @@ static bool station_retry_with_reason(struct station *station, break; } - blacklist_add_bss(station->connected_bss->addr); + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_CONNECT_FAILED); /* * Network blacklist the BSS as well, since the timeout blacklist could @@ -3471,7 +3473,8 @@ static bool station_retry_with_status(struct station *station, * obtain that IE, but this should be done in the future. */ if (!IS_TEMPORARY_STATUS(status_code)) - blacklist_add_bss(station->connected_bss->addr); + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_CONNECT_FAILED); /* * Unconditionally network blacklist the BSS if we are retrying. This @@ -3566,7 +3569,8 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result, switch (result) { case NETDEV_RESULT_OK: - blacklist_remove_bss(station->connected_bss->addr); + blacklist_remove_bss(station->connected_bss->addr, + BLACKLIST_REASON_CONNECT_FAILED); station_connect_ok(station); return; case NETDEV_RESULT_DISCONNECTED: From patchwork Mon Mar 24 14:15:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027437 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB1F925F96E for ; Mon, 24 Mar 2025 14:15:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825760; cv=none; b=u/eBAU+u1Wr8sirqKeN6J7sYiZX7ymAMCGX59POj+ltThkC/UK7C4I14F+ghE6yJumZ4Jhti30RXwLMRxnJxJi9+JvBdLlnX3u8FSypR0BjlQ56csmc4EnSaulKZC0rVo1uE2EtEQaUfRFyi60XSVAQUllc6YliJ5zo4mw8LpO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825760; c=relaxed/simple; bh=a7WJCvx551iMFNF5234uURKm8WKdUHevFwd2TVGdWkU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JXDJvKnbzML849C4wZ3VE4xxDpofcIR3+XSgvjSkkgodz0ysgjJdxJwgGbhCmXS0HZvqSEQ/qOADjDT4IR/EFnycsPbw+REhvzjO/AGGbdSme+Cwk1iJEZ5uXwAlHYuUPyV15o0OwBKwfwKjOrDNffsoxGikZtqaQ6dmB6ovb1s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UXZzdKdC; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UXZzdKdC" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-223fd89d036so83501085ad.1 for ; Mon, 24 Mar 2025 07:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825758; x=1743430558; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3kOwG/yngvmK1gcwehtoklydLh11RsZs9cJUvwASH98=; b=UXZzdKdCmo7bP/4sFNvLz0HBmJMK1+8jsnG7qJWCNhf00LzG7eUubzmiJQXjuAmxjS Qzjz+EODWM1rhUPyn31ZWiyTzs9RGaciMQRnwr1I4eAakfJbhw8IsrVhj5jkX/NKyx9K W6s9tNPnyvEM3t1iYMi7T/U0jLLDPUvtwBPyn8SmhK8NdLs6u6S51y8UBnArQnn03n/K YhPbbmQBk6oQ6UNB9C9UdeDDna6qVxplDCYSWP4TLA/wkxxILu2rUOfr68ygMYNh3VVE nGnXVhVRNXdKCuyXHHNpOzbmozVUBioIEw6zffXSoN3YQyP+0nbHHbfC5M0J8vr6B6u2 ifEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825758; x=1743430558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3kOwG/yngvmK1gcwehtoklydLh11RsZs9cJUvwASH98=; b=ZORW8X8gsx8OecL+aSKr2rvEz42V9ArzXOnY3xHLbTDwYNrhOxWVApKMQnZSQYD/qF Ifn5wX5yKPsCJqKdWAUxYE5Qiv2zz3g50dZ0j6STuXHhZwJ+9oORu89aQfY4zWOWhQgy bAaQvU/qh4TlOACZ55xeeOeTufLSGw+yt9p+wamu6EYejOl7a90fLqPEEmnUNDSltoGa 7l8Rnsrtm5BSFBVrumYN5mpRHW1gvlyTGA0W/f5lmY0yVyqNSri1HWlB0Xr//+JdA8fs HtNJhAYvXPtYu5SJgwlrAN+TX6TsulIISpO9+pScz9wzP4Trt5exGM2ySQMBwMD0ouke +6kw== X-Gm-Message-State: AOJu0YxFUXTeTZHktAm3vX2NpNPZ5bbq2AdEGJb+je4ZGJ7RL/ZUJ0Lb uEI/o+c+WsG2qgiy0lp7PkYSk6XL9qjQKx7AsQPo4nays4UcWY8fR1ok4Q== X-Gm-Gg: ASbGncvHaYM7g1sFwDqZFdiwEi2lzxIi//Mqlj85yE8DJsLnXQdXfNXdbGWZMB/gcRk dGH6YIRahf3S3KJS39HVEWSSuEmtBs+d9l+U0iFvIO6pWaI6MFhEAxfSd/SaizceDJlRa4S2D2X gTgu3ZMBLuEFEsFh84wJTgCF6vYsg9irXxTVph/Dhx3bFFIcrHFkuEtbnWyCfhyzHXNCv/DVqkP n1BftlFliIumEse1Jtl7pRn2eBqJC2WwG67uCv1BN8JwQnoBBpb4JSyp7OinqH0IAzxH1P9iqkd ZfS1re4g3v9h8IDItt1pqrqn0xlZ1S2BHMg0n2ZrQrYPS/RM6tj6rww4Er3dp6WvZw== X-Google-Smtp-Source: AGHT+IFNyovuy+jMVrBXwDmzSt7kqJU3Ong0IZePlWrv5Ok3R6p575ar1jcMdW6xS5tnThA73Uwarw== X-Received: by 2002:a05:6a00:1146:b0:730:9946:5973 with SMTP id d2e1a72fcca58-7390593b830mr18635972b3a.5.1742825757666; Mon, 24 Mar 2025 07:15:57 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:15:57 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 04/13] blacklist: fix pruning to remove the entry if its expired Date: Mon, 24 Mar 2025 07:15:29 -0700 Message-Id: <20250324141538.144578-5-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When pruning the list check_if_expired was comparing to the maximum amount of time a BSS can be blacklisted, not if the current time had exceeded the expirationt time. This results in blacklist entries hanging around longer than they should, which would result in them poentially being blacklisted even longer if there was another reason to blacklist in the future. Instead on prune check the actual expiration and remove the entry if its expired. Doing this removes the need to check any of the times in blacklist_contains_bss since prune will remove any expired entries correctly. --- src/blacklist.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/blacklist.c b/src/blacklist.c index eb722de5..ca699767 100644 --- a/src/blacklist.c +++ b/src/blacklist.c @@ -96,7 +96,7 @@ static bool check_if_expired(void *data, void *user_data) struct blacklist_entry *entry = data; uint64_t now = l_get_u64(user_data); - if (l_time_diff(now, entry->added_time) > blacklist_max_timeout) { + if (l_time_after(now, entry->expire_time)) { l_debug("Removing entry "MAC" on prune", MAC_STR(entry->addr)); l_free(entry); return true; @@ -159,9 +159,6 @@ void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason) bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason) { - bool ret; - uint64_t time_now; - struct blacklist_entry *entry; struct blacklist_search search = { .addr = addr, .reason = reason @@ -169,16 +166,7 @@ bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason) blacklist_prune(); - entry = l_queue_find(blacklist, match_addr, &search); - - if (!entry) - return false; - - time_now = l_time_now(); - - ret = l_time_after(time_now, entry->expire_time) ? false : true; - - return ret; + return l_queue_find(blacklist, match_addr, &search) != NULL; } void blacklist_remove_bss(const uint8_t *addr, enum blacklist_reason reason) From patchwork Mon Mar 24 14:15:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027438 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFBEF25FA05 for ; Mon, 24 Mar 2025 14:16:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825762; cv=none; b=HsdAnPryVvqsTgp5g5zr7P5gddXoT1UaW6g/92w0Cl2jTBjhC2tgRqmUxFerxluEgmKUpVb/+jVIUzAw77jmHGu+2amKUUDHkTTQAgW3tBAMs7S5zWwZrc2dFtN8S17QxibJUV18X3yrvyiy06Nm9h1pMhx72NesWBxYXEbL1Ho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825762; c=relaxed/simple; bh=eRr0JBpLmGE6bEeGFmCycLYH8r6/0QvKzbywXL9YS64=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HCDJt5jZCPTyQFE5JkXZ9hQvTkcGXtadUpm8wlrqExoUM1paJSllekLLLmlTEJg1bRMRjXHiO5yADVkf9MtqEcgZTz7TENoQ0er+patLPehNXcJvxwSKwBIxWzLGKsVnt0cAp0wjYXMCgOe0Lp6HaQFsHIMIKmG6frLg/gEMBag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bRValOZn; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bRValOZn" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-223fb0f619dso87450495ad.1 for ; Mon, 24 Mar 2025 07:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825760; x=1743430560; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IJrxc1DdTsJ+3uGDO3B4C5w5iLEzjBxEs5BJpFpk+II=; b=bRValOZntmogYqxBUbuaUbEjSRYYUbHBUAgcw1J0dbK/sSzKDNNywWWLR1w50h0SEm HJoSIJhY6/FEvBLkPvciD1blQyt4Fg/KFp7X2Mn+se/8qXh6XVHfz7ZoXZmmsewscUQU ezMBTZcsdVGdzas7bK2tzFAjU+VKW/mTign4uD6YcMfZLLp89onacHtZF3KkisWJlPr2 uVYsABvWQHZkv/CeFlsOUhzk4S1wIraJB1fr4oJ31mPkE8pLEDzdFRR0UmcqqlBA5N3z aemMLYvWcmONJzurtz2CNgnOS7QPMaaRm5qsFWXiFP3yaOEOyCi3AvEpNsvApPqkFvpv YgWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825760; x=1743430560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IJrxc1DdTsJ+3uGDO3B4C5w5iLEzjBxEs5BJpFpk+II=; b=DTpOxJMuUf7we6DuFLOHbvg5BS53XQSc+erOMxcWEojIfZ8RSfyLrM9GzKIXZtV0t5 GhR8mnADwHqHzDzz5IKCGrSQkhTtDgqfA0gLXXG4YXBbBgBEqfMMmb8pAvrs79WH4KnO FP9di3IJqYlAHFVirxWFRJev3LbZvVkaJM4x24LJ63dtCTNABud8HOaRMNX/9IBxMEtF evOTJ7oaK8z3ffE3TpwbHzl2Z1OnuReAqNbYp+X5eJYa2K5IMAzMX8X+aA2kzzhc3v/t mv0Psu7sOSUco7MOkQmCJzcskzEOO4mbRf1vtKQ7R/O7KMyY0ZKSZhs2qPyMe0xOWea1 KhUw== X-Gm-Message-State: AOJu0Yx/1v+C2d/S/o2jnRwGtKcW5fi5R9CiAY8NtkJs2j3VLUrDeypR 5UL9+1u9HUJ8uzCTfcFmCasFtMI8RgzA4T48UkbPWwsvDdz0hGCZgvJyDQ== X-Gm-Gg: ASbGncsuGUYc+fbywWbE9RnnwBZmOuBi7jQpkIkA1t09fNTtEOxHL7iu5N0/zfbRlqZ OOWLRO2IuL9f+pSlj1ZxEFUAeTfy4GBsZwGPMgl96aQHtVzfnmPbrqtKjWD5/MocYvyTwgOi5wu df5Fq/ioeAg3ZncjzSKkI46wzmO+QVL6Ls6HyVXevqjqTpyxRReyEuT3caIZRMuK0CrZtcjN7V8 DgQemtQajW7LnxHdYjfRsigCwronVn0FsBspxRqseTYY6VgewsoW3+J1bbhnVgveHKCRyyff2GU rAHp3NJPcplVHvjp1R4sX1si0T67yX+qmmal+5epwIXXT80zOl/bJJQ= X-Google-Smtp-Source: AGHT+IH1JlNqp74wZVGqgUZtRP4qT9KZtyUpgCFn1f4omAbwXPHx6reJBgrvBCcYWsATSB+LeYz8ug== X-Received: by 2002:a17:902:d481:b0:224:1074:63af with SMTP id d9443c01a7336-22780e10a2dmr182301475ad.34.1742825759503; Mon, 24 Mar 2025 07:15:59 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:15:58 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 05/13] blacklist: add BLACKLIST_REASON_TRANSIENT_ERROR Date: Mon, 24 Mar 2025 07:15:30 -0700 Message-Id: <20250324141538.144578-6-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This is meant to replace the blacklist held in network objects, known as the temporary blacklist. For these entires there is no expiration as it will be up to network.c to remove them as it does now internally. --- src/blacklist.c | 13 +++++++++++++ src/blacklist.h | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/blacklist.c b/src/blacklist.c index ca699767..17122840 100644 --- a/src/blacklist.c +++ b/src/blacklist.c @@ -76,6 +76,16 @@ static struct blacklist_entry *blacklist_entry_new(const uint8_t *addr, added = l_time_now(); expires = l_time_offset(added, blacklist_initial_timeout); break; + case BLACKLIST_REASON_TRANSIENT_ERROR: + /* + * The temporary blacklist is a special case where entries are + * required to be removed manually. This type of blacklist is + * only used for an ongoing connection attempt to iterate BSS's + * and not retry until all have been exhausted. + */ + added = 0; + expires = 0; + break; default: l_warn("Unhandled blacklist reason: %u", reason); return NULL; @@ -96,6 +106,9 @@ static bool check_if_expired(void *data, void *user_data) struct blacklist_entry *entry = data; uint64_t now = l_get_u64(user_data); + if (entry->reason == BLACKLIST_REASON_TRANSIENT_ERROR) + return false; + if (l_time_after(now, entry->expire_time)) { l_debug("Removing entry "MAC" on prune", MAC_STR(entry->addr)); l_free(entry); diff --git a/src/blacklist.h b/src/blacklist.h index a87e5eca..dc7891d1 100644 --- a/src/blacklist.h +++ b/src/blacklist.h @@ -26,6 +26,18 @@ enum blacklist_reason { * connect to it via autoconnect */ BLACKLIST_REASON_CONNECT_FAILED, + /* + * Used to blacklist a BSS under certain failure conditions that don't + * warrant a full ban from connecting. This can include an invalid + * password, or an auth/assoc failure with a subset of status codes that + * indicate the BSS is overloaded or cannot accept new connections. + * + * This is used to mark the last BSS as having failed, and to continue + * iterating BSS's. Once the list has been exhausted or a connection has + * succeeded all blacklist entries with this reason code should be + * cleared. + */ + BLACKLIST_REASON_TRANSIENT_ERROR, }; void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason); From patchwork Mon Mar 24 14:15:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027439 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BF4725F96A for ; Mon, 24 Mar 2025 14:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825764; cv=none; b=UfcRFctWaSOLeF2+3BHTB2LFn7k9kXzp3pjpOYyqf+tkp5vJT3vwv3e4keiPxmjmwz83sqXUVOSozqsx3eZ58cFFTfOuQPOOsJFhneUFEIaNPQVDJLXz72EV9nBS+9XTdesDeOfshaAIPjvYYkWLNlOXXN9vurHUN/YJY7QynCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825764; c=relaxed/simple; bh=51wEAWT7aJyNu2blmtP+1KXhrrIfssK7tES3rt9eyDo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PVNII9gfcSN7LRTWAAYhkeQyR1GHbY5dSvDBQV3yMht1xNDbU7F4kny4hbiFxYayNTBLcWo3sB2c/Ob127EJtYGl3Pe+BXlN5v/H+JQ+vPrtnYxBu/sw/cVXXJy+B6AvGs+dDZTLvQr99TZVlZrz4RhgszzunZwqAhSjPoNlFbo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TAAVEjMv; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TAAVEjMv" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2243803b776so7187255ad.0 for ; Mon, 24 Mar 2025 07:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825761; x=1743430561; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l32T96Ov8t1M/e/ghgbw20eFnDZCLgN8TyPJ9gdzECY=; b=TAAVEjMvde6i61moD3WGNWG2AxE8chfKAsO18JZ8FeXuuMFFa/mvek8VrQm576sg07 dHaRNRn8EAk1A6drBhK5eebkF82O/ivMGFeMm1uzhEzQhke2C9OmeJtJKq6llchQOVxZ sysU7jqouTOVVb/PuF4cj7ExHngHVSn80baUpyf9iqICD9ad355GqLvFDHxEpHr32lO7 fIHNXIPUPE9wYnzo7NjsMpivMbYP6i+4z2rSMNu1KlHiIUCcwzDMUK5J+W3jwv7Inh1c RBJ78hGynILKylwHITRUijehju69dfZt+X+uwreDpwhlWqXQbrDdpMprvb602gegqSjV TXEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825761; x=1743430561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l32T96Ov8t1M/e/ghgbw20eFnDZCLgN8TyPJ9gdzECY=; b=dEeXyolP2SuU3ozSja2s6OB2Q1h8bUr3nHeYIqmQI7CM0IUI14AVfm6Qv/DzS/H9Km NIOcpjc/v96J9LUCDJOigY49Mwx9xgpELldUyVVBaZZdXHNDVqOKHgK7S9XhbDcXyloY 7DVuFjSEthTmr+A7Xn5B8HYSu+yOTrxMRA+vSchDXjcCp+F6ESL+MQyi3owxxLd1mIFX vd1XsM2K1QQSSoP75lSBIJPto2tdo8npp7mZn41aEO57PI/Knu8AEVCZ6u4P4MyOLYNI dmv5syofMt+yTd/dzhPK2FAtwTF1mZpdGG/RsJUGNFp2pC+YIeg1YBau0TILAF6gnK/b s99w== X-Gm-Message-State: AOJu0YyAPru3dvcTs+BWn1PW4PGb9Gic4BiswsOgUXrYzxVZb8dCbZkp EOdhjhJTEfyaeYdDpK60koGLHhA0uAFGkoISxCBwMCkd1J5Tbp0H08wzhA== X-Gm-Gg: ASbGnct1oOQMEqfVX0N5hOfBJFb0PnKFEK4idehtG0HAWu5jZ+aP+Dxec9+oqxqDr+q 3/P6LNXNqMYLFK1fwGo1tLHBs5os/MVkaUaRbfwI2nLhpx4y14Om+h9sE1y4ReHxXs7vk9W1hqU HXPogR/PrKBjduqls73vbv0Unxh8Vnc544ybtRZTeK3PodFinjOV944hU1riXfrOsmmmH6iULBc ZsBqRK7h0vYasdrDaaFsxWccep0SwgEoKzSgo5gK8NNJOyPjAtzwubQT/bvl/piFc7Eq0f0glKB fIqzL1ZTz0oWL9Z4q7ZnzLEETy/mnxk3xp0Dz3ZKzNGUGvV2gEsJ1Lg= X-Google-Smtp-Source: AGHT+IECli5ZVyuXJceAwpAKw2SzOLKdb49pa0PyHrzD/Fhc/43n8c6K/kJ+G1SI+l9kVUlWi+crqA== X-Received: by 2002:a05:6a00:4603:b0:736:bfc4:ef2c with SMTP id d2e1a72fcca58-739056530f5mr16584009b3a.0.1742825761107; Mon, 24 Mar 2025 07:16:01 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.15.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:00 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 06/13] network: update to use blacklist's new temporary type Date: Mon, 24 Mar 2025 07:15:31 -0700 Message-Id: <20250324141538.144578-7-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the temporary blacklist from network.c and use the new BLACKLIST_REASON_TRANSIENT_ERROR reason. --- src/network.c | 34 +++++++++++++++++----------------- src/network.h | 2 -- src/station.c | 12 ++++++------ 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/network.c b/src/network.c index 4602a110..be6641c0 100644 --- a/src/network.c +++ b/src/network.c @@ -78,7 +78,6 @@ struct network { struct l_queue *bss_list; struct l_settings *settings; struct l_queue *secrets; - struct l_queue *blacklist; /* temporary blacklist for BSS's */ uint8_t hessid[6]; char **nai_realms; uint8_t *rc_ie; @@ -168,6 +167,18 @@ static bool network_secret_check_cacheable(void *data, void *user_data) return false; } +static void remove_temporary_blacklist(void *user_data) +{ + struct scan_bss *bss = user_data; + + blacklist_remove_bss(bss->addr, BLACKLIST_REASON_TRANSIENT_ERROR); +} + +static void remove_blacklist_foreach(void *data, void *user_data) +{ + remove_temporary_blacklist(data); +} + void network_connected(struct network *network) { enum security security = network_get_security(network); @@ -198,7 +209,7 @@ void network_connected(struct network *network) l_queue_foreach_remove(network->secrets, network_secret_check_cacheable, network); - l_queue_clear(network->blacklist, NULL); + l_queue_foreach(network->bss_list, remove_blacklist_foreach, NULL); network->provisioning_hidden = false; } @@ -207,7 +218,7 @@ void network_disconnected(struct network *network) { network_settings_close(network); - l_queue_clear(network->blacklist, NULL); + l_queue_foreach(network->bss_list, remove_blacklist_foreach, NULL); if (network->provisioning_hidden) station_hide_network(network->station, network); @@ -254,7 +265,6 @@ struct network *network_create(struct station *station, const char *ssid, } network->bss_list = l_queue_new(); - network->blacklist = l_queue_new(); return network; } @@ -1197,11 +1207,6 @@ struct scan_bss *network_bss_find_by_addr(struct network *network, return l_queue_find(network->bss_list, match_addr, addr); } -static bool match_bss(const void *a, const void *b) -{ - return a == b; -} - struct erp_cache_entry *network_get_erp_cache(struct network *network) { struct erp_cache_entry *cache; @@ -1277,7 +1282,8 @@ struct scan_bss *network_bss_select(struct network *network, candidate = bss; /* check if temporarily blacklisted */ - if (l_queue_find(network->blacklist, match_bss, bss)) + if (blacklist_contains_bss(bss->addr, + BLACKLIST_REASON_TRANSIENT_ERROR)) continue; if (blacklist_contains_bss(bss->addr, @@ -1784,11 +1790,6 @@ struct l_dbus_message *network_connect_new_hidden_network( return dbus_error_not_supported(message); } -void network_blacklist_add(struct network *network, struct scan_bss *bss) -{ - l_queue_push_head(network->blacklist, bss); -} - static bool network_property_get_name(struct l_dbus *dbus, struct l_dbus_message *message, struct l_dbus_message_builder *builder, @@ -1934,8 +1935,7 @@ void network_remove(struct network *network, int reason) if (network->info) network->info->seen_count -= 1; - l_queue_destroy(network->bss_list, NULL); - l_queue_destroy(network->blacklist, NULL); + l_queue_destroy(network->bss_list, remove_temporary_blacklist); if (network->nai_realms) l_strv_free(network->nai_realms); diff --git a/src/network.h b/src/network.h index 849051dd..1e01de88 100644 --- a/src/network.h +++ b/src/network.h @@ -95,8 +95,6 @@ struct l_dbus_message *network_connect_new_hidden_network( struct network *network, struct l_dbus_message *message); -void network_blacklist_add(struct network *network, struct scan_bss *bss); - struct erp_cache_entry *network_get_erp_cache(struct network *network); const struct l_queue_entry *network_bss_list_get_entries( diff --git a/src/station.c b/src/station.c index e2ed78f3..c4ba9413 100644 --- a/src/station.c +++ b/src/station.c @@ -3408,8 +3408,8 @@ static bool station_retry_with_reason(struct station *station, * Network blacklist the BSS as well, since the timeout blacklist could * be disabled */ - network_blacklist_add(station->connected_network, - station->connected_bss); + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_TRANSIENT_ERROR); try_next: return station_try_next_bss(station); @@ -3481,8 +3481,8 @@ static bool station_retry_with_status(struct station *station, * will allow network_bss_select to traverse the BSS list and ignore * BSS's which have previously failed */ - network_blacklist_add(station->connected_network, - station->connected_bss); + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_TRANSIENT_ERROR); try_next: iwd_notice(IWD_NOTICE_CONNECT_FAILED, "status: %u", status_code); @@ -3579,8 +3579,8 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result, iwd_notice(IWD_NOTICE_DISCONNECT_INFO, "reason: %u", reason); /* Disconnected while connecting */ - network_blacklist_add(station->connected_network, - station->connected_bss); + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_TRANSIENT_ERROR); if (station_try_next_bss(station)) return; From patchwork Mon Mar 24 14:15:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027440 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF8C425E836 for ; Mon, 24 Mar 2025 14:16:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825765; cv=none; b=qKA0/2uiRtUeW/c+BTSryen17Gg8SM3hUjKBKV9QkFm0kyXNNKUaF1KET4BCT4udNUaSXD1Ypjz1WfOJgDWTXEGVV86Aey+gu0Ov5xJ1RQQF/eT0TEkBx7AAYH0aY4Bin+hkPfYq2hGmRR+riWsRHAU5FxbLyPd8B19uzUiHjmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825765; c=relaxed/simple; bh=869DHHQqfD2nkyQmB1tmUVDGroKlr24OrrMxBhHhonU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AmZAOcmPFhb8SKPi1pATS8A/G2hbJzwzsPYM13OHjv6JZiVZav7NPkq4QaZ26uyzLSRwy9+Oc3bT/7tRInmidp9NikqBg0PfoDFlCQ+DMGkXRnaoPCiw/V3TpTDvn3GlurWGrac+g7O7kZcLAc6aRh0AKDkHLI7LI80hNkEuj8c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kVWyu51d; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kVWyu51d" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22435603572so77929925ad.1 for ; Mon, 24 Mar 2025 07:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825763; x=1743430563; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nZ0JpN0iAS7vJdUhi58QEjPHhM60DdhDjank2X+cKUI=; b=kVWyu51dpLHUqCl0XxMRFtFdLxhmtLQbnxl+L2J4cIK7KwT/8x5VW8sedqgiPP8SOA yT9S31UVsrdzSVUIUWmnlrOQhY0uKthkTR/sJQb8StFSQEj5IDsW9Had1ziK0f9HMe7F e6hVjcLnVs7mfZBRPGQr1FC81rgyjZLd9gud6bJFbQnPrbammq+iPk8eOhqA7UXI+KbG 9cYcjKPycquLxRyZFjPReIeT2s57zza+V70yddwo8i0Gyj5liWIVMda2yLCh63h3l7Jh iNKvSIdiLil+eXSPhR46ja9gnZkEfoL9cbPtTXvipHa4mdSmBckdwzRhnFIJNSkm1x0G yMYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825763; x=1743430563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nZ0JpN0iAS7vJdUhi58QEjPHhM60DdhDjank2X+cKUI=; b=ihaZpfd4iV0HX47XfhZOwyoHAza5X53zWD5oi3Yoldc9m9KfseBh8Z0W4RTKNMhOVe kEgu+T68UE0jwO5zRk3lOIFcC++kh4H22u6fzMpWf9qH02jzkVivG8F3dJP0m4j0+xsB wJtviqWTBgZjQsrEfuJQSK4Y2k7cr2035rEUig4fjLDiUHcNyGqFoSp+rtxTzcZFNz0V AfEw4gDlhMfTZuDn10563gOkwcJ6EWsp0S+Lm7K4xFCvR0NqpY+TxOGMIY5RXPOk9dj9 TKDQj+Our5OHOW1NwaXKAk6QsUZTAurCkGmcwjINw24U22Y4hrJEA8WeqKn1btv0OYmz pRzg== X-Gm-Message-State: AOJu0YyYQ294r3BLBojBpWbh8Y670bmL4a7MUvyjORckCBjssPBD/Osw sXZ3PigRSwsaZO1tmgfRBtyu0lHcXbn5PSjW/AkIKHntA9qRbawm3ZqNAg== X-Gm-Gg: ASbGncttLsFmh9UGH/2saUx/hSrN1e+VU7BHz1ImHxOIAZFmWD/hG/d5uLW7KUq5Pl1 ZIX12mt10xLxzdWUH/6oSjxvnxzX+4HUj+z6CFDZNMhvNv3Ehn7CjQo9wgE4kHnGgcJQn/yQDMP P8plN0ISIMhezvZlJ5FPgxXbyS0gl81MAyTcj0L+SJ39cHqorb/q/bYdGkNU8cKtzBkxQSo3q0S k4OJnfHv6OJY5Y3fLBKwqYYPrIVajfrWkD/u85HmKLgAOutxCbzJiGYH3+E0LTLPQd6+ZKDofvr CYLEg4nyf0cIA2PdoFVIuUjXhTdvDd4lZ5OQbgrhZfqBIRZ0l6N2oSECjGpZCgHLTg== X-Google-Smtp-Source: AGHT+IFxKgeff8rgUQnyFvM5Nru/QiGaJN+Y8mtGdzJg8k0r1RqXhcGHIfODZwtyHKTTPeftJLZLYw== X-Received: by 2002:a17:902:fc4f:b0:224:256e:5e4e with SMTP id d9443c01a7336-22780c7b695mr208612215ad.16.1742825762704; Mon, 24 Mar 2025 07:16:02 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:02 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 07/13] blacklist: add new blacklist reason, ROAM_REQUESTED Date: Mon, 24 Mar 2025 07:15:32 -0700 Message-Id: <20250324141538.144578-8-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This adds a new blacklist reason as well as an option to configure the timeout. This blacklist reason will be used in cases where a BSS has requested IWD roam elsewhere. At that time a new blacklist entry will be added which will be used along with some other criteria to determine if IWD should connect/roam to that BSS again. --- src/blacklist.c | 16 ++++++++++++++++ src/blacklist.h | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/src/blacklist.c b/src/blacklist.c index 17122840..e306195b 100644 --- a/src/blacklist.c +++ b/src/blacklist.c @@ -45,6 +45,7 @@ static uint64_t blacklist_multiplier; static uint64_t blacklist_initial_timeout; +static uint64_t blacklist_roam_initial_timeout; static uint64_t blacklist_max_timeout; struct blacklist_entry { @@ -86,6 +87,13 @@ static struct blacklist_entry *blacklist_entry_new(const uint8_t *addr, added = 0; expires = 0; break; + case BLACKLIST_REASON_ROAM_REQUESTED: + if (!blacklist_roam_initial_timeout) + return NULL; + + added = l_time_now(); + expires = l_time_offset(added, blacklist_roam_initial_timeout); + break; default: l_warn("Unhandled blacklist reason: %u", reason); return NULL; @@ -211,6 +219,14 @@ static int blacklist_init(void) /* For easier user configuration the timeout values are in seconds */ blacklist_initial_timeout *= L_USEC_PER_SEC; + if (!l_settings_get_uint64(config, "Blacklist", + "InitialRoamRequestedTimeout", + &blacklist_roam_initial_timeout)) + blacklist_roam_initial_timeout = BLACKLIST_DEFAULT_TIMEOUT; + + /* For easier user configuration the timeout values are in seconds */ + blacklist_roam_initial_timeout *= L_USEC_PER_SEC; + if (!l_settings_get_uint64(config, "Blacklist", "Multiplier", &blacklist_multiplier)) diff --git a/src/blacklist.h b/src/blacklist.h index dc7891d1..8de5c1d7 100644 --- a/src/blacklist.h +++ b/src/blacklist.h @@ -38,6 +38,13 @@ enum blacklist_reason { * cleared. */ BLACKLIST_REASON_TRANSIENT_ERROR, + /* + * This type of blacklist is added when a BSS requests IWD roams + * elsewhere. This is to aid in preventing IWD from roaming/connecting + * back to that BSS in the future unless there are no other "good" + * candidates to connect to. + */ + BLACKLIST_REASON_ROAM_REQUESTED, }; void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason); From patchwork Mon Mar 24 14:15:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027441 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2D1825E836 for ; Mon, 24 Mar 2025 14:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825767; cv=none; b=A/u8udcJo5cSaqRWE9Gj6EO7oSBPuf53I6+ug9Lkba0fzyJzGjW1DQVabPJZ4yS55WY0RDDg9cToZDvfnloYfp3wDywHPSltVqYCGedhMQuYWXlS6Yp5oz7JJbpcLCaMpK8cp4AfTP0Cw8QNBOkQxZb3vMaEVVYGp64i/5/JX/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825767; c=relaxed/simple; bh=VPIc09Q7xegK52vnPkYEver9dV/TDr9T3t7jfB9mNIc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VVfyJXS+ZeFTXffn5GTAKK5NuILoz972a/G4PpX1Z7RbECKEEKuesjMfEZfGrBKF6kYNVs8Tyi55jSSp8SkmDTrq/7ovX77JLI1D36HEjfMubtOl93i5Q1dBuqpl9dCtKtJG5IqiPB6wty1/HVSkHX7+VsvJBS1xI9huJbAwi8o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jkHJxLYI; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jkHJxLYI" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-223a7065ff8so8990155ad.0 for ; Mon, 24 Mar 2025 07:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825765; x=1743430565; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9n9NMyuov+hct+RSjLtovym+JxrfPfi1Qf9x+d/3hJg=; b=jkHJxLYIttl1XswGVXBwiRxiqhxGNl8+wzmozldTsgCP2pWoTYHkUDbTUtRWFoD8mi DPYs+/g/yKJ/gYesgqsWGqmxfATfGVlJbhOpvnQFw3pBVm0GbzuQk4fvBdq/QztuhBfK TZejGsyv4rrAKuiCWR5iJcUG4bbSM2I55vm0MEf1FmpeSgkL2zsYxw42mMsjVvNCBw9/ 8EqGUklCbphDOPWsmTqwQghlq0j74QOfoyVgUUplzz8xOIr8vG0T22hZ5XmilKWl6INA r0ErMDeIW4g7o5B22YzYXyl43HnPNIh4g/TfAHX38JIjsG20XQPg7ERS4eQ0no0SaEUs vqig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825765; x=1743430565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9n9NMyuov+hct+RSjLtovym+JxrfPfi1Qf9x+d/3hJg=; b=U+J4GeaLwvMX+a9WnweJgvRnA+xxEhsRA4B2GcNj50caRNkhLPHIeiLOyQ9NdhlWBI e9HlLviZ1XcTFSsNsCcY3Lk2mtkLt7K5h4sY10mX1LsEB/EIOtd4jRUTRsYzA6IGfnX0 0yTwmjQPZu5OWqs7RPnEoLFq/jyHPC+x7HclxdEm8A1RhDYhBrDuuh2ea61X47i5YKHu gp5U9eHpgJTjcgyQlPFnwFf/4CK9rhkxXIdiL4JDK30xPxDU7Du+cK/U+Hha/bL9X18O xkRyLT4FyHUVTIH+waXZQ+4v3zf81+nZKS/gHGnRxnAr36gsgY3GdS00lOkBZrgbv3Xa +AaA== X-Gm-Message-State: AOJu0YzoC+lTZuL5kR3PeJnRADsH6bphbc+0MnB8Js4PLVNuuffRKHsT ul0U340nGJUUqyxe7iuNhyCmvQ35mpLAdPPyMvlJxLEiNJQ/0RtGWNTvlw== X-Gm-Gg: ASbGncuDYxG0m6YVmvGzIHtO62cmRzJXVJmTgx0Kxb7MPn6Cqe2SjCNky52tcM2umFd JvueZrKarDtq9JiKT5aGagxBcaU5pMC7Y96GZLsbLm8rFH/ZnuWz7LqpmIbnJcDepc0TwKftXU4 4IzK79+wOLsoSmou5zwGDE2BwyDerA2vQU9tMxYs3VavqzfsIqvrQl2xeQwjweCStTtOSXiu/gB No4h8/VNs3uZP7fgzx38ojJoRdlcln22N823xLMYqpCPF1B03R9C9bKqsgg3RqLy+n1JXERhoEl eGEzfdd9o/g+OOgoVXKetpQ5ez1oUsnEkwiteK6BiIYC/11Y6C0VvRQ= X-Google-Smtp-Source: AGHT+IHxBPOm/QgV/XEFRfqZC1lWT98gmHDf8QgQBbRvjPr1AYI+38QhfX8g9tOnGW5x3nNcrOlxpw== X-Received: by 2002:a05:6a00:1885:b0:736:ab1d:7ed5 with SMTP id d2e1a72fcca58-73905623ea3mr21164512b3a.0.1742825764426; Mon, 24 Mar 2025 07:16:04 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:03 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 08/13] scan: Introduce higher level scan BSS groups Date: Mon, 24 Mar 2025 07:15:33 -0700 Message-Id: <20250324141538.144578-9-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This introduces a higher level grouping to BSS's to improve sorting as opposed to purely rank based sorting. The reason for this is to handle roam request-based blacklisting where we want to encourage IWD to avoid BSS's that have requested we roam elsewhere, but also not fully ban these BSS's (i.e. BLACKLIST_REASON_CONNECT_FAILED). This new concept introduces 4 group types, in order of worse to best: - Blacklisted - the BSS has a permanent timeout blacklist - Under threshold - the BSS is under the set RSSI threshold - Above threshold - the BSS is above the set RSSI threshold - Optimal - The BSS is not "roam blacklisted" and is above the set RSSI threshold. When sorting the BSS group will be considered before rank. This means we will still prefer roam blacklisted BSS's above those that are under the set RSSI threshold. BSS's within the same group are still compared by their rank/signal. The new group sorting logic was added via a macro __scan_bss_rank_compare. This was done since station uses a separate roam_bss structure to sort roam candidates which can also take advantage of this new sorting. The macro is agnostic to the type as long as the structure member names match. --- src/scan.c | 42 +++++++++++++++++++++++++++++++++++++----- src/scan.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/src/scan.c b/src/scan.c index aeab6516..6c03e408 100644 --- a/src/scan.c +++ b/src/scan.c @@ -51,6 +51,7 @@ #include "src/mpdu.h" #include "src/band.h" #include "src/scan.h" +#include "src/blacklist.h" /* User configurable options */ static double RANK_2G_FACTOR; @@ -58,6 +59,7 @@ static double RANK_5G_FACTOR; static double RANK_6G_FACTOR; static uint32_t RANK_HIGH_UTILIZATION; static uint32_t RANK_HIGH_STATION_COUNT; +static int RANK_OPTIMAL_SIGNAL_THRESHOLD; static uint32_t SCAN_MAX_INTERVAL; static uint32_t SCAN_INIT_INTERVAL; @@ -1910,15 +1912,41 @@ int scan_bss_get_security(const struct scan_bss *bss, enum security *security) return 0; } +/* + * Evaluate the BSS's grouping based on its signal strength and blacklist + * status. From best to worst the groupings are: + * + * Optimal: Not blacklisted in any form, and above the RSSI threshold + * Above Threshold: Above the RSSI threshold (may be roam blacklisted) + * Below Threshold: Below the RSSI threshold (may be roam blacklisted) + * Blacklisted: Permanently blacklisted + */ +enum scan_bss_group scan_bss_evaluate_group(const uint8_t *addr, + int16_t signal_strength) +{ + int rssi = signal_strength / 100; + + if (RANK_OPTIMAL_SIGNAL_THRESHOLD == 0) + return SCAN_BSS_GROUP_OPTIMAL; + + if (blacklist_contains_bss(addr, BLACKLIST_REASON_CONNECT_FAILED)) + return SCAN_BSS_GROUP_BLACKLISTED; + + if (!blacklist_contains_bss(addr, BLACKLIST_REASON_ROAM_REQUESTED) && + rssi >= RANK_OPTIMAL_SIGNAL_THRESHOLD) + return SCAN_BSS_GROUP_OPTIMAL; + + if (rssi >= RANK_OPTIMAL_SIGNAL_THRESHOLD) + return SCAN_BSS_GROUP_ABOVE_THRESHOLD; + + return SCAN_BSS_GROUP_UNDER_THRESHOLD; +} + int scan_bss_rank_compare(const void *a, const void *b, void *user_data) { const struct scan_bss *new_bss = a, *bss = b; - if (bss->rank == new_bss->rank) - return (bss->signal_strength > - new_bss->signal_strength) ? 1 : -1; - - return (bss->rank > new_bss->rank) ? 1 : -1; + return __scan_bss_rank_compare(new_bss, bss); } static bool scan_survey_get_snr(struct scan_results *results, @@ -2678,6 +2706,10 @@ static int scan_init(void) if (L_WARN_ON(RANK_HIGH_STATION_COUNT > 255)) RANK_HIGH_STATION_COUNT = 255; + if (!l_settings_get_int(config, "General", "OptimalSignalThreshold", + &RANK_OPTIMAL_SIGNAL_THRESHOLD)) + RANK_OPTIMAL_SIGNAL_THRESHOLD = 0; + return 0; } diff --git a/src/scan.h b/src/scan.h index 4c1ebc21..4d06f29d 100644 --- a/src/scan.h +++ b/src/scan.h @@ -45,6 +45,17 @@ enum scan_bss_frame_type { SCAN_BSS_BEACON, }; +/* + * Groupings for BSS's. These are assumed to be in order of preference where + * the last enum is the most preferred group to connect to. + */ +enum scan_bss_group { + SCAN_BSS_GROUP_BLACKLISTED, + SCAN_BSS_GROUP_UNDER_THRESHOLD, + SCAN_BSS_GROUP_ABOVE_THRESHOLD, + SCAN_BSS_GROUP_OPTIMAL, +}; + struct scan_bss { uint8_t addr[6]; uint32_t frequency; @@ -168,6 +179,36 @@ bool scan_get_firmware_scan(uint64_t wdev_id, scan_notify_func_t notify, void *userdata, scan_destroy_func_t destroy); void scan_bss_free(struct scan_bss *bss); + +enum scan_bss_group scan_bss_evaluate_group(const uint8_t *addr, + int16_t signal_strength); + +/* + * Macro to compare two scan_bss-like objects. This is to share code between + * station.c and scan.c since station uses "roam_bss" objects which is a subset + * of a scan_bss. + * - If the groups differ this is used as the comparison. + * - If the groups match, the BSS rank is used as the comparison + * - If the BSS ranks match, the signal strength is used as the comparison + */ +#define __scan_bss_rank_compare(a, b) ({ \ + int ret; \ + enum scan_bss_group a_group = scan_bss_evaluate_group( \ + (a)->addr, (a)->signal_strength); \ + enum scan_bss_group b_group = scan_bss_evaluate_group( \ + (b)->addr, (b)->signal_strength); \ + if (b_group > a_group) \ + ret = 1; \ + else if (b_group < a_group) \ + ret = -1; \ + else if ((b)->rank == (a)->rank) \ + ret = ((b)->signal_strength > \ + (a)->signal_strength) ? 1 : -1; \ + else \ + ret = ((b)->rank > (a)->rank) ? 1 : -1; \ + ret; \ +}) + int scan_bss_rank_compare(const void *a, const void *b, void *user); int scan_bss_get_rsn_info(const struct scan_bss *bss, struct ie_rsn_info *info); From patchwork Mon Mar 24 14:15:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027442 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D3347081A for ; Mon, 24 Mar 2025 14:16:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825769; cv=none; b=N1LoIlxu3InOT4X6reCjAFdrG5+7zo7rgRb78378t9dBGpRUQcsscRWOJAHyBoUNXGLELDrvJNrVrfgP6p76hlqcpgn1/dWQmPvOfVnqBobzEG/+DJ8gzZjztpYdjnuUvlKxncnHoWND561dMNdO+mwI5p28LVai4eQWtzMpmjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825769; c=relaxed/simple; bh=RfBNyIe54xobimPzlrPZqfLahyeisttQzw6pyUwd76I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q9CxZS2BvRlsY+eqZ7I47PrV1KIUhwXC1suRai7LIqlKANPrYoYQvYxZ0xe2wYnDUORW/kigcc0NQ4997lJpMnWfcE+EV/QgUudL5MYyXz/YaD0mrsGHoUe9HlFb5ROm39aIWKJCDFs8zhNcnMKE/1/Dd++1eMi2mgYJA2SbatI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=M/DE4g9H; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M/DE4g9H" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-224100e9a5cso83328565ad.2 for ; Mon, 24 Mar 2025 07:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825767; x=1743430567; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wLnp/QEGKYUb/a138PIdGcUtNZEdbdq2D1FarrPhoUQ=; b=M/DE4g9H/7Bz/V0kWlmIqf+d6m3c2RzYCOBCNNC3gpX3NVZPV9/IF9I46q4VWnhsDJ 8W7m8i5P5zmm4sivcQ6v5TqbmcnTgIywSeqYXcRHGfIcU2yidiPERJHhKrGj1bpq7jFn /2nh8q/ut+P3zAGudPZk/0Yl0cp7uX4WIyQ90tVGphNcxyojEOm6Agt1K2Bx6IwiKHdq Uxi3J+G1X5Wkjkabgjpq6EoKf+dCIczifxqm3yi7dZemEVFfRLLzUjIa2P+tRhfckbJJ pUR9CqnDP99gdoAzO+Qtmy+Bq7iQccZ3l/qsXDp8v3Q0DYWDTRtPVX2pCqNuN8kGAts8 8DiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825767; x=1743430567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wLnp/QEGKYUb/a138PIdGcUtNZEdbdq2D1FarrPhoUQ=; b=AYaqodxRjtg13RcQuwCBqVGJBw6SAJ1vZRYiqLq+cxF+nh4tehpQJPCgxTaQVzbRaN NFNe+Zos53Gygl15DbtLBIbcLxP7lS267sMqgjDwJz8xCMC6WoWdGgBviGcymQwO77IH OiUvIAdpBkhWTmlC0DuRo3e9h3EwZ8xLmnWdtKssqnyXq+jQO2HGOuP8cvMrQeIAj9h3 7wkWITZJH8lrn0+YWGzabDez+NDKL5nemxUOP3RXPGi87E1NCRRJ9mO7NQsFyTZRapt2 1ebSqqyGI6dAUcoZp2urg2RlJ1iu8Lys5N3CBfgBPHS/WhBzW4S5J9iNLXGxquu9Wk/T hSGQ== X-Gm-Message-State: AOJu0YylP+6lzGsqGsChIW/dMpcMD7htPklSgZ+fg7a2iwm/tlf7qvoB r25tRmw0D8flmGsKzsRCopokfIyQrGOsWxumn+1azT59HmDL/2GITEVjqg== X-Gm-Gg: ASbGnctglR6TZODDj3DdSofag6KHI8eBt7NKW+FNi3HjpH6Wn53AnrpbUxrUy35SzE0 4nlmb9mbPUx17hV6QYsi1EU39KY91IXOfQc1cuEzMmOkNTUbpzNJ5GmZJToxmfnLN8OHNtUxnSV iKUEcw5wTS4sPsg9Jh0bZyurmkKmrKOPtYnEsWulqRthsdZFtklulliHZZ+intTT4s+3z+A8ZA1 OtaoR3ffFwr/3OCpCpjdAC/K+uXEuoNsE7Tb8SsT6G0/c1bXJL5WY0VCGfB0saMKBXNCKu3tWdi 1TtlcEQsXZ95lY0JT1g4zSO/NHsc48OiI1Ify9pTXXHXUbdgmrbFaco= X-Google-Smtp-Source: AGHT+IHgMD9n3qxobX7TwhLjtwWBluxlZ1YZR/t4OkxoqriHzdJ/8Yk44gRouifhw51pCUWDkzjDog== X-Received: by 2002:a05:6a00:843:b0:732:5611:cbb5 with SMTP id d2e1a72fcca58-739059d770bmr21960787b3a.11.1742825766383; Mon, 24 Mar 2025 07:16:06 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:05 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 09/13] station: roam blacklist BSS when a roam is requested Date: Mon, 24 Mar 2025 07:15:34 -0700 Message-Id: <20250324141538.144578-10-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If the BSS is requesting IWD roam elsewhere add this BSS to the blacklist using BLACKLIST_REASON_ROAM_REQUESTED. This will lower the chances of IWD roaming/connecting back to this BSS in the future. In addition we also needed to update the roam_bss sorting to use __scan_bss_rank_compare so we sort based on the new groupings rather than only rank/rssi. --- src/station.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/station.c b/src/station.c index c4ba9413..b96419be 100644 --- a/src/station.c +++ b/src/station.c @@ -184,11 +184,7 @@ static int roam_bss_rank_compare(const void *a, const void *b, void *user_data) { const struct roam_bss *new_bss = a, *bss = b; - if (bss->rank == new_bss->rank) - return (bss->signal_strength > - new_bss->signal_strength) ? 1 : -1; - - return (bss->rank > new_bss->rank) ? 1 : -1; + return __scan_bss_rank_compare(new_bss, bss); } struct wiphy *station_get_wiphy(struct station *station) @@ -3268,6 +3264,10 @@ static void station_ap_directed_roam(struct station *station, l_timeout_remove(station->roam_trigger_timeout); station->roam_trigger_timeout = NULL; + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_ROAM_REQUESTED); + station_debug_event(station, "ap-roam-blacklist-added"); + if (req_mode & WNM_REQUEST_MODE_PREFERRED_CANDIDATE_LIST) { l_debug("roam: AP sent a preferred candidate list"); station_neighbor_report_cb(station->netdev, 0, body + pos, From patchwork Mon Mar 24 14:15:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027443 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F933EEC5 for ; Mon, 24 Mar 2025 14:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825770; cv=none; b=pB+nw544LR6lf9TAwNuu8xakgwZkuslNPEbqRGagtNLmh8Q2eR19o8bJZ9SnKPfLbDD3FzkRgPuq66uxMt+iA+x/v6VnJa37eVcluCEOeqD5zd74GDmn+ZNsd2lDKTiv+0YTrXQWv9sVTt3R06T2gZEtrctt6EPJE7C78gFxxKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825770; c=relaxed/simple; bh=zS7ZgTnrLcpCa6Hgpg9yTGAZAAhIDnALjmgEWaKQYdc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GTKL4cX2KSOOEJhZxj0DYOGk5BEp3LuBJ9OGRgbLKy02IK8K//8LPAvG8dX50PLX0y0nvTyohK+TNcDjoXkFgg+nS09Vt7HCwvQLb4CKtK7q6Jy/jzPU9q57QT28YXQ9wQdGQ4et+krv9OYzzIsf5HG3zNUB8ZGT3vqIoD/qDNk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NbQywY61; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NbQywY61" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-223a7065ff8so8994525ad.0 for ; Mon, 24 Mar 2025 07:16:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825768; x=1743430568; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GwolN0JqN16IIQGx/QcM2yePHjLgWmEMxmMHP7W14+M=; b=NbQywY61XJY/ZHcq71osxRVYES30a0+Om9UlUTKFog5R1tBaaKjuCJhv+Jke9HCWeM oc+yx95j5yYH29kZu6MCBI/CkP8+84/mgU/gv7GjXxVNEqjcyeaIplGDe4xGwmJ9OQMg ef4w8is85LdPZdNx+lVoRDm96+jw9Kn9H0t+7Ab9cOEJq5dp9xMjO2E6rkX2spKCre7W J/BXO4aVc2Jw7ycS5juBD1H6578WMu/HXVU89b0VDHTfsUFoXhTbET2FyAN0bbjOhGLi vQA9cBa5NSnjuD+m+raIqcr16AkAo4YbiJY9NhfmkOnWJhG67xz+Nh9SqKZPTT2gZJ1C MmIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825768; x=1743430568; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GwolN0JqN16IIQGx/QcM2yePHjLgWmEMxmMHP7W14+M=; b=DoMMMBPXXj5o70K5qVHyh6dB140Bwc/e/mATyl0O1PMpAywSjez/Pi+PXPAbFZwgq7 iOesA1bH/1+XOl1TBh1gbenMgH10Hzp5kJ9tmWHQVHT2CZRxnI3qtGivugM2YhzJLSfu 8E9PzvPYhpobdrKlJMPju0ooFyST6Ue7IeQWgZHmZNgocZKFSVgnJ1gC1XcLmUUECHYO BtDo58JhEfw3AHAQZc3icT+5XFmmez7xUnXLmzkTiPyILV6CkbY2W7Rqj+tmXIdcVHDC w5FDCJT2qskXASDcYWtaqlGTbEOua+EV3rhEG3Ue3QXlMO3JIGqIdFH/Ya8ygTNoOiJR gBxA== X-Gm-Message-State: AOJu0Yyn/ZCnGWynosaSjsKSDylZsRoXXG48HcSOH+I1xtNeaOf50MA6 zY5XPKiAua1REp3WvqZdlhpCXjU/FwiypEFKDVFo1ZoFp154OJODE3vcPA== X-Gm-Gg: ASbGncsUE32/rX+Gybr6W0DzAekvYuqAUw7Y7fPBZDP95FOV32+ZoDLbDLUwe6A4s5I mGotMco+1VtcWEUIY/4YdeF8Isn8Ac2YIdwpIACTT3oZJ6UKqPHw9rCDAe1VlPaTSg1G+Zhyc2Y SEFyrX5xEcnavUfjAVLRTqAJGfoORkS6yXUGbxhlzHWfQsVqOiQxNg9ELX52kSWnwXzoHJk5+Hn OrDxnVt874rRnCe0KzoyETrrkaqCUE2smE8uMs+k1Gnieu2NJf82RBRTGPGqkuRn0y3HIDFPhZk OJBsSvjU8d1MoUNDEYVzZZnRta5YYTjpSehgCrMUqoVh8mhg/Nnw2eA= X-Google-Smtp-Source: AGHT+IFxkiwo25qcGdrROSiMXnpOBSIWT50CMiA1BipbkqlK50z7uxAqN2e2BFuoM+DhdqMG/RWfEA== X-Received: by 2002:a17:902:d48f:b0:220:c86d:d7eb with SMTP id d9443c01a7336-22780e15340mr218102215ad.36.1742825768252; Mon, 24 Mar 2025 07:16:08 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:07 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 10/13] station: roam blacklist AP even mid-roam Date: Mon, 24 Mar 2025 07:15:35 -0700 Message-Id: <20250324141538.144578-11-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If an AP directed roam frame comes in while IWD is roaming its still valuable to parse that frame and blacklist the BSS that sent it. This can happen most frequently during a roam scan while connected to an overloaded BSS that is requesting IWD roams elsewhere. --- src/station.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/station.c b/src/station.c index b96419be..066ca337 100644 --- a/src/station.c +++ b/src/station.c @@ -3162,12 +3162,10 @@ static void station_ap_directed_roam(struct station *station, uint8_t req_mode; uint16_t dtimer; uint8_t valid_interval; + bool can_roam = !station_cannot_roam(station); l_debug("ifindex: %u", netdev_get_ifindex(station->netdev)); - if (station_cannot_roam(station)) - return; - if (station->state != STATION_STATE_CONNECTED) { l_debug("roam: unexpected AP directed roam -- ignore"); return; @@ -3231,8 +3229,13 @@ static void station_ap_directed_roam(struct station *station, * disassociating us. If either of these bits are set, set the * ap_directed_roaming flag. Otherwise still try roaming but don't * treat it any different than a normal roam. + * + * The only exception here is if we are in the middle of roaming + * (can_roam == false) since we cannot reliably know if the roam scan + * included frequencies from potential candidates in this request, + * forcing a roam in this case might result in unintended behavior. */ - if (req_mode & (WNM_REQUEST_MODE_DISASSOCIATION_IMMINENT | + if (can_roam && req_mode & (WNM_REQUEST_MODE_DISASSOCIATION_IMMINENT | WNM_REQUEST_MODE_TERMINATION_IMMINENT | WNM_REQUEST_MODE_ESS_DISASSOCIATION_IMMINENT)) station->ap_directed_roaming = true; @@ -3259,15 +3262,24 @@ static void station_ap_directed_roam(struct station *station, pos += url_len; } + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_ROAM_REQUESTED); + station_debug_event(station, "ap-roam-blacklist-added"); + + /* + * Validating the frame and blacklisting should still be done even if + * we are mid-roam. Its important to track the BSS requesting the + * transition so when the current roam completes IWD will be less likely + * to roam back to the current BSS. + */ + if (!can_roam) + return; + station->preparing_roam = true; l_timeout_remove(station->roam_trigger_timeout); station->roam_trigger_timeout = NULL; - blacklist_add_bss(station->connected_bss->addr, - BLACKLIST_REASON_ROAM_REQUESTED); - station_debug_event(station, "ap-roam-blacklist-added"); - if (req_mode & WNM_REQUEST_MODE_PREFERRED_CANDIDATE_LIST) { l_debug("roam: AP sent a preferred candidate list"); station_neighbor_report_cb(station->netdev, 0, body + pos, From patchwork Mon Mar 24 14:15:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027444 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 289487081A for ; Mon, 24 Mar 2025 14:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825772; cv=none; b=Zz2WHHeiFwRNEW33z5Gc84mZ90OvTUBtPzUV8Kdussf5icxtbEb3UCrtXMc71Fi3S4QWYpyJscVVaMumi2PvWDlKu6ysu0AgKedzTdowpBCaCMmJKFntgnb4Y0wRe1kXbKB7ZrOnvob0tS3t+Ahy8gyhR5eIGM5GIptmt689Qec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825772; c=relaxed/simple; bh=+Wfw9ngcS2v+v31vvf7UegVQzfvQl0BxIocCRwLvkTg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cQh0QPnBVgC6bhBRt6vUSZ9U6+RPv5BZyL+rNEIVTHaAxU4GWxMD2Fu0OKBFmwpeblsh1RJmcMC71PeO6oOKMi2wk+2zcqWZ56bLb6SbzYKjGhHOguHKIE3zC+mblkXiJsuHRppl6whqvuE/yVuZs+1CjUdpZ0FvvNq+jx1cRBo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VPTiGCjN; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VPTiGCjN" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-227aaa82fafso27500785ad.2 for ; Mon, 24 Mar 2025 07:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825770; x=1743430570; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/Y7nR1JnCTgYT7L9t49nkf3rFLk9KMFOLvHvRabt+BE=; b=VPTiGCjNs7Q7Uu6Lhat5iSyP6ohPE85qPo64FTUVdbBYfHTjvlhN7K3HSNybmVPLzc HDppafGpGbxno20uVKkHtk/OYZJ1Z/KmqnWcMQsa0SEIBrGxaQ2XLrYUfIpXVA3gDwSK GTIIp4HWhX3hsyW9Wyy4Zu/PmJTfWS6DJCLfap3T4pnCOruLl5z3rvYqhWFtpIxevKcU IRbzAD4N8+6o17sKzvOgjY9SiFyybikDj9/HTZF4YMuGTT9rRILtd6gxBARuLcVLLtEm 8pWqH/vmSXDpgBWlRLOMMGXu3j9Ub0iActAuFOa1zHVHbiPe8CPsiP2PrOLAtBVndbUA Ee9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825770; x=1743430570; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Y7nR1JnCTgYT7L9t49nkf3rFLk9KMFOLvHvRabt+BE=; b=XSnKIB2KJjsQYVeH2e4M7PCiVmfOU6Pd1NxBtUrHvX9m7RZi878co3ISIp/OoJeLD2 c23lt1+U+hmfN3EXej4FSuKIYhERDxvvFTqQjlrBahvBaRgRORK5SB2+H5oBhq+IlJxj qIRbmsJJ0qbGKM0iLk/rQidKOPNs5enlnlTkJLPFdNNGWxkF12QdaehrQ09wudEOu4t3 b8NGxQ6esLq3MZ/zud6mL9/iZPABZ+21SFnkA1VFd/x1eqFHHAmBJXAtfg0uyZsHnL/N UHGVOWMeRZdgFE+66ejNRzTH6WxZRR7dA4wtBPnzeiLH3UNe6/RIqOKCoc9QKImVKuBk i2Og== X-Gm-Message-State: AOJu0YwkOLSunZwKzmyHF2dVirtDrMwOZ8sEd7k4kl/Wo7D/Chz3Lljt 9mC1KYsQgekkRlXfGGe5ql3hRxYIn/T6PUKYjnGvjJp3d4bJ601Gkpb8Gw== X-Gm-Gg: ASbGncsTRpuIOgUyEEM/giumFPL2/AWcwGHaKuUAqjl/x9fi+SqQr6b9Kfw6nLF+ASL m+lp4mEGAJPJbuUbiljSw/pOFpGKO0GHGdSvg3DCzpRItGdDsbuRCtnlWisv0O5jRv479ldHZfJ 6KnOAqyRSaTs2TryGE0bB4uKY+TS9+sGtI2Q8FuAU0kAolQRnydbgnEOBp70o3JdFEO80UR1Qgc yGvMry2MVNbJ+rXsOcWxzGSTEhysZ2XJAQQK3Lhcuuh9xkrrhBhdyaTY8qZ1zSNohCYBwwjPmKO QAwFKrxMyhvP+RS1yJHd3hUoqChIPQLVdnGx5NqekDv2S669nihJm48= X-Google-Smtp-Source: AGHT+IFxHLKxoKZiFlwCfOBOG6NwyO5yeYtJqVJt1U5mFcesRYEgB0blNMEQxrr3wuLAuYdUf51j3g== X-Received: by 2002:a05:6a21:7a42:b0:1f5:5903:edd3 with SMTP id adf61e73a8af0-1fe42f2cbacmr22159666637.11.1742825769931; Mon, 24 Mar 2025 07:16:09 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:09 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 11/13] station: adapt roam scan logic to look at the bss group Date: Mon, 24 Mar 2025 07:15:36 -0700 Message-Id: <20250324141538.144578-12-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In station_roam_scan_notify BSS candidates were being ignored if their rank was not better than the current AP. This check needed to be changed to first check the BSS group, then the rank (only if the groups were equal). This takes into account the current BSS roam blacklisting status rather than only rank. --- src/station.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/station.c b/src/station.c index 066ca337..092d0b4d 100644 --- a/src/station.c +++ b/src/station.c @@ -2801,6 +2801,7 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, struct handshake_state *hs = netdev_get_handshake(station->netdev); struct scan_bss *current_bss = station->connected_bss; struct scan_bss *bss; + enum scan_bss_group cur_bss_group = SCAN_BSS_GROUP_BLACKLISTED; double cur_bss_rank = 0.0; static const double RANK_FT_FACTOR = 1.3; uint16_t mdid; @@ -2831,6 +2832,9 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, bss = l_queue_find(bss_list, bss_match_bssid, current_bss->addr); if (bss && !station->ap_directed_roaming) { cur_bss_rank = bss->rank; + cur_bss_group = scan_bss_evaluate_group( + current_bss->addr, + current_bss->signal_strength); if (hs->mde && bss->mde_present && l_get_le16(bss->mde) == mdid) cur_bss_rank *= RANK_FT_FACTOR; @@ -2855,6 +2859,9 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, while ((bss = l_queue_pop_head(bss_list))) { double rank; struct roam_bss *rbss; + enum scan_bss_group group = scan_bss_evaluate_group( + bss->addr, + bss->signal_strength); station_print_scan_bss(bss); @@ -2876,8 +2883,7 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, if (network_can_connect_bss(network, bss) < 0) goto next; - if (blacklist_contains_bss(bss->addr, - BLACKLIST_REASON_CONNECT_FAILED)) + if (group == SCAN_BSS_GROUP_BLACKLISTED) goto next; rank = bss->rank; @@ -2885,7 +2891,15 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, if (hs->mde && bss->mde_present && l_get_le16(bss->mde) == mdid) rank *= RANK_FT_FACTOR; - if (rank <= cur_bss_rank) + /* + * First check the group: + * - If worse, disregard BSS candidate + * - If better, keep BSS candidate + * - If equal, compare based on rank + */ + if (group < cur_bss_group) + goto next; + else if (group == cur_bss_group && rank <= cur_bss_rank) goto next; /* From patchwork Mon Mar 24 14:15:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027445 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABF2425F998 for ; Mon, 24 Mar 2025 14:16:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825774; cv=none; b=KDByOPxrjHRiZ0QVFbOKXtnY7SwsILuGtSdxCYL1ohmHRauFHIvxsrmFWGAeYaTAEYwkFdS/StqFEM/HsTTomMA6xDe4b31PNfnNzWAXc1+XvdTl7dzRrAhyzCtpMR3UX53G7xq8JRnybkP2p8oTh/PwD/j8rUdhKITKFAVMY5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825774; c=relaxed/simple; bh=D0AZH3j5Nv94fAejR5O2flars8MjA2oi5jHx9Z3OkC4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=k2IA6JwndJZiwWoZHb7xjjUlpEyxfPZmk+9YTFDHBiDVKY7CzF0KzZNofarxJaMuxTobkSImk4/CEUirEMK2SarYCZokFmNSgxmn5NS2hIG6MHodZq9xyY8rfeO9cvcBvDsELjvCpgXyEJa9rm3eNVbYdh6Kom2ZHT8PAm+WWfo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FbcAyvWi; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FbcAyvWi" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22438c356c8so85447995ad.1 for ; Mon, 24 Mar 2025 07:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825772; x=1743430572; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZO7ki/18WDaVCfuhFD2MZcowj6rEYFLXzQ9C8haXsic=; b=FbcAyvWil65UmXUDyy76qbr2bEvz1pl0Ckbtu/FJTe5mxc2RluA1vMDAroKaO/rMhT UBxxU7Lti57XokDiYABm6hA4Phq8XWfvz9x8kdlow2Y/ZEyVj/RWFArqjPIXvyjgYqRa FhXRDwSMuICoXEFlZ7KtArgC+qr2AoP2GNCbZRxwiHGU7dRw7stNQ4FbJor3k+NK9u4X wsCQfTwQZucDVsAdsplDmKZbemSNO7FdJxhVB2Ne8WumWkMdM2d1GeURfzk6VvG0NB+L drAPvPR4TvJSC0BSbOPiNQhSC8hZ1dQCN3RX1WSg5MmUAw9PjG46us23iSnTbYldNBPV QM3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825772; x=1743430572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZO7ki/18WDaVCfuhFD2MZcowj6rEYFLXzQ9C8haXsic=; b=bMiw2KKUziF7suClSbzxDykOsZtXG+v2avLFKMZIWun7Y5GiKJem5Reu1E6+wPG+pc Uq2N/M3lFz9jhb2D4Z3Im5YkU9wRv/edcpfn9n5tcN0ZkdffLJUxek+tfiNFNIdObs4o Z8GqhGx6LtaBXGuBKbmoIrZZ6vOj56DpfPlRiu3DJWjlcGnO1Bxk/DwMseqsVVcWqXof OHeeMH2NYXWuX2fVDiEsUGE94XNaYNPWaztjidoC1dnKQHt8X9cFYEV0i96+Z43VPLtU jHS872+fE2Ee6mk6CC26jtd72wi9KwpVSESQSkecyTLt109klueID1nHs+EkwDaUZfD/ WklA== X-Gm-Message-State: AOJu0YyMuhBrz+G1VLVTyhhWQgl+nPB6sbxmm1GhRO4Y3UiE8XnfF8+Q kEiYxnSb5WNaZ3gX8UUm8Mpwm7Vvk6h/nKYidAjiIuLn4dg6NH0e+OJeDA== X-Gm-Gg: ASbGncspsf55/iemzwygE6SmrCL+WnmJ3KON6WswDu2B3cEo55Het+sUyg1uY+YZKao p5i64lDeIEquJ3q8lE0JxuLmFS2oRzNEowV9ClIiG1+iVwoc6ZUYQ5PuLJUr5ktdRqyeiU+iNTt /uWGqO6vLJ2d9Lyxog1VU7AJd/i/gcW5Ywk6j2CJwfQghrl/Zvl2E4lHUk0mDtCg/XJBMELdfT+ 7cMVi+Em8Xok+ynnHJejQmcwYFCftXactFzhJpgrVPgk19a8zvsAi0C+N+va/VEELTx+Yj09Fqt SUvxX2ZQXHK71925l8bGbnetC4JWwJPJojF1PwneHOeVG6pGda7XAZM= X-Google-Smtp-Source: AGHT+IG6IOydOiPIY0QfX3B8uBRowaDMzD1NPokxJtnfh0e/fQWD2IVOhU/cvtB8oi21Mp+5Ztncpg== X-Received: by 2002:a17:902:cf04:b0:224:5b4:b3b9 with SMTP id d9443c01a7336-22780e12a7dmr199514085ad.33.1742825771544; Mon, 24 Mar 2025 07:16:11 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:11 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 12/13] auto-t: add tests for AP roam blacklisting Date: Mon, 24 Mar 2025 07:15:37 -0700 Message-Id: <20250324141538.144578-13-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- autotests/testAPRoam/connection_test.py | 2 +- autotests/testAPRoam/hw.conf | 2 + autotests/testAPRoam/main.conf.roaming | 6 + autotests/testAPRoam/roam_blacklist_test.py | 183 ++++++++++++++++++++ 4 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 autotests/testAPRoam/main.conf.roaming create mode 100644 autotests/testAPRoam/roam_blacklist_test.py diff --git a/autotests/testAPRoam/connection_test.py b/autotests/testAPRoam/connection_test.py index a419f4aa..9d17ca87 100644 --- a/autotests/testAPRoam/connection_test.py +++ b/autotests/testAPRoam/connection_test.py @@ -13,7 +13,7 @@ from hostapd import HostapdCLI class Test(unittest.TestCase): def validate(self, expect_roam=True): - wd = IWD() + wd = IWD(True) devices = wd.list_devices(1) device = devices[0] diff --git a/autotests/testAPRoam/hw.conf b/autotests/testAPRoam/hw.conf index 00a31063..46b1d4a8 100644 --- a/autotests/testAPRoam/hw.conf +++ b/autotests/testAPRoam/hw.conf @@ -1,5 +1,7 @@ [SETUP] num_radios=4 +hwsim_medium=true +start_iwd=false [HOSTAPD] rad0=ssid1.conf diff --git a/autotests/testAPRoam/main.conf.roaming b/autotests/testAPRoam/main.conf.roaming new file mode 100644 index 00000000..4bf07c29 --- /dev/null +++ b/autotests/testAPRoam/main.conf.roaming @@ -0,0 +1,6 @@ +[General] +RoamThreshold=-66 +OptimalSignalThreshold=-72 + +[Blacklist] +InitialRoamRequestedTimeout=20 diff --git a/autotests/testAPRoam/roam_blacklist_test.py b/autotests/testAPRoam/roam_blacklist_test.py new file mode 100644 index 00000000..b9108d4e --- /dev/null +++ b/autotests/testAPRoam/roam_blacklist_test.py @@ -0,0 +1,183 @@ +#!/usr/bin/python3 + +import unittest +import sys + +sys.path.append('../util') +import iwd +from iwd import IWD, IWD_CONFIG_DIR +from iwd import NetworkType + +from hostapd import HostapdCLI +from hwsim import Hwsim + +class Test(unittest.TestCase): + def validate_connected(self, hostapd): + ordered_network = self.device.get_ordered_network('TestAPRoam') + + self.assertEqual(ordered_network.type, NetworkType.psk) + + condition = 'not obj.connected' + self.wd.wait_for_object_condition(ordered_network.network_object, condition) + + self.device.connect_bssid(hostapd.bssid) + + condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_condition(self.device, condition) + + hostapd.wait_for_event('AP-STA-CONNECTED') + + def validate_ap_roamed(self, from_hostapd, to_hostapd): + from_hostapd.send_bss_transition( + self.device.address, self.neighbor_list, disassoc_imminent=True + ) + + from_condition = 'obj.state == DeviceState.roaming' + to_condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_change(self.device, from_condition, to_condition) + + to_hostapd.wait_for_event('AP-STA-CONNECTED %s' % self.device.address) + + self.device.wait_for_event("ap-roam-blacklist-added") + + def test_roam_to_optimal_candidates(self): + # In this test IWD will naturally transition down the list after each + # BSS gets roam blacklisted. All BSS's are above the RSSI thresholds. + self.rule_ssid1.signal = -5000 + self.rule_ssid2.signal = -6500 + self.rule_ssid3.signal = -6900 + + # Connect to BSS0 + self.validate_connected(self.bss_hostapd[0]) + + # AP directed roam to BSS1 + self.validate_ap_roamed(self.bss_hostapd[0], self.bss_hostapd[1]) + + # AP directed roam to BSS2 + self.validate_ap_roamed(self.bss_hostapd[1], self.bss_hostapd[2]) + + def test_avoiding_under_threshold_bss(self): + # In this test IWD will blacklist BSS0, then roam the BSS1. BSS1 will + # then tell IWD to roam, but it should go back to BSS0 since the only + # non-blacklisted BSS is under the roam threshold. + self.rule_ssid1.signal = -5000 + self.rule_ssid2.signal = -6500 + self.rule_ssid3.signal = -7300 + + # Connect to BSS0 + self.validate_connected(self.bss_hostapd[0]) + + # AP directed roam to BSS1 + self.validate_ap_roamed(self.bss_hostapd[0], self.bss_hostapd[1]) + + # AP directed roam, but IWD should choose BSS0 since BSS2 is -73dB + self.validate_ap_roamed(self.bss_hostapd[1], self.bss_hostapd[0]) + + def test_connect_to_roam_blacklisted_bss(self): + # In this test a BSS will be roam blacklisted, but all other options are + # below the RSSI threshold so IWD should roam back to the blacklisted + # BSS. + self.rule_ssid1.signal = -5000 + self.rule_ssid2.signal = -8000 + self.rule_ssid3.signal = -8500 + + # Connect to BSS0 + self.validate_connected(self.bss_hostapd[0]) + + # AP directed roam, should connect to BSS1 as its the next best + self.validate_ap_roamed(self.bss_hostapd[0], self.bss_hostapd[1]) + + # Connected to BSS1, but the signal is bad, so IWD should try to roam + # again. BSS0 is still blacklisted, but its the only reasonable option + # since both BSS1 and BSS2 are below the set RSSI threshold (-72dB) + + from_condition = 'obj.state == DeviceState.roaming' + to_condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_change(self.device, from_condition, to_condition) + + # IWD should have connected to BSS0, even though its roam blacklisted + self.bss_hostapd[0].wait_for_event('AP-STA-CONNECTED %s' % self.device.address) + + def test_blacklist_during_roam_scan(self): + # Tests that an AP roam request mid-roam results in the AP still being + # blacklisted even though the request itself doesn't directly trigger + # a roam. + self.rule_ssid1.signal = -6700 + self.rule_ssid2.signal = -7100 + self.rule_ssid3.signal = -8500 + + # Connect to BSS0 under the roam threshold so IWD will immediately try + # roaming elsewhere + self.validate_connected(self.bss_hostapd[0]) + + self.device.wait_for_event("roam-scan-triggered") + + self.bss_hostapd[0].send_bss_transition( + self.device.address, self.neighbor_list, disassoc_imminent=True + ) + self.device.wait_for_event("ap-roam-blacklist-added") + + # BSS0 should have gotten blacklisted even though IWD was mid-roam, + # causing IWD to choose BSS1 when it gets is results. + + from_condition = 'obj.state == DeviceState.roaming' + to_condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_change(self.device, from_condition, to_condition) + + self.bss_hostapd[1].wait_for_event('AP-STA-CONNECTED %s' % self.device.address) + + def setUp(self): + self.wd = IWD(True) + + devices = self.wd.list_devices(1) + self.device = devices[0] + + + def tearDown(self): + self.wd = None + self.device = None + + + @classmethod + def setUpClass(cls): + IWD.copy_to_storage("main.conf.roaming", IWD_CONFIG_DIR, "main.conf") + IWD.copy_to_storage('TestAPRoam.psk') + hwsim = Hwsim() + + cls.bss_hostapd = [ HostapdCLI(config='ssid1.conf'), + HostapdCLI(config='ssid2.conf'), + HostapdCLI(config='ssid3.conf') ] + HostapdCLI.group_neighbors(*cls.bss_hostapd) + + rad0 = hwsim.get_radio('rad0') + rad1 = hwsim.get_radio('rad1') + rad2 = hwsim.get_radio('rad2') + + cls.neighbor_list = [ + (cls.bss_hostapd[0].bssid, "8f0000005101060603000000"), + (cls.bss_hostapd[1].bssid, "8f0000005102060603000000"), + (cls.bss_hostapd[2].bssid, "8f0000005103060603000000"), + ] + + + cls.rule_ssid1 = hwsim.rules.create() + cls.rule_ssid1.source = rad0.addresses[0] + cls.rule_ssid1.bidirectional = True + cls.rule_ssid1.enabled = True + + cls.rule_ssid2 = hwsim.rules.create() + cls.rule_ssid2.source = rad1.addresses[0] + cls.rule_ssid2.bidirectional = True + cls.rule_ssid2.enabled = True + + cls.rule_ssid3 = hwsim.rules.create() + cls.rule_ssid3.source = rad2.addresses[0] + cls.rule_ssid3.bidirectional = True + cls.rule_ssid3.enabled = True + + @classmethod + def tearDownClass(cls): + IWD.clear_storage() + +if __name__ == '__main__': + unittest.main(exit=True) From patchwork Mon Mar 24 14:15:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14027446 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5A2F25F985 for ; Mon, 24 Mar 2025 14:16:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825776; cv=none; b=uW4gv8WcrRBfBI1cUdRJfEoZLasDKhr0lwa4Gj4IfvTweH5tXDTbBFPzk6IAqMcyrlmUWpogPzmFDywbdFZQNL8OKKmVTOo6iMYpuqwx/CTQV9nAcNMra+XZ+wm9THfcY4phzGpxnK8aQLNYX7o6hg4AQtJnsFjq+pj5HscQi/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742825776; c=relaxed/simple; bh=EhYkCUOrDHsUDZfAzzIVfxMAiDfgeiDvtMqnzKMt93M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SEqYf7Km2DdEVG0ep3pgbBXE2jD3sa2/+OHGWD0iGzq7bNHq95H/a5z7su7rHHfHtz1lBNqSVF+w+8Td7qQi1sMTomGpfiewjDgs51nJMRvzXxCWowdVD61b14vo1nYSELxKYTxS5FNX1RnnVcurf8Pbec0OynlB7QQ6/3bi/Ho= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XrVL4bkR; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XrVL4bkR" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-223fd89d036so83519275ad.1 for ; Mon, 24 Mar 2025 07:16:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742825773; x=1743430573; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hANVGTDNuNJBwaz1M0ixjk+A8BduGqE4G2Kerywpx9Q=; b=XrVL4bkRYMiEHiIpKZgho8/2Fm2VAa4ntxR/MijOEeDaYXCHc3HkSanGjXCimFSfAQ I+mKcua7E/sRwuQZmUONhFpnTX+YN3R0+gvL7KQde76RPRVlwMGhuhaYRzzWs1w8UN1G 9mLpa3O8gopNE7mzgsAAIUxZfQt9M850G3wDi/TYn78yKnmtf4snI4/Uiw8ei+1b77NU 5OsI5B7SghRUE2zCagG/pr7CTEB6Cr0EQDJfNbqLa8264cCa5hiPRWOlOEP+HgMh+8wn O8+N56KdB3cjJ2wnL/KJXLVEwYfphtm2vd3V4WE9tYummKJvbCGodCJMBkEsbT1X4lRz zUSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742825773; x=1743430573; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hANVGTDNuNJBwaz1M0ixjk+A8BduGqE4G2Kerywpx9Q=; b=dRrKV0daIGEkWZWfdtc7p6P5ovpNwdLJw79Jhpq7MYbCiPBAItMrv5Wqpkdjf+NZIq tFILbSTc2ED5drkTpKIy6TDe8Cav4Ne9PoOj/qFRDJFBTqatMtCsMreiAnThjrHisUY5 zT5dSJzKXZpyGutwothPCIaF7G+AaZRbULcNSPwCA/ydivlSkh6lXdPJOo9Emsc0TIop 2DY/wAUVUqOvSI58BVlGk7YkOG2X6rUHbtBqkPNtHojG715DnwAEr08XLAeIEKGpfug3 fzrZw5W8dUgvzFXRNdFNqyPRqQehHkROFs+AwxypdpRybEAS9JZ+YierDfebwDO7vvHs gjGw== X-Gm-Message-State: AOJu0YyDnXSMyYNlkd+GfcRTOHCUM+1qs0GLVGw0myJSTK3oqsbX1zrT CZFKzmV3shX5/IXWroh6qHXbILASBLBiVcwNuFXog4jPRXW0lKPxcvf+5w== X-Gm-Gg: ASbGncuNN2GVXkexIZBiuTfLh5uwwSG1HjNOdUVd7NBCeSWL+a+jW2Zt7fnN9re+zVY t8PIZWWNrtXgUd2Y07XYId7HDbrvDlPbV5EXJnW5vscdsj3Za12uqN0JxTrV8+4SsHBM256RZzf 1VfUIT1u2HN/XXiK3WJVrpQPXURCVGHPLqrQZI8MViOCsU2Ha3aCDiDxcYY6R4m9vZLxunUZ6Y2 XXEmOQXz+UAi76ofPyyVhLHTSnRiq4HvofIK46ZMSqsyEhmFgAVGczaSeWUoqB/+NIYDeJ6SdOD kiDK6pj8A9MrFbcLOV7pBbjxAApXcXTi9az0u/dQT+sX6oOnL+/+Bg0= X-Google-Smtp-Source: AGHT+IGMXel2mMy/3oFheUl7bZOeIm7s1/eejclFeCatKyQ2MCGxRFCP6nqpkB3q3B8ZYgTKh2dx6g== X-Received: by 2002:a05:6a00:1301:b0:736:51ab:7aed with SMTP id d2e1a72fcca58-739059ffa18mr20758434b3a.16.1742825773207; Mon, 24 Mar 2025 07:16:13 -0700 (PDT) Received: from LOCLAP699.localdomain ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fd54efsm8007868b3a.37.2025.03.24.07.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 07:16:12 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v2 13/13] doc: document OptimalSignalThreshold and InitialRoamRequestedTimeout Date: Mon, 24 Mar 2025 07:15:38 -0700 Message-Id: <20250324141538.144578-14-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250324141538.144578-1-prestwoj@gmail.com> References: <20250324141538.144578-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- src/iwd.config.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/iwd.config.rst b/src/iwd.config.rst index 895a1012..a2fea8b4 100644 --- a/src/iwd.config.rst +++ b/src/iwd.config.rst @@ -149,6 +149,21 @@ The group ``[General]`` contains general settings. This has the same effect as ``CriticalRoamThreshold``, but for the 5GHz band. + * - OptimalSignalThreshold + - Value: rssi dBm value, from -100 to -1, default: **0** (disabled) + + When set to a non-zero value, this enables BSS grouping which is a + sorts BSS's first based on this optimal signal threshold, then by rank. + In addition the BSS's blacklisting status is also taken into account. + IWD will order its connection preference first based on the following + groupings, then followed by rank: + + 1. "Optimal" is the most preferred group. The BSS is both above the + **OptimalSignalThreshold** and not roam blacklisted + 2. "Above Threshold" means the BSS is roam blacklisted, but still above + the **OptimalSignalThreshold** + 3. "Below Threshold" means the BSS is below **OptimalSignalThreshold** + * - RoamRetryInterval - Value: unsigned int value in seconds (default: **60**) @@ -292,6 +307,12 @@ control how long a misbehaved BSS spends on the blacklist. The initial time that a BSS spends on the blacklist. Setting this to zero will disable blacklisting functionality in IWD. + * - InitialRoamRequestedTimeout + - Values: uint64 value in seconds (default: **30**) + + The initial time that a BSS will be marked after a BSS requests a roam. + This is to aid in avoiding roaming back to BSS's which are likely + overloaded. Setting this to zero will disabled this form of blacklisting. * - Multiplier - Values: unsigned int value greater than zero, in seconds (default: **30**)