From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BF9EE45BB6 for ; Wed, 23 Oct 2024 23:20:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA29B432E4; Wed, 23 Oct 2024 23:20:18 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 4D9BD40261 for ; Wed, 23 Oct 2024 23:20:17 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4315baec681so2142195e9.2 for ; Wed, 23 Oct 2024 14:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718417; x=1730323217; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gT+CVpVcevEnKwcuXkX26vLYGQT5XAU+q/Pgz1WmMFw=; b=QwkTz3pm27yTHPfUwhwwWd/ffLV6hUsfwOhwpfl2Uu0R+wND4Ke4GhvuC/PVsTt2By fTPE/CI13uih6DcG2s9zlcfhEh/4nRHlsR/JhkC+i4+tiCPw/BlItNwmtswXrnZ0t4/C aXpCExNR/N40DHQ/dmWGq0JuRzDPZcdaWuNbsMBa/NeVuRhZw3/C0SoY5r4wU/T6zftJ QP8/+ZgqrpvAobkLDvO9/dVXsZf5OVqTmbMK+GeGZzuz290FRhAw31qBMynEVZa4uYTv GotsU7SsmYj3Lz0AvJwOMwMU8QhJnYBSf/33lVNZOpTVrO+kmoqg2UM8tBVho2Meo+G9 Cp9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718417; x=1730323217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gT+CVpVcevEnKwcuXkX26vLYGQT5XAU+q/Pgz1WmMFw=; b=EBIHetH6pExlgJdaEYU2qJ0B9WkPd5V+0vCiflNoD65ekXDBhN8iSqG8ockRbDvdvW yOVfi2++qThcQYdCZQ8nBTxY68Sj2aEGliOIOwKoKSWtkqbGZmwBvMMNPhSYSwkdKrj3 ggjmpo8TnDECJcxlfxcgwuyz+ZbwiefZ8yTXJAVWZqyVEXuiTGz4LSfURZMm7Cz2aW0N ZypkEJw8SDtAo5pfphUVBsLWWnHr0f5GBzJ6oh1BPGFut3bp40i9BDcvtgV12MYYO6Au ZYTaiOVuPtLYjmGAa6goU8Nd/0svJoKPOX455hJkJad+vXhijRIYu7XXFOqloethRnx6 YKCQ== X-Forwarded-Encrypted: i=1; AJvYcCVPiNdZ5UQYDixK+aypFjHo63TLCXRJbXzAcQqbiJwwcytQAS7Rn2HAeAMv1Bexhx1ZEfXlLRU=@dpdk.org X-Gm-Message-State: AOJu0YyNjrLEE86QJXCOKGX3UBBg5Wod2fPx+FPvilmCRxiHaz9LvGX7 ibbzitjUqD5A2RJmZyF8I30lp+d/xqu1PuTPPqNl2sYvPCHBiWTDw/O4EdWL X-Google-Smtp-Source: AGHT+IH5bAf2U8AF0qziNliLir1J2aESQn0X++MUxHmu6LzDZ6v9jY9z2Kvv56fepz20k2x90M+76Q== X-Received: by 2002:a05:600c:1c04:b0:42c:baf9:bee7 with SMTP id 5b1f17b1804b1-4318413eec5mr38133645e9.12.1729718416793; Wed, 23 Oct 2024 14:20:16 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43186bd226dsm27500705e9.2.2024.10.23.14.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:20:16 -0700 (PDT) From: luca.boccassi@gmail.com To: Shreesh Adiga <16567adigashreesh@gmail.com> Cc: Long Li , dpdk stable Subject: patch 'net/mana: support rdma-core via pkg-config' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:31 +0100 Message-ID: <20241023211704.1216956-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ead6f2f7f7b2de61948856c6b9ca9785713a4dac Thanks. Luca Boccassi --- >From ead6f2f7f7b2de61948856c6b9ca9785713a4dac Mon Sep 17 00:00:00 2001 From: Shreesh Adiga <16567adigashreesh@gmail.com> Date: Fri, 20 Sep 2024 16:41:16 +0530 Subject: [PATCH] net/mana: support rdma-core via pkg-config [ upstream commit 8d7596cad7abb413c25f6782fe62fd0d388b8b94 ] Currently building with custom rdma-core installed in /opt/rdma-core after setting PKG_CONFIG_PATH=/opt/rdma-core/lib64/pkgconfig/ results in the below meson logs: Run-time dependency libmana found: YES 1.0.54.0 Header "infiniband/manadv.h" has symbol "manadv_set_context_attr" : NO Thus to fix this, the libs is updated in meson.build and is passed to the cc.has_header_symbol call using dependencies. After this change, the libmana header files are getting included and net/mana is successfully enabled. Fixes: 517ed6e2d590 ("net/mana: add basic driver with build environment") Signed-off-by: Shreesh Adiga <16567adigashreesh@gmail.com> Acked-by: Long Li --- drivers/net/mana/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mana/meson.build b/drivers/net/mana/meson.build index 2d72eca5a8..3ddc230ab4 100644 --- a/drivers/net/mana/meson.build +++ b/drivers/net/mana/meson.build @@ -19,12 +19,14 @@ sources += files( ) libnames = ['ibverbs', 'mana'] +libs = [] foreach libname:libnames lib = dependency('lib' + libname, required:false) if not lib.found() lib = cc.find_library(libname, required:false) endif if lib.found() + libs += lib ext_deps += lib else build = false @@ -43,7 +45,7 @@ required_symbols = [ ] foreach arg:required_symbols - if not cc.has_header_symbol(arg[0], arg[1]) + if not cc.has_header_symbol(arg[0], arg[1], dependencies: libs, args: cflags) build = false reason = 'missing symbol "' + arg[1] + '" in "' + arg[0] + '"' subdir_done() -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:42.456519849 +0100 +++ 0051-net-mana-support-rdma-core-via-pkg-config.patch 2024-10-23 22:16:40.511943208 +0100 @@ -1 +1 @@ -From 8d7596cad7abb413c25f6782fe62fd0d388b8b94 Mon Sep 17 00:00:00 2001 +From ead6f2f7f7b2de61948856c6b9ca9785713a4dac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8d7596cad7abb413c25f6782fe62fd0d388b8b94 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 330d30b2ff..4d163fc0f2 100644 +index 2d72eca5a8..3ddc230ab4 100644