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 6B97842CBC for ; Thu, 15 Jun 2023 03:33:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62BFE40E0F; Thu, 15 Jun 2023 03:33:02 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id C1FA940DDA for ; Thu, 15 Jun 2023 03:33:01 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-30fcde6a73cso2029752f8f.2 for ; Wed, 14 Jun 2023 18:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792781; x=1689384781; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vJOM7O9ePYoakio8BlonHm5CKGFMP8yLV/pSMJ7WD3o=; b=YsJmWiMA5IhfDbmpTObVYx4WG6pphzqXmPyn94EDvRs/6k3xhdpCxWKToWVRQdYVPL OBnBDEkRggkcgimY9TesyJBTOPlqWto18R6RA9VICicKe/mpm1Ppxp9FAvXP4trrtztt X56v2S5sLqA3SPidOolHTQrgZZK9wLNjdi9+MtSv7rqdhhxI1AFbWnv2yAJJzVcfbGtG BDMLHM6sVY0klUh5fpW9giNWdV8BwlDJKSdbgTZ24l/kNxEudHorZFkn91weuQ66wqjc cN+yk6UStyvXWorpTfdV8W2+DM6ky/EuKXflWXOJaM2O4051cTFLFpQXWcmpttI+wA2c 4xwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792781; x=1689384781; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vJOM7O9ePYoakio8BlonHm5CKGFMP8yLV/pSMJ7WD3o=; b=X+bEmtN3JOmeh4Si1e+lRy0Zflu10Ueyl1A1286OI1sXmFKLOKQeKyApyltZ5MlX0a ynNQuvdNHP4zZabU9vk+FyJkLSJiYZezGLME73fzQ+aTua6LMsGGTrEd5LMvbGfKVnzm 4hAR4/06hlMVSkXow9KF7Xt/7rnZU0xAqv3N0irqMYiCWZKUP/IetY93ckENl08TaYkD 0R40MaRAJjzdCaFuHh/lHbV8C0R00Gr0dl2Qn96x8huxS/5BTsV9uGORTinIcpc3qYf1 6WBa4du5lve0n1WOfqlpLDa/5nsfIerSi9JNZX+FBNbdrzYzGbLn4MErZMyz7ANOyNAu BIMg== X-Gm-Message-State: AC+VfDzYGj6UqpuKVqM+Rxp+nYuDuFt/5UAitc7GEOe5CY9IQwOCEQ+D lBCJae71gbUp+IXNCL3M4L0= X-Google-Smtp-Source: ACHHUZ6pF3a9Ky5QxRq+uEM0SlEcNpRZniYWmrh8VDW6mXVNTluczsP2+xvQZMDK9kHL8BYwMD8ACA== X-Received: by 2002:a5d:4c4f:0:b0:307:a77c:c170 with SMTP id n15-20020a5d4c4f000000b00307a77cc170mr9870793wrt.2.1686792781203; Wed, 14 Jun 2023 18:33:01 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id r15-20020adfda4f000000b002fe96f0b3acsm19645193wrl.63.2023.06.14.18.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:33:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: David Marchand , dpdk stable Subject: patch 'kni: fix build with Linux 6.3' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:31:56 +0100 Message-Id: <20230615013258.1439718-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 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/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3f1b6c3280cf9eb0f9ac0b41cdc4a3d92b5a01f9 Thanks. Luca Boccassi --- >From 3f1b6c3280cf9eb0f9ac0b41cdc4a3d92b5a01f9 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 @@ -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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:34.794569772 +0100 +++ 0001-kni-fix-build-with-Linux-6.3.patch 2023-06-15 01:56:34.459538943 +0100 @@ -1 +1 @@ -From 5f34cc454df420b9b2da8deb949fb76cba058b87 Mon Sep 17 00:00:00 2001 +From 3f1b6c3280cf9eb0f9ac0b41cdc4a3d92b5a01f9 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