DPDK patches and discussions
 help / color / mirror / Atom feed
From: Panu Matilainen <pmatilai@redhat.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] eal: fix regression of plugins always requiring full path
Date: Mon, 23 Nov 2015 14:05:55 +0200	[thread overview]
Message-ID: <2ce33879359cd5d15dbb7fb10687d484dd187348.1448280355.git.pmatilai@redhat.com> (raw)

The added error checking on plugin initialization in
commit 9f8eb1d9ca0f56d6292db5858c52e6873d0abe51 broke the ability of
loading plugins by their basename from default linker locations.
Only use stat() for directory discovery and leave error handling
to dlopen() to restore former behavior.

Fixes: 9f8eb1d9ca0f ("eal: support driver loading from directory")
Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
---
 lib/librte_eal/common/eal_common_options.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index e51fa12..29942ea 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -218,22 +218,15 @@ eal_plugins_init(void)
 
 	TAILQ_FOREACH(solib, &solib_list, next) {
 		struct stat sb;
-		if (stat(solib->name, &sb) == -1) {
-			RTE_LOG(ERR, EAL, "Invalid plugin specified: %s: %s\n",
-				solib->name, strerror(errno));
-			return -1;
-		}
 
-		switch (sb.st_mode & S_IFMT) {
-		case S_IFDIR:
+		if (stat(solib->name, &sb) == 0 && S_ISDIR(sb.st_mode)) {
 			if (eal_plugindir_init(solib->name) == -1) {
 				RTE_LOG(ERR, EAL,
 					"Cannot init plugin directory %s\n",
 					solib->name);
 				return -1;
 			}
-			break;
-		case S_IFREG:
+		} else {
 			RTE_LOG(DEBUG, EAL, "open shared lib %s\n",
 				solib->name);
 			solib->lib_handle = dlopen(solib->name, RTLD_NOW);
@@ -241,7 +234,6 @@ eal_plugins_init(void)
 				RTE_LOG(ERR, EAL, "%s\n", dlerror());
 				return -1;
 			}
-			break;
 		}
 
 	}
-- 
2.5.0

             reply	other threads:[~2015-11-23 12:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-23 12:05 Panu Matilainen [this message]
2015-11-23 15:29 ` Thomas Monjalon

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=2ce33879359cd5d15dbb7fb10687d484dd187348.1448280355.git.pmatilai@redhat.com \
    --to=pmatilai@redhat.com \
    --cc=dev@dpdk.org \
    /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).