From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B37D742D46 for ; Sun, 25 Jun 2023 08:45:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE81E42BFE; Sun, 25 Jun 2023 08:45:49 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2048.outbound.protection.outlook.com [40.107.212.48]) by mails.dpdk.org (Postfix) with ESMTP id 68D4940ED8 for ; Sun, 25 Jun 2023 08:45:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mSrJFSfTAdZfdXPVM7QBAPE1XivXUY+jpvwEF/Zwq6bz+rSQM5RwcvOL7+UyC/C31nJIA3J/FOnB4+JkzEGyPSDryFChIiADklYNDPAClAF3zSMBQ4RWT5BeHWbmZWNxt5J36r2NyA3O5G7axuOGrCMsyk58uhvccejS0TgQVTkvS4Or9lhGPBr01Unzm5kUDGuc2TXNI4jmXu8gjRgxvMAPaA1I5DnXv/M0bQcXDbo2op48JBZV3Sk8mNBNrtT3KMdepNhgOrrNsyVEpWxStSNx7ldEH7MxZXZ4xEP1k0ytfjt4Y2FEPBq8OZvAkc+l5RVSQNV4ze/u22ZhUcAGxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=do4Tno4+lvRHbb9cjj5Xl/cYNg4kPoQA7heJnNQT3fs=; b=PCOwloIA+2iEEUf3dLPtu4PEg4GkwKj66CnPJoW5JWzU0ywdiygYeIAUGJ7YUz24Oz01diEB2jyzjQvUk9tF6NViBx8CE81a+F+6pmjOGeYEpi+iQHz7JsedAFORhdRe7pG9GU/muy4NBiRD94CIK3zLRNbWwLAEI21rIMvFMalJ8qop9mcR28Lo4gq/IUNA/F2D4mWFs5xmKXxUpFwz6eg1wtI3trAl/XX4NfyfnyvyGYDmT93jPZedEx7UC5oUYPDc95imwwIj5XcFxhcuK8Ec5DRXLDASgNszVwNGYgcc5I4dhmwEiZVSPtdHcIryKohIbHonWGJIi0uzxmzbDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=do4Tno4+lvRHbb9cjj5Xl/cYNg4kPoQA7heJnNQT3fs=; b=bUfEq9UF4aq301TsEuvvrinB4x0IWtTh/Eb4mFmcLB/qoBnpSpFFZfXDQneT3zo0p4k/muKrb7pScVxHr4zh1e0Uw0BVsDZWLYWdj4zf5p7o/3UAu0xWJIst9pS0dbbv/O/mAxztGQOhlAYxKdRr30hUrEq0LriuuTmLUIfBrJqRFFoaRCBqAAu0yv0CUffQczo77sfy7O313B0Iy1DdDw5/7IX3CEpriT2ou67ZPW47n/zG8UaYcMFkqSoIY5OiuU0sbhiDRRK9S4Wn04F4E3MTSo0zF1ORqsBpZK49BBLvw2vHuiI+A9exXvETR8V8WqWFGEx1Yb1qsxNQnTAg9Q== Received: from BN9PR03CA0301.namprd03.prod.outlook.com (2603:10b6:408:112::6) by SA1PR12MB7200.namprd12.prod.outlook.com (2603:10b6:806:2bb::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:45:45 +0000 Received: from BN8NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:408:112:cafe::1b) by BN9PR03CA0301.outlook.office365.com (2603:10b6:408:112::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:45:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT053.mail.protection.outlook.com (10.13.177.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:45:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:45:30 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:45:28 -0700 From: Xueming Li To: Wenjing Qiao CC: Christopher Pau , Qi Zhang , dpdk stable Subject: patch 'common/idpf/base: fix memory leaks on control queue' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:29 +0800 Message-ID: <20230625063544.11183-112-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT053:EE_|SA1PR12MB7200:EE_ X-MS-Office365-Filtering-Correlation-Id: ea13ce0e-c518-48af-acff-08db7547cd26 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: opywYY1aPxN4R59whr5loTFXTXHJLm2gydotZdaPfXFyzbSufevPdFQEUwN4c+56V1JOH/x5ar7nk+Vvbz2szW1lr/1ZLAw53Tf8fO8cZJKYuBFF42hsXUkuRO6aickdGn0w71QELiWQqPloa8ma2OjtksNifU7rldb5XwMy1YUgzFTCa5aio2Lo86vcVkSFoZ2P1nnE501INnoAY2rqzWdWKmWWlHBcb9S0UqHfnoIbPC6zK1iKD1hKjPZB1294tTRke8B3eoG6LomgDMQ4ezDcg4IunQdfZlG+yxJ0upptgRefT0Q+XDQ1V1oGx2cIlNT6XLjm/IkuJ/r8VgJ8doW/9yjBaaDwuRutlRG+2H3qNLOUuLAvd8/EVEgHc8jgB8VfcsmI1bp3isVtux2nBIUUMDao+96W9kR7SZXu6N5Rq5SMlQJiHIgUxDbLsjxaoSaVXHjgDzef57PILyO0pVgXnTvoiAVSycrJNAQCt0Dg42JaZyVzH2CSCi2fnI0dTW60q9DPzhH/eWd75lVqN6jKrCxkT9HqmhH4quaCSWis09AsNk8chhG6iQ55qDhVSuo1sHGJnYLq5FrUv5xKBSRqj5KFoHsNroEdVW3UUFd2WHWZB7lPuNzw8e6k8WR62MYKIZ0wwmjdcVTpk0S/QM4b4RQqpnm5OD/p8e9mhtqbmhGQn5S96jutv6Obh5GK1QR9hE2AWTHcv1p97jbatybxnTmuyXRZnZOMdJoaZPK7cXKY+La9eNEnHp1fFe6B6zdKBCWRaw8+HlPFivlkBA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(39860400002)(376002)(346002)(396003)(451199021)(36840700001)(46966006)(40470700004)(8676002)(70206006)(8936002)(70586007)(55016003)(41300700001)(316002)(6916009)(4326008)(1076003)(53546011)(26005)(6286002)(16526019)(186003)(336012)(2616005)(478600001)(54906003)(40460700003)(966005)(7696005)(82310400005)(2906002)(5660300002)(40480700001)(82740400003)(356005)(7636003)(36756003)(86362001)(36860700001)(47076005)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:45:44.6017 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea13ce0e-c518-48af-acff-08db7547cd26 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7200 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=b9f3b81e9eae675b51be236741cfa6ae3d511ade Thanks. Xueming Li --- >From b9f3b81e9eae675b51be236741cfa6ae3d511ade Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Wed, 26 Apr 2023 06:22:54 -0400 Subject: [PATCH] common/idpf/base: fix memory leaks on control queue Cc: Xueming Li [ upstream commit e83aa09770603943f7abd1b736f8c01ea4273e16 ] idpf_init_hw needs to free it's q_info. idpf_clean_arq_element needs to return buffers via post_rx_buffs Fixes: fb4ac04e9bfa ("common/idpf: introduce common library") Signed-off-by: Christopher Pau Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- drivers/common/idpf/base/idpf_common.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/common/idpf/base/idpf_common.c b/drivers/common/idpf/base/idpf_common.c index 69e3b32f85..de82c3458f 100644 --- a/drivers/common/idpf/base/idpf_common.c +++ b/drivers/common/idpf/base/idpf_common.c @@ -130,6 +130,8 @@ int idpf_init_hw(struct idpf_hw *hw, struct idpf_ctlq_size ctlq_size) hw->mac.addr[4] = 0x03; hw->mac.addr[5] = 0x14; + idpf_free(hw, q_info); + return 0; } @@ -219,6 +221,7 @@ bool idpf_check_asq_alive(struct idpf_hw *hw) int idpf_clean_arq_element(struct idpf_hw *hw, struct idpf_arq_event_info *e, u16 *pending) { + struct idpf_dma_mem *dma_mem = NULL; struct idpf_ctlq_msg msg = { 0 }; int status; u16 msg_data_len; @@ -226,6 +229,8 @@ int idpf_clean_arq_element(struct idpf_hw *hw, *pending = 1; status = idpf_ctlq_recv(hw->arq, pending, &msg); + if (status == -ENOMSG) + goto exit; /* ctlq_msg does not align to ctlq_desc, so copy relevant data here */ e->desc.opcode = msg.opcode; @@ -240,7 +245,14 @@ int idpf_clean_arq_element(struct idpf_hw *hw, msg_data_len = msg.data_len; idpf_memcpy(e->msg_buf, msg.ctx.indirect.payload->va, msg_data_len, IDPF_DMA_TO_NONDMA); + dma_mem = msg.ctx.indirect.payload; + } else { + *pending = 0; } + + status = idpf_ctlq_post_rx_buffs(hw, hw->arq, pending, &dma_mem); + +exit: return status; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.459682900 +0800 +++ 0111-common-idpf-base-fix-memory-leaks-on-control-queue.patch 2023-06-25 14:31:58.565773900 +0800 @@ -1 +1 @@ -From e83aa09770603943f7abd1b736f8c01ea4273e16 Mon Sep 17 00:00:00 2001 +From b9f3b81e9eae675b51be236741cfa6ae3d511ade Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e83aa09770603943f7abd1b736f8c01ea4273e16 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 2394f85580..da352ea88f 100644 +index 69e3b32f85..de82c3458f 100644