From nobody Sun Jul 21 13:14:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WRkR50L8Lz5RV2j; Sun, 21 Jul 2024 13:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRkR44pttz4Rvl; Sun, 21 Jul 2024 13:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721567696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mr8v2GIQ4GMcxneFKXQCQLGG5p92Vtb3flo8z2b3x6M=; b=f19UemRLdJ1z+OxaAjmA1JmX4EW5dRuuuTbEzecnuJrf8jc4hu/C5d3w9qMGsXtG0XW28T rzT02tcmcXCVHRxEcRHIy1R1qc3/L8+p/U7MZkaq/4eph3XomzWMyNdixvkmQkAiJPdBrO kDwiCZvuypsRWr68MPTr+3/PCSUnkoJKbO6ppNbQWb9YoTt79iHVlm4y9I+zBl6TtrCqS4 H1ml0OUUslXArvVeO1jF8kCwHVlKWmIy+l7KFXYJ6fe6VciXDg5SXbVSdYDXSxR+kIrmvN piyqAQY4IVpwLkfhck6GkRcTgLCVsF1m39LYF/rbrPxOVob3nl0Cews6JTqIPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721567696; a=rsa-sha256; cv=none; b=gZEAsf1NKVdfuO3RG1Jj9gaBz1XwJCcermwrZ1vdJCy+qRP328gjeaXBwR/ajrqVSpfybZ i5QYdeRZ2VQIiqayfb+ge4JWsNmiN1R0OtMlHYFykHOPmS99HznsfOBwuJOKv7CwQlExxJ k045IEco3stoI1q6V9YrwXGV87fbt9CtKqEYCCtvKboIwH/sR+E+SPA7YQW0V+9laJmLY8 Y1dBSTsZhxlvhVdZgOcqcZJQK1FWbfKI2gjMdzfnVdXuKw+pgXjTgSZ9GhGT0iY5GU6ADr 85LnlrB6HHce/hvpZ/CRxYfF0gXacGfSZP+53VWQO0k2pie0Gqo/nMl8Hk0Ocg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721567696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mr8v2GIQ4GMcxneFKXQCQLGG5p92Vtb3flo8z2b3x6M=; b=EnrP0gZO8M+Cx6N7JC3dNUPIqdX/FNsbch1KedDuBJI3nPk6d4Ve0VN7+I+Nybb0GFIo7Q YUfBB1uieZ+qHN4GICiH/n/fHxQx7R0datUydD2/mm27P/A1+UIy5Mo5jYGhjAohrE7Pcg 5dUq1Nf2+HkwNrL3Ryez1oe5uRnZx/karnWD383yevqhNq1KzES0hgdWMDvviIGA+lrNnP NpNl/HbPdW6avWmF7+dGunkhuyqxdcy7E5hVNb2cvo6z61kuJ5MLmdMP4JqgXdSGC42k+v Q+R/oHPc6f76oQNMS6MLpOgCadhJQNNtfBrEIsvKOun7pmzadtTL3Y9cjSyedg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WRkR432gHz12Bl; Sun, 21 Jul 2024 13:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46LDEuqB023363; Sun, 21 Jul 2024 13:14:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LDEuvo023360; Sun, 21 Jul 2024 13:14:56 GMT (envelope-from git) Date: Sun, 21 Jul 2024 13:14:56 GMT Message-Id: <202407211314.46LDEuvo023360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: d42136e36162 - main - LinuxKPI: Remove vmas argument from get_user_pages on KBI layer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d42136e36162d60ea543ae346f32edd321de3f6e Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d42136e36162d60ea543ae346f32edd321de3f6e commit d42136e36162d60ea543ae346f32edd321de3f6e Author: Vladimir Kondratyev AuthorDate: 2024-07-21 13:10:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-07-21 13:10:14 +0000 LinuxKPI: Remove vmas argument from get_user_pages on KBI layer To chase Linux kernel 6.5 Sponsored by: Serenity Cyber Security, LLC Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D45850 --- sys/compat/linuxkpi/common/include/linux/mm.h | 10 ++++++---- sys/compat/linuxkpi/common/src/linux_page.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index 56c849b02c32..b4c8bf3c1c30 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -276,12 +276,14 @@ get_page(struct page *page) } extern long -get_user_pages(unsigned long start, unsigned long nr_pages, - unsigned int gup_flags, struct page **, - struct vm_area_struct **); +lkpi_get_user_pages(unsigned long start, unsigned long nr_pages, + unsigned int gup_flags, struct page **); #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60500 #define get_user_pages(start, nr_pages, gup_flags, pages) \ - get_user_pages(start, nr_pages, gup_flags, pages, NULL) + lkpi_get_user_pages(start, nr_pages, gup_flags, pages) +#else +#define get_user_pages(start, nr_pages, gup_flags, pages, vmas) \ + lkpi_get_user_pages(start, nr_pages, gup_flags, pages) #endif #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60500 diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 8b78a3739f25..d4f8e75a3251 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -277,8 +277,8 @@ get_user_pages_remote(struct task_struct *task, struct mm_struct *mm, } long -get_user_pages(unsigned long start, unsigned long nr_pages, - unsigned int gup_flags, struct page **pages, struct vm_area_struct **vmas) +lkpi_get_user_pages(unsigned long start, unsigned long nr_pages, + unsigned int gup_flags, struct page **pages) { vm_map_t map;