From nobody Sun Jan 09 02:39:55 2022 X-Original-To: dev-commits-src-branches@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 DB65D19331B2; Sun, 9 Jan 2022 02:39:55 +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 4JWh4q417hz3qqZ; Sun, 9 Jan 2022 02:39:55 +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 6A9D52134; Sun, 9 Jan 2022 02:39:55 +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 2092dtNm095311; Sun, 9 Jan 2022 02:39:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2092dtZC095310; Sun, 9 Jan 2022 02:39:55 GMT (envelope-from git) Date: Sun, 9 Jan 2022 02:39:55 GMT Message-Id: <202201090239.2092dtZC095310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 50a078f852ab - stable/13 - LinuxKPI: 802.11 fix queue wait List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 50a078f852abd5fd0b8222c609603791dfbc79ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641695995; 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=6/Cb2bnZPgPu+BhO1uxFB5ESJa+W40CXxt2j/2tTV8o=; b=dPK3+PeFcg94js/olY70KrpJy4HkX+3juT8+YXcclapnglYpdR53Ogsid+l+W3tFhK3eaf kcIyhZ9onU2i8qZybmIBpnu+WbPwiS6eIpMnrB+3HbRH+Y2tAHD+wCL76SWVB16F/He944 IQBs9bi81268THanIIsq/GQ81DBNmWI+iCA2rWtBOuHa52A3wjs5frEr9dfd60KdhPlSno ZqPTESjyJn3RGeQN4FfgAUuUq2hTytrze0CrRZ9T2sw6RFE29VIn5+OA9xFQpqPxWVZwqW 33f5qq7X/H6dh3cPutkLxVeFtVqNh1h+k7Shs7ZqaLBJctRCB5IDybdCRLQi0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641695995; a=rsa-sha256; cv=none; b=sTnFxTZjrCy5K2THBNo4nzIeR7faAKhhvwMvo/nqFQM4oZEQLiFpCWmyY1xbi96wfmfTW6 kyiovAdMiaK7QFphnOVIWbgJBVNa5XXy3Qc8y4HroknQZ34UAWjlAAZi4bvs1rpbhi+qMe t/vqUCzT8pG112sdONrGJ3l/wiBHeyBLvlYlhGwSi8k/EYDHMBXHbFVn26APtr1Qr0c4qt jUC8Mc8GVLWjiZsYdjSx9FOVDz3AgShRBYzGxWanvNsKCLWtJInEmFDNFPcJKGSSNRqzsV 2aqP+9lv3oyRTiasAL3aadmQGFjG4GhYe85DZaQNjvGXZbN1JjNz5GimxsDOZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=50a078f852abd5fd0b8222c609603791dfbc79ee commit 50a078f852abd5fd0b8222c609603791dfbc79ee Author: Bjoern A. Zeeb AuthorDate: 2021-12-31 11:47:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-01-09 02:37:01 +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 (cherry picked from commit 500be2e803377e6fe3aa1600e6d55326bbbb4ae4) --- 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)