LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page
ClosedPublic
Actions

Authored by bz on Jul 31 2023, 8:59 PM.

Details

Reviewers

markj

Commits

rGdcb0c54968db: LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page

Summary

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
MFC after: 2 weeks

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bz created this revision.Jul 31 2023, 8:59 PM

Herald added subscribers: emaste, imp. · View Herald TranscriptJul 31 2023, 8:59 PM

bz requested review of this revision.Jul 31 2023, 8:59 PM

Harbormaster completed remote builds in B52914: Diff 125395.Jul 31 2023, 8:59 PM

I have no objection to this and it looks ok, but I don't really understand it. Why is it useful to use Linux interfaces in these internal routines which deal with vm_page_t's and FreeBSD VM interfaces?

In D41257#939742, @markj wrote:

I have no objection to this and it looks ok, but I don't really understand it. Why is it useful to use Linux interfaces in these internal routines which deal with vm_page_t's and FreeBSD VM interfaces?

Because after D41255 linux_alloc_pages and linux_free_pages properly return/take a 'struct page *'. For as long as they are aliased by the #define page vm_page that's fine; once that alias goes away a struct page will be a struct page and a struct vm_page will be a struct vm_page and the less places we'll have to deal with to get from one to the other for internal handling the better this will be.

markj accepted this revision.Aug 2 2023, 1:16 PM

This revision is now accepted and ready to land.Aug 2 2023, 1:16 PM

Closed by commit rGdcb0c54968db: LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page (authored by bz). · Explain WhyAug 7 2023, 1:00 AM

This revision was automatically updated to reflect the committed changes.

bz added a commit: rGdcb0c54968db: LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page.

Revision Contents
Changeset List

Path

Size

sys/

compat/

linuxkpi/

common/

src/

linux_page.c

4 lines

Diff 125645

View Options

sys/compat/linuxkpi/common/src/linux_page.c

Property	Old Value	New Value
svn:eol-style	null	native \ No newline at end of property
svn:keywords	null	FreeBSD=%H \ No newline at end of property
svn:mime-type	null	text/plain \ No newline at end of property

				# $FreeBSD$

				PORTNAME= pyfda
				PORTVERSION= 0.1
				DISTVERSIONSUFFIX= rc6
				CATEGORIES= cad python devel
				MASTER_SITES= CHEESESHOP
				PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

				MAINTAINER= yuri@FreeBSD.org
				COMMENT= GUI tool for designing and analysing discrete time filters

				LICENSE= MIT
				LICENSE_FILE= ${WRKSRC}/LICENSE

				RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
				${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
				${PYNUMPY} \
				${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}

				USES= python:3.4+ pyqt:5
				USE_PYTHON= distutils autoplist noflavors
				matUnsubmitted Not Done Inline Actions Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is empty, thus, it makes this port broken because the dependencies line end with @ with no flavor. mat: Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is…
				yuriAuthorUnsubmitted Not Done Inline Actions But this is an app, not a library. Shouldn't python apps all be `noflavors`? yuri: But this is an app, not a library. Shouldn't python apps all be `noflavors`?
				matUnsubmitted Not Done Inline Actions this has a PKGNAMEPREFIX, nothing against it having noflavors. mat: this has a PKGNAMEPREFIX, nothing against it having noflavors.
				USE_PYQT= core_run gui_run widgets_run
				NO_ARCH= yes

				post-extract:
				@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
				@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample

				post-patch:
				@${REINPLACE_CMD} -e " \
				s\|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',\|package_data={'pyfda': [\|; \
				s\|data_files = \[\|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])\|" \
				${WRKSRC}/setup.py
				@${REINPLACE_CMD} -e " \
				s\|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))\|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))\|" \
				${WRKSRC}/pyfda/pyfdax.py
				@${REINPLACE_CMD} -e " \
				s\|'pyfda.log'\|'/tmp/pyfda.log'\|" \
				${WRKSRC}/pyfda/*.conf.sample

				post-stage:
				@${REINPLACE_CMD} -E " \
				s\|(.*\.sample)$$\|@sample \1\|" \
				${WRKDIR}/.PLIST.pymodtmp

				.include <bsd.port.mk>

LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_pageClosedPublicActions