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 B96B9A057F for ; Tue, 28 Jun 2022 17:19:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B4BE740DF7; Tue, 28 Jun 2022 17:19:50 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7F9D640042 for ; Tue, 28 Jun 2022 17:19:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656429589; 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=s4acf4WNLsMn26wGv95krH4shEywz0eXuCjy7SbGzBY=; b=GOtV8SVJQ68bJoUCRVrKSVHWgCr0903/H5ilHbEetJbniBXbpTxBu3e+JRX6wwfnXLSQ+P pdv0q8bLUOZ0sQ9iVOAjYDavzKVCyBSYzrlbMhuW2Qe9PKOAdZL7r8vyRnKFEtQ9ZrbdcC F33vTXqLBc7ZPMh8Nh1cCRlNtQlwzpU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-278-tKg5J34MMLKVREh4ZKGAeA-1; Tue, 28 Jun 2022 11:19:45 -0400 X-MC-Unique: tKg5J34MMLKVREh4ZKGAeA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 80C7F29DD9A8; Tue, 28 Jun 2022 15:19:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id A97DB141510C; Tue, 28 Jun 2022 15:19:44 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: dpdk stable Subject: patch 'raw/ioat: fix build when ioat dmadev enabled' has been queued to stable release 21.11.2 Date: Tue, 28 Jun 2022 16:19:14 +0100 Message-Id: <20220628151938.2278711-2-ktraynor@redhat.com> In-Reply-To: <20220628151938.2278711-1-ktraynor@redhat.com> References: <20220628151938.2278711-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b72fa6fd7a498744ff5880e2887bf221683ec3d5 Thanks. Kevin --- >From b72fa6fd7a498744ff5880e2887bf221683ec3d5 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 23 Jun 2022 14:49:32 +0100 Subject: [PATCH] raw/ioat: fix build when ioat dmadev enabled [ upstream commit 7580f35ea7a6f56f3fb65a3fa8601a6c21515805 ] The build of the raw/ioat driver only occurs when the equivalent dmadev drivers are disabled. Complications occur when the ioat dmadev is being built but not the idxd. In this case, only the idxd part of raw/ioat gets built, but the definition of the logtype is in the ioat part, causing build errors. .../raw_ioat_idxd_bus.c.o: In function `idxd_vdev_mmap_wq': idxd_bus.c:(.text+0x116): undefined reference to `ioat_pmd_logtype' Fix this by moving the logtype definition to the common C file, and renaming it to avoid conflicts with a similarly named value in the dma/ioat driver. Fixes: ff06fa2cf3ba ("raw/ioat: probe idxd PCI") Signed-off-by: Bruce Richardson --- drivers/raw/ioat/ioat_common.c | 2 ++ drivers/raw/ioat/ioat_private.h | 4 ++-- drivers/raw/ioat/ioat_rawdev.c | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c index 60de41152a..e44e181e58 100644 --- a/drivers/raw/ioat/ioat_common.c +++ b/drivers/raw/ioat/ioat_common.c @@ -10,4 +10,6 @@ #include "ioat_private.h" +RTE_LOG_REGISTER_DEFAULT(ioat_rawdev_logtype, INFO); + static const char * const xstat_names[] = { "failed_enqueues", "successful_enqueues", diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h index f032d5fe3d..7fb685a3d7 100644 --- a/drivers/raw/ioat/ioat_private.h +++ b/drivers/raw/ioat/ioat_private.h @@ -19,8 +19,8 @@ #include "rte_ioat_rawdev.h" -extern int ioat_pmd_logtype; +extern int ioat_rawdev_logtype; #define IOAT_PMD_LOG(level, fmt, args...) rte_log(RTE_LOG_ ## level, \ - ioat_pmd_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args) + ioat_rawdev_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args) #define IOAT_PMD_DEBUG(fmt, args...) IOAT_PMD_LOG(DEBUG, fmt, ## args) diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c index 5396671d4f..11341fcf5d 100644 --- a/drivers/raw/ioat/ioat_rawdev.c +++ b/drivers/raw/ioat/ioat_rawdev.c @@ -29,6 +29,4 @@ static struct rte_pci_driver ioat_pmd_drv; #define IOAT_DEVICE_ID_ICX 0x0b00 -RTE_LOG_REGISTER_DEFAULT(ioat_pmd_logtype, INFO); - #define DESC_SZ sizeof(struct rte_ioat_generic_hw_desc) #define COMPLETION_SZ sizeof(__m128i) -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-28 16:18:04.111098127 +0100 +++ 0002-raw-ioat-fix-build-when-ioat-dmadev-enabled.patch 2022-06-28 16:18:03.997387177 +0100 @@ -1 +1 @@ -From 7580f35ea7a6f56f3fb65a3fa8601a6c21515805 Mon Sep 17 00:00:00 2001 +From b72fa6fd7a498744ff5880e2887bf221683ec3d5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7580f35ea7a6f56f3fb65a3fa8601a6c21515805 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org