From patchwork Fri Jan 6 20:13:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 121685 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE4F3A00C2; Fri, 6 Jan 2023 21:13:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 358D840A79; Fri, 6 Jan 2023 21:13:37 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2040.outbound.protection.outlook.com [40.107.92.40]) by mails.dpdk.org (Postfix) with ESMTP id CFD23400EF; Fri, 6 Jan 2023 21:13:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W5Rh4LdBOW5t4B/gxg0O03k6UYBNpW2ph4ntjkyyvwuKAsetBtSIHbXeVls67ivsNQESGUBiIAHt0nXvG/8jb7dDqN6AZsFLKSWZFt0roTEbR2dZjCH8AuHyfmj88NzdJ0+BDIlyQj7o2iBHf9omksoDZlNHo42yOundl/uwfHqSEfKBjX73dt6G4QNnSLcct3NuDYy6iW6yRzdKguAy1MEltGqK+c0SKcqUiOM7y4+vQSGnm5ePpU4w577BgCsrthykHJwm+3Q3yqS8a1LYbt4WYoWqwC/6TJeBTfxlBWqmeNkcGOHL5/knxa2uRdp6KdeNnc+9kn0Tob4D2rmpEw== 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=WjQfXrOneeMOwChAXl9ROzb2AN1iuMuqtHfWZcOgUtE=; b=beUsf4tZ4D9XN9Pauhe379/+k4DyO9SFZIeAqcMnaV87a5CTB5Ha0JkZpze87dn+pOROYykzj0+F1vabsTbsH2SFkENko0KA2Qq1fcbjUUFLZPeeT17l0tGcmACoGOPICvzMXwyKIy8miiV7AuOgt2Hu6mpDYVvrvCZV6gsToLbDk9HwRONeQhSyjewGCbkr1uMQ5nzrfNyVixKO5wVJFbR6F5u20HKN8Rxh1UMvf2zTEXGaR3Zf+cSB0/9CqZQW+YqaFw74BBFhaf0OHc2H7F0R6Izwkpg9o1baXresP2BjMHlDm896htoNiOEn4s/KClFXZ6DPtT0gMhdnmN41sA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=monjalon.net smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WjQfXrOneeMOwChAXl9ROzb2AN1iuMuqtHfWZcOgUtE=; b=i+G+UrASJupyaS2qLTw8KLPetaJvOgwHC61vESGiprmADPxKHVXLsvj7YDFL88PCNEhAplnk/i3AwkQWAu7UTRSXTACehUv6eBsLLFEIVNKo4fRu8k+59NgoemRk1shfSVLhpdXnYr628FLOz6cXFyz7TXQ7dvJ90LpD8SyMWBI= Received: from DM6PR21CA0018.namprd21.prod.outlook.com (2603:10b6:5:174::28) by BL1PR12MB5208.namprd12.prod.outlook.com (2603:10b6:208:311::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Fri, 6 Jan 2023 20:13:31 +0000 Received: from DM6NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:5:174:cafe::5e) by DM6PR21CA0018.outlook.office365.com (2603:10b6:5:174::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.8 via Frontend Transport; Fri, 6 Jan 2023 20:13:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT021.mail.protection.outlook.com (10.13.173.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5986.14 via Frontend Transport; Fri, 6 Jan 2023 20:13:30 +0000 Received: from telcodpdk.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 6 Jan 2023 14:13:29 -0600 From: Ferruh Yigit To: Thomas Monjalon CC: David Marchand , , , Subject: [PATCH] kni: fix build on RHEL 9.1 Date: Fri, 6 Jan 2023 20:13:14 +0000 Message-ID: <20230106201315.1179306-1-ferruh.yigit@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT021:EE_|BL1PR12MB5208:EE_ X-MS-Office365-Filtering-Correlation-Id: e08c97d4-58b1-4c0c-fc48-08daf0227b06 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NVSl2uRljTy0r4uZP8+QVbRTeDsNPVPhIqMig3hdCq6w2CFtifeqGF6VR4RhpPA7kWZ4iuI608KXnxyH6PqhSYqpfnJkSQvQBRtP53xttRnjYiziPHJA/eSxvzN4zgZ5L62EjrL9bKo9CFJaHovTwkWWoq6NLkR8gufnE1sBltAUJSMs3dDa0xhOAYcYbMIrTXgBYe5V+pM9ToLtGytTJUtnjZ2YJwrC0e0MPz6jju069hy1S+6nhd4ocELRoBf6fvu6Gh6q6CVh1IAgmOT8KlESQVBmnOyFrXkfE9USw36J9FZ+R9hAHCNU9w1uZdcDMY386r6xfJIMbQmf7LYMdIfsF9XiEBkPhGE+ZucgnEjBmV2ORc7zblAA5awqSRdCjVorqd/YmKd1HRrXWMJfSochsQRqbb+V7o+5Hlg5V8TV0MXUMb/zdtCvVUlEOp4E2di47OyLP2j6Y6yTi5IhFgD9/BHOk+Zmuy0YJxJzecpaMgj1lTpZ/Cwtgo71HC1MJheCdB/cqsbBWuCla2rrkyApnq+8HjBN+Gbw30P466ukK8dNpk9I6n1QiPRtNOEjRAknmLML8qgY269+FZ1tElkPH4RoSBQK2pA3QI2fW/7RRfTmxz3VBGclSQS2BRVetgmCyBPwuOJzjyy3YJFxlYH9WvuyPXohZqwDHJd0z2k74pmcarZrMV0ddHG0yTlNrflHH6EbP2K6SyY0ywrjfvAHMD0tjmefb+QPUrt4mdE= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(136003)(396003)(39860400002)(451199015)(40470700004)(46966006)(36840700001)(26005)(2616005)(186003)(1076003)(83380400001)(82740400003)(426003)(16526019)(47076005)(336012)(40480700001)(36860700001)(40460700003)(82310400005)(36756003)(356005)(81166007)(44832011)(6916009)(54906003)(2906002)(316002)(86362001)(70586007)(4326008)(41300700001)(8936002)(5660300002)(70206006)(8676002)(6666004)(478600001)(7696005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2023 20:13:30.9174 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e08c97d4-58b1-4c0c-fc48-08daf0227b06 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5208 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Linux kernel in the RHEL9.1 seems backported Linux commit [1] that drops netif_rx_ni(). This was fixed in DPDK [2] for vanilla Linux kernel. Adding RHEL9.1 check for the netif_rx_ni() usage to fix build error. [1] 2655926aea9b ("net: Remove netif_rx_any_context() and netif_rx_ni().") [2] Commit c98600d4bed6 ("kni: fix build with Linux 5.18") Bugzilla ID: 1076 Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Tested-by: Daxue Gao Reviewed-by: David Marchand --- Cc: daxuex.gao@intel.com --- 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 3a86d12bbc5c..7aa6cd9fca75 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