Expand x86 struct pcpus to UMA_PCPU_ALLOC_SIZE AKA PAGE_SIZE.
ClosedPublic
Actions

Authored by kib on Jul 6 2018, 1:25 PM.

Details

Reviewers

mmacy
jeff

Commits

rS336047: Expand x86 struct pcpus to UMA_PCPU_ALLOC_SIZE AKA PAGE_SIZE.

Summary

This restores counters(9) operation.

Revert r336024. Improve assert of pcpu size on x86.

Test Plan

Booted SMP amd64 and i386.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kib created this revision.Jul 6 2018, 1:25 PM

Herald added a subscriber: imp. · View Herald TranscriptJul 6 2018, 1:25 PM

Harbormaster completed remote builds in B17888: Diff 44965.Jul 6 2018, 1:25 PM

LGTM

This revision is now accepted and ready to land.Jul 6 2018, 7:43 PM

Closed by commit rS336047: Expand x86 struct pcpus to UMA_PCPU_ALLOC_SIZE AKA PAGE_SIZE. (authored by kib). · Explain WhyJul 6 2018, 7:50 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

sys/

amd64/

include/

counter.h

9 lines

pcpu.h

3 lines

i386/

include/

pcpu.h

2 lines

sys/

pcpu.h

21 lines

Diff 44974

View Options

head/sys/amd64/include/counter.h

	# Created by: kwm@FreeBSD.org			# Created by: kwm@FreeBSD.org
	# $FreeBSD$			# $FreeBSD$

	PORTNAME= wayland			PORTNAME= wayland
	PORTVERSION= 1.18.0			PORTVERSION= 1.18.0
	PORTREVISION= 2			PORTREVISION= 3
	CATEGORIES= graphics wayland			CATEGORIES= graphics wayland
	MASTER_SITES= https://wayland.freedesktop.org/releases/			MASTER_SITES= https://wayland.freedesktop.org/releases/

	PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/			PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/
	PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60			PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60
	PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	Show All 19 Lines

View Options

head/sys/amd64/include/pcpu.h

	# Created by: kwm@FreeBSD.org			# Created by: kwm@FreeBSD.org
	# $FreeBSD$			# $FreeBSD$

	PORTNAME= wayland			PORTNAME= wayland
	PORTVERSION= 1.18.0			PORTVERSION= 1.18.0
	PORTREVISION= 2			PORTREVISION= 3
	CATEGORIES= graphics wayland			CATEGORIES= graphics wayland
	MASTER_SITES= https://wayland.freedesktop.org/releases/			MASTER_SITES= https://wayland.freedesktop.org/releases/

	PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/			PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/
	PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60			PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60
	PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	Show All 19 Lines

View Options

head/sys/i386/include/pcpu.h

	# Created by: kwm@FreeBSD.org			# Created by: kwm@FreeBSD.org
	# $FreeBSD$			# $FreeBSD$

	PORTNAME= wayland			PORTNAME= wayland
	PORTVERSION= 1.18.0			PORTVERSION= 1.18.0
	PORTREVISION= 2			PORTREVISION= 3
	CATEGORIES= graphics wayland			CATEGORIES= graphics wayland
	MASTER_SITES= https://wayland.freedesktop.org/releases/			MASTER_SITES= https://wayland.freedesktop.org/releases/

	PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/			PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/
	PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60			PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60
	PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	Show All 19 Lines

View Options

head/sys/sys/pcpu.h

	# Created by: kwm@FreeBSD.org			# Created by: kwm@FreeBSD.org
	# $FreeBSD$			# $FreeBSD$

	PORTNAME= wayland			PORTNAME= wayland
	PORTVERSION= 1.18.0			PORTVERSION= 1.18.0
	PORTREVISION= 2			PORTREVISION= 3
	CATEGORIES= graphics wayland			CATEGORIES= graphics wayland
	MASTER_SITES= https://wayland.freedesktop.org/releases/			MASTER_SITES= https://wayland.freedesktop.org/releases/

	PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/			PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/commit/
	PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60			PATCHFILES+= 0fc00fff3015.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/60
	PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 1283d54dac97.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 3a3dd0820de3.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61			PATCHFILES+= 230885ebb40b.patch:-p1 # https://gitlab.freedesktop.org/wayland/wayland/merge_requests/61
	Show All 19 Lines

Expand x86 struct pcpus to UMA_PCPU_ALLOC_SIZE AKA PAGE_SIZE.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 44974

head/sys/amd64/include/counter.h

head/sys/amd64/include/pcpu.h

head/sys/i386/include/pcpu.h

head/sys/sys/pcpu.h

Expand x86 struct pcpus to UMA_PCPU_ALLOC_SIZE AKA PAGE_SIZE.
ClosedPublic
Actions

Revision Contents
Changeset List