From nobody Thu Jun 5 14:34:08 2025 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 4bCn5F1YC7z5xvR9; Thu, 05 Jun 2025 14:34:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCn5F00b3z3X8G; Thu, 05 Jun 2025 14:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749134049; 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=VNHZuZ0qJaAPL8B3KArOQXkWlAaRrKieDFqyc/0zQLU=; b=xCnHRrZy2c6JMc8/5k5cVSbPOHe/Rm86XlLdMrOKR29MVHCsgMQuSF7tkNexovg54wLP21 FwsVGcGY+hJmM/jgJE6gemo/G5BZzkOuFUI4VvP8ogkhVAaYnj7uha40B8y5NS085rBDAY ebAuf1Eullkr0ja57ug3ARLP4/CcIx2PQh4lY+poAF7mHehnoM4u5yFSJAktwNze2mHX9p 5uWK7cW0jPic2rYkVA+jFfnzdhx0SvBUV0CQhHp7kkgTa4UuI3bzcGv2moW0OiaEb74VHs TDU3rx9cP82M7kz/r/hRFSlYAWFDqhlExO7uGNWrESUGf2+ELoS183zLaHrSZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749134049; 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=VNHZuZ0qJaAPL8B3KArOQXkWlAaRrKieDFqyc/0zQLU=; b=buzL0E5X7AY0Vrt/27ZTNfLwwJzIH3mvt7jKM09m3qaibjamX9Wr1Xj/wuoJgWH4KhLZAb o0To2+i6JNmE71H9Z3SYAUu/JL47F6czCD00IMQV8KHa2br7M5BQE35sT+O/Mcpi4GWCQa amEXFuZ3KRLVFMlTQCcaGsuUZn+giTAh0fvMJnSpEHP09runAyK5RTmHwcvc/ksbXOI7Mo 8yCtcoIBGxdO/kY/b+0D74FNX5M0k4UGjy6MzaNa4WuXtmh0DaZJrG98qsj2W/K2Zh1UKc Kn6iDdl1/mFxA2qfh/rP38ByqWmCutBZVmms+f5h2mDfXEyK/pr/Z5oIMzjXrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749134049; a=rsa-sha256; cv=none; b=UYxM0rCdaVdVafjSAFPU6298zAluNJUWJT94yJ23bQ3Bg3jAbbF6ff6MQwFtArma0S8gFy /BaVoadnSw8r00yW7Ylvvlnz4DBtDGmb+On/TpVrQUUoQ92jFiA7oUYyAwT3Kl7oXk/H1c JTmydQgbskBdfV871CHvXguhapUUDjfFLNvEgw6SxpTCJnYK9RF4JKNv7Y7z5MExtmGKW+ WuChD0N8OOKWFGs269bVDTtJS0jalAefkil05ETJ+JME/1DG8D+4qNabdppvNSlZR7+mRc 1AKF4YMTp6hRAZxkH6ClkrkuFeP2J0d2fDZVNagkCdJHFnOxIAHgd0kQ+XvWdw== 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 4bCn5D6d7Yz1Bmb; Thu, 05 Jun 2025 14:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 555EY8j2056736; Thu, 5 Jun 2025 14:34:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555EY8If056731; Thu, 5 Jun 2025 14:34:08 GMT (envelope-from git) Date: Thu, 5 Jun 2025 14:34:08 GMT Message-Id: <202506051434.555EY8If056731@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: 29ddd583693a - main - LinuxKPI: 802.11: add support for GCMP hw crypto offload 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 29ddd583693aced69be48b545e1c7e7249bdfb9c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=29ddd583693aced69be48b545e1c7e7249bdfb9c commit 29ddd583693aced69be48b545e1c7e7249bdfb9c Author: Bjoern A. Zeeb AuthorDate: 2025-04-22 20:10:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-05 11:32:27 +0000 LinuxKPI: 802.11: add support for GCMP hw crypto offload For iwlwifi, rtw88, and rtw89 we can treat GCMP the same way as we treat CCMP which allows us to re-use the CCMP code for now. Add the missing case statements and factor out some common code. Allow IEEE80211_CRYPTO_AES_GCM_128 through our filter of supported cipher suites to announce it to net80211. Sponsored by; The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 390b27802fc4..2f9af39391f6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1415,11 +1415,12 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) lcipher = lkpi_net80211_to_l80211_cipher_suite( k->wk_cipher->ic_cipher, k->wk_keylen); switch (lcipher) { - case WLAN_CIPHER_SUITE_CCMP: - break; case WLAN_CIPHER_SUITE_TKIP: keylen += 2 * k->wk_cipher->ic_miclen; break; + case WLAN_CIPHER_SUITE_CCMP: + case WLAN_CIPHER_SUITE_GCMP: + break; default: ic_printf(ic, "%s: CIPHER SUITE %#x (%s) not supported\n", __func__, lcipher, lkpi_cipher_suite_to_name(lcipher)); @@ -1454,16 +1455,16 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) if (k->wk_flags & IEEE80211_KEY_GROUP) kc->flags &= ~IEEE80211_KEY_FLAG_PAIRWISE; + kc->iv_len = k->wk_cipher->ic_header; + kc->icv_len = k->wk_cipher->ic_trailer; + switch (kc->cipher) { - case WLAN_CIPHER_SUITE_CCMP: - kc->iv_len = k->wk_cipher->ic_header; - kc->icv_len = k->wk_cipher->ic_trailer; - break; case WLAN_CIPHER_SUITE_TKIP: memcpy(kc->key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY, k->wk_txmic, k->wk_cipher->ic_miclen); memcpy(kc->key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY, k->wk_rxmic, k->wk_cipher->ic_miclen); - kc->iv_len = k->wk_cipher->ic_header; - kc->icv_len = k->wk_cipher->ic_trailer; + break; + case WLAN_CIPHER_SUITE_CCMP: + case WLAN_CIPHER_SUITE_GCMP: break; default: /* currently UNREACH */ @@ -1528,6 +1529,7 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) #endif break; case WLAN_CIPHER_SUITE_CCMP: + case WLAN_CIPHER_SUITE_GCMP: exp_flags = (IEEE80211_KEY_FLAG_PAIRWISE | IEEE80211_KEY_FLAG_PUT_IV_SPACE | IEEE80211_KEY_FLAG_GENERATE_IV | @@ -4809,6 +4811,7 @@ encrypt: TODO("sw encrypt"); return (ENXIO); } + static int lkpi_hw_crypto_prepare_ccmp(struct ieee80211_key *k, struct ieee80211_key_conf *kc, struct sk_buff *skb) @@ -4876,10 +4879,11 @@ lkpi_hw_crypto_prepare(struct lkpi_sta *lsta, struct ieee80211_key *k, return (lkpi_hw_crypto_prepare_tkip(k, kc, skb)); case WLAN_CIPHER_SUITE_CCMP: return (lkpi_hw_crypto_prepare_ccmp(k, kc, skb)); + case WLAN_CIPHER_SUITE_GCMP: + return (lkpi_hw_crypto_prepare_ccmp(k, kc, skb)); case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP104: case WLAN_CIPHER_SUITE_CCMP_256: - case WLAN_CIPHER_SUITE_GCMP: case WLAN_CIPHER_SUITE_GCMP_256: case WLAN_CIPHER_SUITE_AES_CMAC: case WLAN_CIPHER_SUITE_BIP_CMAC_256: @@ -6124,6 +6128,7 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) * Also permit TKIP if turned on. */ hwciphers &= (IEEE80211_CRYPTO_AES_CCM | + IEEE80211_CRYPTO_AES_GCM_128 | (lkpi_hwcrypto_tkip ? (IEEE80211_CRYPTO_TKIP | IEEE80211_CRYPTO_TKIPMIC) : 0)); ieee80211_set_hardware_ciphers(ic, hwciphers);