From nobody Wed Nov 29 16:37:57 2023 X-Original-To: dev-commits-src-branches@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 4SgQ3n5h0cz52wwh; Wed, 29 Nov 2023 16:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgQ3n55ZSz3GjK; Wed, 29 Nov 2023 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275877; 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=09zX8ruimltBKjPVs0wa49mea46I8A3UpISXTSueRGU=; b=BcZxvffeLlLAfvl1FupC86TbE90g+3TR6mqhyqG2oA9HUxCNZaxhTS2BNhtwjT9qW1SWrl 0BMa4pY50U9jKQjmeTC2VBiqrX/Cf3lIFxtWTqMIUlEr/R6ZNCB6sEYc2n+xc71oFkW+rg BGAMd2A6BvngsiEcee/vdHEtdDLN0CdMqMmXjmHdSExWA/DJpgh2X7xs2K5/ytDVpQy1DZ +GWjnYlOwsq+uPuw/km7YtXklZ4utNQS1iNyR+i74srl7BGqVyk1yZ5XS65DJ9OapSnaPO hrjzDgGezljXiLti6fWrBA8vmP8JLCWadKQgP60bjtsPqehRu3/qqMzNNBnADQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275877; 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=09zX8ruimltBKjPVs0wa49mea46I8A3UpISXTSueRGU=; b=fkAFNoiBgOAMghgbL1cRxzENmIcH9xxBSaDY2/UzvboQrP2OmdxPyjd2I2B+fLggwzF9yd nB9vqU8caQm7nNeFUezXdj42sS5yQYQR7FPFTM/uLrfUBooJO5Wkl0Xbv9h3rwp6pRDiL5 BDFcfZ8orSitgKX6HRleLCJUe+F7t/JZbcEJkXPivpn6Q6AhZWkglGYkYJepYkX0UHBVxd yJXI6wG+asfpqyX8noUeBzM3oyDmNqnFwxP+Fje9dtYpj7xYLQNhq8Vv0NifeX8NgvmgqE JmFpRCFqI7aZ3PK+DfP1Nutn64282GcwGVbYosohZ5WW46QYa1XsifIDGosXAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275877; a=rsa-sha256; cv=none; b=lFdfIHgAE5WbEdfHGAJ4wimiVMWg93thdUxd0biIBrDV4aqfqZ9tFtOWnRRs6KZKbh3u7m QujqmVG0ycQv2f9E/FFtA6kAf/MpbyH0WS1QjOw+x4WgazgMyUI2jyJrl05s7/5eOdXrZS Cmiyrx9m/2riVCnx6ayTvVclEti9I7/Doy2UpG+pvBV/U6zGRDAY4w+LNlZHYbwhanvTPv UBN3CJdK+ixk1f1cFzsbg2Qt1aM6i4c058u9m8HR/Vgl/v5eiMnKag1c3Myv40NXpLFRsO SUcWtjiLS92XcLM0NkMNuiL0dH14vqOD+tbiEE7kSTzYpE8D5G2Z81WOQBQQ6g== 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 4SgQ3n4CPbz1CXf; Wed, 29 Nov 2023 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbvrl044583; Wed, 29 Nov 2023 16:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbv6t044580; Wed, 29 Nov 2023 16:37:57 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:57 GMT Message-Id: <202311291637.3ATGbv6t044580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: de57268b96f2 - stable/13 - LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: de57268b96f23606eb069d63d4e4bbbc7af779c6 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=de57268b96f23606eb069d63d4e4bbbc7af779c6 commit de57268b96f23606eb069d63d4e4bbbc7af779c6 Author: Bjoern A. Zeeb AuthorDate: 2023-07-31 05:28:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page Rather than using the FreeBSD internal calls vtophys() and PHYS_TO_VM_PAGE() use the already existing LinuxKPI abstraction for this called virt_to_page(). This reduces the amount of compat code to maintain and will allow further work on struct [vm_]page. This should be a NOP. Sponsored by: The FreeBSD Foundation (cherry picked from commit dcb0c54968db10d3c7619f16c4bcfa9284d50ea2) --- sys/compat/linuxkpi/common/src/linux_page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index d99d64cac403..d59435ba934f 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -136,7 +136,7 @@ linux_alloc_pages(gfp_t flags, unsigned int order) if (vaddr == 0) return (NULL); - page = PHYS_TO_VM_PAGE(vtophys((void *)vaddr)); + page = virt_to_page((void *)vaddr); KASSERT(vaddr == (vm_offset_t)page_address(page), ("Page address mismatch")); @@ -524,7 +524,7 @@ linuxkpi_page_frag_free(void *addr) { vm_page_t page; - page = PHYS_TO_VM_PAGE(vtophys(addr)); + page = virt_to_page(addr); linux_free_pages(page, 0); }