From patchwork Fri Apr 11 06:01:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 14047599 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 CF16A1D5ADE for ; Fri, 11 Apr 2025 06:02:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351338; cv=none; b=oH6HQTX3+VtosVZicu17LVVCtM2pssenQgvnR2xuAPibxakUvvNrhvTppOaLiLgnuruS9AeGvDG8Umx+p3vQWqhN7LbpKN4e9HHG65zTBFHr9CUtbiozib1N3iDkCbz5h/+sWNpe0uErdHEqMVdL93AsyoxaGMqL91kB9GQ3WuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351338; c=relaxed/simple; bh=F24u63wnC/dR8Yxjy8Zvu9k7RVF09WzPYgQKBTPvtaE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ecOHW2/u8SbXYrJEBHNUspDhEbUHgQkz/RvCNKPGE/2ZQLXpMr/WS0Nc/8PRV31+xnIDtFp/rsv/VPObhwQGP7VM6PL6sWKs+4zVPyQTSXrMAJxPV5zlbOpcDj/4wGOgjwUuKST5E43Yllqdu0viNsnouh39gRbqrhJZPxlPGjI= 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=pKQXs+tS; arc=none smtp.client-ip=205.220.168.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="pKQXs+tS" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53AH7whP030632 for ; Fri, 11 Apr 2025 06:02:16 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=JlHK4YKuTzk w/iX1UXQiiH6p3r2tB5QEn0INjW1eDb0=; b=pKQXs+tS0Bt7f6KeZUKfYTp3HQE 0ItrmB6whA902585eXlgxZARk6vAnSxoCba/Y60SIeyaC/3gjiEbq1uD9wHD037w IWSFH/f/6HKAvM2nfDQ9JSmjEOQuqdIN/cp1t24fjkUWcSs9veKfnr+/R0yxciC2 40BUiup6DiCrdA4CQR54qo9LINBaS9xU0dQik43llc342sLNGtdLvrg2u4feKraE LyRvUzVSufFNuJ92xZICA5XRmKfHPyGNMmShxOrMRbJoHinnTSuU9fsaE+2hhAk9 9mul6mRvAm4A9uZbJ/ErUzYFRhzScXQR8yVuLhSSxpM4OzHUNLwuAD9sWNA== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twfts4j3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 06:02:15 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-736bf7eb149so1247890b3a.0 for ; Thu, 10 Apr 2025 23:02:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744351335; x=1744956135; 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=JlHK4YKuTzkw/iX1UXQiiH6p3r2tB5QEn0INjW1eDb0=; b=IyhIfAYYenYcQyghQ5tPV71ulw1bGlOxWXvt50n3ex2DFIvMI558RlG/VDmwK6aRiS EfanfPP1iGm7KbwWziQd7TIJGVgBZJ2SQqWyJcAhg8ytnE/9jt4fX0irT6f18tMDgZDG BeDzyZpRkjoq9j+7jw8SlrZNeIKf1OU/DsNte7aBnwDjYXvkdoIm7qaYKLB2AYRSbeWw w7ubgH/xNwo8xXIzcdD2Dwk2sojT70GUPvKrkZVItDOSN818IZiXhsLgtFUUw+34Jtxc g5yRe7ZFihYjMLtHhVEHdVAgE61oyBqOJlfPa9pYe4xdxtzpk3bUP713XcxBccBNJiMN 1E6g== X-Gm-Message-State: AOJu0YzeonhXir1upkN+62IbqTYq4bm4jDYDuWzVNgsmgMTZFpSiT+Z9 Sg2Uzsx9Eko+rcZbMUyE66hSSrgQU17fcDx26ycQK+PjxeNLW95ynpe1XoFElHOoleizPFYLb1u u0A6u+VJzBDsw8+5Ju81dPgyzbMRonRtxGHHJnIb15IytMTDcDTGJ7SsaCTSIBnHnabfPs8Urjg == X-Gm-Gg: ASbGncsBiUDZbwu9hQ4fZlLXSvlK8XsimsYYE3TOk+TF4MLkONVTzKvP5YS4L/DGJtD E05h7CKzmCsi/9yRSikbwF5GZ7KmhQDX2xmN0HaeCchosPUoxC/0HEDp6Z7gNJTo542MYTL39Ep ZwP6NDdIWtjKFMLpzd7nwR+zjR5gFZOMuTu3OteIKwJHBHB2GvPgIfJECVyjseIKIJhwU5F0biY ZsEy7+lOU67MY3ep5Ld8kjpi2dQBxbhtjbDIu+d0UTwNhBI3RgVQP67eSDFE8ryAnQYkWiOl1L6 V0h9OMwqxb2MTP5pXHkCcXsDKlwJicaJgMvsPXvR9tapPA9uw26oigLDck6WOdvFkrMXue5wABH JFf27I6OrQygj3u/xxMETPioWUBdvAA== X-Received: by 2002:a05:6a20:2d0e:b0:1f5:6b36:f574 with SMTP id adf61e73a8af0-201799908cemr2526355637.38.1744351334681; Thu, 10 Apr 2025 23:02:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5sfpUjKl0m3+LJ6poTjKB4m7DlLGLpImnll9SAYXKJuyQ38HG2wIwpl2Ghcg0ArHJgQUbxg== X-Received: by 2002:a05:6a20:2d0e:b0:1f5:6b36:f574 with SMTP id adf61e73a8af0-201799908cemr2526314637.38.1744351334173; Thu, 10 Apr 2025 23:02:14 -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 d2e1a72fcca58-73bd2328435sm624567b3a.157.2025.04.10.23.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 23:02:13 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v3 1/4] wifi: ath12k: Handle error cases during extended skb allocation Date: Fri, 11 Apr 2025 11:31:51 +0530 Message-Id: <20250411060154.1388159-2-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250411060154.1388159-1-praneesh.p@oss.qualcomm.com> References: <20250411060154.1388159-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-Authority-Analysis: v=2.4 cv=B5+50PtM c=1 sm=1 tr=0 ts=67f8b067 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=Qd23BeFobrpH1aaNZ9kA:9 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-GUID: cgYaXyVddKsxQbPl9otWAug-6H78h2tU X-Proofpoint-ORIG-GUID: cgYaXyVddKsxQbPl9otWAug-6H78h2tU 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-11_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 bulkscore=0 phishscore=0 spamscore=0 priorityscore=1501 adultscore=0 impostorscore=0 lowpriorityscore=0 mlxscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110042 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 Reviewed-by: Vasanthakumar Thiagarajan --- 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 91da0805706f..9d58a9a9cbff 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -231,7 +231,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; @@ -417,18 +417,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; @@ -464,7 +461,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, ring_selector++; } - goto fail_unmap_dma; + goto fail_unmap_dma_ext; } spin_lock_bh(&arvif->link_stats_lock); @@ -491,13 +488,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 Fri Apr 11 06:01:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 14047600 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 9EEC027C875 for ; Fri, 11 Apr 2025 06:02:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351340; cv=none; b=L9JvInyHOcNtDy/7KHhwgeqhYaoWfiYQ+mi61aILZ9QTEHfwuvJse7JcEiSGDx1qTsKaguY7/UXvwACURv3v1sss+bakdypQxWIaU00XXY1sRnvAeJYOf7CeV8BBOtmLSHez4Tp064WlnF3c9Utjs9Xiy83E6w575cTDK53pqNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351340; c=relaxed/simple; bh=MHaxQpJqyQvOZDbhRicrMY/Z8dQB8FRjcmv4v1wwXjs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sr1oLIxJILWWZTAq33uqJCfl0kPBzcFd3P4yloDk3dI6CbbPnlVtv8u7iByjq5Nw/srgKBpwZEOglC61VUzgAzd9SjfxQMqExh+fP3qfDfAag3/45QuZQgNIFV7O+gdeFLb9TAXc+KM6zJ0wE8U3QkFJlt74Eq88/uldIPMlBdo= 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=VhN8ugXH; arc=none smtp.client-ip=205.220.168.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="VhN8ugXH" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53ALUDou022952 for ; Fri, 11 Apr 2025 06:02:17 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=HCtVp2/c4MZ UyEuyO+HVFhPJjUakW3UDCQt6LzIMjb4=; b=VhN8ugXHNibCBgQkrFoUffrpnPK ytR1HXOkRwBWhZWXslubiqAiufrYKhbj60PuYw3MQU+6sgbKGjgqJpvCVbEy2xV3 gR0ZQVXgc7dq+gvEQgzn6kYOs/Cdpb9F/hriplZ+drlNs9DjgbcVos7zLK8Se+TQ +At7/D+ZgJvagbEt0EbKvS1GXprqgHEcZNfKitoHDjc2180holxnSvbRg5xpFt3t sp31ILG0cpSQ4qdbmyuZHlDANMA3dD53/LPSbiOu4BV2LMaXNLQPjYHcl5wawXuD ja5wdjuoTAiOAZPRMTZWQkzhV0rVZ8Q7R6mdww9ifpvXPI9QfOEP/iX5F7w== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twtb9fj5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 06:02:17 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-736d30d2570so1486030b3a.1 for ; Thu, 10 Apr 2025 23:02:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744351336; x=1744956136; 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=HCtVp2/c4MZUyEuyO+HVFhPJjUakW3UDCQt6LzIMjb4=; b=Y2tc3XTwuvIxawW68FB/Lyn3FymsAg8ciKJXOiXXbmRWmL4ROmUznyW8xKWEkBGOoE nh6Zi4MjKYK3KUgB7lVL/foKSxlqf0w8HPpR+6VEpU+WSVFeELd6FpkuFvgLlw9C3zwz +YAexVDozjGwu3Fea9UGmYa4Ky7VlB4+guAjmOomoJsNtiTAn+7y82fL5jzrsb51B2MC Ltb7JL3guhk2UUUcy9xlAWu0xJK9Ck9bTNIqFLxcSoDF646GhJVr3BEtU4MR24zb4BC8 26uYTN/dJgI/L3I0SPr+2l1GXcj+76cSIMY+bt/isSVCkKAz1o7CyY/1LeJ4gr7qZvlB 4YJQ== X-Gm-Message-State: AOJu0YyYTY5/7LruXiAcxXFrJ18TNtAX77tl1xlz9hxwCZCMgEcas6hC XIsfGUN8caGjzkMXiypwwl3bOq8/mcjgqMvob25V8Ic6VNCMCGzm6jaexI0uvmcHPwDfWOLxOhd COynrDWE+qFcHSEBt/+PU3Ut0TNOh7cfgNnTgdcZgeLUmd1LgoN5Kh+KgyeAwH8Dm4miltIgACw == X-Gm-Gg: ASbGnctEmoAUXmdWM0tm6iDaIR44MARbXJkr1/BJL0xNHxqoKOqUEeI7Yu/ugsa3Jxj tI8Dl2jOSXC4/Rag9rQe/BMHeewI0N2h2ID95HOIHRgHSo8VriKb24drofIE+eH7LEv7mWyd/oV bN2vAUVkUFQFPRV5VD8m01z+4x4J4EKG6ryEY0aGOlkQCkpZrrHvsG1iNeLquS2/8tLmb9QX+t8 8adHtkGv9+y/GUu3kaXp2G9UEL5lRB9HqxnrCEH8i0XzQJJ8QQRGTtkqib2zGTLWbyF/+ntMsSa Pa5T356ytAYcXVX8l40gZMZy23Beq14Nh8Pub0rAe99XGRMScM+iRnQbQxlIzdaC5I0Ix5NTzJI eZrS8KTysLzuUC4lr6M7WARU9cM+mOg== X-Received: by 2002:aa7:8881:0:b0:739:4902:e364 with SMTP id d2e1a72fcca58-73bd127278amr2101020b3a.19.1744351336385; Thu, 10 Apr 2025 23:02:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFArQi+O/yuGejTqFKNVWiTmHtB/EvA/5NTK5V4pX4nn8svVwJWHVJu80ab1OW914dEPJGZbQ== X-Received: by 2002:aa7:8881:0:b0:739:4902:e364 with SMTP id d2e1a72fcca58-73bd127278amr2100989b3a.19.1744351335907; Thu, 10 Apr 2025 23:02:15 -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 d2e1a72fcca58-73bd2328435sm624567b3a.157.2025.04.10.23.02.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 23:02:15 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v3 2/4] wifi: ath12k: Refactor tx descriptor handling in tx completion handler Date: Fri, 11 Apr 2025 11:31:52 +0530 Message-Id: <20250411060154.1388159-3-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250411060154.1388159-1-praneesh.p@oss.qualcomm.com> References: <20250411060154.1388159-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: 9IqvbCO5_e-VcFp1n-qvSaX4l5wItFkD X-Authority-Analysis: v=2.4 cv=LLlmQIW9 c=1 sm=1 tr=0 ts=67f8b069 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=DEzRtGDzSFLe7Yuc7ZwA:9 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: 9IqvbCO5_e-VcFp1n-qvSaX4l5wItFkD 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-11_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 clxscore=1015 mlxlogscore=980 malwarescore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 spamscore=0 adultscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110042 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 Reviewed-by: Vasanthakumar Thiagarajan --- 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 6ce5f853dcdb..241da2a3bd34 100644 --- a/drivers/net/wireless/ath/ath12k/dp.h +++ b/drivers/net/wireless/ath/ath12k/dp.h @@ -301,6 +301,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 9d58a9a9cbff..a272d5b8a51c 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -513,12 +513,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; @@ -536,7 +537,7 @@ 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) { @@ -546,6 +547,7 @@ ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab, struct ieee80211_vif *vif; struct ath12k_vif *ahvif; struct ath12k *ar; + struct sk_buff *msdu = desc_params->skb; skb_cb = ATH12K_SKB_CB(msdu); info = IEEE80211_SKB_CB(msdu); @@ -594,10 +596,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}; @@ -613,14 +614,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 @@ -752,7 +753,7 @@ 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; @@ -762,6 +763,7 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, struct ath12k_skb_cb *skb_cb; struct ieee80211_vif *vif; struct ath12k_vif *ahvif; + struct sk_buff *msdu = desc_params->skb; if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { /* Must not happen */ @@ -891,11 +893,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); @@ -949,28 +951,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 Fri Apr 11 06:01:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 14047601 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 003BF1D5ADE for ; Fri, 11 Apr 2025 06:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351341; cv=none; b=QJDePfmAccLvR8xCYBjPxMEgoN1iZPLCvLRXgLHo6qAxBCZzJkKJDcqqCJAuZGD6PP4uIm+dZMrgV443hnBLq2OEn2awzpntfI1WA+hav3eomeUMgd/1iLqcwKoj/4xD7sXSei/tq4BjvnEaTG9hM31cxwyFXw4SH2hT6XCm4kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351341; c=relaxed/simple; bh=+OFPyyemslXXgBXsQgaBwAv9gWcvXPRIr0/1/WdivDA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jw6mBY3H8AwmgHtmbTOs68e6yVWyNoLbYp/dH7VPqeFFuH1lY7Ro7b29U5HW1Ox3ZPY2LBVaATjzwfwErv1cZGrn2SAMy98lKQwA9ZhEcxoQtG2Z3i0lvNVER6YMxkzUYJxms9cVODXQYF7OpqAbKaqywMfFPdWCEWbQ6txlvDc= 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=K0k87+Ib; arc=none smtp.client-ip=205.220.168.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="K0k87+Ib" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53ALf2ue006137 for ; Fri, 11 Apr 2025 06:02:19 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=2wjvw48IRBR Hm7OUe7JcfSIfNWxDA2eN83zFkdDNCBU=; b=K0k87+Ib90uBvLPVjzgA1YzxZZ4 VXPKshjUcWaCewDJYzDhvfz9pyGuScbfNklxcabmd2JdnBAxbHCtAmCarzYDXUlo YkVEOmQZMcKnwEFaRyn4uWCcGXyzJTaE32Wi5k41ztAiyZomEHB6rrYUPkk+iEpo 0dC9SvFlX2TgDiHo7MIz8OA0R4QJ6yWtFRMBos6/Wjqn4lLDoFx7HNInqch7Bl9Z m94GjdPFi7g3cUB4jB58IDS3/VwgaYTFrhGQw6mWMXil1hGtbuyN6srkvOaPivS4 GDA6ckvpg2bCczIMJJRitzNO0zPEUf1+5WTeC3OL21MED46O7ieOAV3k0ng== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twpmh92d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 06:02:19 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-227e2faab6dso14476085ad.1 for ; Thu, 10 Apr 2025 23:02:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744351338; x=1744956138; 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=2wjvw48IRBRHm7OUe7JcfSIfNWxDA2eN83zFkdDNCBU=; b=rdnqYjmrGr++T1ZcwddtCVKqyMcPs5tmk7y9LwcYK6GybOmzuICXaAZQzNLH1K7Omw D/h0pmYd2MXosJdCBCAwmMXnSVPrOaePF5AunpCO+qHDrpk/HfgqKAOn0i6TCCMy1SJN c4hw5h0jVlpIuYt219VfuUkl6ISDlLcHVEByDlerIzACFoCZNub7HmNyVDCWh67JMobB YRfCuFMq08VpWR5MppKVHOq44mzvCJ5Rz1a8guyrZhrDsYfQexFAs9og3orB64JRcxkC EX+rjiTp/9cv1upAlTy7jUcIQQatZWwNFzCr9Oflf0ZMuho1vLJcc6aZb5NkxhkFDNUd kMNw== X-Gm-Message-State: AOJu0Ywlh3GM1d7vXvZkXY/yWro8rTIt7uDUI/jlOfX5tPRiwfm8PUBj AP7uzJaDG1d69gKKFN8+RUwexMLQUSFz2urud0liNLFC4HH5GNCT49NJP+plM/Kom1Rq6ca4M1n B+gjWIqM2g0Y0BmNggidSPSLk7MaL35mfuDYmq38m7JHn/QewyKSKNbn+NhG0KkAAwsYfdMm9FQ == X-Gm-Gg: ASbGncvwXOWgg35JJGsMozTyqhJTG8oQBfUoPkbu5cVazs9i91lAHkqJUAQ+KmozprW vDJYvIhjWALYVvB15f/piVZQLryyGAMQlnrlzN0lj/zCklOeTLpdbJAP8Wa1nQnF3/u6r1mJXu1 Zbp4BdVhROf0vm4Lj1afjE+eFfL8XBMtqYl3ki+suPgIYahY05rrEKtbbr/SK+p1AXhAzELs1HB UevU32R8aoaYzjGaEHFqUWqh59gtzvL4TpUmXEFur2HN/ylggQ92rprPcyTc7QlwwDiFZCF7J1y lsClcDQUBfHKtnPuHWKfoTTJqSn8+wAYOrIbCrwtfr01hOpHv+XOftURAvtsYMNl5rz6wMwSvBy UJwZ4JirycU3Ci4yRPDNOFhzM3Y3oKw== X-Received: by 2002:a17:902:c951:b0:21f:68ae:56e3 with SMTP id d9443c01a7336-22bea4f009amr24034805ad.39.1744351337802; Thu, 10 Apr 2025 23:02:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLRteCVlMEaQjh10Hbrr4gt/Q1E8StKnZJ2JTliMj6Xe5gP346m01uvv3afIMpzn7jCnbWPw== X-Received: by 2002:a17:902:c951:b0:21f:68ae:56e3 with SMTP id d9443c01a7336-22bea4f009amr24034555ad.39.1744351337401; Thu, 10 Apr 2025 23:02:17 -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 d2e1a72fcca58-73bd2328435sm624567b3a.157.2025.04.10.23.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 23:02:17 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v3 3/4] wifi: ath12k: Fix memory leak during extended skb allocation Date: Fri, 11 Apr 2025 11:31:53 +0530 Message-Id: <20250411060154.1388159-4-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250411060154.1388159-1-praneesh.p@oss.qualcomm.com> References: <20250411060154.1388159-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: xjK6su7e6rMrIV13XVzvEsqiCSzjs1Yh X-Proofpoint-ORIG-GUID: xjK6su7e6rMrIV13XVzvEsqiCSzjs1Yh X-Authority-Analysis: v=2.4 cv=MpRS63ae c=1 sm=1 tr=0 ts=67f8b06b cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=iFgiq4A1vBvqtHBMXJkA:9 a=uG9DUKGECoFWVXl0Dc02: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-11_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=2 mlxlogscore=999 clxscore=1015 priorityscore=1501 impostorscore=0 spamscore=0 bulkscore=2 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110042 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 Reviewed-by: Vasanthakumar Thiagarajan --- 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 b8e63f489e7d..ad873013e46c 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 241da2a3bd34..706d766d8c81 100644 --- a/drivers/net/wireless/ath/ath12k/dp.h +++ b/drivers/net/wireless/ath/ath12k/dp.h @@ -296,6 +296,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; @@ -303,6 +304,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 a272d5b8a51c..9bcd20712888 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]); } @@ -431,6 +432,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; @@ -525,9 +527,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); @@ -558,9 +562,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); + } vif = skb_cb->vif; if (vif) { @@ -773,9 +779,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(); @@ -953,6 +961,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 Fri Apr 11 06:01:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: P Praneesh X-Patchwork-Id: 14047602 X-Patchwork-Delegate: quic_jjohnson@quicinc.com Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 CB6E727CCF6 for ; Fri, 11 Apr 2025 06:02:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351343; cv=none; b=N9Oc+ZbpNk3CAGnS9KNZcHEucySZezwv5RvDedv5Loi6m99Wr/KJgSO4WTS/T4ANFMmxWCqFYJ9Tcse9iHSIfb0VXXbVajrkbv0yRFosNXCZiTPgIGLn23GlBeaq/pR9rHE6iQaKslGr30RTegp08hjUeF9S2K0VmbZlEFlnRq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744351343; c=relaxed/simple; bh=kkZN04hvg7ZnlJzsBQNhiH9OQTP5Te0AQrWwtbTXk5Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DW+QhFQoPB7+WB3tFSki98V9SyKaALyEcnSVMv95af46NZf+A7oSLJ39ygeyOfEr5okbUhAeK3kzZBXPRqLek+OHOlexkw7xKO+Re/JnG5hvhmdKYrN0YJJfWEExrp0CBhrHEf52MwjPXrWe7ngt5QQyxCpZgI3m+gRXC48cHFk= 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=n5NmWVci; arc=none smtp.client-ip=205.220.168.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="n5NmWVci" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53B5Z4po032024 for ; Fri, 11 Apr 2025 06:02:21 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=3LI+y2nA3KG cyfqaaKLuNSW0EzMKBoBYWbhA47+9hn8=; b=n5NmWVcim6UTtkkacyU56Hbz6jd Q6SiZiwvyMKhsOKStSPBvzkWdvn2zAub580WJq5s0SkGZfkiZJUsuLCphImYb9/G SNEq2IbX3GhnhQrgQCsfpxc8LUtx/GMiPRu9RZT7EOry16w7afj02Dc2mHdCuJtI wkv8M8OPw70ZNoNixRhnxI7DtKxL7uEifDbhYw94WiSjLL8Lo2jEEoTKssf59YXg RZwzYIDYCXtAyDkFIPpsgmyl1UJhHSFKBCyJn8yrrx7+rteyMPY8LHRtL2ZdUkKB jBhP67QLGCrZ46Vh6UuBr7Mn6mgRzcqCYzWif9+yvwNt1PpOcE7xE0nJtaA== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twpmh92h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 06:02:20 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-736c7d0d35aso2043410b3a.1 for ; Thu, 10 Apr 2025 23:02:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744351340; x=1744956140; 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=3LI+y2nA3KGcyfqaaKLuNSW0EzMKBoBYWbhA47+9hn8=; b=SeXnsBRPxy3ygOv45t4HpldYsbdhRxb+dUzods7RKt75jQGumj4h/pR8hZdCwHorOt jUqZ3iNVc2EfTuPCWwY48j+RF9TJGy/9ZlOjBjyvDqVaVkBFMReXHBIgjCwZnVLpbtfn 9TLfPiQQkBZaZ8kA/+TYu1zPwMS8t+fg2KOhIqXjh4WPDU2C+Ms4V3/33uG0NnjCSDF5 INEmmw2FxgBi3Sy4773+D3Ka949vz/d1ZFoVRO5ZZ+0e/w17+RoWs7OBBSgH6vRqTtu9 cHBJASaXys1SEsvvt1OQpuYRsCDq/Ug7uwwjEH8T4Px7wmjPHFW72LwztCkQPnKq6/Ej uvaw== X-Gm-Message-State: AOJu0YxVuVYXyjI8lJZ1K5gK5Q86dXib6a5Eb34Reu/nRXewZ9Rd9yqQ xPox+/HDVK9OvyeHDSPPYBSA30vHmT031+yfIaizZstvbkcmiekygkLEvvWSsdM/LuDhY/erdO2 bim31Lj+Afce/3WOtC1VM1uvq6Xf1xJLjtCNwwLsyBWQoDPkCL/rdZVIPwHwz8YvgPZRnPk8+rw == X-Gm-Gg: ASbGncsOTSUHmsaZSEV+s07tx2neuQ1GfYV/UAGX6TnnIfmJfVokoCGyz5W6xmkbx4I yUVK3vmhnHBfCrXNfakenir9IiyIsT9KUnsOucKjfQ2Ch1/ey4UbFqJEsn15jgA2YSlNaV6NrXU byv8tZPbT0JigBJX28OtO+GeWkg5NMMwpLnMDaIh6XNN7ow6yNgtKwJDsr9Cqy4Cz5oDv50rpPg rlFhnrSqBYrgXiMfSLNXbezwIydBzQRaxL8uMs8sFhPmROkH63YZ5nV768YQX2Nm5lofPgdK5m8 7alIYfj8W7SkYrVzGgkqGS4dO4wK77BCXh1GiRQ+ca4vweX9UUvGwZcUJTKaZTE7qS5lD+76JLw 9a1rEIDsu3HQSKIuj3ffGRtX21dy7Pw== X-Received: by 2002:a05:6a00:1482:b0:736:55ec:ea94 with SMTP id d2e1a72fcca58-73bd1293b3amr2318920b3a.20.1744351339636; Thu, 10 Apr 2025 23:02:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGeE2pYHLFT4X13kg4+fpoiqxepA5LEoDfh+AVs7ZQVLKyLO6oscajfotgM2Yn76JUwcsL0qg== X-Received: by 2002:a05:6a00:1482:b0:736:55ec:ea94 with SMTP id d2e1a72fcca58-73bd1293b3amr2318850b3a.20.1744351339095; Thu, 10 Apr 2025 23:02:19 -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 d2e1a72fcca58-73bd2328435sm624567b3a.157.2025.04.10.23.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 23:02:18 -0700 (PDT) From: P Praneesh To: ath12k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH ath-next v3 4/4] wifi: ath12k: Use skb->len for dma_unmap_single() length parameter Date: Fri, 11 Apr 2025 11:31:54 +0530 Message-Id: <20250411060154.1388159-5-praneesh.p@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250411060154.1388159-1-praneesh.p@oss.qualcomm.com> References: <20250411060154.1388159-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: 29eTukpqgirO06BOIheqOLy0XQ6_vi8h X-Proofpoint-ORIG-GUID: 29eTukpqgirO06BOIheqOLy0XQ6_vi8h X-Authority-Analysis: v=2.4 cv=MpRS63ae c=1 sm=1 tr=0 ts=67f8b06c cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=HWa5UnKU9jpq--M6GMsA:9 a=2VI0MkxyNR6bbpdq8BZq: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-11_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxlogscore=999 clxscore=1015 priorityscore=1501 impostorscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110042 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 Reviewed-by: Vasanthakumar Thiagarajan --- 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 9bcd20712888..2136eeb278af 100644 --- a/drivers/net/wireless/ath/ath12k/dp_tx.c +++ b/drivers/net/wireless/ath/ath12k/dp_tx.c @@ -493,7 +493,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); @@ -529,7 +529,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); } @@ -564,7 +564,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); } @@ -781,7 +781,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); }