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 7802241D8C for ; Mon, 27 Feb 2023 08:01:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 73336410EE; Mon, 27 Feb 2023 08:01:54 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2085.outbound.protection.outlook.com [40.107.94.85]) by mails.dpdk.org (Postfix) with ESMTP id C979240A7D for ; Mon, 27 Feb 2023 08:01:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MRTi3LmE2rbNYIifRssZ6Nb8eSbGzOX9rrp4FxnvRCoZbGa4dY6kaMLlx82olabAAAwPzzWLF86Xr6voQaqPx5Psl+gyZydHCUGU1/ZAxOs2YWQfZEgGFeWU0FS2l3MVqvBAg8le54xQ56WIFjNoFrQyzlXUsuQNj4EDSekTx9gxI6jcYaaBId9hsr3NStC1HpfJsF+ycwWf+eZGDNuIMf3Hsz0+NSxtMrfEIcLMGwmmkdo3i5J1chc7CRjZPtxOG3xbdwdv0wnNpNan1IHzz5OpgXGlIhM7OfwX8wXXzXN+vn6sJnmarv8PFVVQ9ciMoSjE9Kb3UUlUO/LBtA6Zeg== 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=zOVRbY2bKAdkILB/dFGOIgZGPi6Fpc2U30Eg7PLgPHY=; b=MluEF24zbNO4q4w+0mnlsVec9phRX7TgGXLQrwN/IwWkeT9DhlhZko7/8KHq6Za0tDLG2qCM+zhfxXRKSufR0qb1n5y3CCjUysZYkl56mdwIynxwjvnAdtbSYfJ5n7h1o+afDKPzBD1mCdAW9Q1HeXicfXqr/5GouYWliExN5oDD698gCsAPQf4WRI5WguruuBUJTfVACF/ac8YjaXhCGNDNoD5tYN9uXjHEZKsEx1RZpmx9dI+MpPo/F+r+MQZZsUOlAxl637iGo9qC0/Gy0KyWkHezZtM1oPTKz3pRP0t6SsIdyqQ33HHuJu3hQGLoaFlGgaw6eZhFsTm8tANucw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=zOVRbY2bKAdkILB/dFGOIgZGPi6Fpc2U30Eg7PLgPHY=; b=pKDjk34nxfxCP0PAQW952yOQveJVRBSh9La7OZVuZj1spQxUeCgKLjGdkJu4KwYCLj5uIT7tdUziFOZKcO6d8xjoU5Gj+cuqnH0a+dYL+5DeV90RKfCr9h4e83WCiwGnNqMdMtMiMZ+gS7H2g0sFh1qdKIX47P5M/L9oFKPxvYkdjBu1nNhkodsTeGFpIcxCJtfj1N4TOalSDGCuhxKrCIrnlUyvPRy3BkCq/Pp9mcT86lxmodM9q5Qamh9khxabzbVLXlz8dJOg+5Y+DoBfGF7tQs9yCyrwR4SohGfb9vqkSoqvaxfkz9tiJaI3mQ09k4leW6bY9L76C3sRkPfQcw== Received: from MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) by BY5PR12MB4872.namprd12.prod.outlook.com (2603:10b6:a03:1c4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:01:50 +0000 Received: from BL02EPF000108EB.namprd05.prod.outlook.com (2603:10b6:208:23d:cafe::35) by MN2PR06CA0022.outlook.office365.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28 via Frontend Transport; Mon, 27 Feb 2023 07:01:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF000108EB.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:01:49 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:01:35 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:01:28 -0800 From: Xueming Li To: Ferruh Yigit CC: Daxue Gao , David Marchand , dpdk stable Subject: patch 'kni: fix build on RHEL 9.1' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:58:31 +0800 Message-ID: <20230227070107.15664-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF000108EB:EE_|BY5PR12MB4872:EE_ X-MS-Office365-Filtering-Correlation-Id: 513520ab-e643-4609-12ad-08db18907fc1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lc4zv6vtov/d48LcZtGGWZvozavLT5CM4davEIcPOiYjuNjlTdk/9PVE0H3N8P2Y1fjKbDAHNJ3OLx/vV/JT4yF5kuzwC+cofVQn5pyQAxtqJHSV8sMj991fRN+C/sOtGhaWY7q35EPv5gycO2BpmiAG+z94SgaeoB4Gi08gKI9HTILqhH5Pv8iLl//V/NUkU70h3ozLkO0BREt+6BXq/f0uH109LVfrFeMCEqMPFsMn5EH+Ifm83TKSaP4mVHxma6EAUcwbN2F53bQy4vJ2/HjdSKIp0I4SZbJ9R2Dc9XVajl/gPrZyYif4aUOJyAS4PUBSWVYGe0Y4fDX4tjzfYtIUzSbUEQQfEzSKP3JGbgdsrqtZHMtxeE4vo+3gOafAjVPg8Mfo0d4AsDiSU1nK19dME1vDr8zImNgxytEfE+U9x4kYJNilFS9+DJhe9SWdOSQ/6sDluf57Wtv+n2iNENu0MPKTFrN1mvE7MgqlTCDNPu3TCElis37AmJBU1bT/Dy/o4OkldGVIcCkD6A0v70jp4ll6hIXu406OChsUzb7C/S92icSQ5hsUS9C2cWwFNvCigOSKKJbqNv2JEpI3mYz32Mkdyi6EnXZ3/F3+zzUDHaO9rjFw3HK8I5UFT8uNVnYN83YpTuEHeOBHlpg/A1zom9JIevg94GRx7DeCjVHA4iYr5yzkOrKYArg0gkQZYahq9y70Dqr57oix3KeevHZZa42y4D6ZklTChk0Y9yHiVxsg6fr/S69+bo9U2PHG X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39850400004)(376002)(396003)(346002)(136003)(451199018)(46966006)(36840700001)(26005)(186003)(6286002)(16526019)(1076003)(53546011)(6666004)(82310400005)(36860700001)(426003)(47076005)(83380400001)(356005)(86362001)(40480700001)(7636003)(82740400003)(36756003)(55016003)(2616005)(336012)(41300700001)(70206006)(70586007)(4326008)(6916009)(8676002)(2906002)(8936002)(5660300002)(966005)(7696005)(316002)(54906003)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:01:49.8742 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 513520ab-e643-4609-12ad-08db18907fc1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF000108EB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4872 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.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 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c8af2a4ad56645e30130088661380338e06b3462 Thanks. Xueming Li --- >From c8af2a4ad56645e30130088661380338e06b3462 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 6 Jan 2023 20:13:14 +0000 Subject: [PATCH] kni: fix build on RHEL 9.1 Cc: Xueming Li [ upstream commit 8b07816b396f2075f44b4ffa65ecbd0d5a624661 ] Linux kernel in the RHEL9.1 seems backported Linux commit 2655926aea9b ("net: Remove netif_rx_any_context() and netif_rx_ni().") that drops netif_rx_ni(). This was fixed in DPDK for vanilla kernel with the commit c98600d4bed6 ("kni: fix build with Linux 5.18"). Add RHEL9.1 check for the netif_rx_ni() usage to fix build error. Bugzilla ID: 1076 Signed-off-by: Ferruh Yigit Tested-by: Daxue Gao Reviewed-by: David Marchand --- kernel/linux/kni/compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 3a86d12bbc..7aa6cd9fca 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -146,6 +146,8 @@ #define HAVE_ETH_HW_ADDR_SET #endif -#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE +#if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE && \ + (!(defined(RHEL_RELEASE_CODE) && \ + RHEL_RELEASE_VERSION(9, 1) <= RHEL_RELEASE_CODE)) #define HAVE_NETIF_RX_NI #endif -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:41.138294800 +0800 +++ 0004-kni-fix-build-on-RHEL-9.1.patch 2023-02-27 14:08:40.719237000 +0800 @@ -1 +1 @@ -From 8b07816b396f2075f44b4ffa65ecbd0d5a624661 Mon Sep 17 00:00:00 2001 +From c8af2a4ad56645e30130088661380338e06b3462 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8b07816b396f2075f44b4ffa65ecbd0d5a624661 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org