From patchwork Mon Nov 23 12:05:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Panu Matilainen X-Patchwork-Id: 9044 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4E1E88E92; Mon, 23 Nov 2015 13:06:04 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id AF4148E91 for ; Mon, 23 Nov 2015 13:06:02 +0100 (CET) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id DD9178E75B; Mon, 23 Nov 2015 12:06:01 +0000 (UTC) Received: from sopuli.koti.laiskiainen.org.com (vpn1-4-70.ams2.redhat.com [10.36.4.70]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tANC60mf024018; Mon, 23 Nov 2015 07:06:00 -0500 From: Panu Matilainen To: dev@dpdk.org Date: Mon, 23 Nov 2015 14:05:55 +0200 Message-Id: <2ce33879359cd5d15dbb7fb10687d484dd187348.1448280355.git.pmatilai@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Subject: [dpdk-dev] [PATCH] eal: fix regression of plugins always requiring full path 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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; } }