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 3062042DA6 for ; Sat, 15 Jul 2023 00:35:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 295E140EDC; Sat, 15 Jul 2023 00:35:47 +0200 (CEST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id E57D040DFB for ; Sat, 15 Jul 2023 00:35:45 +0200 (CEST) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3fbc5d5746cso22968235e9.2 for ; Fri, 14 Jul 2023 15:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689374145; x=1691966145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=01mDY4lrgFccyApaY7+t8vHAOngY6Ph4kMCSJfDnIPk=; b=hUGwb13RPSKF2iphRW0IFMlD8NNZ50WsScLxN2zZsppQMmAnR4TDhIUNng7emBxQKO YQ9XS5CTFHL/i9gg23HPZEZRHn5OL+QZ5IzAaOG1leI0RGpDssFykTEgmgqkSS03qqxd VH1lF/M3ek0jaZ12+zziGQ0/Fq5XwCEEf5sjtg4iZH72/Tj2sTba1WJ3DbzfgrJKVB3K LnhICMpRjGWBhSnvKkZ5cX7mii2Q3xUvr+gxg46Ibn7ITY3+8y9mJtmWaEOBQsluYh+Y qB4iXt97er7eqmFsJJPtdiLH5fg9LuIa1x3OInGKb9yQSQ984ZM5ihLtAu8k9b2RWhAG V7Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689374145; x=1691966145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=01mDY4lrgFccyApaY7+t8vHAOngY6Ph4kMCSJfDnIPk=; b=Lohy4pAXXaByIvHdRO9pJ+uCaXygb1tQJCZ3TmxPAwZXWwpTBrbumi2/kP0E9yM8Bm QOjmBv7+1rjEYBOk8wloI7QISiho/6OTX5KFSpoQvmP6oRxVZ135nEI/EmwAuW8WRinp SIJPhg5M0aaRLdg1NUE4VSAY9HKyBfRJkjWh1PQ1YroE6DXuuzZi0vegc1Wf1kwC+/GG 6+PCBsNwfoVktLxjN5yi95KUTsGfWl7Ie/X+XVnCIRAI3T+BI6IHYx7bgriReeeUItXJ 6dTHzaOLPRGmr6MjG4QyhGDH1XZbMovSk5yIUaUucXtZvrG0uIdsFljAcidc1+pEidW9 uKUg== X-Gm-Message-State: ABy/qLZztQx532taG5PpYlnBZINnE+Mc/mBZdFNNHAFTmzwDoqOG4akk qNbGNfrfpVltmh9z1mWpvZD0+SsNmqhrPuEc/8c= X-Google-Smtp-Source: APBJJlGGVx75GO4qjz18A/Zb7tsv1Elc0NZfrmSlofTVEKBvq+HIBlZ+ErNHn2W9fib0STX1vt9xEQ== X-Received: by 2002:a1c:730b:0:b0:3fa:9538:963e with SMTP id d11-20020a1c730b000000b003fa9538963emr5026522wmb.36.1689374145534; Fri, 14 Jul 2023 15:35:45 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id y22-20020a7bcd96000000b003fa8dbb7b5dsm2315022wmj.25.2023.07.14.15.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 15:35:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: dpdk stable Subject: patch 'kni: fix build with Linux 6.5' has been queued to stable release 20.11.9 Date: Fri, 14 Jul 2023 23:34:47 +0100 Message-Id: <20230714223447.1092828-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230714223447.1092828-1-luca.boccassi@gmail.com> References: <20230628141046.2145871-22-luca.boccassi@gmail.com> <20230714223447.1092828-1-luca.boccassi@gmail.com> 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 07/16/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/b4075bea115a3e51d326439e91bca3b6ccf0483e Thanks. Luca Boccassi --- >From b4075bea115a3e51d326439e91bca3b6ccf0483e 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 [ 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 6e64380d06..417c67b5ae 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-14 23:33:09.333636763 +0100 +++ 0018-kni-fix-build-with-Linux-6.5.patch 2023-07-14 23:33:08.511305571 +0100 @@ -1 +1 @@ -From dd33d53b9a032d7376aa04a28a1235338e1fd78f Mon Sep 17 00:00:00 2001 +From b4075bea115a3e51d326439e91bca3b6ccf0483e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dd33d53b9a032d7376aa04a28a1235338e1fd78f ] + @@ -15,2 +16,0 @@ -Cc: stable@dpdk.org - @@ -36 +36 @@ -index 21bfb6890e..975379825b 100644 +index 6e64380d06..417c67b5ae 100644