svn commit: r273372 - stable/10/share/man/man4
Author: mav Date: Tue Oct 21 06:23:14 2014 New Revision: 273372 URL: https://svnweb.freebsd.org/changeset/base/273372 Log: MFC r262294 (by ivoras): Explain how and where kern.cam.ada.write_cache can be set in practical situations. Modified: stable/10/share/man/man4/ada.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/ada.4 == --- stable/10/share/man/man4/ada.4 Tue Oct 21 05:45:57 2014 (r273371) +++ stable/10/share/man/man4/ada.4 Tue Oct 21 06:23:14 2014 (r273372) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 8, 2012 +.Dd February 21, 2014 .Dt ADA 4 .Os .Sh NAME @@ -129,8 +129,13 @@ The default is currently enabled. These variables determines whether device write cache should be enabled globally or per-device or disabled. Set to 1 to enable write cache, 0 to disable, -1 to leave it as-is. -Values modified in runtime take effect only after device reset. -The global default is currently enabled. +Values modified at runtime take effect only after device reset +.Pq using the reset subcommand of Xr camcontrol 8 . +Because of that, this setting should be changed in +.Pa /boot/loader.conf +instead of +.Pa /etc/sysctl.conf . +The global default is currently 1. The per-device default is to leave it as-is (follow global setting). .El .Sh FILES ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273373 - stable/10/share/man/man4
Author: mav Date: Tue Oct 21 06:24:15 2014 New Revision: 273373 URL: https://svnweb.freebsd.org/changeset/base/273373 Log: MFC r262332 (by ivoras): Grammar fix Modified: stable/10/share/man/man4/ada.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/ada.4 == --- stable/10/share/man/man4/ada.4 Tue Oct 21 06:23:14 2014 (r273372) +++ stable/10/share/man/man4/ada.4 Tue Oct 21 06:24:15 2014 (r273373) @@ -126,7 +126,7 @@ The default is currently enabled. .It Va kern.cam.ada.write_cache .It Va kern.cam.ada. Ns Ar X Ns Va .write_cache .Pp -These variables determines whether device write cache should be enabled +These variables determine whether device write cache should be enabled globally or per-device or disabled. Set to 1 to enable write cache, 0 to disable, -1 to leave it as-is. Values modified at runtime take effect only after device reset ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273374 - stable/10/share/man/man4
Author: mav Date: Tue Oct 21 06:25:41 2014 New Revision: 273374 URL: https://svnweb.freebsd.org/changeset/base/273374 Log: MFC r271926: Mention read_ahead tunables/sysctls. Modified: stable/10/share/man/man4/ada.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/ada.4 == --- stable/10/share/man/man4/ada.4 Tue Oct 21 06:24:15 2014 (r273373) +++ stable/10/share/man/man4/ada.4 Tue Oct 21 06:25:41 2014 (r273374) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 21, 2014 +.Dd September 21, 2014 .Dt ADA 4 .Os .Sh NAME @@ -123,11 +123,13 @@ seconds. This variable determines whether to spin-down disks when shutting down. Set to 1 to enable spin-down, 0 to disable. The default is currently enabled. +.It Va kern.cam.ada.read_ahead +.It Va kern.cam.ada. Ns Ar X Ns Va .read_ahead .It Va kern.cam.ada.write_cache .It Va kern.cam.ada. Ns Ar X Ns Va .write_cache .Pp -These variables determine whether device write cache should be enabled -globally or per-device or disabled. +These variables determine whether device read-ahead and write caches +should be enabled globally or per-device or disabled. Set to 1 to enable write cache, 0 to disable, -1 to leave it as-is. Values modified at runtime take effect only after device reset .Pq using the reset subcommand of Xr camcontrol 8 . ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273375 - in head: sys/amd64/include sys/amd64/vmm sys/amd64/vmm/amd sys/amd64/vmm/intel sys/amd64/vmm/io sys/modules/vmm usr.sbin/bhyve usr.sbin/bhyvectl
Author: neel
Date: Tue Oct 21 07:10:43 2014
New Revision: 273375
URL: https://svnweb.freebsd.org/changeset/base/273375
Log:
Merge projects/bhyve_svm into HEAD.
After this change bhyve supports AMD processors with the SVM/AMD-V hardware
extensions.
More details available here:
https://lists.freebsd.org/pipermail/freebsd-virtualization/2014-October/002905.html
Submitted by: Anish Gupta (akgu...@gmail.com)
Tested by:Benjamin Perrault (ben.perra...@gmail.com)
Tested by:Willem Jan Withagen (w...@digiware.nl)
Added:
- copied unchanged from r273369, projects/bhyve_svm/sys/amd64/vmm/amd/npt.c
- copied unchanged from r273369, projects/bhyve_svm/sys/amd64/vmm/amd/npt.h
- copied unchanged from r273369, projects/bhyve_svm/sys/amd64/vmm/amd/svm.c
- copied unchanged from r273369, projects/bhyve_svm/sys/amd64/vmm/amd/svm.h
- copied unchanged from r273369,
projects/bhyve_svm/sys/amd64/vmm/amd/svm_genassym.c
- copied unchanged from r273369,
projects/bhyve_svm/sys/amd64/vmm/amd/svm_msr.c
- copied unchanged from r273369,
projects/bhyve_svm/sys/amd64/vmm/amd/svm_msr.h
- copied unchanged from r273369,
projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h
- copied unchanged from r273369,
projects/bhyve_svm/sys/amd64/vmm/amd/svm_support.S
- copied unchanged from r273369,
projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c
- copied unchanged from r273369,
projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.h
Directory Properties:
head/sys/amd64/vmm/amd/npt.c (props changed)
head/sys/amd64/vmm/amd/npt.h (props changed)
head/sys/amd64/vmm/amd/svm.c (props changed)
head/sys/amd64/vmm/amd/svm.h (props changed)
head/sys/amd64/vmm/amd/svm_genassym.c (props changed)
head/sys/amd64/vmm/amd/svm_msr.c (props changed)
head/sys/amd64/vmm/amd/svm_msr.h (props changed)
head/sys/amd64/vmm/amd/svm_softc.h (props changed)
head/sys/amd64/vmm/amd/svm_support.S (props changed)
head/sys/amd64/vmm/amd/vmcb.c (props changed)
head/sys/amd64/vmm/amd/vmcb.h (props changed)
Modified:
head/sys/amd64/include/vmm.h
head/sys/amd64/include/vmm_instruction_emul.h
head/sys/amd64/vmm/amd/amdv.c
head/sys/amd64/vmm/intel/vmx.c
head/sys/amd64/vmm/io/vlapic.c
head/sys/amd64/vmm/vmm.c
head/sys/amd64/vmm/vmm_instruction_emul.c
head/sys/amd64/vmm/x86.c
head/sys/modules/vmm/Makefile
head/usr.sbin/bhyve/bhyverun.c
head/usr.sbin/bhyve/xmsr.c
head/usr.sbin/bhyvectl/bhyvectl.c
Modified: head/sys/amd64/include/vmm.h
==
--- head/sys/amd64/include/vmm.hTue Oct 21 06:25:41 2014
(r273374)
+++ head/sys/amd64/include/vmm.hTue Oct 21 07:10:43 2014
(r273375)
@@ -487,6 +487,7 @@ enum vm_exitcode {
VM_EXITCODE_TASK_SWITCH,
VM_EXITCODE_MONITOR,
VM_EXITCODE_MWAIT,
+ VM_EXITCODE_SVM,
VM_EXITCODE_MAX
};
@@ -564,6 +565,14 @@ struct vm_exit {
int inst_type;
int inst_error;
} vmx;
+ /*
+* SVM specific payload.
+*/
+ struct {
+ uint64_texitcode;
+ uint64_texitinfo1;
+ uint64_texitinfo2;
+ } svm;
struct {
uint32_tcode; /* ecx value */
uint64_twval;
Modified: head/sys/amd64/include/vmm_instruction_emul.h
==
--- head/sys/amd64/include/vmm_instruction_emul.h Tue Oct 21 06:25:41
2014(r273374)
+++ head/sys/amd64/include/vmm_instruction_emul.h Tue Oct 21 07:10:43
2014(r273375)
@@ -93,7 +93,7 @@ int vmm_fetch_instruction(struct vm *vm,
int vmm_gla2gpa(struct vm *vm, int vcpuid, struct vm_guest_paging *paging,
uint64_t gla, int prot, uint64_t *gpa);
-void vie_init(struct vie *vie);
+void vie_init(struct vie *vie, const char *inst_bytes, int inst_length);
/*
* Decode the instruction fetched into 'vie' so it can be emulated.
Modified: head/sys/amd64/vmm/amd/amdv.c
==
--- head/sys/amd64/vmm/amd/amdv.c Tue Oct 21 06:25:41 2014
(r273374)
+++ head/sys/amd64/vmm/amd/amdv.c Tue Oct 21 07:10:43 2014
(r273375)
@@ -38,149 +38,6 @@ __FBSDID($FreeBSD$);
#include io/iommu.h
static int
-amdv_init(int ipinum)
-{
-
- printf(amdv_init: not implemented\n);
- return (ENXIO);
-}
-
-static int
-amdv_cleanup(void)
-{
-
- printf(amdv_cleanup: not implemented\n);
- return (ENXIO);
-}
-
-static void
-amdv_resume(void)
-{
-}
-
-static void *
-amdv_vminit(struct vm *vm, struct pmap *pmap)
-{
-
- printf(amdv_vminit: not implemented\n);
- return
svn commit: r273376 - head/sys/dev/usb/controller
Author: kevlo
Date: Tue Oct 21 07:24:58 2014
New Revision: 273376
URL: https://svnweb.freebsd.org/changeset/base/273376
Log:
Add the Intel BayTrail USB device which needs port routing for USB 3.0.
Tested on the BayTrail E3845 platform.
Reviewed by: hselasky
Modified:
head/sys/dev/usb/controller/ehci_pci.c
head/sys/dev/usb/controller/xhci_pci.c
Modified: head/sys/dev/usb/controller/ehci_pci.c
==
--- head/sys/dev/usb/controller/ehci_pci.c Tue Oct 21 07:10:43 2014
(r273375)
+++ head/sys/dev/usb/controller/ehci_pci.c Tue Oct 21 07:24:58 2014
(r273376)
@@ -120,6 +120,8 @@ ehci_pci_match(device_t self)
case 0x43961002:
return (AMD SB7x0/SB8x0/SB9x0 USB 2.0 controller);
+ case 0x0f348086:
+ return (Intel BayTrail USB 2.0 controller);
case 0x1d268086:
return (Intel Patsburg USB 2.0 controller);
case 0x1d2d8086:
Modified: head/sys/dev/usb/controller/xhci_pci.c
==
--- head/sys/dev/usb/controller/xhci_pci.c Tue Oct 21 07:10:43 2014
(r273375)
+++ head/sys/dev/usb/controller/xhci_pci.c Tue Oct 21 07:24:58 2014
(r273376)
@@ -102,6 +102,8 @@ xhci_pci_match(device_t self)
case 0x10421b21:
return (ASMedia ASM1042 USB 3.0 controller);
+ case 0x0f358086:
+ return (Intel Intel BayTrail USB 3.0 controller);
case 0x9c318086:
case 0x1e318086:
return (Intel Panther Point USB 3.0 controller);
@@ -244,6 +246,7 @@ xhci_pci_attach(device_t self)
/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
switch (pci_get_devid(self)) {
+ case 0x0f358086:/* BayTrail */
case 0x9c318086:/* Panther Point */
case 0x1e318086:/* Panther Point */
case 0x8c318086:/* Lynx Point */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273377 - in head: share/man/man9 sys/amd64/amd64 sys/arm/arm sys/cam/scsi sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/dev/dtrace sys/compat/ndis sys/dev/acpi_support sys/de...
Author: hselasky Date: Tue Oct 21 07:31:21 2014 New Revision: 273377 URL: https://svnweb.freebsd.org/changeset/base/273377 Log: Fix multiple incorrect SYSCTL arguments in the kernel: - Wrong integer type was specified. - Wrong or missing access specifier. The access specifier sometimes included the SYSCTL type, which it should not, except for procedural SYSCTL nodes. - Logical OR where binary OR was expected. - Properly assert the access argument passed to all SYSCTL macros, using the CTASSERT macro. This applies to both static- and dynamically created SYSCTLs. - Properly assert the the data type for both static and dynamic SYSCTLs. In the case of static SYSCTLs we only assert that the data pointed to by the SYSCTL data pointer has the correct size, hence there is no easy way to assert types in the C language outside a C-function. - Rewrote some code which doesn't pass a constant access specifier when creating dynamic SYSCTL nodes, which is now a requirement. - Updated EXAMPLES section in SYSCTL manual page. MFC after:3 days Sponsored by: Mellanox Technologies Modified: head/share/man/man9/Makefile head/share/man/man9/sysctl.9 head/sys/amd64/amd64/fpu.c head/sys/arm/arm/busdma_machdep-v6.c head/sys/arm/arm/busdma_machdep.c head/sys/cam/scsi/scsi_sa.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c head/sys/cddl/dev/dtrace/dtrace_sysctl.c head/sys/compat/ndis/kern_ndis.c head/sys/dev/acpi_support/acpi_asus.c head/sys/dev/acpi_support/acpi_asus_wmi.c head/sys/dev/acpi_support/acpi_hp.c head/sys/dev/acpi_support/acpi_ibm.c head/sys/dev/acpi_support/acpi_rapidstart.c head/sys/dev/acpi_support/acpi_sony.c head/sys/dev/bxe/bxe.c head/sys/dev/cxgb/cxgb_sge.c head/sys/dev/cxgbe/t4_main.c head/sys/dev/e1000/if_em.c head/sys/dev/e1000/if_igb.c head/sys/dev/e1000/if_lem.c head/sys/dev/hatm/if_hatm.c head/sys/dev/ixgbe/ixgbe.c head/sys/dev/ixgbe/ixv.c head/sys/dev/ixl/if_ixl.c head/sys/dev/mpr/mpr.c head/sys/dev/mps/mps.c head/sys/dev/mrsas/mrsas.c head/sys/dev/mrsas/mrsas.h head/sys/dev/mxge/if_mxge.c head/sys/dev/oce/oce_sysctl.c head/sys/dev/qlxgb/qla_os.c head/sys/dev/qlxgbe/ql_os.c head/sys/dev/rt/if_rt.c head/sys/dev/sound/pci/hda/hdaa.c head/sys/dev/vxge/vxge.c head/sys/dev/xen/netfront/netfront.c head/sys/fs/devfs/devfs_devs.c head/sys/fs/fuse/fuse_main.c head/sys/fs/fuse/fuse_vfsops.c head/sys/geom/geom_kern.c head/sys/kern/kern_cpuset.c head/sys/kern/kern_descrip.c head/sys/kern/kern_mib.c head/sys/kern/kern_synch.c head/sys/kern/subr_devstat.c head/sys/kern/subr_kdb.c head/sys/kern/subr_uio.c head/sys/kern/vfs_cache.c head/sys/mips/mips/busdma_machdep.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_hwmp.c head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_superg.c head/sys/netgraph/bluetooth/common/ng_bluetooth.c head/sys/netgraph/ng_base.c head/sys/netgraph/ng_socket.c head/sys/netinet/cc/cc_chd.c head/sys/netinet/tcp_timer.c head/sys/netipsec/ipsec.h head/sys/netpfil/pf/pf.c head/sys/ofed/drivers/net/mlx4/mlx4_en.h head/sys/powerpc/powermac/fcu.c head/sys/powerpc/powermac/smu.c head/sys/powerpc/powerpc/cpu.c head/sys/sys/sysctl.h head/sys/vm/memguard.c head/sys/vm/vm_kern.c head/sys/x86/x86/busdma_bounce.c Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileTue Oct 21 07:24:58 2014 (r273376) +++ head/share/man/man9/MakefileTue Oct 21 07:31:21 2014 (r273377) @@ -1499,6 +1499,7 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \ sysctl.9 SYSCTL_ADD_ROOT_NODE.9 \ sysctl.9 SYSCTL_ADD_STRING.9 \ sysctl.9 SYSCTL_ADD_STRUCT.9 \ + sysctl.9 SYSCTL_ADD_UAUTO.9 \ sysctl.9 SYSCTL_ADD_UINT.9 \ sysctl.9 SYSCTL_ADD_ULONG.9 \ sysctl.9 SYSCTL_ADD_UQUAD.9 \ Modified: head/share/man/man9/sysctl.9 == --- head/share/man/man9/sysctl.9Tue Oct 21 07:24:58 2014 (r273376) +++ head/share/man/man9/sysctl.9Tue Oct 21 07:31:21 2014 (r273377) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd September 15, 2014 +.Dd October 20, 2014 .Dt SYSCTL 9 .Os .Sh NAME @@ -39,6 +39,7 @@ .Nm SYSCTL_ADD_ROOT_NODE , .Nm SYSCTL_ADD_STRING , .Nm SYSCTL_ADD_STRUCT , +.Nm SYSCTL_ADD_UAUTO , .Nm SYSCTL_ADD_UINT , .Nm SYSCTL_ADD_ULONG , .Nm SYSCTL_ADD_UQUAD , @@ -82,7 +83,6 @@ .Fa const char *name .Fa int ctlflags .Fa long *ptr -.Fa intptr_t val .Fa const char *descr .Fc .Ft struct sysctl_oid * @@ -128,7 +128,6 @@ .Fa const char *name .Fa int ctlflags .Fa quad_t *ptr -.Fa intptr_t val .Fa const char *descr .Fc .Ft struct sysctl_oid * @@ -181,7 +180,6 @@ .Fa const char *name .Fa int ctlflags .Fa unsigned long *ptr -.Fa
svn commit: r273378 - head/sys/sys
Author: hselasky Date: Tue Oct 21 07:49:34 2014 New Revision: 273378 URL: https://svnweb.freebsd.org/changeset/base/273378 Log: Fix minor typo in currently unused macro. MFC after:3 days Modified: head/sys/sys/sysctl.h Modified: head/sys/sys/sysctl.h == --- head/sys/sys/sysctl.h Tue Oct 21 07:31:21 2014(r273377) +++ head/sys/sys/sysctl.h Tue Oct 21 07:49:34 2014(r273378) @@ -378,7 +378,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_e }) /* Oid for a quad. The pointer must be non NULL. */ -#defineSYSCTL_NULL_QUAD_PTR ((int64_T *)NULL) +#defineSYSCTL_NULL_QUAD_PTR ((int64_t *)NULL) #defineSYSCTL_QUAD(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_S64 | CTLFLAG_MPSAFE | (access),\ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273274 - head/sys/netpfil/ipfw
On 19 Oct 2014, at 13:02, Andriy Gapon a...@freebsd.org wrote: I think that on platforms where an optimized version of fls() is available that would work faster than this cool piece of bit magic. If you're lucky, the compiler's idiom recogniser will spot this. You're generally better off using the builtins though, because then the compiler will expand them to something sensible (hopefully - old versions of gcc did horribly inefficient things for bswap and clz on platforms without native support). David ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273379 - in stable/10/sys/ofed: drivers/net/mlx4 include/linux/mlx4
Author: hselasky Date: Tue Oct 21 08:24:12 2014 New Revision: 273379 URL: https://svnweb.freebsd.org/changeset/base/273379 Log: MFC r272683: - Fix compile warning when compiling with GCC. - Add missed chunk in previous driver code MFC. Sponsored by: Mellanox Technologies Modified: stable/10/sys/ofed/drivers/net/mlx4/en_tx.c stable/10/sys/ofed/drivers/net/mlx4/mlx4.h stable/10/sys/ofed/include/linux/mlx4/device.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/ofed/drivers/net/mlx4/en_tx.c == --- stable/10/sys/ofed/drivers/net/mlx4/en_tx.c Tue Oct 21 07:49:34 2014 (r273378) +++ stable/10/sys/ofed/drivers/net/mlx4/en_tx.c Tue Oct 21 08:24:12 2014 (r273379) @@ -1028,9 +1028,6 @@ mlx4_en_transmit_locked(struct ifnet *de } drbr_advance(dev, ring-br); enqueued++; - dev-if_obytes += next-m_pkthdr.len; - if (next-m_flags M_MCAST) - dev-if_omcasts++; if ((dev-if_drv_flags IFF_DRV_RUNNING) == 0) break; } Modified: stable/10/sys/ofed/drivers/net/mlx4/mlx4.h == --- stable/10/sys/ofed/drivers/net/mlx4/mlx4.h Tue Oct 21 07:49:34 2014 (r273378) +++ stable/10/sys/ofed/drivers/net/mlx4/mlx4.h Tue Oct 21 08:24:12 2014 (r273379) @@ -1234,6 +1234,7 @@ int mlx4_trans_to_dmfs_attach(struct mlx u8 gid[16], u8 port, int block_mcast_loopback, enum mlx4_protocol prot, u64 *reg_id); +int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode); int mlx4_SET_MCAST_FLTR_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr, struct mlx4_cmd_mailbox *inbox, Modified: stable/10/sys/ofed/include/linux/mlx4/device.h == --- stable/10/sys/ofed/include/linux/mlx4/device.h Tue Oct 21 07:49:34 2014(r273378) +++ stable/10/sys/ofed/include/linux/mlx4/device.h Tue Oct 21 08:24:12 2014(r273379) @@ -1210,7 +1210,6 @@ int mlx4_multicast_promisc_add(struct ml int mlx4_multicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port); int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port); int mlx4_unicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port); -int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode); int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac); void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273380 - in head/sys: arm/altera/socfpga arm/conf boot/fdt/dts/arm dev/mii
Author: br
Date: Tue Oct 21 09:14:16 2014
New Revision: 273380
URL: https://svnweb.freebsd.org/changeset/base/273380
Log:
Add driver for Micrel KSZ9021 Gigabit Ethernet Transceiver (PHY).
Sponsored by: DARPA, AFRL
Added:
head/sys/dev/mii/micphy.c (contents, props changed)
Modified:
head/sys/arm/altera/socfpga/files.socfpga
head/sys/arm/conf/SOCKIT
head/sys/arm/conf/SOCKIT-BERI
head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts
head/sys/boot/fdt/dts/arm/socfpga-sockit.dts
head/sys/dev/mii/miidevs
Modified: head/sys/arm/altera/socfpga/files.socfpga
==
--- head/sys/arm/altera/socfpga/files.socfpga Tue Oct 21 08:24:12 2014
(r273379)
+++ head/sys/arm/altera/socfpga/files.socfpga Tue Oct 21 09:14:16 2014
(r273380)
@@ -20,5 +20,6 @@ arm/altera/socfpga/socfpga_rstmgr.c sta
arm/altera/socfpga/socfpga_mp.coptional smp
dev/dwc/if_dwc.c optional dwc
+dev/mii/micphy.c optional micphy
dev/mmc/host/dwmmc.c optional dwmmc
dev/beri/beri_ring.c optional beri_ring
Modified: head/sys/arm/conf/SOCKIT
==
--- head/sys/arm/conf/SOCKITTue Oct 21 08:24:12 2014(r273379)
+++ head/sys/arm/conf/SOCKITTue Oct 21 09:14:16 2014(r273380)
@@ -125,6 +125,7 @@ device mii
device smsc
device smscphy
device dwc
+device micphy
# USB ethernet support, requires miibus
device miibus
Modified: head/sys/arm/conf/SOCKIT-BERI
==
--- head/sys/arm/conf/SOCKIT-BERI Tue Oct 21 08:24:12 2014
(r273379)
+++ head/sys/arm/conf/SOCKIT-BERI Tue Oct 21 09:14:16 2014
(r273380)
@@ -128,6 +128,7 @@ device mii
device smsc
device smscphy
device dwc
+device micphy
# USB ethernet support, requires miibus
device miibus
Modified: head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts
==
--- head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts Tue Oct 21 08:24:12
2014(r273379)
+++ head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts Tue Oct 21 09:14:16
2014(r273380)
@@ -57,6 +57,15 @@
gmac1: ethernet@ff702000 {
status = okay;
+
+ rxd0-skew-ps = 0;
+ rxd1-skew-ps = 0;
+ rxd2-skew-ps = 0;
+ rxd3-skew-ps = 0;
+ txen-skew-ps = 0;
+ txc-skew-ps = 2600;
+ rxdv-skew-ps = 0;
+ rxc-skew-ps = 2000;
};
mmc: dwmmc@ff704000 {
@@ -69,7 +78,7 @@
slot@0 {
reg = 0;
bus-width = 4;
- };
+ };
};
beri_debug: ring@c000 {
Modified: head/sys/boot/fdt/dts/arm/socfpga-sockit.dts
==
--- head/sys/boot/fdt/dts/arm/socfpga-sockit.dtsTue Oct 21 08:24:12
2014(r273379)
+++ head/sys/boot/fdt/dts/arm/socfpga-sockit.dtsTue Oct 21 09:14:16
2014(r273380)
@@ -57,6 +57,15 @@
gmac1: ethernet@ff702000 {
status = okay;
+
+ rxd0-skew-ps = 0;
+ rxd1-skew-ps = 0;
+ rxd2-skew-ps = 0;
+ rxd3-skew-ps = 0;
+ txen-skew-ps = 0;
+ txc-skew-ps = 2600;
+ rxdv-skew-ps = 0;
+ rxc-skew-ps = 2000;
};
mmc: dwmmc@ff704000 {
@@ -69,7 +78,7 @@
slot@0 {
reg = 0;
bus-width = 4;
- };
+ };
};
};
Added: head/sys/dev/mii/micphy.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/mii/micphy.c Tue Oct 21 09:14:16 2014(r273380)
@@ -0,0 +1,215 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin b...@bsdpad.com
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * (CTSRD), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or
svn commit: r273381 - in head: contrib/libcxxrt lib/libcxxrt
Author: bapt
Date: Tue Oct 21 10:19:45 2014
New Revision: 273381
URL: https://svnweb.freebsd.org/changeset/base/273381
Log:
Add support for __cxa_throw_bad_array_new_length in libcxxrt
It is required for use with newer g++49
Differential Revision:https://reviews.freebsd.org/D982
Reviewed by: theraven
Approved by: theraven
MFC after:3 weeks
Modified:
head/contrib/libcxxrt/auxhelper.cc
head/contrib/libcxxrt/stdexcept.cc
head/contrib/libcxxrt/stdexcept.h
head/lib/libcxxrt/Version.map
Modified: head/contrib/libcxxrt/auxhelper.cc
==
--- head/contrib/libcxxrt/auxhelper.cc Tue Oct 21 09:14:16 2014
(r273380)
+++ head/contrib/libcxxrt/auxhelper.cc Tue Oct 21 10:19:45 2014
(r273381)
@@ -75,3 +75,8 @@ extern C void __cxa_deleted_virtual()
{
abort();
}
+
+extern C void __cxa_throw_bad_array_new_length()
+{
+ throw std::bad_array_new_length();
+}
Modified: head/contrib/libcxxrt/stdexcept.cc
==
--- head/contrib/libcxxrt/stdexcept.cc Tue Oct 21 09:14:16 2014
(r273380)
+++ head/contrib/libcxxrt/stdexcept.cc Tue Oct 21 10:19:45 2014
(r273381)
@@ -82,5 +82,13 @@ const char* bad_typeid::what() const thr
return std::bad_typeid;
}
+bad_array_new_length::bad_array_new_length() throw() {}
+bad_array_new_length::~bad_array_new_length() {}
+bad_array_new_length::bad_array_new_length(const bad_array_new_length)
throw() {}
+bad_array_new_length bad_array_new_length::operator=(const
bad_array_new_length) throw()
+{
+ return *this;
+}
+
} // namespace std
Modified: head/contrib/libcxxrt/stdexcept.h
==
--- head/contrib/libcxxrt/stdexcept.h Tue Oct 21 09:14:16 2014
(r273380)
+++ head/contrib/libcxxrt/stdexcept.h Tue Oct 21 10:19:45 2014
(r273381)
@@ -81,6 +81,15 @@ namespace std
virtual const char* what() const throw();
};
+ class bad_array_new_length: public exception
+ {
+ public:
+ bad_array_new_length() throw();
+ bad_array_new_length(const bad_array_new_length) throw();
+ bad_array_new_length operator=(const bad_array_new_length)
throw();
+ virtual ~bad_array_new_length();
+ virtual const char *what() const throw();
+ };
} // namespace std
Modified: head/lib/libcxxrt/Version.map
==
--- head/lib/libcxxrt/Version.map Tue Oct 21 09:14:16 2014
(r273380)
+++ head/lib/libcxxrt/Version.map Tue Oct 21 10:19:45 2014
(r273381)
@@ -26,6 +26,7 @@ CXXABI_1.3 {
__cxa_pure_virtual;
__cxa_rethrow;
__cxa_throw;
+__cxa_throw_bad_array_new_length;
__cxa_type_match;
__cxa_vec_cctor;
__cxa_vec_cleanup;
@@ -273,6 +274,9 @@ CXXRT_1.0 {
std::bad_alloc::bad_alloc(std::bad_alloc const);
std::bad_alloc::bad_alloc();
std::bad_alloc::operator=(std::bad_alloc const);
+
std::bad_array_new_length::bad_array_new_length(std::bad_array_new_length
const);
+std::bad_array_new_length::bad_array_new_length();
+std::bad_array_new_length::operator=(std::bad_array_new_length
const);
};
__cxa_allocate_dependent_exception;
@@ -307,6 +311,7 @@ GLIBCXX_3.4 {
std::bad_typeid::~bad_typeid();
std::exception::~exception();
std::bad_alloc::~bad_alloc();
+std::bad_array_new_length::~bad_array_new_length();
std::exception::what() const;
@@ -320,17 +325,20 @@ GLIBCXX_3.4 {
vtable for std::bad_typeid;
vtable for std::exception;
vtable for std::type_info;
+vtable for std::bad_array_new_length;
typeinfo for std::bad_alloc;
typeinfo for std::bad_typeid;
typeinfo for std::bad_cast;
typeinfo for std::exception;
typeinfo for std::type_info;
+typeinfo for std::bad_array_new_length;
typeinfo name for std::bad_alloc;
typeinfo name for std::bad_typeid;
typeinfo name for std::bad_cast;
typeinfo name for std::exception;
typeinfo name for std::type_info;
+typeinfo name for std::bad_array_new_length;
};
};
@@ -340,6 +348,7 @@ GLIBCXX_3.4.9 {
std::bad_typeid::what() const;
std::bad_cast::what() const;
std::bad_alloc::what() const;
+std::bad_array_new_length::what() const;
};
} GLIBCXX_3.4;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273274 - head/sys/netpfil/ipfw
On Tue, 21 Oct 2014, David Chisnall wrote: On 19 Oct 2014, at 13:02, Andriy Gapon a...@freebsd.org wrote: I think that on platforms where an optimized version of fls() is available that would work faster than this cool piece of bit magic. Even a lightly optimized naive linear search might work faster. The fancy method has about 7 dependent operations, while the naive method has about 32 independent operations. If you're lucky, the compiler's idiom recogniser will spot this. You're generally better off using the builtins though, because then the compiler will expand them to something sensible (hopefully - old versions of gcc did horribly inefficient things for bswap and clz on platforms without native support). No one cared when cperciva optimized fls() using a lookup table and I investigated 11 different method to show that neither the builtins nor the lookup table were especially good (or bad). On i386, the best portable method is to use ilogb() (floating point). The next best is to use floating point directly. These methods are not the fastest, except probably for 64 bits on i386, but they are quite fast and fairly portable. Not all systems have fls() in libc, and FreeBSD has only pessimized implementations there. I just ran my benchmark on ref11-i386 and got the following: % UNIFORM/BUILTIN_FFS: 0.08 real 0.08 user 0.00 sys % UNIFORM/CPUFUNC_FFS: 0.12 real 0.11 user 0.00 sys % UNIFORM/LIBMET0_FFS: 0.11 real 0.09 user 0.00 sys % UNIFORM/LIBMETH_FFS: 0.11 real 0.10 user 0.00 sys % UNIFORM/LUTMETH_FFS: 0.10 real 0.09 user 0.00 sys % UNIFORM/CPUFUNC_FLS: 0.12 real 0.10 user 0.01 sys % UNIFORM/ILOGMET_FLS: 0.14 real 0.13 user 0.00 sys % UNIFORM/ILOGBME_FLS: 0.23 real 0.23 user 0.00 sys % UNIFORM/ILOGBM0_FLS: 0.23 real 0.23 user 0.00 sys % UNIFORM/LIBMET0_FLS: 1.63 real 1.61 user 0.00 sys % UNIFORM/LIBMETH_FLS: 1.61 real 1.60 user 0.00 sys Several bit patterns are tested, to try to see if there are cache effects. The builtin is now clearly fastest. (On old Athlon64 in 32-bit mode with gcc, it loses to floating point: @ UNIFORM/BUILTIN_FFS: 0.22 real 0.22 user 0.00 sys @ UNIFORM/ILOGMET_FLS: 0.17 real 0.17 user 0.00 sys), but even in the benchmark that spends 100% of its time doing ffs(), the speedup from using the builtin vs the next best is only 20%. Only the pessimized libc methods are very slow. Programs like ministat are intentionally not used. It takes long enough to read the results of 55 simple tests. 44 more follow: % RANDBIT/BUILTIN_FFS: 0.08 real 0.08 user 0.00 sys % RANDBIT/CPUFUNC_FFS: 0.12 real 0.12 user 0.00 sys % RANDBIT/LIBMET0_FFS: 0.11 real 0.10 user 0.00 sys % RANDBIT/LIBMETH_FFS: 0.11 real 0.10 user 0.00 sys % RANDBIT/LUTMETH_FFS: 0.10 real 0.09 user 0.00 sys % RANDBIT/CPUFUNC_FLS: 0.12 real 0.11 user 0.00 sys % RANDBIT/ILOGMET_FLS: 0.14 real 0.13 user 0.00 sys % RANDBIT/ILOGBME_FLS: 0.23 real 0.23 user 0.00 sys % RANDBIT/ILOGBM0_FLS: 0.23 real 0.23 user 0.00 sys % RANDBIT/LIBMET0_FLS: 1.25 real 1.24 user 0.00 sys % RANDBIT/LIBMETH_FLS: 1.24 real 1.24 user 0.00 sys % ALLZERO/BUILTIN_FFS: 0.08 real 0.07 user 0.00 sys % ALLZERO/CPUFUNC_FFS: 0.05 real 0.04 user 0.00 sys % ALLZERO/LIBMET0_FFS: 0.11 real 0.10 user 0.00 sys % ALLZERO/LIBMETH_FFS: 0.11 real 0.10 user 0.00 sys % ALLZERO/LUTMETH_FFS: 0.05 real 0.04 user 0.00 sys % ALLZERO/CPUFUNC_FLS: 0.05 real 0.04 user 0.00 sys % ALLZERO/ILOGMET_FLS: 0.07 real 0.06 user 0.00 sys % ALLZERO/ILOGBME_FLS: 0.05 real 0.03 user 0.00 sys % ALLZERO/ILOGBM0_FLS: 0.05 real 0.04 user 0.00 sys % ALLZERO/LIBMET0_FLS: 0.18 real 0.17 user 0.00 sys % ALLZERO/LIBMETH_FLS: 0.20 real 0.20 user 0.00 sys % ALLONE_/BUILTIN_FFS: 0.08 real 0.08 user 0.00 sys % ALLONE_/CPUFUNC_FFS: 0.12 real 0.12 user 0.00 sys % ALLONE_/LIBMET0_FFS: 0.11 real 0.10 user 0.00 sys % ALLONE_/LIBMETH_FFS: 0.11 real 0.10 user 0.00 sys % ALLONE_/LUTMETH_FFS: 0.10 real 0.09 user 0.00 sys % ALLONE_/CPUFUNC_FLS: 0.12 real 0.12 user 0.00 sys % ALLONE_/ILOGMET_FLS: 0.10 real 0.09 user
svn commit: r273382 - head/contrib/libcxxrt
Author: bapt
Date: Tue Oct 21 12:52:01 2014
New Revision: 273382
URL: https://svnweb.freebsd.org/changeset/base/273382
Log:
Fix build by marking the new functions as weak
This is a temporary fix
Modified:
head/contrib/libcxxrt/stdexcept.cc
Modified: head/contrib/libcxxrt/stdexcept.cc
==
--- head/contrib/libcxxrt/stdexcept.cc Tue Oct 21 10:19:45 2014
(r273381)
+++ head/contrib/libcxxrt/stdexcept.cc Tue Oct 21 12:52:01 2014
(r273382)
@@ -82,13 +82,23 @@ const char* bad_typeid::what() const thr
return std::bad_typeid;
}
+__attribute__((weak))
bad_array_new_length::bad_array_new_length() throw() {}
+__attribute__((weak))
bad_array_new_length::~bad_array_new_length() {}
+__attribute__((weak))
bad_array_new_length::bad_array_new_length(const bad_array_new_length)
throw() {}
+__attribute__((weak))
bad_array_new_length bad_array_new_length::operator=(const
bad_array_new_length) throw()
{
return *this;
}
+__attribute__((weak))
+const char *bad_array_new_length::what() const throw()
+{
+ return std::bad_array_new_length;
+}
+
} // namespace std
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273383 - stable/10/sys/dev/amdtemp
Author: brueffer
Date: Tue Oct 21 13:07:36 2014
New Revision: 273383
URL: https://svnweb.freebsd.org/changeset/base/273383
Log:
MFC: r273034
Add one more AMD Kaveri APU device ID.
Submitted by: Remy Nonnenmacher remy.nonnenmac...@activnetworks.com
Modified:
stable/10/sys/dev/amdtemp/amdtemp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/amdtemp/amdtemp.c
==
--- stable/10/sys/dev/amdtemp/amdtemp.c Tue Oct 21 12:52:01 2014
(r273382)
+++ stable/10/sys/dev/amdtemp/amdtemp.c Tue Oct 21 13:07:36 2014
(r273383)
@@ -80,6 +80,7 @@ struct amdtemp_softc {
#defineDEVICEID_AMD_MISC14 0x1703
#defineDEVICEID_AMD_MISC15 0x1603
#defineDEVICEID_AMD_MISC16 0x1533
+#defineDEVICEID_AMD_MISC17 0x141d
static struct amdtemp_product {
uint16_tamdtemp_vendorid;
@@ -92,6 +93,7 @@ static struct amdtemp_product {
{ VENDORID_AMD, DEVICEID_AMD_MISC14 },
{ VENDORID_AMD, DEVICEID_AMD_MISC15 },
{ VENDORID_AMD, DEVICEID_AMD_MISC16 },
+ { VENDORID_AMD, DEVICEID_AMD_MISC17 },
{ 0, 0 }
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273384 - stable/9/sys/dev/amdtemp
Author: brueffer
Date: Tue Oct 21 13:09:52 2014
New Revision: 273384
URL: https://svnweb.freebsd.org/changeset/base/273384
Log:
MFC: r273034
Add one more AMD Kaveri APU device ID.
Submitted by: Remy Nonnenmacher remy.nonnenmac...@activnetworks.com
Modified:
stable/9/sys/dev/amdtemp/amdtemp.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/amdtemp/amdtemp.c
==
--- stable/9/sys/dev/amdtemp/amdtemp.c Tue Oct 21 13:07:36 2014
(r273383)
+++ stable/9/sys/dev/amdtemp/amdtemp.c Tue Oct 21 13:09:52 2014
(r273384)
@@ -77,6 +77,7 @@ struct amdtemp_softc {
#defineDEVICEID_AMD_MISC10 0x1203
#defineDEVICEID_AMD_MISC11 0x1303
#defineDEVICEID_AMD_MISC16 0x1533
+#defineDEVICEID_AMD_MISC17 0x141d
static struct amdtemp_product {
uint16_tamdtemp_vendorid;
@@ -86,6 +87,7 @@ static struct amdtemp_product {
{ VENDORID_AMD, DEVICEID_AMD_MISC10 },
{ VENDORID_AMD, DEVICEID_AMD_MISC11 },
{ VENDORID_AMD, DEVICEID_AMD_MISC16 },
+ { VENDORID_AMD, DEVICEID_AMD_MISC17 },
{ 0, 0 }
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273385 - stable/10/share/man/man8
Author: emaste
Date: Tue Oct 21 14:47:26 2014
New Revision: 273385
URL: https://svnweb.freebsd.org/changeset/base/273385
Log:
Add basic UEFI boot procedure manpage
MFC of r273218 and r273235.
Added:
stable/10/share/man/man8/uefi.8
- copied, changed from r273218, head/share/man/man8/uefi.8
Modified:
stable/10/share/man/man8/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man8/Makefile
==
--- stable/10/share/man/man8/Makefile Tue Oct 21 13:09:52 2014
(r273384)
+++ stable/10/share/man/man8/Makefile Tue Oct 21 14:47:26 2014
(r273385)
@@ -11,6 +11,7 @@ MAN= crash.8 \
rc.sendmail.8 \
rc.subr.8 \
rescue.8 \
+ ${_uefi.8} \
yp.8
MLINKS=rc.8 rc.atm.8 \
@@ -25,4 +26,8 @@ MLINKS+=yp.8 NIS.8 \
yp.8 nis.8 \
yp.8 YP.8
+.if ${MACHINE_CPUARCH} == amd64
+_uefi.8= uefi.8
+.endif
+
.include bsd.prog.mk
Copied and modified: stable/10/share/man/man8/uefi.8 (from r273218,
head/share/man/man8/uefi.8)
==
--- head/share/man/man8/uefi.8 Fri Oct 17 13:50:37 2014(r273218, copy
source)
+++ stable/10/share/man/man8/uefi.8 Tue Oct 21 14:47:26 2014
(r273385)
@@ -31,10 +31,10 @@
.Nm UEFI
.Nd Unified Extensible Firmware Interface bootstrapping procedures
.Sh DESCRIPTION
-The
+The
.Nm
Unified Extensible Firmware Interface provides boot- and run-time services
-services to operating systems.
+to operating systems.
.Nm
is a replacement for the legacy BIOS on the i386 and amd64 CPU architectures,
and is also used on arm64 and ia64.
@@ -43,7 +43,7 @@ The
.Nm
boot process loads system bootstrap code located in an EFI System Partition
(ESP).
-The ESP is a GPT or MBR parition with a specific identifier that contains an
+The ESP is a GPT or MBR partition with a specific identifier that contains an
.Xr msdosfs 5
FAT file system with a specified file hierarchy.
.Bl -column -offset indent .Sy Partition Scheme .Sy ESP Identifier
@@ -100,7 +100,7 @@ FAT file system image containing
for use by
.Xr bsdinstall 8
and the
-.Ar bootcode
+.Ar bootcode
argument to
.Xr gpart 8 .
.It Pa /boot/loader.efi
@@ -110,26 +110,6 @@ default kernel
.It Pa /boot/kernel.old/kernel
typical non-default kernel (optional)
.El
-.Sh CAVEATS
-EFI environment variables are not supported by
-.Xr loader 8
-or the kernel.
-.Pp
-.Pa boot1.efi
-loads
-.Pa loader.efi
-from the first FreeBSD-UFS file system it locates, even if it is on a
-different disk.
-.Pp
-.Pa boot1.efi
-cannot load
-.Pa loader.efi
-from a
-.Xr ZFS 8
-file system.
-As a result,
-.Nm
-does not support a typical root file system on ZFS configuration.
.Sh SEE ALSO
.Xr vt 4 ,
.Xr msdosfs 5 ,
@@ -150,3 +130,23 @@ and
The
.Fx
Foundation sponsored portions of the work.
+.Sh CAVEATS
+EFI environment variables are not supported by
+.Xr loader 8
+or the kernel.
+.Pp
+.Pa boot1.efi
+loads
+.Pa loader.efi
+from the first FreeBSD-UFS file system it locates, even if it is on a
+different disk.
+.Pp
+.Pa boot1.efi
+cannot load
+.Pa loader.efi
+from a
+.Xr ZFS 8
+file system.
+As a result,
+.Nm
+does not support a typical root file system on ZFS configuration.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273377 - in head: share/man/man9 sys/amd64/amd64 sys/arm/arm sys/cam/scsi sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/dev/dtrace sys/compat/ndis sys/dev/acpi_support sys/d
On Tue, Oct 21, 2014 at 07:31:22AM +, Hans Petter Selasky wrote: Author: hselasky Date: Tue Oct 21 07:31:21 2014 New Revision: 273377 URL: https://svnweb.freebsd.org/changeset/base/273377 Log: Fix multiple incorrect SYSCTL arguments in the kernel: - Wrong integer type was specified. - Wrong or missing access specifier. The access specifier sometimes included the SYSCTL type, which it should not, except for procedural SYSCTL nodes. - Logical OR where binary OR was expected. - Properly assert the access argument passed to all SYSCTL macros, using the CTASSERT macro. This applies to both static- and dynamically created SYSCTLs. - Properly assert the the data type for both static and dynamic SYSCTLs. In the case of static SYSCTLs we only assert that the data pointed to by the SYSCTL data pointer has the correct size, hence there is no easy way to assert types in the C language outside a C-function. - Rewrote some code which doesn't pass a constant access specifier when creating dynamic SYSCTL nodes, which is now a requirement. - Updated EXAMPLES section in SYSCTL manual page. MFC after: 3 days Sponsored by: Mellanox Technologies Modified: head/share/man/man9/Makefile head/share/man/man9/sysctl.9 head/sys/amd64/amd64/fpu.c head/sys/arm/arm/busdma_machdep-v6.c head/sys/arm/arm/busdma_machdep.c head/sys/cam/scsi/scsi_sa.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c head/sys/cddl/dev/dtrace/dtrace_sysctl.c head/sys/compat/ndis/kern_ndis.c head/sys/dev/acpi_support/acpi_asus.c head/sys/dev/acpi_support/acpi_asus_wmi.c head/sys/dev/acpi_support/acpi_hp.c head/sys/dev/acpi_support/acpi_ibm.c head/sys/dev/acpi_support/acpi_rapidstart.c head/sys/dev/acpi_support/acpi_sony.c head/sys/dev/bxe/bxe.c head/sys/dev/cxgb/cxgb_sge.c head/sys/dev/cxgbe/t4_main.c head/sys/dev/e1000/if_em.c head/sys/dev/e1000/if_igb.c head/sys/dev/e1000/if_lem.c head/sys/dev/hatm/if_hatm.c head/sys/dev/ixgbe/ixgbe.c head/sys/dev/ixgbe/ixv.c head/sys/dev/ixl/if_ixl.c head/sys/dev/mpr/mpr.c head/sys/dev/mps/mps.c head/sys/dev/mrsas/mrsas.c head/sys/dev/mrsas/mrsas.h head/sys/dev/mxge/if_mxge.c head/sys/dev/oce/oce_sysctl.c head/sys/dev/qlxgb/qla_os.c head/sys/dev/qlxgbe/ql_os.c head/sys/dev/rt/if_rt.c head/sys/dev/sound/pci/hda/hdaa.c head/sys/dev/vxge/vxge.c head/sys/dev/xen/netfront/netfront.c head/sys/fs/devfs/devfs_devs.c head/sys/fs/fuse/fuse_main.c head/sys/fs/fuse/fuse_vfsops.c head/sys/geom/geom_kern.c head/sys/kern/kern_cpuset.c head/sys/kern/kern_descrip.c head/sys/kern/kern_mib.c head/sys/kern/kern_synch.c head/sys/kern/subr_devstat.c head/sys/kern/subr_kdb.c head/sys/kern/subr_uio.c head/sys/kern/vfs_cache.c head/sys/mips/mips/busdma_machdep.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_hwmp.c head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_superg.c head/sys/netgraph/bluetooth/common/ng_bluetooth.c head/sys/netgraph/ng_base.c head/sys/netgraph/ng_socket.c head/sys/netinet/cc/cc_chd.c head/sys/netinet/tcp_timer.c head/sys/netipsec/ipsec.h head/sys/netpfil/pf/pf.c head/sys/ofed/drivers/net/mlx4/mlx4_en.h head/sys/powerpc/powermac/fcu.c head/sys/powerpc/powermac/smu.c head/sys/powerpc/powerpc/cpu.c head/sys/sys/sysctl.h head/sys/vm/memguard.c head/sys/vm/vm_kern.c head/sys/x86/x86/busdma_bounce.c This seems to break at least PowerPC 64bit, or some bits were not committed. I have to add the following change to compile GENERIC64 kernel, otherwise I get cc1: warnings being treated as errors /usr/home/kostik/work/build/bsd/DEV/src/sys/powerpc/powerpc/busdma_machdep.c: In function 'alloc_bounce_zone': /usr/home/kostik/work/build/bsd/DEV/src/sys/powerpc/powerpc/busdma_machdep.c:1030: warning: initialization from incompatible pointer type *** [busdma_machdep.o] Error code 1 OTOH, I did not verified that 32bit PowerPC kernel is compilable with the change applied. diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index e35ecec..b58a91b 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -1027,9 +1027,9 @@ alloc_bounce_zone(bus_dma_tag_t dmat) SYSCTL_ADD_STRING(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, lowaddr, CTLFLAG_RD, bz-lowaddrid, 0, ); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), + SYSCTL_ADD_ULONG(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - alignment, CTLFLAG_RD, bz-alignment, 0, ); + alignment, CTLFLAG_RD, bz-alignment, ); return (0); } ___ svn-src-all@freebsd.org mailing list
svn commit: r273386 - releng/10.1/share/man/man8
Author: emaste
Date: Tue Oct 21 16:20:23 2014
New Revision: 273386
URL: https://svnweb.freebsd.org/changeset/base/273386
Log:
Add basic UEFI boot procedure manpage
MFS10 of r273385 (r273218,r273235 in HEAD)
Approved by: re (gjb)
Added:
releng/10.1/share/man/man8/uefi.8
- copied unchanged from r273385, stable/10/share/man/man8/uefi.8
Modified:
releng/10.1/share/man/man8/Makefile
Directory Properties:
releng/10.1/ (props changed)
Modified: releng/10.1/share/man/man8/Makefile
==
--- releng/10.1/share/man/man8/Makefile Tue Oct 21 14:47:26 2014
(r273385)
+++ releng/10.1/share/man/man8/Makefile Tue Oct 21 16:20:23 2014
(r273386)
@@ -11,6 +11,7 @@ MAN= crash.8 \
rc.sendmail.8 \
rc.subr.8 \
rescue.8 \
+ ${_uefi.8} \
yp.8
MLINKS=rc.8 rc.atm.8 \
@@ -25,4 +26,8 @@ MLINKS+=yp.8 NIS.8 \
yp.8 nis.8 \
yp.8 YP.8
+.if ${MACHINE_CPUARCH} == amd64
+_uefi.8= uefi.8
+.endif
+
.include bsd.prog.mk
Copied: releng/10.1/share/man/man8/uefi.8 (from r273385,
stable/10/share/man/man8/uefi.8)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ releng/10.1/share/man/man8/uefi.8 Tue Oct 21 16:20:23 2014
(r273386, copy of r273385, stable/10/share/man/man8/uefi.8)
@@ -0,0 +1,152 @@
+.\ Copyright (c) 2014 The FreeBSD Foundation
+.\ All rights reserved.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\ SUCH DAMAGE.
+.\
+.\ $FreeBSD$
+.\
+.Dd October 17, 2014
+.Dt UEFI 8
+.Os
+.Sh NAME
+.Nm UEFI
+.Nd Unified Extensible Firmware Interface bootstrapping procedures
+.Sh DESCRIPTION
+The
+.Nm
+Unified Extensible Firmware Interface provides boot- and run-time services
+to operating systems.
+.Nm
+is a replacement for the legacy BIOS on the i386 and amd64 CPU architectures,
+and is also used on arm64 and ia64.
+.Pp
+The
+.Nm
+boot process loads system bootstrap code located in an EFI System Partition
+(ESP).
+The ESP is a GPT or MBR partition with a specific identifier that contains an
+.Xr msdosfs 5
+FAT file system with a specified file hierarchy.
+.Bl -column -offset indent .Sy Partition Scheme .Sy ESP Identifier
+.It Sy Partition Scheme Ta Sy ESP Identifier
+.It GPT Ta C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+.It MBR Ta 0xEF
+.El
+.Pp
+The
+.Nm
+boot process proceeds as follows:
+.Bl -enum -offset indent -compact
+.It
+.Nm
+firmware runs at power up and searches for an OS loader in the EFI system
+partition.
+The path to the loader may be set by an EFI environment variable.
+If not set, the default is
+.Pa /EFI/BOOT/BOOTX64.EFI .
+The default
+.Nm
+boot configuration for
+.Fx
+installs
+.Pa boot1.efi
+as
+.Pa /EFI/BOOT/BOOTX64.EFI .
+.It
+.Pa boot1.efi
+locates the first partition with the type
+.Li freebsd-ufs ,
+and from it loads
+.Pa loader.efi .
+.It
+.Pa loader.efi
+loads and boots the kernel, as described in
+.Xr loader 8 .
+.El
+.Pp
+The
+.Xr vt 4
+system console is automatically selected when booting via
+.Nm .
+.Sh FILES
+.Bl -tag -width /boot/loader -compact
+.It Pa /boot/boot1.efi
+First stage
+.Nm
+bootstrap
+.It Pa /boot/boot1.efifat
+.Xr msdosfs 5
+FAT file system image containing
+.Pa boot1.efi
+for use by
+.Xr bsdinstall 8
+and the
+.Ar bootcode
+argument to
+.Xr gpart 8 .
+.It Pa /boot/loader.efi
+Final stage bootstrap
+.It Pa /boot/kernel/kernel
+default kernel
+.It Pa /boot/kernel.old/kernel
+typical non-default kernel (optional)
+.El
+.Sh SEE ALSO
+.Xr vt 4 ,
+.Xr msdosfs 5 ,
+.Xr boot 8 ,
+.Xr gpart 8
+.Sh HISTORY
+.Nm
+boot support first appeared in
+.Fx 10.1 .
+.Sh AUTHORS
+.An -nosplit
+.Nm
+boot
svn commit: r273387 - stable/9/contrib/libc-vis
Author: brooks
Date: Tue Oct 21 16:44:03 2014
New Revision: 273387
URL: https://svnweb.freebsd.org/changeset/base/273387
Log:
MFC r271287:
Merge from NetBSD:
PR/49185: Conrad Meyer: strvisx: Handle zero-length input strings
gracefully. (don't abuse 0 to mean compute string length internally)
PR: 193447
Submitted by: Conrad Meyer conrad.me...@isilon.com
Modified:
stable/9/contrib/libc-vis/vis.c
Directory Properties:
stable/9/contrib/libc-vis/ (props changed)
Modified: stable/9/contrib/libc-vis/vis.c
==
--- stable/9/contrib/libc-vis/vis.c Tue Oct 21 16:20:23 2014
(r273386)
+++ stable/9/contrib/libc-vis/vis.c Tue Oct 21 16:44:03 2014
(r273387)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $ */
+/* $NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $*/
/*-
* Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: vis.c,v 1.60 2013/02/21 16:21:20 joerg Exp $);
+__RCSID($NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#ifdef __FBSDID
__FBSDID($FreeBSD$);
@@ -357,7 +357,7 @@ istrsenvisx(char *mbdst, size_t *dlen, c
ssize_t mbslength, maxolen;
_DIAGASSERT(mbdst != NULL);
- _DIAGASSERT(mbsrc != NULL);
+ _DIAGASSERT(mbsrc != NULL || mblength == 0);
_DIAGASSERT(mbextra != NULL);
/*
@@ -375,8 +375,6 @@ istrsenvisx(char *mbdst, size_t *dlen, c
/* Allocate space for the wide char strings */
psrc = pdst = extra = NULL;
- if (!mblength)
- mblength = strlen(mbsrc);
if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
return -1;
if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
@@ -528,6 +526,15 @@ out:
free(psrc);
return error;
}
+
+static int
+istrsenvisxl(char *mbdst, size_t *dlen, const char *mbsrc,
+int flags, const char *mbextra, int *cerr_ptr)
+{
+ return istrsenvisx(mbdst, dlen, mbsrc,
+ mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr);
+}
+
#endif
#if !HAVE_SVIS
@@ -571,13 +578,13 @@ snvis(char *mbdst, size_t dlen, int c, i
int
strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra)
{
- return istrsenvisx(mbdst, NULL, mbsrc, 0, flags, mbextra, NULL);
+ return istrsenvisxl(mbdst, NULL, mbsrc, flags, mbextra, NULL);
}
int
strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char
*mbextra)
{
- return istrsenvisx(mbdst, dlen, mbsrc, 0, flags, mbextra, NULL);
+ return istrsenvisxl(mbdst, dlen, mbsrc, flags, mbextra, NULL);
}
int
@@ -646,13 +653,13 @@ nvis(char *mbdst, size_t dlen, int c, in
int
strvis(char *mbdst, const char *mbsrc, int flags)
{
- return istrsenvisx(mbdst, NULL, mbsrc, 0, flags, , NULL);
+ return istrsenvisxl(mbdst, NULL, mbsrc, flags, , NULL);
}
int
strnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags)
{
- return istrsenvisx(mbdst, dlen, mbsrc, 0, flags, , NULL);
+ return istrsenvisxl(mbdst, dlen, mbsrc, flags, , NULL);
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273017 - head/contrib/netbsd-tests/lib/libc/locale
On Oct 21, 2014, at 8:22, Warner Losh i...@bsdimp.com wrote: Any reason you added #fidefs around this? It is needed on NetBSD too :) Agreed. NetBSD seems to work thanks to header pollution though. I opened several upstream PRs to fix #include issues. The #ifdefs make it clear how the tests differ (and for me what needs to be pushed back). Thanks! ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273388 - head/share/man/man9
Author: jmg Date: Tue Oct 21 17:17:40 2014 New Revision: 273388 URL: https://svnweb.freebsd.org/changeset/base/273388 Log: spell out the arguments.. the + *offsetp does not belong w/ the type, move it outside the .Fn macro... Modified: head/share/man/man9/mbuf.9 Modified: head/share/man/man9/mbuf.9 == --- head/share/man/man9/mbuf.9 Tue Oct 21 16:44:03 2014(r273387) +++ head/share/man/man9/mbuf.9 Tue Oct 21 17:17:40 2014(r273388) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd June 5, 2014 +.Dd October 21, 2014 .Dt MBUF 9 .Os .\ @@ -738,15 +738,16 @@ the offset in the data region of the to the data contained in the returned mbuf is stored in .Fa *offsetp . If -.Fa offp +.Fa offsetp is NULL, the region may be accessed using .Fn mtod mbuf type . If -.Fa offp +.Fa offsetp is non-NULL, the region may be accessed using -.Fn mtod mbuf uint8_t + *offsetp . +.Fn mtod mbuf uint8_t ++ *offsetp. The region of the mbuf chain between its beginning and -.Fa off +.Fa offset is not modified, therefore it is safe to hold pointers to data within this region before calling .Fn m_pulldown . ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273389 - head/contrib/netbsd-tests/lib/libc/gen
Author: ngie Date: Tue Oct 21 17:56:06 2014 New Revision: 273389 URL: https://svnweb.freebsd.org/changeset/base/273389 Log: Port lib/libc/gen/t_siginfo to FreeBSD - mcontext_t on FreeBSD doesn't have a __gregs field (it's split out on FreeBSD into separate fields). In order to avoid muddying the test code with MD code, the debugging trace info has not been implemented - FreeBSD does not implement the si_stime and si_utime fields in siginfo_t, so omit the debugging code that dumps the values - sys/inttypes.h doesn't exist on FreeBSD Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Modified: head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c == --- head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Tue Oct 21 17:17:40 2014(r273388) +++ head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Tue Oct 21 17:56:06 2014(r273389) @@ -29,7 +29,9 @@ #include atf-c.h #include atf-c/config.h +#if defined(__NetBSD__) #include sys/inttypes.h +#endif #include sys/resource.h #include sys/sysctl.h #include sys/time.h @@ -86,9 +88,11 @@ sig_debug(int signo, siginfo_t *info, uc printf(uc_stack %p %lu 0x%x\n, ctx-uc_stack.ss_sp, (unsigned long)ctx-uc_stack.ss_size, ctx-uc_stack.ss_flags); +#if defined(__NetBSD__) for (i = 0; i __arraycount(ctx-uc_mcontext.__gregs); i++) printf(uc_mcontext.greg[%d] 0x%lx\n, i, (long)ctx-uc_mcontext.__gregs[i]); +#endif } } @@ -141,8 +145,10 @@ sigchild_action(int signo, siginfo_t *in printf(si_uid=%d\n, info-si_uid); printf(si_pid=%d\n, info-si_pid); printf(si_status=%d\n, info-si_status); +#if defined(__NetBSD__) printf(si_utime=%lu\n, (unsigned long int)info-si_utime); printf(si_stime=%lu\n, (unsigned long int)info-si_stime); +#endif } ATF_REQUIRE_EQ(info-si_code, code); ATF_REQUIRE_EQ(info-si_signo, SIGCHLD); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273390 - head/contrib/netbsd-tests/lib/libc/stdlib
Author: ngie Date: Tue Oct 21 17:57:12 2014 New Revision: 273390 URL: https://svnweb.freebsd.org/changeset/base/273390 Log: libutil.h is required for fparseln on FreeBSD Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c Modified: head/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c == --- head/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.cTue Oct 21 17:56:06 2014(r273389) +++ head/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.cTue Oct 21 17:57:12 2014(r273390) @@ -34,6 +34,9 @@ #include stdlib.h #include unistd.h #include err.h +#if defined(__FreeBSD__) +#include libutil.h +#endif #defineWS \t\n #definedebug 0 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273392 - head/share/man/man9
Author: jmg Date: Tue Oct 21 17:59:27 2014 New Revision: 273392 URL: https://svnweb.freebsd.org/changeset/base/273392 Log: it is not cast to a pointer of the specified type, it is cast to the specified type... mtod(m, uint8_t) does not work, mtod(m, uint8_t *) does work.. Modified: head/share/man/man9/mbuf.9 Modified: head/share/man/man9/mbuf.9 == --- head/share/man/man9/mbuf.9 Tue Oct 21 17:58:53 2014(r273391) +++ head/share/man/man9/mbuf.9 Tue Oct 21 17:59:27 2014(r273392) @@ -355,7 +355,7 @@ developer with common utilities. Convert an .Fa mbuf pointer to a data pointer. -The macro expands to the data pointer cast to the pointer of the specified +The macro expands to the data pointer cast to the specified .Fa type . .Sy Note : It is advisable to ensure that there is enough contiguous data in ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273391 - head/contrib/netbsd-tests/lib/libc/sys
Author: ngie
Date: Tue Oct 21 17:58:53 2014
New Revision: 273391
URL: https://svnweb.freebsd.org/changeset/base/273391
Log:
Add missing #include for sys/stat.h for fchmod
Sponsored by: EMC / Isilon Storage Division
Modified:
head/contrib/netbsd-tests/lib/libc/sys/t_access.c
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_access.c
==
--- head/contrib/netbsd-tests/lib/libc/sys/t_access.c Tue Oct 21 17:57:12
2014(r273390)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_access.c Tue Oct 21 17:58:53
2014(r273391)
@@ -40,6 +40,10 @@ __RCSID($NetBSD: t_access.c,v 1.1 2011/
#include atf-c.h
+#if defined(__FreeBSD__)
+#include sys/stat.h
+#endif
+
static const char path[] = access;
static const int mode[4] = { R_OK, W_OK, X_OK, F_OK };
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273394 - head/sys/dev/ixl
Author: jimharris Date: Tue Oct 21 18:00:56 2014 New Revision: 273394 URL: https://svnweb.freebsd.org/changeset/base/273394 Log: ixl: remove i40e_register_x710_int.h This file is not used by the FreeBSD ixl driver. Submitted by: Eric Joyner eric.joy...@intel.com MFC after:3 days Deleted: head/sys/dev/ixl/i40e_register_x710_int.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273393 - head/contrib/netbsd-tests/lib/libc/sys
Author: ngie
Date: Tue Oct 21 18:00:55 2014
New Revision: 273393
URL: https://svnweb.freebsd.org/changeset/base/273393
Log:
Port t_write to FreeBSD
- Mark the signo variable for the signal handle __unused
- Use limits.h instead of sys/syslimits.h (the latter does not
exist on FreeBSD)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/contrib/netbsd-tests/lib/libc/sys/t_write.c
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_write.c
==
--- head/contrib/netbsd-tests/lib/libc/sys/t_write.cTue Oct 21 17:59:27
2014(r273392)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_write.cTue Oct 21 18:00:55
2014(r273393)
@@ -32,7 +32,9 @@ __COPYRIGHT(@(#) Copyright (c) 2008\
__RCSID($NetBSD: t_write.c,v 1.2 2011/10/19 16:19:30 jruoho Exp $);
#include sys/uio.h
+#if defined(__NetBSD__)
#include sys/syslimits.h
+#endif
#include atf-c.h
#include errno.h
@@ -43,13 +45,21 @@ __RCSID($NetBSD: t_write.c,v 1.2 2011/1
#include string.h
#include unistd.h
+#if defined(__FreeBSD__)
+#include limits.h
+#endif
+
static void sighandler(int);
static bool fail = false;
static const char *path = write;
static void
+#if defined(__FreeBSD__)
+sighandler(int signo __unused)
+#else
sighandler(int signo)
+#endif
{
fail = false;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273395 - head/contrib/netbsd-tests/lib/libc/sys
Author: ngie
Date: Tue Oct 21 18:01:37 2014
New Revision: 273395
URL: https://svnweb.freebsd.org/changeset/base/273395
Log:
Mark osi __unused so this compiles cleanly on FreeBSD
Sponsored by: EMC / Isilon Storage Division
Modified:
head/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c
==
--- head/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c Tue Oct 21
18:00:56 2014(r273394)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c Tue Oct 21
18:01:37 2014(r273395)
@@ -38,7 +38,11 @@ static timer_t t;
static bool fail = true;
static void
+#if defined(__FreeBSD__)
+timer_signal_handler(int signo, siginfo_t *si, void *osi __unused)
+#else
timer_signal_handler(int signo, siginfo_t *si, void *osi)
+#endif
{
timer_t *tp;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273396 - head/contrib/netbsd-tests/lib/libc/sys
Author: ngie Date: Tue Oct 21 18:06:04 2014 New Revision: 273396 URL: https://svnweb.freebsd.org/changeset/base/273396 Log: unlink(/) fails with EISDIR instead of EBUSY on FreeBSD; test for that instead Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c Modified: head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c == --- head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c Tue Oct 21 18:01:37 2014(r273395) +++ head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c Tue Oct 21 18:06:04 2014(r273396) @@ -85,7 +85,11 @@ ATF_TC_BODY(unlink_err, tc) (void)memset(buf, 'x', sizeof(buf)); errno = 0; +#if defined(__FreeBSD__) + ATF_REQUIRE_ERRNO(EISDIR, unlink(/) == -1); +#else ATF_REQUIRE_ERRNO(EBUSY, unlink(/) == -1); +#endif errno = 0; ATF_REQUIRE_ERRNO(ENAMETOOLONG, unlink(buf) == -1); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273397 - head/contrib/netbsd-tests/lib/libc/sys
Author: ngie
Date: Tue Oct 21 18:10:05 2014
New Revision: 273397
URL: https://svnweb.freebsd.org/changeset/base/273397
Log:
Port t_chroot to FreeBSD
- Add missing #include sys/stat.h for mkdir(2)
- Omit the fchroot(2) tests because the support is not present on FreeBSD
Sponsored by: EMC / Isilon Storage Division
Modified:
head/contrib/netbsd-tests/lib/libc/sys/t_chroot.c
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_chroot.c
==
--- head/contrib/netbsd-tests/lib/libc/sys/t_chroot.c Tue Oct 21 18:06:04
2014(r273396)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_chroot.c Tue Oct 21 18:10:05
2014(r273397)
@@ -42,6 +42,10 @@ __RCSID($NetBSD: t_chroot.c,v 1.1 2011/
#include string.h
#include unistd.h
+#ifdef __FreeBSD__
+#include sys/stat.h
+#endif
+
ATF_TC(chroot_basic);
ATF_TC_HEAD(chroot_basic, tc)
{
@@ -167,6 +171,7 @@ ATF_TC_BODY(chroot_perm, tc)
atf_tc_fail(chroot(2) succeeded as unprivileged user);
}
+#ifdef __NetBSD__
ATF_TC(fchroot_basic);
ATF_TC_HEAD(fchroot_basic, tc)
{
@@ -298,6 +303,7 @@ ATF_TC_BODY(fchroot_perm, tc)
if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
atf_tc_fail(fchroot(2) succeeded as unprivileged user);
}
+#endif
ATF_TP_ADD_TCS(tp)
{
@@ -305,9 +311,11 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, chroot_basic);
ATF_TP_ADD_TC(tp, chroot_err);
ATF_TP_ADD_TC(tp, chroot_perm);
+#ifdef __NetBSD__
ATF_TP_ADD_TC(tp, fchroot_basic);
ATF_TP_ADD_TC(tp, fchroot_err);
ATF_TP_ADD_TC(tp, fchroot_perm);
+#endif
return atf_no_error();
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273398 - in stable/9/usr.sbin/bsdconfig: dot dot/include examples include includes share share/media share/packages
Author: dteske
Date: Tue Oct 21 18:31:08 2014
New Revision: 273398
URL: https://svnweb.freebsd.org/changeset/base/273398
Log:
MFC revisions 253175, 268999, 269027, 269351-269352, 269354, 269460,
270283, 270505, 270954, 270989, 273067, and 273068:
r253175: Introduce f_which() to common.subr
r268999: Add new bsdconfig example scripts; remove obsolete ones
r269027: Update bsdconfig dot module; fixes and enhancements
r269351: Add setvar() for non-FreeBSD platforms using bash as /bin/sh
r269352: Fix syntax error when run under bash
r269354: Update setvar() function introduced in r269351
r269460: Update f_xdialog_info() in bsdconfig's dialog.subr include
r270283: Add `-A' flag to pkg-install(8) when installing dependencies
r270505: Optimize f_which() to be slightly faster still (common.subr)
r270954: Update f_dialog_init() for safer getopts usage (dialog.subr)
r270989: Fix for previously mentioned r270954
r273067: Fix awk(1) asorti() implementation to work when called in a loop
r273068: Rename awk(1) asorti() to prevent conflict with GNU awk(1)
Added:
stable/9/usr.sbin/bsdconfig/examples/add_some_packages.sh
- copied unchanged from r268999,
head/usr.sbin/bsdconfig/examples/add_some_packages.sh
stable/9/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
- copied unchanged from r268999,
head/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
Deleted:
stable/9/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
Modified:
stable/9/usr.sbin/bsdconfig/dot/dot
stable/9/usr.sbin/bsdconfig/dot/include/messages.subr
stable/9/usr.sbin/bsdconfig/examples/Makefile
stable/9/usr.sbin/bsdconfig/examples/browse_packages_http.sh
stable/9/usr.sbin/bsdconfig/include/messages.subr
stable/9/usr.sbin/bsdconfig/includes/includes
stable/9/usr.sbin/bsdconfig/share/common.subr
stable/9/usr.sbin/bsdconfig/share/device.subr
stable/9/usr.sbin/bsdconfig/share/dialog.subr
stable/9/usr.sbin/bsdconfig/share/media/http.subr
stable/9/usr.sbin/bsdconfig/share/media/httpproxy.subr
stable/9/usr.sbin/bsdconfig/share/packages/Makefile
stable/9/usr.sbin/bsdconfig/share/packages/index.subr (contents, props
changed)
stable/9/usr.sbin/bsdconfig/share/packages/packages.subr (contents, props
changed)
Directory Properties:
stable/9/usr.sbin/bsdconfig/ (props changed)
stable/9/usr.sbin/bsdconfig/share/packages/categories.subr (props changed)
Modified: stable/9/usr.sbin/bsdconfig/dot/dot
==
--- stable/9/usr.sbin/bsdconfig/dot/dot Tue Oct 21 18:10:05 2014
(r273397)
+++ stable/9/usr.sbin/bsdconfig/dot/dot Tue Oct 21 18:31:08 2014
(r273398)
@@ -249,6 +249,7 @@ if [ $SHOW_INCLUDES ]; then
$menu_program_list \
$submenu_program_list \
$cmd_program_list \
+ $BSDCFG_SHARE/script.subr \
; do
[ -e $file ] echo $file
done | sort -u
@@ -299,12 +300,6 @@ if [ $SHOW_INCLUDES ]; then
fi
#
-# Add script.subr to includes if it exists
-#
-[ -f $BSDCFG_SHARE/script.subr ]
- include_file_list=$include_file_list script.subr
-
-#
# Start the directional-graph (digraph) output
#
printf 'strict digraph { // Empty name to prevent SVG Auto-Tooltip\n'
@@ -352,7 +347,7 @@ printf '\tnode [\n'
printf '\t\tfontname = Times-Roman,\n'
printf '\t\tfontsize = 12,\n'
printf '\t\twidth = 2.5, // arbitrary minimum width for all nodes\n'
-printf '\t\tfixedsize, // turn minimum width into exact width\n'
+printf '\t\tfixedsize = true, // turn minimum width into exact width\n'
printf '\t];\n'
#
@@ -546,34 +541,36 @@ printf '\t\tbgcolor = %s;\n' $bgcolor
printf '\t\tlabel = bsdconfig(8);\n'
printf '\t\ttooltip = bsdconfig(8);\n'
print_node bsdconfig
+end_nodelist
if [ $SHOW_INCLUDES ]; then
- printf '\t\tsubgraph cluster_includes {\n'
- printf '\t\t\tbgcolor = %s;\n' $bgcolor_includes
- printf '\t\t\tlabel = %s;\n' $msg_includes
-
for include_file in $include_file_list; do
echo $include_file
- done | awk -v bgcolor=$bgcolor_bsdconfig '
- BEGIN { created = 0 }
- function end_subgraph() { printf \t\t\t};\n }
- ( $0 !~ / ) {
- if ( ! created )
- {
- printf \t\t\tsubgraph \%s\ {\n,
- cluster_bsdconfig_includes
- printf \t\t\t\tbgcolor = \%s\;\n, bgcolor
- printf \t\t\t\tlabel = \bsdconfig\;\n
- created++
+ done | awk \
+ -v bgcolor=$bgcolor_bsdconfig \
+ -v msg_subroutines=$msg_subroutines \
+ '
+ BEGIN { created = 0 }
+ function end_subgraph() { printf \t};\n }
+ ( $0 !~ / ) {
+ if ( ! created )
+ {
+
svn commit: r273399 - in releng/10.1: . crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/aes/asm crypto/openssl/crypto/asn1 crypto/openssl/crypto/bn crypto/openssl/cry...
Author: delphij Date: Tue Oct 21 19:00:32 2014 New Revision: 273399 URL: https://svnweb.freebsd.org/changeset/base/273399 Log: MFS r273149 (jkim): MFC: r273144, r273146 Merge OpenSSL 1.0.1j. This is part of an upcoming FreeBSD security advisory. Approved by: re (so@ blanket) Added: releng/10.1/crypto/openssl/crypto/constant_time_locl.h - copied unchanged from r273149, stable/10/crypto/openssl/crypto/constant_time_locl.h releng/10.1/crypto/openssl/crypto/constant_time_test.c - copied unchanged from r273149, stable/10/crypto/openssl/crypto/constant_time_test.c releng/10.1/crypto/openssl/doc/apps/c_rehash.pod - copied unchanged from r273149, stable/10/crypto/openssl/doc/apps/c_rehash.pod releng/10.1/crypto/openssl/doc/crypto/CMS_add1_signer.pod - copied unchanged from r273149, stable/10/crypto/openssl/doc/crypto/CMS_add1_signer.pod releng/10.1/secure/lib/libcrypto/man/CMS_add1_signer.3 - copied unchanged from r273149, stable/10/secure/lib/libcrypto/man/CMS_add1_signer.3 releng/10.1/secure/usr.bin/openssl/man/c_rehash.1 - copied unchanged from r273149, stable/10/secure/usr.bin/openssl/man/c_rehash.1 Deleted: releng/10.1/crypto/openssl/doc/crypto/CMS_sign_add1_signer.pod releng/10.1/secure/lib/libcrypto/man/CMS_sign_add1_signer.3 Modified: releng/10.1/ObsoleteFiles.inc releng/10.1/crypto/openssl/CHANGES releng/10.1/crypto/openssl/Configure releng/10.1/crypto/openssl/Makefile releng/10.1/crypto/openssl/NEWS releng/10.1/crypto/openssl/README releng/10.1/crypto/openssl/apps/s_client.c releng/10.1/crypto/openssl/crypto/Makefile releng/10.1/crypto/openssl/crypto/aes/asm/aesni-x86_64.pl releng/10.1/crypto/openssl/crypto/asn1/a_strex.c releng/10.1/crypto/openssl/crypto/bn/asm/x86_64-gcc.c releng/10.1/crypto/openssl/crypto/bn/bn_exp.c releng/10.1/crypto/openssl/crypto/bn/bn_nist.c releng/10.1/crypto/openssl/crypto/bn/exptest.c releng/10.1/crypto/openssl/crypto/dsa/dsa_ameth.c releng/10.1/crypto/openssl/crypto/ebcdic.h releng/10.1/crypto/openssl/crypto/ec/ec.h releng/10.1/crypto/openssl/crypto/ec/ec2_smpl.c releng/10.1/crypto/openssl/crypto/ec/ec_ameth.c releng/10.1/crypto/openssl/crypto/ec/ec_asn1.c releng/10.1/crypto/openssl/crypto/ec/ecp_mont.c releng/10.1/crypto/openssl/crypto/ec/ecp_nist.c releng/10.1/crypto/openssl/crypto/ec/ecp_smpl.c releng/10.1/crypto/openssl/crypto/ec/ectest.c releng/10.1/crypto/openssl/crypto/evp/Makefile releng/10.1/crypto/openssl/crypto/evp/e_aes.c releng/10.1/crypto/openssl/crypto/evp/evp_enc.c releng/10.1/crypto/openssl/crypto/md5/asm/md5-x86_64.pl releng/10.1/crypto/openssl/crypto/modes/modes.h releng/10.1/crypto/openssl/crypto/ocsp/ocsp_vfy.c releng/10.1/crypto/openssl/crypto/opensslconf.h releng/10.1/crypto/openssl/crypto/opensslv.h releng/10.1/crypto/openssl/crypto/ossl_typ.h releng/10.1/crypto/openssl/crypto/pkcs7/pkcs7.h releng/10.1/crypto/openssl/crypto/pqueue/pqueue.h releng/10.1/crypto/openssl/crypto/rsa/Makefile releng/10.1/crypto/openssl/crypto/rsa/rsa.h releng/10.1/crypto/openssl/crypto/rsa/rsa_err.c releng/10.1/crypto/openssl/crypto/rsa/rsa_oaep.c releng/10.1/crypto/openssl/crypto/rsa/rsa_pk1.c releng/10.1/crypto/openssl/crypto/rsa/rsa_sign.c releng/10.1/crypto/openssl/crypto/stack/safestack.h releng/10.1/crypto/openssl/doc/apps/dgst.pod releng/10.1/crypto/openssl/doc/crypto/BIO_s_accept.pod releng/10.1/crypto/openssl/doc/crypto/EVP_DigestInit.pod releng/10.1/crypto/openssl/doc/crypto/EVP_DigestVerifyInit.pod releng/10.1/crypto/openssl/doc/crypto/EVP_EncryptInit.pod releng/10.1/crypto/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod releng/10.1/crypto/openssl/doc/crypto/EVP_PKEY_sign.pod releng/10.1/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod releng/10.1/crypto/openssl/e_os.h releng/10.1/crypto/openssl/ssl/Makefile releng/10.1/crypto/openssl/ssl/d1_both.c releng/10.1/crypto/openssl/ssl/d1_lib.c releng/10.1/crypto/openssl/ssl/d1_srtp.c releng/10.1/crypto/openssl/ssl/dtls1.h releng/10.1/crypto/openssl/ssl/s23_clnt.c releng/10.1/crypto/openssl/ssl/s23_srvr.c releng/10.1/crypto/openssl/ssl/s2_lib.c releng/10.1/crypto/openssl/ssl/s3_cbc.c releng/10.1/crypto/openssl/ssl/s3_clnt.c releng/10.1/crypto/openssl/ssl/s3_enc.c releng/10.1/crypto/openssl/ssl/s3_lib.c releng/10.1/crypto/openssl/ssl/s3_pkt.c releng/10.1/crypto/openssl/ssl/s3_srvr.c releng/10.1/crypto/openssl/ssl/srtp.h releng/10.1/crypto/openssl/ssl/ssl.h releng/10.1/crypto/openssl/ssl/ssl3.h releng/10.1/crypto/openssl/ssl/ssl_err.c releng/10.1/crypto/openssl/ssl/ssl_lib.c releng/10.1/crypto/openssl/ssl/t1_enc.c releng/10.1/crypto/openssl/ssl/t1_lib.c releng/10.1/crypto/openssl/ssl/tls1.h releng/10.1/crypto/openssl/util/mk1mf.pl releng/10.1/crypto/openssl/util/mkdef.pl releng/10.1/crypto/openssl/util/ssleay.num releng/10.1/secure/lib/libcrypto/Makefile.inc
svn commit: r273400 - in head/sys: kern sys
Author: mjg
Date: Tue Oct 21 19:02:26 2014
New Revision: 273400
URL: https://svnweb.freebsd.org/changeset/base/273400
Log:
Rename sysctl_lock and _unlock to sysctl_xlock and _xunlock.
Modified:
head/sys/kern/kern_linker.c
head/sys/kern/kern_sysctl.c
head/sys/kern/vfs_init.c
head/sys/sys/sysctl.h
Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Tue Oct 21 19:00:32 2014(r273399)
+++ head/sys/kern/kern_linker.c Tue Oct 21 19:02:26 2014(r273400)
@@ -292,10 +292,10 @@ linker_file_register_sysctls(linker_file
return;
sx_xunlock(kld_sx);
- sysctl_lock();
+ sysctl_xlock();
for (oidp = start; oidp stop; oidp++)
sysctl_register_oid(*oidp);
- sysctl_unlock();
+ sysctl_xunlock();
sx_xlock(kld_sx);
}
@@ -313,10 +313,10 @@ linker_file_unregister_sysctls(linker_fi
return;
sx_xunlock(kld_sx);
- sysctl_lock();
+ sysctl_xlock();
for (oidp = start; oidp stop; oidp++)
sysctl_unregister_oid(*oidp);
- sysctl_unlock();
+ sysctl_xunlock();
sx_xlock(kld_sx);
}
Modified: head/sys/kern/kern_sysctl.c
==
--- head/sys/kern/kern_sysctl.c Tue Oct 21 19:00:32 2014(r273399)
+++ head/sys/kern/kern_sysctl.c Tue Oct 21 19:02:26 2014(r273400)
@@ -126,14 +126,14 @@ sysctl_find_oidname(const char *name, st
* Order by number in each list.
*/
void
-sysctl_lock(void)
+sysctl_xlock(void)
{
SYSCTL_XLOCK();
}
void
-sysctl_unlock(void)
+sysctl_xunlock(void)
{
SYSCTL_XUNLOCK();
Modified: head/sys/kern/vfs_init.c
==
--- head/sys/kern/vfs_init.cTue Oct 21 19:00:32 2014(r273399)
+++ head/sys/kern/vfs_init.cTue Oct 21 19:02:26 2014(r273400)
@@ -291,7 +291,7 @@ vfs_register(struct vfsconf *vfc)
* preserved by re-registering the oid after modifying its
* number.
*/
- sysctl_lock();
+ sysctl_xlock();
SLIST_FOREACH(oidp, SYSCTL_CHILDREN(sysctl___vfs), oid_link) {
if (strcmp(oidp-oid_name, vfc-vfc_name) == 0) {
sysctl_unregister_oid(oidp);
@@ -300,7 +300,7 @@ vfs_register(struct vfsconf *vfc)
break;
}
}
- sysctl_unlock();
+ sysctl_xunlock();
return (0);
}
Modified: head/sys/sys/sysctl.h
==
--- head/sys/sys/sysctl.h Tue Oct 21 19:00:32 2014(r273399)
+++ head/sys/sys/sysctl.h Tue Oct 21 19:02:26 2014(r273400)
@@ -770,8 +770,8 @@ int userland_sysctl(struct thread *td, i
size_t *retval, int flags);
intsysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
int *nindx, struct sysctl_req *req);
-void sysctl_lock(void);
-void sysctl_unlock(void);
+void sysctl_xlock(void);
+void sysctl_xunlock(void);
intsysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
struct sbuf;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273401 - head/sys/kern
Author: mjg
Date: Tue Oct 21 19:05:44 2014
New Revision: 273401
URL: https://svnweb.freebsd.org/changeset/base/273401
Log:
Implement shared locking for sysctl.
Modified:
head/sys/kern/kern_sysctl.c
Modified: head/sys/kern/kern_sysctl.c
==
--- head/sys/kern/kern_sysctl.c Tue Oct 21 19:02:26 2014(r273400)
+++ head/sys/kern/kern_sysctl.c Tue Oct 21 19:05:44 2014(r273401)
@@ -91,6 +91,10 @@ static struct sx sysctlmemlock;
#defineSYSCTL_XLOCK() sx_xlock(sysctllock)
#defineSYSCTL_XUNLOCK()sx_xunlock(sysctllock)
+#defineSYSCTL_SLOCK() sx_slock(sysctllock)
+#defineSYSCTL_SUNLOCK()sx_sunlock(sysctllock)
+#defineSYSCTL_XLOCKED()sx_xlocked(sysctllock)
+#defineSYSCTL_ASSERT_LOCKED() sx_assert(sysctllock, SA_LOCKED)
#defineSYSCTL_ASSERT_XLOCKED() sx_assert(sysctllock, SA_XLOCKED)
#defineSYSCTL_INIT() sx_init(sysctllock, sysctl lock)
#defineSYSCTL_SLEEP(ch, wmesg, timo)
\
@@ -106,12 +110,35 @@ static intsysctl_remove_oid_locked(stru
static int sysctl_old_kernel(struct sysctl_req *, const void *, size_t);
static int sysctl_new_kernel(struct sysctl_req *, void *, size_t);
+static void
+sysctl_lock(bool xlock)
+{
+
+ if (xlock)
+ SYSCTL_XLOCK();
+ else
+ SYSCTL_SLOCK();
+}
+
+static bool
+sysctl_unlock(void)
+{
+ bool xlocked;
+
+ xlocked = SYSCTL_XLOCKED();
+ if (xlocked)
+ SYSCTL_XUNLOCK();
+ else
+ SYSCTL_SUNLOCK();
+ return (xlocked);
+}
+
static struct sysctl_oid *
sysctl_find_oidname(const char *name, struct sysctl_oid_list *list)
{
struct sysctl_oid *oidp;
- SYSCTL_ASSERT_XLOCKED();
+ SYSCTL_ASSERT_LOCKED();
SLIST_FOREACH(oidp, list, oid_link) {
if (strcmp(oidp-oid_name, name) == 0) {
return (oidp);
@@ -144,9 +171,10 @@ sysctl_root_handler_locked(struct sysctl
struct sysctl_req *req)
{
int error;
+ bool xlocked;
- oid-oid_running++;
- SYSCTL_XUNLOCK();
+ atomic_add_int(oid-oid_running, 1);
+ xlocked = sysctl_unlock();
if (!(oid-oid_kind CTLFLAG_MPSAFE))
mtx_lock(Giant);
@@ -154,9 +182,9 @@ sysctl_root_handler_locked(struct sysctl
if (!(oid-oid_kind CTLFLAG_MPSAFE))
mtx_unlock(Giant);
- SYSCTL_XLOCK();
- oid-oid_running--;
- if (oid-oid_running == 0 (oid-oid_kind CTLFLAG_DYING) != 0)
+ sysctl_lock(xlocked);
+ if (atomic_fetchadd_int(oid-oid_running, -1) == 1
+ (oid-oid_kind CTLFLAG_DYING) != 0)
wakeup(oid-oid_running);
return (error);
@@ -852,7 +880,7 @@ sysctl_sysctl_next_ls(struct sysctl_oid_
{
struct sysctl_oid *oidp;
- SYSCTL_ASSERT_XLOCKED();
+ SYSCTL_ASSERT_LOCKED();
*len = level;
SLIST_FOREACH(oidp, lsp, oid_link) {
*next = oidp-oid_number;
@@ -939,7 +967,7 @@ name2oid(char *name, int *oid, int *len,
struct sysctl_oid_list *lsp = sysctl__children;
char *p;
- SYSCTL_ASSERT_XLOCKED();
+ SYSCTL_ASSERT_LOCKED();
for (*len = 0; *len CTL_MAXNAME;) {
p = strsep(name, .);
@@ -1364,9 +1392,9 @@ kernel_sysctl(struct thread *td, int *na
req.newfunc = sysctl_new_kernel;
req.lock = REQ_UNWIRED;
- SYSCTL_XLOCK();
+ SYSCTL_SLOCK();
error = sysctl_root(0, name, namelen, req);
- SYSCTL_XUNLOCK();
+ SYSCTL_SUNLOCK();
if (req.lock == REQ_WIRED req.validlen 0)
vsunlock(req.oldptr, req.validlen);
@@ -1498,7 +1526,7 @@ sysctl_find_oid(int *name, u_int namelen
struct sysctl_oid *oid;
int indx;
- SYSCTL_ASSERT_XLOCKED();
+ SYSCTL_ASSERT_LOCKED();
lsp = sysctl__children;
indx = 0;
while (indx CTL_MAXNAME) {
@@ -1545,7 +1573,7 @@ sysctl_root(SYSCTL_HANDLER_ARGS)
struct sysctl_oid *oid;
int error, indx, lvl;
- SYSCTL_ASSERT_XLOCKED();
+ SYSCTL_ASSERT_LOCKED();
error = sysctl_find_oid(arg1, arg2, oid, indx, req);
if (error)
@@ -1729,9 +1757,9 @@ userland_sysctl(struct thread *td, int *
for (;;) {
req.oldidx = 0;
req.newidx = 0;
- SYSCTL_XLOCK();
+ SYSCTL_SLOCK();
error = sysctl_root(0, name, namelen, req);
- SYSCTL_XUNLOCK();
+ SYSCTL_SUNLOCK();
if (error != EAGAIN)
break;
kern_yield(PRI_USER);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to
svn commit: r273402 - head/sys/dev/hyperv/storvsc
Author: gjb
Date: Tue Oct 21 19:36:20 2014
New Revision: 273402
URL: https://svnweb.freebsd.org/changeset/base/273402
Log:
Fix an issue where a FreeBSD virtual machine provisioned in
the Microsoft Azure service does not recognize the second
attached disk on the system.
Submitted by: kyliel@Microsoft
Patched by: weh@Microsoft
PR: 194376
MFC after:3 days
X-MFC-10.1: yes, ASAP
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
Modified: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==
--- head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.cTue Oct 21
19:05:44 2014(r273401)
+++ head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.cTue Oct 21
19:36:20 2014(r273402)
@@ -75,7 +75,7 @@ __FBSDID($FreeBSD$);
#define STORVSC_MAX_IO_REQUESTS(STORVSC_MAX_LUNS_PER_TARGET *
2)
#define BLKVSC_MAX_IDE_DISKS_PER_TARGET(1)
#define BLKVSC_MAX_IO_REQUESTS STORVSC_MAX_IO_REQUESTS
-#define STORVSC_MAX_TARGETS(1)
+#define STORVSC_MAX_TARGETS(2)
struct storvsc_softc;
@@ -584,7 +584,6 @@ hv_storvsc_on_iocompletion(struct storvs
vm_srb = vstor_packet-u.vm_srb;
- request-sense_info_len = 0;
if (((vm_srb-scsi_status 0xFF) == SCSI_STATUS_CHECK_COND)
(vm_srb-srb_status SRB_STATUS_AUTOSENSE_VALID)) {
/* Autosense data available */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273372 - stable/10/share/man/man4
В Tue, 21 Oct 2014 06:23:15 + (UTC) Alexander Motin m...@freebsd.org пишет: Author: mav Date: Tue Oct 21 06:23:14 2014 New Revision: 273372 URL: https://svnweb.freebsd.org/changeset/base/273372 Log: MFC r262294 (by ivoras): Explain how and where kern.cam.ada.write_cache can be set in practical situations. Modified: stable/10/share/man/man4/ada.4 Directory Properties: stable/10/ (props changed) Please document the SYSCTL VARIABLE kern.cam.ada.X.sort_io_queue Thanks. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273403 - head/sys/kern
Author: mjg Date: Tue Oct 21 19:45:08 2014 New Revision: 273403 URL: https://svnweb.freebsd.org/changeset/base/273403 Log: Make sysctl name2oid shared-locked as well. This is a follow-up to r273401. Modified: head/sys/kern/kern_sysctl.c Modified: head/sys/kern/kern_sysctl.c == --- head/sys/kern/kern_sysctl.c Tue Oct 21 19:36:20 2014(r273402) +++ head/sys/kern/kern_sysctl.c Tue Oct 21 19:45:08 2014(r273403) @@ -1021,9 +1021,9 @@ sysctl_sysctl_name2oid(SYSCTL_HANDLER_AR p [req-newlen] = '\0'; - SYSCTL_XLOCK(); + SYSCTL_SLOCK(); error = name2oid(p, oid, len, op); - SYSCTL_XUNLOCK(); + SYSCTL_SUNLOCK(); free(p, M_SYSCTL); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273404 - head/share/mk
Author: bapt
Date: Tue Oct 21 19:56:45 2014
New Revision: 273404
URL: https://svnweb.freebsd.org/changeset/base/273404
Log:
The dependencies are computed with CC even if sources are C++, when building
when building with an external gcc, we want to be able to pass the path to
the libc++ headers so dependencies are correctly computed for C++ source
files.
Add a DEPFLAGS for that purpose
Reviewed by: imp
Modified:
head/share/mk/bsd.dep.mk
Modified: head/share/mk/bsd.dep.mk
==
--- head/share/mk/bsd.dep.mkTue Oct 21 19:45:08 2014(r273403)
+++ head/share/mk/bsd.dep.mkTue Oct 21 19:56:45 2014(r273404)
@@ -49,7 +49,7 @@ GTAGSFLAGS?= -o
HTAGSFLAGS?=
.if ${CC} != cc
-MKDEPCMD?= CC='${CC}' mkdep
+MKDEPCMD?= CC='${CC} ${DEPFLAGS}' mkdep
.else
MKDEPCMD?= mkdep
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273405 - head/share/mk
Author: bapt
Date: Tue Oct 21 19:58:23 2014
New Revision: 273405
URL: https://svnweb.freebsd.org/changeset/base/273405
Log:
When using an external toolchain note that gcc 4.8+ supports C++11
Submitted by: imp
Modified:
head/share/mk/bsd.compiler.mk
Modified: head/share/mk/bsd.compiler.mk
==
--- head/share/mk/bsd.compiler.mk Tue Oct 21 19:56:45 2014
(r273404)
+++ head/share/mk/bsd.compiler.mk Tue Oct 21 19:58:23 2014
(r273405)
@@ -42,7 +42,8 @@ COMPILER_VERSION!=echo ${_v:M[1-9].[0-9]
.endif
.undef _v
-.if ${COMPILER_TYPE} == clang
+.if ${COMPILER_TYPE} == clang || \
+ (${COMPILER_TYPE} == gcc ${COMPILER_VERSION} = 40800)
COMPILER_FEATURES= c++11
.else
COMPILER_FEATURES=
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273406 - head/share/mk
Author: bapt
Date: Tue Oct 21 20:00:49 2014
New Revision: 273406
URL: https://svnweb.freebsd.org/changeset/base/273406
Log:
Always use libc++ as the default c++ stack when building with an external gcc
4.8+
While here disable building gcc from base when using gcc 4.8+
Reviewed by: imp
Modified:
head/share/mk/src.opts.mk
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Tue Oct 21 19:58:23 2014(r273405)
+++ head/share/mk/src.opts.mk Tue Oct 21 20:00:49 2014(r273406)
@@ -358,4 +358,12 @@ MK_${vv:H}:= ${MK_${vv:T}}
MK_LLDB:= no
.endif
+# gcc 4.8 and newer supports libc++, so suppress gnuc++ in that case.
+# while in theory we could build it with that, we don't want to do
+# that since it creates too much confusion for too little gain.
+.if ${COMPILER_TYPE} == gcc ${COMPILER_VERSION} = 40800
+MK_GNUCXX:=no
+MK_GCC:=no
.endif
+
+.endif # !target(__src.opts.mk__)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273407 - head/lib/libc++
Author: bapt
Date: Tue Oct 21 20:04:05 2014
New Revision: 273407
URL: https://svnweb.freebsd.org/changeset/base/273407
Log:
When using an external gcc 4.8+ and not building libstdc++ then create in the
objectdir a
fake libstdc++.so and libstdc++.a which is a symlink on libc++ that allow g++
to satisfy
its links dependencies in the least hackish way.
Please note that this hacky libstds++ never get installed on the final system
Reviewed by: imp
Modified:
head/lib/libc++/Makefile
Modified: head/lib/libc++/Makefile
==
--- head/lib/libc++/MakefileTue Oct 21 20:00:49 2014(r273406)
+++ head/lib/libc++/MakefileTue Oct 21 20:04:05 2014(r273407)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include src.opts.mk
+
LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt
HDRDIR=${.CURDIR}/../../contrib/libc++/include
SRCDIR=${.CURDIR}/../../contrib/libc++/src
@@ -192,4 +194,14 @@ EXT+= ${HDRDIR}/ext/${hdr}
.endfor
EXTDIR=${CXXINCLUDEDIR}/ext
+.if ${MK_GNUCXX} == no ${COMPILER_TYPE} == gcc
+CLEANFILES+= libstdc++.so libstdc++.a
+
+afterinstall:
+ ln -sf ${DESTDIR}${LIBDIR}/lib${LIB}.so \
+ ${.OBJDIR}/libstdc++.so
+ ln -sf ${DESTDIR}${LIBDIR}/lib${LIB}.a \
+ ${.OBJDIR}/libstdc++.a
+.endif
+
.include bsd.lib.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273408 - head
Author: bapt
Date: Tue Oct 21 20:07:15 2014
New Revision: 273408
URL: https://svnweb.freebsd.org/changeset/base/273408
Log:
Make the external toolchain support grows to the knowleged of XXFLAGS for C++
dedicated flags
and DEPFLAGS for mkdep flags
Pass the path to the libc++ headers in both, enforce the gnu++11 standard in
the XXFLAGS
to satisfy libc++ requirements pass the libc++ objectdir as a location where
to find
libraries so it can find libstdc++.so and libstdc++.A
Reviewed by: imp
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Oct 21 20:04:05 2014(r273407)
+++ head/Makefile.inc1 Tue Oct 21 20:07:15 2014(r273408)
@@ -323,7 +323,8 @@ X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${
X${BINUTIL}?= ${${BINUTIL}}
.endif
.endfor
-WMAKEENV+= CC=${XCC} ${XFLAGS} CXX=${XCXX} ${XFLAGS} \
+WMAKEENV+= CC=${XCC} ${XFLAGS} CXX=${XCXX} ${XFLAGS} ${XXFLAGS} \
+ DEPFLAGS=${DEPFLAGS} \
CPP=${XCPP} ${XFLAGS} \
AS=${XAS} AR=${XAR} LD=${XLD} NM=${XNM} \
OBJDUMP=${XOBJDUMP} OBJCOPY=${XOBJCOPY} \
@@ -351,6 +352,8 @@ TARGET_ABI= gnueabi
.endif
.if defined(X_COMPILER_TYPE) ${X_COMPILER_TYPE} == gcc
XFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+XXFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11
-L${WORLDTMP}/../lib/libc++
+DEPFLAGS+= -I${WORLDTMP}/usr/include/c++/v1
.else
TARGET_ABI?= unknown
TARGET_TRIPLE?=${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273409 - head/share/mk
Author: bapt
Date: Tue Oct 21 20:11:05 2014
New Revision: 273409
URL: https://svnweb.freebsd.org/changeset/base/273409
Log:
Do not make ld(1) warnings fatal anymore, binutils behaviour has changed over
the
time and gnu.warnings.symbol are now being fatal preventing building world.
in the futur we want to investigate only making the gnu.warning.symbol non
fatal
Reviewed by: imp
Modified:
head/share/mk/bsd.lib.mk
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Oct 21 20:07:15 2014(r273408)
+++ head/share/mk/bsd.lib.mkTue Oct 21 20:11:05 2014(r273409)
@@ -207,7 +207,7 @@ _LIBS+= ${SHLIB_NAME}
SOLINKOPTS=-shared -Wl,-x
.if !defined(ALLOW_SHARED_TEXTREL)
-SOLINKOPTS+= -Wl,--fatal-warnings -Wl,--warn-shared-textrel
+SOLINKOPTS+= -Wl,--no-fatal-warnings -Wl,--warn-shared-textrel
.endif
.if target(beforelinking)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273410 - head/contrib/netbsd-tests/lib/libc/sys
Author: ngie
Date: Tue Oct 21 20:17:05 2014
New Revision: 273410
URL: https://svnweb.freebsd.org/changeset/base/273410
Log:
Add sys/socket.h #include for bind(2), et al
Sponsored by: EMC / Isilon Storage Division
Modified:
head/contrib/netbsd-tests/lib/libc/sys/t_connect.c
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_connect.c
==
--- head/contrib/netbsd-tests/lib/libc/sys/t_connect.c Tue Oct 21 20:11:05
2014(r273409)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_connect.c Tue Oct 21 20:17:05
2014(r273410)
@@ -36,6 +36,10 @@
#include atf-c.h
+#ifdef __FreeBSD__
+#include sys/socket.h
+#endif
+
ATF_TC(connect_low_port);
ATF_TC_HEAD(connect_low_port, tc)
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273412 - in stable/9: sbin/routed sys/kern usr.sbin/rtsold
Author: delphij
Date: Tue Oct 21 20:20:17 2014
New Revision: 273412
URL: https://svnweb.freebsd.org/changeset/base/273412
Log:
Fix rtsold(8) remote buffer overflow vulnerability. [SA-14:20]
Fix routed(8) remote denial of service vulnerability. [SA-14:21]
Fix memory leak in sandboxed namei lookup. [SA-14:22]
Modified:
stable/9/sbin/routed/input.c
stable/9/sys/kern/vfs_lookup.c
stable/9/usr.sbin/rtsold/rtsol.c
Modified: stable/9/sbin/routed/input.c
==
--- stable/9/sbin/routed/input.cTue Oct 21 20:20:07 2014
(r273411)
+++ stable/9/sbin/routed/input.cTue Oct 21 20:20:17 2014
(r273412)
@@ -288,6 +288,10 @@ input(struct sockaddr_in *from,/* rece
/* Answer a query from a utility program
* with all we know.
*/
+ if (aifp == NULL) {
+ trace_pkt(ignore remote query);
+ return;
+ }
if (from-sin_port != htons(RIP_PORT)) {
supply(from, aifp, OUT_QUERY, 0,
rip-rip_vers, ap != 0);
Modified: stable/9/sys/kern/vfs_lookup.c
==
--- stable/9/sys/kern/vfs_lookup.c Tue Oct 21 20:20:07 2014
(r273411)
+++ stable/9/sys/kern/vfs_lookup.c Tue Oct 21 20:20:17 2014
(r273412)
@@ -121,6 +121,16 @@ TUNABLE_INT(vfs.lookup_shared, lookup
* if symbolic link, massage name in buffer and continue
* }
*/
+static void
+namei_cleanup_cnp(struct componentname *cnp)
+{
+ uma_zfree(namei_zone, cnp-cn_pnbuf);
+#ifdef DIAGNOSTIC
+ cnp-cn_pnbuf = NULL;
+ cnp-cn_nameptr = NULL;
+#endif
+}
+
int
namei(struct nameidata *ndp)
{
@@ -182,11 +192,7 @@ namei(struct nameidata *ndp)
}
#endif
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
ndp-ni_vp = NULL;
return (error);
}
@@ -248,11 +254,7 @@ namei(struct nameidata *ndp)
}
}
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
return (error);
}
}
@@ -278,8 +280,10 @@ namei(struct nameidata *ndp)
if (*(cnp-cn_nameptr) == '/') {
vrele(dp);
VFS_UNLOCK_GIANT(vfslocked);
- if (ndp-ni_strictrelative != 0)
+ if (ndp-ni_strictrelative != 0) {
+ namei_cleanup_cnp(cnp);
return (ENOTCAPABLE);
+ }
while (*(cnp-cn_nameptr) == '/') {
cnp-cn_nameptr++;
ndp-ni_pathlen--;
@@ -293,11 +297,7 @@ namei(struct nameidata *ndp)
ndp-ni_startdir = dp;
error = lookup(ndp);
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
SDT_PROBE(vfs, namei, lookup, return, error, NULL, 0,
0, 0);
return (error);
@@ -309,11 +309,7 @@ namei(struct nameidata *ndp)
*/
if ((cnp-cn_flags ISSYMLINK) == 0) {
if ((cnp-cn_flags (SAVENAME | SAVESTART)) == 0) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
} else
cnp-cn_flags |= HASBUF;
@@ -379,11 +375,7 @@ namei(struct nameidata *ndp)
vput(ndp-ni_vp);
dp = ndp-ni_dvp;
}
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
vput(ndp-ni_vp);
ndp-ni_vp = NULL;
vrele(ndp-ni_dvp);
Modified: stable/9/usr.sbin/rtsold/rtsol.c
==
---
svn commit: r273411 - in stable/10: sys/kern usr.sbin/rtsold
Author: delphij
Date: Tue Oct 21 20:20:07 2014
New Revision: 273411
URL: https://svnweb.freebsd.org/changeset/base/273411
Log:
Fix rtsold(8) remote buffer overflow vulnerability. [SA-14:20]
Fix memory leak in sandboxed namei lookup. [SA-14:22]
Modified:
stable/10/sys/kern/vfs_lookup.c
stable/10/usr.sbin/rtsold/rtsol.c
Modified: stable/10/sys/kern/vfs_lookup.c
==
--- stable/10/sys/kern/vfs_lookup.c Tue Oct 21 20:17:05 2014
(r273410)
+++ stable/10/sys/kern/vfs_lookup.c Tue Oct 21 20:20:07 2014
(r273411)
@@ -121,6 +121,16 @@ TUNABLE_INT(vfs.lookup_shared, lookup
* if symbolic link, massage name in buffer and continue
* }
*/
+static void
+namei_cleanup_cnp(struct componentname *cnp)
+{
+ uma_zfree(namei_zone, cnp-cn_pnbuf);
+#ifdef DIAGNOSTIC
+ cnp-cn_pnbuf = NULL;
+ cnp-cn_nameptr = NULL;
+#endif
+}
+
int
namei(struct nameidata *ndp)
{
@@ -185,11 +195,7 @@ namei(struct nameidata *ndp)
}
#endif
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
ndp-ni_vp = NULL;
return (error);
}
@@ -256,11 +262,7 @@ namei(struct nameidata *ndp)
}
}
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
return (error);
}
}
@@ -286,6 +288,7 @@ namei(struct nameidata *ndp)
if (KTRPOINT(curthread, KTR_CAPFAIL))
ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL);
#endif
+ namei_cleanup_cnp(cnp);
return (ENOTCAPABLE);
}
while (*(cnp-cn_nameptr) == '/') {
@@ -298,11 +301,7 @@ namei(struct nameidata *ndp)
ndp-ni_startdir = dp;
error = lookup(ndp);
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
SDT_PROBE(vfs, namei, lookup, return, error, NULL, 0,
0, 0);
return (error);
@@ -312,11 +311,7 @@ namei(struct nameidata *ndp)
*/
if ((cnp-cn_flags ISSYMLINK) == 0) {
if ((cnp-cn_flags (SAVENAME | SAVESTART)) == 0) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
} else
cnp-cn_flags |= HASBUF;
@@ -378,11 +373,7 @@ namei(struct nameidata *ndp)
vput(ndp-ni_vp);
dp = ndp-ni_dvp;
}
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
vput(ndp-ni_vp);
ndp-ni_vp = NULL;
vrele(ndp-ni_dvp);
Modified: stable/10/usr.sbin/rtsold/rtsol.c
==
--- stable/10/usr.sbin/rtsold/rtsol.c Tue Oct 21 20:17:05 2014
(r273410)
+++ stable/10/usr.sbin/rtsold/rtsol.c Tue Oct 21 20:20:07 2014
(r273411)
@@ -933,7 +933,8 @@ dname_labeldec(char *dst, size_t dlen, c
dst_origin = dst;
memset(dst, '\0', dlen);
while (src (len = (uint8_t)(*src++) 0x3f)
- (src + len) = src_last) {
+ (src + len) = src_last
+ (dst - dst_origin (ssize_t)dlen)) {
if (dst != dst_origin)
*dst++ = '.';
warnmsg(LOG_DEBUG, __func__, labellen = %zd, len);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273413 - stable/8/sbin/routed
Author: delphij
Date: Tue Oct 21 20:20:26 2014
New Revision: 273413
URL: https://svnweb.freebsd.org/changeset/base/273413
Log:
Fix routed(8) remote denial of service vulnerability. [SA-14:21]
Modified:
stable/8/sbin/routed/input.c
Modified: stable/8/sbin/routed/input.c
==
--- stable/8/sbin/routed/input.cTue Oct 21 20:20:17 2014
(r273412)
+++ stable/8/sbin/routed/input.cTue Oct 21 20:20:26 2014
(r273413)
@@ -288,6 +288,10 @@ input(struct sockaddr_in *from,/* rece
/* Answer a query from a utility program
* with all we know.
*/
+ if (aifp == NULL) {
+ trace_pkt(ignore remote query);
+ return;
+ }
if (from-sin_port != htons(RIP_PORT)) {
supply(from, aifp, OUT_QUERY, 0,
rip-rip_vers, ap != 0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273414 - in releng/10.1: sbin/routed sys/kern usr.sbin/rtsold
Author: delphij
Date: Tue Oct 21 20:20:36 2014
New Revision: 273414
URL: https://svnweb.freebsd.org/changeset/base/273414
Log:
Fix rtsold(8) remote buffer overflow vulnerability. [SA-14:20]
Fix routed(8) remote denial of service vulnerability. [SA-14:21]
Fix memory leak in sandboxed namei lookup. [SA-14:22]
Approved by: re (so@ blanket)
Modified:
releng/10.1/sbin/routed/input.c
releng/10.1/sys/kern/vfs_lookup.c
releng/10.1/usr.sbin/rtsold/rtsol.c
Modified: releng/10.1/sbin/routed/input.c
==
--- releng/10.1/sbin/routed/input.c Tue Oct 21 20:20:26 2014
(r273413)
+++ releng/10.1/sbin/routed/input.c Tue Oct 21 20:20:36 2014
(r273414)
@@ -288,6 +288,10 @@ input(struct sockaddr_in *from,/* rece
/* Answer a query from a utility program
* with all we know.
*/
+ if (aifp == NULL) {
+ trace_pkt(ignore remote query);
+ return;
+ }
if (from-sin_port != htons(RIP_PORT)) {
supply(from, aifp, OUT_QUERY, 0,
rip-rip_vers, ap != 0);
Modified: releng/10.1/sys/kern/vfs_lookup.c
==
--- releng/10.1/sys/kern/vfs_lookup.c Tue Oct 21 20:20:26 2014
(r273413)
+++ releng/10.1/sys/kern/vfs_lookup.c Tue Oct 21 20:20:36 2014
(r273414)
@@ -121,6 +121,16 @@ TUNABLE_INT(vfs.lookup_shared, lookup
* if symbolic link, massage name in buffer and continue
* }
*/
+static void
+namei_cleanup_cnp(struct componentname *cnp)
+{
+ uma_zfree(namei_zone, cnp-cn_pnbuf);
+#ifdef DIAGNOSTIC
+ cnp-cn_pnbuf = NULL;
+ cnp-cn_nameptr = NULL;
+#endif
+}
+
int
namei(struct nameidata *ndp)
{
@@ -185,11 +195,7 @@ namei(struct nameidata *ndp)
}
#endif
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
ndp-ni_vp = NULL;
return (error);
}
@@ -256,11 +262,7 @@ namei(struct nameidata *ndp)
}
}
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
return (error);
}
}
@@ -286,6 +288,7 @@ namei(struct nameidata *ndp)
if (KTRPOINT(curthread, KTR_CAPFAIL))
ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL);
#endif
+ namei_cleanup_cnp(cnp);
return (ENOTCAPABLE);
}
while (*(cnp-cn_nameptr) == '/') {
@@ -298,11 +301,7 @@ namei(struct nameidata *ndp)
ndp-ni_startdir = dp;
error = lookup(ndp);
if (error) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
SDT_PROBE(vfs, namei, lookup, return, error, NULL, 0,
0, 0);
return (error);
@@ -312,11 +311,7 @@ namei(struct nameidata *ndp)
*/
if ((cnp-cn_flags ISSYMLINK) == 0) {
if ((cnp-cn_flags (SAVENAME | SAVESTART)) == 0) {
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
} else
cnp-cn_flags |= HASBUF;
@@ -378,11 +373,7 @@ namei(struct nameidata *ndp)
vput(ndp-ni_vp);
dp = ndp-ni_dvp;
}
- uma_zfree(namei_zone, cnp-cn_pnbuf);
-#ifdef DIAGNOSTIC
- cnp-cn_pnbuf = NULL;
- cnp-cn_nameptr = NULL;
-#endif
+ namei_cleanup_cnp(cnp);
vput(ndp-ni_vp);
ndp-ni_vp = NULL;
vrele(ndp-ni_dvp);
Modified: releng/10.1/usr.sbin/rtsold/rtsol.c
==
--- releng/10.1/usr.sbin/rtsold/rtsol.c Tue Oct 21 20:20:26 2014
(r273413)
+++ releng/10.1/usr.sbin/rtsold/rtsol.c Tue Oct 21 20:20:36 2014
svn commit: r273415 - in releng: 10.0 10.0/crypto/openssl/apps 10.0/crypto/openssl/ssl 10.0/sbin/routed 10.0/sys/conf 10.0/sys/kern 10.0/usr.sbin/rtsold 9.1 9.1/crypto/openssl/apps 9.1/crypto/opens...
Author: delphij Date: Tue Oct 21 20:21:10 2014 New Revision: 273415 URL: https://svnweb.freebsd.org/changeset/base/273415 Log: Fix rtsold(8) remote buffer overflow vulnerability. [SA-14:20] Fix routed(8) remote denial of service vulnerability. [SA-14:21] Fix memory leak in sandboxed namei lookup. [SA-14:22] Fix OpenSSL multiple vulnerabilities. [SA-14:23] Approved by: so Modified: releng/10.0/UPDATING releng/10.0/crypto/openssl/apps/s_client.c releng/10.0/crypto/openssl/ssl/d1_lib.c releng/10.0/crypto/openssl/ssl/d1_srtp.c releng/10.0/crypto/openssl/ssl/dtls1.h releng/10.0/crypto/openssl/ssl/s23_clnt.c releng/10.0/crypto/openssl/ssl/s23_srvr.c releng/10.0/crypto/openssl/ssl/s2_lib.c releng/10.0/crypto/openssl/ssl/s3_enc.c releng/10.0/crypto/openssl/ssl/s3_lib.c releng/10.0/crypto/openssl/ssl/ssl.h releng/10.0/crypto/openssl/ssl/ssl3.h releng/10.0/crypto/openssl/ssl/ssl_err.c releng/10.0/crypto/openssl/ssl/ssl_lib.c releng/10.0/crypto/openssl/ssl/t1_enc.c releng/10.0/crypto/openssl/ssl/t1_lib.c releng/10.0/crypto/openssl/ssl/tls1.h releng/10.0/sbin/routed/input.c releng/10.0/sys/conf/newvers.sh releng/10.0/sys/kern/vfs_lookup.c releng/10.0/usr.sbin/rtsold/rtsol.c releng/9.1/UPDATING releng/9.1/crypto/openssl/apps/s_cb.c releng/9.1/crypto/openssl/apps/s_client.c releng/9.1/crypto/openssl/crypto/err/openssl.ec releng/9.1/crypto/openssl/doc/apps/s_client.pod releng/9.1/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod releng/9.1/crypto/openssl/ssl/d1_lib.c releng/9.1/crypto/openssl/ssl/dtls1.h releng/9.1/crypto/openssl/ssl/s23_clnt.c releng/9.1/crypto/openssl/ssl/s23_srvr.c releng/9.1/crypto/openssl/ssl/s2_lib.c releng/9.1/crypto/openssl/ssl/s3_enc.c releng/9.1/crypto/openssl/ssl/s3_lib.c releng/9.1/crypto/openssl/ssl/ssl.h releng/9.1/crypto/openssl/ssl/ssl3.h releng/9.1/crypto/openssl/ssl/ssl_err.c releng/9.1/crypto/openssl/ssl/ssl_lib.c releng/9.1/crypto/openssl/ssl/ssl_stat.c releng/9.1/crypto/openssl/ssl/t1_enc.c releng/9.1/crypto/openssl/ssl/t1_lib.c releng/9.1/crypto/openssl/ssl/tls1.h releng/9.1/sbin/routed/input.c releng/9.1/sys/conf/newvers.sh releng/9.1/sys/kern/vfs_lookup.c releng/9.1/usr.sbin/rtsold/rtsol.c releng/9.2/UPDATING releng/9.2/crypto/openssl/apps/s_cb.c releng/9.2/crypto/openssl/apps/s_client.c releng/9.2/crypto/openssl/crypto/err/openssl.ec releng/9.2/crypto/openssl/doc/apps/s_client.pod releng/9.2/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod releng/9.2/crypto/openssl/ssl/d1_lib.c releng/9.2/crypto/openssl/ssl/dtls1.h releng/9.2/crypto/openssl/ssl/s23_clnt.c releng/9.2/crypto/openssl/ssl/s23_srvr.c releng/9.2/crypto/openssl/ssl/s2_lib.c releng/9.2/crypto/openssl/ssl/s3_enc.c releng/9.2/crypto/openssl/ssl/s3_lib.c releng/9.2/crypto/openssl/ssl/ssl.h releng/9.2/crypto/openssl/ssl/ssl3.h releng/9.2/crypto/openssl/ssl/ssl_err.c releng/9.2/crypto/openssl/ssl/ssl_lib.c releng/9.2/crypto/openssl/ssl/ssl_stat.c releng/9.2/crypto/openssl/ssl/t1_enc.c releng/9.2/crypto/openssl/ssl/t1_lib.c releng/9.2/crypto/openssl/ssl/tls1.h releng/9.2/sbin/routed/input.c releng/9.2/sys/conf/newvers.sh releng/9.2/sys/kern/vfs_lookup.c releng/9.2/usr.sbin/rtsold/rtsol.c releng/9.3/UPDATING releng/9.3/crypto/openssl/apps/s_client.c releng/9.3/crypto/openssl/crypto/err/openssl.ec releng/9.3/crypto/openssl/doc/apps/s_client.pod releng/9.3/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod releng/9.3/crypto/openssl/ssl/d1_lib.c releng/9.3/crypto/openssl/ssl/dtls1.h releng/9.3/crypto/openssl/ssl/s23_clnt.c releng/9.3/crypto/openssl/ssl/s23_srvr.c releng/9.3/crypto/openssl/ssl/s2_lib.c releng/9.3/crypto/openssl/ssl/s3_enc.c releng/9.3/crypto/openssl/ssl/s3_lib.c releng/9.3/crypto/openssl/ssl/ssl.h releng/9.3/crypto/openssl/ssl/ssl3.h releng/9.3/crypto/openssl/ssl/ssl_err.c releng/9.3/crypto/openssl/ssl/ssl_lib.c releng/9.3/crypto/openssl/ssl/t1_enc.c releng/9.3/crypto/openssl/ssl/t1_lib.c releng/9.3/crypto/openssl/ssl/tls1.h releng/9.3/sbin/routed/input.c releng/9.3/sys/conf/newvers.sh releng/9.3/sys/kern/vfs_lookup.c releng/9.3/usr.sbin/rtsold/rtsol.c Modified: releng/10.0/UPDATING == --- releng/10.0/UPDATINGTue Oct 21 20:20:36 2014(r273414) +++ releng/10.0/UPDATINGTue Oct 21 20:21:10 2014(r273415) @@ -16,6 +16,19 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20141021: p10 FreeBSD-SA-14:20.rtsold + FreeBSD-SA-14:21.routed + FreeBSD-SA-14:22.namei + FreeBSD-SA-14:23.openssl + + Fix rtsold(8) remote buffer overflow vulnerability. [SA-14:20] + + Fix routed(8) remote denial of service vulnerability. [SA-14:21
svn commit: r273416 - in releng/8.4: . crypto/openssl/apps crypto/openssl/crypto/err crypto/openssl/doc/apps crypto/openssl/doc/ssl crypto/openssl/ssl sbin/routed sys/conf
Author: delphij Date: Tue Oct 21 20:21:27 2014 New Revision: 273416 URL: https://svnweb.freebsd.org/changeset/base/273416 Log: Fix routed(8) remote denial of service vulnerability. [SA-14:21] Fix OpenSSL multiple vulnerabilities. [SA-14:23] Approved by: so Modified: releng/8.4/UPDATING releng/8.4/crypto/openssl/apps/s_cb.c releng/8.4/crypto/openssl/apps/s_client.c releng/8.4/crypto/openssl/crypto/err/openssl.ec releng/8.4/crypto/openssl/doc/apps/s_client.pod releng/8.4/crypto/openssl/doc/ssl/SSL_CTX_set_mode.pod releng/8.4/crypto/openssl/ssl/d1_lib.c releng/8.4/crypto/openssl/ssl/dtls1.h releng/8.4/crypto/openssl/ssl/s23_clnt.c releng/8.4/crypto/openssl/ssl/s23_srvr.c releng/8.4/crypto/openssl/ssl/s2_lib.c releng/8.4/crypto/openssl/ssl/s3_enc.c releng/8.4/crypto/openssl/ssl/s3_lib.c releng/8.4/crypto/openssl/ssl/ssl.h releng/8.4/crypto/openssl/ssl/ssl3.h releng/8.4/crypto/openssl/ssl/ssl_err.c releng/8.4/crypto/openssl/ssl/ssl_lib.c releng/8.4/crypto/openssl/ssl/ssl_stat.c releng/8.4/crypto/openssl/ssl/t1_enc.c releng/8.4/crypto/openssl/ssl/t1_lib.c releng/8.4/crypto/openssl/ssl/tls1.h releng/8.4/sbin/routed/input.c releng/8.4/sys/conf/newvers.sh Modified: releng/8.4/UPDATING == --- releng/8.4/UPDATING Tue Oct 21 20:21:10 2014(r273415) +++ releng/8.4/UPDATING Tue Oct 21 20:21:27 2014(r273416) @@ -15,6 +15,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20141021: p17 FreeBSD-SA-14:21.routed + FreeBSD-SA-14:23.openssl + + Fix routed(8) remote denial of service vulnerability. [SA-14:21] + + Fix OpenSSL multiple vulnerabilities. [SA-14:23] + 20140916: p16 FreeBSD-SA-14:19.tcp Fix Denial of Service in TCP packet processing. [SA-14:19] Modified: releng/8.4/crypto/openssl/apps/s_cb.c == --- releng/8.4/crypto/openssl/apps/s_cb.c Tue Oct 21 20:21:10 2014 (r273415) +++ releng/8.4/crypto/openssl/apps/s_cb.c Tue Oct 21 20:21:27 2014 (r273416) @@ -518,6 +518,24 @@ void MS_CALLBACK msg_cb(int write_p, int case 100: str_details2 = no_renegotiation; break; + case 110: + str_details2 = unsupported_extension; + break; + case 111: + str_details2 = certificate_unobtainable; + break; + case 112: + str_details2 = unrecognized_name; + break; + case 113: + str_details2 = bad_certificate_status_response; + break; + case 114: + str_details2 = bad_certificate_hash_value; + break; + case 115: + str_details2 = unknown_psk_identity; + break; } } } Modified: releng/8.4/crypto/openssl/apps/s_client.c == --- releng/8.4/crypto/openssl/apps/s_client.c Tue Oct 21 20:21:10 2014 (r273415) +++ releng/8.4/crypto/openssl/apps/s_client.c Tue Oct 21 20:21:27 2014 (r273416) @@ -226,6 +226,7 @@ static void sc_usage(void) BIO_printf(bio_err, -ssl3 - just use SSLv3\n); BIO_printf(bio_err, -tls1 - just use TLSv1\n); BIO_printf(bio_err, -dtls1- just use DTLSv1\n); + BIO_printf(bio_err, -fallback_scsv - send TLS_FALLBACK_SCSV\n); BIO_printf(bio_err, -mtu - set the link layer MTU\n); BIO_printf(bio_err, -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n); BIO_printf(bio_err, -bugs - Switch on all SSL implementation bug workarounds\n); @@ -339,6 +340,7 @@ int MAIN(int argc, char **argv) char *sess_out = NULL; struct sockaddr peer; int peerlen = sizeof(peer); + int fallback_scsv = 0; int enable_timeouts = 0 ; long socket_mtu = 0; #ifndef OPENSSL_NO_JPAKE @@ -488,6 +490,10 @@ int MAIN(int argc, char **argv) socket_mtu = atol(*(++argv)); } #endif + else if (strcmp
svn commit: r273417 - head
Author: imp
Date: Tue Oct 21 20:29:42 2014
New Revision: 273417
URL: https://svnweb.freebsd.org/changeset/base/273417
Log:
You aren't allowed to test WITH_xxx or WITHOUT_xxx here, so remove it.
Even if you were allowed to test for it, the test makes no sense as it
always results in adding -DWITH_ATF unless WITH_ATF was already
defined. But if MK_ATF != no, then we know it was defined. This, in
turn, caused tools/build/options/makemake always think WITH_ATF is the
default, which removed control of that from sys.conf.mk.
To get the intent of the deleted comment, another mechanism is
required, assuming that the intent of that comment is desirable.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Oct 21 20:21:27 2014(r273416)
+++ head/Makefile.inc1 Tue Oct 21 20:29:42 2014(r273417)
@@ -1561,12 +1561,7 @@ gnu/lib/libsupc++__L: gnu/lib/libstdc++_
lib/libgeom__L: lib/libexpat__L
-.if defined(WITH_ATF) || ${MK_TESTS} != no
-.if !defined(WITH_ATF)
-# Ensure that the ATF libraries will be built during make libraries, even
-# though they will have WITHOUT_TESTS
-MAKE+= -DWITH_ATF
-.endif
+.if ${MK_TESTS} != no
_lib_atf= lib/atf
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273418 - head
Author: imp
Date: Tue Oct 21 20:29:51 2014
New Revision: 273418
URL: https://svnweb.freebsd.org/changeset/base/273418
Log:
Generate both userland and kernel option settings for showconfig.
PR: 191920
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Oct 21 20:29:42 2014(r273417)
+++ head/Makefile.inc1 Tue Oct 21 20:29:51 2014(r273418)
@@ -1886,7 +1886,8 @@ check-old: check-old-files check-old-lib
# showconfig - show build configuration.
#
showconfig:
- @${MAKE} -n -f src.opts.mk -V dummy -dg1 21 | grep ^MK_ | sort
+ @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \
+ ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 21 |
grep ^MK_ | sort -u
.if !empty(KRNLOBJDIR) !empty(KERNCONF)
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273419 - head/share/mk
Author: imp Date: Tue Oct 21 20:29:53 2014 New Revision: 273419 URL: https://svnweb.freebsd.org/changeset/base/273419 Log: For the kernel, we have USB_GADGET_EXAMPLES as defaults to yes. For userland defaults to no. This caused issues for the automated option documenation script. Turns out, this isn't used in userland at all, so just remove it from here. Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk == --- head/share/mk/src.opts.mk Tue Oct 21 20:29:51 2014(r273418) +++ head/share/mk/src.opts.mk Tue Oct 21 20:29:53 2014(r273419) @@ -169,8 +169,7 @@ __DEFAULT_NO_OPTIONS = \ OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN \ SORT_THREADS \ -SVN \ -USB_GADGET_EXAMPLES +SVN # # Default behaviour of some options depends on the architecture. Unfortunately ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273420 - head/share/man/man5
Author: emaste Date: Tue Oct 21 20:41:19 2014 New Revision: 273420 URL: https://svnweb.freebsd.org/changeset/base/273420 Log: Regenerate after r273418 Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Tue Oct 21 20:29:53 2014 (r273419) +++ head/share/man/man5/src.conf.5 Tue Oct 21 20:41:19 2014 (r273420) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. .\ from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\ $FreeBSD$ -.Dd October 16, 2014 +.Dd October 21, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -211,10 +211,10 @@ Set to build the Clang C/C++ compiler du It is a default setting on amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. .It Va WITHOUT_CLANG_BOOTSTRAP -.\ from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp +.\ from FreeBSD: head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP 273177 2014-10-16 18:28:11Z skreuzer Set to not build the Clang C/C++ compiler during the bootstrap phase of the build. -You must enable wither gcc or clang bootstrap to be able to build the system, -unless an alternative compiiler is provided via +You must enable either gcc or clang bootstrap to be able to build the system, +unless an alternative compiler is provided via XCC. .Pp It is a default setting on @@ -404,6 +404,12 @@ program to be built and installed as fma .\ from FreeBSD: head/tools/build/options/WITHOUT_FMTREE 261299 2014-01-30 21:37:43Z brooks Set to not build and install .Pa /usr/sbin/fmtree . +.It Va WITHOUT_FORMAT_EXTENSIONS +.\ from FreeBSD: head/tools/build/options/WITHOUT_FORMAT_EXTENSIONS 250658 2013-05-15 13:04:10Z brooks +Set to not enable +.Fl fformat-extensions +when compiling the kernel. +Also disables all format checking. .It Va WITHOUT_FORTH .\ from FreeBSD: head/tools/build/options/WITHOUT_FORTH 156932 2006-03-21 07:50:50Z ru Set to build bootloaders without Forth support. @@ -432,10 +438,10 @@ Set to build and install gcc and g++. It is a default setting on arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64. .It Va WITHOUT_GCC_BOOTSTRAP -.\ from FreeBSD: head/tools/build/options/WITHOUT_GCC_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp +.\ from FreeBSD: head/tools/build/options/WITHOUT_GCC_BOOTSTRAP 273177 2014-10-16 18:28:11Z skreuzer Set to not build gcc and g++ as part of the bootstrap process. -You must enable wither gcc or clang bootstrap to be able to build the system, -unless an alternative compiiler is provided via +You must enable either gcc or clang bootstrap to be able to build the system, +unless an alternative compiler is provided via XCC. .Pp It is a default setting on @@ -613,6 +619,12 @@ Set to build some programs without Kerbe .Xr sshd 8 , and .Xr telnetd 8 . +.It Va WITHOUT_KERNEL_SYMBOLS +.\ from FreeBSD: head/tools/build/options/WITHOUT_KERNEL_SYMBOLS 222189 2011-05-22 18:23:17Z imp +Set to not install kernel symbol files. +.Bf -symbolic +This option is recommended for those people who have small root partitions. +.Ef .It Va WITHOUT_KVM .\ from FreeBSD: head/tools/build/options/WITHOUT_KVM 174550 2007-12-12 16:43:17Z ru Set to not build the @@ -1077,9 +1089,6 @@ and related programs. .It Va WITHOUT_USB .\ from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. -.It Va WITH_USB_GADGET_EXAMPLES -.\ from FreeBSD: head/tools/build/options/WITH_USB_GADGET_EXAMPLES 254919 2013-08-26 17:15:56Z antoine -Set to build USB gadget kernel modules. .It Va WITHOUT_UTMPX .\ from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 231530 2012-02-11 20:28:42Z ed Set to not build user accounting tools such as ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273421 - head/tools/build/options
Author: emaste Date: Tue Oct 21 20:44:33 2014 New Revision: 273421 URL: https://svnweb.freebsd.org/changeset/base/273421 Log: Fix typo in src option description Modified: head/tools/build/options/WITHOUT_GNU_GREP_COMPAT Modified: head/tools/build/options/WITHOUT_GNU_GREP_COMPAT == --- head/tools/build/options/WITHOUT_GNU_GREP_COMPATTue Oct 21 20:41:19 2014(r273420) +++ head/tools/build/options/WITHOUT_GNU_GREP_COMPATTue Oct 21 20:44:33 2014(r273421) @@ -1,3 +1,3 @@ .\ $FreeBSD$ -Set this option to omit the gnu extentions to grep from being included in +Set this option to omit the gnu extensions to grep from being included in BSD grep. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273377 - in head: share/man/man9 sys/amd64/amd64 sys/arm/arm sys/cam/scsi sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/dev/dtrace sys/compat/ndis sys/dev/acpi_support sys/d
On 10/21/14 18:16, Konstantin Belousov wrote: On Tue, Oct 21, 2014 at 07:31:22AM +, Hans Petter Selasky wrote: Author: hselasky Date: Tue Oct 21 07:31:21 2014 New Revision: 273377 URL: https://svnweb.freebsd.org/changeset/base/273377 Log: Fix multiple incorrect SYSCTL arguments in the kernel: - Wrong integer type was specified. - Wrong or missing access specifier. The access specifier sometimes included the SYSCTL type, which it should not, except for procedural SYSCTL nodes. - Logical OR where binary OR was expected. - Properly assert the access argument passed to all SYSCTL macros, using the CTASSERT macro. This applies to both static- and dynamically created SYSCTLs. - Properly assert the the data type for both static and dynamic SYSCTLs. In the case of static SYSCTLs we only assert that the data pointed to by the SYSCTL data pointer has the correct size, hence there is no easy way to assert types in the C language outside a C-function. - Rewrote some code which doesn't pass a constant access specifier when creating dynamic SYSCTL nodes, which is now a requirement. - Updated EXAMPLES section in SYSCTL manual page. MFC after: 3 days Sponsored by:Mellanox Technologies Modified: head/share/man/man9/Makefile head/share/man/man9/sysctl.9 head/sys/amd64/amd64/fpu.c head/sys/arm/arm/busdma_machdep-v6.c head/sys/arm/arm/busdma_machdep.c head/sys/cam/scsi/scsi_sa.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c head/sys/cddl/dev/dtrace/dtrace_sysctl.c head/sys/compat/ndis/kern_ndis.c head/sys/dev/acpi_support/acpi_asus.c head/sys/dev/acpi_support/acpi_asus_wmi.c head/sys/dev/acpi_support/acpi_hp.c head/sys/dev/acpi_support/acpi_ibm.c head/sys/dev/acpi_support/acpi_rapidstart.c head/sys/dev/acpi_support/acpi_sony.c head/sys/dev/bxe/bxe.c head/sys/dev/cxgb/cxgb_sge.c head/sys/dev/cxgbe/t4_main.c head/sys/dev/e1000/if_em.c head/sys/dev/e1000/if_igb.c head/sys/dev/e1000/if_lem.c head/sys/dev/hatm/if_hatm.c head/sys/dev/ixgbe/ixgbe.c head/sys/dev/ixgbe/ixv.c head/sys/dev/ixl/if_ixl.c head/sys/dev/mpr/mpr.c head/sys/dev/mps/mps.c head/sys/dev/mrsas/mrsas.c head/sys/dev/mrsas/mrsas.h head/sys/dev/mxge/if_mxge.c head/sys/dev/oce/oce_sysctl.c head/sys/dev/qlxgb/qla_os.c head/sys/dev/qlxgbe/ql_os.c head/sys/dev/rt/if_rt.c head/sys/dev/sound/pci/hda/hdaa.c head/sys/dev/vxge/vxge.c head/sys/dev/xen/netfront/netfront.c head/sys/fs/devfs/devfs_devs.c head/sys/fs/fuse/fuse_main.c head/sys/fs/fuse/fuse_vfsops.c head/sys/geom/geom_kern.c head/sys/kern/kern_cpuset.c head/sys/kern/kern_descrip.c head/sys/kern/kern_mib.c head/sys/kern/kern_synch.c head/sys/kern/subr_devstat.c head/sys/kern/subr_kdb.c head/sys/kern/subr_uio.c head/sys/kern/vfs_cache.c head/sys/mips/mips/busdma_machdep.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_hwmp.c head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_superg.c head/sys/netgraph/bluetooth/common/ng_bluetooth.c head/sys/netgraph/ng_base.c head/sys/netgraph/ng_socket.c head/sys/netinet/cc/cc_chd.c head/sys/netinet/tcp_timer.c head/sys/netipsec/ipsec.h head/sys/netpfil/pf/pf.c head/sys/ofed/drivers/net/mlx4/mlx4_en.h head/sys/powerpc/powermac/fcu.c head/sys/powerpc/powermac/smu.c head/sys/powerpc/powerpc/cpu.c head/sys/sys/sysctl.h head/sys/vm/memguard.c head/sys/vm/vm_kern.c head/sys/x86/x86/busdma_bounce.c This seems to break at least PowerPC 64bit, or some bits were not committed. I have to add the following change to compile GENERIC64 kernel, otherwise I get cc1: warnings being treated as errors /usr/home/kostik/work/build/bsd/DEV/src/sys/powerpc/powerpc/busdma_machdep.c: In function 'alloc_bounce_zone': /usr/home/kostik/work/build/bsd/DEV/src/sys/powerpc/powerpc/busdma_machdep.c:1030: warning: initialization from incompatible pointer type *** [busdma_machdep.o] Error code 1 OTOH, I did not verified that 32bit PowerPC kernel is compilable with the change applied. diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index e35ecec..b58a91b 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -1027,9 +1027,9 @@ alloc_bounce_zone(bus_dma_tag_t dmat) SYSCTL_ADD_STRING(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, lowaddr, CTLFLAG_RD, bz-lowaddrid, 0, ); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), + SYSCTL_ADD_ULONG(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - alignment, CTLFLAG_RD, bz-alignment, 0, ); + alignment, CTLFLAG_RD, bz-alignment, ); return (0); } It think it is better to have it UAUTO, so that the macro will choose
Re: svn commit: r273335 - head/sys/fs/unionfs
On Mon, Oct 20, 2014 at 05:53:49PM +, Mateusz Guzik wrote: Author: mjg Date: Mon Oct 20 17:53:49 2014 New Revision: 273335 URL: https://svnweb.freebsd.org/changeset/base/273335 Log: unionfs: hold mount interlock while manipulating mnt_flag This is for consistency with other filesystems. Can you check interoperability unionfs with zfs and devfs? I have crashed unionfs with zfs. unionfs with devfs need double devfs mount. Modified: head/sys/fs/unionfs/union_vfsops.c Modified: head/sys/fs/unionfs/union_vfsops.c == --- head/sys/fs/unionfs/union_vfsops.cMon Oct 20 17:04:03 2014 (r273334) +++ head/sys/fs/unionfs/union_vfsops.cMon Oct 20 17:53:49 2014 (r273335) @@ -290,12 +290,14 @@ unionfs_domount(struct mount *mp) return (error); } + MNT_ILOCK(mp); /* * Check mnt_flag */ if ((ump-um_lowervp-v_mount-mnt_flag MNT_LOCAL) (ump-um_uppervp-v_mount-mnt_flag MNT_LOCAL)) mp-mnt_flag |= MNT_LOCAL; + MNT_IUNLOCK(mp); /* * Get new fsid ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273423 - head/sys/powerpc/powerpc
Author: hselasky Date: Tue Oct 21 21:04:44 2014 New Revision: 273423 URL: https://svnweb.freebsd.org/changeset/base/273423 Log: Use the UAUTO SYSCTL type for exporting the bounce zone alignment, because the variable size depends on the build type. Reported by: kib @ MFC after:3 days Modified: head/sys/powerpc/powerpc/busdma_machdep.c Modified: head/sys/powerpc/powerpc/busdma_machdep.c == --- head/sys/powerpc/powerpc/busdma_machdep.c Tue Oct 21 20:51:22 2014 (r273422) +++ head/sys/powerpc/powerpc/busdma_machdep.c Tue Oct 21 21:04:44 2014 (r273423) @@ -1027,9 +1027,9 @@ alloc_bounce_zone(bus_dma_tag_t dmat) SYSCTL_ADD_STRING(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, lowaddr, CTLFLAG_RD, bz-lowaddrid, 0, ); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), + SYSCTL_ADD_UAUTO(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - alignment, CTLFLAG_RD, bz-alignment, 0, ); + alignment, CTLFLAG_RD, bz-alignment, ); return (0); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273424 - head/sys/kern
Author: mjg
Date: Tue Oct 21 21:08:45 2014
New Revision: 273424
URL: https://svnweb.freebsd.org/changeset/base/273424
Log:
Mark some more sysctl stuff shared-locked and MPSAFE.
Modified:
head/sys/kern/kern_sysctl.c
Modified: head/sys/kern/kern_sysctl.c
==
--- head/sys/kern/kern_sysctl.c Tue Oct 21 21:04:44 2014(r273423)
+++ head/sys/kern/kern_sysctl.c Tue Oct 21 21:08:45 2014(r273424)
@@ -755,7 +755,7 @@ sysctl_sysctl_debug_dump_node(struct sys
int k;
struct sysctl_oid *oidp;
- SYSCTL_ASSERT_XLOCKED();
+ SYSCTL_ASSERT_LOCKED();
SLIST_FOREACH(oidp, l, oid_link) {
for (k=0; ki; k++)
@@ -800,13 +800,13 @@ sysctl_sysctl_debug(SYSCTL_HANDLER_ARGS)
error = priv_check(req-td, PRIV_SYSCTL_DEBUG);
if (error)
return (error);
- SYSCTL_XLOCK();
+ SYSCTL_SLOCK();
sysctl_sysctl_debug_dump_node(sysctl__children, 0);
- SYSCTL_XUNLOCK();
+ SYSCTL_SUNLOCK();
return (ENOENT);
}
-SYSCTL_PROC(_sysctl, 0, debug, CTLTYPE_STRING|CTLFLAG_RD,
+SYSCTL_PROC(_sysctl, 0, debug, CTLTYPE_STRING|CTLFLAG_RD|CTLFLAG_MPSAFE,
0, 0, sysctl_sysctl_debug, -, );
#endif
@@ -820,7 +820,7 @@ sysctl_sysctl_name(SYSCTL_HANDLER_ARGS)
struct sysctl_oid_list *lsp = sysctl__children, *lsp2;
char buf[10];
- SYSCTL_XLOCK();
+ SYSCTL_SLOCK();
while (namelen) {
if (!lsp) {
snprintf(buf,sizeof(buf),%d,*name);
@@ -863,7 +863,7 @@ sysctl_sysctl_name(SYSCTL_HANDLER_ARGS)
}
error = SYSCTL_OUT(req, , 1);
out:
- SYSCTL_XUNLOCK();
+ SYSCTL_SUNLOCK();
return (error);
}
@@ -871,7 +871,7 @@ sysctl_sysctl_name(SYSCTL_HANDLER_ARGS)
* XXXRW/JA: Shouldn't return name data for nodes that we don't permit in
* capability mode.
*/
-static SYSCTL_NODE(_sysctl, 1, name, CTLFLAG_RD | CTLFLAG_CAPRD,
+static SYSCTL_NODE(_sysctl, 1, name, CTLFLAG_RD | CTLFLAG_MPSAFE |
CTLFLAG_CAPRD,
sysctl_sysctl_name, );
static int
@@ -944,9 +944,9 @@ sysctl_sysctl_next(SYSCTL_HANDLER_ARGS)
struct sysctl_oid_list *lsp = sysctl__children;
int newoid[CTL_MAXNAME];
- SYSCTL_XLOCK();
+ SYSCTL_SLOCK();
i = sysctl_sysctl_next_ls(lsp, name, namelen, newoid, j, 1, oid);
- SYSCTL_XUNLOCK();
+ SYSCTL_SUNLOCK();
if (i)
return (ENOENT);
error = SYSCTL_OUT(req, newoid, j * sizeof (int));
@@ -957,7 +957,7 @@ sysctl_sysctl_next(SYSCTL_HANDLER_ARGS)
* XXXRW/JA: Shouldn't return next data for nodes that we don't permit in
* capability mode.
*/
-static SYSCTL_NODE(_sysctl, 2, next, CTLFLAG_RD | CTLFLAG_CAPRD,
+static SYSCTL_NODE(_sysctl, 2, next, CTLFLAG_RD | CTLFLAG_MPSAFE |
CTLFLAG_CAPRD,
sysctl_sysctl_next, );
static int
@@ -1048,7 +1048,7 @@ sysctl_sysctl_oidfmt(SYSCTL_HANDLER_ARGS
struct sysctl_oid *oid;
int error;
- SYSCTL_XLOCK();
+ SYSCTL_SLOCK();
error = sysctl_find_oid(arg1, arg2, oid, NULL, req);
if (error)
goto out;
@@ -1062,7 +1062,7 @@ sysctl_sysctl_oidfmt(SYSCTL_HANDLER_ARGS
goto out;
error = SYSCTL_OUT(req, oid-oid_fmt, strlen(oid-oid_fmt) + 1);
out:
- SYSCTL_XUNLOCK();
+ SYSCTL_SUNLOCK();
return (error);
}
@@ -1076,7 +1076,7 @@ sysctl_sysctl_oiddescr(SYSCTL_HANDLER_AR
struct sysctl_oid *oid;
int error;
- SYSCTL_XLOCK();
+ SYSCTL_SLOCK();
error = sysctl_find_oid(arg1, arg2, oid, NULL, req);
if (error)
goto out;
@@ -1087,11 +1087,11 @@ sysctl_sysctl_oiddescr(SYSCTL_HANDLER_AR
}
error = SYSCTL_OUT(req, oid-oid_descr, strlen(oid-oid_descr) + 1);
out:
- SYSCTL_XUNLOCK();
+ SYSCTL_SUNLOCK();
return (error);
}
-static SYSCTL_NODE(_sysctl, 5, oiddescr, CTLFLAG_RD|CTLFLAG_CAPRD,
+static SYSCTL_NODE(_sysctl, 5, oiddescr,
CTLFLAG_RD|CTLFLAG_MPSAFE|CTLFLAG_CAPRD,
sysctl_sysctl_oiddescr, );
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273426 - head/share/mk
Author: bapt
Date: Tue Oct 21 21:09:54 2014
New Revision: 273426
URL: https://svnweb.freebsd.org/changeset/base/273426
Log:
older binutils does not know about --no-fatal-warnings
Modified:
head/share/mk/bsd.lib.mk
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Oct 21 21:09:54 2014(r273425)
+++ head/share/mk/bsd.lib.mkTue Oct 21 21:09:54 2014(r273426)
@@ -207,7 +207,7 @@ _LIBS+= ${SHLIB_NAME}
SOLINKOPTS=-shared -Wl,-x
.if !defined(ALLOW_SHARED_TEXTREL)
-SOLINKOPTS+= -Wl,--no-fatal-warnings -Wl,--warn-shared-textrel
+SOLINKOPTS+= -Wl,--warn-shared-textrel
.endif
.if target(beforelinking)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273425 - stable/9/lib/libcrypt
Author: delphij
Date: Tue Oct 21 21:09:54 2014
New Revision: 273425
URL: https://svnweb.freebsd.org/changeset/base/273425
Log:
MFC r272830 (des):
Change the hardcoded default back from SHA512 to DES.
This will become EN-14:11.crypt.
PR: 192277
Modified:
stable/9/lib/libcrypt/crypt.c
Directory Properties:
stable/9/lib/libcrypt/ (props changed)
Modified: stable/9/lib/libcrypt/crypt.c
==
--- stable/9/lib/libcrypt/crypt.c Tue Oct 21 21:08:45 2014
(r273424)
+++ stable/9/lib/libcrypt/crypt.c Tue Oct 21 21:09:54 2014
(r273425)
@@ -37,24 +37,26 @@ __FBSDID($FreeBSD$);
#include crypt.h
/*
- * List of supported crypt(3) formats. The first element in the list will
- * be the default.
+ * List of supported crypt(3) formats.
+ *
+ * The default algorithm is the last entry in the list (second-to-last
+ * array element since the last is a sentinel). The reason for placing
+ * the default last rather than first is that DES needs to be at the
+ * bottom for the algorithm guessing logic in crypt(3) to work correctly,
+ * and it needs to be the default for backward compatibility.
*/
static const struct crypt_format {
const char *const name;
char *(*const func)(const char *, const char *);
const char *const magic;
} crypt_formats[] = {
- /* default format */
- { sha512, crypt_sha512, $6$ },
-
- /* other supported formats */
{ md5,crypt_md5, $1$ },
#ifdef HAS_BLOWFISH
{ blf,crypt_blowfish, $2},
#endif
{ nth,crypt_nthash, $3$ },
{ sha256, crypt_sha256, $5$ },
+ { sha512, crypt_sha512, $6$ },
#ifdef HAS_DES
{ des,crypt_des, _ },
#endif
@@ -63,7 +65,8 @@ static const struct crypt_format {
{ NULL, NULL, NULL}
};
-static const struct crypt_format *crypt_format = crypt_formats[0];
+static const struct crypt_format *crypt_format =
+crypt_formats[(sizeof crypt_formats / sizeof *crypt_formats) - 2];
#define DES_SALT_ALPHABET \
./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273427 - stable/9/usr.sbin/pw
Author: delphij
Date: Tue Oct 21 21:11:25 2014
New Revision: 273427
URL: https://svnweb.freebsd.org/changeset/base/273427
Log:
MFC r272833 (des):
Two more places where login_setcryptfmt() defaults to MD5 were missed
in r252688.
Modified:
stable/9/usr.sbin/pw/pw_user.c
Directory Properties:
stable/9/usr.sbin/pw/ (props changed)
Modified: stable/9/usr.sbin/pw/pw_user.c
==
--- stable/9/usr.sbin/pw/pw_user.c Tue Oct 21 21:09:54 2014
(r273426)
+++ stable/9/usr.sbin/pw/pw_user.c Tue Oct 21 21:11:25 2014
(r273427)
@@ -586,7 +586,7 @@ pw_user(struct userconf * cnf, int mode,
pwd-pw_dir = pw_homepolicy(cnf, args, pwd-pw_name);
pwd-pw_shell = pw_shellpolicy(cnf, args, NULL);
lc = login_getpwclass(pwd);
- if (lc == NULL || login_setcryptfmt(lc, md5, NULL) == NULL)
+ if (lc == NULL || login_setcryptfmt(lc, sha512, NULL) == NULL)
warn(setting crypt(3) format);
login_close(lc);
pwd-pw_passwd = pw_password(cnf, args, pwd-pw_name);
@@ -661,7 +661,7 @@ pw_user(struct userconf * cnf, int mode,
} else {
lc = login_getpwclass(pwd);
if (lc == NULL ||
- login_setcryptfmt(lc, md5, NULL) == NULL)
+ login_setcryptfmt(lc, sha512, NULL) ==
NULL)
warn(setting crypt(3) format);
login_close(lc);
pwd-pw_passwd = pw_pwcrypt(line);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273428 - head/share/mk
Author: bapt
Date: Tue Oct 21 21:17:44 2014
New Revision: 273428
URL: https://svnweb.freebsd.org/changeset/base/273428
Log:
Revert r273426 r273409
A solution that work with both new and old binutils should be investigated
Modified:
head/share/mk/bsd.lib.mk
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Oct 21 21:11:25 2014(r273427)
+++ head/share/mk/bsd.lib.mkTue Oct 21 21:17:44 2014(r273428)
@@ -207,7 +207,7 @@ _LIBS+= ${SHLIB_NAME}
SOLINKOPTS=-shared -Wl,-x
.if !defined(ALLOW_SHARED_TEXTREL)
-SOLINKOPTS+= -Wl,--warn-shared-textrel
+SOLINKOPTS+= -Wl,--fatal-warnings -Wl,--warn-shared-textrel
.endif
.if target(beforelinking)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273429 - stable/10/sys/dev/hyperv/storvsc
Author: gjb
Date: Tue Oct 21 21:27:13 2014
New Revision: 273429
URL: https://svnweb.freebsd.org/changeset/base/273429
Log:
MFC r273402:
Fix an issue where a FreeBSD virtual machine provisioned in
the Microsoft Azure service does not recognize the second
attached disk on the system.
PR: 194376
Insta-MFC OK: re (rodrigc)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==
--- stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Tue Oct 21
21:17:44 2014(r273428)
+++ stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Tue Oct 21
21:27:13 2014(r273429)
@@ -75,7 +75,7 @@ __FBSDID($FreeBSD$);
#define STORVSC_MAX_IO_REQUESTS(STORVSC_MAX_LUNS_PER_TARGET *
2)
#define BLKVSC_MAX_IDE_DISKS_PER_TARGET(1)
#define BLKVSC_MAX_IO_REQUESTS STORVSC_MAX_IO_REQUESTS
-#define STORVSC_MAX_TARGETS(1)
+#define STORVSC_MAX_TARGETS(2)
struct storvsc_softc;
@@ -584,7 +584,6 @@ hv_storvsc_on_iocompletion(struct storvs
vm_srb = vstor_packet-u.vm_srb;
- request-sense_info_len = 0;
if (((vm_srb-scsi_status 0xFF) == SCSI_STATUS_CHECK_COND)
(vm_srb-srb_status SRB_STATUS_AUTOSENSE_VALID)) {
/* Autosense data available */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273430 - head/sys/fs/tmpfs
Author: mjg Date: Tue Oct 21 21:27:13 2014 New Revision: 273430 URL: https://svnweb.freebsd.org/changeset/base/273430 Log: tmpfs: allow shared file lookups Tested by: pho Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c == --- head/sys/fs/tmpfs/tmpfs_vfsops.cTue Oct 21 21:27:13 2014 (r273429) +++ head/sys/fs/tmpfs/tmpfs_vfsops.cTue Oct 21 21:27:13 2014 (r273430) @@ -255,7 +255,7 @@ tmpfs_mount(struct mount *mp) MNT_ILOCK(mp); mp-mnt_flag |= MNT_LOCAL; - mp-mnt_kern_flag |= MNTK_SUSPENDABLE; + mp-mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_SUSPENDABLE; MNT_IUNLOCK(mp); mp-mnt_data = tmp; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273431 - head/sys/kern
Author: mjg
Date: Tue Oct 21 21:29:20 2014
New Revision: 273431
URL: https://svnweb.freebsd.org/changeset/base/273431
Log:
Take the lock shared in linker_search_symbol_name.
This helps sysctl kern.proc.stack.
Modified:
head/sys/kern/kern_linker.c
Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Tue Oct 21 21:27:13 2014(r273430)
+++ head/sys/kern/kern_linker.c Tue Oct 21 21:29:20 2014(r273431)
@@ -986,9 +986,9 @@ linker_search_symbol_name(caddr_t value,
{
int error;
- sx_xlock(kld_sx);
+ sx_slock(kld_sx);
error = linker_debug_search_symbol_name(value, buf, buflen, offset);
- sx_xunlock(kld_sx);
+ sx_sunlock(kld_sx);
return (error);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273274 - head/sys/netpfil/ipfw
On Sun, Oct 19, 2014 at 03:02:07PM +0300, Andriy Gapon wrote:
On 19/10/2014 14:15, Alexander V. Chernikov wrote:
+static uint32_t
+roundup2p(uint32_t v)
+{
+
+ v--;
+ v |= v 1;
+ v |= v 2;
+ v |= v 4;
+ v |= v 8;
+ v |= v 16;
+ v++;
+
+ return (v);
+}
I think that on platforms where an optimized version of fls() is available
that
would work faster than this cool piece of bit magic.
This code is not performance critical. I wouldn't bother optimizing it.
Rather, since this code must be platform independent, I'd like
to give it a name that does not conflict with any builtin.
cheers
luigi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273432 - head/sys/sys stable/10/sys/sys stable/8/sys/sys stable/9/sys/sys
Author: gjb Date: Tue Oct 21 21:37:53 2014 New Revision: 273432 URL: https://svnweb.freebsd.org/changeset/base/273432 Log: Bump __FreeBSD_version to track SA-14:20, SA-14:21, SA-14:22, SA-14:23 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/8/sys/sys/param.h Changes in other areas also in this revision: Modified: head/sys/sys/param.h stable/10/sys/sys/param.h stable/9/sys/sys/param.h Modified: stable/8/sys/sys/param.h == --- stable/8/sys/sys/param.hTue Oct 21 21:29:20 2014(r273431) +++ stable/8/sys/sys/param.hTue Oct 21 21:37:53 2014(r273432) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 804505 /* Master, propagated to newvers */ +#define __FreeBSD_version 804506 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273432 - head/sys/sys stable/10/sys/sys stable/8/sys/sys stable/9/sys/sys
Author: gjb Date: Tue Oct 21 21:37:53 2014 New Revision: 273432 URL: https://svnweb.freebsd.org/changeset/base/273432 Log: Bump __FreeBSD_version to track SA-14:20, SA-14:21, SA-14:22, SA-14:23 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/9/sys/sys/param.h Changes in other areas also in this revision: Modified: head/sys/sys/param.h stable/10/sys/sys/param.h stable/8/sys/sys/param.h Modified: stable/9/sys/sys/param.h == --- stable/9/sys/sys/param.hTue Oct 21 21:29:20 2014(r273431) +++ stable/9/sys/sys/param.hTue Oct 21 21:37:53 2014(r273432) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 903504 /* Master, propagated to newvers */ +#define __FreeBSD_version 903505 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273432 - head/sys/sys stable/10/sys/sys stable/8/sys/sys stable/9/sys/sys
Author: gjb Date: Tue Oct 21 21:37:53 2014 New Revision: 273432 URL: https://svnweb.freebsd.org/changeset/base/273432 Log: Bump __FreeBSD_version to track SA-14:20, SA-14:21, SA-14:22, SA-14:23 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: head/sys/sys/param.h Changes in other areas also in this revision: Modified: stable/10/sys/sys/param.h stable/8/sys/sys/param.h stable/9/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hTue Oct 21 21:29:20 2014(r273431) +++ head/sys/sys/param.hTue Oct 21 21:37:53 2014(r273432) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100039 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100040 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273432 - head/sys/sys stable/10/sys/sys stable/8/sys/sys stable/9/sys/sys
Author: gjb Date: Tue Oct 21 21:37:53 2014 New Revision: 273432 URL: https://svnweb.freebsd.org/changeset/base/273432 Log: Bump __FreeBSD_version to track SA-14:20, SA-14:21, SA-14:22, SA-14:23 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/sys/param.h Changes in other areas also in this revision: Modified: head/sys/sys/param.h stable/8/sys/sys/param.h stable/9/sys/sys/param.h Modified: stable/10/sys/sys/param.h == --- stable/10/sys/sys/param.h Tue Oct 21 21:29:20 2014(r273431) +++ stable/10/sys/sys/param.h Tue Oct 21 21:37:53 2014(r273432) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1001500 /* Master, propagated to newvers */ +#define __FreeBSD_version 1001501 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273400 - in head/sys: kern sys
On 21 Oct 2014, at 19:02 , Mateusz Guzik m...@freebsd.org wrote:
Author: mjg
Date: Tue Oct 21 19:02:26 2014
New Revision: 273400
URL: https://svnweb.freebsd.org/changeset/base/273400
Log:
Rename sysctl_lock and _unlock to sysctl_xlock and _xunlock.
You are perfectly describing what you are doing, but I’d also like to
understand the “why?”
Modified:
head/sys/kern/kern_linker.c
head/sys/kern/kern_sysctl.c
head/sys/kern/vfs_init.c
head/sys/sys/sysctl.h
Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Tue Oct 21 19:00:32 2014
(r273399)
+++ head/sys/kern/kern_linker.c Tue Oct 21 19:02:26 2014
(r273400)
@@ -292,10 +292,10 @@ linker_file_register_sysctls(linker_file
return;
sx_xunlock(kld_sx);
- sysctl_lock();
+ sysctl_xlock();
for (oidp = start; oidp stop; oidp++)
sysctl_register_oid(*oidp);
- sysctl_unlock();
+ sysctl_xunlock();
sx_xlock(kld_sx);
}
@@ -313,10 +313,10 @@ linker_file_unregister_sysctls(linker_fi
return;
sx_xunlock(kld_sx);
- sysctl_lock();
+ sysctl_xlock();
for (oidp = start; oidp stop; oidp++)
sysctl_unregister_oid(*oidp);
- sysctl_unlock();
+ sysctl_xunlock();
sx_xlock(kld_sx);
}
Modified: head/sys/kern/kern_sysctl.c
==
--- head/sys/kern/kern_sysctl.c Tue Oct 21 19:00:32 2014
(r273399)
+++ head/sys/kern/kern_sysctl.c Tue Oct 21 19:02:26 2014
(r273400)
@@ -126,14 +126,14 @@ sysctl_find_oidname(const char *name, st
* Order by number in each list.
*/
void
-sysctl_lock(void)
+sysctl_xlock(void)
{
SYSCTL_XLOCK();
}
void
-sysctl_unlock(void)
+sysctl_xunlock(void)
{
SYSCTL_XUNLOCK();
Modified: head/sys/kern/vfs_init.c
==
--- head/sys/kern/vfs_init.c Tue Oct 21 19:00:32 2014(r273399)
+++ head/sys/kern/vfs_init.c Tue Oct 21 19:02:26 2014(r273400)
@@ -291,7 +291,7 @@ vfs_register(struct vfsconf *vfc)
* preserved by re-registering the oid after modifying its
* number.
*/
- sysctl_lock();
+ sysctl_xlock();
SLIST_FOREACH(oidp, SYSCTL_CHILDREN(sysctl___vfs), oid_link) {
if (strcmp(oidp-oid_name, vfc-vfc_name) == 0) {
sysctl_unregister_oid(oidp);
@@ -300,7 +300,7 @@ vfs_register(struct vfsconf *vfc)
break;
}
}
- sysctl_unlock();
+ sysctl_xunlock();
return (0);
}
Modified: head/sys/sys/sysctl.h
==
--- head/sys/sys/sysctl.h Tue Oct 21 19:00:32 2014(r273399)
+++ head/sys/sys/sysctl.h Tue Oct 21 19:02:26 2014(r273400)
@@ -770,8 +770,8 @@ int userland_sysctl(struct thread *td, i
size_t *retval, int flags);
int sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
int *nindx, struct sysctl_req *req);
-void sysctl_lock(void);
-void sysctl_unlock(void);
+void sysctl_xlock(void);
+void sysctl_xunlock(void);
int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
struct sbuf;
—
Bjoern A. Zeeb Come on. Learn, goddamn it., WarGames, 1983
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273433 - releng/10.1/release/doc/en_US.ISO8859-1/relnotes stable/9/release/doc/en_US.ISO8859-1/errata
Author: gjb Date: Tue Oct 21 21:44:24 2014 New Revision: 273433 URL: https://svnweb.freebsd.org/changeset/base/273433 Log: Document the following security advisories: FreeBSD-SA-14:20.rtsold FreeBSD-SA-14:21.routed FreeBSD-SA-14:22.namei FreeBSD-SA-14:23.openssl Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xml Changes in other areas also in this revision: Modified: releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xml == --- stable/9/release/doc/en_US.ISO8859-1/errata/article.xml Tue Oct 21 21:37:53 2014(r273432) +++ stable/9/release/doc/en_US.ISO8859-1/errata/article.xml Tue Oct 21 21:44:24 2014(r273433) @@ -112,6 +112,33 @@ entryparaDenial of Service in TCP packet processing./para/entry /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:20.rtsold.asc;SA-14:20.rtsold/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaRemote buffer overflow + vulnerability./para/entry + /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:21.routed.asc;SA-14:21.routed/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaRemote denial of service + vulnerability./para/entry + /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:22.namei.asc;SA-14:22.namei/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaMemory leak in sandboxed namei + lookup./para/entry + /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:23.openssl.asc;SA-14:23.openssl/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaMultiple vulerabilities./para/entry + /row /tbody /tgroup /informaltable ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273433 - releng/10.1/release/doc/en_US.ISO8859-1/relnotes stable/9/release/doc/en_US.ISO8859-1/errata
Author: gjb Date: Tue Oct 21 21:44:24 2014 New Revision: 273433 URL: https://svnweb.freebsd.org/changeset/base/273433 Log: Document the following security advisories: FreeBSD-SA-14:20.rtsold FreeBSD-SA-14:21.routed FreeBSD-SA-14:22.namei FreeBSD-SA-14:23.openssl Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Changes in other areas also in this revision: Modified: stable/9/release/doc/en_US.ISO8859-1/errata/article.xml Modified: releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xmlTue Oct 21 21:37:53 2014(r273432) +++ releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xmlTue Oct 21 21:44:24 2014(r273433) @@ -287,6 +287,33 @@ entryparaDenial of Service in TCP packet processing./para/entry /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:20.rtsold.asc;SA-14:20.rtsold/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaRemote buffer overflow + vulnerability./para/entry + /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:21.routed.asc;SA-14:21.routed/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaRemote denial of service + vulnerability./para/entry + /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:22.namei.asc;SA-14:22.namei/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaMemory leak in sandboxed namei + lookup./para/entry + /row + + row + entrylink xlink:href=http://www.freebsd.org/security/advisories/FreeBSD-SA-14:23.openssl.asc;SA-14:23.openssl/link/entry + entry21nbsp;Octobernbsp;2014/entry + entryparaMultiple vulerabilities./para/entry + /row /tbody /tgroup /informaltable ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273400 - in head/sys: kern sys
On Tue, Oct 21, 2014 at 09:40:38PM +, Bjoern A. Zeeb wrote: On 21 Oct 2014, at 19:02 , Mateusz Guzik m...@freebsd.org wrote: Author: mjg Date: Tue Oct 21 19:02:26 2014 New Revision: 273400 URL: https://svnweb.freebsd.org/changeset/base/273400 Log: Rename sysctl_lock and _unlock to sysctl_xlock and _xunlock. You are perfectly describing what you are doing, but I’d also like to understand the “why?” First off, these function do lock sysctl exclusively, so I find this to be a better suited name. In https://svnweb.freebsd.org/base?view=revisionrevision=273401 I added shared locking to sysctl and this change coincidently freed up a nice name for a functions which remember previous lock type and lock it the same way later. -- Mateusz Guzik mjguzik gmail.com ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273274 - head/sys/netpfil/ipfw
Luigi Rizzo ri...@iet.unipi.it writes: This code is not performance critical. I wouldn't bother optimizing it. So just use fls() or flsl(). DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273434 - head/contrib/libc++/src
Author: bapt
Date: Tue Oct 21 21:49:06 2014
New Revision: 273434
URL: https://svnweb.freebsd.org/changeset/base/273434
Log:
Do not define bad_array_new_length::bad_array_new_length in libc++ anymore
when used in combinaison with libcxxrt since it is now defined there already.
This fixes building world
Modified:
head/contrib/libc++/src/new.cpp
Modified: head/contrib/libc++/src/new.cpp
==
--- head/contrib/libc++/src/new.cpp Tue Oct 21 21:44:24 2014
(r273433)
+++ head/contrib/libc++/src/new.cpp Tue Oct 21 21:49:06 2014
(r273434)
@@ -192,8 +192,6 @@ bad_alloc::what() const _NOEXCEPT
#endif // !__GLIBCXX__
-#endif //LIBCXXRT
-
bad_array_new_length::bad_array_new_length() _NOEXCEPT
{
}
@@ -202,6 +200,8 @@ bad_array_new_length::~bad_array_new_len
{
}
+#endif //LIBCXXRT
+
const char*
bad_array_length::what() const _NOEXCEPT
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273435 - releng/10.1/sys/dev/hyperv/storvsc
Author: gjb
Date: Tue Oct 21 23:07:30 2014
New Revision: 273435
URL: https://svnweb.freebsd.org/changeset/base/273435
Log:
MFstable10 r273429:
MFC r273402:
Fix an issue where a FreeBSD virtual machine provisioned in
the Microsoft Azure service does not recognize the second
attached disk on the system.
PR: 194376
Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation
Modified:
releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
Directory Properties:
releng/10.1/ (props changed)
Modified: releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==
--- releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Tue Oct 21
21:49:06 2014(r273434)
+++ releng/10.1/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Tue Oct 21
23:07:30 2014(r273435)
@@ -75,7 +75,7 @@ __FBSDID($FreeBSD$);
#define STORVSC_MAX_IO_REQUESTS(STORVSC_MAX_LUNS_PER_TARGET *
2)
#define BLKVSC_MAX_IDE_DISKS_PER_TARGET(1)
#define BLKVSC_MAX_IO_REQUESTS STORVSC_MAX_IO_REQUESTS
-#define STORVSC_MAX_TARGETS(1)
+#define STORVSC_MAX_TARGETS(2)
struct storvsc_softc;
@@ -584,7 +584,6 @@ hv_storvsc_on_iocompletion(struct storvs
vm_srb = vstor_packet-u.vm_srb;
- request-sense_info_len = 0;
if (((vm_srb-scsi_status 0xFF) == SCSI_STATUS_CHECK_COND)
(vm_srb-srb_status SRB_STATUS_AUTOSENSE_VALID)) {
/* Autosense data available */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273436 - in head/sys: i386/ibcs2 kern sys
Author: mjg
Date: Tue Oct 21 23:08:46 2014
New Revision: 273436
URL: https://svnweb.freebsd.org/changeset/base/273436
Log:
Eliminate unnecessary memory allocation in sys_getgroups and its ibcs2
counterpart.
Modified:
head/sys/i386/ibcs2/ibcs2_misc.c
head/sys/kern/kern_prot.c
head/sys/sys/syscallsubr.h
Modified: head/sys/i386/ibcs2/ibcs2_misc.c
==
--- head/sys/i386/ibcs2/ibcs2_misc.cTue Oct 21 23:07:30 2014
(r273435)
+++ head/sys/i386/ibcs2/ibcs2_misc.cTue Oct 21 23:08:46 2014
(r273436)
@@ -659,33 +659,28 @@ ibcs2_getgroups(td, uap)
struct thread *td;
struct ibcs2_getgroups_args *uap;
{
+ struct ucred *cred;
ibcs2_gid_t *iset;
- gid_t *gp;
u_int i, ngrp;
int error;
- if (uap-gidsetsize td-td_ucred-cr_ngroups) {
- if (uap-gidsetsize == 0)
- ngrp = 0;
- else
- return (EINVAL);
- } else
- ngrp = td-td_ucred-cr_ngroups;
- gp = malloc(ngrp * sizeof(*gp), M_TEMP, M_WAITOK);
- error = kern_getgroups(td, ngrp, gp);
- if (error)
+ cred = td-td_ucred;
+ ngrp = cred-cr_ngroups;
+
+ if (uap-gidsetsize == 0) {
+ error = 0;
goto out;
- if (uap-gidsetsize 0) {
- iset = malloc(ngrp * sizeof(*iset), M_TEMP, M_WAITOK);
- for (i = 0; i ngrp; i++)
- iset[i] = (ibcs2_gid_t)gp[i];
- error = copyout(iset, uap-gidset, ngrp * sizeof(ibcs2_gid_t));
- free(iset, M_TEMP);
}
- if (error == 0)
- td-td_retval[0] = ngrp;
+ if (uap-gidsetsize ngrp)
+ return (EINVAL);
+
+ iset = malloc(ngrp * sizeof(*iset), M_TEMP, M_WAITOK);
+ for (i = 0; i ngrp; i++)
+ iset[i] = (ibcs2_gid_t)cred-cr_groups[i];
+ error = copyout(iset, uap-gidset, ngrp * sizeof(ibcs2_gid_t));
+ free(iset, M_TEMP);
out:
- free(gp, M_TEMP);
+ td-td_retval[0] = ngrp;
return (error);
}
Modified: head/sys/kern/kern_prot.c
==
--- head/sys/kern/kern_prot.c Tue Oct 21 23:07:30 2014(r273435)
+++ head/sys/kern/kern_prot.c Tue Oct 21 23:08:46 2014(r273436)
@@ -303,45 +303,24 @@ struct getgroups_args {
int
sys_getgroups(struct thread *td, register struct getgroups_args *uap)
{
- gid_t *groups;
+ struct ucred *cred;
u_int ngrp;
int error;
- if (uap-gidsetsize td-td_ucred-cr_ngroups) {
- if (uap-gidsetsize == 0)
- ngrp = 0;
- else
- return (EINVAL);
- } else
- ngrp = td-td_ucred-cr_ngroups;
- groups = malloc(ngrp * sizeof(*groups), M_TEMP, M_WAITOK);
- error = kern_getgroups(td, ngrp, groups);
- if (error)
- goto out;
- if (uap-gidsetsize 0)
- error = copyout(groups, uap-gidset, ngrp * sizeof(gid_t));
- if (error == 0)
- td-td_retval[0] = ngrp;
-out:
- free(groups, M_TEMP);
- return (error);
-}
-
-int
-kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups)
-{
- struct ucred *cred;
-
cred = td-td_ucred;
- if (*ngrp == 0) {
- *ngrp = cred-cr_ngroups;
- return (0);
+ ngrp = cred-cr_ngroups;
+
+ if (uap-gidsetsize == 0) {
+ error = 0;
+ goto out;
}
- if (*ngrp cred-cr_ngroups)
+ if (uap-gidsetsize ngrp)
return (EINVAL);
- *ngrp = cred-cr_ngroups;
- bcopy(cred-cr_groups, groups, *ngrp * sizeof(gid_t));
- return (0);
+
+ error = copyout(cred-cr_groups, uap-gidset, ngrp * sizeof(gid_t));
+out:
+ td-td_retval[0] = ngrp;
+ return (error);
}
#ifndef _SYS_SYSPROTO_H_
Modified: head/sys/sys/syscallsubr.h
==
--- head/sys/sys/syscallsubr.h Tue Oct 21 23:07:30 2014(r273435)
+++ head/sys/sys/syscallsubr.h Tue Oct 21 23:08:46 2014(r273436)
@@ -109,7 +109,6 @@ int kern_getdirentries(struct thread *td
long *basep, ssize_t *residp, enum uio_seg bufseg);
intkern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize,
enum uio_seg bufseg, int flags);
-intkern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups);
intkern_getitimer(struct thread *, u_int, struct itimerval *);
intkern_getppid(struct thread *);
intkern_getpeername(struct thread *td, int fd, struct sockaddr **sa,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to
svn commit: r273437 - releng/10.1/sys/conf
Author: gjb
Date: Tue Oct 21 23:09:09 2014
New Revision: 273437
URL: https://svnweb.freebsd.org/changeset/base/273437
Log:
Update releng/10.1 to -RC3 as part of the 10.1-RELEASE cycle.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
releng/10.1/sys/conf/newvers.sh
Modified: releng/10.1/sys/conf/newvers.sh
==
--- releng/10.1/sys/conf/newvers.sh Tue Oct 21 23:08:46 2014
(r273436)
+++ releng/10.1/sys/conf/newvers.sh Tue Oct 21 23:09:09 2014
(r273437)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=10.1
-BRANCH=RC2
+BRANCH=RC3
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273438 - in releng/9.3: . contrib/tzdata lib/libcrypt sys/conf
Author: delphij Date: Tue Oct 21 23:50:46 2014 New Revision: 273438 URL: https://svnweb.freebsd.org/changeset/base/273438 Log: Time zone data file update. [EN-14:10] Change crypt(3) default hashing algorithm back to DES. [EN-14:11] Approved by: so Added: releng/9.3/contrib/tzdata/zone1970.tab Modified: releng/9.3/UPDATING releng/9.3/contrib/tzdata/africa releng/9.3/contrib/tzdata/antarctica releng/9.3/contrib/tzdata/asia releng/9.3/contrib/tzdata/australasia releng/9.3/contrib/tzdata/backward releng/9.3/contrib/tzdata/etcetera releng/9.3/contrib/tzdata/europe releng/9.3/contrib/tzdata/factory releng/9.3/contrib/tzdata/leap-seconds.list releng/9.3/contrib/tzdata/northamerica releng/9.3/contrib/tzdata/pacificnew releng/9.3/contrib/tzdata/southamerica releng/9.3/contrib/tzdata/systemv releng/9.3/contrib/tzdata/yearistype.sh releng/9.3/contrib/tzdata/zone.tab releng/9.3/lib/libcrypt/crypt.c releng/9.3/sys/conf/newvers.sh Modified: releng/9.3/UPDATING == --- releng/9.3/UPDATING Tue Oct 21 23:09:09 2014(r273437) +++ releng/9.3/UPDATING Tue Oct 21 23:50:46 2014(r273438) @@ -11,6 +11,13 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20141022: p4 FreeBSD-EN-14:10.tzdata + FreeBSD-EN-14:11.crypt + + Time zone data file update. [EN-14:10] + + Change crypt(3) default hashing algorithm back to DES. [EN-14:11] + 20141021: p3 FreeBSD-SA-14:20.rtsold FreeBSD-SA-14:21.routed FreeBSD-SA-14:22.namei Modified: releng/9.3/contrib/tzdata/africa == --- releng/9.3/contrib/tzdata/africaTue Oct 21 23:09:09 2014 (r273437) +++ releng/9.3/contrib/tzdata/africaTue Oct 21 23:50:46 2014 (r273438) @@ -1,4 +1,3 @@ -# pre # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -35,13 +34,13 @@ # Previous editions of this database used WAT, CAT, SAT, and EAT # for +0:00 through +3:00, respectively, # but Mark R V Murray reports that -# `SAST' is the official abbreviation for +2:00 in the country of South Africa, -# `CAT' is commonly used for +2:00 in countries north of South Africa, and -# `WAT' is probably the best name for +1:00, as the common phrase for -# the area that includes Nigeria is ``West Africa''. -# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference. +# 'SAST' is the official abbreviation for +2:00 in the country of South Africa, +# 'CAT' is commonly used for +2:00 in countries north of South Africa, and +# 'WAT' is probably the best name for +1:00, as the common phrase for +# the area that includes Nigeria is West Africa. +# He has heard of Western Sahara Time for +0:00 but can find no reference. # -# To make things confusing, `WAT' seems to have been used for -1:00 long ago; +# To make things confusing, 'WAT' seems to have been used for -1:00 long ago; # I'd guess that this was because people needed _some_ name for -1:00, # and at the time, far west Africa was the only major land area in -1:00. # This usage is now obsolete, as the last use of -1:00 on the African @@ -54,7 +53,7 @@ # 2:00 SASTSouth Africa Standard Time # and Murray suggests the following abbreviation: # 1:00 WAT West Africa Time -# I realize that this leads to `WAT' being used for both -1:00 and 1:00 +# I realize that this leads to 'WAT' being used for both -1:00 and 1:00 # for times before 1976, but this is the best I can think of # until we get more information. # @@ -131,9 +130,7 @@ ZoneAfrica/Gaborone 1:43:40 - LMT 1885 2:00- CAT # Burkina Faso -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ouagadougou-0:06:04 - LMT 1912 -0:00 - GMT +# See Africa/Abidjan. # Burundi # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -161,7 +158,7 @@ ZoneAfrica/Bangui 1:14:20 - LMT 1912 # Chad # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 +Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena 1:00- WAT 1979 Oct 14 1:001:00WAST1980 Mar 8 1:00- WAT @@ -183,10 +180,20 @@ Zone Africa/Lubumbashi1:49:52 - LMT 189 Zone Africa/Brazzaville1:01:08 - LMT 1912 1:00- WAT -# Cote D'Ivoire +# Côte D'Ivoire / Ivory Coast # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Abidjan -0:16:08 - LMT 1912
svn commit: r273439 - in releng: 10.0 10.0/contrib/tzdata 10.0/sys/conf 8.4 8.4/share/zoneinfo 8.4/sys/conf 9.1 9.1/contrib/tzdata 9.1/sys/conf 9.2 9.2/contrib/tzdata 9.2/sys/conf
Author: delphij Date: Tue Oct 21 23:52:25 2014 New Revision: 273439 URL: https://svnweb.freebsd.org/changeset/base/273439 Log: Time zone data file update. [EN-14:10] Approved by: so Added: releng/10.0/contrib/tzdata/zone1970.tab releng/8.4/share/zoneinfo/leap-seconds.list (contents, props changed) releng/8.4/share/zoneinfo/zone1970.tab (contents, props changed) releng/9.1/contrib/tzdata/leap-seconds.list releng/9.1/contrib/tzdata/zone1970.tab releng/9.2/contrib/tzdata/leap-seconds.list releng/9.2/contrib/tzdata/zone1970.tab Modified: releng/10.0/UPDATING releng/10.0/contrib/tzdata/africa releng/10.0/contrib/tzdata/antarctica releng/10.0/contrib/tzdata/asia releng/10.0/contrib/tzdata/australasia releng/10.0/contrib/tzdata/backward releng/10.0/contrib/tzdata/etcetera releng/10.0/contrib/tzdata/europe releng/10.0/contrib/tzdata/factory releng/10.0/contrib/tzdata/leap-seconds.list releng/10.0/contrib/tzdata/northamerica releng/10.0/contrib/tzdata/pacificnew releng/10.0/contrib/tzdata/southamerica releng/10.0/contrib/tzdata/systemv releng/10.0/contrib/tzdata/yearistype.sh releng/10.0/contrib/tzdata/zone.tab releng/10.0/sys/conf/newvers.sh releng/8.4/UPDATING releng/8.4/share/zoneinfo/africa releng/8.4/share/zoneinfo/antarctica releng/8.4/share/zoneinfo/asia releng/8.4/share/zoneinfo/australasia releng/8.4/share/zoneinfo/backward releng/8.4/share/zoneinfo/etcetera releng/8.4/share/zoneinfo/europe releng/8.4/share/zoneinfo/factory releng/8.4/share/zoneinfo/northamerica releng/8.4/share/zoneinfo/pacificnew releng/8.4/share/zoneinfo/southamerica releng/8.4/share/zoneinfo/systemv releng/8.4/share/zoneinfo/yearistype.sh releng/8.4/share/zoneinfo/zone.tab releng/8.4/sys/conf/newvers.sh releng/9.1/UPDATING releng/9.1/contrib/tzdata/africa releng/9.1/contrib/tzdata/antarctica releng/9.1/contrib/tzdata/asia releng/9.1/contrib/tzdata/australasia releng/9.1/contrib/tzdata/backward releng/9.1/contrib/tzdata/etcetera releng/9.1/contrib/tzdata/europe releng/9.1/contrib/tzdata/factory releng/9.1/contrib/tzdata/leapseconds releng/9.1/contrib/tzdata/northamerica releng/9.1/contrib/tzdata/pacificnew releng/9.1/contrib/tzdata/southamerica releng/9.1/contrib/tzdata/systemv releng/9.1/contrib/tzdata/yearistype.sh releng/9.1/contrib/tzdata/zone.tab releng/9.1/sys/conf/newvers.sh releng/9.2/UPDATING releng/9.2/contrib/tzdata/africa releng/9.2/contrib/tzdata/antarctica releng/9.2/contrib/tzdata/asia releng/9.2/contrib/tzdata/australasia releng/9.2/contrib/tzdata/backward releng/9.2/contrib/tzdata/etcetera releng/9.2/contrib/tzdata/europe releng/9.2/contrib/tzdata/factory releng/9.2/contrib/tzdata/northamerica releng/9.2/contrib/tzdata/pacificnew releng/9.2/contrib/tzdata/southamerica releng/9.2/contrib/tzdata/systemv releng/9.2/contrib/tzdata/yearistype.sh releng/9.2/contrib/tzdata/zone.tab releng/9.2/sys/conf/newvers.sh Modified: releng/10.0/UPDATING == --- releng/10.0/UPDATINGTue Oct 21 23:50:46 2014(r273438) +++ releng/10.0/UPDATINGTue Oct 21 23:52:25 2014(r273439) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20141022: p11 FreeBSD-EN-14:10.tzdata + + Time zone data file update. [EN-14:10] + 20141021: p10 FreeBSD-SA-14:20.rtsold FreeBSD-SA-14:21.routed FreeBSD-SA-14:22.namei Modified: releng/10.0/contrib/tzdata/africa == --- releng/10.0/contrib/tzdata/africa Tue Oct 21 23:50:46 2014 (r273438) +++ releng/10.0/contrib/tzdata/africa Tue Oct 21 23:52:25 2014 (r273439) @@ -1,4 +1,3 @@ -# pre # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -35,13 +34,13 @@ # Previous editions of this database used WAT, CAT, SAT, and EAT # for +0:00 through +3:00, respectively, # but Mark R V Murray reports that -# `SAST' is the official abbreviation for +2:00 in the country of South Africa, -# `CAT' is commonly used for +2:00 in countries north of South Africa, and -# `WAT' is probably the best name for +1:00, as the common phrase for -# the area that includes Nigeria is ``West Africa''. -# He has heard of ``Western Sahara Time'' for +0:00 but can find no reference. +# 'SAST' is the official abbreviation for +2:00 in the country of South Africa, +# 'CAT' is commonly used for +2:00 in countries north of South Africa, and +# 'WAT' is probably the best name for +1:00, as the common phrase for +# the area that includes Nigeria is West Africa. +# He has heard of Western Sahara Time for +0:00 but can find no reference. # -# To make things
Re: svn commit: r273406 - head/share/mk
On Tue, Oct 21, 2014 at 08:00:50PM +, Baptiste Daroussin wrote: Author: bapt Date: Tue Oct 21 20:00:49 2014 New Revision: 273406 URL: https://svnweb.freebsd.org/changeset/base/273406 Log: Always use libc++ as the default c++ stack when building with an external gcc 4.8+ While here disable building gcc from base when using gcc 4.8+ Reviewed by:imp Are you sure that this works? There are some (well-known?) incompatibilities between libc++ and libstdc++. By work, I mean a resulting binary actually functions as expected. -- steve ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273441 - in head/sys: kern sys
Author: mjg
Date: Wed Oct 22 00:23:43 2014
New Revision: 273441
URL: https://svnweb.freebsd.org/changeset/base/273441
Log:
filedesc: cleanup setugidsafety a little
Rename it to fdsetugidsafety for consistency with other functions.
There is no need to take filedesc lock if not closing any files.
The loop has to verify each file and we are guaranteed fdtable has space
for at least 20 fds. As such there is no need to check fd_lastfile.
While here tidy up is_unsafe.
Modified:
head/sys/kern/kern_descrip.c
head/sys/kern/kern_exec.c
head/sys/sys/filedesc.h
Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cTue Oct 21 23:57:31 2014
(r273440)
+++ head/sys/kern/kern_descrip.cWed Oct 22 00:23:43 2014
(r273441)
@@ -2078,23 +2078,23 @@ fdescfree(struct thread *td)
* Since setugidsafety calls this only for fd 0, 1 and 2, this check is
* sufficient. We also don't check for setugidness since we know we are.
*/
-static int
+static bool
is_unsafe(struct file *fp)
{
- if (fp-f_type == DTYPE_VNODE) {
- struct vnode *vp = fp-f_vnode;
+ struct vnode *vp;
- if ((vp-v_vflag VV_PROCDEP) != 0)
- return (1);
- }
- return (0);
+ if (fp-f_type != DTYPE_VNODE)
+ return (false);
+
+ vp = fp-f_vnode;
+ return ((vp-v_vflag VV_PROCDEP) != 0);
}
/*
* Make this setguid thing safe, if at all possible.
*/
void
-setugidsafety(struct thread *td)
+fdsetugidsafety(struct thread *td)
{
struct filedesc *fdp;
struct file *fp;
@@ -2102,12 +2102,10 @@ setugidsafety(struct thread *td)
fdp = td-td_proc-p_fd;
KASSERT(fdp-fd_refcnt == 1, (the fdtable should not be shared));
- FILEDESC_XLOCK(fdp);
- for (i = 0; i = fdp-fd_lastfile; i++) {
- if (i 2)
- break;
+ for (i = 0; i = 2; i++) {
fp = fdp-fd_ofiles[i].fde_file;
if (fp != NULL is_unsafe(fp)) {
+ FILEDESC_XLOCK(fdp);
knote_fdclose(td, i);
/*
* NULL-out descriptor prior to close to avoid
@@ -2116,10 +2114,8 @@ setugidsafety(struct thread *td)
fdfree(fdp, i);
FILEDESC_XUNLOCK(fdp);
(void) closef(fp, td);
- FILEDESC_XLOCK(fdp);
}
}
- FILEDESC_XUNLOCK(fdp);
}
/*
Modified: head/sys/kern/kern_exec.c
==
--- head/sys/kern/kern_exec.c Tue Oct 21 23:57:31 2014(r273440)
+++ head/sys/kern/kern_exec.c Wed Oct 22 00:23:43 2014(r273441)
@@ -695,7 +695,7 @@ interpret:
*/
PROC_UNLOCK(p);
VOP_UNLOCK(imgp-vp, 0);
- setugidsafety(td);
+ fdsetugidsafety(td);
error = fdcheckstd(td);
if (error != 0)
goto done1;
Modified: head/sys/sys/filedesc.h
==
--- head/sys/sys/filedesc.h Tue Oct 21 23:57:31 2014(r273440)
+++ head/sys/sys/filedesc.h Wed Oct 22 00:23:43 2014(r273441)
@@ -148,6 +148,7 @@ int fdallocn(struct thread *td, int minf
intfdcheckstd(struct thread *td);
void fdclose(struct filedesc *fdp, struct file *fp, int idx, struct thread
*td);
void fdcloseexec(struct thread *td);
+void fdsetugidsafety(struct thread *td);
struct filedesc *fdcopy(struct filedesc *fdp);
void fdunshare(struct thread *td);
void fdescfree(struct thread *td);
@@ -159,7 +160,6 @@ struct filedesc_to_leader *
intgetvnode(struct filedesc *fdp, int fd, cap_rights_t *rightsp,
struct file **fpp);
void mountcheckdirs(struct vnode *olddp, struct vnode *newdp);
-void setugidsafety(struct thread *td);
/* Return a referenced file from an unlocked descriptor. */
intfget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273442 - head/contrib/elftoolchain/libelf
Author: marcel Date: Wed Oct 22 00:58:50 2014 New Revision: 273442 URL: https://svnweb.freebsd.org/changeset/base/273442 Log: GCC for PowerPC does not align .note sections to 4 bytes. When running ctfmerge on its objects, libelf asserts as it expects .note sections to be 4-byte aligned. Change that expectation. Approved by: jkoshy@ Obtained from:Juniper Networks, Inc. Modified: head/contrib/elftoolchain/libelf/libelf_align.c Modified: head/contrib/elftoolchain/libelf/libelf_align.c == --- head/contrib/elftoolchain/libelf/libelf_align.c Wed Oct 22 00:23:43 2014(r273441) +++ head/contrib/elftoolchain/libelf/libelf_align.c Wed Oct 22 00:58:50 2014(r273442) @@ -109,7 +109,7 @@ static struct align falign[ELF_T_NUM] = [ELF_T_LWORD] = FALIGN(8,8), [ELF_T_MOVE]= FALIGN(8,8), [ELF_T_MOVEP] = UNSUPPORTED(), - [ELF_T_NOTE]= FALIGN(4,4), + [ELF_T_NOTE]= FALIGN(1,1), [ELF_T_OFF] = FALIGN(4,8), [ELF_T_PHDR]= FALIGN(4,8), [ELF_T_REL] = FALIGN(4,8), ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273443 - head/contrib/elftoolchain/libelf
Author: marcel Date: Wed Oct 22 01:04:16 2014 New Revision: 273443 URL: https://svnweb.freebsd.org/changeset/base/273443 Log: Fix the conversion macro for .note sections, broken in the case the ELF file's byte order is not the native byte order. The bug is that the variables holding the name and description size are used (natively) after having been byte-swapped. The fix is to calculate sz from them just prior to byte-swapping. Approved by: jkoshy@ Obtained from:Juniper Networks, Inc. Modified: head/contrib/elftoolchain/libelf/libelf_convert.m4 Modified: head/contrib/elftoolchain/libelf/libelf_convert.m4 == --- head/contrib/elftoolchain/libelf/libelf_convert.m4 Wed Oct 22 00:58:50 2014(r273442) +++ head/contrib/elftoolchain/libelf/libelf_convert.m4 Wed Oct 22 01:04:16 2014(r273443) @@ -947,6 +947,11 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d READ_WORD(src, descsz); READ_WORD(src, type); + sz = namesz; + ROUNDUP2(sz, 4); + sz += descsz; + ROUNDUP2(sz, 4); + /* Translate. */ SWAP_WORD(namesz); SWAP_WORD(descsz); @@ -962,11 +967,6 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d dst += sizeof(Elf_Note); count -= hdrsz; - ROUNDUP2(namesz, 4); - ROUNDUP2(descsz, 4); - - sz = namesz + descsz; - if (count sz || dsz sz) /* Buffers are too small. */ return (0); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273444 - head/sys/kern
Author: mjg
Date: Wed Oct 22 01:09:07 2014
New Revision: 273444
URL: https://svnweb.freebsd.org/changeset/base/273444
Log:
Avoid crdup when possible in kern_accessat.
While here tidy up a little.
Modified:
head/sys/kern/vfs_syscalls.c
Modified: head/sys/kern/vfs_syscalls.c
==
--- head/sys/kern/vfs_syscalls.cWed Oct 22 01:04:16 2014
(r273443)
+++ head/sys/kern/vfs_syscalls.cWed Oct 22 01:09:07 2014
(r273444)
@@ -2064,7 +2064,7 @@ int
kern_accessat(struct thread *td, int fd, char *path, enum uio_seg pathseg,
int flag, int amode)
{
- struct ucred *cred, *tmpcred;
+ struct ucred *cred, *usecred;
struct vnode *vp;
struct nameidata nd;
cap_rights_t rights;
@@ -2075,31 +2075,33 @@ kern_accessat(struct thread *td, int fd,
/*
* Create and modify a temporary credential instead of one that
-* is potentially shared.
+* is potentially shared (if we need one).
*/
- if (!(flag AT_EACCESS)) {
- cred = td-td_ucred;
- tmpcred = crdup(cred);
- tmpcred-cr_uid = cred-cr_ruid;
- tmpcred-cr_groups[0] = cred-cr_rgid;
- td-td_ucred = tmpcred;
+ cred = td-td_ucred;
+ if ((flag AT_EACCESS) == 0
+ ((cred-cr_uid != cred-cr_ruid ||
+ cred-cr_rgid != cred-cr_groups[0]))) {
+ usecred = crdup(cred);
+ usecred-cr_uid = cred-cr_ruid;
+ usecred-cr_groups[0] = cred-cr_rgid;
+ td-td_ucred = usecred;
} else
- cred = tmpcred = td-td_ucred;
+ usecred = cred;
AUDIT_ARG_VALUE(amode);
NDINIT_ATRIGHTS(nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF |
AUDITVNODE1, pathseg, path, fd, cap_rights_init(rights, CAP_FSTAT),
td);
if ((error = namei(nd)) != 0)
- goto out1;
+ goto out;
vp = nd.ni_vp;
- error = vn_access(vp, amode, tmpcred, td);
+ error = vn_access(vp, amode, usecred, td);
NDFREE(nd, NDF_ONLY_PNBUF);
vput(vp);
-out1:
- if (!(flag AT_EACCESS)) {
+out:
+ if (usecred != cred) {
td-td_ucred = cred;
- crfree(tmpcred);
+ crfree(usecred);
}
return (error);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273417 - head
Warner Losh i...@freebsd.org writes: Author: imp Date: Tue Oct 21 20:29:42 2014 New Revision: 273417 URL: https://svnweb.freebsd.org/changeset/base/273417 Log: You aren't allowed to test WITH_xxx or WITHOUT_xxx here, so remove it. Even if you were allowed to test for it, the test makes no sense as it always results in adding -DWITH_ATF unless WITH_ATF was already defined. But if MK_ATF != no, then we know it was defined. This, in turn, caused tools/build/options/makemake always think WITH_ATF is the default, which removed control of that from sys.conf.mk. To get the intent of the deleted comment, another mechanism is required, assuming that the intent of that comment is desirable. This broke the paralell build. It prevents building lib/atf entirely in stage 4.3, so the programs in libexec/atf have nothing to link against unless lib/atf just happens to get built before libexec/atf. That almost never happens: lib and libexec are built in paralell, and lib/atf is one of the last items in lib whereas libexec/atf is one of the first items in libexec. (on a side note, libatf doesn't need to be in _prebuild_libs, since no other library depend on it) DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273445 - head/sys/sys
Author: imp
Date: Wed Oct 22 01:35:30 2014
New Revision: 273445
URL: https://svnweb.freebsd.org/changeset/base/273445
Log:
Add defines for various FIRST PARTY DMA SEND subcommands.
Modified:
head/sys/sys/ata.h
Modified: head/sys/sys/ata.h
==
--- head/sys/sys/ata.h Wed Oct 22 01:09:07 2014(r273444)
+++ head/sys/sys/ata.h Wed Oct 22 01:35:30 2014(r273445)
@@ -372,6 +372,10 @@ struct ata_params {
#define ATA_WRITE_FPDMA_QUEUED 0x61/* write DMA NCQ */
#define ATA_NCQ_NON_DATA 0x63/* NCQ non-data command */
#define ATA_SEND_FPDMA_QUEUED 0x64/* send DMA NCQ */
+#defineATA_SFPDMA_DSM 0x00/* Data set management
*/
+#defineATA_SFPDMA_DSM_TRIM 0x01/* Set trim bit
in auxilary */
+#defineATA_SFPDMA_HYBRID_EVICT 0x01/* Hybrid Evict */
+#defineATA_SFPDMA_WLDMA0x02/* Write Log DMA EXT */
#define ATA_RECV_FPDMA_QUEUED 0x65/* recieve DMA NCQ */
#define ATA_SEP_ATTN0x67/* SEP request */
#define ATA_SEEK0x70/* seek */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273446 - head/sys/x86/isa
Author: marcel
Date: Wed Oct 22 01:37:32 2014
New Revision: 273446
URL: https://svnweb.freebsd.org/changeset/base/273446
Log:
Virtual machines can easily have more than 16 option ROMs and
when that happens, we happily access our resource array out of
bounds. Make sure we stay within the MAX_ROMS limit.
While here, bump MAX_ROMS from 16 to 32 to minimize the chance
of leaving option ROMs unaccounted for.
Obtained from:Juniper Networks, Inc.
Modified:
head/sys/x86/isa/orm.c
Modified: head/sys/x86/isa/orm.c
==
--- head/sys/x86/isa/orm.c Wed Oct 22 01:35:30 2014(r273445)
+++ head/sys/x86/isa/orm.c Wed Oct 22 01:37:32 2014(r273446)
@@ -58,7 +58,7 @@ static struct isa_pnp_id orm_ids[] = {
{ 0,NULL },
};
-#define MAX_ROMS 16
+#define MAX_ROMS 32
struct orm_softc {
int rnum;
@@ -97,7 +97,7 @@ orm_identify(driver_t* driver, device_t
isa_set_vendorid(child, ORM_ID);
sc = device_get_softc(child);
sc-rnum = 0;
- while (chunk IOMEM_END) {
+ while (sc-rnum MAX_ROMS chunk IOMEM_END) {
bus_set_resource(child, SYS_RES_MEMORY, sc-rnum, chunk,
IOMEM_STEP);
rid = sc-rnum;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273447 - head/sys/kern
Author: mjg
Date: Wed Oct 22 01:53:00 2014
New Revision: 273447
URL: https://svnweb.freebsd.org/changeset/base/273447
Log:
Reduce nesting in vn_access.
No functional changes.
Modified:
head/sys/kern/vfs_syscalls.c
Modified: head/sys/kern/vfs_syscalls.c
==
--- head/sys/kern/vfs_syscalls.cWed Oct 22 01:37:32 2014
(r273446)
+++ head/sys/kern/vfs_syscalls.cWed Oct 22 01:53:00 2014
(r273447)
@@ -1994,23 +1994,23 @@ vn_access(vp, user_flags, cred, td)
int error;
/* Flags == 0 means only check for existence. */
- error = 0;
- if (user_flags) {
- accmode = 0;
- if (user_flags R_OK)
- accmode |= VREAD;
- if (user_flags W_OK)
- accmode |= VWRITE;
- if (user_flags X_OK)
- accmode |= VEXEC;
+ if (user_flags == 0)
+ return (0);
+
+ accmode = 0;
+ if (user_flags R_OK)
+ accmode |= VREAD;
+ if (user_flags W_OK)
+ accmode |= VWRITE;
+ if (user_flags X_OK)
+ accmode |= VEXEC;
#ifdef MAC
- error = mac_vnode_check_access(cred, vp, accmode);
- if (error != 0)
- return (error);
+ error = mac_vnode_check_access(cred, vp, accmode);
+ if (error != 0)
+ return (error);
#endif
- if ((accmode VWRITE) == 0 || (error = vn_writechk(vp)) == 0)
- error = VOP_ACCESS(vp, accmode, cred, td);
- }
+ if ((accmode VWRITE) == 0 || (error = vn_writechk(vp)) == 0)
+ error = VOP_ACCESS(vp, accmode, cred, td);
return (error);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273417 - head
On Oct 21, 2014, at 7:25 PM, Dag-Erling Smørgrav d...@des.no wrote: Warner Losh i...@freebsd.org writes: Author: imp Date: Tue Oct 21 20:29:42 2014 New Revision: 273417 URL: https://svnweb.freebsd.org/changeset/base/273417 Log: You aren't allowed to test WITH_xxx or WITHOUT_xxx here, so remove it. Even if you were allowed to test for it, the test makes no sense as it always results in adding -DWITH_ATF unless WITH_ATF was already defined. But if MK_ATF != no, then we know it was defined. This, in turn, caused tools/build/options/makemake always think WITH_ATF is the default, which removed control of that from sys.conf.mk. To get the intent of the deleted comment, another mechanism is required, assuming that the intent of that comment is desirable. This broke the paralell build. It prevents building lib/atf entirely in stage 4.3, so the programs in libexec/atf have nothing to link against unless lib/atf just happens to get built before libexec/atf. That almost never happens: lib and libexec are built in paralell, and lib/atf is one of the last items in lib whereas libexec/atf is one of the first items in libexec. (on a side note, libatf doesn't need to be in _prebuild_libs, since no other library depend on it) Yea, it was AFU. I’ll fix this. I think we need to have a MK_TESTS_SUPPORT that builds the libatf stuff when yes, and omits it when no, since we don’t want the tests building when we’re building the 4.3 stage. Warner DES -- Dag-Erling Smørgrav - d...@des.no signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r273449 - in head: . lib share/mk
Author: imp
Date: Wed Oct 22 03:39:11 2014
New Revision: 273449
URL: https://svnweb.freebsd.org/changeset/base/273449
Log:
My previous commit exposed an issue as it fixed a different
issue. lib/atf isn't a prereq_lib, since it isn't required for other
libraries to build. Remove it. The old kludge of always building it
had effectively been retired. Since we don't want to build the
libraries with the tests when we're bootstrapping, invent
MK_TESTS_SUPPORT which normally defaults to the current MK_TESTS
value, except when explicitly defined. Make lib/atf depend on it being
yes. When building the libraries set MK_TESTS to no, and
MK_TESTS_SUPPORT to the current value of MK_TESTS so that later stages
of the build work correctly. This should fix (and does for me)
people's issues with parallel builds racing between lib/atf and
libexec/atf. Since lib/atf is built during the libraries phase, the
race disappears.
Modified:
head/Makefile.inc1
head/lib/Makefile
head/share/mk/src.opts.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Wed Oct 22 03:32:27 2014(r273448)
+++ head/Makefile.inc1 Wed Oct 22 03:39:11 2014(r273449)
@@ -574,7 +574,7 @@ _libraries:
@echo --
${_+_}cd ${.CURDIR}; \
${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
- MK_PROFILE=no MK_TESTS=no libraries
+ MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries
_depend:
@echo
@echo --
@@ -1535,7 +1535,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \
${_kerberos5_lib_libwind} \
- ${_lib_atf} \
lib/libbz2 ${_libcom_err} lib/libcrypt \
lib/libelf lib/libexpat \
${_lib_libgssapi} \
@@ -1561,10 +1560,6 @@ gnu/lib/libsupc++__L: gnu/lib/libstdc++_
lib/libgeom__L: lib/libexpat__L
-.if ${MK_TESTS} != no
-_lib_atf= lib/atf
-.endif
-
.if ${MK_LIBTHR} != no
_lib_libthr= lib/libthr
.endif
Modified: head/lib/Makefile
==
--- head/lib/Makefile Wed Oct 22 03:32:27 2014(r273448)
+++ head/lib/Makefile Wed Oct 22 03:39:11 2014(r273449)
@@ -276,8 +276,10 @@ _libsmutil=libsmutil
_libtelnet=libtelnet
.endif
-.if ${MK_TESTS} != no
+.if ${MK_TESTS_SUPPORT} != no
_atf= atf
+.endif
+.if ${MK_TESTS} != no
_tests=tests
.endif
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Wed Oct 22 03:32:27 2014(r273448)
+++ head/share/mk/src.opts.mk Wed Oct 22 03:39:11 2014(r273449)
@@ -330,6 +330,7 @@ MK_CLANG_FULL:= no
KVM \
NETGRAPH \
PAM \
+TESTS \
WIRELESS
.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == no
MK_${var}_SUPPORT:= no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273450 - stable/10/sys/sys
Author: bryanv
Date: Wed Oct 22 04:01:27 2014
New Revision: 273450
URL: https://svnweb.freebsd.org/changeset/base/273450
Log:
MFC r272796:
Add M_FLOWID to M_COPYFLAGS
The M_FLOWID flag should be propagated to the new mbuf pkthdr in
m_move_pkthdr() and m_dup_pkthdr(). The new mbuf already got the
existing flowid value, but would be ignored since the flag was
not set.
Modified:
stable/10/sys/sys/mbuf.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/sys/mbuf.h
==
--- stable/10/sys/sys/mbuf.hWed Oct 22 03:39:11 2014(r273449)
+++ stable/10/sys/sys/mbuf.hWed Oct 22 04:01:27 2014(r273450)
@@ -247,7 +247,7 @@ struct mbuf {
* Flags preserved when copying m_pkthdr.
*/
#define M_COPYFLAGS \
-(M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_VLANTAG|M_PROMISC| \
+(M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_PROMISC|M_VLANTAG|M_FLOWID| \
M_PROTOFLAGS)
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273406 - head/share/mk
On Oct 21, 2014, at 6:07 PM, Steve Kargl s...@troutmask.apl.washington.edu wrote: On Tue, Oct 21, 2014 at 08:00:50PM +, Baptiste Daroussin wrote: Author: bapt Date: Tue Oct 21 20:00:49 2014 New Revision: 273406 URL: https://svnweb.freebsd.org/changeset/base/273406 Log: Always use libc++ as the default c++ stack when building with an external gcc 4.8+ While here disable building gcc from base when using gcc 4.8+ Reviewed by:imp Are you sure that this works? There are some (well-known?) incompatibilities between libc++ and libstdc++. By work, I mean a resulting binary actually functions as expected. This is just for the build. And just to work around hard coded library names in g++. The ABIs that are used turn out to be the same since all the headers are from libc++ not libstdc++. Warner ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273451 - stable/10/sys/vm
Author: bryanv
Date: Wed Oct 22 04:09:47 2014
New Revision: 273451
URL: https://svnweb.freebsd.org/changeset/base/273451
Log:
MFC r272573:
Change the UMA mutex into a rwlock
Acquire the lock in read mode when just needed to ensure the stability
of the keg list. The UMA lock may be held for a long time (relatively
speaking) in uma_reclaim() on machines with lots of zones/kegs. If the
uma_timeout() would fire during that period, subsequent callouts on that
CPU may be significantly delayed.
Modified:
stable/10/sys/vm/uma_core.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/vm/uma_core.c
==
--- stable/10/sys/vm/uma_core.c Wed Oct 22 04:01:27 2014(r273450)
+++ stable/10/sys/vm/uma_core.c Wed Oct 22 04:09:47 2014(r273451)
@@ -135,8 +135,8 @@ static LIST_HEAD(,uma_keg) uma_kegs = LI
static LIST_HEAD(,uma_zone) uma_cachezones =
LIST_HEAD_INITIALIZER(uma_cachezones);
-/* This mutex protects the keg list */
-static struct mtx_padalign uma_mtx;
+/* This RW lock protects the keg list */
+static struct rwlock_padalign uma_rwlock;
/* Linked list of boot time pages */
static LIST_HEAD(,uma_slab) uma_boot_pages =
@@ -905,7 +905,7 @@ zone_drain_wait(uma_zone_t zone, int wai
ZONE_UNLOCK(zone);
/*
* The DRAINING flag protects us from being freed while
-* we're running. Normally the uma_mtx would protect us but we
+* we're running. Normally the uma_rwlock would protect us but we
* must be able to release and acquire the right lock for each keg.
*/
zone_foreach_keg(zone, keg_drain);
@@ -1541,9 +1541,9 @@ keg_ctor(void *mem, int size, void *udat
LIST_INSERT_HEAD(keg-uk_zones, zone, uz_link);
- mtx_lock(uma_mtx);
+ rw_wlock(uma_rwlock);
LIST_INSERT_HEAD(uma_kegs, keg, uk_link);
- mtx_unlock(uma_mtx);
+ rw_wunlock(uma_rwlock);
return (0);
}
@@ -1593,9 +1593,9 @@ zone_ctor(void *mem, int size, void *uda
zone-uz_release = arg-release;
zone-uz_arg = arg-arg;
zone-uz_lockptr = zone-uz_lock;
- mtx_lock(uma_mtx);
+ rw_wlock(uma_rwlock);
LIST_INSERT_HEAD(uma_cachezones, zone, uz_link);
- mtx_unlock(uma_mtx);
+ rw_wunlock(uma_rwlock);
goto out;
}
@@ -1612,7 +1612,7 @@ zone_ctor(void *mem, int size, void *uda
zone-uz_fini = arg-fini;
zone-uz_lockptr = keg-uk_lock;
zone-uz_flags |= UMA_ZONE_SECONDARY;
- mtx_lock(uma_mtx);
+ rw_wlock(uma_rwlock);
ZONE_LOCK(zone);
LIST_FOREACH(z, keg-uk_zones, uz_link) {
if (LIST_NEXT(z, uz_link) == NULL) {
@@ -1621,7 +1621,7 @@ zone_ctor(void *mem, int size, void *uda
}
}
ZONE_UNLOCK(zone);
- mtx_unlock(uma_mtx);
+ rw_wunlock(uma_rwlock);
} else if (keg == NULL) {
if ((keg = uma_kcreate(zone, arg-size, arg-uminit, arg-fini,
arg-align, arg-flags)) == NULL)
@@ -1719,9 +1719,9 @@ zone_dtor(void *arg, int size, void *uda
if (!(zone-uz_flags UMA_ZFLAG_INTERNAL))
cache_drain(zone);
- mtx_lock(uma_mtx);
+ rw_wlock(uma_rwlock);
LIST_REMOVE(zone, uz_link);
- mtx_unlock(uma_mtx);
+ rw_wunlock(uma_rwlock);
/*
* XXX there are some races here where
* the zone can be drained but zone lock
@@ -1743,9 +1743,9 @@ zone_dtor(void *arg, int size, void *uda
* We only destroy kegs from non secondary zones.
*/
if (keg != NULL (zone-uz_flags UMA_ZONE_SECONDARY) == 0) {
- mtx_lock(uma_mtx);
+ rw_wlock(uma_rwlock);
LIST_REMOVE(keg, uk_link);
- mtx_unlock(uma_mtx);
+ rw_wunlock(uma_rwlock);
zone_free_item(kegs, keg, NULL, SKIP_NONE);
}
ZONE_LOCK_FINI(zone);
@@ -1767,12 +1767,12 @@ zone_foreach(void (*zfunc)(uma_zone_t))
uma_keg_t keg;
uma_zone_t zone;
- mtx_lock(uma_mtx);
+ rw_rlock(uma_rwlock);
LIST_FOREACH(keg, uma_kegs, uk_link) {
LIST_FOREACH(zone, keg-uk_zones, uz_link)
zfunc(zone);
}
- mtx_unlock(uma_mtx);
+ rw_runlock(uma_rwlock);
}
/* Public functions */
@@ -1788,7 +1788,7 @@ uma_startup(void *bootmem, int boot_page
#ifdef UMA_DEBUG
printf(Creating uma keg headers zone and keg.\n);
#endif
- mtx_init(uma_mtx, UMA lock, NULL, MTX_DEF);
+ rw_init(uma_rwlock, UMA lock);
/* manually create the initial zone */
memset(args, 0, sizeof(args));
@@ -3363,12 +3363,12 @@
svn commit: r273452 - head/sys/kern
Author: mjg Date: Wed Oct 22 04:16:09 2014 New Revision: 273452 URL: https://svnweb.freebsd.org/changeset/base/273452 Log: Plug unnecessary PRS_NEW check in kern_procctl. pfind does not return processes in such state. Modified: head/sys/kern/sys_process.c Modified: head/sys/kern/sys_process.c == --- head/sys/kern/sys_process.c Wed Oct 22 04:09:47 2014(r273451) +++ head/sys/kern/sys_process.c Wed Oct 22 04:16:09 2014(r273452) @@ -1373,10 +1373,7 @@ kern_procctl(struct thread *td, idtype_t error = ESRCH; break; } - if (p-p_state == PRS_NEW) - error = ESRCH; - else - error = p_cansee(td, p); + error = p_cansee(td, p); if (error == 0) error = kern_procctl_single(td, p, com, data); PROC_UNLOCK(p); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273453 - head/sys/netpfil/ipfw
Author: luigi
Date: Wed Oct 22 05:21:36 2014
New Revision: 273453
URL: https://svnweb.freebsd.org/changeset/base/273453
Log:
remove/fix old code for building ipfw and dummynet in userspace
Modified:
head/sys/netpfil/ipfw/ip_dn_io.c
head/sys/netpfil/ipfw/ip_fw_private.h
head/sys/netpfil/ipfw/ip_fw_sockopt.c
Modified: head/sys/netpfil/ipfw/ip_dn_io.c
==
--- head/sys/netpfil/ipfw/ip_dn_io.cWed Oct 22 04:16:09 2014
(r273452)
+++ head/sys/netpfil/ipfw/ip_dn_io.cWed Oct 22 05:21:36 2014
(r273453)
@@ -283,7 +283,7 @@ mq_append(struct mq *q, struct mbuf *m)
*m_new = *m;// copy
m_new-m_flags = ~M_STACK;
m_new-__m_extbuf = p; // point to new buffer
- pkt_copy(m-__m_extbuf, p, m-__m_extlen);
+ _pkt_copy(m-__m_extbuf, p, m-__m_extlen);
m_new-m_data = p + ofs;
m = m_new;
}
Modified: head/sys/netpfil/ipfw/ip_fw_private.h
==
--- head/sys/netpfil/ipfw/ip_fw_private.h Wed Oct 22 04:16:09 2014
(r273452)
+++ head/sys/netpfil/ipfw/ip_fw_private.h Wed Oct 22 05:21:36 2014
(r273453)
@@ -354,29 +354,6 @@ struct ipfw_ifc {
};
/* Macro for working with various counters */
-#ifdef USERSPACE
-#defineIPFW_INC_RULE_COUNTER(_cntr, _bytes)do {\
- (_cntr)-pcnt++;\
- (_cntr)-bcnt += _bytes;\
- (_cntr)-timestamp = time_uptime; \
- } while (0)
-
-#defineIPFW_INC_DYN_COUNTER(_cntr, _bytes) do {\
- (_cntr)-pcnt++;\
- (_cntr)-bcnt += _bytes;\
- } while (0)
-
-#defineIPFW_ZERO_RULE_COUNTER(_cntr) do { \
- (_cntr)-pcnt = 0; \
- (_cntr)-bcnt = 0; \
- (_cntr)-timestamp = 0; \
- } while (0)
-
-#defineIPFW_ZERO_DYN_COUNTER(_cntr) do { \
- (_cntr)-pcnt = 0; \
- (_cntr)-bcnt = 0; \
- } while (0)
-#else
#defineIPFW_INC_RULE_COUNTER(_cntr, _bytes)do {\
counter_u64_add((_cntr)-cntr, 1); \
counter_u64_add((_cntr)-cntr + 1, _bytes); \
@@ -399,7 +376,6 @@ struct ipfw_ifc {
(_cntr)-pcnt = 0; \
(_cntr)-bcnt = 0; \
} while (0)
-#endif
#defineTARG_VAL(ch, k, f) ((struct table_value
*)((ch)-valuestate))[k].f
#defineIP_FW_ARG_TABLEARG(ch, a, f)\
Modified: head/sys/netpfil/ipfw/ip_fw_sockopt.c
==
--- head/sys/netpfil/ipfw/ip_fw_sockopt.c Wed Oct 22 04:16:09 2014
(r273452)
+++ head/sys/netpfil/ipfw/ip_fw_sockopt.c Wed Oct 22 05:21:36 2014
(r273453)
@@ -152,8 +152,6 @@ static struct ipfw_sopt_handler scodes[]
* static variables followed by global ones
*/
-#ifndef USERSPACE
-
static VNET_DEFINE(uma_zone_t, ipfw_cntr_zone);
#defineV_ipfw_cntr_zoneVNET(ipfw_cntr_zone)
@@ -191,35 +189,6 @@ free_rule(struct ip_fw *rule)
uma_zfree(V_ipfw_cntr_zone, rule-cntr);
free(rule, M_IPFW);
}
-#else
-void
-ipfw_init_counters()
-{
-}
-
-void
-ipfw_destroy_counters()
-{
-}
-
-struct ip_fw *
-ipfw_alloc_rule(struct ip_fw_chain *chain, size_t rulesize)
-{
- struct ip_fw *rule;
-
- rule = malloc(rulesize, M_IPFW, M_WAITOK | M_ZERO);
-
- return (rule);
-}
-
-static void
-free_rule(struct ip_fw *rule)
-{
-
- free(rule, M_IPFW);
-}
-
-#endif
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
