PERFORCE change 168051 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue Sep 1 16:12:51 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=168051
Change 168051 by trasz at trasz_anger on 2009/09/01 16:12:07
IFC.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/ls/print.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ahci.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ip6.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ips.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mfi.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/make.conf.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/ja_JP.UTF-8.src#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/vm_machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_xpt.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ia32/ia32_sysvec.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkfront/blkfront.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/elf_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pmap.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/vesa.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/locore.s#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thread.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/imgact_elf.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_extern.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_glue.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/extern.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/pr_time.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/w.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#8 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.35 2009/07/01 15:52:19 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.36 2009/08/31 20:42:07 trasz Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -249,4 +249,3 @@
return (supports_acls);
}
-
==== //depot/projects/soc2008/trasz_nfs4acl/bin/ls/print.c#6 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.79 2009/08/31 20:53:01 trasz Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -659,6 +659,7 @@
return;
}
if (acl_is_trivial_np(facl, &trivial)) {
+ acl_free(facl);
warn("%s", name);
return;
}
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.60 2009/07/10 17:42:53 scottl Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.62 2009/08/30 16:31:25 mav Exp $");
#include <sys/ioctl.h>
#include <sys/stdint.h>
@@ -206,6 +206,7 @@
struct ccb_trans_settings *cts);
static void cpi_print(struct ccb_pathinq *cpi);
static int get_cpi(struct cam_device *device, struct ccb_pathinq *cpi);
+static int get_cgd(struct cam_device *device, struct ccb_getdev *cgd);
static int get_print_cts(struct cam_device *device, int user_settings,
int quiet, struct ccb_trans_settings *cts);
static int ratecontrol(struct cam_device *device, int retry_count,
@@ -1015,17 +1016,18 @@
((u_int64_t)parm->lba_size48_4 << 48);
printf("\n");
- printf("Protocol ");
+ printf("protocol ");
+ printf("ATA/ATAPI-%d", ata_version(parm->version_major));
if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
if (parm->satacapabilities & ATA_SATA_GEN2)
- printf("SATA revision 2.x\n");
+ printf(" SATA 2.x\n");
else if (parm->satacapabilities & ATA_SATA_GEN1)
- printf("SATA revision 1.x\n");
+ printf(" SATA 1.x\n");
else
- printf("Unknown SATA revision\n");
+ printf(" SATA x.x\n");
}
else
- printf("ATA/ATAPI revision %d\n", ata_version(parm->version_major));
+ printf("\n");
printf("device model %.40s\n", parm->model);
printf("serial number %.20s\n", parm->serial);
printf("firmware revision %.8s\n", parm->revision);
@@ -1038,22 +1040,74 @@
(parm->support.command2 & ATA_SUPPORT_CFA))
printf("CFA supported\n");
- printf("lba%ssupported ",
+ printf("LBA%ssupported ",
parm->capabilities1 & ATA_SUPPORT_LBA ? " " : " not ");
if (lbasize)
printf("%d sectors\n", lbasize);
else
printf("\n");
- printf("lba48%ssupported ",
+ printf("LBA48%ssupported ",
parm->support.command2 & ATA_SUPPORT_ADDRESS48 ? " " : " not ");
if (lbasize48)
printf("%ju sectors\n", (uintmax_t)lbasize48);
else
printf("\n");
- printf("dma%ssupported\n",
+ printf("PIO supported PIO");
+ if (parm->atavalid & ATA_FLAG_64_70) {
+ if (parm->apiomodes & 0x02)
+ printf("4");
+ else if (parm->apiomodes & 0x01)
+ printf("3");
+ } else if (parm->mwdmamodes & 0x04)
+ printf("4");
+ else if (parm->mwdmamodes & 0x02)
+ printf("3");
+ else if (parm->mwdmamodes & 0x01)
+ printf("2");
+ else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x200)
+ printf("2");
+ else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x100)
+ printf("1");
+ else
+ printf("0");
+ printf("\n");
+
+ printf("DMA%ssupported ",
parm->capabilities1 & ATA_SUPPORT_DMA ? " " : " not ");
+ if (parm->capabilities1 & ATA_SUPPORT_DMA) {
+ if (parm->mwdmamodes & 0xff) {
+ printf("WDMA");
+ if (parm->mwdmamodes & 0x04)
+ printf("2");
+ else if (parm->mwdmamodes & 0x02)
+ printf("1");
+ else if (parm->mwdmamodes & 0x01)
+ printf("0");
+ printf(" ");
+ }
+ if ((parm->atavalid & ATA_FLAG_88) &&
+ (parm->udmamodes & 0xff)) {
+ printf("UDMA");
+ if (parm->udmamodes & 0x40)
+ printf("6");
+ else if (parm->udmamodes & 0x20)
+ printf("5");
+ else if (parm->udmamodes & 0x10)
+ printf("4");
+ else if (parm->udmamodes & 0x08)
+ printf("3");
+ else if (parm->udmamodes & 0x04)
+ printf("2");
+ else if (parm->udmamodes & 0x02)
+ printf("1");
+ else if (parm->udmamodes & 0x01)
+ printf("0");
+ printf(" ");
+ }
+ }
+ printf("\n");
printf("overlap%ssupported\n",
parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not ");
@@ -1070,10 +1124,10 @@
parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no");
if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
- printf("Native Command Queuing (NCQ) %s %s"
+ printf("Native Command Queuing (NCQ) %s "
" %d/0x%02X\n",
parm->satacapabilities & ATA_SUPPORT_NCQ ?
- "yes" : "no", " -",
+ "yes" : "no",
(parm->satacapabilities & ATA_SUPPORT_NCQ) ?
ATA_QUEUE_LEN(parm->queue) : 0,
(parm->satacapabilities & ATA_SUPPORT_NCQ) ?
@@ -1121,9 +1175,14 @@
{
union ccb *ccb;
struct ata_params *ident_buf;
+ struct ccb_getdev cgd;
u_int i, error = 0;
int16_t *ptr;
-
+
+ if (get_cgd(device, &cgd) != 0) {
+ warnx("couldn't get CGD");
+ return(1);
+ }
ccb = cam_getccb(device);
if (ccb == NULL) {
@@ -1152,10 +1211,10 @@
/*data_ptr*/(u_int8_t *)ptr,
/*dxfer_len*/sizeof(struct ata_params),
timeout ? timeout : 30 * 1000);
-// if (periph->path->device->protocol == PROTO_ATA)
- ata_36bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
-// else
-// ata_36bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
+ if (cgd.protocol == PROTO_ATA)
+ ata_28bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
+ else
+ ata_28bit_cmd(&ccb->ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
/* Disable freezing the device queue */
ccb->ccb_h.flags |= CAM_DEV_QFRZDIS;
@@ -2588,46 +2647,71 @@
int retval = 0;
ccb = cam_getccb(device);
-
if (ccb == NULL) {
warnx("get_cpi: couldn't allocate CCB");
return(1);
}
-
bzero(&(&ccb->ccb_h)[1],
sizeof(struct ccb_pathinq) - sizeof(struct ccb_hdr));
-
ccb->ccb_h.func_code = XPT_PATH_INQ;
-
if (cam_send_ccb(device, ccb) < 0) {
warn("get_cpi: error sending Path Inquiry CCB");
-
if (arglist & CAM_ARG_VERBOSE)
cam_error_print(device, ccb, CAM_ESF_ALL,
CAM_EPF_ALL, stderr);
-
retval = 1;
-
goto get_cpi_bailout;
}
-
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-
if (arglist & CAM_ARG_VERBOSE)
cam_error_print(device, ccb, CAM_ESF_ALL,
CAM_EPF_ALL, stderr);
-
retval = 1;
-
goto get_cpi_bailout;
}
-
bcopy(&ccb->cpi, cpi, sizeof(struct ccb_pathinq));
get_cpi_bailout:
+ cam_freeccb(ccb);
+ return(retval);
+}
+/*
+ * Get a get device CCB for the specified device.
+ */
+static int
+get_cgd(struct cam_device *device, struct ccb_getdev *cgd)
+{
+ union ccb *ccb;
+ int retval = 0;
+
+ ccb = cam_getccb(device);
+ if (ccb == NULL) {
+ warnx("get_cgd: couldn't allocate CCB");
+ return(1);
+ }
+ bzero(&(&ccb->ccb_h)[1],
+ sizeof(struct ccb_pathinq) - sizeof(struct ccb_hdr));
+ ccb->ccb_h.func_code = XPT_GDEV_TYPE;
+ if (cam_send_ccb(device, ccb) < 0) {
+ warn("get_cgd: error sending Path Inquiry CCB");
+ if (arglist & CAM_ARG_VERBOSE)
+ cam_error_print(device, ccb, CAM_ESF_ALL,
+ CAM_EPF_ALL, stderr);
+ retval = 1;
+ goto get_cgd_bailout;
+ }
+ if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+ if (arglist & CAM_ARG_VERBOSE)
+ cam_error_print(device, ccb, CAM_ESF_ALL,
+ CAM_EPF_ALL, stderr);
+ retval = 1;
+ goto get_cgd_bailout;
+ }
+ bcopy(&ccb->cgd, cgd, sizeof(struct ccb_getdev));
+
+get_cgd_bailout:
cam_freeccb(ccb);
-
return(retval);
}
@@ -2673,6 +2757,9 @@
case PI_SOFT_RST:
str = "soft reset alternative";
break;
+ case PI_SATAPM:
+ str = "SATA Port Multiplier";
+ break;
default:
str = "unknown PI bit set";
break;
@@ -2702,6 +2789,12 @@
str = "user has disabled initial BUS RESET or"
" controller is in target/mixed mode";
break;
+ case PIM_NO_6_BYTE:
+ str = "do not send 6-byte commands";
+ break;
+ case PIM_SEQSCAN:
+ str = "scan bus sequentially";
+ break;
default:
str = "unknown PIM bit set";
break;
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ahci.4#3 (text+ko) ====
@@ -23,9 +23,9 @@
.\" (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: src/share/man/man4/ahci.4,v 1.2 2009/07/25 18:19:31 mav Exp $
+.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.3 2009/08/30 15:20:13 mav Exp $
.\"
-.Dd June 26, 2009
+.Dd August 24, 2009
.Dt AHCI 4
.Os
.Sh NAME
@@ -60,6 +60,13 @@
.It 2
multiple MSI vectors used, if supported;
.El
+.It Va hint.ahci.X.ccc
+controls Command Completion Coalescing (CCC) usage by the specified controller.
+Non-zero value enables CCC and defines maximum time (in ms), request can wait
+for interrupt, if there are some more requests present on controller queue.
+CCC reduces number of context switches on systems with many parallel requests,
+but it can decrease disk performance on some workloads due to additional
+command latency.
.It Va hint.ahcich.X.pm_level
controls SATA interface Power Management for specified channel,
allowing some power to be saved at the cost of additional command
@@ -74,7 +81,15 @@
host initiates PARTIAL PM state transition every time port becomes idle;
.It 3
host initiates SLUMBER PM state transition every time port becomes idle.
+.It 4
+driver initiates PARTIAL PM state transition 1ms after port becomes idle;
+.It 5
+driver initiates SLUMBER PM state transition 125ms after port becomes idle.
.El
+Some controllers, such as ICH8, do not implement modes 2 and 3 with NCQ used.
+Because of artificial entering latency, performance degradation in modes
+4 and 5 is much smaller then in modes 2 and 3.
+.Pp
Note that interface Power Management is not compatible with
device presence detection.
You will have to reset bus manually on device hot-plug.
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ip6.4#2 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.23 2008/02/22 21:02:36 bms Exp $
+.\" $FreeBSD: src/share/man/man4/ip6.4,v 1.24 2009/08/30 14:45:09 motoyuki Exp $
.\"
.Dd February 21, 2008
.Dt IP6 4
@@ -692,7 +692,7 @@
Most of the socket options are defined in RFC 2292 or RFC 2553.
The
.Dv IPV6_V6ONLY
-socket option is defined in RFC 3542.
+socket option is defined in RFC 3493 Section 5.3.
The
.Dv IPV6_PORTRANGE
socket option and the conflict resolution rule are not defined in the
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ips.4#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ips.4,v 1.7 2006/11/05 08:55:21 maxim Exp $
+.\" $FreeBSD: src/share/man/man4/ips.4,v 1.8 2009/08/31 16:20:06 trasz Exp $
.\"
.Dd November 4, 2006
.Dt IPS 4
@@ -92,6 +92,10 @@
.It
ServeRAID 7t/7k/7M
.El
+.Pp
+Newer ServeRAID controllers are supported by the
+.Xr aac 4
+driver.
.Sh DIAGNOSTICS
Several error codes may be shown when the card initializes the
.Tn IBM
@@ -180,6 +184,7 @@
.Tn SCSI
subsystem.
.Sh SEE ALSO
+.Xr aac 4 ,
.Xr ch 4 ,
.Xr da 4 ,
.Xr sysctl 8
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mfi.4#3 (text) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.8 2009/08/15 11:47:05 trasz Exp $
+.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.9 2009/08/31 16:19:06 trasz Exp $
.\"
.Dd August 15, 2009
.Dt MFI 4
@@ -102,9 +102,9 @@
An attempt was made to remove a mounted volume.
.El
.Sh SEE ALSO
-.Xr mfiutil 1 ,
.Xr amr 4 ,
-.Xr pci 4
+.Xr pci 4 ,
+.Xr mfiutil 8
.Sh HISTORY
The
.Nm
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/make.conf.5#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.140 2007/06/15 03:21:20 gshapiro Exp $
+.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.141 2009/09/01 05:55:10 maxim Exp $
.\"
-.Dd September 5, 2006
+.Dd September 1, 2009
.Dt MAKE.CONF 5
.Os
.Sh NAME
@@ -466,6 +466,12 @@
and allow access over FireWire(IEEE1394) using
.Xr dconschat 8 .
Currently, only i386 and amd64 are supported.
+.It Va MALLOC_PRODUCTION
+.Pq Vt bool
+Set this to disable assertions and statistics gathering in
+.Xr malloc 3 .
+It also defaults the A and J runtime options to off.
+Disabled by default on -CURRENT.
.It Va MODULES_WITH_WORLD
.Pq Vt bool
Set to build modules with the system instead of the kernel.
==== //depot/projects/soc2008/trasz_nfs4acl/share/timedef/ja_JP.UTF-8.src#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.3 2007/12/30 03:08:52 ache Exp $
+# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.4 2009/08/30 10:47:00 ume Exp $
#
# WARNING: spaces may be essential at the end of lines
# WARNING: empty lines are essential too
@@ -68,13 +68,11 @@
#
# am
#
-#åˆå‰
-AM
+åˆå‰
#
# pm
#
-#åˆå¾Œ
-PM
+åˆå¾Œ
#
# date_fmt
#
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.31 2009/08/24 16:19:47 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.32 2009/08/30 14:38:17 bz Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -118,7 +118,7 @@
.sysvec = &elf64_freebsd_sysvec,
.interp_newpath = NULL,
.brand_note = &elf64_kfreebsd_brandnote,
- .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE
+ .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY
};
SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#21 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.669 2009/08/29 16:01:21 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.670 2009/08/31 18:41:13 jhb Exp $");
/*
* Manages physical address maps.
@@ -4476,7 +4476,8 @@
if (base < DMAP_MIN_ADDRESS)
return (EINVAL);
- cache_bits_pde = cache_bits_pte = -1;
+ cache_bits_pde = pmap_cache_bits(mode, 1);
+ cache_bits_pte = pmap_cache_bits(mode, 0);
changed = FALSE;
/*
@@ -4493,8 +4494,6 @@
* memory type, then we need not demote this page. Just
* increment tmpva to the next 1GB page frame.
*/
- if (cache_bits_pde < 0)
- cache_bits_pde = pmap_cache_bits(mode, 1);
if ((*pdpe & PG_PDE_CACHE) == cache_bits_pde) {
tmpva = trunc_1gpage(tmpva) + NBPDP;
continue;
@@ -4522,8 +4521,6 @@
* memory type, then we need not demote this page. Just
* increment tmpva to the next 2MB page frame.
*/
- if (cache_bits_pde < 0)
- cache_bits_pde = pmap_cache_bits(mode, 1);
if ((*pde & PG_PDE_CACHE) == cache_bits_pde) {
tmpva = trunc_2mpage(tmpva) + NBPDR;
continue;
@@ -4557,12 +4554,9 @@
for (tmpva = base; tmpva < base + size; ) {
pdpe = pmap_pdpe(kernel_pmap, tmpva);
if (*pdpe & PG_PS) {
- if (cache_bits_pde < 0)
- cache_bits_pde = pmap_cache_bits(mode, 1);
if ((*pdpe & PG_PDE_CACHE) != cache_bits_pde) {
pmap_pde_attr(pdpe, cache_bits_pde);
- if (!changed)
- changed = TRUE;
+ changed = TRUE;
}
if (tmpva >= VM_MIN_KERNEL_ADDRESS) {
if (pa_start == pa_end) {
@@ -4588,12 +4582,9 @@
}
pde = pmap_pdpe_to_pde(pdpe, tmpva);
if (*pde & PG_PS) {
- if (cache_bits_pde < 0)
- cache_bits_pde = pmap_cache_bits(mode, 1);
if ((*pde & PG_PDE_CACHE) != cache_bits_pde) {
pmap_pde_attr(pde, cache_bits_pde);
- if (!changed)
- changed = TRUE;
+ changed = TRUE;
}
if (tmpva >= VM_MIN_KERNEL_ADDRESS) {
if (pa_start == pa_end) {
@@ -4616,13 +4607,10 @@
}
tmpva = trunc_2mpage(tmpva) + NBPDR;
} else {
- if (cache_bits_pte < 0)
- cache_bits_pte = pmap_cache_bits(mode, 0);
pte = pmap_pde_to_pte(pde, tmpva);
if ((*pte & PG_PTE_CACHE) != cache_bits_pte) {
pmap_pte_attr(pte, cache_bits_pte);
- if (!changed)
- changed = TRUE;
+ changed = TRUE;
}
if (tmpva >= VM_MIN_KERNEL_ADDRESS) {
if (pa_start == pa_end) {
==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/vm_machdep.c#7 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.42 2009/08/29 21:53:08 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.43 2009/09/01 11:41:51 kib Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,9 +119,6 @@
#ifdef __XSCALE__
#ifndef CPU_XSCALE_CORE3
pmap_use_minicache(td2->td_kstack, td2->td_kstack_pages * PAGE_SIZE);
- if (td2->td_altkstack)
- pmap_use_minicache(td2->td_altkstack, td2->td_altkstack_pages *
- PAGE_SIZE);
#endif
#endif
td2->td_pcb = pcb2;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.1 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.2 2009/08/30 16:31:25 mav Exp $");
#include <sys/param.h>
@@ -91,7 +91,7 @@
}
void
-ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
+ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
uint32_t lba, uint8_t sector_count)
{
bzero(&ataio->cmd, sizeof(ataio->cmd));
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* (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: src/sys/cam/ata/ata_all.h,v 1.1 2009/07/10 08:18:08 scottl Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $
*/
#ifndef CAM_ATA_ALL_H
@@ -83,7 +83,7 @@
int ata_version(int ver);
void ata_print_ident(struct ata_params *ident_data);
-void ata_36bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
+void ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
uint32_t lba, uint8_t sector_count);
void ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features,
uint64_t lba, uint16_t sector_count);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.2 2009/07/17 21:48:08 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.4 2009/08/30 16:31:25 mav Exp $");
#include <sys/param.h>
@@ -287,7 +287,7 @@
if (softc->flags & ADA_FLAG_CAN_48BIT)
ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0);
else
- ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0);
+ ata_28bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0);
cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0,
/*sense_flags*/SF_RETRY_UA,
softc->disk->d_devstat);
@@ -411,7 +411,7 @@
ata_48bit_cmd(&ccb.ataio, ATA_WRITE_DMA48,
0, lba, count);
} else {
- ata_36bit_cmd(&ccb.ataio, ATA_WRITE_DMA,
+ ata_28bit_cmd(&ccb.ataio, ATA_WRITE_DMA,
0, lba, count);
}
xpt_polled_action(&ccb);
@@ -441,7 +441,7 @@
if (softc->flags & ADA_FLAG_CAN_48BIT)
ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0);
else
- ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
+ ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
xpt_polled_action(&ccb);
if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
@@ -856,10 +856,10 @@
}
} else {
if (bp->bio_cmd == BIO_READ) {
- ata_36bit_cmd(ataio, ATA_READ_DMA,
+ ata_28bit_cmd(ataio, ATA_READ_DMA,
0, lba, count);
} else {
- ata_36bit_cmd(ataio, ATA_WRITE_DMA,
+ ata_28bit_cmd(ataio, ATA_WRITE_DMA,
0, lba, count);
}
}
@@ -878,7 +878,7 @@
if (softc->flags & ADA_FLAG_CAN_48BIT)
ata_48bit_cmd(ataio, ATA_FLUSHCACHE48, 0, 0, 0);
else
- ata_48bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0);
+ ata_28bit_cmd(ataio, ATA_FLUSHCACHE, 0, 0, 0);
break;
}
start_ccb->ccb_h.ccb_state = ADA_CCB_BUFFER_IO;
@@ -1126,7 +1126,7 @@
if (softc->flags & ADA_FLAG_CAN_48BIT)
ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE48, 0, 0, 0);
else
- ata_48bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
+ ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
xpt_polled_action(&ccb);
if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_xpt.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.4 2009/08/18 09:27:17 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.5 2009/08/30 16:31:25 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -357,9 +357,9 @@
/*dxfer_len*/sizeof(struct ata_params),
30 * 1000);
if (periph->path->device->protocol == PROTO_ATA)
- ata_36bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
+ ata_28bit_cmd(ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
else
- ata_36bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
+ ata_28bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0);
break;
}
case PROBE_SETMODE:
@@ -375,7 +375,7 @@
/*data_ptr*/NULL,
/*dxfer_len*/0,
30 * 1000);
- ata_36bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0,
+ ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0,
ata_max_mode(ident_buf, ATA_UDMA6, ATA_UDMA6));
break;
}
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 (text+ko) ====
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -864,10 +864,11 @@
/* currently allocated, want to be allocated */
dmu_tx_hold_bonus(tx, drro->drr_object);
/*
- * We may change blocksize, so need to
- * hold_write
+ * We may change blocksize and delete old content,
+ * so need to hold_write and hold_free.
*/
dmu_tx_hold_write(tx, drro->drr_object, 0, 1);
+ dmu_tx_hold_free(tx, drro->drr_object, 0, DMU_OBJECT_END);
err = dmu_tx_assign(tx, TXG_WAIT);
if (err) {
dmu_tx_abort(tx);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 (text+ko) ====
@@ -415,7 +415,7 @@
dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize,
dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx)
{
- int i, old_nblkptr;
+ int i, nblkptr;
dmu_buf_impl_t *db = NULL;
ASSERT3U(blocksize, >=, SPA_MINBLOCKSIZE);
@@ -445,6 +445,8 @@
dnode_free_range(dn, 0, -1ULL, tx);
}
+ nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT);
+
/* change blocksize */
rw_enter(&dn->dn_struct_rwlock, RW_WRITER);
if (blocksize != dn->dn_datablksz &&
@@ -457,6 +459,8 @@
dnode_setdirty(dn, tx);
dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen;
dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize;
+ if (dn->dn_nblkptr != nblkptr)
+ dn->dn_next_nblkptr[tx->tx_txg&TXG_MASK] = nblkptr;
rw_exit(&dn->dn_struct_rwlock);
if (db)
dbuf_rele(db, FTAG);
@@ -466,19 +470,15 @@
/* change bonus size and type */
mutex_enter(&dn->dn_mtx);
- old_nblkptr = dn->dn_nblkptr;
dn->dn_bonustype = bonustype;
dn->dn_bonuslen = bonuslen;
- dn->dn_nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT);
+ dn->dn_nblkptr = nblkptr;
dn->dn_checksum = ZIO_CHECKSUM_INHERIT;
dn->dn_compress = ZIO_COMPRESS_INHERIT;
ASSERT3U(dn->dn_nblkptr, <=, DN_MAX_NBLKPTR);
- /* XXX - for now, we can't make nblkptr smaller */
- ASSERT3U(dn->dn_nblkptr, >=, old_nblkptr);
-
- /* fix up the bonus db_size if dn_nblkptr has changed */
- if (dn->dn_bonus && dn->dn_bonuslen != old_nblkptr) {
+ /* fix up the bonus db_size */
+ if (dn->dn_bonus) {
dn->dn_bonus->db.db_size =
DN_MAX_BONUSLEN - (dn->dn_nblkptr-1) * sizeof (blkptr_t);
ASSERT(dn->dn_bonuslen <= dn->dn_bonus->db.db_size);
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 (text+ko) ====
@@ -19,12 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/zfs_context.h>
#include <sys/dbuf.h>
#include <sys/dnode.h>
@@ -534,18 +532,12 @@
/* XXX shouldn't the phys already be zeroed? */
bzero(dnp, DNODE_CORE_SIZE);
dnp->dn_nlevels = 1;
+ dnp->dn_nblkptr = dn->dn_nblkptr;
}
- if (dn->dn_nblkptr > dnp->dn_nblkptr) {
- /* zero the new blkptrs we are gaining */
- bzero(dnp->dn_blkptr + dnp->dn_nblkptr,
- sizeof (blkptr_t) *
- (dn->dn_nblkptr - dnp->dn_nblkptr));
- }
dnp->dn_type = dn->dn_type;
dnp->dn_bonustype = dn->dn_bonustype;
dnp->dn_bonuslen = dn->dn_bonuslen;
- dnp->dn_nblkptr = dn->dn_nblkptr;
}
ASSERT(dnp->dn_nlevels > 1 ||
@@ -605,6 +597,30 @@
return;
}
+ if (dn->dn_next_nblkptr[txgoff]) {
+ /* this should only happen on a realloc */
+ ASSERT(dn->dn_allocated_txg == tx->tx_txg);
+ if (dn->dn_next_nblkptr[txgoff] > dnp->dn_nblkptr) {
+ /* zero the new blkptrs we are gaining */
+ bzero(dnp->dn_blkptr + dnp->dn_nblkptr,
+ sizeof (blkptr_t) *
+ (dn->dn_next_nblkptr[txgoff] - dnp->dn_nblkptr));
+#ifdef ZFS_DEBUG
+ } else {
+ int i;
+ ASSERT(dn->dn_next_nblkptr[txgoff] < dnp->dn_nblkptr);
+ /* the blkptrs we are losing better be unallocated */
+ for (i = dn->dn_next_nblkptr[txgoff];
+ i < dnp->dn_nblkptr; i++)
+ ASSERT(BP_IS_HOLE(&dnp->dn_blkptr[i]));
+#endif
+ }
+ mutex_enter(&dn->dn_mtx);
+ dnp->dn_nblkptr = dn->dn_next_nblkptr[txgoff];
+ dn->dn_next_nblkptr[txgoff] = 0;
+ mutex_exit(&dn->dn_mtx);
+ }
+
if (dn->dn_next_nlevels[txgoff]) {
dnode_increase_indirection(dn, tx);
dn->dn_next_nlevels[txgoff] = 0;
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 (text+ko) ====
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -160,6 +160,7 @@
uint16_t dn_datablkszsec; /* in 512b sectors */
uint32_t dn_datablksz; /* in bytes */
uint64_t dn_maxblkid;
+ uint8_t dn_next_nblkptr[TXG_SIZE];
uint8_t dn_next_nlevels[TXG_SIZE];
uint8_t dn_next_indblkshift[TXG_SIZE];
uint16_t dn_next_bonuslen[TXG_SIZE];
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 (text+ko) ====
@@ -729,7 +729,9 @@
vattr.va_mask = AT_UID;
+ vn_lock(mvp, LK_SHARED | LK_RETRY);
if (error = VOP_GETATTR(mvp, &vattr, cr)) {
+ VOP_UNLOCK(mvp, 0);
goto out;
}
@@ -741,12 +743,15 @@
}
#else
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list