From patchwork Tue Nov 24 15:14:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Redaelli X-Patchwork-Id: 84521 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BDEC1A04B1; Tue, 24 Nov 2020 16:15:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AED13C94A; Tue, 24 Nov 2020 16:14:41 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id A3B34C948 for ; Tue, 24 Nov 2020 16:14:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606230878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5NqEvUQj4Zl3N6ZeiuroElOsI0nIpPoS/L7xrqkox9k=; b=QEw3f5mv0eVmm5YzfnibIV/2osa79B3agXlSQO4UMg+iHmzqIUV4qkD9KciLMJB9rCHsDT CUQZNheFh2FfPjsKRx5ovXgZLbH9UdcFfdpVsPgBMHgsQbDQEd5V85AN+/lv+SpAaORNbN /yIMMrjOgWg0hnCAXCAjuEPg6/c6Ye8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-588-RNG7my1DPgiKpwuqS-Hp9Q-1; Tue, 24 Nov 2020 10:14:34 -0500 X-MC-Unique: RNG7my1DPgiKpwuqS-Hp9Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E68AF81C478; Tue, 24 Nov 2020 15:14:32 +0000 (UTC) Received: from localhost.localdomain (dhcp19-189-130.ntdv.lab.eng.bos.redhat.com [10.19.189.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id B300A60877; Tue, 24 Nov 2020 15:14:31 +0000 (UTC) From: Timothy Redaelli To: Anatoly Burakov Cc: bruce.richardson@intel.com, dev@dpdk.org, stable@dpdk.org Date: Tue, 24 Nov 2020 16:14:15 +0100 Message-Id: <4a04b06b040ac16c45addf92fb43f59b070f185a.1606229937.git.tredaelli@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=tredaelli@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 2/2] eal: fix loading of shared libs from driver plugin directories 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" Commit 49b536fc3060 ("eal: load only shared libs from driver plugin directories") introduced a check that any shared library must ends with .so, but it can't work, at least, on Fedora/CentOS/RHEL since .so symlinks are not installed when you install dpdk package, but only when you install dpdk-devel package. This commit adds also a check for .so.ABI_VERSION to check for shared lib. See Fedora Packaging Guidelines for more informations: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_devel_packages Fixes: 49b536fc3060 ("eal: load only shared libs from driver plugin directories") Cc: bruce.richardson@intel.com Signed-off-by: Timothy Redaelli Acked-by: Bruce Richardson Acked-by: David Marchand Tested-by: Ferruh Yigit --- lib/librte_eal/common/eal_common_options.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index e6f77ad217..e9e2362c53 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -402,8 +402,10 @@ eal_plugindir_init(const char *path) struct stat sb; int nlen = strnlen(dent->d_name, sizeof(dent->d_name)); - /* check if name ends in .so */ - if (strcmp(&dent->d_name[nlen - 3], ".so") != 0) + /* check if name ends in .so or .so.ABI_VERSION */ + if (strcmp(&dent->d_name[nlen - 3], ".so") != 0 && + strcmp(&dent->d_name[nlen - 4 - strlen(ABI_VERSION)], + ".so."ABI_VERSION) != 0) continue; snprintf(sopath, sizeof(sopath), "%s/%s", path, dent->d_name);