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 8289142ECF for ; Thu, 20 Jul 2023 17:36:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7EA3640685; Thu, 20 Jul 2023 17:36:08 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id DFA85400D6 for ; Thu, 20 Jul 2023 17:36:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTAAYKa9AEmxgk5Gq4hLVPKzvowyFalzLD4mlDjn5oc=; b=ADmlp4zYzoShVK3pIwMQwbblCv0mkH4e3S4fV5jm2/BI5EQ76fv4yrbIMWg8soSbz9HO1W duiV7vOO21fI/2IWZpyT8fekbeJgqBAfxXM8Z82ZKo0k85P71B903DMKrTpPSnuP8gaCXO fdLsHeiztzz1qEiZn+MQepSxf0pVMd0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-161-CVE3yWIvON2iw3vQO-Jh_A-1; Thu, 20 Jul 2023 11:20:15 -0400 X-MC-Unique: CVE3yWIvON2iw3vQO-Jh_A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1B4C0856F66; Thu, 20 Jul 2023 15:19:50 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E80AA492C13; Thu, 20 Jul 2023 15:19:48 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: David Marchand , dpdk stable Subject: patch 'kni: fix build with Linux 6.3' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:12 +0100 Message-ID: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b22ddfe63aec6ee9d178985d1e51973c489afe40 Thanks. Kevin --- >From b22ddfe63aec6ee9d178985d1e51973c489afe40 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 [ 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 e8633486ee..6e64380d06 100644 --- a/kernel/linux/kni/kni_dev.h +++ b/kernel/linux/kni/kni_dev.h @@ -106,9 +106,7 @@ 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) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:55.298276656 +0100 +++ 0001-kni-fix-build-with-Linux-6.3.patch 2023-07-20 16:17:54.407749470 +0100 @@ -1 +1 @@ -From 5f34cc454df420b9b2da8deb949fb76cba058b87 Mon Sep 17 00:00:00 2001 +From b22ddfe63aec6ee9d178985d1e51973c489afe40 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5f34cc454df420b9b2da8deb949fb76cba058b87 ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index a2c6d9fc1a..21bfb6890e 100644 +index e8633486ee..6e64380d06 100644