From patchwork Wed Apr 3 16:22:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rathees Kumar R Chinannan X-Patchwork-Id: 13616470 X-Patchwork-Delegate: johannes@sipsolutions.net Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F4CF14F9D2 for ; Wed, 3 Apr 2024 16:23:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712161429; cv=none; b=d9MKVl1M0hH6rlMis/Iy/UfyrdrLEjiXsRIID6oziP92ep+66/3NJ0LXLKOJqtYtRluL9RQsgVmGtTAcCB5BMDLNmNC1DAOLk/uLLMKxgmgSu+Xy+swNkxScxoffHSwhyjnZIM2LRZZVcBPXjrWE6zkpp0GoRtIpXJ9pTBVHM5U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712161429; c=relaxed/simple; bh=JKYrXcBZIkYJ8v3xIyJh3zxzyrhc9rV4oS8K1dMCrjU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DrCMAyNA22bLF7jijc+VytGC6EnFbiPwjb5YIyugM5hYHQVNlcnownaTQE55UxJa02A1KA29/NhsZKbyE8LnMHDI+Q+vmqtDjNx37BWhyZHrzM2Ura2AGBw8c0O+AkSkj3K3WLz8EbC1eJkb/yVTSk8IVWUfF+btd5bX3Yx6tqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=XwD1cvcG; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="XwD1cvcG" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 433FcVex028007; Wed, 3 Apr 2024 16:23:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= qcppdkim1; bh=AXI/MJPCc+A+uzaZZ0wkt5sm2vHwWkx8L995KKisUi8=; b=Xw D1cvcGb5tfDiPrp++s58oK9VvZdFIuLS4P9hjcZQZ1nlPVV0QFKYI0X5TuyC3zjM 6PKzpspmSGL4lfpH3IP9Bo+mg1nRWhwl4BMeT3WjSTPERX8Pfn6U91wiyKJSHlil mRcU4cmkuUqIVyQm2+AWSafRGMoZOUUuGiOdNFtihUUNi7Snuu5l3E8DqMIIx99M v1CEfcKwzreIT8A9CfDFuZtXA6174likYtvXVvNMI/4/5QhwVrNizvV4V7dtlwGm MU4OYX/RyN9dyzyUbwrvT354QXkgGOrlbOgX2COojARmkaNk5PzaSMAuS35OO3P8 XgBc4CcOxgPLkjWsD9Mw== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3x944e1595-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 03 Apr 2024 16:23:43 +0000 (GMT) Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 433GNfH3004309 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 3 Apr 2024 16:23:41 GMT Received: from hu-rrchinan-blr.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 3 Apr 2024 09:23:40 -0700 From: Rathees Kumar R Chinannan To: CC: , Subject: [RFC v2 2/2] wifi: mac80211: Indicate ongoing critical update parameters Date: Wed, 3 Apr 2024 21:52:25 +0530 Message-ID: <20240403162225.3096228-3-quic_rrchinan@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240403162225.3096228-1-quic_rrchinan@quicinc.com> References: <20240403162225.3096228-1-quic_rrchinan@quicinc.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: eHdO-YwRGhj6z6ml02POsWhi8pwPa9nN X-Proofpoint-GUID: eHdO-YwRGhj6z6ml02POsWhi8pwPa9nN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-03_16,2024-04-03_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 mlxlogscore=999 clxscore=1015 suspectscore=0 mlxscore=0 phishscore=0 adultscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2403210001 definitions=main-2404030112 User space application doesn't have the latest ongoing critical update parameters like critical update flag, BSS param change count (BPCC) and CSA/CCA switch count for each link. Add an ieee80211_critical_update() API to send these params to cfg80211 and call it when event received from firmware during probe or assoc or reassoc request frame receive to update critical parameters to user space and needed only on beacon offload case. Signed-off-by: Rathees Kumar R Chinannan --- include/net/mac80211.h | 13 +++++++++++++ net/mac80211/cfg.c | 43 +++++++++++++++++++++++++++++++++++++++++- net/mac80211/rx.c | 12 ++++++++++++ net/mac80211/tx.c | 9 +++++++++ 4 files changed, 76 insertions(+), 1 deletion(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 353488ab94a2..a369f0d7087d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -7599,4 +7599,17 @@ int ieee80211_emulate_switch_vif_chanctx(struct ieee80211_hw *hw, int n_vifs, enum ieee80211_chanctx_switch_mode mode); +/** + * ieee80211_critical_update - update critical params for each link + * @vif: the specified virtual interface + * @link_id: the link ID for MLO, otherwise 0 + * @critical_flag: critical update information + * @bpcc: Bss parameter change count value + * + * The function is called when event received from firmware to update + * critical parameters to user space during probe or assoc or reassoc request + * frame receive and needed only on beacon offload case. + */ +void ieee80211_critical_update(struct ieee80211_vif *vif, unsigned int link_id, + bool critical_flag, u8 bpcc); #endif /* MAC80211_H */ diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index f03452dc716d..97ffd3028467 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3606,6 +3606,7 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif, unsigned int link_id) struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); struct ieee80211_local *local = sdata->local; struct ieee80211_link_data *link_data; + struct wireless_dev *wdev = ieee80211_vif_to_wdev(vif); if (WARN_ON(link_id >= IEEE80211_MLD_MAX_NUM_LINKS)) return; @@ -3617,7 +3618,13 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif, unsigned int link_id) rcu_read_unlock(); return; } - + if (wiphy_ext_feature_isset( + local->hw.wiphy, + NL80211_EXT_FEATURE_CRITICAL_UPDATE_OFFLOAD) && + wdev->valid_links && wdev->links[link_id].ap.switch_count != 0) { + wdev->links[link_id].ap.switch_count = 0; + wdev->critical_update = true; + } /* TODO: MBSSID with MLO changes */ if (vif->mbssid_tx_vif == vif) { /* Trigger ieee80211_csa_finish() on the non-transmitting @@ -3643,6 +3650,40 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif, unsigned int link_id) } EXPORT_SYMBOL(ieee80211_csa_finish); +/** + * ieee80211_critical_update - update critical params for each link + * @vif: the specified virtual interface + * @link_id: the link ID for MLO, otherwise 0 + * @critical_flag: critical update information + * @bpcc: Bss parameter change count value + * + * The function is called when event received from firmware to update + * critical parameters to user space during probe or assoc or reassoc request + * frame receive and needed only on beacon offload case. + */ +void ieee80211_critical_update(struct ieee80211_vif *vif, unsigned int link_id, + bool critical_flag, u8 bpcc) +{ + struct wireless_dev *wdev = ieee80211_vif_to_wdev(vif); + struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); + struct ieee80211_local *local = sdata->local; + + if (!wiphy_ext_feature_isset( + local->hw.wiphy, + NL80211_EXT_FEATURE_CRITICAL_UPDATE_OFFLOAD) || + !wdev->valid_links) + return; + if (WARN_ON(link_id > IEEE80211_MLD_MAX_NUM_LINKS)) + return; + if (wdev->links[link_id].ap.critical_flag != critical_flag || + wdev->links[link_id].ap.bpcc != bpcc) { + wdev->critical_update = true; + wdev->links[link_id].ap.critical_flag = critical_flag; + wdev->links[link_id].ap.bpcc = bpcc; + } +} +EXPORT_SYMBOL(ieee80211_critical_update); + void ieee80211_channel_switch_disconnect(struct ieee80211_vif *vif, bool block_tx) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c1f850138405..e60560b4e3e4 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3825,14 +3825,26 @@ static ieee80211_rx_result debug_noinline ieee80211_rx_h_userspace_mgmt(struct ieee80211_rx_data *rx) { struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb); + struct ieee80211_mgmt *mgmt = (void *)rx->skb->data; + __le16 stype; + struct wireless_dev *wdev = &rx->sdata->wdev; + struct cfg80211_rx_info info = { .freq = ieee80211_rx_status_to_khz(status), .buf = rx->skb->data, .len = rx->skb->len, .link_id = rx->link_id, .have_link_id = rx->link_id >= 0, + .critical_update = false, }; + stype = mgmt->frame_control & cpu_to_le16(IEEE80211_FCTL_STYPE); + if (stype == cpu_to_le16(IEEE80211_STYPE_PROBE_REQ) || + stype == cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ) || + stype == cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ)) { + if (wdev->critical_update) + info.critical_update = true; + } /* skip known-bad action frames and return them in the next handler */ if (status->rx_flags & IEEE80211_RX_MALFORMED_ACTION_FRM) return RX_CONTINUE; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 6bf223e6cd1a..3603cc582b0d 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -5041,6 +5041,8 @@ u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif, unsigned int link_i struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); struct ieee80211_link_data *link; struct beacon_data *beacon = NULL; + struct wireless_dev *wdev = ieee80211_vif_to_wdev(vif); + struct ieee80211_local *local = sdata->local; u8 count = 0; if (WARN_ON(link_id >= IEEE80211_MLD_MAX_NUM_LINKS)) @@ -5063,6 +5065,13 @@ u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif, unsigned int link_i goto unlock; count = __ieee80211_beacon_update_cntdwn(beacon); + if (wiphy_ext_feature_isset( + local->hw.wiphy, + NL80211_EXT_FEATURE_CRITICAL_UPDATE_OFFLOAD) && + wdev->valid_links && wdev->links[link_id].ap.switch_count != count) { + wdev->links[link_id].ap.switch_count = count; + wdev->critical_update = true; + } unlock: rcu_read_unlock();