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 B272945C9B for ; Tue, 12 Nov 2024 23:08:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85EF14021E; Tue, 12 Nov 2024 23:08:03 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id E84C44021E for ; Tue, 12 Nov 2024 23:08:02 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-37d63a79bb6so4039710f8f.0 for ; Tue, 12 Nov 2024 14:08:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449282; x=1732054082; 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=df4LIsP5KDIi3597+PLxun6llhvIaNuqcv8QAJTMgIA=; b=B79s6WoB/l4S6xnWVACODs7CQyioXyQlBOcO6yxRC30tJfCsXe9EQXppyk/Msluosr uSW7KfdCc2oQaOJNC5W9IApKqtHrM5pYKMd3/mc542mOQrjlch+yGKzeG7dMbzaf95aQ b0M7jvaY3RPBEbgW7bxzNc9/Tks2FrJASFBNSUeso0+dJhssIIzqGh55A2E+tLfI5/+c 1b6hU6m3TRJXkLUTSe691Iec8vX5DgccecSszbRDg0inEbyT3dubNDkGYAkzYRINqvMF bcOC8VcKG4Trf8a9b+p1woZ4dB3O5Ct0On26QesiSaf+4LnMt5ng02LpqqsAc6MfsyXf ExEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449282; x=1732054082; 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=df4LIsP5KDIi3597+PLxun6llhvIaNuqcv8QAJTMgIA=; b=qLc94C9qTyYFKidy21+rVMNV1GZJMXj52UO7eDy0TfcG6oJ4fEvhBv4OY4t71EwpDG valeulMASI2uHmqTfHKCimVt/rhcHNvdaIR7w49kLPSxPSUcPL0mSs663Ke8k2FjCE1N 7Dm0CamjpVcrKgGx6yTLmgAUtXl+hpCjfcy65DAABQ9StuMyCieVUIC/RwtVpPGWJYvI Brjqt7irf6VXhBfi0PbKv+PO3V2ihciln037RFcVp8KFOmLg3Hq+EGh/wu8ogkBQurlp fyHuVaLglypsCO4/u8kAejE1jSu/rXZFGZFOzQO8IzPqGb5n8oKnJ0+Te6yRnDFeRoPj ZAbw== X-Forwarded-Encrypted: i=1; AJvYcCXC7zdQqQDK0luim3OJAtROlAd3i0Okw1GeGwIw4w3Ip/x9ddh85Zcc7ZbowwG3bUZUg46o/qQ=@dpdk.org X-Gm-Message-State: AOJu0YyUe5jy+AKTscJ33J9URw+JRIZXiGGud7bbEobDg7z0BJVmQZ2O sgH7l4yjPojxifSN++W4JOp2E5ufJ91KLkVuhBOEDT1TYXLW94la X-Google-Smtp-Source: AGHT+IFbLdB+x7sLye0g3uyPhWFhMXr4q6TQ5UJrHymVyzoezkBknTjhvsfm0Pyww5f0LXv0rrOzGg== X-Received: by 2002:a05:6000:2a1:b0:381:b1b4:8ba1 with SMTP id ffacd0b85a97d-3820df886a5mr463986f8f.39.1731449282247; Tue, 12 Nov 2024 14:08:02 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381eda0411csm16193303f8f.95.2024.11.12.14.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:08:01 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'buildtools/chkincs: check driver specific headers' has been queued to stable release 22.11.7 Date: Tue, 12 Nov 2024 22:07:11 +0000 Message-ID: <20241112220754.666489-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-79-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 11/14/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/8a4a31ed6ee1185215ad6d2b15d4b0190a32f096 Thanks. Luca Boccassi --- >From 8a4a31ed6ee1185215ad6d2b15d4b0190a32f096 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 23 Oct 2023 13:50:28 +0200 Subject: [PATCH] buildtools/chkincs: check driver specific headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 90cb8ff8196f9b9c1c2bcee1c94ea583789bb63f ] Only driver headers exported by libraries were checked. Add driver specific headers to the checked headers list. This reveals a small issue with the vmbus driver header as some driver headers rely on it. Fixes: b232b2aa212b ("buildtools/chkincs: check SDK headers for C++ compatibility") Fixes: 84aaf06d817c ("bus/vmbus: make driver-only headers private") Signed-off-by: David Marchand Acked-by: Morten Brørup --- buildtools/chkincs/meson.build | 3 +++ drivers/meson.build | 1 + 2 files changed, 4 insertions(+) diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build index 378c2f19ef..0f14e02104 100644 --- a/buildtools/chkincs/meson.build +++ b/buildtools/chkincs/meson.build @@ -21,6 +21,9 @@ sources += gen_c_files.process(dpdk_chkinc_headers) # some driver SDK headers depend on these two buses, which are mandatory in build # so we always include them in deps list deps = [get_variable('shared_rte_bus_vdev'), get_variable('shared_rte_bus_pci')] +if dpdk_conf.has('RTE_BUS_VMBUS') + deps += get_variable('shared_rte_bus_vmbus') +endif # add the rest of the libs to the dependencies foreach l:enabled_libs deps += get_variable('shared_rte_' + l) diff --git a/drivers/meson.build b/drivers/meson.build index b4d9252888..175beec15e 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -175,6 +175,7 @@ foreach subpath:subdirs if get_option('enable_driver_sdk') install_headers(driver_sdk_headers) endif + dpdk_chkinc_headers += driver_sdk_headers if headers.length() > 0 dpdk_includes += include_directories(drv_path) -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:58.735088790 +0000 +++ 0001-buildtools-chkincs-check-driver-specific-headers.patch 2024-11-12 22:06:58.623306511 +0000 @@ -1 +1 @@ -From 90cb8ff8196f9b9c1c2bcee1c94ea583789bb63f Mon Sep 17 00:00:00 2001 +From 8a4a31ed6ee1185215ad6d2b15d4b0190a32f096 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 90cb8ff8196f9b9c1c2bcee1c94ea583789bb63f ] + @@ -26 +28 @@ -index 787d70272b..ed65105599 100644 +index 378c2f19ef..0f14e02104 100644 @@ -29 +31 @@ -@@ -19,6 +19,9 @@ sources += gen_c_files.process(dpdk_chkinc_headers) +@@ -21,6 +21,9 @@ sources += gen_c_files.process(dpdk_chkinc_headers) @@ -37 +39 @@ - foreach l:dpdk_libs_enabled + foreach l:enabled_libs @@ -40 +42 @@ -index 2733306698..5270160c56 100644 +index b4d9252888..175beec15e 100644 @@ -43 +45 @@ -@@ -220,6 +220,7 @@ foreach subpath:subdirs +@@ -175,6 +175,7 @@ foreach subpath:subdirs