From mboxrd@z Thu Jan 1 00:00:00 1970 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 4392D37646B for ; Mon, 20 Apr 2026 02:22:12 +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=1776651733; cv=none; b=lrpuQ9X5vN0aREIw4upoxlP1bDSsIdpmYhwUEjZrwUIlDbrqznG2GsGnvUbZyrpFfLApe4fHNIVVrkj2EUxn9i2bYboSVZr9ACKCyoME06hfGic41winQg/Mr//8xykrL6Sfge48d1kCuUrkV8NdX9G03gRv93cxkQbW38+M5n4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776651733; c=relaxed/simple; bh=5BcjVB3MqrcBSEqqNeG07ugHlj0CHm1xOFBeDB33dMQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=TIAFEWfqlC5xC3CJdjv4caSOxgUdj9rzrqP9JIx+5fOarizA0ZaaFuuHR3uc0BcESHSYBPNAHsc6bOT+pprfkAkMpyyjSApHNctLQ09QcTqfnT3ko5AzyI2NwlUhoqRkuLlsoI68P7mIO2nquS0f2la+7lpw0eNzdh+a+0dFhBM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=WnUfbfkW; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=R84MFJNa; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="WnUfbfkW"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="R84MFJNa" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63JKjvr81912190 for ; Mon, 20 Apr 2026 02:22:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 5xXtD8l8YqLF0HZdr+8U1U57kN59Gw5OqLqwwXN9jN8=; b=WnUfbfkWTrTf2ikC 6sqd2t3rhWYMO+07Lqwi5JWBB1anc2qy4nIQOYE5sHOTPlcIifznNfziScfRRrpe lQvB8TjinNgA0MyrFDtdXb3WNDOCM2192TrIuRPHUii6uCzlwyW1uiNVFv2+HIkc SKLUE0D34Iw/R1ykfYql/qAhBrjfxRwCMgMQKopVvsCI2YB5yiZe5Xz5b47uhciq q6Kdq7a6bId7Al8m4vGz+vJKSXZpfEflAV3AOMmGnZAcVHVDKjjcZlKViCAYljoA YspjB3YZZhqmDAmkCTL7b3uKyL0ol1GnSKFeWienY3umS/gfJt9VYwDH4MTIAZnd MKOFyA== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dm19fuqfh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 20 Apr 2026 02:22:10 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-35fbaada2f3so4465383a91.0 for ; Sun, 19 Apr 2026 19:22:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1776651730; x=1777256530; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=5xXtD8l8YqLF0HZdr+8U1U57kN59Gw5OqLqwwXN9jN8=; b=R84MFJNaslxB7++gixc62+vcmCK6QYgEX5KMU3T7xLcUAIk1PgHhpBEOhVo+f8GPHO L5oRH4u0m1+mn3C+trnwucI6yqOY8obFX5xcjb5JL+9y0LeeCS18i5aPGDRSkNT+OTnc wjzYHUqPUqQXTWyWzMtzop9wURYr7p5564RVR9S3Z1tzGOSgPkBYrXWWruCTowi0SCvg /XRtaH2lDoYwXXMDb+JQ2VdBxtNZTBLmM6hx9Ndqdcd3GbN5FTXiBjYkjsgs16HnkqnF BA5eRNoS8Loz4pPy133+J32JXWandJ8zpoh6Q2Rz6Ul71sTK57Sl2lVYn6Eb9AKv26P/ Rl+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776651730; x=1777256530; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5xXtD8l8YqLF0HZdr+8U1U57kN59Gw5OqLqwwXN9jN8=; b=ATUkU7H/bEcavui5FhUbI0LSmBNMXupC89QX4lWE+PaAGhM9IZV71uEz3UAEJR79ua pqNng+7j3GHEPfYoL77bNJezI33idFE9yWQniECTKS83/iuKh0Td9APwi6JuyUycJ1Af YNWcGp++7D1DZa5mhRqbaEmD1CyBKbJdwg4s+1MKRREel1EEMT3FgcjZsggdQi+WVAkN +9LeWT1MvaBl1CMtntof+O6bfAeQQQLQf/ve3uTWY9RDbWe4snqjixXullrFrUIS5Zwc DFPgSxo6FBtzPOqcHORIwjS1Siefr3LlsebBvENrE+Hz15x6giUJuy4rtwAc6w0zVjam lA+w== X-Forwarded-Encrypted: i=1; AFNElJ892PQJB9TithQvrFUTn3PuJXpdlnqsKyO5NW/YL4XCv3H9njpl9Jhr9TD5F7i6Gcb6mrJ/Yxqv5f/XYcs=@vger.kernel.org X-Gm-Message-State: AOJu0YzWU/hPH33O5+qFNyMMTZy8TWIDFFDTYeJLgOiMol5tCXChDgf8 IbPrOCcT1NCoMYxnVi6lQeg5fEVU/4azaiZIv+6rP/Vpwm5MtCy/SX1guLg+LFOWozJeLzDV3Nm bITn8i5TYYgwvhYg6KM43BWckbYGrXI0PaTUm/ZafWfWJeSobyU9+amrsTabjsJfp+uHtH/qAjv E= X-Gm-Gg: AeBDiev82S9c6I8eZA99MpXuszzqEFvT58oVb9lG81a84vZkh9Fha4X8y3yuCkx/BfT tGlOQN7zM/FNt13yhmV0S7DR7KYn1eRgdH3G0ipATemAZ4A95JxUiaMZvcmFghebOBVJOSQF6MB H5QqcvZzLMiWzffns37fkRhFhPJ+/Zp+GwRptE0JaUnJ850FNwo/e8b65KkQ780hcacnyxHQqeZ VSPBrcOT0BtjWL/icdkADY4gFMtJV6a4rrXm86N0DtuaIj0OwRPm8w82yNVi8Dv4jz7FRpE+VfL vKxVWHs2A/lSLMmjpVfNeZF+AFp6TzYgv4ao36ib4Gdp8bE1wit2wZvAd2RExOHyP/hcpei1Buw rtFHMh/SYy+bYbvC38CPWFxYdeimvgFvXE5FLXHuov8MxSLfyqPzkkoqsNe4vqluXT5Fz52P8aN wnHQwvC4bhQWgAp6yrNj3ARhUWVACjqQ== X-Received: by 2002:a17:90b:1a8d:b0:35f:b987:4dac with SMTP id 98e67ed59e1d1-361403fa894mr11911247a91.12.1776651729595; Sun, 19 Apr 2026 19:22:09 -0700 (PDT) X-Received: by 2002:a17:90b:1a8d:b0:35f:b987:4dac with SMTP id 98e67ed59e1d1-361403fa894mr11911243a91.12.1776651729112; Sun, 19 Apr 2026 19:22:09 -0700 (PDT) Received: from [10.133.33.231] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3613fb7118esm4336837a91.4.2026.04.19.19.22.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Apr 2026 19:22:08 -0700 (PDT) Message-ID: <44c5e877-15eb-4a89-8498-328b77d27d0f@oss.qualcomm.com> Date: Mon, 20 Apr 2026 10:22:05 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] ath11k: fix peer resolution on rx path when peer_id=0 To: Matthew Leach , Jeff Johnson Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com References: <20260417-ath11k-null-peerid-workaround-v3-1-d04302284486@collabora.com> From: Baochen Qiang Content-Language: en-US In-Reply-To: <20260417-ath11k-null-peerid-workaround-v3-1-d04302284486@collabora.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDIwMDAyMSBTYWx0ZWRfX9pHPZttGFqk9 2xaixD+rFLXAXHeMm/KwD/NSO41cqRJDqJbTAC3WJtomIxMlput8POsFlHe6cJT4uDVOnH5t9sW a4/jBv4BM+afMDmziUWUdNtxURB5GWR+iJWpFx5SnZ6d3UmAi1kv9uqCWqGZ09Q4f9wN+2BJ9Ci hTYYfPbDzN54SXPr+ac9MRmyvojvstRIXmLK+186Wv/203vdyhrkomYwoP/psMygMleRP06f9Fc ok0x+sn1yoWFD6lhVH28AevLVaWm1E6Qydl8DxYOaPmvmW7W2xpighydauS2gENnJB4Vw9jhRz3 ps3h91tXE4VDpyLkTGIqmyfxhlDRsQQ1sVgPpECOWfbhCAXgDccHVCEUFVoCjs6NuWkrXnIj0ny xLMQCzOBqG2AmVgbVjMEbe/BEOFJX3YeOrXJJv4UAw/Grt/lDGa04IovKyjnSpxlyAaKbNf7wyH ov0zsKFMIreN5E2MDng== X-Proofpoint-ORIG-GUID: zsAr87izHL6TMFGR2JPUd3wVjBlK4ubQ X-Proofpoint-GUID: zsAr87izHL6TMFGR2JPUd3wVjBlK4ubQ X-Authority-Analysis: v=2.4 cv=FMorAeos c=1 sm=1 tr=0 ts=69e58dd2 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=bC-a23v3AAAA:8 a=QX4gbG5DAAAA:8 a=VwQbUJbxAAAA:8 a=JfrnYn6hAAAA:8 a=EUspDBNiAAAA:8 a=H35CScFOu-zhalx1qioA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 a=FO4_E8m0qiDe52t0p3_H:22 a=AbAUZ8qAyYyZVLSsDulk:22 a=1CNFftbPRP8L7MoqJWF3:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-19_07,2026-04-17_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604200021 On 4/17/2026 7:07 PM, Matthew Leach wrote: > It has been observed that on certain chipsets a peer can be assigned > peer_id=0. For reception of non-aggregated MPDUs this is fine as > ath11k_dp_rx_h_find_peer() has a fallback case where it locates the peer > based upon the source MAC address. On an aggregated link, the mpdu_start > header is only populated by hardware on the first sub-MSDU. This causes > the peer resolution to be skipped for the subsequent MSDUs and the > encryption type of these frames to be set to an incorrect value, > resulting in these MSDUs being dropped by ieee80211. > > ath11k_pci 0000:03:00.0: data rx skb 000000002f4b704d len 1534 peer xx:xx:xx:xx:xx:xx 0 ucast sn 3063 he160 rate_idx 9 vht_nss 2 freq 5240 band 1 flag 0x40d1a fcs-err 0 mic-err 0 amsdu-more 0 peer_id 0 first_msdu 1 last_msdu 0 > ath11k_pci 0000:03:00.0: data rx skb 0000000038acd580 len 1534 peer (null) 0 ucast sn 3063 he160 rate_idx 9 vht_nss 2 freq 5240 band 1 flag 0x40d00 fcs-err 0 mic-err 0 amsdu-more 0 peer_id 0 first_msdu 0 last_msdu 1 > > Remove the null peer_id checks in ath11k_dp_rx_h_find_peer() and > ath11k_hal_rx_parse_mon_status_tlv(), allowing peers with an assigned ID > of 0 to be resolved. > > Signed-off-by: Matthew Leach > --- > Changes in v3: > - Clarified that the mpdu_start header isn't populated by the h/w for > all sub-MSDUs in the commit message. > - Fix second null-peer check in ath11k_hal_rx_parse_mon_status_tlv(). > - Link to v2: https://patch.msgid.link/20260415-ath11k-null-peerid-workaround-v2-1-2abae3bbac16@collabora.com > > Changes in v2: > > - Since peer_id=0 is a valid condition on some chips, remove the guard > that prevented the peer lookup. > - Link to v1: https://patch.msgid.link/20260326-ath11k-null-peerid-workaround-v1-1-0c2fd53202f8@collabora.com > > To: Jeff Johnson > Cc: linux-wireless@vger.kernel.org > Cc: ath11k@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +-- > drivers/net/wireless/ath/ath11k/hal_rx.c | 5 +---- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c > index 49d959b2e148..ff2c78a4e5f3 100644 > --- a/drivers/net/wireless/ath/ath11k/dp_rx.c > +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c > @@ -2215,8 +2215,7 @@ ath11k_dp_rx_h_find_peer(struct ath11k_base *ab, struct sk_buff *msdu) > > lockdep_assert_held(&ab->base_lock); > > - if (rxcb->peer_id) > - peer = ath11k_peer_find_by_id(ab, rxcb->peer_id); > + peer = ath11k_peer_find_by_id(ab, rxcb->peer_id); > > if (peer) > return peer; > diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c > index 753bd93f0212..51e0840bc0d1 100644 > --- a/drivers/net/wireless/ath/ath11k/hal_rx.c > +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c > @@ -1467,11 +1467,8 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, > case HAL_RX_MPDU_START: { > struct hal_rx_mpdu_info *mpdu_info = > (struct hal_rx_mpdu_info *)tlv_data; > - u16 peer_id; > > - peer_id = ath11k_hal_rx_mpduinfo_get_peerid(ab, mpdu_info); > - if (peer_id) > - ppdu_info->peer_id = peer_id; > + ppdu_info->peer_id = ath11k_hal_rx_mpduinfo_get_peerid(ab, mpdu_info); > break; > } > case HAL_RXPCU_PPDU_END_INFO: { > > --- > base-commit: f338e77383789c0cae23ca3d48adcc5e9e137e3c > change-id: 20260326-ath11k-null-peerid-workaround-625a129781b1 > > Best regards, > -- > Matt > Reviewed-by: Baochen Qiang