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 6FFFDA034F for ; Wed, 10 Nov 2021 07:59:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 63D6740142; Wed, 10 Nov 2021 07:59:09 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2042.outbound.protection.outlook.com [40.107.212.42]) by mails.dpdk.org (Postfix) with ESMTP id 4F37740142 for ; Wed, 10 Nov 2021 07:59:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SlgWHGmsuqOegdgo2mOr0ID5JfsdJa+Xrsd1u/dyDDlWi1orHhN43EmfgQ3+EWl0u1GgVT5f7FxWb6n8802QQkCcps99UrMxUN0KxwSygtwLtARF0JX2U/5YC+dXctq2/Kru+iZJqAECH69raRGNfxoR/LfCyG1D8smrHw4KPlOIFDd/yLmeSVpWB4z2ovJFvr57O0348+TLa0NDu3HwoFIugwwavE+zhN7jz6ljw30o/YFuej39t3bqQfOH7TMcfd+GrOErFG0mOLjAiexENtK+6TfTrDPDcg6wcTOWBgB7wC06/wZzdv6xJIyj1HXKrkQphoKPmBI2tZvvOlaA7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v20frFmltSXqMKsr5PYFk9FMueCj9x2f1jiJ1NGSCQ8=; b=D0ywlrAjZdI2+ThopE1ms+etiQzMPG8wvLOy2fghgMaesU739b59w0PVtEbE98N/NkxHNxHlS29wJcIobL1LZQDCwypysTN2MRjf+Zubc0WJjOwGj1MKCROYFIIASbTaigK6wWeE4B+gYdsF/kTlz4LykRxwi+KMEeWEI/h0BTnSmh2wnvR6s5LYMqgG1sAm6yzpET1gZQjrcY3AnIzIEaXCVXigKnc1Vu+CH3nlz8OxvvxSgEhY4/qmz0clBGHxM9EFEvt+oke9OAvPpEI9PyYXJOVlmTNUDzVpUs72bcDGcKcbS34ZgVvvtFJMROMCnwp8Pv2nbUm+AbvQ5Fpx5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v20frFmltSXqMKsr5PYFk9FMueCj9x2f1jiJ1NGSCQ8=; b=kIw5C+8W/maHk4n1Wox9IQ0PwjQMsasebPejjXwjC9PWrVJ92hWlBuNTRrlJxOjjzHZOktUdrMN4IQ0V8eyaZwx+ouEL7+2dA/pyEx1kaQ5MMDIFub4hbTHjQ7QU5qeZWva5GtHny9F5UkHsiq8G0GSc088VyPmvcc2l2pF6kMMuw2NK1pCetgAVnZcQb89nSDFO4cL5jzwc+4PRPEZnWFwf/xg8wFJ/xKxjVmBqiaHWj9eGocxTsqfCEih3Bzw4asnvraCebFHMuN3Oaw3+Bytfj3fW1V4Z0AmxHaUYQ3AH8l0KnItDCYNTfEBFIxfixw2AjMfk3Q9220y0nY+1qA== Received: from DM6PR06CA0102.namprd06.prod.outlook.com (2603:10b6:5:336::35) by CY4PR1201MB0117.namprd12.prod.outlook.com (2603:10b6:910:22::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:59:05 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:5:336:cafe::bf) by DM6PR06CA0102.outlook.office365.com (2603:10b6:5:336::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:59:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:59:05 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:59:03 +0000 From: Xueming Li To: Andrew Rybchenko CC: Luca Boccassi , dpdk stable Date: Wed, 10 Nov 2021 14:32:04 +0800 Message-ID: <20211110063216.2744012-241-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0da914ec-0634-44bc-3c95-08d9a41795dd X-MS-TrafficTypeDiagnostic: CY4PR1201MB0117: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PWBe5F9NKeLupBUHgGqhElTm9J6O0Lh/3zSnqLivX6NuyIHRORJmz2RnV8fR5E7GiC1KbAyBfuYqctv+XQbTggwQGU2TjEGm8IYtgtBwmSIjayYtG9ZKsN0rdjT+VzoDSKhT33+yXWSYyG0lGnOsEt2f4lHNXUpbiXFm0eUEt0YRQwKIsOocRC6w5eSmtBvrQUac1SIuc3hhlqRO3qEXtbPYBKvcIgmQ6flCvq6N0ngVlBokXfaCOEhVv0uLso9A3bpsUeO5YbIVMYtGueIJ0RN5TLuMDZzx5YYp6paAtzW8OiIJWfwuC4pSSLj3tw/HCs+VfbsCtqELxWAoAyjGI8wBtmUwxQ73uDcxD66XrTvdBFQG+nJP2ZR45PfMBZ+hf67AFnI/9d0lsclokzB8cGoulPUXBpdOgEiPop0OJUZTsuEz7D0jZmWHXzQfgdiY7ks0EJrSei3JsfXV+7u/NfHEaalE4mROR3DQX4NxGqEQIzadNAeFAkwVmLDB2Rco4nmMkYtzaG/4MttsovclNTOaWNUcl27149ZKzhBi5G1j+t9t0ra9uj8+Wy9g0EuMJLc+ESrqI3mSS1uR+RlToWRGgLNV3f63Scm9Dnchr7PhKjmfTEscRYzMuA67O7n2eWx80virNOzqjpgMVK153KNSigHFYpKQNqRmdk/xBYMb6XQW+rPGO9r9hs4mVcd9lBQm7J/t5kOZS6L6TuVpndL1F7jadVmwAhA2flLSqcje10vNV2Glz4jV5TZqEF69KPKIIyJlnjtrTs0yfQkRaWJnobDSxDEVbCHd+npbUf0dWIB/ojVpAvC/TwI/nOW24JsN8CwqmFZS8fSJ2ni4cw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(5660300002)(2906002)(8676002)(7696005)(1076003)(16526019)(47076005)(7636003)(186003)(83380400001)(356005)(55016002)(4326008)(6916009)(4001150100001)(54906003)(26005)(70206006)(316002)(426003)(53546011)(2616005)(8936002)(70586007)(6286002)(966005)(508600001)(36756003)(86362001)(82310400003)(36860700001)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:59:05.4153 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0da914ec-0634-44bc-3c95-08d9a41795dd X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0117 Subject: [dpdk-stable] patch 'common/sfc_efx: fix debug compilation control' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 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/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/f4893697256da4579190dbfe7761c6af87c27599 Thanks. Xueming Li --- >From f4893697256da4579190dbfe7761c6af87c27599 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Fri, 5 Nov 2021 11:33:30 +0300 Subject: [PATCH] common/sfc_efx: fix debug compilation control Cc: Xueming Li [ upstream commit 5e973b3fa1bb6a8e682a8bfab6142809db69dcc3 ] efsys.h belongs to common/sfc_efx and common driver debug toggle should be used instead of net/sfc toggle. Fixes: 5e111ed87999 ("net/sfc: introduce common driver library") Signed-off-by: Andrew Rybchenko --- drivers/common/sfc_efx/efsys.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h index a3ae3137e6..c2ff3fe9bc 100644 --- a/drivers/common/sfc_efx/efsys.h +++ b/drivers/common/sfc_efx/efsys.h @@ -125,7 +125,7 @@ prefetch_read_once(const volatile void *addr) /* Enable Riverhead support */ #define EFSYS_OPT_RIVERHEAD 1 -#ifdef RTE_LIBRTE_SFC_EFX_DEBUG +#ifdef RTE_DEBUG_COMMON_SFC_EFX #define EFSYS_OPT_CHECK_REG 1 #else #define EFSYS_OPT_CHECK_REG 0 @@ -740,7 +740,7 @@ typedef uint64_t efsys_stat_t; /* RTE_VERIFY from DPDK treats expressions with % operator incorrectly, * so we re-implement it here */ -#ifdef RTE_LIBRTE_SFC_EFX_DEBUG +#ifdef RTE_DEBUG_COMMON_SFC_EFX #define EFSYS_ASSERT(_exp) \ do { \ if (unlikely(!(_exp))) \ -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.463387073 +0800 +++ 0240-common-sfc_efx-fix-debug-compilation-control.patch 2021-11-10 14:17:02.084077679 +0800 @@ -1 +1 @@ -From 5e973b3fa1bb6a8e682a8bfab6142809db69dcc3 Mon Sep 17 00:00:00 2001 +From f4893697256da4579190dbfe7761c6af87c27599 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5e973b3fa1bb6a8e682a8bfab6142809db69dcc3 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 37ec6b99ba..b2109bf3c0 100644 +index a3ae3137e6..c2ff3fe9bc 100644 @@ -30 +32 @@ -@@ -742,7 +742,7 @@ typedef uint64_t efsys_stat_t; +@@ -740,7 +740,7 @@ typedef uint64_t efsys_stat_t;