From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A715A0518 for ; Fri, 24 Jul 2020 14:11:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7FD501C225; Fri, 24 Jul 2020 14:11:03 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 3CA5D1C20A for ; Fri, 24 Jul 2020 14:11:02 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id a6so8468679wmm.0 for ; Fri, 24 Jul 2020 05:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=27Wu7gjhE2DDf/sdsd7l49VjVWAJj2Bh2Y61RZ0rHbs=; b=dL3JYpPDy1QDtx+US35gq2E0alQ4P0m2jizhh0/EDIy/h4FsQS3nFTSJzo5J5q5Bni hH9hIf7WeTZW/o/6ChhG7n887nXB9HRBc4idZ7iLdEMN4DwvYvdCqtMWbRmso98qTpLw RoUCjIGSWL2SGp5DnGK/VsjR6gOu4y/+YdATYQPD6V3wYQkBYKdXplvwYdiqwnbubSDa G9RwPShuzWNXNS//cLI9XoBgm+0ceQEuI6dtjWVQSTYCUWxsCR5elpChJyDcVNfZ0BoA Rmgf4YDNxDLM/amZtx21vbgJgBZBgdcFxVcrVEJZMroFOLe8deQcfuH7kyPIuhyXIiBY vOMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=27Wu7gjhE2DDf/sdsd7l49VjVWAJj2Bh2Y61RZ0rHbs=; b=edpFqttq0MxDauirTV0WRTM1I5pMcIsZ8jWbvbL+46oRUn8Fm1mYVhlgC0+d6fjzVo Qd0/FNhaxMwUucYikmIbPOo602aealqwvDyYpZB2+ECPrHCRIR93eZDZBZFHqippMww+ qD87Vt/p9QFIuB2NUT2Md1XASblsYu4RdZAWmRESZw2aRl7h4CvLMsu+tWG/ez3zh13h jmyQubPTLknVjgrzeRoxeeVMJcS7yDPxug2Ry8lk/O3F5/Hno+J25im5x4UrCNFtPIR+ VBVA/6xkcQub7ghCuFejC22/HfQPt/DcD29giEwStoONWaNr4fZS1GZmK7Fe9REfKjdC e0yQ== X-Gm-Message-State: AOAM5301cMlf/iIsmtnEWgeUkSQaBUeIgz+1NlMXUzuPkVcSk/T6Xhoa 76iYvUjU7IF1AUfaxgtpU8M= X-Google-Smtp-Source: ABdhPJza5BwT37Hf5dBVKKOctX851n7bLET5LDAIZpMG+d8AF41fUvSPf7XEd+djhW0Z7EYo4AXgpg== X-Received: by 2002:a7b:c8c9:: with SMTP id f9mr5521546wml.131.1595592661924; Fri, 24 Jul 2020 05:11:01 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 32sm1179002wrn.86.2020.07.24.05.11.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:11:01 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Hemant Agrawal , dpdk stable Date: Fri, 24 Jul 2020 12:59:59 +0100 Message-Id: <20200724120030.1863487-161-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/fslmc: fix memory leak in secondary process' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. Thanks. Luca Boccassi --- >From 9373ca5d89f429cc52bb955b16fb022296254f39 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 17 Jul 2020 18:50:17 +0800 Subject: [PATCH] bus/fslmc: fix memory leak in secondary process [ upstream commit 5ce366525a4cafafd965dd1dfd58c35de1c9ffd7 ] In fslmc_process_mcp(), we allocate memory for 'dev_name' but not released before return in secondary process. And it is not used since commit a69f79300262 ("bus/fslmc: support multi VFIO group"), so it can be removed. Fixes: e55d0494ab98 ("bus/fslmc: support secondary process") Signed-off-by: Yunjian Wang Acked-by: Hemant Agrawal --- drivers/bus/fslmc/fslmc_vfio.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 970969d2b..abf233844 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -730,7 +730,6 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) { int ret; intptr_t v_addr; - char *dev_name = NULL; struct fsl_mc_io dpmng = {0}; struct mc_version mc_ver_info = {0}; @@ -741,13 +740,6 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) goto cleanup; } - dev_name = strdup(dev->device.name); - if (!dev_name) { - DPAA2_BUS_ERR("Unable to allocate MC device name memory"); - ret = -ENOMEM; - goto cleanup; - } - v_addr = vfio_map_mcp_obj(dev->device.name); if (v_addr == (intptr_t)MAP_FAILED) { DPAA2_BUS_ERR("Error mapping region (errno = %d)", errno); @@ -784,13 +776,9 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) } rte_mcp_ptr_list[0] = (void *)v_addr; - free(dev_name); return 0; cleanup: - if (dev_name) - free(dev_name); - if (rte_mcp_ptr_list) { free(rte_mcp_ptr_list); rte_mcp_ptr_list = NULL; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.762675691 +0100 +++ 0161-bus-fslmc-fix-memory-leak-in-secondary-process.patch 2020-07-24 12:53:48.531011006 +0100 @@ -1,15 +1,16 @@ -From 5ce366525a4cafafd965dd1dfd58c35de1c9ffd7 Mon Sep 17 00:00:00 2001 +From 9373ca5d89f429cc52bb955b16fb022296254f39 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 17 Jul 2020 18:50:17 +0800 Subject: [PATCH] bus/fslmc: fix memory leak in secondary process +[ upstream commit 5ce366525a4cafafd965dd1dfd58c35de1c9ffd7 ] + In fslmc_process_mcp(), we allocate memory for 'dev_name' but not released before return in secondary process. And it is not used since commit a69f79300262 ("bus/fslmc: support multi VFIO group"), so it can be removed. Fixes: e55d0494ab98 ("bus/fslmc: support secondary process") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Hemant Agrawal @@ -18,10 +19,10 @@ 1 file changed, 12 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c -index efe2c43d3..9134ec552 100644 +index 970969d2b..abf233844 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c -@@ -739,7 +739,6 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) +@@ -730,7 +730,6 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) { int ret; intptr_t v_addr; @@ -29,7 +30,7 @@ struct fsl_mc_io dpmng = {0}; struct mc_version mc_ver_info = {0}; -@@ -750,13 +749,6 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) +@@ -741,13 +740,6 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) goto cleanup; } @@ -43,9 +44,9 @@ v_addr = vfio_map_mcp_obj(dev->device.name); if (v_addr == (intptr_t)MAP_FAILED) { DPAA2_BUS_ERR("Error mapping region (errno = %d)", errno); -@@ -793,13 +785,9 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) +@@ -784,13 +776,9 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) } - rte_mcp_ptr_list[MC_PORTAL_INDEX] = (void *)v_addr; + rte_mcp_ptr_list[0] = (void *)v_addr; - free(dev_name); return 0;