From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E17AC54E94 for ; Sun, 22 Jan 2023 16:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230155AbjAVQQ0 (ORCPT ); Sun, 22 Jan 2023 11:16:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229986AbjAVQQY (ORCPT ); Sun, 22 Jan 2023 11:16:24 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E89A91DBB1 for ; Sun, 22 Jan 2023 08:16:22 -0800 (PST) Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 30MFUkc8022590; Sun, 22 Jan 2023 08:16:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=rb4sK0OGxhcsGgRhJdhcOfmRPdasjJADUmKhlombzpo=; b=XWkl9J5kvr4fZ4yF92NMLkodGL/qjYo+uYD/iOnSOILmNTUuyfj/M/Moda2fq4eU7EGE FggrVmROaiiK5x/EmxS+PiaFyH6Ko5inKZe/0JCgYVEWc5YnI+CLpPbY1y4i732sABak PQondbKTmclt83WBIQQSpJgu1AHTU4+Zr4PxDAeTVvZbIr6RAF43+Mgc2xSqM6w9dEgw dNw1ZJhSxgIHrMQWb4oiGC4rgOsSV9Wv1Vrm/gj98aFVJtljkrCIbXZOVgBJkoCZ0zrH BBKRkbHDmjtRR1zAQzUXxENLrv/E4l4VmZ9JWtIgMFQ3r6GAX63Tzdy1LCDwf2w+WwSu Ew== Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net (PPS) with ESMTPS id 3n8cm1e1ce-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Sun, 22 Jan 2023 08:16:17 -0800 Received: from devvm1736.cln0.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server id 15.1.2375.34; Sun, 22 Jan 2023 08:16:14 -0800 From: Vadim Fedorenko To: Aya Levin , Saeed Mahameed , "Jakub Kicinski" CC: Vadim Fedorenko , Subject: [PATCH net 2/2] mlx5: fix skb leak while fifo resync Date: Sun, 22 Jan 2023 08:16:02 -0800 Message-ID: <20230122161602.1958577-3-vadfed@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230122161602.1958577-1-vadfed@meta.com> References: <20230122161602.1958577-1-vadfed@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [2620:10d:c085:108::4] X-Proofpoint-GUID: SUzomPU7NsSSW1KZSRFQL7NdNrWLNv66 X-Proofpoint-ORIG-GUID: SUzomPU7NsSSW1KZSRFQL7NdNrWLNv66 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-22_13,2023-01-20_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org During ptp resync operation SKBs were poped from the fifo but were never freed neither by napi_consume nor by dev_kfree_skb_any. Add call to napi_consume_skb to properly free SKBs. Fixes: 19b43a432e3e ("net/mlx5e: Extend SKB room check to include PTP-SQ") Signed-off-by: Vadim Fedorenko --- drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c index 11a99e0f00c6..d60bb997c53b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c @@ -102,6 +102,7 @@ static bool mlx5e_ptp_skb_fifo_ts_cqe_resync(struct mlx5e_ptpsq *ptpsq, u16 skb_ hwts.hwtstamp = mlx5e_skb_cb_get_hwts(skb)->cqe_hwtstamp; skb_tstamp_tx(skb, &hwts); ptpsq->cq_stats->resync_cqe++; + napi_consume_skb(skb, 1); skb_cc = PTP_WQE_CTR2IDX(ptpsq->skb_fifo_cc); } -- 2.30.2