From nobody Thu Feb 17 00:03:51 2022 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 C6E8D19C55DC; Thu, 17 Feb 2022 00:03:51 +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 4JzZml3Yshz4XVF; Thu, 17 Feb 2022 00:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645056231; 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=jGJuiU4vNjzvsBayzcltqedrqwsf0E3vjVUB7L/NgC8=; b=klz0NX0lrylYx2PRJDU+bRMkR8Sja3IcpuhSsSerVyfMBx1J36rsobIaqnckN8zYYrom9B TwHV00BCuWktgv934BfGzNWAZebBkGyIyAja0q4l5/jcKHVkktxfpRYe1qrOZUTUOPT2BQ TrnbbGm3oPqCfjRuYpCPgORRe/G//O0eBEFYgngVctmZ4f6TkGdNWCIkTN7ALtnjHBqO8p B85EjkRGXDknC5+5REXMGB4hTQ36ncFnmbPli0uFRI2IgVt3wx8rupkgIGys8+L8BqUgE8 QGVIOmRd1HR7quJSqwtXH9WIgdLPA2rmu+9+Yc2SV4UqzlbKAKxNmgDw193AGA== 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 5B20D1F4E3; Thu, 17 Feb 2022 00:03:51 +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 21H03p6c047888; Thu, 17 Feb 2022 00:03:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21H03puX047887; Thu, 17 Feb 2022 00:03:51 GMT (envelope-from git) Date: Thu, 17 Feb 2022 00:03:51 GMT Message-Id: <202202170003.21H03puX047887@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: 3d09d310d998 - main - LinuxKPI: 802.11: disable ic_headroom for the moment 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: 3d09d310d9981dde1d6e51fed6ecf9576480b9f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645056231; 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=jGJuiU4vNjzvsBayzcltqedrqwsf0E3vjVUB7L/NgC8=; b=VAQrSbAsqZimyvRyTDu/LH4Vmx1lth56O90e8YrZJekBqyg1YS0pGTbdFtH7ozyohvMQyf EJpwsK/D8QiUY4QzAO8Ei3mO0cbv1pmYbm9iGgN+lUKjxK5I6VZLPgv063xq44S+sMg/G2 y/kxXnxWTxHpzNVQYyRTLsUb4njg19OvEbOTatui9nMa+cpzOgwngx9ZMGtLZoDZDKS3yS HSP/HuDhvd+YqVcSC0mPpvFtGzJ0U+5K0haIRwqb0xHvUqkWiL4ipor1q1qR0Frk0kI2v5 sxdwnH8G9VdLcimhMXSNnya488n0yY86hgasJ+YLn8H3Z8l2UHjGUFRgblt4PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645056231; a=rsa-sha256; cv=none; b=QU6URfUQ2TQAXTXwsD6R63rNriNAI6DIUoADRF7wo6WW7u6OZnBoQLvARoC2abfmwA2yEA AQ4AimknyRD5+StQfC3yXRJWJ0yw8nwV141YRcZvc4Vfh6n+hZqi8fGsvfXSzd3ft0oor5 ynxCiCAzG1nj4zjluYXiT9DwhX1CL9aQylhh1oqEymiySY01AZMVcWZyXwGJzlvfjR2hhf UzTZqGZdERPEOYX+A7O2YRalk8RBvRohgpyjwPgUjf6u7LBdoT2CGmmY+KRxqeTaBcl4vd A//vJyk1Yi/zLL9CYbHS2wsevEydNlcoPUosO+MTpFlQsqp0lRhASYn5+eaYnA== 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=3d09d310d9981dde1d6e51fed6ecf9576480b9f7 commit 3d09d310d9981dde1d6e51fed6ecf9576480b9f7 Author: Bjoern A. Zeeb AuthorDate: 2022-02-16 23:57:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-16 23:57:27 +0000 LinuxKPI: 802.11: disable ic_headroom for the moment There is a problem with some drivers, such as rtw88, asking for more headroom than we currently can handle throughout the stack (we have other legacy wireless driver in the tree with similar problems). This may trigger an assertion in the TCP syncache where we are checking for a reply to fit in MHLEN. While for the moment we still copy data from mbufs to skbs, we can simply disable the extra headroom request in ic_headroom and deal with it ourselves (which we already did anyway). Leave a link to the thread on freebsd-transport detailing more of the problem so we can find it again and solve it here or there. MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 6e5bf19d0aa1..5aaae47a3e41 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2423,6 +2423,8 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) /* * net80211 should handle hw->extra_tx_headroom. * Though for as long as we are copying we don't mind. + * XXX-BZ rtw88 asks for too much headroom for ipv6+tcp: + * https://lists.freebsd.org/archives/freebsd-transport/2022-February/000012.html */ skb = dev_alloc_skb(hw->extra_tx_headroom + m->m_pkthdr.len); if (skb == NULL) { @@ -2852,7 +2854,10 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) ic_printf(ic, "%s: warning, no hardware address!\n", __func__); } +#ifdef __not_yet__ + /* See comment in lkpi_80211_txq_tx_one(). */ ic->ic_headroom = hw->extra_tx_headroom; +#endif ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA;