From patchwork Tue Apr 8 06:13:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 879328 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 CB0A822F3B0 for ; Tue, 8 Apr 2025 06:13:59 +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=1744092841; cv=none; b=P675R/HztyNz3P45Lh2xI5ihnT9Jl44h6JezQ8WUOn9wAQ1fFNQ2isVDrWco25bQmsBLqkPWE1Q3iC0R1RkRpao43Bz6c2vOsE9RTmXtxlnBJnm9T/iYtXStGS1PqI7dD0gPFkYmDcjEOJAVfFcvqO1Yb6yLb8Pch5jH+FXAeHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744092841; c=relaxed/simple; bh=gLmGN2rJds9DsaVH8kLiJdokT6D3F4D/NR5T1hFPwXc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hVELwIDoOkVvytk5U9Z9Ln+vgHmkQrLvCyqJFyJWt/+LcRoqRc+1CNRZccPsEhAxaEk6G34Vs5szRFZ+VtSOZKkb4XQ78NO8nHE4TQ7uqXjR1uYaMb2NVuEhT5nAwp5vf/9pU15KlTGo/DAomsTlMrWaQyXMQDc9i3oOkAyDwbI= 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=fAVbN+bk; 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="fAVbN+bk" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5382GObA019576 for ; Tue, 8 Apr 2025 06:13:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=jf4X7nmgLLt sPPYdxMAbBPiLSQqDc/fGOuZSKINRik0=; b=fAVbN+bky0rov6hMrPPFx6voZOc S2vb9bl+LZg4A6qb/4TZ1gUk42BaODUCS0sgkkKU0Mks4zEDluJs36bal42FFIdf duTHZXyeF13zmlCE8Sgm1xnFcassjYRWy06XfWO9WggFYpKz0KzE1dw4/JOEC7pn v2qheem4BKJu4YyQE/nl6n1Pv+4Zr/QVgoEon6Xmt5SvDrj9TnU4FUPmHaISIcXy +UNST43YkjrZEKAaBfrza2YXjgy8OOVLRPjb17etckQpBMUTJE9beUU/A16Be05P SuvOZMISdVn52lhAJjB+a7CAW3q1ToV3LWjDxCPutw5GRu2dshr3knpqQjQ== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twg3enfm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 08 Apr 2025 06:13:58 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-2ff55176edcso5111509a91.1 for ; Mon, 07 Apr 2025 23:13:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744092837; x=1744697637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jf4X7nmgLLtsPPYdxMAbBPiLSQqDc/fGOuZSKINRik0=; b=PdUQ0yyy6QXo3PenGvUNHBFnu3yE6yRfYAgHR5o/Q/TX6ra9k8NdPuFkziVcjQ9mYr itu0z/bhXpVlZMMH/v+6JPyZALrSDfNBK4q1VSlBck0QfrqmD/dIJa/6clKCEbhR/Btn kqBmEcsWKBy9WqIWjmwCy8RLqPPBQwHujpI/Mziuh8h8bRhDslkK6M2tWvuCbPg0Bzun Ym8VkKAe4LRErcWo/xnYxygYFijfwhqcZ1yPOiHqI0as8aUXXam+PGjOzhwDPsce+TE6 +aWkXUbyPkufxqm2XvRyNXFCwebbabB/LlZYe/MxwI6HpE/G/L5ctCnx12JSACmVMqte ZSCw== X-Gm-Message-State: AOJu0YyVYbhREU3BuAqRfsvxQ44cbANVsknTtS2KpFvqy8BkBj/yfJHv kTCQHOCLYH6CPSW8IUudHRkRVoeBEDri9lNJi8vdDsoSGA7EyUWJRMSspaFsHZggAwXd+ZDfEBn 0eT38wimUHxeAw+Sxn7pM9z6puIYGO3xGqgTPy+OrqmLZle+NXhVDQC5vkKeD2K/BnXmiq8Cpdw == X-Gm-Gg: ASbGncu1SwNwG74+0Ns3fwYcrzSmbXmqzoVUlUkeSFHyYWTUokb+SriPdR07pU3qfsA jD3RwxRbGOsFNft8EOrcD6+4mQzO+xGEgk0Rhg4W29KumS3Bb0IFvdOzMkoHCb/Ten7T946j5Md PX/hiOD+kZuGytdGGqBmusj6Le+auLesUuJHNNisYD6f/fVhwWDfFdaX8Lv0uJv5sYkhRDKNgfU LveH9IufLbvc09GbEcNOtueBkp3Z7vKAwAocYZRf8X6cq1HpjUZERUXAC6ujrApYAzKR6lSpLAx bHjNt1SYU7igVVVygwaylawYM9Bul30sMpP2IarxmdndzY9gkMePl0iuP9AEq2S3obhxILUbgAk g2MFbv8zMbYpIaK3wLmTwa2J6t+5AgVSneQ== X-Received: by 2002:a17:90a:d60c:b0:2fa:f8d:65de with SMTP id 98e67ed59e1d1-306a62137c1mr14778028a91.22.1744092836905; Mon, 07 Apr 2025 23:13:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4zeDZwRMBgzLBqfd01jymT1YpR7b25k588jo1J2XTWsT6kjoa3QT980ig55+H9URMzQROHQ== X-Received: by 2002:a17:90a:d60c:b0:2fa:f8d:65de with SMTP id 98e67ed59e1d1-306a62137c1mr14778011a91.22.1744092836327; Mon, 07 Apr 2025 23:13:56 -0700 (PDT) Received: from hu-ppranees-blr.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3057cb94f4esm10258444a91.46.2025.04.07.23.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 23:13:55 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v2 1/4] wifi: ath12k: Handle error cases during extended skb allocation Date: Tue, 8 Apr 2025 11:43:40 +0530 Message-Id: <20250408061343.2774345-2-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> References: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: zMml_YRsSTDom7KxniIkpMjpB3BGmz6o X-Proofpoint-ORIG-GUID: zMml_YRsSTDom7KxniIkpMjpB3BGmz6o X-Authority-Analysis: v=2.4 cv=I/9lRMgg c=1 sm=1 tr=0 ts=67f4bea6 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=Qd23BeFobrpH1aaNZ9kA:9 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-08_02,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 spamscore=0 clxscore=1015 malwarescore=0 adultscore=0 priorityscore=1501 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504080043 Currently, in the case of extended skb allocation, the buffer is freed before the DMA unmap operation. This premature deletion can result in skb->data corruption, as the memory region could be re-allocated for other purposes. Fix this issue by reordering the failure cases by calling dma_unmap_single() first, then followed by the corresponding kfree_skb(). This helps avoid data corruption in case of failures in dp_tx(). Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices") Signed-off-by: P Praneesh --- drivers/net/wireless/ath/ath12k/dp_tx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c index b93669348f35..6b394534e3a2 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -230,7 +230,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb); struct hal_tcl_data_cmd *hal_tcl_desc; struct hal_tx_msdu_ext_desc *msg; - struct sk_buff *skb_ext_desc; + struct sk_buff *skb_ext_desc = NULL; struct hal_srng *tcl_ring; struct ieee80211_hdr *hdr = (void *)skb->data; struct ath12k_vif *ahvif = arvif->ahvif; @@ -416,18 +416,15 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, if (ret < 0) { ath12k_dbg(ab, ATH12K_DBG_DP_TX, "Failed to add HTT meta data, dropping packet\n"); - kfree_skb(skb_ext_desc); - goto fail_unmap_dma; + goto fail_free_ext_skb; } } ti.paddr = dma_map_single(ab->dev, skb_ext_desc->data, skb_ext_desc->len, DMA_TO_DEVICE); ret = dma_mapping_error(ab->dev, ti.paddr); - if (ret) { - kfree_skb(skb_ext_desc); - goto fail_unmap_dma; - } + if (ret) + goto fail_free_ext_skb; ti.data_len = skb_ext_desc->len; ti.type = HAL_TCL_DESC_TYPE_EXT_DESC; @@ -463,7 +460,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, ring_selector++; } - goto fail_unmap_dma; + goto fail_unmap_dma_ext; } ath12k_hal_tx_cmd_desc_setup(ab, hal_tcl_desc, &ti); @@ -479,13 +476,16 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, return 0; -fail_unmap_dma: - dma_unmap_single(ab->dev, ti.paddr, ti.data_len, DMA_TO_DEVICE); - +fail_unmap_dma_ext: if (skb_cb->paddr_ext_desc) dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); +fail_free_ext_skb: + kfree_skb(skb_ext_desc); + +fail_unmap_dma: + dma_unmap_single(ab->dev, ti.paddr, ti.data_len, DMA_TO_DEVICE); fail_remove_tx_buf: ath12k_dp_tx_release_txbuf(dp, tx_desc, pool_id); From patchwork Tue Apr 8 06:13:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 879730 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 9837E217F5D for ; Tue, 8 Apr 2025 06:14:01 +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=1744092843; cv=none; b=fy5HZGWKFqeNKIAfnwF8wDc8q7dIWauEvQcWCRKv5dCZKjYRzcoklJVW0Ng2BOSnrgBjn2Z2tkepKvWEMFZxQSfk/gatNUGt/NpMZx8ss8nFu6+L1Rw+HCsijkQLlAsOyTxmBFfRBGGWnYxvowUgRYoOfKz7D46KqvIE3SOgRZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744092843; c=relaxed/simple; bh=VbVjg8+0hsc+aCiZec4xTFA9kO1/KR9bxxNNKUi1q80=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e+6xBkGHQffUBo1v0/pj7kp7rSHXYZgUkFUV4rM8whgNKKQMov2s4T+QgcDxi3rjhTNcFHIVqxD6fMad5PaL9hK8qgzgtttP06ffKoIGZEPI1OPSbzNpBPGDAby0I+5XhZiOW8zomoJsWezYMaWvHL5vGqtdJjYZ7PW4lug9bj8= 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=CNBj4GXa; 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="CNBj4GXa" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5382GPui010539 for ; Tue, 8 Apr 2025 06:14:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=kEFyTTEuNUu SbnwQFNWQYErdU/hJQYQmJmQ0atVTp0E=; b=CNBj4GXanKn1RbEiCmChmrYHrZx zbXq4XyVGHsrkzULSn3pgEp4+048ka9Hw2QUFcDRJ6Fh4q1HI3TOokxRjayuEgdo IlRTUucGOmJhwuk9P1P+IndYSIsQ2uT24QFzEYlJpU/Oa8IgFQ+4YnpiASw4cSll omY2HvSziA4G089rvTi4gsKNNAHrjmjxGPB8ct8Yx7HtJSrCRbqCx7e/F/ibhrUm zUA57gg8Z6T+MNVKAp7/ZccYWi5OGYvKMmk93Y7fGE1kiyKQCmp0/qfVwyW9sIEf VohDzsBfbuk2FkGhKDXJw4zlna1xQqE+5KKC5zooWBd36hg8daaxd1PavVA== 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 45twc1ekef-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 08 Apr 2025 06:14:00 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2ff5296726fso8010238a91.0 for ; Mon, 07 Apr 2025 23:14:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744092839; x=1744697639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kEFyTTEuNUuSbnwQFNWQYErdU/hJQYQmJmQ0atVTp0E=; b=lTS3OPYLFzEwjbSel8zle+kfMilP54YK3yOxIB9i3CdmEWJ/SkErt5aFSwzxhvxzEc Q6vYPde7/hRpjA1d+vIYrQVT94s7KeGtuRgomBOHW0NOtiL/PX7xhgDhV/0kZtiWdgrm xMcZXBEwIh9VcGCI5vP06LP6YOtfe01o7Nh3ewC6cMi+fDftRbsnBUFkTjai66SwLUhN uKoSQnXImW/WoUrRnKHVeTmPiIMO+SfFPbkfg7vezhv071CD/n3ia3fbLV+ihLxfpaIc mlJLN71tRaC6e5l5DN6tam6PN7tsS2YqMXwx6EsKMGP8F9yv+s7X8hW62QHXaWw61JbA 7isA== X-Gm-Message-State: AOJu0YzLbHnKloCD+FWNXFpzs/zlPhrbHjxuvMRTOvsnz77OeEoWAjqM qu9ecnsIiq53XuTuDeFdUPH5LZcDee1wPlWObwTrKglj88z81Y4zjQHFtBCI8fH/wOhFJcyu6Cg +ROF0IBcCn5cW+f3AHF4xGHuSRcJiVx4NRAJSmaclICMRLcnJbB/B/7R6hO5+MaBS6L0ZgpaUgQ == X-Gm-Gg: ASbGncsJqHd6grnTc2IVsIsq3v0vPtaNmQrm417nnO30A5hl3E0f2lwWV5a2wJZ4xBd KLuFaPw7FpMZjlGDInKArzrO/to1diO0Vzjz96x/CdtGFQbQjjDZzkWh28yMI+gqznv2agntN3h jthbAIHnZ/CKxbSkqhtM56GJgWD7sFEgSrZ4qdV+FsH05/5PGntiH28i6iQjOeSLHXIt47IU0hH dNW8AV6THJlv39a3bs4sLU4u9lwA9OEdPtfxf0bExlhXi+a0c8hUmIVmgfzlh+i69teo0GmBrI1 AHkthOYHrOAiZa994Z7qhttEGuluFjfWK5X7JwiP8BNbcutM5YQZ9RQaLFVvXZu35nNxubklTzb ImjlVMaDVW+n8YQN/A6XWwugWbFT/1YjYmA== X-Received: by 2002:a17:90b:2390:b0:306:b65e:13a8 with SMTP id 98e67ed59e1d1-306b65e13fcmr10168966a91.8.1744092838672; Mon, 07 Apr 2025 23:13:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGoBBnXJXCkSl1D6taAVfDLW9Ne+0IIgh+f9kGprM0pNZnCYkxkVhjhirD7WUC8hFYjuNwEww== X-Received: by 2002:a17:90b:2390:b0:306:b65e:13a8 with SMTP id 98e67ed59e1d1-306b65e13fcmr10168940a91.8.1744092838111; Mon, 07 Apr 2025 23:13:58 -0700 (PDT) Received: from hu-ppranees-blr.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3057cb94f4esm10258444a91.46.2025.04.07.23.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 23:13:57 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v2 2/4] wifi: ath12k: Refactor tx descriptor handling in tx completion handler Date: Tue, 8 Apr 2025 11:43:41 +0530 Message-Id: <20250408061343.2774345-3-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> References: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: TMHSn-s8S3J74bAhTBd8REgIK7gYlvP_ X-Authority-Analysis: v=2.4 cv=KtdN2XWN c=1 sm=1 tr=0 ts=67f4bea8 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=DEzRtGDzSFLe7Yuc7ZwA:9 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-GUID: TMHSn-s8S3J74bAhTBd8REgIK7gYlvP_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-08_02,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=982 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504080043 Current code uses mac_id and msdu parameters in ath12k_dp_tx_free_txbuf() and ath12k_dp_tx_process_htt_tx_complete(). Since these parameters are already encapsulated by struct ath12k_dp_tx_desc, passing them individually results in redundant arguments. Introduce struct ath12k_tx_desc_params to capture the skb, mac_id, and pass it to the corresponding functions. Refactor these functions to use struct ath12k_tx_desc_params instead, reducing the number of arguments and improving function argument handling efficiency. Additionally, use struct ath12k_tx_desc_params in ath12k_dp_tx_htt_tx_complete_buf() and ath12k_dp_tx_complete_msdu(), which will be utilized for fetching extended skb in a future patch. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Signed-off-by: P Praneesh --- drivers/net/wireless/ath/ath12k/dp.h | 5 +++ drivers/net/wireless/ath/ath12k/dp_tx.c | 42 ++++++++++++------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h index e8dbba0c3bb7..d982e9638517 100644 --- a/drivers/net/wireless/ath/ath12k/dp.h +++ b/drivers/net/wireless/ath/ath12k/dp.h @@ -300,6 +300,11 @@ struct ath12k_tx_desc_info { u8 pool_id; }; +struct ath12k_tx_desc_params { + struct sk_buff *skb; + u8 mac_id; +}; + struct ath12k_spt_info { dma_addr_t paddr; u64 *vaddr; diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c index 6b394534e3a2..08af7edd3f25 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -496,12 +496,13 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, } static void ath12k_dp_tx_free_txbuf(struct ath12k_base *ab, - struct sk_buff *msdu, u8 mac_id, - struct dp_tx_ring *tx_ring) + struct dp_tx_ring *tx_ring, + struct ath12k_tx_desc_params *desc_params) { struct ath12k *ar; + struct sk_buff *msdu = desc_params->skb; struct ath12k_skb_cb *skb_cb; - u8 pdev_id = ath12k_hw_mac_id_to_pdev_id(ab->hw_params, mac_id); + u8 pdev_id = ath12k_hw_mac_id_to_pdev_id(ab->hw_params, desc_params->mac_id); skb_cb = ATH12K_SKB_CB(msdu); ar = ab->pdevs[pdev_id].ar; @@ -519,11 +520,12 @@ static void ath12k_dp_tx_free_txbuf(struct ath12k_base *ab, static void ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab, - struct sk_buff *msdu, + struct ath12k_tx_desc_params *desc_params, struct dp_tx_ring *tx_ring, struct ath12k_dp_htt_wbm_tx_status *ts) { struct ieee80211_tx_info *info; + struct sk_buff *msdu = desc_params->skb; struct ath12k_skb_cb *skb_cb; struct ath12k *ar; @@ -561,10 +563,9 @@ ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab, } static void -ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab, - void *desc, u8 mac_id, - struct sk_buff *msdu, - struct dp_tx_ring *tx_ring) +ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab, void *desc, + struct dp_tx_ring *tx_ring, + struct ath12k_tx_desc_params *desc_params) { struct htt_tx_wbm_completion *status_desc; struct ath12k_dp_htt_wbm_tx_status ts = {0}; @@ -580,14 +581,14 @@ ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab, ts.acked = (wbm_status == HAL_WBM_REL_HTT_TX_COMP_STATUS_OK); ts.ack_rssi = le32_get_bits(status_desc->info2, HTT_TX_WBM_COMP_INFO2_ACK_RSSI); - ath12k_dp_tx_htt_tx_complete_buf(ab, msdu, tx_ring, &ts); + ath12k_dp_tx_htt_tx_complete_buf(ab, desc_params, tx_ring, &ts); break; case HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP: case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL: case HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ: case HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT: case HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH: - ath12k_dp_tx_free_txbuf(ab, msdu, mac_id, tx_ring); + ath12k_dp_tx_free_txbuf(ab, tx_ring, desc_params); break; case HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY: /* This event is to be handled only when the driver decides to @@ -719,13 +720,14 @@ static void ath12k_dp_tx_update_txcompl(struct ath12k *ar, struct hal_tx_status } static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, - struct sk_buff *msdu, + struct ath12k_tx_desc_params *desc_params, struct hal_tx_status *ts) { struct ath12k_base *ab = ar->ab; struct ath12k_hw *ah = ar->ah; struct ieee80211_tx_info *info; struct ath12k_skb_cb *skb_cb; + struct sk_buff *msdu = desc_params->skb; if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { /* Must not happen */ @@ -844,11 +846,11 @@ void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id) int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id; struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id]; struct ath12k_tx_desc_info *tx_desc = NULL; - struct sk_buff *msdu; struct hal_tx_status ts = { 0 }; + struct ath12k_tx_desc_params desc_params; struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id]; struct hal_wbm_release_ring *desc; - u8 mac_id, pdev_id; + u8 pdev_id; u64 desc_va; spin_lock_bh(&status_ring->lock); @@ -902,28 +904,26 @@ void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id) continue; } - msdu = tx_desc->skb; - mac_id = tx_desc->mac_id; + desc_params.mac_id = tx_desc->mac_id; + desc_params.skb = tx_desc->skb; /* Release descriptor as soon as extracting necessary info * to reduce contention */ ath12k_dp_tx_release_txbuf(dp, tx_desc, tx_desc->pool_id); if (ts.buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW) { - ath12k_dp_tx_process_htt_tx_complete(ab, - (void *)tx_status, - mac_id, msdu, - tx_ring); + ath12k_dp_tx_process_htt_tx_complete(ab, (void *)tx_status, + tx_ring, &desc_params); continue; } - pdev_id = ath12k_hw_mac_id_to_pdev_id(ab->hw_params, mac_id); + pdev_id = ath12k_hw_mac_id_to_pdev_id(ab->hw_params, desc_params.mac_id); ar = ab->pdevs[pdev_id].ar; if (atomic_dec_and_test(&ar->dp.num_tx_pending)) wake_up(&ar->dp.tx_empty_waitq); - ath12k_dp_tx_complete_msdu(ar, msdu, &ts); + ath12k_dp_tx_complete_msdu(ar, &desc_params, &ts); } } From patchwork Tue Apr 8 06:13:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 879327 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 45EAE22F3B0 for ; Tue, 8 Apr 2025 06:14:02 +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=1744092844; cv=none; b=ChyDIULzsHKT6Lrn+azaUVmeaUBFS9fJ3tgkTLl8fNad+IhfyGkfMxIDZlmeqI/BVeREq9W6uBu/9JlmByYNFWJkwdpX4pGBg8p8qV6hIs3ZIpmsjhkzToiDw4Ha4N96chHTxhXtSY43i1mLV0K7gfGdQSizcN9W3gIu+wWqXuo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744092844; c=relaxed/simple; bh=Psk+6L4iEn0jpEyew6q62CSgzF7i7b+HoJSnfw8Z1us=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jrcQuC/WhgbPhaHoX+vRmyM0WLL31vypCo2nrsQUr5f2CJlpTEnfdt7sMGC5WnISfQRppA/h1aEGrspEYKWPCwlYjZ7XOYZpkW26EBgBIGkZMKD2pxoaWdbhRqJVs+lH3Sed3N2nsq1YV+rfweY/8I5oUf1TyHxc+UZ86ASCCDA= 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=a9SEMjOM; 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="a9SEMjOM" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5382GcMv029774 for ; Tue, 8 Apr 2025 06:14:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=RVJEK1IFLVo Re3I9On+Sj5DwxTBvPTi7jowA3qHQFAw=; b=a9SEMjOMor+Zcyv0aEgPpmsJ2b2 Z6sDQFYAIrcBl2xRZ8OhGHmHswuLbOnS9xIaP6EjoMml2W9Bpqc9YObTtNZ2oXyZ pog66ajCssK7Wb6L0VkauqkeddexjugldVkPd2/J5dUUFZd+9m2SOzDmwSxJ76ai 1kChv+fHnb+BTp6azAYNk3KRYx77AB9et8UK0queLoWsPvqVdyKaXxo5JoVrvMAY YHKYeRkQZHogPH7wL2KVPtG/kwmvWgNtXae6XQPIkw1bniUvVHw6DB991CGT+LfZ q6n551HX5J/awg//IZ+NkmvF+R3z2dJXRylOAaQXDoa9EfTdAU1NnDq+iiA== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twcrepf1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 08 Apr 2025 06:14:01 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-2ff5296726fso8010267a91.0 for ; Mon, 07 Apr 2025 23:14:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744092840; x=1744697640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RVJEK1IFLVoRe3I9On+Sj5DwxTBvPTi7jowA3qHQFAw=; b=m2Cus9vtZBRlt5toGvmgeDdfUPJhwJYevdWKcH8WUCnVXckbStakrssukjha5nBaxi EtO7ZSS7XbFlfsAeRgrVrZciqsScnmEZgS76Kn016n9NHMCTFKoq/pUOfcN+UEbtUk/Z dtJfRvsUfkOxACia/M4qvYgelddvydmDaWRdphpB5YUVdBwqEGtuTNo9L9ttTWZeLLVu xs/BThPJQrWOC9X7LHemXTPr0iWYuNp6mI89mOSeZ3kfZyNWuXXXWQBxTjBvxA3oWExx hJdlINNSEgOO3ipMTU55Ao8+4zO5gZ4XNiMNNqx8pYsHobPb3N2i11g4vbfNS4zEMxaJ v3YA== X-Gm-Message-State: AOJu0YwYvwGYLpanPUvJgUBqD3qb0gTh6PUklyP6qQXAqpRVHbHmMf// E5YZaMz4Wz7tsAA6Gmf2KCnq3kx1j1CuYjbzX0lvaTUcNfqooBCf+VIbLmevehVxzrfCfOdSdIJ vPIkBLtIdbrx0CGx5mm00wbdlRmx4aUFJdX2utqWblKspbc+UtCTLEjCHtakeVK1sW91O3S1SKA == X-Gm-Gg: ASbGnct52+zfeGaKb1xneE14LQgEdxmLtGxxbzu92Y4i1nhgi+0IVzgem6PJHTztiGx HX4WAuOY7oQoumz+/B+PHRAniV84JuwyMogL5ZveyRl3IL5CjWCZobJFneTdm7pSiaYkzEjd5NX 5/uBnDSVyQI4cDY9Z4f3BwiRdcexkoXSB8Z8o37wktbb3ogSHNoNcFCF6q8qrALDL0OFYyQ3Y2l nByc0QjocuOjOp4nDvOVeY12+GSISL0mZS+aT7qDHahh17eTZctM+jIy//9izzX/OL53J62wgXx 4hsLEj1i+gDjhurjVyWc4lKl6HK8drq71HeM0c78DrgY2gTbBuztAuBEiJmAK9FPRleplOzbtyT 0nJllwulrOHqULR7IDhU6PdKPsjkXsBDdjA== X-Received: by 2002:a17:90a:f950:b0:2fe:b907:562f with SMTP id 98e67ed59e1d1-306af732f86mr16004706a91.14.1744092840187; Mon, 07 Apr 2025 23:14:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPVFLRffPlSEHQVibT4tkJnPFyrG1oTmGsUikApM+bvRcTGIMMfyJvJ5orXb5VTo0HJ3nfcg== X-Received: by 2002:a17:90a:f950:b0:2fe:b907:562f with SMTP id 98e67ed59e1d1-306af732f86mr16004678a91.14.1744092839705; Mon, 07 Apr 2025 23:13:59 -0700 (PDT) Received: from hu-ppranees-blr.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3057cb94f4esm10258444a91.46.2025.04.07.23.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 23:13:59 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v2 3/4] wifi: ath12k: Fix memory leak during extended skb allocation Date: Tue, 8 Apr 2025 11:43:42 +0530 Message-Id: <20250408061343.2774345-4-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> References: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: VQsAeYlRiQrTd80zN6rCH7u0EvT1gSh- X-Authority-Analysis: v=2.4 cv=QuVe3Uyd c=1 sm=1 tr=0 ts=67f4bea9 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=iFgiq4A1vBvqtHBMXJkA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-GUID: VQsAeYlRiQrTd80zN6rCH7u0EvT1gSh- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-08_02,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 bulkscore=1 priorityscore=1501 clxscore=1015 phishscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=1 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504080043 In ath12k_dp_tx(), memory allocated for extended skb is not freed properly, causing a memory leak even when the host receives tx completion for those skbs. Fix this issue by storing skb_ext_desc in the host tx descriptor and using this skb_ext_desc field during completion or during ath12k_dp_cc_cleanup(). Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices") Signed-off-by: P Praneesh --- drivers/net/wireless/ath/ath12k/dp.c | 10 +++++++++- drivers/net/wireless/ath/ath12k/dp.h | 2 ++ drivers/net/wireless/ath/ath12k/dp_tx.c | 15 ++++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c index 59f61341383a..e04415517860 100644 --- a/drivers/net/wireless/ath/ath12k/dp.c +++ b/drivers/net/wireless/ath/ath12k/dp.c @@ -1206,11 +1206,19 @@ static void ath12k_dp_cc_cleanup(struct ath12k_base *ab) if (!skb) continue; + skb_cb = ATH12K_SKB_CB(skb); + if (skb_cb->paddr_ext_desc) { + dma_unmap_single(ab->dev, + skb_cb->paddr_ext_desc, + tx_desc_info->skb_ext_desc->len, + DMA_TO_DEVICE); + dev_kfree_skb_any(tx_desc_info->skb_ext_desc); + } + /* if we are unregistering, hw would've been destroyed and * ar is no longer valid. */ if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->dev_flags))) { - skb_cb = ATH12K_SKB_CB(skb); ar = skb_cb->ar; if (atomic_dec_and_test(&ar->dp.num_tx_pending)) diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h index d982e9638517..c839f2fb7c0a 100644 --- a/drivers/net/wireless/ath/ath12k/dp.h +++ b/drivers/net/wireless/ath/ath12k/dp.h @@ -295,6 +295,7 @@ struct ath12k_rx_desc_info { struct ath12k_tx_desc_info { struct list_head list; struct sk_buff *skb; + struct sk_buff *skb_ext_desc; u32 desc_id; /* Cookie */ u8 mac_id; u8 pool_id; @@ -302,6 +303,7 @@ struct ath12k_tx_desc_info { struct ath12k_tx_desc_params { struct sk_buff *skb; + struct sk_buff *skb_ext_desc; u8 mac_id; }; diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c index 08af7edd3f25..03ca45d10f7c 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -84,6 +84,7 @@ static void ath12k_dp_tx_release_txbuf(struct ath12k_dp *dp, u8 pool_id) { spin_lock_bh(&dp->tx_desc_lock[pool_id]); + tx_desc->skb_ext_desc = NULL; list_move_tail(&tx_desc->list, &dp->tx_desc_free_list[pool_id]); spin_unlock_bh(&dp->tx_desc_lock[pool_id]); } @@ -430,6 +431,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, ti.type = HAL_TCL_DESC_TYPE_EXT_DESC; skb_cb->paddr_ext_desc = ti.paddr; + tx_desc->skb_ext_desc = skb_ext_desc; } hal_ring_id = tx_ring->tcl_data_ring.ring_id; @@ -508,9 +510,11 @@ static void ath12k_dp_tx_free_txbuf(struct ath12k_base *ab, ar = ab->pdevs[pdev_id].ar; dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); - if (skb_cb->paddr_ext_desc) + if (skb_cb->paddr_ext_desc) { dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + dev_kfree_skb_any(desc_params->skb_ext_desc); + } ieee80211_free_txskb(ar->ah->hw, msdu); @@ -538,9 +542,11 @@ ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab, wake_up(&ar->dp.tx_empty_waitq); dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); - if (skb_cb->paddr_ext_desc) + if (skb_cb->paddr_ext_desc) { dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + dev_kfree_skb_any(desc_params->skb_ext_desc); + } memset(&info->status, 0, sizeof(info->status)); @@ -737,9 +743,11 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, skb_cb = ATH12K_SKB_CB(msdu); dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); - if (skb_cb->paddr_ext_desc) + if (skb_cb->paddr_ext_desc) { dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + dev_kfree_skb_any(desc_params->skb_ext_desc); + } rcu_read_lock(); @@ -906,6 +914,7 @@ void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id) desc_params.mac_id = tx_desc->mac_id; desc_params.skb = tx_desc->skb; + desc_params.skb_ext_desc = tx_desc->skb_ext_desc; /* Release descriptor as soon as extracting necessary info * to reduce contention From patchwork Tue Apr 8 06:13:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 879729 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 4760725F985 for ; Tue, 8 Apr 2025 06:14:04 +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=1744092845; cv=none; b=uuQ2DCOYTkJ9qv71D4t4/sluy0hGRWb3YtHlFrzb9iJNqKUlKXNmNoBxLfbXaDKCuDfwQCQKD1n/S3o69KKOj7LDbKlYncMcrIKafuPvC2CTwj8TwTt74x60sCc0DJYyZUIoHoRvsedIkofjLY2fFAVPx7j47hX2Oa67Y1cS7+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744092845; c=relaxed/simple; bh=lRdsgyk2PVwbTdF3/ou7/1EHozWl4HwuVjydW9UXQhs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VYprlab1KLsH58K9GOQzcIVVpuWN0AlibJdnj7RG0XQRGY/hyKd6nI3qH+YgFvJxlOrlreirZEHEXiBvLtYqS3fgBDxRnfqQDrf5QcgI1jfzr5sj0wjNvgSc6MtOPTtio+J6+WCctdGlD0UkYy3cBbIVftJWsQXOxY2ZViviSnA= 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=DKnXUHgw; 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="DKnXUHgw" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5382GOuF010519 for ; Tue, 8 Apr 2025 06:14:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=olrNLy2pDRf TnemTktBOL55UfepkNvExCqdqi2eTMK0=; b=DKnXUHgwFyXUkd69i/6kR6Q+tw4 p01JHmh8s+bMlg59ki+XGEixri09fqwBG5/FNOjsWnBgvJwIIx6qW9S7jsnYHDnc dkXeyq4jKLkyo8emIRnBgSXjJ7hbSo61W0dA8QsJ370QzwXR1wFuaado4qRIna9s SLpoTxiv4Iz9DwP1BqrBOrPbebFtMfDw+pu7mT2Oq8/LCar0q5yA1iQGUpRiAhlp +/ptjP0T0w01SpDtuzC/hZN3D7q3W+FGuFayvboch2g+kOS62jhDEp0qgMTYbPbs /NXhOBjyt2ncduch9+liPsAuMhZlIBpSfpn3d0hHkY8BuKwASwgNc8lGR3Q== 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 45twc1ekep-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 08 Apr 2025 06:14:03 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2ff58318acaso8825533a91.0 for ; Mon, 07 Apr 2025 23:14:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744092842; x=1744697642; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=olrNLy2pDRfTnemTktBOL55UfepkNvExCqdqi2eTMK0=; b=SKsSokGqf+Zzt3QMup6ZHbsxhkrDaVWG7JjBx54VZ5YRsPY6FD9Va0pA0tntDgVSA1 mJkHOlCBhxDyaPbiCkmFI84xQAeqtFilL71OolS26tYOb1u1X/CLFb+h9vLMQNFyQCnE +FgyzdTkPQDn8Zmc2ekCVdUE60wUUFbXnhs4eFY8W3jMFt82d7dfS9wXDbRNRsfDRy5Z QHD+BwkW+nRq6kiNzPjxc6vyOhrYuSP387ML3q3BkjaTyVsnJ8NOl0co4JpgLMqzSzOr aHwhENx4An3wBApyuO8v44AUP152H78vwJlz3uUwkP9UHOm5zvDe2HA3QEqDbXUzLrP4 MYPg== X-Gm-Message-State: AOJu0YyN6VQ+Fr/6CFixqk4BhlXYAmiQRGjt1J2dDeP/lqAZbBQm9eoh ziHACJV9yOdlYS/U8ILNMQosLJqCfDYQMtQ+9YToaABio8LUZn0yvyglQ9Z0w96h2k+p64QBf7G R4/OVDBIfv939XEAUH/VyymEWFfpcOwa94FxZWvbHCyIRxE6AK2UkDIDLUdrw/tzukReuJXlxng == X-Gm-Gg: ASbGncvsO9UayQV3cng7KPKB6LdjXvlqG47ZKOaztvYXWqqIDuwImR7hPSxagNiZwKT Gvg8xKt3nHp269AOdsmQduwUD3Yl08UW6Kd3p36sHV2L3gSHUsNtdwW2rtzJkcCP6j/OxPdNiY3 DYVEGOSaUAQrs4d4ZSZ+PgKCJeojgz6CwYdmLtQN+nHFDE0ZH6n7MPsOg7I9o9SiW850xcxVbvg JLkjkYe8q4jjsf4toOCF7LdHjj+LzuOuCV8P54fxsvbkYt4gNKVRPNxbrdgdsnkBsjNs0hGvO17 SwpkuDlR9wHOZSm+93COQzIz56deleQn0n+rIrx6AJbX4hKn3unX8dBR7mhURRDZZqS63iTfkKr rLXkjzbdibIs6oosxWyDd9qiIMP30tJ2YKg== X-Received: by 2002:a17:90b:188c:b0:2ff:52b8:2767 with SMTP id 98e67ed59e1d1-306a6179a96mr12672344a91.19.1744092841800; Mon, 07 Apr 2025 23:14:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmOq7mvvxns/jU1l9GXGdqKsz3ASS5fX2Fd+UjuOJusmNSgIgcWzVv2cx4/ddu7CQ5sSqI9w== X-Received: by 2002:a17:90b:188c:b0:2ff:52b8:2767 with SMTP id 98e67ed59e1d1-306a6179a96mr12672323a91.19.1744092841311; Mon, 07 Apr 2025 23:14:01 -0700 (PDT) Received: from hu-ppranees-blr.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3057cb94f4esm10258444a91.46.2025.04.07.23.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 23:14:00 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v2 4/4] wifi: ath12k: Use skb->len for dma_unmap_single() length parameter Date: Tue, 8 Apr 2025 11:43:43 +0530 Message-Id: <20250408061343.2774345-5-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> References: <20250408061343.2774345-1-praneesh.p@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: hwDyY3pC2tby_-hcQhTKcA-dXGc3Phqn X-Authority-Analysis: v=2.4 cv=KtdN2XWN c=1 sm=1 tr=0 ts=67f4beab cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=HWa5UnKU9jpq--M6GMsA:9 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-GUID: hwDyY3pC2tby_-hcQhTKcA-dXGc3Phqn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-08_02,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504080043 During dma_unmap_single() for extended skb, the driver currently uses sizeof() of the corresponding structure. When the allocation size changes, one of the parameters of dma_unmap_single() needs to be updated everywhere. Improve code readability by using skb->len instead of sizeof() the structure. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Signed-off-by: P Praneesh --- drivers/net/wireless/ath/ath12k/dp_tx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c index 03ca45d10f7c..3bda44b41e34 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -481,7 +481,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, fail_unmap_dma_ext: if (skb_cb->paddr_ext_desc) dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), + skb_ext_desc->len, DMA_TO_DEVICE); fail_free_ext_skb: kfree_skb(skb_ext_desc); @@ -512,7 +512,7 @@ static void ath12k_dp_tx_free_txbuf(struct ath12k_base *ab, dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); if (skb_cb->paddr_ext_desc) { dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + desc_params->skb_ext_desc->len, DMA_TO_DEVICE); dev_kfree_skb_any(desc_params->skb_ext_desc); } @@ -544,7 +544,7 @@ ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab, dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); if (skb_cb->paddr_ext_desc) { dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + desc_params->skb_ext_desc->len, DMA_TO_DEVICE); dev_kfree_skb_any(desc_params->skb_ext_desc); } @@ -745,7 +745,7 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); if (skb_cb->paddr_ext_desc) { dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + desc_params->skb_ext_desc->len, DMA_TO_DEVICE); dev_kfree_skb_any(desc_params->skb_ext_desc); }