From patchwork Mon Jun 4 12:09:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 40625 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2E3F0727F; Mon, 4 Jun 2018 14:10:36 +0200 (CEST) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by dpdk.org (Postfix) with ESMTP id 972C772FD for ; Mon, 4 Jun 2018 14:10:17 +0200 (CEST) Received: by mail-lf0-f68.google.com with SMTP id o9-v6so24809483lfk.1 for ; Mon, 04 Jun 2018 05:10: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=iuNYJm2f3Qqb0zkpxWGvb6JEx0BLKtjH6YhnsrScW00=; b=iUe5wca7KXAM86kI1hnLAr5il8tST7/YVE0IT9AeW2qxSeznw3rOVRtfSs9xSFQ3Kl r0e26qZloeXxDaFyzaTihhJZQk6tFIVcHIQ6r7XqrU8n/BqvmTZPVRzmSl0VzbafC2EA krPX30n1z9f25XwTa+029CDw5/j+UDYZeJmn+6X7XrHKJiyzpJRgPPI3vX9ikZKbdSZ/ Ljypzs/PbDaZtm0RV1ljxFk5jQRIcr4lae9/0rFwbqeu8jm2Y1+UcgNT522v2H4ve263 IV1MyqtMW631XtyHFWUfw2onLHxHdyURR6JUXhxhCdhZHXqmNCR3+VKqLCZcQdVHRUgY 1x3Q== 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=iuNYJm2f3Qqb0zkpxWGvb6JEx0BLKtjH6YhnsrScW00=; b=cKco944ttJlbqOGWAJrPoaszzyDWLyTB/qlmHZFVv+7wiI6qjxklpKkGvMH1pb4RPE Zqz0PQwMn0aCaCs/c19Z544g3WbN88z1NrvoahNkzesWE0BCP4Kfh+TcLDGgKByiTNo7 gbF0mYd9a0MS6LONYBC6+Vf8KzCwZWeGAmh9UmS+5/7YH8lqimXqeyvZrV48OjxUtTBp DB260lVX9TReIP7XqpqkJiHwtdl5wX31bHT7DpwEhN8eZZDVR4KOpOeoonKdodLy7m1j mzIhmGupoCBzegjB21QW95EU9DkN4TzQYWsx5uVeYs4JlzKc/Nbv71IhS3a926elyo8/ qxOA== X-Gm-Message-State: ALKqPwdD9mishRIrfh02rUNDdPXyqXoR4zE6iyZzcXYO3XMHEYpNirJ+ NR/7VJ1ekGTPDXwXL9DoQ4Rkk940VG4= X-Google-Smtp-Source: ADUXVKJQWcwiSdH4zertWq5j5ni8WcBkgXcrZtnqpLJsqWYJZ6qpqxEdX8SLxqyNi2aPlipMZ0oNcg== X-Received: by 2002:a19:949d:: with SMTP id o29-v6mr13475081lfk.56.1528114217286; Mon, 04 Jun 2018 05:10:17 -0700 (PDT) Received: from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id g23-v6sm3817415lfi.49.2018.06.04.05.10.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jun 2018 05:10:16 -0700 (PDT) From: Michal Krawczyk To: Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin Cc: dev@dpdk.org, matua@amazon.com, Rafal Kozik Date: Mon, 4 Jun 2018 14:09:51 +0200 Message-Id: <20180604120955.17319-14-mk@semihalf.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180604120955.17319-1-mk@semihalf.com> References: <20180604120955.17319-1-mk@semihalf.com> Subject: [dpdk-dev] [PATCH v2 23/26] net/ena: change memory type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Rafal Kozik 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 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index d30153e92..22d7a9cb1 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -248,15 +248,8 @@ extern uint32_t ena_alloc_cnt; #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, \ - RTE_MEMZONE_IOVA_CONTIG); \ - 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)