Add support for xtra-bits-dir of mkisoimages.sh via XTRADIR
ClosedPublic
Actions

Authored by dteske on Sep 10 2015, 11:05 PM.

Details

Reviewers

kmacy
gjb
allanjude
bapt

Commits

rS290282: MFC r287696:
rS287696: The <arch>/mkisoimages.sh script in release knows how to add

Summary

The <arch>/mkisoimages.sh script in release knows how to add
extra bits from an "xtra-bits-dir". This feature is unusable
from release/Makefile. Add an XTRADIR setting to use it.

Test Plan

cd release
make -DXTRADIR=/path/to/xtra/ cdrom

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dteske updated this revision to Diff 8662.Sep 10 2015, 11:05 PM

dteske retitled this revision from to Add support for xtra-bits-dir of mkisoimages.sh via XTRADIR.

dteske updated this object.

dteske edited the test plan for this revision. (Show Details)

dteske added reviewers: gjb, kmacy, bapt, allanjude.

dteske added a subscriber: marcel.

Herald added a subscriber: imp. · View Herald TranscriptSep 10 2015, 11:05 PM

kmacy accepted this revision.Sep 11 2015, 9:42 PM

kmacy edited edge metadata.

This revision is now accepted and ready to land.Sep 11 2015, 9:42 PM

Closed by commit rS287696: The <arch>/mkisoimages.sh script in release knows how to add (authored by dteske). · Explain WhySep 11 2015, 9:45 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

release/

Makefile

7 lines

Diff 8681

View Options

head/release/Makefile

	Show All 12 Lines

	#include <sys/dtrace.h>			#include <sys/dtrace.h>
	#include <cddl/dev/dtrace/dtrace_cddl.h>			#include <cddl/dev/dtrace/dtrace_cddl.h>
	#include <dis_tables.h>			#include <dis_tables.h>

	#include "kinst.h"			#include "kinst.h"

	#define KINST_PUSHL_RBP 0x55			#define KINST_PUSHL_RBP 0x55
				#define KINST_POPL_RBP 0x5d
	#define KINST_STI 0xfb			#define KINST_STI 0xfb
	#define KINST_POPF 0x9d			#define KINST_POPF 0x9d

	#define KINST_MODRM_MOD(b) (((b) & 0xc0) >> 6)			#define KINST_MODRM_MOD(b) (((b) & 0xc0) >> 6)
	#define KINST_MODRM_REG(b) (((b) & 0x38) >> 3)			#define KINST_MODRM_REG(b) (((b) & 0x38) >> 3)
	#define KINST_MODRM_RM(b) ((b) & 0x07)			#define KINST_MODRM_RM(b) ((b) & 0x07)

	#define KINST_SIB_SCALE(s) (((s) & 0xc0) >> 6)			#define KINST_SIB_SCALE(s) (((s) & 0xc0) >> 6)
	▲ Show 20 Lines • Show All 462 Lines • ▼ Show 20 Lines
	int			int
	kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval,			kinst_make_probe(linker_file_t lf, int symindx, linker_symval_t *symval,
	void *opaque)			void *opaque)
	{			{
	struct kinst_probe *kp;			struct kinst_probe *kp;
	dtrace_kinst_probedesc_t *pd;			dtrace_kinst_probedesc_t *pd;
	const char *func;			const char *func;
	int error, instrsize, n, off;			int error, instrsize, n, off;
	uint8_t instr, limit;			uint8_t instr, limit, *tmp;
				bool push_found, pop_found;

	pd = opaque;			pd = opaque;
	func = symval->name;			func = symval->name;
	if (kinst_excluded(func))			if (kinst_excluded(func))
	return (0);			return (0);
	if (strcmp(func, pd->kpd_func) != 0)			if (strcmp(func, pd->kpd_func) != 0)
	return (0);			return (0);

	instr = (uint8_t *)symval->value;			instr = (uint8_t *)symval->value;
	limit = (uint8_t *)symval->value + symval->size;			limit = (uint8_t *)symval->value + symval->size;
	if (instr >= limit)			if (instr >= limit)
	return (0);			return (0);

	/*			/*
	* Ignore functions not beginning with the usual function prologue.			* Ignore functions not beginning with the usual function prologue.
				markjUnsubmitted Done Inline Actions The first sentence isn't really accurate anymore. I'd just replace the comment with something like, "refuse to instrument functions lacking the usual frame pointer manipulations since they might correspond to exception handlers." markj: The first sentence isn't really accurate anymore. I'd just replace the comment with something…
	* These might correspond to exception handlers with which we should not			* These might correspond to exception handlers with which we should
	* meddle. This does however exclude functions which can be safely			* not meddle.
	* traced, such as cpu_switch().
	*/			*/
	if (*instr != KINST_PUSHL_RBP)			tmp = instr;
				push_found = pop_found = false;
				while (tmp < limit) {
				if (*tmp == KINST_PUSHL_RBP)
				push_found = true;
				else if (*tmp == KINST_POPL_RBP)
				pop_found = true;
				if (push_found && pop_found)
				break;
				tmp += dtrace_instr_size(tmp);
				}
				if (!push_found \|\| !pop_found)
	return (0);			return (0);

	n = 0;			n = 0;
	while (instr < limit) {			while (instr < limit) {
	instrsize = dtrace_instr_size(instr);			instrsize = dtrace_instr_size(instr);
	off = (int)(instr - (uint8_t *)symval->value);			off = (int)(instr - (uint8_t *)symval->value);
	if (pd->kpd_off != -1 && off != pd->kpd_off) {			if (pd->kpd_off != -1 && off != pd->kpd_off) {
	instr += instrsize;			instr += instrsize;
	▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines

Add support for xtra-bits-dir of mkisoimages.sh via XTRADIRClosedPublicActions