Differential D19741

Refactor ELF interpreter loading into a separate function.
ClosedPublic
Actions

Authored by trasz on Mar 28 2019, 10:22 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Fri, Apr 11, 5:19 PM

	Unknown Object (File)
	Thu, Apr 10, 9:50 PM

	Unknown Object (File)
	Fri, Apr 4, 1:58 PM

	Unknown Object (File)
	Mar 13 2025, 11:50 PM

	Unknown Object (File)
	Feb 18 2025, 11:27 AM

	Unknown Object (File)
	Feb 3 2025, 12:40 AM

	Unknown Object (File)
	Jan 11 2025, 12:34 AM

	Unknown Object (File)
	Dec 25 2024, 2:01 PM

View All 77 Files

Subscribers

Details

Reviewers

Commits

rS346030: Refactor ELF interpreter loading into a separate function.

Summary

Refactor ELF interpreter loading into a separate function.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 23435
Build 22449: arc lint + arc unit

Event Timeline

trasz created this revision.Mar 28 2019, 10:22 PM

Herald added a subscriber: imp. · View Herald TranscriptMar 28 2019, 10:22 PM

Harbormaster completed remote builds in B23361: Diff 55566.Mar 28 2019, 10:22 PM

kib added inline comments.Mar 29 2019, 10:36 AM

sys/kern/imgact_elf.c
981	This block is irrelevant for the task of loading the interpreter. I must not be moved.

Rework a bit.

Harbormaster completed remote builds in B23431: Diff 55666.Apr 1 2019, 11:07 AM

trasz marked an inline comment as done.Apr 1 2019, 11:08 AM

kib added inline comments.Apr 1 2019, 12:54 PM

sys/kern/imgact_elf.c
961	This block of if() can be naturally moved before calculating newinterp.
971	How could newinterp != NULL and brand_info->interp_path == NULL ?

Reorder.

Harbormaster completed remote builds in B23435: Diff 55670.Apr 1 2019, 1:49 PM

trasz added inline comments.Apr 6 2019, 1:59 PM

sys/kern/imgact_elf.c
971	The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path.

More rework - goto is done, as is the 'newinterp' variable.

Harbormaster completed remote builds in B23550: Diff 55881.Apr 6 2019, 2:35 PM

Looks fine, please test with 32bit binary.

This revision is now accepted and ready to land.Apr 6 2019, 3:07 PM

Closed by commit rS346030: Refactor ELF interpreter loading into a separate function. (authored by trasz). · Explain WhyApr 8 2019, 2:31 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

sys/

kern/

81 lines

Diff 55670

sys/kern/imgact_elf.c

	Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines
	#endif			#endif

	struct vm_batchqueue {			struct vm_batchqueue {
	vm_page_t bq_pa[VM_BATCHQUEUE_SIZE];			vm_page_t bq_pa[VM_BATCHQUEUE_SIZE];
	int bq_cnt;			int bq_cnt;
	} __aligned(CACHE_LINE_SIZE);			} __aligned(CACHE_LINE_SIZE);

	#include <vm/uma.h>			#include <vm/uma.h>
				#include <sys/_blockcount.h>
	#include <sys/pidctrl.h>			#include <sys/pidctrl.h>
	struct sysctl_oid;			struct sysctl_oid;

	/*			/*
	* One vm_domain per NUMA domain. Contains pagequeues, free page structures,			* One vm_domain per NUMA domain. Contains pagequeues, free page structures,
	* and accounting.			* and accounting.
	*			*
	* Lock Key:			* Lock Key:
	▲ Show 20 Lines • Show All 154 Lines • ▼ Show 20 Lines		struct vm_domain {
	long vmd_segs; /* (c) bitmask of the segments */			long vmd_segs; /* (c) bitmask of the segments */
	u_int __aligned(CACHE_LINE_SIZE) vmd_free_count; /* (a,f) free page count */			u_int __aligned(CACHE_LINE_SIZE) vmd_free_count; /* (a,f) free page count */
	u_int vmd_pageout_deficit; /* (a) Estimated number of pages deficit */			u_int vmd_pageout_deficit; /* (a) Estimated number of pages deficit */
	uint8_t vmd_pad[CACHE_LINE_SIZE - (sizeof(u_int) * 2)];			uint8_t vmd_pad[CACHE_LINE_SIZE - (sizeof(u_int) * 2)];

	/* Paging control variables, used within single threaded page daemon. */			/* Paging control variables, used within single threaded page daemon. */
	struct pidctrl vmd_pid; /* Pageout controller. */			struct pidctrl vmd_pid; /* Pageout controller. */
	boolean_t vmd_oom;			boolean_t vmd_oom;
				u_int vmd_inactive_threads;
				u_int vmd_inactive_shortage; /* Per-thread shortage. */
				blockcount_t vmd_inactive_running; /* Number of inactive threads. */
				blockcount_t vmd_inactive_starting; /* Number of threads started. */
				volatile u_int vmd_addl_shortage; /* Shortage accumulator. */
				volatile u_int vmd_inactive_freed; /* Successful inactive frees. */
				volatile u_int vmd_inactive_us; /* Microseconds for above. */
				u_int vmd_inactive_pps; /* Exponential decay frees/second. */
	int vmd_oom_seq;			int vmd_oom_seq;
	int vmd_last_active_scan;			int vmd_last_active_scan;
	struct vm_page vmd_markers[PQ_COUNT]; /* (q) markers for queue scans */			struct vm_page vmd_markers[PQ_COUNT]; /* (q) markers for queue scans */
	struct vm_page vmd_inacthead; /* marker for LRU-defeating insertions */			struct vm_page vmd_inacthead; /* marker for LRU-defeating insertions */
	struct vm_page vmd_clock[2]; /* markers for active queue scan */			struct vm_page vmd_clock[2]; /* markers for active queue scan */

	int vmd_pageout_wanted; /* (a, p) pageout daemon wait channel */			int vmd_pageout_wanted; /* (a, p) pageout daemon wait channel */
	int vmd_pageout_pages_needed; /* (d) page daemon waiting for pages? */			int vmd_pageout_pages_needed; /* (d) page daemon waiting for pages? */
	▲ Show 20 Lines • Show All 195 Lines • Show Last 20 Lines