D28707.1794684508.diff
No OneTemporary
Actions

Authored By

Unknown

Size

37 KB

Referenced Files

None

Subscribers

None

D28707.1794684508.diff
View Options

	Index: stand/efi/loader/main.c
	===================================================================
	--- stand/efi/loader/main.c
	+++ stand/efi/loader/main.c
	@@ -1161,17 +1161,32 @@
	efi_init_environment();

	#if !defined(__arm__)
	+ int found = 0;
	for (k = 0; k < ST->NumberOfTableEntries; k++) {
	+ guid = &ST->ConfigurationTable[k].VendorGuid;
	+ if (!memcmp(guid, &smbios3, sizeof(EFI_GUID))) {
	+ found = 3;
	+ break;
	+ }
	+ }
	+ for (k = 0; found == 0 && k < ST->NumberOfTableEntries; k++) {
	guid = &ST->ConfigurationTable[k].VendorGuid;
	if (!memcmp(guid, &smbios, sizeof(EFI_GUID))) {
	- char buf[40];
	+ found = 2;
	+ break;
	+ }
	+ }
	+ if (found > 0) {
	+ char buf[40];

	- snprintf(buf, sizeof(buf), "%p",
	- ST->ConfigurationTable[k].VendorTable);
	+ snprintf(buf, sizeof(buf), "%p",
	+ ST->ConfigurationTable[k].VendorTable);
	+ if (found == 3) {
	+ setenv("hint.smbios3.0.mem", buf, 1);
	+ } else {
	setenv("hint.smbios.0.mem", buf, 1);
	- smbios_detect(ST->ConfigurationTable[k].VendorTable);
	- break;
	}
	+ smbios_detect(ST->ConfigurationTable[k].VendorTable);
	}
	#endif

	Index: stand/libsa/smbios.c
	===================================================================
	--- stand/libsa/smbios.c
	+++ stand/libsa/smbios.c
	@@ -54,10 +54,12 @@
	#define SMBIOS_STEP 0x10
	#define SMBIOS_SIG "_SM_"
	#define SMBIOS_DMI_SIG "_DMI_"
	+#define SMBIOS3_SIG "_SM3_"

	#define SMBIOS_GET8(base, off) ((uint8_t )((base) + (off)))
	#define SMBIOS_GET16(base, off) ((uint16_t )((base) + (off)))
	#define SMBIOS_GET32(base, off) ((uint32_t )((base) + (off)))
	+#define SMBIOS_GET64(base, off) ((uint64_t )((base) + (off)))

	#define SMBIOS_GETLEN(base) SMBIOS_GET8(base, 0x01)
	#define SMBIOS_GETSTR(base) ((base) + SMBIOS_GETLEN(base))
	@@ -98,6 +100,11 @@
	caddr_t cp;

	/* Search on 16-byte boundaries. */
	+ for (cp = addr; cp < addr + len; cp += SMBIOS_STEP)
	+ if (strncmp(cp, SMBIOS3_SIG, 5) == 0 &&
	+ smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0)
	+ return (cp);
	+
	for (cp = addr; cp < addr + len; cp += SMBIOS_STEP)
	if (strncmp(cp, SMBIOS_SIG, 4) == 0 &&
	smbios_checksum(cp, SMBIOS_GET8(cp, 0x05)) == 0 &&
	@@ -423,7 +430,9 @@
	return (NULL);

	for (dmi = smbios.addr, i = 0;
	- dmi < smbios.addr + smbios.length && i < smbios.count; i++) {
	+ dmi < smbios.addr + smbios.length &&
	+ (smbios.count == 0 \|\| i < smbios.count);
	+ i++) {
	if (SMBIOS_GET8(dmi, 0) == type)
	return dmi;
	/* Find structure terminator. */
	@@ -437,25 +446,44 @@
	}

	static void
	-smbios_probe(const caddr_t addr)
	+smbios_probe(caddr_t addr)
	{
	caddr_t saddr, info;
	uintptr_t paddr;
	+ uint32_t searchlen;
	+ bool ep_64bit;

	if (smbios.probed)
	return;
	smbios.probed = 1;

	+ if (addr == 0) {
	+ addr = PTOV(SMBIOS_START);
	+ searchlen = SMBIOS_LENGTH;
	+ } else {
	+ searchlen = 1;
	+ }
	+
	/* Search signatures and validate checksums. */
	- saddr = smbios_sigsearch(addr ? addr : PTOV(SMBIOS_START),
	- SMBIOS_LENGTH);
	+ saddr = smbios_sigsearch(addr, searchlen);
	if (saddr == NULL)
	return;

	- smbios.length = SMBIOS_GET16(saddr, 0x16); /* Structure Table Length */
	- paddr = SMBIOS_GET32(saddr, 0x18); /* Structure Table Address */
	- smbios.count = SMBIOS_GET16(saddr, 0x1c); /* No of SMBIOS Structures */
	- smbios.ver = SMBIOS_GET8(saddr, 0x1e); /* SMBIOS BCD Revision */
	+ ep_64bit = (SMBIOS_GET8(saddr, 0x3) == '3') ? true : false;
	+
	+ if (ep_64bit) {
	+ /* SMBIOS 3.0 (64-bit) Entry Point */
	+ smbios.length = SMBIOS_GET32(saddr, 0xc); /* Structure table maximum size */
	+ paddr = SMBIOS_GET64(saddr, 0x10); /* Structure table address */
	+ smbios.ver = 0;
	+ smbios.count = 0;
	+ } else {
	+ /* SMBIOS 2.1 (32-bit) Entry Point */
	+ smbios.length = SMBIOS_GET16(saddr, 0x16); /* Structure Table Length */
	+ paddr = SMBIOS_GET32(saddr, 0x18); /* Structure Table Address */
	+ smbios.count = SMBIOS_GET16(saddr, 0x1c); /* No of SMBIOS Structures */
	+ smbios.ver = SMBIOS_GET8(saddr, 0x1e); /* SMBIOS BCD Revision */
	+ }

	if (smbios.ver != 0) {
	smbios.major = smbios.ver >> 4;
	@@ -464,8 +492,13 @@
	smbios.ver = 0;
	}
	if (smbios.ver == 0) {
	- smbios.major = SMBIOS_GET8(saddr, 0x06);/* SMBIOS Major Version */
	- smbios.minor = SMBIOS_GET8(saddr, 0x07);/* SMBIOS Minor Version */
	+ if (ep_64bit) {
	+ smbios.major = SMBIOS_GET8(saddr, 0x07);/* SMBIOS Major Version */
	+ smbios.minor = SMBIOS_GET8(saddr, 0x08);/* SMBIOS Minor Version */
	+ } else {
	+ smbios.major = SMBIOS_GET8(saddr, 0x06);/* SMBIOS Major Version */
	+ smbios.minor = SMBIOS_GET8(saddr, 0x07);/* SMBIOS Minor Version */
	+ }
	}
	smbios.ver = (smbios.major << 8) \| smbios.minor;
	smbios.addr = PTOV(paddr);
	@@ -489,12 +522,17 @@
	caddr_t dmi;
	size_t i;

	+ if (smbios.addr != NULL)
	+ return;
	+
	smbios_probe(addr);
	if (smbios.addr == NULL)
	return;

	for (dmi = smbios.addr, i = 0;
	- dmi < smbios.addr + smbios.length && i < smbios.count; i++)
	+ dmi < smbios.addr + smbios.length &&
	+ (smbios.count == 0 \|\| i < smbios.count);
	+ i++)
	dmi = smbios_parse_table(dmi);

	sprintf(buf, "%d.%d", smbios.major, smbios.minor);
	Index: sys/amd64/conf/GENERIC
	===================================================================
	--- sys/amd64/conf/GENERIC
	+++ sys/amd64/conf/GENERIC
	@@ -129,6 +129,7 @@

	# Bus support.
	device acpi
	+device smbios
	options IOMMU
	device pci
	options PCI_HP # PCI-Express native HotPlug
	Index: sys/amd64/conf/MINIMAL
	===================================================================
	--- sys/amd64/conf/MINIMAL
	+++ sys/amd64/conf/MINIMAL
	@@ -103,6 +103,7 @@

	# Bus support.
	device acpi
	+device smbios
	options IOMMU
	device pci

	Index: sys/amd64/include/pc/bios.h
	===================================================================
	--- sys/amd64/include/pc/bios.h
	+++ sys/amd64/include/pc/bios.h
	@@ -64,38 +64,6 @@
	u_int32_t xattr;
	} __packed;

	-/*
	- * System Management BIOS
	- */
	-#define SMBIOS_START 0xf0000
	-#define SMBIOS_STEP 0x10
	-#define SMBIOS_OFF 0
	-#define SMBIOS_LEN 4
	-#define SMBIOS_SIG "_SM_"
	-
	-struct smbios_eps {
	- uint8_t anchor_string[4]; /* '_SM_' */
	- uint8_t checksum;
	- uint8_t length;
	- uint8_t major_version;
	- uint8_t minor_version;
	- uint16_t maximum_structure_size;
	- uint8_t entry_point_revision;
	- uint8_t formatted_area[5];
	- uint8_t intermediate_anchor_string[5]; /* '_DMI_' */
	- uint8_t intermediate_checksum;
	- uint16_t structure_table_length;
	- uint32_t structure_table_address;
	- uint16_t number_structures;
	- uint8_t BCD_revision;
	-};
	-
	-struct smbios_structure_header {
	- uint8_t type;
	- uint8_t length;
	- uint16_t handle;
	-};
	-
	#ifdef _KERNEL
	#define BIOS_PADDRTOVADDR(x) ((x) + KERNBASE)
	#define BIOS_VADDRTOPADDR(x) ((x) - KERNBASE)
	Index: sys/arm64/conf/GENERIC
	===================================================================
	--- sys/arm64/conf/GENERIC
	+++ sys/arm64/conf/GENERIC
	@@ -383,6 +383,7 @@

	options FDT
	device acpi
	+device smbios

	# DTBs
	makeoptions MODULES_EXTRA="dtb/allwinner dtb/freescale dtb/imx8 dtb/nvidia dtb/mv dtb/rockchip dtb/rpi"
	Index: sys/conf/files
	===================================================================
	--- sys/conf/files
	+++ sys/conf/files
	@@ -3095,6 +3095,7 @@
	dev/siis/siis.c optional siis pci
	dev/sis/if_sis.c optional sis pci
	dev/sk/if_sk.c optional sk pci
	+dev/smbios/smbios.c optional smbios
	dev/smbus/smb.c optional smb
	dev/smbus/smbconf.c optional smbus
	dev/smbus/smbus.c optional smbus
	Index: sys/conf/files.x86
	===================================================================
	--- sys/conf/files.x86
	+++ sys/conf/files.x86
	@@ -293,7 +293,6 @@
	x86/acpica/acpi_apm.c optional acpi
	x86/acpica/acpi_wakeup.c optional acpi
	x86/acpica/srat.c optional acpi
	-x86/bios/smbios.c optional smbios
	x86/bios/vpd.c optional vpd
	x86/cpufreq/est.c optional cpufreq
	x86/cpufreq/hwpstate_amd.c optional cpufreq
	Index: sys/dev/acpica/acpi_resource.c
	===================================================================
	--- sys/dev/acpica/acpi_resource.c
	+++ sys/dev/acpica/acpi_resource.c
	@@ -496,6 +496,13 @@
	acpi_MatchHid(handle, "ARMHC9FF") != ACPI_MATCHHID_NOMATCH)
	arc.ignore_producer_flag = true;

	+ /*
	+ * The DesignWare I2C Controller on Ampere Altra sets ResourceProducer on
	+ * memory resources.
	+ */
	+ if (acpi_MatchHid(handle, "APMC0D0F") != ACPI_MATCHHID_NOMATCH)
	+ arc.ignore_producer_flag = true;
	+
	status = AcpiWalkResources(handle, "_CRS", acpi_parse_resource, &arc);
	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
	printf("can't fetch resources for %s - %s\n",
	Index: sys/dev/ichiic/ig4_acpi.c
	===================================================================
	--- sys/dev/ichiic/ig4_acpi.c
	+++ sys/dev/ichiic/ig4_acpi.c
	@@ -89,8 +89,16 @@
	sc = device_get_softc(dev);

	sc->dev = dev;
	- /* All the HIDs matched are Atom SOCs. */
	- sc->version = IG4_ATOM;
	+ if (acpi_MatchHid(acpi_get_handle(dev), "APMC0D0F") !=
	+ ACPI_MATCHHID_NOMATCH) {
	+ sc->version = IG4_EMAG;
	+ } else {
	+ /*
	+ * All the other HIDs matched are compatible with Atom
	+ * mode.
	+ */
	+ sc->version = IG4_ATOM;
	+ }
	sc->regs_rid = 0;
	sc->regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
	&sc->regs_rid, RF_ACTIVE);
	Index: sys/dev/ichiic/ig4_iic.c
	===================================================================
	--- sys/dev/ichiic/ig4_iic.c
	+++ sys/dev/ichiic/ig4_iic.c
	@@ -91,8 +91,11 @@
	* Ig4 hardware parameters except Haswell are taken from intel_lpss driver
	*/
	static const struct ig4_hw ig4iic_hw[] = {
	- [IG4_HASWELL] = {
	+ [IG4_EMAG] = {
	.ic_clock_rate = 100, /* MHz */
	+ },
	+ [IG4_HASWELL] = {
	+ .ic_clock_rate = 100,
	.sda_hold_time = 90, /* nsec */
	.txfifo_depth = 32,
	.rxfifo_depth = 32,
	@@ -267,7 +270,7 @@
	int error;
	int txlvl = -1;
	u_int count_us = 0;
	- u_int limit_us = 25000; /* 25ms */
	+ u_int limit_us = 1000000; /* 1sec */

	for (;;) {
	/*
	@@ -801,7 +804,13 @@
	elems = obj->Package.Elements;
	*scl_hcnt = elems[0].Integer.Value & IG4_SCL_CLOCK_MASK;
	*scl_lcnt = elems[1].Integer.Value & IG4_SCL_CLOCK_MASK;
	- *sda_hold = elems[2].Integer.Value & IG4_SDA_TX_HOLD_MASK;
	+ if (elems[2].Integer.Value != 0) {
	+ /*
	+ * If the value in the table is zero, stick
	+ * with value calculated earlier for sda_hold.
	+ */
	+ *sda_hold = elems[2].Integer.Value & IG4_SDA_TX_HOLD_MASK;
	+ }
	status = AE_OK;
	}

	Index: sys/dev/ichiic/ig4_var.h
	===================================================================
	--- sys/dev/ichiic/ig4_var.h
	+++ sys/dev/ichiic/ig4_var.h
	@@ -44,6 +44,7 @@
	#include "iicbus_if.h"

	enum ig4_vers {
	+ IG4_EMAG,
	IG4_HASWELL,
	IG4_ATOM,
	IG4_SKYLAKE,
	Index: sys/dev/iicbus/iicsmb.c
	===================================================================
	--- sys/dev/iicbus/iicsmb.c
	+++ sys/dev/iicbus/iicsmb.c
	@@ -455,7 +455,7 @@
	int error;

	/* Have to do this because the command is split in two transfers. */
	- error = iicbus_request_bus(parent, dev, IIC_WAIT);
	+ error = iicbus_request_bus(parent, dev, IIC_WAIT \| IIC_RECURSIVE);
	if (error == 0)
	error = TRANSFER_MSGS(dev, msgs);
	if (error == 0) {
	Index: sys/dev/ipmi/ipmi_isa.c
	===================================================================
	--- sys/dev/ipmi/ipmi_isa.c
	+++ sys/dev/ipmi/ipmi_isa.c
	@@ -286,3 +286,4 @@
	};

	DRIVER_MODULE(ipmi_isa, isa, ipmi_isa_driver, ipmi_devclass, 0, 0);
	+MODULE_DEPEND(ipmi_isa, smbios, 1, 1, 1);
	Index: sys/dev/ipmi/ipmi_pci.c
	===================================================================
	--- sys/dev/ipmi/ipmi_pci.c
	+++ sys/dev/ipmi/ipmi_pci.c
	@@ -179,6 +179,7 @@
	};

	DRIVER_MODULE(ipmi_pci, pci, ipmi_pci_driver, ipmi_devclass, 0, 0);
	+MODULE_DEPEND(ipmi_pci, smbios, 1, 1, 1);

	/* Native IPMI on PCI driver. */

	Index: sys/dev/ipmi/ipmi_smbios.c
	===================================================================
	--- sys/dev/ipmi/ipmi_smbios.c
	+++ sys/dev/ipmi/ipmi_smbios.c
	@@ -39,7 +39,10 @@

	#include <vm/vm.h>
	#include <vm/pmap.h>
	+#if defined(__amd64__) \|\| defined(__i386__)
	#include <machine/pc/bios.h>
	+#endif
	+#include <dev/smbios/smbios.h>

	#ifdef LOCAL_MODULE
	#include <ipmi.h>
	@@ -84,8 +87,7 @@
	MTX_SYSINIT(ipmi_info, &ipmi_info_mtx, "ipmi info", MTX_DEF);

	static void ipmi_smbios_probe(struct ipmi_get_info *);
	-static int smbios_cksum(struct smbios_eps *);
	-static void smbios_walk_table(uint8_t *, int, smbios_callback_t,
	+static void smbios_walk_table(uint8_t *, vm_size_t, smbios_callback_t,
	void *);
	static void smbios_ipmi_info(struct smbios_structure_header , void );

	@@ -144,11 +146,12 @@
	}

	static void
	-smbios_walk_table(uint8_t p, int entries, smbios_callback_t cb, void arg)
	+smbios_walk_table(uint8_t table, vm_size_t size, smbios_callback_t cb, void arg)
	{
	struct smbios_structure_header *s;
	+ uint8_t *p;

	- while (entries--) {
	+ for (p = table; p < table + size;) {
	s = (struct smbios_structure_header *)p;
	cb(s, arg);

	@@ -157,8 +160,11 @@
	* formatted area of this structure.
	*/
	p += s->length;
	- while (!(p[0] == 0 && p[1] == 0))
	+ while (!(p[0] == 0 && p[1] == 0)) {
	p++;
	+ if (p >= table + size)
	+ return;
	+ }

	/*
	* Skip over the double-nul to the start of the next
	@@ -176,41 +182,23 @@
	static void
	ipmi_smbios_probe(struct ipmi_get_info *info)
	{
	- struct smbios_eps *header;
	void *table;
	- u_int32_t addr;
	+ vm_paddr_t table_paddr;
	+ vm_size_t table_size;
	+ int err;

	bzero(info, sizeof(struct ipmi_get_info));

	- /* Find the SMBIOS table header. */
	- addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN,
	- SMBIOS_STEP, SMBIOS_OFF);
	- if (addr == 0)
	+ err = smbios_get_structure_table(&table_paddr, &table_size);
	+ if (err != 0)
	return;

	- /*
	- * Map the header. We first map a fixed size to get the actual
	- * length and then map it a second time with the actual length so
	- * we can verify the checksum.
	- */
	- header = pmap_mapbios(addr, sizeof(struct smbios_eps));
	- table = pmap_mapbios(addr, header->length);
	- pmap_unmapbios((vm_offset_t)header, sizeof(struct smbios_eps));
	- header = table;
	- if (smbios_cksum(header) != 0) {
	- pmap_unmapbios((vm_offset_t)header, header->length);
	- return;
	- }
	+ table = pmap_mapbios(table_paddr, table_size);

	- /* Now map the actual table and walk it looking for an IPMI entry. */
	- table = pmap_mapbios(header->structure_table_address,
	- header->structure_table_length);
	- smbios_walk_table(table, header->number_structures, smbios_ipmi_info,
	- info);
	+ smbios_walk_table(table, table_size, smbios_ipmi_info, info);

	/* Unmap everything. */
	- pmap_unmapbios((vm_offset_t)table, header->structure_table_length);
	- pmap_unmapbios((vm_offset_t)header, header->length);
	+ pmap_unmapbios((vm_offset_t)table, table_size);
	}

	/*
	@@ -248,19 +236,3 @@

	return (info->iface_type != 0);
	}
	-
	-static int
	-smbios_cksum(struct smbios_eps *e)
	-{
	- u_int8_t *ptr;
	- u_int8_t cksum;
	- int i;
	-
	- ptr = (u_int8_t *)e;
	- cksum = 0;
	- for (i = 0; i < e->length; i++) {
	- cksum += ptr[i];
	- }
	-
	- return (cksum);
	-}
	Index: sys/dev/ipmi/ipmi_smbus.c
	===================================================================
	--- sys/dev/ipmi/ipmi_smbus.c
	+++ sys/dev/ipmi/ipmi_smbus.c
	@@ -131,3 +131,8 @@

	DRIVER_MODULE(ipmi_smbus, smbus, ipmi_smbus_driver, ipmi_devclass, 0, 0);
	MODULE_DEPEND(ipmi_smbus, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
	+MODULE_DEPEND(ipmi_smbus, smbios, 1, 1, 1);
	+#if defined(__aarch64__)
	+MODULE_DEPEND(ipmi_smbus, iicsmb, 1, 1, 1);
	+MODULE_DEPEND(ipmi_smbus, ig4iic, 1, 1, 1);
	+#endif
	Index: sys/dev/ipmi/ipmi_ssif.c
	===================================================================
	--- sys/dev/ipmi/ipmi_ssif.c
	+++ sys/dev/ipmi/ipmi_ssif.c
	@@ -297,7 +297,7 @@
	len += count - 1;

	/* If this was the last block we are done. */
	- if (ssif_buf[0] != 0xff)
	+ if (ssif_buf[0] == 0xff)
	break;
	block++;
	}
	Index: sys/dev/smbios/smbios.h
	===================================================================
	--- sys/dev/smbios/smbios.h
	+++ sys/dev/smbios/smbios.h
	@@ -29,40 +29,10 @@
	* $FreeBSD$
	*/

	-#ifndef _MACHINE_PC_BIOS_H_
	-#define _MACHINE_PC_BIOS_H_
	+#ifndef _SMBIOS_H_
	+#define _SMBIOS_H_

	-/*
	- * Int 15:E820 'SMAP' structure
	- */
	-#define SMAP_SIG 0x534D4150 /* 'SMAP' */
	-
	-#define SMAP_TYPE_MEMORY 1
	-#define SMAP_TYPE_RESERVED 2
	-#define SMAP_TYPE_ACPI_RECLAIM 3
	-#define SMAP_TYPE_ACPI_NVS 4
	-#define SMAP_TYPE_ACPI_ERROR 5
	-#define SMAP_TYPE_DISABLED 6
	-#define SMAP_TYPE_PMEM 7
	-#define SMAP_TYPE_PRAM 12
	-
	-#define SMAP_XATTR_ENABLED 0x00000001
	-#define SMAP_XATTR_NON_VOLATILE 0x00000002
	-#define SMAP_XATTR_MASK (SMAP_XATTR_ENABLED \| SMAP_XATTR_NON_VOLATILE)
	-
	-struct bios_smap {
	- u_int64_t base;
	- u_int64_t length;
	- u_int32_t type;
	-} __packed;
	-
	-/* Structure extended to include extended attribute field in ACPI 3.0. */
	-struct bios_smap_xattr {
	- u_int64_t base;
	- u_int64_t length;
	- u_int32_t type;
	- u_int32_t xattr;
	-} __packed;
	+int smbios_get_structure_table(vm_paddr_t table, vm_size_t size);

	/*
	* System Management BIOS
	@@ -72,6 +42,8 @@
	#define SMBIOS_OFF 0
	#define SMBIOS_LEN 4
	#define SMBIOS_SIG "_SM_"
	+#define SMBIOS3_LEN 5
	+#define SMBIOS3_SIG "_SM3_"

	struct smbios_eps {
	uint8_t anchor_string[4]; /* '_SM_' */
	@@ -90,37 +62,23 @@
	uint8_t BCD_revision;
	};

	+struct smbios3_eps {
	+ uint8_t anchor_string[5]; /* '_SM3_' */
	+ uint8_t checksum;
	+ uint8_t length;
	+ uint8_t major_version;
	+ uint8_t minor_version;
	+ uint8_t docrev;
	+ uint8_t entry_point_revision;
	+ uint8_t reserved;
	+ uint32_t structure_table_max_size;
	+ uint64_t structure_table_address;
	+};
	+
	struct smbios_structure_header {
	uint8_t type;
	uint8_t length;
	uint16_t handle;
	};

	-#ifdef _KERNEL
	-#define BIOS_PADDRTOVADDR(x) ((x) + KERNBASE)
	-#define BIOS_VADDRTOPADDR(x) ((x) - KERNBASE)
	-
	-struct bios_oem_signature {
	- char * anchor; /* search anchor string in BIOS memory */
	- size_t offset; /* offset from anchor (may be negative) */
	- size_t totlen; /* total length of BIOS string to copy */
	-} __packed;
	-
	-struct bios_oem_range {
	- u_int from; /* shouldn't be below 0xe0000 */
	- u_int to; /* shouldn't be above 0xfffff */
	-} __packed;
	-
	-struct bios_oem {
	- struct bios_oem_range range;
	- struct bios_oem_signature signature[];
	-} __packed;
	-
	-int bios_oem_strings(struct bios_oem oem, u_char buffer, size_t maxlen);
	-uint32_t bios_sigsearch(uint32_t start, u_char *sig, int siglen, int paralen,
	- int sigofs);
	-void bios_add_smap_entries(struct bios_smap *smapbase, u_int32_t smapsize,
	- vm_paddr_t physmap, int physmap_idx);
	-#endif
	-
	-#endif /* _MACHINE_PC_BIOS_H_ */
	+#endif /* _SMBIOS_H_ */
	Index: sys/dev/smbios/smbios.c
	===================================================================
	--- sys/dev/smbios/smbios.c
	+++ sys/dev/smbios/smbios.c
	@@ -46,7 +46,12 @@
	#include <vm/vm_param.h>
	#include <vm/pmap.h>
	#include <machine/md_var.h>
	+#if defined(__amd64__) \|\| defined(__i386__)
	#include <machine/pc/bios.h>
	+#endif
	+#include <dev/smbios/smbios.h>
	+
	+static struct smbios_softc *smbios;

	/*
	* System Management BIOS Reference Specification, v2.4 Final
	@@ -58,11 +63,15 @@
	struct resource * res;
	int rid;

	- struct smbios_eps * eps;
	+ union {
	+ struct smbios_eps * eps;
	+ struct smbios3_eps * eps3;
	+ };
	+ bool eps_64bit;
	};

	#define RES2EPS(res) ((struct smbios_eps *)rman_get_virtual(res))
	-#define ADDR2EPS(addr) ((struct smbios_eps *)BIOS_PADDRTOVADDR(addr))
	+#define RES2EPS3(res) ((struct smbios3_eps *)rman_get_virtual(res))

	static devclass_t smbios_devclass;

	@@ -72,30 +81,61 @@
	static int smbios_detach (device_t);
	static int smbios_modevent (module_t, int, void *);

	-static int smbios_cksum (struct smbios_eps *);
	+static bool smbios_eps_64bit(void *);
	+static int smbios_cksum (void *);

	static void
	smbios_identify (driver_t *driver, device_t parent)
	{
	+ struct smbios3_eps *eps3;
	+ struct smbios_eps *eps;
	device_t child;
	- u_int32_t addr;
	+ vm_paddr_t addr;
	int length;
	int rid;
	+ bool eps_64bit;

	if (!device_is_alive(parent))
	return;

	- addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN,
	- SMBIOS_STEP, SMBIOS_OFF);
	+ if (resource_long_value("smbios3", 0, "mem", &addr) != 0) {
	+#if defined(__amd64__) \|\| defined(__i386__)
	+ addr = bios_sigsearch(SMBIOS_START, SMBIOS3_SIG, SMBIOS3_LEN,
	+ SMBIOS_STEP, SMBIOS_OFF);
	+#else
	+ addr = 0;
	+#endif
	+ }
	+
	if (addr != 0) {
	+ eps_64bit = true;
	+ } else {
	+ eps_64bit = false;
	+ if (resource_long_value("smbios", 0, "mem", &addr) != 0) {
	+#if defined(__amd64__) \|\| defined(__i386__)
	+ addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN,
	+ SMBIOS_STEP, SMBIOS_OFF);
	+#else
	+ addr = 0;
	+#endif
	+ }
	+ }
	+
	+ if (addr != 0) {
	+ if (eps_64bit) {
	+ eps3 = pmap_mapbios(addr, 0x18);
	+ length = eps3->length;
	+ } else {
	+ eps = pmap_mapbios(addr, 0x1f);
	+ length = eps->length;
	+ }
	rid = 0;
	- length = ADDR2EPS(addr)->length;

	- if (length != 0x1f) {
	+ if (!eps_64bit && length != 0x1f) {
	u_int8_t major, minor;

	- major = ADDR2EPS(addr)->major_version;
	- minor = ADDR2EPS(addr)->minor_version;
	+ major = eps->major_version;
	+ minor = eps->minor_version;

	/* SMBIOS v2.1 implementation might use 0x1e. */
	if (length == 0x1e && major == 2 && minor == 1)
	@@ -108,6 +148,11 @@
	device_set_driver(child, driver);
	bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length);
	device_set_desc(child, "System Management BIOS");
	+
	+ if (eps_64bit)
	+ pmap_unmapbios((vm_offset_t)eps3, 0x18);
	+ else
	+ pmap_unmapbios((vm_offset_t)eps, 0x1f);
	}

	return;
	@@ -129,7 +174,7 @@
	goto bad;
	}

	- if (smbios_cksum(RES2EPS(res))) {
	+ if (smbios_cksum(rman_get_virtual(res))) {
	device_printf(dev, "SMBIOS checksum failed.\n");
	error = ENXIO;
	goto bad;
	@@ -159,16 +204,24 @@
	error = ENOMEM;
	goto bad;
	}
	- sc->eps = RES2EPS(sc->res);
	-
	- device_printf(dev, "Version: %u.%u",
	- sc->eps->major_version, sc->eps->minor_version);
	- if (bcd2bin(sc->eps->BCD_revision))
	- printf(", BCD Revision: %u.%u",
	- bcd2bin(sc->eps->BCD_revision >> 4),
	- bcd2bin(sc->eps->BCD_revision & 0x0f));
	+ sc->eps_64bit = smbios_eps_64bit(rman_get_virtual(sc->res));
	+
	+ if (sc->eps_64bit) {
	+ sc->eps3 = RES2EPS3(sc->res);
	+ device_printf(dev, "Version: %u.%u",
	+ sc->eps3->major_version, sc->eps3->minor_version);
	+ } else {
	+ sc->eps = RES2EPS(sc->res);
	+ device_printf(dev, "Version: %u.%u",
	+ sc->eps->major_version, sc->eps->minor_version);
	+ if (bcd2bin(sc->eps->BCD_revision))
	+ printf(", BCD Revision: %u.%u",
	+ bcd2bin(sc->eps->BCD_revision >> 4),
	+ bcd2bin(sc->eps->BCD_revision & 0x0f));
	+ }
	printf("\n");

	+ smbios = sc;
	return (0);
	bad:
	if (sc->res)
	@@ -181,6 +234,7 @@
	{
	struct smbios_softc *sc;

	+ smbios = NULL;
	sc = device_get_softc(dev);

	if (sc->res)
	@@ -189,6 +243,23 @@
	return (0);
	}

	+int
	+smbios_get_structure_table(vm_paddr_t table, vm_size_t size)
	+{
	+
	+ if (smbios == NULL)
	+ return (ENXIO);
	+ if (smbios->eps_64bit) {
	+ *table = smbios->eps3->structure_table_address;
	+ *size = smbios->eps3->structure_table_max_size;
	+ } else {
	+ *table = smbios->eps->structure_table_address;
	+ *size = smbios->eps->structure_table_length;
	+ }
	+ return (0);
	+}
	+
	+
	static int
	smbios_modevent (mod, what, arg)
	module_t mod;
	@@ -234,16 +305,35 @@
	DRIVER_MODULE(smbios, nexus, smbios_driver, smbios_devclass, smbios_modevent, 0);
	MODULE_VERSION(smbios, 1);

	+static bool
	+smbios_eps_64bit (void *v)
	+{
	+ struct smbios3_eps *e;
	+
	+ e = (struct smbios3_eps *)v;
	+ return (memcmp(e->anchor_string, SMBIOS3_SIG, SMBIOS3_LEN) == 0);
	+}
	+
	static int
	-smbios_cksum (struct smbios_eps *e)
	+smbios_cksum (void *v)
	{
	+ struct smbios3_eps *eps3;
	+ struct smbios_eps *eps;
	u_int8_t *ptr;
	u_int8_t cksum;
	+ u_int8_t length;
	int i;

	- ptr = (u_int8_t *)e;
	+ if (smbios_eps_64bit(v)) {
	+ eps3 = (struct smbios3_eps *)v;
	+ length = eps3->length;
	+ } else {
	+ eps = (struct smbios_eps *)v;
	+ length = eps->length;
	+ }
	+ ptr = (u_int8_t *)v;
	cksum = 0;
	- for (i = 0; i < e->length; i++) {
	+ for (i = 0; i < length; i++) {
	cksum += ptr[i];
	}

	Index: sys/i386/conf/GENERIC
	===================================================================
	--- sys/i386/conf/GENERIC
	+++ sys/i386/conf/GENERIC
	@@ -115,6 +115,7 @@

	# Bus support.
	device acpi
	+device smbios
	device pci
	options PCI_HP # PCI-Express native HotPlug
	options PCI_IOV # PCI SR-IOV support
	Index: sys/i386/conf/MINIMAL
	===================================================================
	--- sys/i386/conf/MINIMAL
	+++ sys/i386/conf/MINIMAL
	@@ -104,6 +104,7 @@

	# Bus support.
	device acpi
	+device smbios
	device pci

	# atkbdc0 controls both the keyboard and the PS/2 mouse
	Index: sys/i386/include/pc/bios.h
	===================================================================
	--- sys/i386/include/pc/bios.h
	+++ sys/i386/include/pc/bios.h
	@@ -234,38 +234,6 @@
	u_int32_t xattr;
	} __packed;

	-/*
	- * System Management BIOS
	- */
	-#define SMBIOS_START 0xf0000
	-#define SMBIOS_STEP 0x10
	-#define SMBIOS_OFF 0
	-#define SMBIOS_LEN 4
	-#define SMBIOS_SIG "_SM_"
	-
	-struct smbios_eps {
	- uint8_t anchor_string[4]; /* '_SM_' */
	- uint8_t checksum;
	- uint8_t length;
	- uint8_t major_version;
	- uint8_t minor_version;
	- uint16_t maximum_structure_size;
	- uint8_t entry_point_revision;
	- uint8_t formatted_area[5];
	- uint8_t intermediate_anchor_string[5]; /* '_DMI_' */
	- uint8_t intermediate_checksum;
	- uint16_t structure_table_length;
	- uint32_t structure_table_address;
	- uint16_t number_structures;
	- uint8_t BCD_revision;
	-};
	-
	-struct smbios_structure_header {
	- uint8_t type;
	- uint8_t length;
	- uint16_t handle;
	-};
	-
	#ifdef _KERNEL
	#define BIOS_PADDRTOVADDR(x) ((x) + PMAP_MAP_LOW)
	#define BIOS_VADDRTOPADDR(x) ((x) - PMAP_MAP_LOW)
	Index: sys/kern/kern_fork.c
	===================================================================
	--- sys/kern/kern_fork.c
	+++ sys/kern/kern_fork.c
	@@ -1126,6 +1126,12 @@
	PROC_UNLOCK(p);
	}

	+ /*
	+ * If the prison was killed mid-fork, die along with it.
	+ */
	+ if (!prison_isalive(td->td_ucred->cr_prison))
	+ exit1(td, 0, SIGKILL);
	+
	userret(td, frame);

	#ifdef KTRACE
	Index: sys/kern/kern_jail.c
	===================================================================
	--- sys/kern/kern_jail.c
	+++ sys/kern/kern_jail.c
	@@ -1764,6 +1764,7 @@
	}
	}
	pr->pr_flags = (pr->pr_flags & ~ch_flags) \| pr_flags;
	+ pr->pr_flags &= ~PR_REMOVE;
	mtx_unlock(&pr->pr_mtx);
	drflags &= ~PD_LOCKED;

	@@ -2368,6 +2369,12 @@

	drflags = PD_DEREF \| PD_LOCKED \| PD_LIST_XLOCKED;

	+ /*
	+ * Mark the prison as doomed, so it doesn't accidentally come back
	+ * to life. It may still be explicitly brought back by jail_set(2).
	+ */
	+ pr->pr_flags \|= PR_REMOVE;
	+
	/* If the prison was persistent, it is not anymore. */
	if (pr->pr_flags & PR_PERSIST) {
	refcount_release(&pr->pr_ref);
	@@ -2508,6 +2515,17 @@
	#endif
	prison_deref(oldcred->cr_prison, PD_DEREF \| PD_DEUREF);
	crfree(oldcred);
	+
	+ /*
	+ * If the prison was killed while changing credentials, die along
	+ * with it.
	+ */
	+ if (!prison_isalive(pr)) {
	+ PROC_LOCK(p);
	+ kern_psignal(p, SIGKILL);
	+ PROC_UNLOCK(p);
	+ }
	+
	return (0);

	e_unlock:
	@@ -3038,17 +3056,18 @@

	/*
	* Return true if the prison is currently alive. A prison is alive if it is
	- * valid and it holds user references.
	+ * valid and holds user references, and it isn't being removed.
	*/
	bool
	prison_isalive(struct prison *pr)
	{

	- mtx_assert(&pr->pr_mtx, MA_OWNED);
	if (__predict_false(refcount_load(&pr->pr_ref) == 0))
	return (false);
	if (__predict_false(refcount_load(&pr->pr_uref) == 0))
	return (false);
	+ if (__predict_false(pr->pr_flags & PR_REMOVE))
	+ return (false);
	return (true);
	}

	@@ -3061,7 +3080,6 @@
	prison_isvalid(struct prison *pr)
	{

	- mtx_assert(&pr->pr_mtx, MA_OWNED);
	if (__predict_false(refcount_load(&pr->pr_ref) == 0))
	return (false);
	return (true);
	Index: sys/modules/bios/smbios/Makefile
	===================================================================
	--- sys/modules/bios/smbios/Makefile
	+++ sys/modules/bios/smbios/Makefile
	@@ -1,7 +1,7 @@
	# $FreeBSD$
	#

	-.PATH: ${SRCTOP}/sys/x86/bios
	+.PATH: ${SRCTOP}/sys/dev/smbios

	KMOD= smbios
	SRCS= smbios.c \
	Index: sys/modules/ipmi/Makefile
	===================================================================
	--- sys/modules/ipmi/Makefile
	+++ sys/modules/ipmi/Makefile
	@@ -14,12 +14,17 @@
	SRCS+= ipmi_acpi.c
	SRCS+= opt_acpi.h
	SRCS+= acpi_if.h
	+SRCS+= ipmi_smbios.c
	+SRCS+= ipmi_ssif.c
	+SRCS+= ipmi_pci.c
	+SRCS+= ipmi_smbus.c
	+SRCS+= pci_if.h
	+SRCS+= smbus_if.h
	.endif

	.if ${MACHINE_CPUARCH} == "i386" \|\| ${MACHINE_CPUARCH} == "amd64"
	-SRCS+= ipmi_smbios.c ipmi_ssif.c
	-SRCS+= ipmi_isa.c ipmi_pci.c ipmi_smbus.c
	-SRCS+= isa_if.h pci_if.h smbus_if.h
	+SRCS+= ipmi_isa.c
	+SRCS+= isa_if.h

	SUBDIR+= ipmi_linux

	Index: sys/net/if.c
	===================================================================
	--- sys/net/if.c
	+++ sys/net/if.c
	@@ -1857,8 +1857,18 @@
	void
	ifa_ref(struct ifaddr *ifa)
	{
	+ u_int old;

	- refcount_acquire(&ifa->ifa_refcnt);
	+ old = refcount_acquire(&ifa->ifa_refcnt);
	+ KASSERT(old > 0, ("%s: ifa %p has 0 refs", __func__, ifa));
	+}
	+
	+int
	+ifa_try_ref(struct ifaddr *ifa)
	+{
	+
	+ NET_EPOCH_ASSERT();
	+ return (refcount_acquire_if_not_zero(&ifa->ifa_refcnt));
	}

	static void
	Index: sys/net/if_var.h
	===================================================================
	--- sys/net/if_var.h
	+++ sys/net/if_var.h
	@@ -577,6 +577,7 @@
	struct ifaddr * ifa_alloc(size_t size, int flags);
	void ifa_free(struct ifaddr *ifa);
	void ifa_ref(struct ifaddr *ifa);
	+int ifa_try_ref(struct ifaddr *ifa);

	/*
	* Multicast address structure. This is analogous to the ifaddr
	Index: sys/net/rtsock.c
	===================================================================
	--- sys/net/rtsock.c
	+++ sys/net/rtsock.c
	@@ -70,6 +70,7 @@
	#include <netinet/if_ether.h>
	#include <netinet/ip_carp.h>
	#ifdef INET6
	+#include <netinet6/in6_var.h>
	#include <netinet6/ip6_var.h>
	#include <netinet6/scope6_var.h>
	#endif
	@@ -173,6 +174,7 @@
	struct walkarg w, int plen);
	static int rt_xaddrs(caddr_t cp, caddr_t cplim,
	struct rt_addrinfo *rtinfo);
	+static int cleanup_xaddrs(struct rt_addrinfo *info);
	static int sysctl_dumpentry(struct rtentry rt, void vw);
	static int sysctl_dumpnhop(struct rtentry rt, struct nhop_object nh,
	uint32_t weight, struct walkarg *w);
	@@ -636,11 +638,9 @@
	return (EINVAL);

	info->rti_flags = rtm->rtm_flags;
	- if (info->rti_info[RTAX_DST] == NULL \|\|
	- info->rti_info[RTAX_DST]->sa_family >= AF_MAX \|\|
	- (info->rti_info[RTAX_GATEWAY] != NULL &&
	- info->rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX))
	- return (EINVAL);
	+ error = cleanup_xaddrs(info);
	+ if (error != 0)
	+ return (error);
	saf = info->rti_info[RTAX_DST]->sa_family;
	/*
	* Verify that the caller has the appropriate privilege; RTM_GET
	@@ -739,7 +739,14 @@

	RIB_RLOCK(rnh);

	- if (info->rti_info[RTAX_NETMASK] == NULL) {
	+ /*
	+ * By (implicit) convention host route (one without netmask)
	+ * means longest-prefix-match request and the route with netmask
	+ * means exact-match lookup.
	+ * As cleanup_xaddrs() cleans up info flags&addrs for the /32,/128
	+ * prefixes, use original data to check for the netmask presence.
	+ */
	+ if ((rtm->rtm_addrs & RTA_NETMASK) == 0) {
	/*
	* Provide longest prefix match for
	* address lookup (no mask).
	@@ -1286,6 +1293,188 @@
	return (0);
	}

	+static inline void
	+fill_sockaddr_inet(struct sockaddr_in *sin, struct in_addr addr)
	+{
	+
	+ const struct sockaddr_in nsin = {
	+ .sin_family = AF_INET,
	+ .sin_len = sizeof(struct sockaddr_in),
	+ .sin_addr = addr,
	+ };
	+ *sin = nsin;
	+}
	+
	+static inline void
	+fill_sockaddr_inet6(struct sockaddr_in6 sin6, const struct in6_addr addr6,
	+ uint32_t scopeid)
	+{
	+
	+ const struct sockaddr_in6 nsin6 = {
	+ .sin6_family = AF_INET6,
	+ .sin6_len = sizeof(struct sockaddr_in6),
	+ .sin6_addr = *addr6,
	+ .sin6_scope_id = scopeid,
	+ };
	+ *sin6 = nsin6;
	+}
	+
	+static int
	+cleanup_xaddrs_gateway(struct rt_addrinfo *info)
	+{
	+ struct sockaddr *gw = info->rti_info[RTAX_GATEWAY];
	+
	+ switch (gw->sa_family) {
	+#ifdef INET
	+ case AF_INET:
	+ {
	+ struct sockaddr_in gw_sin = (struct sockaddr_in )gw;
	+ if (gw_sin->sin_len < sizeof(struct sockaddr_in)) {
	+ printf("gw sin_len too small\n");
	+ return (EINVAL);
	+ }
	+ fill_sockaddr_inet(gw_sin, gw_sin->sin_addr);
	+ }
	+ break;
	+#endif
	+#ifdef INET6
	+ case AF_INET6:
	+ {
	+ struct sockaddr_in6 gw_sin6 = (struct sockaddr_in6 )gw;
	+ if (gw_sin6->sin6_len < sizeof(struct sockaddr_in6)) {
	+ printf("gw sin6_len too small\n");
	+ return (EINVAL);
	+ }
	+ fill_sockaddr_inet6(gw_sin6, &gw_sin6->sin6_addr, 0);
	+ break;
	+ }
	+#endif
	+ case AF_LINK:
	+ {
	+ struct sockaddr_dl_short *gw_sdl;
	+
	+ gw_sdl = (struct sockaddr_dl_short *)gw;
	+ if (gw_sdl->sdl_len < sizeof(struct sockaddr_dl_short)) {
	+ printf("gw sdl_len too small\n");
	+ return (EINVAL);
	+ }
	+
	+ const struct sockaddr_dl_short sdl = {
	+ .sdl_family = AF_LINK,
	+ .sdl_len = sizeof(struct sockaddr_dl_short),
	+ .sdl_index = gw_sdl->sdl_index,
	+ };
	+ *gw_sdl = sdl;
	+ break;
	+ }
	+ }
	+
	+ return (0);
	+}
	+
	+static int
	+cleanup_xaddrs_inet(struct rt_addrinfo *info)
	+{
	+ struct sockaddr_in dst_sa, mask_sa;
	+
	+ /* Check & fixup dst/netmask combination first */
	+ dst_sa = (struct sockaddr_in *)info->rti_info[RTAX_DST];
	+ mask_sa = (struct sockaddr_in *)info->rti_info[RTAX_NETMASK];
	+
	+ struct in_addr mask = {
	+ .s_addr = mask_sa ? mask_sa->sin_addr.s_addr : INADDR_BROADCAST,
	+ };
	+ struct in_addr dst = {
	+ .s_addr = htonl(ntohl(dst_sa->sin_addr.s_addr) & ntohl(mask.s_addr))
	+ };
	+
	+ if (dst_sa->sin_len < sizeof(struct sockaddr_in)) {
	+ printf("dst sin_len too small\n");
	+ return (EINVAL);
	+ }
	+ if (mask_sa && mask_sa->sin_len < sizeof(struct sockaddr_in)) {
	+ printf("mask sin_len too small\n");
	+ return (EINVAL);
	+ }
	+ fill_sockaddr_inet(dst_sa, dst);
	+
	+ if (mask.s_addr != INADDR_BROADCAST)
	+ fill_sockaddr_inet(mask_sa, mask);
	+ else {
	+ info->rti_info[RTAX_NETMASK] = NULL;
	+ info->rti_flags \|= RTF_HOST;
	+ info->rti_addrs &= ~RTA_NETMASK;
	+ }
	+
	+ /* Check gateway */
	+ if (info->rti_info[RTAX_GATEWAY] != NULL)
	+ return (cleanup_xaddrs_gateway(info));
	+
	+ return (0);
	+}
	+
	+static int
	+cleanup_xaddrs_inet6(struct rt_addrinfo *info)
	+{
	+ struct sockaddr_in6 dst_sa, mask_sa;
	+ struct in6_addr mask;
	+
	+ /* Check & fixup dst/netmask combination first */
	+ dst_sa = (struct sockaddr_in6 *)info->rti_info[RTAX_DST];
	+ mask_sa = (struct sockaddr_in6 *)info->rti_info[RTAX_NETMASK];
	+
	+ mask = mask_sa ? mask_sa->sin6_addr : in6mask128;
	+ IN6_MASK_ADDR(&dst_sa->sin6_addr, &mask);
	+
	+ if (dst_sa->sin6_len < sizeof(struct sockaddr_in6)) {
	+ printf("dst sin6_len too small\n");
	+ return (EINVAL);
	+ }
	+ if (mask_sa && mask_sa->sin6_len < sizeof(struct sockaddr_in6)) {
	+ printf("mask sin6_len too small\n");
	+ return (EINVAL);
	+ }
	+ fill_sockaddr_inet6(dst_sa, &dst_sa->sin6_addr, 0);
	+
	+ if (!IN6_ARE_ADDR_EQUAL(&mask, &in6mask128))
	+ fill_sockaddr_inet6(mask_sa, &mask, 0);
	+ else {
	+ info->rti_info[RTAX_NETMASK] = NULL;
	+ info->rti_flags \|= RTF_HOST;
	+ info->rti_addrs &= ~RTA_NETMASK;
	+ }
	+
	+ /* Check gateway */
	+ if (info->rti_info[RTAX_GATEWAY] != NULL)
	+ return (cleanup_xaddrs_gateway(info));
	+
	+ return (0);
	+}
	+
	+static int
	+cleanup_xaddrs(struct rt_addrinfo *info)
	+{
	+ int error = EAFNOSUPPORT;
	+
	+ if (info->rti_info[RTAX_DST] == NULL)
	+ return (EINVAL);
	+
	+ switch (info->rti_info[RTAX_DST]->sa_family) {
	+#ifdef INET
	+ case AF_INET:
	+ error = cleanup_xaddrs_inet(info);
	+ break;
	+#endif
	+#ifdef INET6
	+ case AF_INET6:
	+ error = cleanup_xaddrs_inet6(info);
	+ break;
	+#endif
	+ }
	+
	+ return (error);
	+}
	+
	/*
	* Fill in @dmask with valid netmask leaving original @smask
	* intact. Mostly used with radix netmasks.
	Index: sys/netinet/in.c
	===================================================================
	--- sys/netinet/in.c
	+++ sys/netinet/in.c
	@@ -163,18 +163,23 @@
	* the supplied one but with same IP address value.
	*/
	static struct in_ifaddr *
	-in_localip_more(struct in_ifaddr *ia)
	+in_localip_more(struct in_ifaddr *original_ia)
	{
	struct rm_priotracker in_ifa_tracker;
	- in_addr_t in = IA_SIN(ia)->sin_addr.s_addr;
	- struct in_ifaddr *it;
	+ in_addr_t original_addr = IA_SIN(original_ia)->sin_addr.s_addr;
	+ uint32_t original_fib = original_ia->ia_ifa.ifa_ifp->if_fib;
	+ struct in_ifaddr *ia;

	IN_IFADDR_RLOCK(&in_ifa_tracker);
	- LIST_FOREACH(it, INADDR_HASH(in), ia_hash) {
	- if (it != ia && IA_SIN(it)->sin_addr.s_addr == in) {
	- ifa_ref(&it->ia_ifa);
	+ LIST_FOREACH(ia, INADDR_HASH(original_addr), ia_hash) {
	+ in_addr_t addr = IA_SIN(ia)->sin_addr.s_addr;
	+ uint32_t fib = ia->ia_ifa.ifa_ifp->if_fib;
	+ if (!V_rt_add_addr_allfibs && (original_fib != fib))
	+ continue;
	+ if ((original_ia != ia) && (original_addr == addr)) {
	+ ifa_ref(&ia->ia_ifa);
	IN_IFADDR_RUNLOCK(&in_ifa_tracker);
	- return (it);
	+ return (ia);
	}
	}
	IN_IFADDR_RUNLOCK(&in_ifa_tracker);
	@@ -1007,11 +1012,6 @@
	if (ia_need_loopback_route(target) && (flags & LLE_STATIC)) {
	struct in_ifaddr *eia;

	- /*
	- * XXXME: add fib-aware in_localip.
	- * We definitely don't want to switch between
	- * prefixes in different fibs.
	- */
	eia = in_localip_more(target);

	if (eia != NULL) {
	Index: sys/sys/jail.h
	===================================================================
	--- sys/sys/jail.h
	+++ sys/sys/jail.h
	@@ -216,6 +216,7 @@
	/* primary jail address. */

	/* Internal flag bits */
	+#define PR_REMOVE 0x01000000 /* In process of being removed */
	#define PR_IP4 0x02000000 /* IPv4 restricted or disabled */
	/* by this jail or an ancestor */
	#define PR_IP6 0x04000000 /* IPv6 restricted or disabled */
	Index: tests/sys/net/routing/rtsock_common.h
	===================================================================
	--- tests/sys/net/routing/rtsock_common.h
	+++ tests/sys/net/routing/rtsock_common.h
	@@ -826,10 +826,6 @@
	}
	sa = (struct sockaddr )((char )sa + SA_SIZE(sa));
	}
	-
	- RTSOCK_ATF_REQUIRE_MSG((struct rt_msghdr *)buffer, parsed_len == rtm_len,
	- "message len != parsed len: expected %d parsed %d",
	- rtm_len, (int)parsed_len);
	}

	/*

File Metadata

Mime Type: text/plain
Expires: Sat, Nov 14, 7:28 PM (12 h, 59 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 41731279
Default Alt Text: D28707.1794684508.diff (37 KB)

D28707.1794684508.diffNo OneTemporaryActions

D28707.1794684508.diffView Options

File Metadata

Event Timeline

D28707.1794684508.diff
No OneTemporary
Actions

D28707.1794684508.diff
View Options