DPDK patches and discussions
 help / color / mirror / Atom feed
From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Zerun Fu <zerun.fu@corigine.com>,
	Chaoyong He <chaoyong.he@corigine.com>,
	Long Wu <long.wu@corigine.com>,
	Peng Zhang <peng.zhang@corigine.com>
Subject: [PATCH v5 1/3] bus/pci: rename the variable in UIO secondary map logic
Date: Tue,  2 Jul 2024 10:19:44 +0800	[thread overview]
Message-ID: <20240702021946.4194102-2-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20240702021946.4194102-1-chaoyong.he@corigine.com>

From: Zerun Fu <zerun.fu@corigine.com>

To makes the logic clearer, rename the variable 'i' into 'map_idx'
and the variable 'j' into 'i'.

Signed-off-by: Zerun Fu <zerun.fu@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
---
 drivers/bus/pci/pci_common_uio.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_uio.c
index 76c661f054..caacbb69d9 100644
--- a/drivers/bus/pci/pci_common_uio.c
+++ b/drivers/bus/pci/pci_common_uio.c
@@ -26,7 +26,7 @@ EAL_REGISTER_TAILQ(rte_uio_tailq)
 static int
 pci_uio_map_secondary(struct rte_pci_device *dev)
 {
-	int fd, i, j;
+	int fd, i, map_idx;
 	struct mapped_pci_resource *uio_res;
 	struct mapped_pci_res_list *uio_res_list =
 			RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
@@ -37,41 +37,41 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
 		if (rte_pci_addr_cmp(&uio_res->pci_addr, &dev->addr))
 			continue;
 
-		for (i = 0; i != uio_res->nb_maps; i++) {
+		for (map_idx = 0; map_idx != uio_res->nb_maps; map_idx++) {
 			/*
 			 * open devname, to mmap it
 			 */
-			fd = open(uio_res->maps[i].path, O_RDWR);
+			fd = open(uio_res->maps[map_idx].path, O_RDWR);
 			if (fd < 0) {
 				RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
-					uio_res->maps[i].path, strerror(errno));
+					uio_res->maps[map_idx].path, strerror(errno));
 				return -1;
 			}
 
-			void *mapaddr = pci_map_resource(uio_res->maps[i].addr,
-					fd, (off_t)uio_res->maps[i].offset,
-					(size_t)uio_res->maps[i].size, 0);
+			void *mapaddr = pci_map_resource(uio_res->maps[map_idx].addr,
+					fd, (off_t)uio_res->maps[map_idx].offset,
+					(size_t)uio_res->maps[map_idx].size, 0);
 
 			/* fd is not needed in secondary process, close it */
 			close(fd);
-			if (mapaddr != uio_res->maps[i].addr) {
+			if (mapaddr != uio_res->maps[map_idx].addr) {
 				RTE_LOG(ERR, EAL,
 					"Cannot mmap device resource file %s to address: %p\n",
-					uio_res->maps[i].path,
-					uio_res->maps[i].addr);
+					uio_res->maps[map_idx].path,
+					uio_res->maps[map_idx].addr);
 				if (mapaddr != NULL) {
 					/* unmap addrs correctly mapped */
-					for (j = 0; j < i; j++)
+					for (i = 0; i < map_idx; i++)
 						pci_unmap_resource(
-							uio_res->maps[j].addr,
-							(size_t)uio_res->maps[j].size);
+							uio_res->maps[i].addr,
+							(size_t)uio_res->maps[i].size);
 					/* unmap addr wrongly mapped */
 					pci_unmap_resource(mapaddr,
-						(size_t)uio_res->maps[i].size);
+						(size_t)uio_res->maps[map_idx].size);
 				}
 				return -1;
 			}
-			dev->mem_resource[i].addr = mapaddr;
+			dev->mem_resource[map_idx].addr = mapaddr;
 		}
 		return 0;
 	}
-- 
2.39.1


  reply	other threads:[~2024-07-02  2:20 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-24 10:45 [PATCH] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-01-29  9:22 ` [PATCH v2 0/2] fix secondary process PCI UIO resource problem Chaoyong He
2024-01-29  9:22   ` [PATCH v2 1/2] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-01-30  4:00     ` fengchengwen
2024-03-14 10:55     ` Burakov, Anatoly
2024-01-29  9:22   ` [PATCH v2 2/2] bus/pci: fix secondary process save 'FD' problem Chaoyong He
2024-01-30  6:16     ` fengchengwen
2024-03-14 11:01     ` Burakov, Anatoly
2024-03-11  6:42   ` [PATCH v2 0/2] fix secondary process PCI UIO resource problem Chaoyong He
2024-04-19  3:26   ` Chaoyong He
2024-04-19  3:26     ` [PATCH v3 1/2] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-06-27 14:00       ` Thomas Monjalon
2024-06-28  1:03         ` Chaoyong He
2024-04-19  3:26     ` [PATCH v3 2/2] bus/pci: fix secondary process save 'FD' problem Chaoyong He
2024-06-28  7:36     ` [PATCH v4 0/3] fix secondary process PCI UIO resource problem Chaoyong He
2024-06-28  7:36       ` [PATCH v4 1/3] bus/pci: rename the variable in UIO secondary map logic Chaoyong He
2024-06-28  7:36       ` [PATCH v4 2/3] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-06-28  7:36       ` [PATCH v4 3/3] bus/pci: fix secondary process save 'FD' problem Chaoyong He
2024-07-01 14:14         ` David Marchand
2024-07-02  1:53           ` Chaoyong He
2024-07-01 14:12       ` [PATCH v4 0/3] fix secondary process PCI UIO resource problem David Marchand
2024-07-02  2:19       ` [PATCH v5 " Chaoyong He
2024-07-02  2:19         ` Chaoyong He [this message]
2024-07-02  2:47           ` [PATCH v5 1/3] bus/pci: rename the variable in UIO secondary map logic Stephen Hemminger
2024-07-02  2:19         ` [PATCH v5 2/3] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-07-02  2:19         ` [PATCH v5 3/3] bus/pci: fix secondary process save 'FD' problem Chaoyong He
2024-07-02  7:40         ` [PATCH v6 0/2] fix secondary process PCI UIO resource problem Chaoyong He
2024-07-02  7:40           ` [PATCH v6 1/2] bus/pci: fix secondary process PCI uio resource map problem Chaoyong He
2024-07-02  7:40           ` [PATCH v6 2/2] bus/pci: fix secondary process save 'FD' problem Chaoyong He
2024-07-02  9:28           ` [PATCH v6 0/2] fix secondary process PCI UIO resource problem David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240702021946.4194102-2-chaoyong.he@corigine.com \
    --to=chaoyong.he@corigine.com \
    --cc=dev@dpdk.org \
    --cc=long.wu@corigine.com \
    --cc=oss-drivers@corigine.com \
    --cc=peng.zhang@corigine.com \
    --cc=zerun.fu@corigine.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).