From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by dpdk.org (Postfix) with ESMTP id A878F7F39 for ; Thu, 12 Mar 2015 11:18:25 +0100 (CET) Received: by padfa1 with SMTP id fa1so19375558pad.9 for ; Thu, 12 Mar 2015 03:18:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jWCNjDGqAfHVBusZAN7+BtbCg9EfmOUbwDumHZkJmzU=; b=bYsD/vD2qKuB4jtusTj44TpSrv7k3evwH2BRl/IsggAIC/lkOaaUc3TRR7+7Csbecv Zt6L+tcpF/U7YBwYjWsb50PBySmDGFJGqI7INqlgjMzVF9cENcRhkWxX5FRn0MndU3Z6 AYPvUVyoamZcovp54Vf4RNra/8IYc5dQZiujxwolrRZStP61uNN3a0pDEc+ZZrEqi0QO zpicmqKH9M+C2H4E4f4GehkI6XX1K9XSZqMIVmZk14bSEaeaDU8s1m1feCj8uqEPM89G y6huQaZXio3rHFcw4COM76MTUlAc0ZPhNWRsEzk7E8pKZ2Wih9RMd2wYNvvhcFKPsB3S abBQ== X-Gm-Message-State: ALoCoQl3K6DuPfQRfJPK9MFLWB84N9CerkjU3v39Em4kbdpvNk2xbOQ3kG2Mub9tb0iZbxdiBCw4 X-Received: by 10.70.96.145 with SMTP id ds17mr88282442pdb.153.1426155504968; Thu, 12 Mar 2015 03:18:24 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id z4sm10080331pdi.90.2015.03.12.03.18.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Mar 2015 03:18:24 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Thu, 12 Mar 2015 19:17:43 +0900 Message-Id: <1426155474-1596-5-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426155474-1596-1-git-send-email-mukawa@igel.co.jp> References: <1425438703-18895-1-git-send-email-mukawa@igel.co.jp> <1426155474-1596-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v2 04/15] eal: Fix needless incrementation of pci_map_addr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2015 10:18:26 -0000 When pci_map_resource() is failed, mapaddr will be MAP_FAILED. In this case, pci_map_addr should not be incremented. The patch fixes it. Also, fix below. - To shrink code, move close(). - Remove fail variable. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c index 901f277..2741c62 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c @@ -337,7 +337,6 @@ pci_uio_map_resource(struct rte_pci_device *dev) maps = uio_res->maps; for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) { int fd; - int fail = 0; /* skip empty BAR */ phaddr = dev->mem_resource[i].phys_addr; @@ -371,18 +370,13 @@ pci_uio_map_resource(struct rte_pci_device *dev) mapaddr = pci_map_resource(pci_map_addr, fd, 0, (size_t)dev->mem_resource[i].len, 0); + close(fd); if (mapaddr == MAP_FAILED) - fail = 1; + goto fail1; pci_map_addr = RTE_PTR_ADD(mapaddr, (size_t)dev->mem_resource[i].len); - if (fail) { - close(fd); - goto fail1; - } - close(fd); - maps[map_idx].phaddr = dev->mem_resource[i].phys_addr; maps[map_idx].size = dev->mem_resource[i].len; maps[map_idx].addr = mapaddr; -- 1.9.1