SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support acpi firmware performance data (FPDT)

Browse Source 
Prefer firmware-provided performance data over loader-exported ones; if
ACPI data is available, always use it, otherwise try to read the loader
data.

The firmware-provided variables start at the time the first EFI image
is executed and end when the operating system exits the boot services;
the (loader) time calculated in systemd-analyze increases.
This commit is contained in:
Kay Sievers
2013-09-24 15:43:41 +02:00
parent 036ae95ac4
commit c51d84dc09
13 changed files with 389 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/acpi-fpdt.c
+155
View File
@@ -0,0 +1,155 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2013 Kay Sievers
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <util.h>
#include <fileio.h>
#include <time-util.h>
#include <acpi-fpdt.h>
struct acpi_table_header {
char signature[4];
uint32_t length;
uint8_t revision;
uint8_t checksum;
char oem_id[6];
char oem_table_id[8];
uint32_t oem_revision;
char asl_compiler_id[4];
uint32_t asl_compiler_revision;
};
enum {
ACPI_FPDT_TYPE_BOOT = 0,
ACPI_FPDT_TYPE_S3PERF = 1,
};
struct acpi_fpdt_header {
uint16_t type;
uint8_t length;
uint8_t revision;
uint8_t reserved[4];
uint64_t ptr;
};
struct acpi_fpdt_boot_header {
char signature[4];
uint32_t length;
};
enum {
ACPI_FPDT_S3PERF_RESUME_REC = 0,
ACPI_FPDT_S3PERF_SUSPEND_REC = 1,
ACPI_FPDT_BOOT_REC = 2,
};
struct acpi_fpdt_boot {
uint16_t type;
uint8_t length;
uint8_t revision;
uint8_t reserved[4];
uint64_t reset_end;
uint64_t load_start;
uint64_t startup_start;
uint64_t exit_services_entry;
uint64_t exit_services_exit;
};
int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
char *buf;
struct acpi_table_header *tbl;
size_t l;
struct acpi_fpdt_header *rec;
int r;
uint64_t ptr = 0;
_cleanup_close_ int fd = -1;
struct acpi_fpdt_boot_header hbrec;
struct acpi_fpdt_boot brec;
r = read_full_file("/sys/firmware/acpi/tables/FPDT", &buf, &l);
if (r < 0)
return r;
if (l < sizeof(struct acpi_table_header) + sizeof(struct acpi_fpdt_header))
return -EINVAL;
tbl = (struct acpi_table_header *)buf;
if (l != tbl->length)
return -EINVAL;
if (memcmp(tbl->signature, "FPDT", 4) != 0)
return -EINVAL;
/* find Firmware Basic Boot Performance Pointer Record */
for (rec = (struct acpi_fpdt_header *)(buf + sizeof(struct acpi_table_header));
(char *)rec < buf + l;
rec = (struct acpi_fpdt_header *)((char *)rec + rec->length)) {
if (rec->type != ACPI_FPDT_TYPE_BOOT)
continue;
if (rec->length != sizeof(struct acpi_fpdt_header))
continue;
ptr = rec->ptr;
break;
}
if (ptr == 0)
return -EINVAL;
/* read Firmware Basic Boot Performance Data Record */
fd = open("/dev/mem", O_CLOEXEC|O_RDONLY);
if (fd < 0)
return -errno;
l = pread(fd, &hbrec, sizeof(struct acpi_fpdt_boot_header), ptr);
if (l != sizeof(struct acpi_fpdt_boot_header))
return -EINVAL;
if (memcmp(hbrec.signature, "FBPT", 4) != 0)
return -EINVAL;
if (hbrec.length < sizeof(struct acpi_fpdt_boot_header) + sizeof(struct acpi_fpdt_boot))
return -EINVAL;
l = pread(fd, &brec, sizeof(struct acpi_fpdt_boot), ptr + sizeof(struct acpi_fpdt_boot_header));
if (l != sizeof(struct acpi_fpdt_boot))
return -EINVAL;
if (brec.length != sizeof(struct acpi_fpdt_boot))
return -EINVAL;
if (brec.type != ACPI_FPDT_BOOT_REC)
return -EINVAL;
if (loader_start)
*loader_start = brec.startup_start / 1000;
if (loader_exit)
*loader_exit = brec.exit_services_exit / 1000;
return 0;
}
src/shared/acpi-fpdt.h
+26
View File
@@ -0,0 +1,26 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2013 Kay Sievers
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <time-util.h>
int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit);
src/shared/boot-timestamps.c
+65
View File
@@ -0,0 +1,65 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2012 Lennart Poettering
Copyright 2013 Kay Sievers
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <unistd.h>
#include "boot-timestamps.h"
#include "acpi-fpdt.h"
#include "efivars.h"
int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) {
usec_t x, y, a;
int r;
dual_timestamp _n;
assert(firmware);
assert(loader);
if (!n) {
dual_timestamp_get(&_n);
n = &_n;
}
r = acpi_get_boot_usec(&x, &y);
if (r < 0) {
r = efi_loader_get_boot_usec(&x, &y);
if (r < 0)
return r;
}
/* Let's convert this to timestamps where the firmware
* began/loader began working. To make this more confusing:
* since usec_t is unsigned and the kernel's monotonic clock
* begins at kernel initialization we'll actually initialize
* the monotonic timestamps here as negative of the actual
* value. */
firmware->monotonic = y;
loader->monotonic = y - x;
a = n->monotonic + firmware->monotonic;
firmware->realtime = n->realtime > a ? n->realtime - a : 0;
a = n->monotonic + loader->monotonic;
loader->realtime = n->realtime > a ? n->realtime - a : 0;
return 0;
}
src/shared/boot-timestamps.h
+27
View File
@@ -0,0 +1,27 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2012 Lennart Poettering
Copyright 2013 Kay Sievers
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <time-util.h>
int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader);
src/shared/efivars.c
+3 -38
View File
@@ -24,6 +24,7 @@
#include <fcntl.h>
#include <ctype.h>
#include "acpi-fpdt.h"
#include "util.h"
#include "utf8.h"
#include "efivars.h"
@@ -413,7 +414,7 @@ static int read_usec(sd_id128_t vendor, const char *name, usec_t *u) {
return 0;
}
static int get_boot_usec(usec_t *firmware, usec_t *loader) {
int efi_loader_get_boot_usec(usec_t *firmware, usec_t *loader) {
uint64_t x, y;
int r;
@@ -440,43 +441,7 @@ static int get_boot_usec(usec_t *firmware, usec_t *loader) {
return 0;
}
int efi_get_boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader) {
usec_t x, y, a;
int r;
dual_timestamp _n;
assert(firmware);
assert(loader);
if (!n) {
dual_timestamp_get(&_n);
n = &_n;
}
r = get_boot_usec(&x, &y);
if (r < 0)
return r;
/* Let's convert this to timestamps where the firmware
* began/loader began working. To make this more confusing:
* since usec_t is unsigned and the kernel's monotonic clock
* begins at kernel initialization we'll actually initialize
* the monotonic timestamps here as negative of the actual
* value. */
firmware->monotonic = y;
loader->monotonic = y - x;
a = n->monotonic + firmware->monotonic;
firmware->realtime = n->realtime > a ? n->realtime - a : 0;
a = n->monotonic + loader->monotonic;
loader->realtime = n->realtime > a ? n->realtime - a : 0;
return 0;
}
int efi_get_loader_device_part_uuid(sd_id128_t *u) {
int efi_loader_get_device_part_uuid(sd_id128_t *u) {
_cleanup_free_ char *p = NULL;
int r, parsed[16];
unsigned i;
src/shared/efivars.h
+2 -3
View File
@@ -42,6 +42,5 @@ int efi_get_boot_option(uint16_t nr, char **title, sd_id128_t *partuuid, char **
int efi_get_boot_order(uint16_t **order);
int efi_get_boot_options(uint16_t **options);
int efi_get_boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_timestamp *loader);
int efi_get_loader_device_part_uuid(sd_id128_t *u);
int efi_loader_get_device_part_uuid(sd_id128_t *u);
int efi_loader_get_boot_usec(usec_t *firmware, usec_t *loader);