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 1C1A842942; Fri, 14 Apr 2023 17:25:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC9F240144; Fri, 14 Apr 2023 17:25:41 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2043.outbound.protection.outlook.com [40.107.243.43]) by mails.dpdk.org (Postfix) with ESMTP id C6190400D5 for ; Fri, 14 Apr 2023 17:25:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qgi1D8cbZ5dxyr33KpjMWumIdKQlThKlUqEKC74fFx3P6gKTxSt/ZKHJjrbX2GvyhT3q3pM8KIpmnuOH+IugFgcVoViLvwdQ5hRUbZWJyHekWhiotP/MYhiihjI+ffABfUWjHnWFfan2aWcVAXXg/AVhDQeW59eGAXn1NGvNfTpZpvDosOQowUU583E5/QAiRo4bRP20SosKQirJU9vWrF7fzBGeTUIXMGHHlDv4eoyTwRl8/yHyD9AZj+SWvFi+Fxmz6P/DnFUBzipYShQ8IZPeuYaES/rwgJVL13a/7W30CJbCikHjOVSc7HLp7XD/9s8sw7Y4ttyrHLt4SgWdwQ== 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=FH1d05E0ahNkT6iFdpQtCRhTGWDGUgGcrfawgoekVfY=; b=N9dzFo7tiwM465gUs70Z10dh7suiU9D4ylQmbEPjTf//PQDaVJMx46Qc2dBvOhVt5BeU08wW2aPqlatHZG4tb8ADxqbR5E9lRtMHu4/21FI/wrrd8DjUdIpkiq4+e+O4C2aSyKJFHNpJqhvC0ld7lOt1kmA4gSChPV3LGBcDMZm4gB3l4mZG2wF9vaj4tst6fw09MbT4izIqmDCs6vV8VsOQdahY7ZjXhPOFC5VuWXGDN9GsC5JO4DuYnvtC4QUwcwE53FAZz0b+Gxop0kdDPTk81vuF9Ta/WWjLk0gQ+5IEzowYhJufdBZnO2Rcrh3o3Nvb28ygtNPGqKNdw5lJOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org 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=FH1d05E0ahNkT6iFdpQtCRhTGWDGUgGcrfawgoekVfY=; b=nAM2B4+F0SEX9E7qAVdF5rWUTcmChdP9EuB1WcUdDEJfL7R64v2NIpxfIPt7N+f6bRab1LBIUME5ueiiqA65YJtDtVXF46a6o8PMrhCoW31XXcMOYbvDd2UhFltVkSMc6KOKFo4vRyY8Ep8SF4xHRe9mMJmzBrTH/9Hwj6YIuxQ= Received: from BN8PR03CA0011.namprd03.prod.outlook.com (2603:10b6:408:94::24) by MW3PR12MB4569.namprd12.prod.outlook.com (2603:10b6:303:57::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Fri, 14 Apr 2023 15:25:37 +0000 Received: from BN8NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::89) by BN8PR03CA0011.outlook.office365.com (2603:10b6:408:94::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.33 via Frontend Transport; Fri, 14 Apr 2023 15:25:37 +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 BN8NAM11FT053.mail.protection.outlook.com (10.13.177.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6298.37 via Frontend Transport; Fri, 14 Apr 2023 15:25:37 +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, 14 Apr 2023 10:25:36 -0500 From: Ferruh Yigit To: CC: David Marchand , Vamsi Krishna Attunuru Subject: [PATCH v2] kni: fix build with Linux 6.3 Date: Fri, 14 Apr 2023 16:25:22 +0100 Message-ID: <20230414152522.83636-1-ferruh.yigit@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230228172909.2054386-1-ferruh.yigit@amd.com> References: <20230228172909.2054386-1-ferruh.yigit@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: BN8NAM11FT053:EE_|MW3PR12MB4569:EE_ X-MS-Office365-Filtering-Correlation-Id: c2fc4584-59ad-4041-1393-08db3cfc7fb2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aDWffq//Sggo8xop2mMMz8kgWC+18HgxETfNB1wBrxoer3jHFOmWXfePABDPArGs2BUkjR3zAMN0caYr2xN7O7yDuqNU3IqSD93DpSXL3VtD2DBr6rOhl0QU2xfW1f6BDsZAc+gvJHq4s+TMFQC03yA3qus6Amx4pcQVZ95C6P+p5qSQjvltS/SfvQVjtAd9+Da9dQdZJbu1p/q9khXA5tjdwyzBql3pG8nHntepjZ4Rmz159PdiZxVpoCkY+MLwUSQ4EG6g0EQ0CHLY7F7QjpeurjZ70Ndk+gNthfuQYwAaN/h2D1tDPmpiC3qPrtK23v1mLBHH9NvgvrnKDCQoLGIWflmrAoL62LdrBoI+LTb1Bc48ZG2sh5raqZ/mEmt1LtKZtHSFkyDiIxoXIPrpU02Eg5h9F7mIeYDUvStloz4rIVweUBZTe9GxFLCnWnGq3cnRG6wet9OkM1wiF9+2RDOBt18K4zDu89fUg36wTih5okeW2Dtbv5K1ZV1NwNnK7NMUqtBwRfovy05Hd9tb3Fj7sJdA2l6tJ16GtVP7wH/fEhjdQiRQV8iJzALs6fwOCXbYrzMEw1271++qRw0cKdsXz7eyE0f6eUh1aLLkDuZiewOMymdBh/1FRA2vSAi4Te0lSJI7WqvWIkzusKyiJH4lvpQFk84VoQ8OqMgbI7K5+Kfkd323oXwjsL2h/WFFDL70sIeiD9nLpUlw2ldyH9Eg8YWBwHdPwia5IE3PNgY= 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:(13230028)(4636009)(136003)(376002)(396003)(346002)(39860400002)(451199021)(36840700001)(40470700004)(46966006)(6666004)(7696005)(40460700003)(5660300002)(6916009)(36756003)(4326008)(70586007)(70206006)(2906002)(44832011)(86362001)(81166007)(41300700001)(82740400003)(82310400005)(8676002)(356005)(8936002)(316002)(478600001)(40480700001)(54906003)(1076003)(26005)(336012)(426003)(36860700001)(16526019)(2616005)(186003)(47076005)(83380400001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 15:25:37.4390 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2fc4584-59ad-4041-1393-08db3cfc7fb2 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: BN8NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4569 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 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") Signed-off-by: Ferruh Yigit --- Cc: David Marchand Cc: Vamsi Krishna Attunuru v2: * Remove 'FOLL_TOUCH' flag from 'get_user_pages_remote()' --- 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 a2c6d9fc1a53..21bfb6890e30 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.34.1