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 99F9EA0553 for ; Mon, 17 Feb 2020 18:50:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 939CB1DA12; Mon, 17 Feb 2020 18:50:35 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 6752E1DA12 for ; Mon, 17 Feb 2020 18:50:34 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id g1so193753wmh.4 for ; Mon, 17 Feb 2020 09:50:34 -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=6jYRx952xZYWjPxkggCJ6qbZ1KNA5SnOkIumjDUTDJU=; b=sjpRUMMsS35Wp9BvDqAduFfyAZ8HJH+ewowPpj8mPZFKbgRm9/vcn9DZBNMrZuB79R lDMaaA7rQttpV2U48cwOM4gqy6tFb77W3XBhtXOYmL+J3F1QoOjZxtL3uJt1wc2UjtN2 HxNK/6bZoZdTC9bTJYBwhBirtNDohID4djh4wklZ3zZw+IDraHCIKkadjme1kYWtW8Xh 3RhxgmTcOkVvC7entXeelJKPiot5vGenxN/oND04l/bSVxENQ5kqViuF9h2pUsysuLef Z0hOwlfgBfMaLa7e3POU+TK+ujg8cnUDpinhDqajS6J8L9PNea4XjOLNl7ry62YPEZbm FIGQ== 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=6jYRx952xZYWjPxkggCJ6qbZ1KNA5SnOkIumjDUTDJU=; b=su9ofyf6VuLYw2gPULUeZGivVFZON/bZHegZu5/LjmpdQoe0IEUA2XiA09ubO9oIld +DwmAo8nMq6JtmbRIwLkF9poMoXdQlMcW//AogNkBpUgRb8xZv3jFeLmx1ewHbKlNKfX 2B9WKrPpdjpgcoipevyiJroAxNU48ONlI9s+0z1S6NtRa/ngRtoTzHzNKk8FC3GLR6we zdb2SHMMXN2PtKm9HxtH3tHOL7nsC1GGKHkqzqEfs9MBgyxrFp6cos+lSJiwYwvmOO6H qOUYrBJcoJ11n+mpcIfuclRwJLgarOnDRhyJON5ZCy+sRLpd9fUKrY+zDeYtMPSz2RWF brOg== X-Gm-Message-State: APjAAAWrMj1pime4CUNrxmnWCK6yUnXNCKR8Xg9IcsQfcnaEICK9VRpM lvxDIIWTty/WCE51PI0SABE= X-Google-Smtp-Source: APXvYqyXKDbWVN267DAaRTg6+JDh+NsImRPI4MKmnFSuDsln3fyTbeZG1x9Yztpv8f7iOEy3IYl1Lw== X-Received: by 2002:a1c:de55:: with SMTP id v82mr191673wmg.48.1581961834140; Mon, 17 Feb 2020 09:50:34 -0800 (PST) Received: from bluca-lenovo (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id x10sm1911245wrp.58.2020.02.17.09.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:50:33 -0800 (PST) Message-ID: <5027c9e36251459fd7061bd81ab5c3214e50cf59.camel@gmail.com> From: Luca Boccassi To: Thomas Monjalon Cc: Bruce Richardson , dpdk stable Date: Mon, 17 Feb 2020 17:50:32 +0000 In-Reply-To: <20200217174546.25334-36-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> <20200217174546.25334-36-luca.boccassi@gmail.com> 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" 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. 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