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 0072442D46 for ; Sun, 25 Jun 2023 08:36:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B689242BDA; Sun, 25 Jun 2023 08:36:24 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2077.outbound.protection.outlook.com [40.107.92.77]) by mails.dpdk.org (Postfix) with ESMTP id AB31040A7F for ; Sun, 25 Jun 2023 08:36:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UK0RHq82DxlVKZjSrR7Q/ztkTLNoTw+RRAZirwDaehZQyGFvkrjn4IZQpJPUYTMcLMlDBl/La5AU6A2RpEWm46fQmhd1k3bMyOylIEH7NWtJ1AEi2XBeun4G9skykN91boskjGbeW37wJZTK5OwWV9EqTXUYliCh6XTkzIDuoTZK+z2Bs5kEOghAUyO/TagWmHkovxmBgiaRay4orjScupx+L61Sm1fV7BkxruDSzw4Y6fabO92eJ7AinvED+9nhE8D+nQWZAoPPhLbg0sOHTf3I0tJ+VxcWvomUoMXyO2OKibZFDrjhsMZxpbiV9E9EiwUQAw8zjn2bPmkXxzTrZA== 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=yX2D6ocebNjq5YQqpqHXEeZuWNg39A7ovPKaLiHbSPE=; b=OehYZlcwl88BSa4NnslHy4yTeNEG37YKDM4/LTFYld9IKpgEyCqaPjOd4w+EvAw6GEfYeOl8pEywofjwAgIaJZNvT+6H5+/QKXThmHT+mbudd2pd/m29mPdj5+ovw/907bG2iSd/b2gq0U21qwG6Q+jI7EnmSVpF8VzClyb36Zj+PSy25DKjfkBC6dpgsWS9pA21bKfBInmT+R3M/HoUK8qvyDYovmChCUIShrRoAaTHf6XuHfYNs/MSk+uXiiKYUHrtMHmZUggL8PmjD74Y/Zs7XI+HsF/+fhMywOw5NRVOh07P0OlXz6zOeChGxoaDGyjtRW5NzuRcaZ5qfOOBkQ== 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=yX2D6ocebNjq5YQqpqHXEeZuWNg39A7ovPKaLiHbSPE=; b=fsozsK0GNJGw9ZKsA7HQVAhEdYvKMd3wxsxVsCFnZHZ+PdkKI3rlbw8YT2K+7CZsurOKbPyVTuFLj/wKbaJ1ZjzigWvsMleGLnUMUEeO5a0D0OoVaw5t6Jjn8eT8P+P6i/vZV5mAPNYBN8hMoGnSAtmxZ4jO7dEGA2Uf4OP7LPHNJZnbwwnFjCGxZf65Iu/PNtpcQaYcmDB9jaKeQdFieLaOE0bwd2b0kz2dMrRZkJkamxSzwJIwh+p/Y6NTOnP7VpYb9KYOfDqOn6QdUWCFIGul7dItVqPlvC2SexaCLaUDjfl4vr56/QmSiDynD71cdsPId/ujGdAsm9UhTZbU2Q== Received: from BN6PR17CA0057.namprd17.prod.outlook.com (2603:10b6:405:75::46) by MW3PR12MB4427.namprd12.prod.outlook.com (2603:10b6:303:52::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:36:22 +0000 Received: from BN8NAM11FT085.eop-nam11.prod.protection.outlook.com (2603:10b6:405:75:cafe::27) by BN6PR17CA0057.outlook.office365.com (2603:10b6:405:75::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:36:21 +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 BN8NAM11FT085.mail.protection.outlook.com (10.13.176.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:36:21 +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.5; Sat, 24 Jun 2023 23:36:11 -0700 Received: from nvidia.com (10.126.230.35) 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; Sat, 24 Jun 2023 23:36:09 -0700 From: Xueming Li To: Ferruh Yigit CC: David Marchand , dpdk stable Subject: patch 'kni: fix build with Linux 6.3' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:33:40 +0800 Message-ID: <20230625063544.11183-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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: BN8NAM11FT085:EE_|MW3PR12MB4427:EE_ X-MS-Office365-Filtering-Correlation-Id: afb57a7d-a633-488c-e338-08db75467d71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: genNuEJzQHPAjYIUSMIGDrDI1aBqEidg2Ky5ybrx+T+nBaSKjyO+HathlUZ+/7zLjESZgytSs2CTghsYWosMF6VyA3G6i+YcG1XkyxTeq4IMB00KS4FFjX9+jeEwnPKiCZiYIlPgA8QsRTZPUR0EsW8O4GwijPjBkXHcUo+GvsOlV7112F8FYcN+6uP7RuHfegNgpvPh3t5QLTddisbi+rsiZ5tYlYa1+aPKJi6PG1ENkRNvNoFUYYVTGy6VV/XVFikH4gAUwCgk3AEwLH/XsHOGV8PhBDWmiCyM9MoOgFB5EPldQl/SVWdsgJCbFsGaFJXfYXwKW+i7d4FdqSzG4PwUcZOyUqkAlPwhp3PPYtUz8akXVnEkxtAHH6vDlSmVjje4Y7ZR71M3AX7aN8XQvR+rmstqgDvT6xiS0YiW54zlKvz/z7qonziipHyRc0fpPV4D271eYAS+NrhVTtqeNeNYdiJYry44+UqM1lsic0bAIJr7u/k4XYwhCK1GMigT+7PWEqnbHZKMgqYVkdjNDZFsEYQCrDHC1sjOdUhvjEGNF3qDA1836+runHg1KusPjuSGYCuN107VJzMQzzDSjN+VTxGxIpjYCU/XZKwR1FGq0Mi06PuOoBTnmChB2a1q0C+VAnXsoflx+WIWhTalht9f/z69+LEzdrWLqJa/Rey5qu9JA4KOmmu79qqsw8SUIwEQy6vGQGM0gHzLRDEm5HyfQ5u0HusddDM6qneQt+dd8PCC9F11bavlvHeYrDfqxsB9DNa0X42RYI8ioHOD+w== 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:(13230028)(4636009)(39860400002)(376002)(346002)(136003)(396003)(451199021)(36840700001)(40470700004)(46966006)(82310400005)(2906002)(186003)(26005)(1076003)(426003)(47076005)(2616005)(336012)(7636003)(53546011)(356005)(6286002)(16526019)(40480700001)(36860700001)(5660300002)(41300700001)(40460700003)(83380400001)(70206006)(70586007)(8936002)(36756003)(8676002)(55016003)(82740400003)(6666004)(54906003)(7696005)(966005)(86362001)(4326008)(478600001)(6916009)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:36:21.3958 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: afb57a7d-a633-488c-e338-08db75467d71 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: BN8NAM11FT085.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4427 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 06/27/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=156b423f54f532d3d89fa0a59276cf6751602900 Thanks. Xueming Li --- >From 156b423f54f532d3d89fa0a59276cf6751602900 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 14 Apr 2023 16:25:22 +0100 Subject: [PATCH] kni: fix build with Linux 6.3 Cc: Xueming Li [ upstream commit 5f34cc454df420b9b2da8deb949fb76cba058b87 ] KNI calls `get_user_pages_remote()` API which is using `FOLL_TOUCH` flag, but `FOLL_TOUCH` is no more in public headers since v6.3, causing a build error. `FOLL_*` defines in Linux kernel first moved to another header [1], later some of them moved to memory subsystem internal header [2] for 6.3 `get_user_pages_remote()` already sets `FOLL_TOUCH` internally, no need to set this flag externally anyway, moving flag from the call altogether. [1] Commit b5054174ac7c ("mm: move FOLL_* defs to mm_types.h") [2] Commit 2c2241081f7d ("mm/gup: move private gup FOLL_ flags to internal.h") Fixes: e73831dc6c26 ("kni: support userspace VA") Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand --- kernel/linux/kni/kni_dev.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h index a2c6d9fc1a..21bfb6890e 100644 --- a/kernel/linux/kni/kni_dev.h +++ b/kernel/linux/kni/kni_dev.h @@ -105,11 +105,9 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk, /* Read one page struct info */ #ifdef HAVE_TSK_IN_GUP - ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, - FOLL_TOUCH, &page, NULL, NULL); + ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, 0, &page, NULL, NULL); #else - ret = get_user_pages_remote(tsk->mm, iova, 1, - FOLL_TOUCH, &page, NULL, NULL); + ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL, NULL); #endif if (ret < 0) return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:58.661058400 +0800 +++ 0002-kni-fix-build-with-Linux-6.3.patch 2023-06-25 14:31:58.285773900 +0800 @@ -1 +1 @@ -From 5f34cc454df420b9b2da8deb949fb76cba058b87 Mon Sep 17 00:00:00 2001 +From 156b423f54f532d3d89fa0a59276cf6751602900 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5f34cc454df420b9b2da8deb949fb76cba058b87 ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org