From nobody Fri Dec 31 11:59:31 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C745D192A6B9; Fri, 31 Dec 2021 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JQNwg30tJz3vYM; Fri, 31 Dec 2021 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 488B731F7; Fri, 31 Dec 2021 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BVBxV7s040392; Fri, 31 Dec 2021 11:59:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BVBxVEw040391; Fri, 31 Dec 2021 11:59:31 GMT (envelope-from git) Date: Fri, 31 Dec 2021 11:59:31 GMT Message-Id: <202112311159.1BVBxVEw040391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 500be2e80337 - main - LinuxKPI: 802.11 fix queue wait List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 500be2e803377e6fe3aa1600e6d55326bbbb4ae4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640951971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fbb/mbr8aYLQscHpzDgu9KVFZM1i0OyPlA6baM6oIY=; b=emXvpQyTalKOHjGTCGcVYRBhkpBJxs/FoXZkFkG0wy2jT8zI6TJOxrEkwZtKW/Q4Qb13Zj L9FgdRTlEQeJiKSX+V0eCYKZAmQYxacBQOfK44iQbQrdMlwpn5Wa9x3yEq+AdR0ZivLzPo fEp8EfXXkfz+vQXsz2FyEr482F8Vm8HHs57iCtv9eqzgEIvKn6jJiTB4YIpClispAxiYcq PQLn/Pa6g1RBo27Ltf/qtl1Rwsa6QiyLFJnJx4T0IcrjH02sEhduU1wtYvL3fpQQBdfa1l 3i/YLk+Ilyy31+6dfaLYqDKKFgLD7iBFJ0FeWzdq7MYYQJF9YVoqN3casAGnew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640951971; a=rsa-sha256; cv=none; b=o96ng9eSZdpJ4+y3TzR+8BgieQw/d61a4r6XLyV2pBzibZ0yqrUtLPnMduQD3MencFx5Cn SuhYkw49v3D3YBoKKSC4S173Dahfpse3bKOg6/lzq1HpYQdFofMecrU6SCjfu+wyqkIISm fgisx0a69rJPtLIDkxaw08V9bTUKttHes7RqO3zOa7zjmNaxkbUZlIlnepAnyACKRrDabp +PKVwSLG0VeXpPG47GnI+2Kl7UIsCLUDjCIs07uQYjiMlin5gB7Ewjara5GeS2h3fKWhCO OcP1ckXdI+VQ5n5ybjbUKJUdESaytYGyMcO4QfAZ0U5BdgllXDkfD24jnTZqyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=500be2e803377e6fe3aa1600e6d55326bbbb4ae4 commit 500be2e803377e6fe3aa1600e6d55326bbbb4ae4 Author: Bjoern A. Zeeb AuthorDate: 2021-12-31 11:47:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-12-31 11:47:14 +0000 LinuxKPI: 802.11 fix queue wait We are using a bandaid to wait for queues after station creation looping and pausing. The abort condition was looping in the wrong direction so we were potentially waiting forever if queues never became ready. From initial user test data we also found that the wait time was too low in some cases so increase the length. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f38997225185..5df10458f3de 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -786,7 +786,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int { int i, count; - for (i = 3; i > 0; i++) { + for (i = 3 * (hw->queues + 1); i > 0; i--) { struct lkpi_txq *ltxq; int tid; @@ -815,7 +815,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int ic_printf(vap->iv_ic, "%s: waiting for %d quuees " "to be allocated by driver\n", __func__, count); #endif - DELAY(100); + pause("lkpi80211txq", hz/10); } #ifdef LINUXKPI_DEBUG_80211 if (count > 0)