From nobody Tue Feb 7 20:21:24 2023 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 4PBDzm4ByMz3ng06; Tue, 7 Feb 2023 20:21:24 +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 4PBDzm1pfQz3FfF; Tue, 7 Feb 2023 20:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675801284; 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=8Sq6EPRMBWmO+Z5hAnZt9DjL/YqfLj0vuwV0SQWOE04=; b=c1ISW+52pRcegh44wU+PUuNEHF8RcTd1M/xixCLLJ8Czedsd8DH/d7LW+I2SuKWDLneSeX de3VBV2OfCUdWzRwujPFP8hUqJAwPGqQKBk2xIbNhPjGFS7vMOnPhbix6WEDj6bfpDCAKG GeJ1Uk63QGIVNBMANcY2sLqNRI3j1f+2U6ndt5Ouuy9R4dV6hCSy3+j0jrMQ594JESRDio 6vaSEO65+P8kL1dIv/biXKYKUG+gzCVPYii+52xZVZ0E7AwcSrVaNM5hmNu5ke7EKOd3eq J5yzfkQo9Q/dfs906QBCHM1l82c9XkEw3VRZ3XH0ul46X+PEcx8QFKDih8ntUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675801284; 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=8Sq6EPRMBWmO+Z5hAnZt9DjL/YqfLj0vuwV0SQWOE04=; b=Gp40sB4RnSaXFKyB8bCsDQO2W4gbWe1eD8c5r3q5DHrY+BADTp1CY//5x7GQ0QKg1V5w4g jI/A06uqLKmw8NF0AXzELMhb+DSN9j0yylpZpoYHqbxS9hm2PKIDClmdMcgjmxU9HVjRvo Gctr1LMmOm8uKW2SNOyaB18pNQLSYnV60W5Boa6OZ+synxLPi6tj3tEHWMjESbLVvuEZze G/bulILyG7/kgS4Smou7fjuSx8xDZfLzCuipU/+mZI604g4TNrK/9CACBfcJmktKVXQ6Zd ME4j1LPaLIuK35WYoGFKJvi2IWr/dpv2P/4chqJBruIOxR/rY9kudEX27eCG3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675801284; a=rsa-sha256; cv=none; b=p1AX1AMgJ2ATKYfYmaKnUmpT5xIijbVs7XUeX81TbS4NMR6mLeQpHc15t1vijXYzLLU8se 3sUxl94nfL4wAy35pHObK1XwWaK6BEywo4yroG+Z6xRrehS6AMaqLZdE4Y3dPoYEIB3cfU fIgskNYIUOy9uGX0UrRQyKX7mcW4gQTxAvip725AZLvscdt1hD994ci7ro3WKLyVARzoo5 eIADTmQFWAQRN7Zawsxx4TbBkqN1KtZRoA3yppuAIG1aOfJoI3UPKhfNGCoybh4LeR5cm4 529aMw5XM6B5rbfvN9iFk05TcV8xnaCfH+tRCVkOPVAyS4dA/A9dtQEtHOTjqw== 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 4PBDzm0wmGzVdS; Tue, 7 Feb 2023 20:21:24 +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 317KLO84047194; Tue, 7 Feb 2023 20:21:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 317KLOLs047193; Tue, 7 Feb 2023 20:21:24 GMT (envelope-from git) Date: Tue, 7 Feb 2023 20:21:24 GMT Message-Id: <202302072021.317KLOLs047193@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: 0cbcfa1964de - main - LinuxKPI: 802.11: deal with stopped queues 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: 0cbcfa1964de89cd346ee6f79437c6ab83a3b716 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0cbcfa1964de89cd346ee6f79437c6ab83a3b716 commit 0cbcfa1964de89cd346ee6f79437c6ab83a3b716 Author: Bjoern A. Zeeb AuthorDate: 2023-02-07 20:18:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-02-07 20:20:33 +0000 LinuxKPI: 802.11: deal with stopped queues Following 5a9a0d7803382321b5f9fff1deae5fb08463cf1a initialize the queue values explicitly and deal with a stopped queue in ieee80211_tx_dequeue(). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index dc158699f4cf..fdfa384c1a25 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -244,9 +244,11 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], ltxq->txq.ac = tid_to_mac80211_ac[tid & 7]; } ltxq->seen_dequeue = false; + ltxq->stopped = false; ltxq->txq.vif = vif; ltxq->txq.tid = tid; ltxq->txq.sta = sta; + TAILQ_ELEM_INIT(ltxq, txq_entry); skb_queue_head_init(<xq->skbq); sta->txq[tid] = <xq->txq; } @@ -2276,6 +2278,9 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], vif->hw_queue[i] = i; else vif->hw_queue[i] = 0; + + /* Initialize the queue to running. Stopped? */ + lvif->hw_queue_stopped[i] = false; } vif->cab_queue = IEEE80211_INVAL_HW_QUEUE; @@ -4268,13 +4273,25 @@ linuxkpi_ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) { struct lkpi_txq *ltxq; + struct lkpi_vif *lvif; struct sk_buff *skb; + skb = NULL; ltxq = TXQ_TO_LTXQ(txq); ltxq->seen_dequeue = true; + if (ltxq->stopped) + goto stopped; + + lvif = VIF_TO_LVIF(ltxq->txq.vif); + if (lvif->hw_queue_stopped[ltxq->txq.ac]) { + ltxq->stopped = true; + goto stopped; + } + skb = skb_dequeue(<xq->skbq); +stopped: return (skb); }