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 8AA2B4301F for ; Thu, 10 Aug 2023 02:08:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 848A840DD8; Thu, 10 Aug 2023 02:08:46 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2084.outbound.protection.outlook.com [40.107.94.84]) by mails.dpdk.org (Postfix) with ESMTP id 28EA5406B6 for ; Thu, 10 Aug 2023 02:08:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kWPs4Rz6nb4S0o/0uzREZdEedmAPpWXa9SedqzEjAyu2k2f4wm1f8wZbNlntVn0qe5fDjmUzcfyVfIKrWdfhUolokr3wjZ/v724PiMlINd9k82HCEkOcqRzGfY6R25di40WufHuRyzP3OZ1wZx6k2dvknr6GD1tWuMMMkjUJFTDdtKJj5uOZ9coEEeVdEDf6d4l3h4FeX4q/yMzDu6w4AwmkpBl3f9TvZv1CwhOm1KV495pG6xjWlY5uC1FXCXXppQ21WF70yeZwAPu2JxN8Y/8tFNq0Uel9IAxaIMlwXs/sGBrM4kbIlLe/v/6ybNalmB2x9zN7E4Do8+n+0pJPYw== 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=/MyDL4+iogFydVimtDY+l+28/rIJiIaGTfIiwjJ/3ek=; b=fIdGnuPZ+SHxVIlFeRANH6S+leU/8SNfCnYsYA180O0E9R51Zb1tDUspnZMqtq32aMNGCztmVg4XhHm7KZjEJtShM/NoejpXfnMwjVZonHoKXYx5JjkSXt2tLtJ+spbCQGqTr5QMpv3uXTy8IvEzvED+tUu0r1xbHPBXc+qtxAoU24qhNm9ZshSaCvL/pm4qEEuZ9McoshUHCyH+sEoUcKNSOS4/rSfwD8l+DwTit/hdElatf9wuoU375VOO/qhaxKPp29ihhaudAOmydOr9nGSJPTgIiXyzizIwRQ2b1gWmmuKTpPD/vfupbaIj8eq/IyZs/peouZqgl0Vw7no6Fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=/MyDL4+iogFydVimtDY+l+28/rIJiIaGTfIiwjJ/3ek=; b=oY7CgiauZHX80ebSmo55Vl0dHLnzEp0Q/81eWFbOqiRJCATF3FrXQnwhp626TRXCHqwEMOVwYsyxql8So9mUco0o7Jl3EflX1ENhs14d8sp/KyCagj9dXftYKN4hMV+HXz5E9d/TQnPVwKIYyYqYNZo44k3oxKhj7d8625pSPdZWM03GHb/vQMcIjGYfwYj81vedFdx85XaAyHLWbPMqG86Wllv2OwnxpdyVGp1SlRfFLevHG1g6euuURTNyUsSMd+yffnzGtaoxy/LqCSbZ0OPiGCX8zhubfHbTuGj2q+CsSk/iJckoj2rbdim/ujGvFBEwNL1413VT+ug4GUbyiQ== Received: from DS7PR07CA0004.namprd07.prod.outlook.com (2603:10b6:5:3af::13) by SA3PR12MB8761.namprd12.prod.outlook.com (2603:10b6:806:312::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:08:43 +0000 Received: from CY4PEPF0000E9D7.namprd05.prod.outlook.com (2603:10b6:5:3af:cafe::f6) by DS7PR07CA0004.outlook.office365.com (2603:10b6:5:3af::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:08:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000E9D7.mail.protection.outlook.com (10.167.241.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:08:42 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:08:30 -0700 Received: from nvidia.com (10.126.231.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; Wed, 9 Aug 2023 17:08:29 -0700 From: Xueming Li To: Ferruh Yigit CC: dpdk stable Subject: patch 'kni: fix build with Linux 6.5' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:06:52 +0800 Message-ID: <20230810000717.2191-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810000717.2191-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810000717.2191-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: CY4PEPF0000E9D7:EE_|SA3PR12MB8761:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d6679a9-278a-4288-0f2f-08db9935f536 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gIrStkv/wTOG6z5wYuCCIi/ugefczxQgizxw2y7AjD5k7fu8+0V3wpRY7dZRuFS9P7tQOsnjpQ1YSe5Qp7dhjlfs+8qhvx7mSsWhmL32j+uQMGwFQoHkXx0rnuxUPdzQXZE9mYoJwIH0jXLgnzXoGAHuu4Z7XFtr+zWN7+Ltv601Mv7VxFFdQw/Uu59pzThF8MS13sfuHCNz8F557B1wG02rFO0jTtfX1F0N/fnO8jNQNxLg8CF2ng+cxPUjw0gWkGt4VTWxhm4oz91kWmB5yWaT9Sym+OZpnH33RWfIYcVjk/e9LvNmEU38eJQa3JoT+8wOeX29go2rQ8I0T8wnt6EHsbBTiK6Fz0akaxPQewvHQbyzw/kTRSRwuB1S7fqYZPxmr/AUrqUElcum0Z9rd2SweD5pJLisBeH9tu1cXyTmsTC4riT5HoncGMMF2GFn6USBmwFLL33eBmlO9DlyPyL6peWmYfody0fk1EZ1rsp6hjlsxtVkkCKo55IjxVHchRx2KBm4mgMr+jruuUkWabDHL/DfBKa6IPCZvTZfoZeFt3Z9qyMG4nhH7j1Uozf9TDyORUXrJqsIoe/jHbWLGWlGM9FL/GtK252nAIqcpfMWV4FAIcaduuEcHOUYE1dpEOTkYw9HA8W5zMjTdjyqaCnwHEOiBosHu2tcCm/buKd+YF+r7hicHgpWK1We0nXJLo/uGWhavL83Pa1jmzse0tIOEZE8rXtw5bjmva1JCHOehv33GZE4AwB/xouxuGBLBekLVNKng3erqf8qxLgGyQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(396003)(39860400002)(136003)(186006)(82310400008)(1800799006)(451199021)(40470700004)(46966006)(36840700001)(47076005)(966005)(2906002)(53546011)(1076003)(26005)(7696005)(40480700001)(55016003)(86362001)(40460700003)(426003)(6916009)(70586007)(70206006)(4326008)(82740400003)(7636003)(2616005)(356005)(336012)(16526019)(6286002)(41300700001)(316002)(36756003)(478600001)(5660300002)(6666004)(8676002)(8936002)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:08:42.7928 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d6679a9-278a-4288-0f2f-08db9935f536 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D7.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8761 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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=b9a44572feac5bce05a44eb4b09de640dee31546 Thanks. Xueming Li --- >From b9a44572feac5bce05a44eb4b09de640dee31546 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 11 Jul 2023 11:09:41 +0100 Subject: [PATCH] kni: fix build with Linux 6.5 Cc: Xueming Li [ upstream commit dd33d53b9a032d7376aa04a28a1235338e1fd78f ] The get_user_pages_remote() API has been modified in Linux kernel v6.5 [1], "struct vm_area_struct **vmas" parameter removed from the API. To fix KNI build with Linux kernel v6.5, version check added around the get_user_pages_remote() API. [1] ca5e863233e8 ("mm/gup: remove vmas parameter from get_user_pages_remote()") Signed-off-by: Ferruh Yigit --- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_dev.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 7aa6cd9fca..8beb670465 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -151,3 +151,7 @@ RHEL_RELEASE_VERSION(9, 1) <= RHEL_RELEASE_CODE)) #define HAVE_NETIF_RX_NI #endif + +#if KERNEL_VERSION(6, 5, 0) > LINUX_VERSION_CODE +#define HAVE_VMA_IN_GUP +#endif diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h index 21bfb6890e..975379825b 100644 --- a/kernel/linux/kni/kni_dev.h +++ b/kernel/linux/kni/kni_dev.h @@ -107,7 +107,11 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk, #ifdef HAVE_TSK_IN_GUP ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, 0, &page, NULL, NULL); #else + #ifdef HAVE_VMA_IN_GUP ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL, NULL); + #else + ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL); + #endif #endif if (ret < 0) return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.818176000 +0800 +++ 0103-kni-fix-build-with-Linux-6.5.patch 2023-08-09 21:51:18.274352000 +0800 @@ -1 +1 @@ -From dd33d53b9a032d7376aa04a28a1235338e1fd78f Mon Sep 17 00:00:00 2001 +From b9a44572feac5bce05a44eb4b09de640dee31546 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dd33d53b9a032d7376aa04a28a1235338e1fd78f ] @@ -14,2 +16,0 @@ - -Cc: stable@dpdk.org