svn commit: r255963 - in head: etc/mtree etc/periodic/daily usr.bin/dig
Author: des
Date: Tue Oct 1 07:19:23 2013
New Revision: 255963
URL: http://svnweb.freebsd.org/changeset/base/255963
Log:
Odds and ends left over from BIND and unnoticed because they didn't
affect 'make universe'.
Approved by: re (gjb)
Deleted:
head/usr.bin/dig/
Modified:
head/etc/mtree/Makefile
head/etc/periodic/daily/Makefile
Modified: head/etc/mtree/Makefile
==
--- head/etc/mtree/Makefile Tue Oct 1 05:27:48 2013(r255962)
+++ head/etc/mtree/Makefile Tue Oct 1 07:19:23 2013(r255963)
@@ -2,20 +2,12 @@
.include
-FILES= ${_BIND.chroot.dist} \
- ${_BIND.include.dist} \
- ${_BSD.debug.dist} \
- BSD.include.dist \
+FILES= BSD.include.dist \
BSD.root.dist \
${_BSD.sendmail.dist} \
BSD.usr.dist \
BSD.var.dist
-.if ${MK_BIND} != "no"
-_BIND.chroot.dist= BIND.chroot.dist
-.if ${MK_BIND_LIBS} != "no"
-_BIND.include.dist=BIND.include.dist
-.endif
.endif
.if ${MK_DEBUG_FILES} != "no"
_BSD.debug.dist= BSD.debug.dist
Modified: head/etc/periodic/daily/Makefile
==
--- head/etc/periodic/daily/MakefileTue Oct 1 05:27:48 2013
(r255962)
+++ head/etc/periodic/daily/MakefileTue Oct 1 07:19:23 2013
(r255963)
@@ -24,10 +24,6 @@ FILES= 100.clean-disks \
FILES+=310.accounting
.endif
-.if ${MK_BIND_NAMED} != "no"
-FILES+=470.status-named
-.endif
-
.if ${MK_CALENDAR} != "no"
FILES+=300.calendar
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255964 - head/tools/build/options
Author: des
Date: Tue Oct 1 07:22:04 2013
New Revision: 255964
URL: http://svnweb.freebsd.org/changeset/base/255964
Log:
Have makeman always use the mk files from the source tree it's operating
on rather than those from the installed system.
Approved by: re (delphij)
Modified:
head/tools/build/options/makeman
Modified: head/tools/build/options/makeman
==
--- head/tools/build/options/makemanTue Oct 1 07:19:23 2013
(r255963)
+++ head/tools/build/options/makemanTue Oct 1 07:22:04 2013
(r255964)
@@ -10,6 +10,9 @@ ident='$FreeBSD$'
t=$(mktemp -d -t makeman)
trap 'test -d $t && rm -rf $t' exit
+srcdir=$(realpath ../../..)
+make="make -C $srcdir -m $srcdir/share/mk"
+
#
# usage: no_targets all_targets yes_targets
#
@@ -27,10 +30,10 @@ no_targets()
show_options()
{
- ALL_TARGETS=$(echo $(make -C ../../.. targets | tail -n +2))
+ ALL_TARGETS=$(echo $(${make} targets | tail -n +2))
rm -f $t/settings
for target in ${ALL_TARGETS} ; do
- make -C ../../.. showconfig \
+ ${make} showconfig \
SRCCONF=/dev/null __MAKE_CONF=/dev/null \
TARGET_ARCH=${target#*/} TARGET=${target%/*} |
while read var _ val ; do
@@ -93,7 +96,7 @@ show()
exit 1
;;
esac
- make -C ../../.. "$@" showconfig __MAKE_CONF=/dev/null |
+ ${make} "$@" showconfig __MAKE_CONF=/dev/null |
while read var _ val ; do
opt=${var#MK_}
case ${val} in
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255967 - head/sys/arm/samsung/exynos
Author: br
Date: Tue Oct 1 12:01:20 2013
New Revision: 255967
URL: http://svnweb.freebsd.org/changeset/base/255967
Log:
- Enable unmapped buffers on Exynos5 again, because
board now able to see all the 2GB ram it has
- Also unbreak gcc build
Approved by: cognet (mentor)
Approved by: re (marius)
Modified:
head/sys/arm/samsung/exynos/exynos5_machdep.c
Modified: head/sys/arm/samsung/exynos/exynos5_machdep.c
==
--- head/sys/arm/samsung/exynos/exynos5_machdep.c Tue Oct 1 08:41:28
2013(r255966)
+++ head/sys/arm/samsung/exynos/exynos5_machdep.c Tue Oct 1 12:01:20
2013(r255967)
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
#defineDEVMAP_BOOTSTRAP_MAP_START 0xF000
-extern int unmapped_buf_allowed;
-
vm_offset_t
initarm_lastaddr(void)
{
@@ -64,9 +62,6 @@ initarm_gpio_init(void)
void
initarm_late_init(void)
{
-
- /* XXX: PR arm/180080 */
- unmapped_buf_allowed = 0;
}
#define FDT_DEVMAP_MAX (1 + 2 + 1 + 1) /* FIXME */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r255963 - in head: etc/mtree etc/periodic/daily usr.bin/dig
On Tue, Oct 1, 2013 at 12:19 AM, Dag-Erling Smørgrav wrote:
> Author: des
> Date: Tue Oct 1 07:19:23 2013
> New Revision: 255963
> URL: http://svnweb.freebsd.org/changeset/base/255963
>
> Log:
> Odds and ends left over from BIND and unnoticed because they didn't
> affect 'make universe'.
>
> Approved by: re (gjb)
>
> Deleted:
> head/usr.bin/dig/
> Modified:
> head/etc/mtree/Makefile
> head/etc/periodic/daily/Makefile
>
> Modified: head/etc/mtree/Makefile
>
> ==
> --- head/etc/mtree/Makefile Tue Oct 1 05:27:48 2013(r255962)
> +++ head/etc/mtree/Makefile Tue Oct 1 07:19:23 2013(r255963)
> @@ -2,20 +2,12 @@
>
> .include
>
> -FILES= ${_BIND.chroot.dist} \
> - ${_BIND.include.dist} \
> - ${_BSD.debug.dist} \
> - BSD.include.dist \
> +FILES= BSD.include.dist \
>
It looks like {_BSD.debug.list} is no longer in FILES.
> BSD.root.dist \
> ${_BSD.sendmail.dist} \
> BSD.usr.dist \
> BSD.var.dist
>
> -.if ${MK_BIND} != "no"
> -_BIND.chroot.dist= BIND.chroot.dist
> -.if ${MK_BIND_LIBS} != "no"
> -_BIND.include.dist=BIND.include.dist
> -.endif
> .endif
>
This .endif needs to be removed too, as the MK_BIND_LIBS was nested inside
MK_BIND check.
Thanks,
matthew
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255968 - head/sys/ofed/include/linux
Author: alfred Date: Tue Oct 1 15:33:00 2013 New Revision: 255968 URL: http://svnweb.freebsd.org/changeset/base/255968 Log: Fix mis-merge of upstream fix. We would accidentally make the string one byte too short. Submitted by: Orit Moskovich (oritm mellanox.com) Approved by: re Modified: head/sys/ofed/include/linux/sysfs.h Modified: head/sys/ofed/include/linux/sysfs.h == --- head/sys/ofed/include/linux/sysfs.h Tue Oct 1 12:01:20 2013 (r255967) +++ head/sys/ofed/include/linux/sysfs.h Tue Oct 1 15:33:00 2013 (r255968) @@ -105,10 +105,6 @@ sysctl_handle_attr(SYSCTL_HANDLER_ARGS) /* Trim trailing newline. */ buf[len] = '\0'; } - - /* Trim trailing newline. */ - len--; - ((char*)buf)[len] = '\0'; } /* Leave one trailing byte to append a newline. */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255970 - head/sys/ofed/drivers/infiniband/hw/mlx4
Author: alfred
Date: Tue Oct 1 15:38:29 2013
New Revision: 255970
URL: http://svnweb.freebsd.org/changeset/base/255970
Log:
Fixed 'Couldn't Create QP' issue when running rc_pingpong, uc_pingpong,
srq_pingpong IBverbs
Removed refrences using 'ifdef __linux__' to qpg functions and
related fields in struct
ib_qp_init_attr.
Submitted by: Orit Moskovich (oritm mellanox.com)
Approved by: re
Modified:
head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
==
--- head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c Tue Oct 1 15:36:51
2013(r255969)
+++ head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c Tue Oct 1 15:38:29
2013(r255970)
@@ -611,6 +611,7 @@ static int qp_has_rq(struct ib_qp_init_a
return !attr->srq;
}
+#ifdef __linux__
static int init_qpg_parent(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *pqp,
struct ib_qp_init_attr *attr, int *qpn)
{
@@ -791,6 +792,7 @@ static void free_qpg_qpn(struct mlx4_ib_
break;
}
}
+#endif
static int alloc_qpn_common(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp,
struct ib_qp_init_attr *attr, int *qpn)
@@ -811,11 +813,15 @@ static int alloc_qpn_common(struct mlx4_
}
break;
case IB_QPG_PARENT:
+#ifdef __linux__
err = init_qpg_parent(dev, qp, attr, qpn);
+#endif
break;
case IB_QPG_CHILD_TX:
case IB_QPG_CHILD_RX:
+#ifdef __linux__
err = alloc_qpg_qpn(attr, qp, qpn);
+#endif
break;
default:
qp->qpg_type = IB_QPG_NONE;
@@ -839,11 +845,15 @@ static void free_qpn_common(struct mlx4_
mlx4_qp_release_range(dev->dev, qpn, 1);
break;
case IB_QPG_PARENT:
+#ifdef __linux__
free_qpg_parent(dev, qp);
+#endif
break;
case IB_QPG_CHILD_TX:
case IB_QPG_CHILD_RX:
+#ifdef __linux__
free_qpg_qpn(qp, qpn);
+#endif
break;
default:
break;
@@ -872,6 +882,10 @@ static int create_qp_common(struct mlx4_
struct mlx4_ib_qp *qp;
enum mlx4_ib_qp_type qp_type = (enum mlx4_ib_qp_type)
init_attr->qp_type;
+#ifndef __linux__
+init_attr->qpg_type = IB_QPG_NONE;
+#endif
+
/* When tunneling special qps, we use a plain UD qp */
if (sqpn) {
if (mlx4_is_mfunc(dev->dev) &&
@@ -1287,6 +1301,7 @@ static u32 get_sqp_num(struct mlx4_ib_de
return dev->dev->caps.qp1_proxy[attr->port_num - 1];
}
+#ifdef __linux__
static int check_qpg_attr(struct mlx4_ib_dev *dev,
struct ib_qp_init_attr *attr)
{
@@ -1332,6 +1347,7 @@ static int check_qpg_attr(struct mlx4_ib
}
return 0;
}
+#endif
#define RESERVED_FLAGS_MASK unsigned int)IB_QP_CREATE_RESERVED_END - 1) |
IB_QP_CREATE_RESERVED_END) \
&
~(IB_QP_CREATE_RESERVED_START - 1))
@@ -1390,9 +1406,11 @@ struct ib_qp *mlx4_ib_create_qp(struct i
init_attr->qp_type > IB_QPT_GSI)))
return ERR_PTR(-EINVAL);
+#ifdef __linux__
err = check_qpg_attr(to_mdev(device), init_attr);
if (err)
return ERR_PTR(err);
+#endif
switch (init_attr->qp_type) {
case IB_QPT_XRC_TGT:
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255971 - in head/sys: compat/linux security/mac
Author: markj
Date: Tue Oct 1 15:40:27 2013
New Revision: 255971
URL: http://svnweb.freebsd.org/changeset/base/255971
Log:
Fix some typos that were causing probe argument types to show up as unknown.
Reviewed by: rwatson (mac provider)
Approved by: re (glebius)
MFC after:1 week
Modified:
head/sys/compat/linux/linux_futex.c
head/sys/compat/linux/linux_uid16.c
head/sys/security/mac/mac_framework.c
head/sys/security/mac/mac_internal.h
head/sys/security/mac/mac_posix_shm.c
head/sys/security/mac/mac_vfs.c
Modified: head/sys/compat/linux/linux_futex.c
==
--- head/sys/compat/linux/linux_futex.c Tue Oct 1 15:38:29 2013
(r255970)
+++ head/sys/compat/linux/linux_futex.c Tue Oct 1 15:40:27 2013
(r255971)
@@ -119,7 +119,7 @@ LIN_SDT_PROBE_DEFINE1(futex, futex_sleep
LIN_SDT_PROBE_DEFINE3(futex, futex_wake, entry, "struct futex *", "int",
"uint32_t");
LIN_SDT_PROBE_DEFINE3(futex, futex_wake, iterate, "uint32_t",
-"struct waiting_proc *", "uin32_t");
+"struct waiting_proc *", "uint32_t");
LIN_SDT_PROBE_DEFINE1(futex, futex_wake, wakeup, "struct waiting_proc *");
LIN_SDT_PROBE_DEFINE1(futex, futex_wake, return, "int");
LIN_SDT_PROBE_DEFINE4(futex, futex_requeue, entry, "struct futex *", "int",
Modified: head/sys/compat/linux/linux_uid16.c
==
--- head/sys/compat/linux/linux_uid16.c Tue Oct 1 15:38:29 2013
(r255970)
+++ head/sys/compat/linux/linux_uid16.c Tue Oct 1 15:40:27 2013
(r255971)
@@ -87,7 +87,7 @@ LIN_SDT_PROBE_DEFINE1(uid16, linux_setgi
LIN_SDT_PROBE_DEFINE1(uid16, linux_setgid16, return, "int");
LIN_SDT_PROBE_DEFINE1(uid16, linux_setuid16, entry, "l_uid16_t");
LIN_SDT_PROBE_DEFINE1(uid16, linux_setuid16, return, "int");
-LIN_SDT_PROBE_DEFINE2(uid16, linux_setregid16, entry, "l_git16_t",
"l_git16_t");
+LIN_SDT_PROBE_DEFINE2(uid16, linux_setregid16, entry, "l_gid16_t",
"l_gid16_t");
LIN_SDT_PROBE_DEFINE1(uid16, linux_setregid16, return, "int");
LIN_SDT_PROBE_DEFINE2(uid16, linux_setreuid16, entry, "l_uid16_t",
"l_uid16_t");
LIN_SDT_PROBE_DEFINE1(uid16, linux_setreuid16, return, "int");
Modified: head/sys/security/mac/mac_framework.c
==
--- head/sys/security/mac/mac_framework.c Tue Oct 1 15:38:29 2013
(r255970)
+++ head/sys/security/mac/mac_framework.c Tue Oct 1 15:40:27 2013
(r255971)
@@ -95,7 +95,7 @@ SDT_PROVIDER_DEFINE(mac);
SDT_PROVIDER_DEFINE(mac_framework);
SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, modevent, "int",
-"struct mac_policy_conf *mpc");
+"struct mac_policy_conf *");
SDT_PROBE_DEFINE1(mac, kernel, policy, register, register,
"struct mac_policy_conf *");
SDT_PROBE_DEFINE1(mac, kernel, policy, unregister, unregister,
Modified: head/sys/security/mac/mac_internal.h
==
--- head/sys/security/mac/mac_internal.hTue Oct 1 15:38:29 2013
(r255970)
+++ head/sys/security/mac/mac_internal.hTue Oct 1 15:40:27 2013
(r255971)
@@ -119,7 +119,7 @@ SDT_PROVIDER_DECLARE(mac_framework);/*
SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_err, \
mac-grant-err, "int", arg0, arg1); \
SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_ok,\
- mac-grant-ok, "INT", arg0, arg1);
+ mac-grant-ok, "int", arg0, arg1);
#defineMAC_GRANT_PROBE2(name, error, arg0, arg1) do {
\
if (error) {\
Modified: head/sys/security/mac/mac_posix_shm.c
==
--- head/sys/security/mac/mac_posix_shm.c Tue Oct 1 15:38:29 2013
(r255970)
+++ head/sys/security/mac/mac_posix_shm.c Tue Oct 1 15:40:27 2013
(r255971)
@@ -133,7 +133,7 @@ mac_posixshm_check_mmap(struct ucred *cr
}
MAC_CHECK_PROBE_DEFINE3(posixshm_check_open, "struct ucred *",
-"struct shmfd *", "accmode_t accmode");
+"struct shmfd *", "accmode_t");
int
mac_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd,
Modified: head/sys/security/mac/mac_vfs.c
==
--- head/sys/security/mac/mac_vfs.c Tue Oct 1 15:38:29 2013
(r255970)
+++ head/sys/security/mac/mac_vfs.c Tue Oct 1 15:40:27 2013
(r255971)
@@ -783,7 +783,7 @@ mac_vnode_check_revoke(struct ucred *cre
}
MAC_CHECK_PROBE_DEFINE4(vnode_check_setacl, "struct ucred *",
-"struct vnode *", "acl_tpe_t", "struct acl *");
+"struct vnode *", "acl_type_t", "struct acl *");
int
mac_vnode_check_setacl(struct ucred *cred, struct vnode *vp, acl_type_t
svn commit: r255972 - in head/sys/ofed: drivers/infiniband/core drivers/infiniband/hw/mlx4 include/rdma
Author: alfred
Date: Tue Oct 1 15:42:38 2013
New Revision: 255972
URL: http://svnweb.freebsd.org/changeset/base/255972
Log:
Enable ib_dev.mmap function
Removed the ifdef linux from this function.
Added stub function for contiguous pages to avoid compilation
errors.
Submitted by: Orit Moskovich (oritm mellanox.com)
Approved by: re
Modified:
head/sys/ofed/drivers/infiniband/core/umem.c
head/sys/ofed/drivers/infiniband/hw/mlx4/main.c
head/sys/ofed/include/rdma/ib_umem.h
Modified: head/sys/ofed/drivers/infiniband/core/umem.c
==
--- head/sys/ofed/drivers/infiniband/core/umem.cTue Oct 1 15:40:27
2013(r255971)
+++ head/sys/ofed/drivers/infiniband/core/umem.cTue Oct 1 15:42:38
2013(r255972)
@@ -530,3 +530,46 @@ int ib_umem_page_count(struct ib_umem *u
return n;
}
EXPORT_SYMBOL(ib_umem_page_count);
+
+/**/
+/*
+ * Stub functions for contiguous pages -
+ * We currently do not support this feature
+ */
+/**/
+
+/**
+ * ib_cmem_release_contiguous_pages - release memory allocated by
+ * ib_cmem_alloc_contiguous_pages.
+ * @cmem: cmem struct to release
+ */
+void ib_cmem_release_contiguous_pages(struct ib_cmem *cmem)
+{
+}
+EXPORT_SYMBOL(ib_cmem_release_contiguous_pages);
+
+/**
+ * * ib_cmem_alloc_contiguous_pages - allocate contiguous pages
+ * * @context: userspace context to allocate memory for
+ * * @total_size: total required size for that allocation.
+ ** @page_size_order: order of one contiguous page.
+ * */
+struct ib_cmem *ib_cmem_alloc_contiguous_pages(struct ib_ucontext *context,
+unsigned long total_size,
+ unsigned long
page_size_order)
+{
+ return NULL;
+}
+EXPORT_SYMBOL(ib_cmem_alloc_contiguous_pages);
+
+/**
+ * * ib_cmem_map_contiguous_pages_to_vma - map contiguous pages into VMA
+ * * @ib_cmem: cmem structure returned by ib_cmem_alloc_contiguous_pages
+ ** @vma: VMA to inject pages into.
+ * */
+int ib_cmem_map_contiguous_pages_to_vma(struct ib_cmem *ib_cmem,
+struct vm_area_struct *vma)
+{
+ return 0;
+}
+EXPORT_SYMBOL(ib_cmem_map_contiguous_pages_to_vma);
Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/main.c
==
--- head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Tue Oct 1 15:40:27
2013(r255971)
+++ head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Tue Oct 1 15:42:38
2013(r255972)
@@ -726,6 +726,7 @@ full_search:
addr = ALIGN(vma->vm_end, 1 << page_size_order);
}
}
+#endif
static int mlx4_ib_mmap(struct ib_ucontext *context, struct vm_area_struct
*vma)
{
@@ -780,7 +781,6 @@ static int mlx4_ib_mmap(struct ib_uconte
return 0;
}
-#endif
static struct ib_pd *mlx4_ib_alloc_pd(struct ib_device *ibdev,
struct ib_ucontext *context,
@@ -1984,8 +1984,8 @@ static void *mlx4_ib_add(struct mlx4_dev
ibdev->ib_dev.modify_port = mlx4_ib_modify_port;
ibdev->ib_dev.alloc_ucontext= mlx4_ib_alloc_ucontext;
ibdev->ib_dev.dealloc_ucontext = mlx4_ib_dealloc_ucontext;
-#ifdef __linux__
ibdev->ib_dev.mmap = mlx4_ib_mmap;
+#ifdef __linux__
ibdev->ib_dev.get_unmapped_area = mlx4_ib_get_unmapped_area;
#endif
ibdev->ib_dev.alloc_pd = mlx4_ib_alloc_pd;
Modified: head/sys/ofed/include/rdma/ib_umem.h
==
--- head/sys/ofed/include/rdma/ib_umem.hTue Oct 1 15:40:27 2013
(r255971)
+++ head/sys/ofed/include/rdma/ib_umem.hTue Oct 1 15:42:38 2013
(r255972)
@@ -57,6 +57,24 @@ struct ib_umem {
unsigned long diff;
};
+struct ib_cmem {
+
+struct ib_ucontext *context;
+size_t length;
+/* Link list of contiguous blocks being part of that cmem */
+struct list_head ib_cmem_block;
+
+/* Order of cmem block, 2^ block_order will equal number
+ of physical pages per block
+*/
+unsigned longblock_order;
+/* Refernce counter for that memory area
+ - When value became 0 pages will be returned to the kernel.
+*/
+struct kref refcount;
+};
+
+
struct ib_umem_chunk {
struct list_headlist;
int nents;
@@ -70,4 +88,14 @@ struct ib_umem *ib_umem_get(struct ib_uc
void ib_umem_release(struct ib_umem *umem);
int ib_umem_page_count(struct ib_umem *umem);
+int ib_cmem_map_contiguous_pages_to_vma(struct ib_cmem *ib_cmem,
+struct vm_ar
svn commit: r255973 - head/sys/ofed/drivers/infiniband/core
Author: alfred
Date: Tue Oct 1 15:43:23 2013
New Revision: 255973
URL: http://svnweb.freebsd.org/changeset/base/255973
Log:
Fixed kernel crash when running devinfo
When calling to ib_uverbs_cleanup_ucontext, there is a call to
mutex_lock of xrcd_table_mutex, which was not initialized.
Added missing initialization for xrcd_table_mutex.
Submitted by: Orit Moskovich (oritm mellanox.com)
Approved by: re
Modified:
head/sys/ofed/drivers/infiniband/core/device.c
Modified: head/sys/ofed/drivers/infiniband/core/device.c
==
--- head/sys/ofed/drivers/infiniband/core/device.c Tue Oct 1 15:42:38
2013(r255972)
+++ head/sys/ofed/drivers/infiniband/core/device.c Tue Oct 1 15:43:23
2013(r255973)
@@ -296,6 +296,8 @@ int ib_register_device(struct ib_device
INIT_LIST_HEAD(&device->client_data_list);
spin_lock_init(&device->event_handler_lock);
spin_lock_init(&device->client_data_lock);
+ device->ib_uverbs_xrcd_table = RB_ROOT;
+ mutex_init(&device->xrcd_table_mutex);
ret = read_port_table_lengths(device);
if (ret) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255969 - in head/sys/ofed/drivers: infiniband/hw/mlx4 net/mlx4
Author: alfred Date: Tue Oct 1 15:36:51 2013 New Revision: 255969 URL: http://svnweb.freebsd.org/changeset/base/255969 Log: Fixed kernel crash when removing IPOIB_CM option from configuration file Changed module init from module_init() to module_init_order() with SI_ORDER_MIDDLE flag Submitted by: Orit Moskovich (oritm mellanox.com) Approved by: re Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/main.c head/sys/ofed/drivers/net/mlx4/main.c Modified: head/sys/ofed/drivers/infiniband/hw/mlx4/main.c == --- head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Tue Oct 1 15:33:00 2013(r255968) +++ head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Tue Oct 1 15:36:51 2013(r255969) @@ -2431,7 +2431,7 @@ static void __exit mlx4_ib_cleanup(void) } -module_init(mlx4_ib_init); +module_init_order(mlx4_ib_init, SI_ORDER_MIDDLE); module_exit(mlx4_ib_cleanup); #undef MODULE_VERSION Modified: head/sys/ofed/drivers/net/mlx4/main.c == --- head/sys/ofed/drivers/net/mlx4/main.c Tue Oct 1 15:33:00 2013 (r255968) +++ head/sys/ofed/drivers/net/mlx4/main.c Tue Oct 1 15:36:51 2013 (r255969) @@ -2859,7 +2859,7 @@ static void __exit mlx4_cleanup(void) destroy_workqueue(mlx4_wq); } -module_init(mlx4_init); +module_init_order(mlx4_init, SI_ORDER_MIDDLE); module_exit(mlx4_cleanup); #undef MODULE_VERSION ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255974 - in head: . gnu/usr.bin/binutils gnu/usr.bin/binutils/ar gnu/usr.bin/binutils/ranlib tools/build/options
Author: emaste Date: Tue Oct 1 17:40:56 2013 New Revision: 255974 URL: http://svnweb.freebsd.org/changeset/base/255974 Log: Remove long-unused GNU ar and ranlib The libarchive-based replacements have been used since 2009; the GNU ones were kept to support source upgrades from FreeBSD 6. Approved by: re@ (delphij) Deleted: head/gnu/usr.bin/binutils/ar/Makefile head/gnu/usr.bin/binutils/ar/ar.1 head/gnu/usr.bin/binutils/ranlib/Makefile head/gnu/usr.bin/binutils/ranlib/ranlib.1 Modified: head/ObsoleteFiles.inc head/gnu/usr.bin/binutils/Makefile head/tools/build/options/WITHOUT_BINUTILS Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Tue Oct 1 15:43:23 2013(r255973) +++ head/ObsoleteFiles.inc Tue Oct 1 17:40:56 2013(r255974) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib # 20130930: BIND removed from base OLD_FILES+=etc/namedb OLD_FILES+=etc/periodic/daily/470.status-named Modified: head/gnu/usr.bin/binutils/Makefile == --- head/gnu/usr.bin/binutils/Makefile Tue Oct 1 15:43:23 2013 (r255973) +++ head/gnu/usr.bin/binutils/Makefile Tue Oct 1 17:40:56 2013 (r255974) @@ -1,7 +1,7 @@ # $FreeBSD$ SUBDIR=libiberty libbfd libopcodes libbinutils \ - addr2line ar as ld nm objcopy objdump ranlib readelf \ + addr2line as ld nm objcopy objdump readelf \ size strings strip doc .include Modified: head/tools/build/options/WITHOUT_BINUTILS == --- head/tools/build/options/WITHOUT_BINUTILS Tue Oct 1 15:43:23 2013 (r255973) +++ head/tools/build/options/WITHOUT_BINUTILS Tue Oct 1 17:40:56 2013 (r255974) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib, +Set to not install binutils (as, c++-filt, gconv, ld, nm, objcopy, objdump, readelf, size and strip). .Bf -symbolic The option does not generally work for build targets, unless some alternative ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255975 - head/share/man/man5
Author: emaste Date: Tue Oct 1 17:46:04 2013 New Revision: 255975 URL: http://svnweb.freebsd.org/changeset/base/255975 Log: Regen. Approved by: re (implicit) 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 1 17:40:56 2013 (r255974) +++ head/share/man/man5/src.conf.5 Tue Oct 1 17:46:04 2013 (r255975) @@ -128,8 +128,8 @@ Set to not build audit support into syst Set to not build .Xr authpf 8 . .It Va WITHOUT_BINUTILS -.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 235342 2012-05-12 16:12:36Z gjb -Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib, +.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 255974 2013-10-01 17:40:56Z emaste +Set to not install binutils (as, c++-filt, gconv, ld, nm, objcopy, objdump, readelf, size and strip). .Bf -symbolic The option does not generally work for build targets, unless some alternative ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255976 - head
Author: emaste Date: Tue Oct 1 17:51:04 2013 New Revision: 255976 URL: http://svnweb.freebsd.org/changeset/base/255976 Log: Also remove GNU ar and ranlib man pages This was missed in r255974. Approved by: re (implicit) Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Tue Oct 1 17:46:04 2013(r255975) +++ head/ObsoleteFiles.inc Tue Oct 1 17:51:04 2013(r255976) @@ -41,6 +41,8 @@ # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz # 20130930: BIND removed from base OLD_FILES+=etc/namedb OLD_FILES+=etc/periodic/daily/470.status-named ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255977 - in head: bin/dd sbin/bsdlabel sbin/ccdconfig sbin/fdisk sbin/gbde sbin/geom/class/eli sbin/geom/class/shsec sbin/geom/class/virstor sbin/gvinum sbin/mount_msdosfs sbin/newfs s...
Author: pluknet Date: Tue Oct 1 18:41:53 2013 New Revision: 255977 URL: http://svnweb.freebsd.org/changeset/base/255977 Log: Sweep man pages replacing ad -> ada. Approved by: re (blackend) MFC after:1 week X-MFC note: stable/9 only Modified: head/bin/dd/dd.1 head/sbin/bsdlabel/bsdlabel.8 head/sbin/ccdconfig/ccdconfig.8 head/sbin/fdisk/fdisk.8 head/sbin/gbde/gbde.8 head/sbin/geom/class/eli/geli.8 head/sbin/geom/class/shsec/gshsec.8 head/sbin/geom/class/virstor/gvirstor.8 head/sbin/gvinum/gvinum.8 head/sbin/mount_msdosfs/mount_msdosfs.8 head/sbin/newfs/newfs.8 head/sbin/newfs_msdos/newfs_msdos.8 head/sbin/newfs_nandfs/newfs_nandfs.8 head/sbin/recoverdisk/recoverdisk.1 head/share/man/man4/geom_linux_lvm.4 head/share/man/man5/ext2fs.5 head/share/man/man5/msdosfs.5 head/share/man/man5/reiserfs.5 head/share/man/man8/picobsd.8 head/sys/boot/common/loader.8 head/usr.sbin/boot0cfg/boot0cfg.8 Modified: head/bin/dd/dd.1 == --- head/bin/dd/dd.1Tue Oct 1 17:51:04 2013(r255976) +++ head/bin/dd/dd.1Tue Oct 1 18:41:53 2013(r255977) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: head/sbin/bsdlabel/bsdlabel.8 == --- head/sbin/bsdlabel/bsdlabel.8 Tue Oct 1 17:51:04 2013 (r255976) +++ head/sbin/bsdlabel/bsdlabel.8 Tue Oct 1 18:41:53 2013 (r255977) @@ -31,7 +31,7 @@ .\"@(#)disklabel.8 8.2 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd March 5, 2011 +.Dd October 1, 2013 .Dt BSDLABEL 8 .Os .Sh NAME @@ -457,9 +457,9 @@ such as and .Cm * , which could be used as a source file for -.Dq Li "bsdlabel -R ad0s1 new_label_file" : +.Dq Li "bsdlabel -R ada0s1 new_label_file" : .Bd -literal -offset 4n -# /dev/ad0s1: +# /dev/ada0s1: 8 partitions: #size offsetfstype [fsize bsize bps/cpg] Modified: head/sbin/ccdconfig/ccdconfig.8 == --- head/sbin/ccdconfig/ccdconfig.8 Tue Oct 1 17:51:04 2013 (r255976) +++ head/sbin/ccdconfig/ccdconfig.8 Tue Oct 1 18:41:53 2013 (r255977) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 17, 1995 +.Dd October 1, 2013 .Dt CCDCONFIG 8 .Os .Sh NAME @@ -180,7 +180,7 @@ and read it from mdadm --create --chunk=32 --level=0 --raid-devices=2 /dev/md0 \\ /dev/hda1 /dev/hdb1 # Make the RAID-0 just created available on FreeBSD: -ccdconfig -c /dev/ccd0 32 linux /dev/ad0s1 /dev/ad0s2 +ccdconfig -c /dev/ccd0 32 linux /dev/ada0s1 /dev/ada0s2 .Ed .Pp When you create a new ccd disk you generally want to Modified: head/sbin/fdisk/fdisk.8 == --- head/sbin/fdisk/fdisk.8 Tue Oct 1 17:51:04 2013(r255976) +++ head/sbin/fdisk/fdisk.8 Tue Oct 1 18:41:53 2013(r255977) @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd May 24, 2009 +.Dd October 1, 2013 .Dt FDISK 8 .Os .Sh NAME @@ -159,7 +159,7 @@ mounted root device. When called with no arguments, it prints the sector 0 slice table. An example follows: .Bd -literal - *** Working on device /dev/ad0 *** + *** Working on device /dev/ada0 *** parameters extracted from in-core disklabel are: cylinders=769 heads=15 sectors/track=33 (495 blks/cyl) Modified: head/sbin/gbde/gbde.8 == --- head/sbin/gbde/gbde.8 Tue Oct 1 17:51:04 2013(r255976) +++ head/sbin/gbde/gbde.8 Tue Oct 1 18:41:53 2013(r255977) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2006 +.Dd October 1, 2013 .Dt GBDE 8 .Os .Sh NAME @@ -207,23 +207,23 @@ used). .Sh EXAMPLES To initialize a device, using default parameters: .Pp -.Dl "gbde init /dev/ad0s1f -L /etc/ad0s1f.lock" +.Dl "gbde init /dev/ada0s1f -L /etc/ada0s1f.lock" .Pp To attach an encrypted device: .Pp -.Dl "gbde attach ad0s1f -l /etc/ad0s1f.lock" +.Dl "gbde attach ada0s1f -l /etc/ada0s1f.lock" .Pp The encrypted device has the suffix .Pa .bde so a typical command to create and mount a file system would be: .Pp -.Dl "newfs /dev/ad0s1f.bde" -.Dl "mount /dev/ad0s1f.bde /secret" +.Dl "newfs /dev/ada0s1f.bde" +.Dl "mount /dev/ada0s1f.
svn commit: r255978 - head/contrib/llvm/lib/Target/X86
Author: dim
Date: Tue Oct 1 19:14:24 2013
New Revision: 255978
URL: http://svnweb.freebsd.org/changeset/base/255978
Log:
Pull in r191711 from upstream llvm trunk:
The X86FixupLEAs pass for Intel Atom must not call
convertToThreeAddress on ADD16rr opcodes, if src1 != src, since that
would cause convertToThreeAddress to try to create a virtual register.
This is not permitted after register allocation, which is when the
X86FixupLEAs pass runs.
This patch fixes PR16785.
Pull in r191715 from upstream llvm trunk:
Forgot to add a break statement.
This should enable building the x11-toolskits/libXaw port with
CPUTYPE=atom.
Approved by: re (gjb)
Reported by: Kenta Suzumoto
MFC after:3 days
Modified:
head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp
Modified: head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp
==
--- head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp Tue Oct 1 18:41:53
2013(r255977)
+++ head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp Tue Oct 1 19:14:24
2013(r255978)
@@ -125,6 +125,15 @@ FixupLEAPass::postRAConvertToLEA(Machine
// which requires isImm() to be true
return 0;
}
+break;
+ case X86::ADD16rr:
+ case X86::ADD16rr_DB:
+if (MI->getOperand(1).getReg() != MI->getOperand(2).getReg()) {
+ // if src1 != src2, then convertToThreeAddress will
+ // need to create a Virtual register, which we cannot do
+ // after register allocation.
+ return 0;
+}
}
return TII->convertToThreeAddress(MFI, MBBI, 0);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255979 - head/sys/kern
Author: kib
Date: Tue Oct 1 20:18:33 2013
New Revision: 255979
URL: http://svnweb.freebsd.org/changeset/base/255979
Log:
When printing the vnode information from ddb, print the lengths of the
dirty and clean buffer queues.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Approved by: re (gjb)
Modified:
head/sys/kern/vfs_subr.c
Modified: head/sys/kern/vfs_subr.c
==
--- head/sys/kern/vfs_subr.cTue Oct 1 19:14:24 2013(r255978)
+++ head/sys/kern/vfs_subr.cTue Oct 1 20:18:33 2013(r255979)
@@ -2892,9 +2892,12 @@ vn_printf(struct vnode *vp, const char *
if (mtx_owned(VI_MTX(vp)))
printf(" VI_LOCKed");
if (vp->v_object != NULL)
- printf("v_object %p ref %d pages %d\n",
+ printf("v_object %p ref %d pages %d "
+ "cleanbuf %d dirtybuf %d\n",
vp->v_object, vp->v_object->ref_count,
- vp->v_object->resident_page_count);
+ vp->v_object->resident_page_count,
+ vp->v_bufobj.bo_dirty.bv_cnt,
+ vp->v_bufobj.bo_clean.bv_cnt);
printf("");
lockmgr_printinfo(vp->v_vnlock);
if (vp->v_data != NULL)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255980 - head/lib/libc/sys
Author: jilles Date: Tue Oct 1 21:17:18 2013 New Revision: 255980 URL: http://svnweb.freebsd.org/changeset/base/255980 Log: accept(2): Update portability note for accept4(). The accept(2) man page warns that O_NONBLOCK and other properties on the new socket may vary across implementations. However, this issue only applies to accept() and not to accept4(). On the other hand, accept4() is not commonly available yet. Reported by: pluknet Reviewed by: bjk Approved by: re (kib) Modified: head/lib/libc/sys/accept.2 Modified: head/lib/libc/sys/accept.2 == --- head/lib/libc/sys/accept.2 Tue Oct 1 20:18:33 2013(r255979) +++ head/lib/libc/sys/accept.2 Tue Oct 1 21:17:18 2013(r255980) @@ -28,7 +28,7 @@ .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd May 1, 2013 +.Dd October 1, 2013 .Dt ACCEPT 2 .Os .Sh NAME @@ -155,13 +155,20 @@ For some applications, performance may b .Xr accept_filter 9 to pre-process incoming connections. .Pp -Portable programs should not rely on the +When using +.Fn accept , +portable programs should not rely on the .Dv O_NONBLOCK and .Dv O_ASYNC properties and the signal destination being inherited, but should set them explicitly using -.Xr fcntl 2 . +.Xr fcntl 2 ; +.Fn accept4 +sets these properties consistently, +but may not be fully portable across +.Ux +platforms. .Sh RETURN VALUES These calls return \-1 on error. If they succeed, they return a non-negative ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255981 - head
Author: delphij
Date: Tue Oct 1 22:53:27 2013
New Revision: 255981
URL: http://svnweb.freebsd.org/changeset/base/255981
Log:
Revert-and-redo r255955: the sort -r should be added to delete-old-dirs.
Approved by: re (gjb)
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Oct 1 21:17:18 2013(r255980)
+++ head/Makefile.inc1 Tue Oct 1 22:53:27 2013(r255981)
@@ -1673,7 +1673,7 @@ delete-old-files:
# the Makefile parser segfault.
@exec 3<&0; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
- -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | sort -r
| \
+ -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
while read file; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ];
then \
chflags noschg "${DESTDIR}/$${file}" 2>/dev/null ||
true; \
@@ -1738,7 +1738,7 @@ check-old-libs:
delete-old-dirs:
@echo ">>> Removing old directories"
@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
- -V OLD_DIRS | xargs -n1 | \
+ -V OLD_DIRS | xargs -n1 | sort -r | \
while read dir; do \
if [ -d "${DESTDIR}/$${dir}" ]; then \
rmdir -v "${DESTDIR}/$${dir}" || true; \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255982 - head/contrib/binutils/bfd
Author: emaste
Date: Wed Oct 2 00:50:27 2013
New Revision: 255982
URL: http://svnweb.freebsd.org/changeset/base/255982
Log:
Use correct size for MIPS .rld_map section
On MIPS .dynamic is read-only and so a special section .rld_map is used
to store the pointer to the rtld information for debuggers. This
section had a hard coded size of 4 bytes which is not correct for
mips64. (Note that FreeBSD's rtld does not yet populate .rld_map.)
Sponsored by: DARPA, AFRL
Approved by: re (delphij)
Modified:
head/contrib/binutils/bfd/elfxx-mips.c
Modified: head/contrib/binutils/bfd/elfxx-mips.c
==
--- head/contrib/binutils/bfd/elfxx-mips.c Tue Oct 1 22:53:27 2013
(r255981)
+++ head/contrib/binutils/bfd/elfxx-mips.c Wed Oct 2 00:50:27 2013
(r255982)
@@ -557,6 +557,10 @@ static bfd *reldyn_sorting_bfd;
#define MIPS_ELF_DYN_SIZE(abfd) \
(get_elf_backend_data (abfd)->s->sizeof_dyn)
+/* The size of the rld_map pointer. */
+#define MIPS_ELF_RLD_MAP_SIZE(abfd) \
+ (get_elf_backend_data (abfd)->s->arch_size / 8)
+
/* The size of a GOT entry. */
#define MIPS_ELF_GOT_SIZE(abfd) \
(get_elf_backend_data (abfd)->s->arch_size / 8)
@@ -7492,7 +7496,7 @@ _bfd_mips_elf_size_dynamic_sections (bfd
{
/* We add a room for __rld_map. It will be filled in by the
rtld to contain a pointer to the _r_debug structure. */
- s->size += 4;
+ s->size += MIPS_ELF_RLD_MAP_SIZE (output_bfd);
}
else if (SGI_COMPAT (output_bfd)
&& CONST_STRNEQ (name, ".compact_rel"))
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255983 - head/libexec/rtld-elf
Author: emaste
Date: Wed Oct 2 02:32:58 2013
New Revision: 255983
URL: http://svnweb.freebsd.org/changeset/base/255983
Log:
Populate .rld_map on MIPS for debuggers
On MIPS the .dynamic section is read-only, so the pointer to rtld
information for debuggers cannot be stored there (in DT_DEBUG).
Instead, a special section .rld_map is used.
Sponsored by: DARPA, AFRL
Approved by: re (delphij)
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cWed Oct 2 00:50:27 2013
(r255982)
+++ head/libexec/rtld-elf/rtld.cWed Oct 2 02:32:58 2013
(r255983)
@@ -,11 +,7 @@ digest_dynamic1(Obj_Entry *obj, int earl
break;
case DT_MIPS_RLD_MAP:
-#ifdef notyet
- if (!early)
- dbg("Filling in DT_DEBUG entry");
- ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug;
-#endif
+ *((Elf_Addr *)(dynp->d_un.d_ptr)) = (Elf_Addr) &r_debug;
break;
#endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255985 - head/share/misc
Author: gjb Date: Wed Oct 2 04:40:46 2013 New Revision: 255985 URL: http://svnweb.freebsd.org/changeset/base/255985 Log: Add FreeBSD 9.2-RELEASE to the BSD Family Tree Approved by: re (hrs) Sponsored by: The FreeBSD Foundation Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree == --- head/share/misc/bsd-family-tree Wed Oct 2 04:18:00 2013 (r255984) +++ head/share/misc/bsd-family-tree Wed Oct 2 04:40:46 2013 (r255985) @@ -263,22 +263,23 @@ FreeBSD 5.2 | | | | | | | | ||OpenBSD 5.2 DragonFly 3.2.1 | FreeBSD| | | | | NetBSD | | |9.1 | | | | | 5.2 | | - | | | | | ||| | - | | | | | | NetBSD | | - | | | | | | 5.2.1 | | - | | | | | | | | - | | | | | \| | - | | | | | NetBSD | | - | | | | |6.0.1 | | - | | | | | | OpenBSD 5.3 DragonFly 3.4.1 - | | | | | NetBSD | | - | | | | |6.0.2 | | - | | | | | | | - | | | | `-NetBSD 6.1 | | - | FreeBSD | | | | - |8.4 | | | | - || | | | - || | | | + | | | | | | ||| | + | | | | | | | NetBSD | | + | | | | | | | 5.2.1 | | + | | | | | | | | | + | | | | | | \| | + | | | | | | NetBSD | | + | | | | | |6.0.1 | | + | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 + | | | | | | NetBSD | | + | | | | | |6.0.2 | | + | | | | | | | | + | | | | | `-NetBSD 6.1 | | + | |FreeBSD | | | | + | | 8.4 | | | | + | | | | | | + | FreeBSD | | | | + |9.2 | | | | || | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | || | | | @@ -589,6 +590,7 @@ NetBSD 6.1 2013-05-18 [NBD] FreeBSD 8.42013-06-07 [FBD] NetBSD 5.1.3 2013-09-29 [NBD] NetBSD 5.2.1 2013-09-29 [NBD] +FreeBSD 9.22013-09-30 [FBD] Bibliography ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r255983 - head/libexec/rtld-elf
On Wed, Oct 02, 2013 at 02:32:59AM +, Ed Maste wrote:
> Author: emaste
> Date: Wed Oct 2 02:32:58 2013
> New Revision: 255983
> URL: http://svnweb.freebsd.org/changeset/base/255983
>
> Log:
> Populate .rld_map on MIPS for debuggers
>
> On MIPS the .dynamic section is read-only, so the pointer to rtld
> information for debuggers cannot be stored there (in DT_DEBUG).
> Instead, a special section .rld_map is used.
>
> Sponsored by: DARPA, AFRL
> Approved by:re (delphij)
>
> Modified:
> head/libexec/rtld-elf/rtld.c
>
> Modified: head/libexec/rtld-elf/rtld.c
> ==
> --- head/libexec/rtld-elf/rtld.c Wed Oct 2 00:50:27 2013
> (r255982)
> +++ head/libexec/rtld-elf/rtld.c Wed Oct 2 02:32:58 2013
> (r255983)
> @@ -,11 +,7 @@ digest_dynamic1(Obj_Entry *obj, int earl
> break;
>
> case DT_MIPS_RLD_MAP:
> -#ifdef notyet
> - if (!early)
> - dbg("Filling in DT_DEBUG entry");
> - ((Elf_Dyn*)dynp)->d_un.d_ptr = (Elf_Addr) &r_debug;
> -#endif
> + *((Elf_Addr *)(dynp->d_un.d_ptr)) = (Elf_Addr) &r_debug;
> break;
> #endif
>
Could the DT_DEBUG and DT_MIPS_RLD_MAP cases be collapsed some more, e.g. by
putting only the 'case :' lines under ifdef ?
Also, you removed the if (!early) test. Is rtld relocated enough in
the init_rtld() for this assignment to work correctly ?
pgpUibaV2iS_J.pgp
Description: PGP signature
svn commit: r255986 - head/sys/kern
Author: kib
Date: Wed Oct 2 06:00:34 2013
New Revision: 255986
URL: http://svnweb.freebsd.org/changeset/base/255986
Log:
When helping the bufdaemon from the buffer allocation context, there
is no sense to walk the whole dirty buffer queue. We are only
interested in, and can operate on, the buffers owned by the current
vnode [1]. Instead of calling generic queue flush routine, do
VOP_FSYNC() if possible.
Holding the dirty buffer queue lock in the bufdaemon, without dropping
it, can cause starvation of buffer writes from other threads. This is
esp. easy to reproduce on the big memory machines, where large files
are written, causing almost all dirty buffers accumulating in several
big files, which vnodes are locked by writers. Bufdaemon cannot flush
any buffer, but is iterating over the whole dirty queue
continuously. Since dirty queue mutex is not dropped, bufdone() in
g_up thread is starved, usually deadlocking the machine [2]. Mitigate
this by dropping the queue lock after the vnode is locked, allowing
other queue lock contenders to make a progress.
Discussed with: Jeff [1]
Reported by: pho [2]
Tested by:pho
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Approved by: re (hrs)
Modified:
head/sys/kern/vfs_bio.c
Modified: head/sys/kern/vfs_bio.c
==
--- head/sys/kern/vfs_bio.c Wed Oct 2 04:40:46 2013(r255985)
+++ head/sys/kern/vfs_bio.c Wed Oct 2 06:00:34 2013(r255986)
@@ -113,8 +113,8 @@ static void vfs_setdirty_locked_object(s
static void vfs_vmio_release(struct buf *bp);
static int vfs_bio_clcheck(struct vnode *vp, int size,
daddr_t lblkno, daddr_t blkno);
-static int buf_flush(struct vnode *vp, int);
-static int flushbufqueues(struct vnode *, int, int);
+static int buf_flush(int);
+static int flushbufqueues(int, int);
static void buf_daemon(void);
static void bremfreel(struct buf *bp);
static __inline void bd_wakeup(void);
@@ -2048,7 +2048,7 @@ getnewbuf_bufd_help(struct vnode *vp, in
{
struct thread *td;
char *waitmsg;
- int fl, flags, norunbuf;
+ int cnt, error, flags, norunbuf, wait;
mtx_assert(&bqclean, MA_OWNED);
@@ -2072,10 +2072,13 @@ getnewbuf_bufd_help(struct vnode *vp, in
return;
td = curthread;
+ cnt = 0;
+ wait = MNT_NOWAIT;
mtx_lock(&nblock);
while (needsbuffer & flags) {
if (vp != NULL && (td->td_pflags & TDP_BUFNEED) == 0) {
mtx_unlock(&nblock);
+
/*
* getblk() is called with a vnode locked, and
* some majority of the dirty buffers may as
@@ -2084,15 +2087,20 @@ getnewbuf_bufd_help(struct vnode *vp, in
* cannot be achieved by the buf_daemon, that
* cannot lock the vnode.
*/
- norunbuf = ~(TDP_BUFNEED | TDP_NORUNNINGBUF) |
- (td->td_pflags & TDP_NORUNNINGBUF);
- /* play bufdaemon */
- td->td_pflags |= TDP_BUFNEED | TDP_NORUNNINGBUF;
- fl = buf_flush(vp, flushbufqtarget);
- td->td_pflags &= norunbuf;
+ if (cnt++ > 2)
+ wait = MNT_WAIT;
+ ASSERT_VOP_LOCKED(vp, "bufd_helper");
+ error = VOP_ISLOCKED(vp) == LK_EXCLUSIVE ? 0 :
+ vn_lock(vp, LK_TRYUPGRADE);
+ if (error == 0) {
+ /* play bufdaemon */
+ norunbuf = curthread_pflags_set(TDP_BUFNEED |
+ TDP_NORUNNINGBUF);
+ VOP_FSYNC(vp, wait, td);
+ atomic_add_long(¬bufdflushes, 1);
+ curthread_pflags_restore(norunbuf);
+ }
mtx_lock(&nblock);
- if (fl != 0)
- continue;
if ((needsbuffer & flags) == 0)
break;
}
@@ -2510,20 +2518,18 @@ static struct kproc_desc buf_kp = {
SYSINIT(bufdaemon, SI_SUB_KTHREAD_BUF, SI_ORDER_FIRST, kproc_start, &buf_kp);
static int
-buf_flush(struct vnode *vp, int target)
+buf_flush(int target)
{
int flushed;
- flushed = flushbufqueues(vp, target, 0);
+ flushed = flushbufqueues(target, 0);
if (flushed == 0) {
/*
* Could not find any buffers without rollback
* dependencies, so just write the first one
* in the hopes of eventually making progress.
*/
- if (vp != NULL && target > 2)
-
