From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E4D41A054F for ; Tue, 18 Feb 2020 10:15:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C257E1D734; Tue, 18 Feb 2020 10:15:30 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 4158B1D734 for ; Tue, 18 Feb 2020 10:15:29 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id e8so450450wrm.5 for ; Tue, 18 Feb 2020 01:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=nXo4kmLAUepz3EL8Wx509iA2/chB++vK4vFwb0dt77Y=; b=EUS7FfYmzoNb8qhSAtxBSUf+mPTbKkEL2tQclZdcmYppmAn6J8UDZdOgrxMQ06891n CtYbaR2PeyJO0mvvo4+RiWs3wRwtfWvXfLkQgEbTEJFHP/UJampCvP/cEbIZaePFV0CH s20y5dU6Y+j7uVdREpayZHYHmlzfwEB2tOXZVAPWqJWDB30Om1H5I4nQ/9LcucUoODLU /PtgjjPZdmcfZtXVZ4udm/RRqm0PqXSOMr8wY1yzPw1MMKMYUX2L0uD6oQb+yGrnPzVt NEtq1FxCWrcQZtqZ9aTlqq5EwN2gg1urPjg5Wbz2Vc44sJuWFr/xYpu7JgcjNrxQh1sp cQ2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=nXo4kmLAUepz3EL8Wx509iA2/chB++vK4vFwb0dt77Y=; b=pIkLxXbqLHvJY6bVMWmTJV8caKgBBixviHvzYK1G1REoykK7SoGXvHC17jW1nL6VVL nZhzs3YtbYtoQZ6Mh4c0DKdmPMqG4xFEaCSiMj0NTZaWXcBPwxoNChqv02ARnnM13bFD uoPmjK+7G7cGo+5vc7tJHdaIeyLuHY9W3MpCNCHm0QERJYXTOWs9G8pLfkZE+gOi0p0G 7jepIjgPrSSa4sGxxq6lt8b6YZ+ZO2YcsnQ75W1k+SlBTnO+Uazo4I00rKKnSSqr1sAx akMa3JXkGNSWE2SXPaJWSBUbShUuHfgcRfC7j/lnv+Ui4ksVcmwGdfStRrKOYpljob8b amGQ== X-Gm-Message-State: APjAAAWW3gGb86sVnxAU62fAdsLfGHOOWC7everVjdObBNd8pd4LSoOK ibVfMmLvPE3uv0Epfk/o3Mc= X-Google-Smtp-Source: APXvYqyok9xdXsn1GCiJ3upmaVGS8A/zfwobAFxDKrzCDKbLzd5ik3h9bvQm8Gb/GE7gi+oC4kVzaQ== X-Received: by 2002:a5d:484f:: with SMTP id n15mr27619512wrs.365.1582017328850; Tue, 18 Feb 2020 01:15:28 -0800 (PST) Received: from bluca-lenovo ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r6sm4922393wrq.92.2020.02.18.01.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2020 01:15:27 -0800 (PST) Message-ID: <71824e82cc0c42710084a62432e7d942c01242dc.camel@gmail.com> From: Luca Boccassi To: Thomas Monjalon Cc: Bruce Richardson , dpdk stable Date: Tue, 18 Feb 2020 09:15:27 +0000 In-Reply-To: <4043715.ElGaqSPkdT@xps> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-36-luca.boccassi@gmail.com> <5027c9e36251459fd7061bd81ab5c3214e50cf59.camel@gmail.com> <4043715.ElGaqSPkdT@xps> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] patch 'net/mlx: fix overlinking with meson and glue dlopen' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Mon, 2020-02-17 at 19:07 +0100, Thomas Monjalon wrote: > 17/02/2020 18:50, Luca Boccassi: > > This one required a few extra backports, you can see the end result > > at: > > > > https://github.com/bluca/dpdk-stable/blob/19.11/drivers/net/mlx4/meson.build > > > > https://github.com/bluca/dpdk-stable/blob/19.11/drivers/net/mlx5/meson.build > > > > > > I can drop the series of changes to mlx's meson.build alternatively > > if > > you prefer. > > Your backport looks OK, thanks. > > There is just a unneeded redundant allow_experimental_apis. Thanks, fixed > > > On Mon, 2020-02-17 at 17:45 +0000, > > luca.boccassi@gmail.com > > wrote: > > > Hi, > > > > > > FYI, your patch has been queued to stable release 19.11.1 > > > > > > Note it hasn't been pushed to > > > http://dpdk.org/browse/dpdk-stable > > > > > > yet. > > > It will be pushed if I get no objections before 02/19/20. So > > > please > > > shout if anyone has objections. > > > > > > Also note that after the patch there's a diff of the upstream > > > commit > > > vs the > > > patch applied to the branch. This will indicate if there was any > > > rebasing > > > needed to apply to the stable branch. If there were code changes > > > for > > > rebasing > > > (ie: not only metadata diffs), please double check that the > > > rebase > > > was > > > correctly done. > > > > > > Thanks. > > > > > > Luca Boccassi > > > > > > --- > > > From 3253622dc4630e11207629aba50293049938ec20 Mon Sep 17 00:00:00 > > > 2001 > > > From: Thomas Monjalon < > > > thomas@monjalon.net > > > > > > > > > Date: Wed, 12 Feb 2020 23:07:08 +0100 > > > Subject: [PATCH] net/mlx: fix overlinking with meson and glue > > > dlopen > > > > > > [ upstream commit e21492a5175af31ae568fa5fabef1f4b22706962 ] > > > > > > If ibverbs_link is dlopen, the PMD and application should not > > > be linked with ibverbs, but the glue library is. > > > Unfortunately the ibverbs dependency was exported in the > > > variable ext_deps, so there were overlinking. > > > > > > It is fixed by not exporting the dependency in ext_deps, > > > and recreating a limited dependency object for cflags only. > > > > > > Fixes: 1dd7c7e38c19 ("net/mlx4: support meson build") > > > Fixes: 96d7c62a70c7 ("net/mlx5: support meson build") > > > Cc: > > > stable@dpdk.org > > > > > > > > > > > > Signed-off-by: Thomas Monjalon < > > > thomas@monjalon.net > > > > > > > > > Acked-by: Bruce Richardson < > > > bruce.richardson@intel.com > > > > > > > > > --- > > > drivers/net/mlx4/meson.build | 6 ++++-- > > > drivers/net/mlx5/meson.build | 4 +++- > > > 2 files changed, 7 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/net/mlx4/meson.build > > > b/drivers/net/mlx4/meson.build > > > index 17711f154b..ff7386aee2 100644 > > > --- a/drivers/net/mlx4/meson.build > > > +++ b/drivers/net/mlx4/meson.build > > > @@ -31,7 +31,7 @@ foreach libname:libnames > > > endif > > > if lib.found() > > > libs += lib > > > - if not static_ibverbs > > > + if not static_ibverbs and not dlopen_ibverbs > > > ext_deps += lib > > > endif > > > else > > > @@ -41,10 +41,12 @@ foreach libname:libnames > > > endforeach > > > > > > if build > > > - if static_ibverbs > > > + if static_ibverbs or dlopen_ibverbs > > > # Build without adding shared libs to Requires.private > > > ibv_cflags = run_command(pkgconf, '--cflags', > > > 'libibverbs').stdout() > > > ext_deps += declare_dependency(compile_args: > > > ibv_cflags.split()) > > > + endif > > > + if static_ibverbs > > > # Add static deps ldflags to internal apps and > > > Libs.private > > > ibv_ldflags = run_command(ldflags_ibverbs_static, > > > check:true).stdout() > > > ext_deps += > > > declare_dependency(link_args:ibv_ldflags.split()) > > > diff --git a/drivers/net/mlx5/meson.build > > > b/drivers/net/mlx5/meson.build > > > index e21f3d8dc8..dab1b83fd3 100644 > > > --- a/drivers/net/mlx5/meson.build > > > +++ b/drivers/net/mlx5/meson.build > > > @@ -41,10 +41,12 @@ foreach libname:libnames > > > endforeach > > > > > > if build > > > - if static_ibverbs > > > + if static_ibverbs or dlopen_ibverbs > > > # Build without adding shared libs to Requires.private > > > ibv_cflags = run_command(pkgconf, '--cflags', > > > 'libibverbs').stdout() > > > ext_deps += declare_dependency(compile_args: > > > ibv_cflags.split()) > > > + endif > > > + if static_ibverbs > > > # Add static deps ldflags to internal apps and > > > Libs.private > > > ibv_ldflags = run_command(ldflags_ibverbs_static, > > > check:true).stdout() > > > ext_deps += > > > declare_dependency(link_args:ibv_ldflags.split()) > > > > > > > > > -- Kind regards, Luca Boccassi