Page MenuHomeFreeBSD
Differential D31065

xen/efi: make Xen PV EFI clock optional
ClosedPublic
Actions

Authored by ehem_freebsd_m5p.com on Jul 5 2021, 6:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 8:24 AM
Unknown Object (File)
Tue, Mar 11, 9:17 PM
Unknown Object (File)
Mar 5 2025, 12:56 PM
Unknown Object (File)
Mar 5 2025, 12:57 AM
Unknown Object (File)
Feb 22 2025, 5:50 AM
Unknown Object (File)
Feb 18 2025, 8:23 PM
Unknown Object (File)
Jan 27 2025, 12:27 AM
Unknown Object (File)
Jan 21 2025, 6:53 AM
View All 59 Files
Subscribers
imp

Details

Reviewers
royger
mhorne
julien_xen.org
Commits
rGb2c50bb934fb: xen/efi: make Xen PV EFI clock optional
Summary

The present implementation is only for x86. Other architectures need adjustments for querying presence of EFI.

Xen's EFI support is also quite troublesome on non-x86. This is being
slowly remedied, but until in better shape the EFI clock functionality
should be disabled.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 40323
Build 37212: arc lint + arc unit

Event Timeline

ehem_freebsd_m5p.com created this revision.Jul 5 2021, 6:42 PM
Herald added a subscriber: imp. · View Herald TranscriptJul 5 2021, 6:42 PM
ehem_freebsd_m5p.com requested review of this revision.Jul 5 2021, 6:42 PM
Harbormaster completed remote builds in B40323: Diff 91821.Jul 5 2021, 6:42 PM
ehem_freebsd_m5p.com added a child revision: D30950: xen/arm64: enable arm64 Xen configuration.Jul 5 2021, 6:44 PM
ehem_freebsd_m5p.com added a comment.Jul 5 2021, 7:05 PM

I was taking some glances at making this cross-architecture, but the simpler short-term approach is to make this !arm64. Plus for that matter, Xen's EFI/ACPI support on arm64 isn't yet in particularly good shape.

ehem_freebsd_m5p.com added a comment.Sep 3 2021, 3:42 PM

Another alternative would be to have this depend on xentimer, but I've got no idea whether that would be correct (in fact I was under the impression they're quite distinct, so doing that would be an ugly hack).

ehem_freebsd_m5p.com added a comment.Sep 13 2021, 2:10 AM

Ideal solution would be to fix D28619. This though requires merging "bootmethod" from x86 with "arm64_bus_method" from ARM64.

Thing is bootmethod is a string, arm64_bus_method is an enum. The enum seems to make more sense. I'm though curious why the somewhat similar vm_guest variable is declared as an int, even though its values are declared as enums.

Testing confirmed making pvefi.c depend on xentimer works, but I'm unsure whether that is correct.

ehem_freebsd_m5p.com mentioned this in D31955: sys: unify boot/firmware variables.Sep 14 2021, 2:06 AM
ehem_freebsd_m5p.com abandoned this revision.Sep 14 2021, 2:09 AM

I'm marking D31065 as abandoned as D31955 fixes the root cause. D31065 could be resurrected if appropriate, but somehow I don't expect that to happen.

ehem_freebsd_m5p.com removed a child revision: D30950: xen/arm64: enable arm64 Xen configuration.Sep 14 2021, 2:09 AM
ehem_freebsd_m5p.com retitled this revision from xen/efi: disable PV EFI clock on non-x86 to xen/efi: make Xen PV EFI clock optional.May 13 2022, 2:43 AM
ehem_freebsd_m5p.com edited the summary of this revision. (Show Details)
ehem_freebsd_m5p.com changed the repository for this revision from rS FreeBSD src repository - subversion to rG FreeBSD src repository.
ehem_freebsd_m5p.com updated this revision to Diff 105935.May 13 2022, 3:02 AM

Bringing this back in as D31955 has been stuck. Longer term D31955 is better, just this has a better shot at making 14.0.

Harbormaster completed remote builds in B45561: Diff 105935.May 13 2022, 3:02 AM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 14 2023, 2:01 PM
Closed by commit rGb2c50bb934fb: xen/efi: make Xen PV EFI clock optional (authored by ehem_freebsd_m5p.com, committed by royger). · Explain Why
This revision was automatically updated to reflect the committed changes.
royger added a commit: rGb2c50bb934fb: xen/efi: make Xen PV EFI clock optional.

Revision Contents
Changeset List

PathSize
sys/
conf/
1 line
1 line

Diff 91821

View Options

sys/conf/files

Show All 38 Lines
#include <sys/stddef.h> #include <sys/stddef.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#include <sys/time.h> #include <sys/time.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/build_bug.h> #include <linux/build_bug.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/container_of.h> #include <linux/container_of.h>
#include <linux/kstrtox.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/math.h> #include <linux/math.h>
#include <linux/minmax.h> #include <linux/minmax.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/typecheck.h> #include <linux/typecheck.h>
▲ Show 20 Lines • Show All 208 Lines • ▼ Show 20 Lines
}) })
#endif #endif
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define u64_to_user_ptr(val) ((void *)(uintptr_t)(val)) #define u64_to_user_ptr(val) ((void *)(uintptr_t)(val))
#define _RET_IP_ __builtin_return_address(0) #define _RET_IP_ __builtin_return_address(0)
static inline unsigned long long
simple_strtoull(const char *cp, char **endp, unsigned int base)
{
return (strtouq(cp, endp, base));
}
static inline long long
simple_strtoll(const char *cp, char **endp, unsigned int base)
{
return (strtoq(cp, endp, base));
}
static inline unsigned long
simple_strtoul(const char *cp, char **endp, unsigned int base)
{
return (strtoul(cp, endp, base));
}
static inline long
simple_strtol(const char *cp, char **endp, unsigned int base)
{
return (strtol(cp, endp, base));
}
static inline int
kstrtoul(const char *cp, unsigned int base, unsigned long *res)
{
char *end;
*res = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
return (0);
}
static inline int
kstrtol(const char *cp, unsigned int base, long *res)
{
char *end;
*res = strtol(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
return (0);
}
static inline int
kstrtoint(const char *cp, unsigned int base, int *res)
{
char *end;
long temp;
*res = temp = strtol(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (int)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtouint(const char *cp, unsigned int base, unsigned int *res)
{
char *end;
unsigned long temp;
*res = temp = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (unsigned int)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtou8(const char *cp, unsigned int base, u8 *res)
{
char *end;
unsigned long temp;
*res = temp = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (u8)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtou16(const char *cp, unsigned int base, u16 *res)
{
char *end;
unsigned long temp;
*res = temp = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (u16)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtou32(const char *cp, unsigned int base, u32 *res)
{
return (kstrtouint(cp, base, res));
}
static inline int
kstrtou64(const char *cp, unsigned int base, u64 *res)
{
char *end;
*res = strtouq(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
return (0);
}
static inline int
kstrtoull(const char *cp, unsigned int base, unsigned long long *res)
{
return (kstrtou64(cp, base, (u64 *)res));
}
static inline int
kstrtobool(const char *s, bool *res)
{
int len;
if (s == NULL || (len = strlen(s)) == 0 || res == NULL)
return (-EINVAL);
/* skip newline character, if any */
if (s[len - 1] == '\n')
len--;
if (len == 1 && strchr("yY1", s[0]) != NULL)
*res = true;
else if (len == 1 && strchr("nN0", s[0]) != NULL)
*res = false;
else if (strncasecmp("on", s, len) == 0)
*res = true;
else if (strncasecmp("off", s, len) == 0)
*res = false;
else
return (-EINVAL);
return (0);
}
static inline int
kstrtobool_from_user(const char __user *s, size_t count, bool *res)
{
char buf[8] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtobool(buf, res));
}
static inline int
kstrtoint_from_user(const char __user *s, size_t count, unsigned int base,
int *p)
{
char buf[36] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtoint(buf, base, p));
}
static inline int
kstrtouint_from_user(const char __user *s, size_t count, unsigned int base,
unsigned int *p)
{
char buf[36] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtouint(buf, base, p));
}
static inline int
kstrtou32_from_user(const char __user *s, size_t count, unsigned int base,
unsigned int *p)
{
return (kstrtouint_from_user(s, count, base, p));
}
static inline int
kstrtou8_from_user(const char __user *s, size_t count, unsigned int base,
u8 *p)
{
char buf[8] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtou8(buf, base, p));
}
#define offsetofend(t, m) \ #define offsetofend(t, m) \
(offsetof(t, m) + sizeof((((t *)0)->m))) (offsetof(t, m) + sizeof((((t *)0)->m)))
#define smp_processor_id() PCPU_GET(cpuid) #define smp_processor_id() PCPU_GET(cpuid)
#define num_possible_cpus() mp_ncpus #define num_possible_cpus() mp_ncpus
#define num_online_cpus() mp_ncpus #define num_online_cpus() mp_ncpus
▲ Show 20 Lines • Show All 107 Lines • Show Last 20 Lines
View Options

sys/conf/files.x86

Show All 38 Lines
#include <sys/stddef.h> #include <sys/stddef.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#include <sys/time.h> #include <sys/time.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/build_bug.h> #include <linux/build_bug.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/container_of.h> #include <linux/container_of.h>
#include <linux/kstrtox.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/math.h> #include <linux/math.h>
#include <linux/minmax.h> #include <linux/minmax.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/typecheck.h> #include <linux/typecheck.h>
▲ Show 20 Lines • Show All 208 Lines • ▼ Show 20 Lines
}) })
#endif #endif
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define u64_to_user_ptr(val) ((void *)(uintptr_t)(val)) #define u64_to_user_ptr(val) ((void *)(uintptr_t)(val))
#define _RET_IP_ __builtin_return_address(0) #define _RET_IP_ __builtin_return_address(0)
static inline unsigned long long
simple_strtoull(const char *cp, char **endp, unsigned int base)
{
return (strtouq(cp, endp, base));
}
static inline long long
simple_strtoll(const char *cp, char **endp, unsigned int base)
{
return (strtoq(cp, endp, base));
}
static inline unsigned long
simple_strtoul(const char *cp, char **endp, unsigned int base)
{
return (strtoul(cp, endp, base));
}
static inline long
simple_strtol(const char *cp, char **endp, unsigned int base)
{
return (strtol(cp, endp, base));
}
static inline int
kstrtoul(const char *cp, unsigned int base, unsigned long *res)
{
char *end;
*res = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
return (0);
}
static inline int
kstrtol(const char *cp, unsigned int base, long *res)
{
char *end;
*res = strtol(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
return (0);
}
static inline int
kstrtoint(const char *cp, unsigned int base, int *res)
{
char *end;
long temp;
*res = temp = strtol(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (int)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtouint(const char *cp, unsigned int base, unsigned int *res)
{
char *end;
unsigned long temp;
*res = temp = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (unsigned int)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtou8(const char *cp, unsigned int base, u8 *res)
{
char *end;
unsigned long temp;
*res = temp = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (u8)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtou16(const char *cp, unsigned int base, u16 *res)
{
char *end;
unsigned long temp;
*res = temp = strtoul(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
if (temp != (u16)temp)
return (-ERANGE);
return (0);
}
static inline int
kstrtou32(const char *cp, unsigned int base, u32 *res)
{
return (kstrtouint(cp, base, res));
}
static inline int
kstrtou64(const char *cp, unsigned int base, u64 *res)
{
char *end;
*res = strtouq(cp, &end, base);
/* skip newline character, if any */
if (*end == '\n')
end++;
if (*cp == 0 || *end != 0)
return (-EINVAL);
return (0);
}
static inline int
kstrtoull(const char *cp, unsigned int base, unsigned long long *res)
{
return (kstrtou64(cp, base, (u64 *)res));
}
static inline int
kstrtobool(const char *s, bool *res)
{
int len;
if (s == NULL || (len = strlen(s)) == 0 || res == NULL)
return (-EINVAL);
/* skip newline character, if any */
if (s[len - 1] == '\n')
len--;
if (len == 1 && strchr("yY1", s[0]) != NULL)
*res = true;
else if (len == 1 && strchr("nN0", s[0]) != NULL)
*res = false;
else if (strncasecmp("on", s, len) == 0)
*res = true;
else if (strncasecmp("off", s, len) == 0)
*res = false;
else
return (-EINVAL);
return (0);
}
static inline int
kstrtobool_from_user(const char __user *s, size_t count, bool *res)
{
char buf[8] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtobool(buf, res));
}
static inline int
kstrtoint_from_user(const char __user *s, size_t count, unsigned int base,
int *p)
{
char buf[36] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtoint(buf, base, p));
}
static inline int
kstrtouint_from_user(const char __user *s, size_t count, unsigned int base,
unsigned int *p)
{
char buf[36] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtouint(buf, base, p));
}
static inline int
kstrtou32_from_user(const char __user *s, size_t count, unsigned int base,
unsigned int *p)
{
return (kstrtouint_from_user(s, count, base, p));
}
static inline int
kstrtou8_from_user(const char __user *s, size_t count, unsigned int base,
u8 *p)
{
char buf[8] = {};
if (count > (sizeof(buf) - 1))
count = (sizeof(buf) - 1);
if (copy_from_user(buf, s, count))
return (-EFAULT);
return (kstrtou8(buf, base, p));
}
#define offsetofend(t, m) \ #define offsetofend(t, m) \
(offsetof(t, m) + sizeof((((t *)0)->m))) (offsetof(t, m) + sizeof((((t *)0)->m)))
#define smp_processor_id() PCPU_GET(cpuid) #define smp_processor_id() PCPU_GET(cpuid)
#define num_possible_cpus() mp_ncpus #define num_possible_cpus() mp_ncpus
#define num_online_cpus() mp_ncpus #define num_online_cpus() mp_ncpus
▲ Show 20 Lines • Show All 107 Lines • Show Last 20 Lines