git: a06e08c43c12 - main - organization.dot: Update Core Team Secretary
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=a06e08c43c128ead7af6b2c2a974f0a0bc840574 commit a06e08c43c128ead7af6b2c2a974f0a0bc840574 Author: Li-Wen Hsu AuthorDate: 2023-01-07 16:05:26 + Commit: Li-Wen Hsu CommitDate: 2023-01-07 16:05:26 + organization.dot: Update Core Team Secretary --- share/misc/organization.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/organization.dot b/share/misc/organization.dot index a0d75d50aca5..c8c1cc6b4298 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -26,7 +26,7 @@ _misc [label="Miscellaneous Hats"] # Development teams go here alphabetically sorted by FreeBSD login name core [label="Core Team\nc...@freebsd.org\nbapt, bcr, emaste,\ngrog, jhb, lwhsu,\nmanu, tcberner, 0mp"] -coresecretary [label="Core Team Secretary\ncore-secret...@freebsd.org\nbofh"] +coresecretary [label="Core Team Secretary\ncore-secret...@freebsd.org\ncarlavilla"] doccommitters [label="Doc/www Committers\ndoc-committ...@freebsd.org"] doceng [label="Documentation Engineering Team\ndoc...@freebsd.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"] pkgmgr [label="Package Management Team\npkg...@freebsd.org\nantoine, bdrewery"]
git: 538b73578b91 - main - kboot: hostdisk.c update copyright notice
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=538b73578b9190af1b2fd57ca886c79b40aa1c17 commit 538b73578b9190af1b2fd57ca886c79b40aa1c17 Author: Warner Losh AuthorDate: 2022-12-13 05:37:35 + Commit: Warner Losh CommitDate: 2023-01-07 20:16:19 + kboot: hostdisk.c update copyright notice I've rewritten a substantial portion of this file, so add Netflix copyright. Sponsored by: Netflix --- stand/kboot/hostdisk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index d83161f5bfee..bc31bef8e6d0 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -1,6 +1,7 @@ /*- * Copyright (C) 2014 Nathan Whitehorn * All rights reserved. + * Copyright 2022 Netflix, Inc * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions
git: 0386255bee07 - main - kboot: Disks should be at least 16MB
The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0386255bee079922f00f37eeb4e9e3138b7666c1
commit 0386255bee079922f00f37eeb4e9e3138b7666c1
Author: Warner Losh
AuthorDate: 2022-12-13 05:39:03 +
Commit: Warner Losh
CommitDate: 2023-01-07 20:20:44 +
kboot: Disks should be at least 16MB
Linux pre-boot environments will often have a number of psuedo disks
that are small, all smaller than a few MB. 16MB is a good cutoff since
it's big enough to filter these devices, yet small enough to allow a
super-minimal partition through (the smallest I've been able to make
that's useful lately is around 20MB).
Sponsored by: Netflix
---
stand/kboot/hostdisk.c | 4
1 file changed, 4 insertions(+)
diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c
index bc31bef8e6d0..628450ef8bb5 100644
--- a/stand/kboot/hostdisk.c
+++ b/stand/kboot/hostdisk.c
@@ -60,6 +60,8 @@ struct devsw hostdisk = {
*/
#define SYSBLK "/sys/block"
+#define HOSTDISK_MIN_SIZE (16ul << 20) /* 16MB */
+
typedef STAILQ_HEAD(, hdinfo) hdinfo_list_t;
typedef struct hdinfo {
STAILQ_ENTRY(hdinfo)hd_link;/* link in device list */
@@ -162,6 +164,8 @@ hostdisk_add_drive(const char *drv, uint64_t secs)
if (!file2u64(fn, &hd->hd_sectorsize))
goto err;
hd->hd_size = hd->hd_sectors * hd->hd_sectorsize;
+ if (hd->hd_size < HOSTDISK_MIN_SIZE)
+ goto err;
hd->hd_flags = 0;
STAILQ_INIT(&hd->hd_children);
printf("/dev/%s: %ju %ju %ju\n",
git: 2f5f17b80c2d - main - stand: Add macros for file types from stat
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2f5f17b80c2d030196e05b12b15d544b363eb058 commit 2f5f17b80c2d030196e05b12b15d544b363eb058 Author: Warner Losh AuthorDate: 2023-01-07 20:23:05 + Commit: Warner Losh CommitDate: 2023-01-07 20:23:05 + stand: Add macros for file types from stat Add the familiar macros for file types for stat's st_mode member. Prepend HOST_ to the start of these. Make sure all the values match the linux nolibc and uapi headers. These values are the same as native values since they appear to be required by POSIX. Define anyway to allow the reader of the code to know that they are in the 'host (eg Linux)' namespace rather than the 'loader' namespace. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37967 --- stand/kboot/host_syscall.h | 22 ++ 1 file changed, 22 insertions(+) diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index ea0745542a5b..38f0fb04aa95 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -46,6 +46,28 @@ typedef int64_t host_blkcnt_t; #include "stat_arch.h" +/* + * stat flags + * These are arch independent and match the values in nolib and uapi headers + * with HOST_ prepended. + */ +#defineHOST_S_IFMT 017 +#defineHOST_S_IFIFO001 +#defineHOST_S_IFCHR002 +#defineHOST_S_IFDIR004 +#defineHOST_S_IFBLK006 +#defineHOST_S_IFREG010 +#defineHOST_S_IFLNK012 +#defineHOST_S_IFSOCK 014 + +#defineHOST_S_ISBLK(mode) (((mode) & HOST_S_IFMT) == HOST_S_IFBLK) +#defineHOST_S_ISCHR(mode) (((mode) & HOST_S_IFMT) == HOST_S_IFCHR) +#defineHOST_S_ISDIR(mode) (((mode) & HOST_S_IFMT) == HOST_S_IFDIR) +#defineHOST_S_ISFIFO(mode) (((mode) & HOST_S_IFMT) == HOST_S_IFIFO) +#defineHOST_S_ISLNK(mode) (((mode) & HOST_S_IFMT) == HOST_S_IFLNK) +#defineHOST_S_ISREG(mode) (((mode) & HOST_S_IFMT) == HOST_S_IFREG) +#defineHOST_S_ISSOCK(mode) (((mode) & HOST_S_IFMT) == HOST_S_IFSOCK) + /* * Constants for open, fcntl, etc *
git: a0e4d18091a4 - main - kboot: Sort kexec_load alphabetically
The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a0e4d18091a4fab66c4eb7c5dc731f78a2f9b0a3
commit a0e4d18091a4fab66c4eb7c5dc731f78a2f9b0a3
Author: Warner Losh
AuthorDate: 2023-01-07 20:24:45 +
Commit: Warner Losh
CommitDate: 2023-01-07 20:24:45 +
kboot: Sort kexec_load alphabetically
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D37968
---
stand/kboot/host_syscalls.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/host_syscalls.c
index 1ffa04948fdf..092ddfd133fd 100644
--- a/stand/kboot/host_syscalls.c
+++ b/stand/kboot/host_syscalls.c
@@ -60,12 +60,6 @@ host_ioctl(int fd, unsigned long request, unsigned long arg)
return host_syscall(SYS_ioctl, fd, request, arg);
}
-int
-host_kexec_load(unsigned long entry, unsigned long nsegs, struct
host_kexec_segment *segs, unsigned long flags)
-{
- return host_syscall(SYS_kexec_load, entry, nsegs, segs, flags);
-}
-
ssize_t
host_llseek(int fd, int32_t offset_high, int32_t offset_lo, uint64_t *result,
int whence)
{
@@ -80,6 +74,12 @@ host_llseek(int fd, int32_t offset_high, int32_t offset_lo,
uint64_t *result, in
#endif
}
+int
+host_kexec_load(unsigned long entry, unsigned long nsegs, struct
host_kexec_segment *segs, unsigned long flags)
+{
+ return host_syscall(SYS_kexec_load, entry, nsegs, segs, flags);
+}
+
int
host_mkdir(const char *path, host_mode_t mode)
{
git: 4dd3e76881ad - main - kboot: use 128MB for the heap area, ZFS needs a lot of memory
The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4dd3e76881ad025170b0cfb5455680b3c89fe263
commit 4dd3e76881ad025170b0cfb5455680b3c89fe263
Author: Warner Losh
AuthorDate: 2022-12-23 18:26:32 +
Commit: Warner Losh
CommitDate: 2023-01-07 20:27:49 +
kboot: use 128MB for the heap area, ZFS needs a lot of memory
ZFS uses a lot of memory. The old minimal allocations won't work when
ZFS support is added. Most environments this will be used (or will
liekly be used) have >> 256MB, 128MB should be safe everywhere and allow
examination of a fair number of ZFS pools to boot from.
Sponsored by: Netflix
---
stand/kboot/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stand/kboot/main.c b/stand/kboot/main.c
index 85453db50fa5..2e85121b7b12 100644
--- a/stand/kboot/main.c
+++ b/stand/kboot/main.c
@@ -150,7 +150,7 @@ int
main(int argc, const char **argv)
{
void *heapbase;
- const size_t heapsize = 15*1024*1024;
+ const size_t heapsize = 128*1024*1024;
const char *bootdev;
archsw.arch_getdev = kboot_getdev;
git: c33509d49a6f - main - gssd: Fix handling of the gssname= NFS mount option
The branch main has been updated by rmacklem:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c33509d49a6fdcf86ef280a78f428d3cb7012c4a
commit c33509d49a6fdcf86ef280a78f428d3cb7012c4a
Author: Rick Macklem
AuthorDate: 2023-01-07 21:49:25 +
Commit: Rick Macklem
CommitDate: 2023-01-07 21:49:25 +
gssd: Fix handling of the gssname= NFS mount option
If an NFS mount using "sec=krb5[ip],gssname=" is
done, the gssd daemon fails. There is a long delay
(several seconds) in the gss_acquire_cred() call and then
it returns success, but the credentials returned are
junk.
I have no idea how long this has been broken, due to some
change in the Heimdal gssapi library call, but I suspect
it has been quite some time.
Anyhow, it turns out that replacing the "desired_name"
argument with GSS_C_NO_NAME fixes the problem.
Replacing the argument should not be a problem, since the
TGT for the host based initiator credential in the default
keytab file should be the only TGT in the gssd'd credential
cache (which is not the one for uid 0).
I will try and determine if FreeBSD13 and/or FreeBSD12
needs this same fix and will MFC if they need the fix.
This problem only affected Kerberized NFS mounts when the
"gssname" mount option was used. Other Kerberized NFS
mount cases already used GSS_C_NO_NAME and work ok.
A workaround if you do not have this patch is to do a
"kinit -k host/FQDN" as root on the machine, followed by
the Kerberized NFS mount without the "gssname" mount
option.
MFC after: 1 month
---
usr.sbin/gssd/gssd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c
index 5589da37c195..ee77471bf05b 100644
--- a/usr.sbin/gssd/gssd.c
+++ b/usr.sbin/gssd/gssd.c
@@ -847,7 +847,7 @@ gssd_acquire_cred_1_svc(acquire_cred_args *argp,
acquire_cred_res *result, struc
}
result->major_status = gss_acquire_cred(&result->minor_status,
- desired_name, argp->time_req, argp->desired_mechs,
+ GSS_C_NO_NAME, argp->time_req, argp->desired_mechs,
argp->cred_usage, &cred, &result->actual_mechs, &result->time_rec);
gssd_verbose_out("gssd_acquire_cred: done major=0x%x minor=%d\n",
(unsigned int)result->major_status, (int)result->minor_status);
Re: git: c33509d49a6f - main - gssd: Fix handling of the gssname= NFS mount option
On Sat, Jan 7, 2023 at 1:50 PM Rick Macklem wrote: > The branch main has been updated by rmacklem: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=c33509d49a6fdcf86ef280a78f428d3cb7012c4a > > commit c33509d49a6fdcf86ef280a78f428d3cb7012c4a > Author: Rick Macklem > AuthorDate: 2023-01-07 21:49:25 + > Commit: Rick Macklem > CommitDate: 2023-01-07 21:49:25 + > > gssd: Fix handling of the gssname= NFS mount option > > If an NFS mount using "sec=krb5[ip],gssname=" is > done, the gssd daemon fails. There is a long delay > (several seconds) in the gss_acquire_cred() call and then > it returns success, but the credentials returned are > junk. > > I have no idea how long this has been broken, due to some > change in the Heimdal gssapi library call, but I suspect > it has been quite some time. > > Anyhow, it turns out that replacing the "desired_name" > argument with GSS_C_NO_NAME fixes the problem. > Replacing the argument should not be a problem, since the > TGT for the host based initiator credential in the default > keytab file should be the only TGT in the gssd'd credential > cache (which is not the one for uid 0). > > I will try and determine if FreeBSD13 and/or FreeBSD12 > needs this same fix and will MFC if they need the fix. > > This problem only affected Kerberized NFS mounts when the > "gssname" mount option was used. Other Kerberized NFS > mount cases already used GSS_C_NO_NAME and work ok. > A workaround if you do not have this patch is to do a > "kinit -k host/FQDN" as root on the machine, followed by > the Kerberized NFS mount without the "gssname" mount > option. > > Hi Rick, This doesn't seem like a good long-term fix. If we're going to have a gssname argument, we should actually make it take effect, rather than silently ignoring it, which is what using GSS_C_NO_NAME does (it indicates the use of "any credential", which ends up meaning the default credential when used on a GSS initiator). It should be possible to inspect the "junk" credential from gss_acquire_cred() and learn more about what happened (perhaps a non-kerberos mechanismm was picked, or the name was in the wrong format) using various gss_inquire_*() calls, as a diagnostic measure. Unfortunately I don't anticipate having a huge amount of time to put into it anytime soon... Thanks, Ben
git: 4ffe60e6833e - main - Add Combo PHY, RK817, Syr827, tcs4525 pmic devices to Rockchip specific config.
The branch main has been updated by ganbold: URL: https://cgit.FreeBSD.org/src/commit/?id=4ffe60e6833e22f304e63212cc3b3984e3cf643f commit 4ffe60e6833e22f304e63212cc3b3984e3cf643f Author: Søren Schmidt AuthorDate: 2023-01-08 03:07:18 + Commit: Ganbold Tsagaankhuu CommitDate: 2023-01-08 03:07:18 + Add Combo PHY, RK817, Syr827, tcs4525 pmic devices to Rockchip specific config. --- sys/arm64/conf/std.rockchip | 6 ++ sys/conf/files | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/arm64/conf/std.rockchip b/sys/arm64/conf/std.rockchip index 8dee25910c02..8f8084379d62 100644 --- a/sys/arm64/conf/std.rockchip +++ b/sys/arm64/conf/std.rockchip @@ -12,12 +12,18 @@ device dwgpio # Synopsys DesignWare APB GPIO Controller device rk_gpio # RockChip GPIO Controller device rk_pinctrl # RockChip Pinmux Controller +# Combo PHY support +device rk_combphy # Naneng Combo PHY + # I2C device rk_i2c # RockChip I2C controller device fan53555# Fairchild Semi FAN53555/SYR82x Regulator # Power management controllers device rk805 # RockChip RK805 PMIC +device rk817 # RockChip RK817 PMIC +device syr827 # Silergy SYR827 PMIC +device tcs4525 # TCS 4525 PMIC # SPI device rk_spi # RockChip SPI controller diff --git a/sys/conf/files b/sys/conf/files index eb5fe2055f8e..ca6dd03d4817 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1883,7 +1883,7 @@ dev/iicbus/s35390a.c optional s35390a dev/iicbus/sy8106a.c optional sy8106a fdt dev/iicbus/syr827.coptional syr827 fdt dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio -dev/iicbus/pmic/fan53555.c optional fan53555 fdt +dev/iicbus/pmic/fan53555.c optional fan53555 fdt | tcs4525 fdt dev/igc/if_igc.c optional igc iflib pci dev/igc/igc_api.c optional igc iflib pci dev/igc/igc_base.c optional igc iflib pci
