From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id AE3974CC3 for ; Fri, 27 Jul 2018 12:39:17 +0200 (CEST) Received: by mail-lj1-f194.google.com with SMTP id j19-v6so4037439ljc.7 for ; Fri, 27 Jul 2018 03:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wm/zVa1bTkkjeKJCxKmeJN8hsegYhj3YXZYoXOBZ3fE=; b=zD/uXsuuzQDbl7AFPX8ZB5mTAx9tYMOx4GXZjwTz9adY33TsK/BX4io0u7FiIdnhxt x6Z3BK+l0CETpB7LBj/1S3BGQb7pg0wAVDoNBzHEH3pCf9khdGWFgQdR8OuPONN3/kme RdtdXG07nO1eQmDOCvH9IQ0JlAZDvo0/6skgq6OjzI4NWzM2h0/5SS34HyB788tFydJW xjdssE5RguPb6UsP+dywQ1gBii0s7LoIK3lUEd3tlksPxHGHpxUtfD+vUFKVku++0EEI rPZ5piXQ3otEjwOWA5ttv6JIHmORe14WSq6DoKHfkbGaMWGau2ss0PTqRwe+nVPoWqhY fSUA== 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; bh=Wm/zVa1bTkkjeKJCxKmeJN8hsegYhj3YXZYoXOBZ3fE=; b=O0/tblYu6Vf88cWim7v3DtyS8UqKqUze6g6JpfiNbSd1LPxS+hh4a7aOvdEyO0jbJA EPhiw0pBvAlhxvHO/H0jLOX2NUyOJP0SHYeChpyiJbxVGa/Edh33QnTEl0pmS7w0DTG5 yxplg5JGlj3nL0ZrJL52DZJoosEuK0TBeWFFGwNb8ZP1MXINJ+y3TH1hFAzEg2rsM4a9 HRzXFHO3txNFGz2mkbxKEYJyZFexOIx1QTVyaq2CsW1L+c173jV5pWzVPeZzdrcp3IMV AFBieD0+/BSnBhzt3n2Fl8NAVfMgPnoP5WytekzOIy0ULLDTXzwqmgHh3b1eYRHFQCJz b2UQ== X-Gm-Message-State: AOUpUlG1HXpU9VJ4Xw6UFmmc7VctiIXmXEgPmnujt/LO1ce+SUTxfvDA lSPju7TLOpRRUeOEBq7HNe+74a0IgDY= X-Google-Smtp-Source: AAOMgpe/YDKLF1dTh60uePj9O8HVUK8tdQHxq8N1i8StrNcZM6HkztXRtXTQFOX2FqfAG/MuKnOjDQ== X-Received: by 2002:a2e:118f:: with SMTP id 15-v6mr4470459ljr.38.1532687957212; Fri, 27 Jul 2018 03:39:17 -0700 (PDT) Received: from rafalkozik.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id f198-v6sm495487lfg.86.2018.07.27.03.39.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 03:39:16 -0700 (PDT) From: Rafal Kozik To: stable@dpdk.org Cc: mw@semihalf.com, mk@semihalf.com, gtzalik@amazon.com, evgenys@amazon.com, matua@amazon.com, igorch@amazon.com, yskoh@mellanox.com, Rafal Kozik Date: Fri, 27 Jul 2018 12:39:06 +0200 Message-Id: <1532687946-14276-4-git-send-email-rk@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532687946-14276-1-git-send-email-rk@semihalf.com> References: <1532687946-14276-1-git-send-email-rk@semihalf.com> Subject: [dpdk-stable] [17.11 3/3] net/ena: change memory type 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: , X-List-Received-Date: Fri, 27 Jul 2018 10:39:17 -0000 [ backported from upstream commit 9f32c7e7e6ce58ab772913f54f8328c1c0186a17 ] ENA_MEM_ALLOC_NODE not need to use contiguous physical memory. Also using memset without checking if allocation succeed can cause segmentation fault. To avoid both issue use rte_zmalloc_socket. Fixes: 3d3edc265fc8 ("net/ena: make coherent memory allocation NUMA-aware") Signed-off-by: Rafal Kozik Acked-by: Michal Krawczyk --- drivers/net/ena/base/ena_plat_dpdk.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 362741a..8363fb4 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -224,14 +224,8 @@ typedef uint64_t dma_addr_t; #define ENA_MEM_ALLOC_NODE(dmadev, size, virt, node, dev_node) \ do { \ - const struct rte_memzone *mz; \ - char z_name[RTE_MEMZONE_NAMESIZE]; \ ENA_TOUCH(dmadev); ENA_TOUCH(dev_node); \ - snprintf(z_name, sizeof(z_name), \ - "ena_alloc_%d", ena_alloc_cnt++); \ - mz = rte_memzone_reserve(z_name, size, node, 0); \ - memset(mz->addr, 0, size); \ - virt = mz->addr; \ + virt = rte_zmalloc_socket(NULL, size, 0, node); \ } while (0) #define ENA_MEM_ALLOC(dmadev, size) rte_zmalloc(NULL, size, 1) -- 2.7.4