diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-16 11:31:51 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-16 11:31:51 +0000 |
commit | f22763a77aeb04df3d683e094615740a079cfe4c (patch) | |
tree | b9708a6955e40d4671246a4ece688d47d8ed6633 /usr/src | |
parent | fbc0ddb953a7d9b82226743cc9873150a118a37f (diff) | |
parent | 668deb93650906efec36a69b7d09c98435d9cf24 (diff) | |
download | illumos-joyent-f22763a77aeb04df3d683e094615740a079cfe4c.tar.gz |
[illumos-gate merge]
commit 668deb93650906efec36a69b7d09c98435d9cf24
12516 bignum: File does not contain CTF data
commit eefd1fd8cdcbc3b47ccbc8e3609736f4e94ec70f
12424 openeepr: variable may be used uninitialized
commit c90a6cb9577b585b21dfb2f0db6cc9be16d67a6e
12278 nfs-zone needs man page changes
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/common/bignum/sun4u/mont_mulf_kernel_v9.s | 79 | ||||
-rw-r--r-- | usr/src/man/man1m/nfsd.1m | 17 | ||||
-rw-r--r-- | usr/src/man/man4/nfs.4 | 17 | ||||
-rw-r--r-- | usr/src/man/man5/zones.5 | 31 | ||||
-rw-r--r-- | usr/src/man/man7fs/sharefs.7fs | 21 | ||||
-rw-r--r-- | usr/src/uts/common/io/openprom.c | 2 | ||||
-rw-r--r-- | usr/src/uts/sun4u/bignum/Makefile | 14 |
7 files changed, 72 insertions, 109 deletions
diff --git a/usr/src/common/bignum/sun4u/mont_mulf_kernel_v9.s b/usr/src/common/bignum/sun4u/mont_mulf_kernel_v9.s index 4080b43f82..af522fb12d 100644 --- a/usr/src/common/bignum/sun4u/mont_mulf_kernel_v9.s +++ b/usr/src/common/bignum/sun4u/mont_mulf_kernel_v9.s @@ -26,7 +26,7 @@ /* * This file is mostly a result of compiling the mont_mulf.c file to generate an * assembly output and then hand-editing that output to replace the - * compiler-generated loop for the 512-bit case (nlen == 16) in the + * compiler-generated loop for the 512-bit case (nlen == 16) in the * mont_mulf_noconv routine with a hand-crafted version. This file also * has big_savefp() and big_restorefp() routines added by hand. */ @@ -41,45 +41,8 @@ #include <sys/machtrap.h> #include <sys/machsig.h> -#if defined(lint) || defined(__lint) -#include <sys/types.h> - -/* ARGSUSED */ -uint64_t -double2uint64_t(double* d) -{ - return (0ULL); -} - -/* ARGSUSED */ -void -conv_d16_to_i32(uint32_t *i32, double *d16, int64_t *tmp, int ilen) -{ -} - -/* ARGSUSED */ -void -conv_i32_to_d32(double *d32, uint32_t *i32, int len) -{ -} - -/* ARGSUSED */ -void -conv_i32_to_d16(double *d16, uint32_t *i32, int len) -{ -} - -/* ARGSUSED */ -void -mont_mulf_noconv(uint32_t *result, double *dm1, double *dm2, double *dt, - double *dn, uint32_t *nint, int nlen, double dn0) -{ -} - -#else /* lint || __lint */ - .section ".text",#alloc,#execinstr - .file "mont_mulf.c" + .file "mont_mulf.s" .section ".bss",#alloc,#write Bbss.bss: @@ -257,7 +220,7 @@ TwoToMinus32: /* 0x0084 */ ble,a,pt %icc,.L900000110 /* 0x0088 64 */ ldd [%g1],%f10 .L77000188: -/* 0x008c 69 */ retl ! Result = +/* 0x008c 69 */ retl ! Result = /* 0x0090 */ nop /* 0x0094 0 */ .type cleanup,2 /* 0x0094 0 */ .size cleanup,(.-cleanup) @@ -286,7 +249,7 @@ TwoToMinus32: ! ! OFFSET SOURCE LINE LABEL INSTRUCTION - .global double2uint64_t + .global double2uint64_t double2uint64_t: /* 000000 86 */ ldx [%o0],%o2 @@ -350,7 +313,7 @@ TwoToMinus32: ! ! OFFSET SOURCE LINE LABEL INSTRUCTION - .global conv_d16_to_i32 + .global conv_d16_to_i32 conv_d16_to_i32: /* 000000 110 */ save %sp,-176,%sp @@ -522,7 +485,7 @@ TwoToMinus32: /* 0x01b8 */ sllx %l5,16,%l6 /* 0x01bc */ add %l2,%l6,%l7 /* 0x01c0 */ st %l7,[%i0+%i2] -/* 0x01c4 129 */ ret ! Result = +/* 0x01c4 129 */ ret ! Result = /* 0x01c8 */ restore %g0,%g0,%g0 /* 0x01cc 0 */ .type conv_d16_to_i32,2 /* 0x01cc 0 */ .size conv_d16_to_i32,(.-conv_d16_to_i32) @@ -551,7 +514,7 @@ TwoToMinus32: ! ! OFFSET SOURCE LINE LABEL INSTRUCTION - .global conv_i32_to_d32 + .global conv_i32_to_d32 conv_i32_to_d32: /* 000000 140 */ orcc %g0,%o2,%o2 @@ -657,7 +620,7 @@ TwoToMinus32: /* 0x015c */ ble,a,pt %icc,.L900000409 /* 0x0160 */ ld [%o1],%f15 .L77000254: -/* 0x0164 145 */ retl ! Result = +/* 0x0164 145 */ retl ! Result = /* 0x0168 */ nop /* 0x016c 0 */ .type conv_i32_to_d32,2 /* 0x016c 0 */ .size conv_i32_to_d32,(.-conv_i32_to_d32) @@ -686,7 +649,7 @@ TwoToMinus32: ! ! OFFSET SOURCE LINE LABEL INSTRUCTION - .global conv_i32_to_d16 + .global conv_i32_to_d16 conv_i32_to_d16: /* 000000 151 */ save %sp,-368,%sp /* 0x0004 */ orcc %g0,%i2,%i2 @@ -828,7 +791,7 @@ TwoToMinus32: /* 0x01d0 */ ble,a,pt %icc,.L900000510 /* 0x01d4 157 */ ld [%l7],%l2 .L77000272: -/* 0x01d8 159 */ ret ! Result = +/* 0x01d8 159 */ ret ! Result = /* 0x01dc */ restore %g0,%g0,%g0 /* 0x01e0 0 */ .type conv_i32_to_d16,2 /* 0x01e0 0 */ .size conv_i32_to_d16,(.-conv_i32_to_d16) @@ -899,7 +862,7 @@ TwoToMinus32: ! ! OFFSET SOURCE LINE LABEL INSTRUCTION - .global conv_i32_to_d32_and_d16 + .global conv_i32_to_d32_and_d16 conv_i32_to_d32_and_d16: /* 000000 214 */ save %sp,-368,%sp @@ -1160,7 +1123,7 @@ TwoToMinus32: /* 0x03a0 */ bl,a,pt %icc,.L900000614 /* 0x03a4 225 */ ld [%i2],%o2 .L77000294: -/* 0x03a8 222 */ ret ! Result = +/* 0x03a8 222 */ ret ! Result = /* 0x03ac */ restore %g0,%g0,%g0 /* 0x03b0 0 */ .type conv_i32_to_d32_and_d16,2 /* 0x03b0 0 */ .size conv_i32_to_d32_and_d16,(.-conv_i32_to_d32_and_d16) @@ -1362,7 +1325,7 @@ TwoToMinus32: /* 0x0218 */ ble,a,pt %icc,.L900000711 /* 0x021c 250 */ ld [%o4],%g5 .L77000332: -/* 0x0220 252 */ retl ! Result = +/* 0x0220 252 */ retl ! Result = /* 0x0224 */ nop /* 0x0228 0 */ .type adjust_montf_result,2 /* 0x0228 0 */ .size adjust_montf_result,(.-adjust_montf_result) @@ -1380,7 +1343,7 @@ TwoToMinus32: ! 261 ! int64_t acc; ! 262 ! int i; ! 264 ! c4++; -! 265 ! +! 265 ! ! 266 ! if (i32[len] > 0) { ! 267 ! i = -1; ! 268 ! c1++; @@ -1436,7 +1399,7 @@ TwoToMinus32: ! ! OFFSET SOURCE LINE LABEL INSTRUCTION - .global mont_mulf_noconv + .global mont_mulf_noconv mont_mulf_noconv: /* 000000 317 */ save %sp,-176,%sp /* 0x0004 */ ldx [%fp+2223],%g1 @@ -1598,7 +1561,7 @@ TwoToMinus32: /* 0x0184 */ std %f0,[%i3+512] /* 0x0188 */ std %f0,[%i3+520] -!BEGIN HAND CODED PART +!BEGIN HAND CODED PART ! cheetah schedule, no even-odd trick @@ -1624,7 +1587,7 @@ TwoToMinus32: ldd [%i1+112],%f58 ldd [%i4],%f44 - ldd [%i4+8],%f46 + ldd [%i4+8],%f46 ldd [%i4+104],%f50 ldd [%i4+112],%f60 @@ -1667,7 +1630,7 @@ TwoToMinus32: !11 ldd [%i3+8],%f6 faddd %f16,%f18,%f16 - fmuld %f30,%f0,%f30 + fmuld %f30,%f0,%f30 !12 std %f16,[%i3+16] faddd %f24,%f26,%f24 @@ -2289,7 +2252,7 @@ TwoToMinus32: !11 ldd [%i3+8],%f6 faddd %f16,%f18,%f16 - fmuld %f30,%f0,%f30 + fmuld %f30,%f0,%f30 !12 std %f16,[%i3+16] faddd %f24,%f26,%f24 @@ -3041,7 +3004,7 @@ TwoToMinus32: /* 0x0c30 */ ble,a,pt %icc,.L900000841 /* 0x0c34 */ ld [%i2],%o4 .L77000379: -/* 0x0c38 405 */ ret ! Result = +/* 0x0c38 405 */ ret ! Result = /* 0x0c3c */ restore %g0,%g0,%g0 /* 0x0c40 0 */ .type mont_mulf_noconv,2 /* 0x0c40 0 */ .size mont_mulf_noconv,(.-mont_mulf_noconv) @@ -3151,5 +3114,3 @@ TwoToMinus32: retl nop SET_SIZE(big_restorefp) - -#endif /* lint || __lint */ diff --git a/usr/src/man/man1m/nfsd.1m b/usr/src/man/man1m/nfsd.1m index e188fdd29b..82b3282718 100644 --- a/usr/src/man/man1m/nfsd.1m +++ b/usr/src/man/man1m/nfsd.1m @@ -18,8 +18,9 @@ .\" Copyright 1989 AT&T .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved .\" Copyright 2016 Nexenta Systems, Inc. +.\" Copyright 2020 Joyent, Inc. .\" -.Dd March 12, 2016 +.Dd February 4, 2020 .Dt NFSD 1M .Os .Sh NAME @@ -178,7 +179,8 @@ Daemon failed to start. .Xr sharetab 4 , .Xr system 4 , .Xr attributes 5 , -.Xr smf 5 +.Xr smf 5 , +.Xr zones 5 .Sh NOTES Manually starting and restarting .Nm @@ -193,7 +195,9 @@ unless its .Sy application Ns / Ns Sy auto_enable property is set to .Sy false . -See the , and +See +.Xr smf 5 +and .Xr svcadm 1M for more information. .Pp @@ -222,3 +226,10 @@ Instead, .Nm can be restarted by other signals, such as .Sy SIGINT . +.Pp +NFS service, which includes +.Nm , +can run inside a non-global zone. +See the discussion under ZONES in +.Xr nfs 4 +for more information. diff --git a/usr/src/man/man4/nfs.4 b/usr/src/man/man4/nfs.4 index 56b1fae33c..29b60bf5e2 100644 --- a/usr/src/man/man4/nfs.4 +++ b/usr/src/man/man4/nfs.4 @@ -18,8 +18,9 @@ .\" Copyright 1989 AT&T .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved. .\" Copyright 2016 Nexenta Systems, Inc. +.\" Copyright 2020 Joyent, Inc. .\" -.Dd December 18, 2016 +.Dd February 4, 2020 .Dt NFS 4 .Os .Sh NAME @@ -296,6 +297,16 @@ However, this is not functionally different from mapping the inbound string to .Sy nobody , yet provides greater flexibility. .El +.Sh ZONES +NFS can be served out of a non-global zone. +All of the above documentation applies to an in-zone NFS server. +File sharing in zones is restricted to filesystems a zone completely controls. +Some zone brands (see +.Xr brands 5 ) +do not give the zone's root its own filesystem, for example. +Delegated ZFS datasets to a zone are shareable, as well as lofs-remounted +directories. +The zone must have sys_nfs privileges; most brands grant this already. .Sh SEE ALSO .Xr lockd 1M , .Xr mount_nfs 1M , @@ -303,4 +314,6 @@ yet provides greater flexibility. .Xr nfsd 1M , .Xr nfsmapid 1M , .Xr sharectl 1M , -.Xr smf 5 +.Xr brands 5 , +.Xr smf 5 , +.Xr zones 5 diff --git a/usr/src/man/man5/zones.5 b/usr/src/man/man5/zones.5 index d4f03efb76..d860f3b290 100644 --- a/usr/src/man/man5/zones.5 +++ b/usr/src/man/man5/zones.5 @@ -3,12 +3,12 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] +.\" +.\" Copyright 2020 Joyent, Inc. .TH ZONES 5 "Jan 29, 2009" .SH NAME zones \- Solaris application containers .SH DESCRIPTION -.sp -.LP The zones facility in Solaris provides an isolated environment for running applications. Processes running in a zone are prevented from monitoring or interfering with other activity in the system. Access to other processes, @@ -118,8 +118,6 @@ cannot be destroyed. Such cases require operator intervention. .RE .SS "Process Access Restrictions" -.sp -.LP Processes running inside a zone (aside from the global zone) have restricted access to other processes. Only processes in the same zone are visible through \fB/proc\fR (see \fBproc\fR(4) or through system call interfaces that take @@ -127,8 +125,6 @@ process IDs such as \fBkill\fR(2) and \fBpriocntl\fR(2). Attempts to access processes that exist in other zones (including the global zone) fail with the same error code that would be issued if the specified process did not exist. .SS "Privilege Restrictions" -.sp -.LP Processes running within a non-global zone are restricted to a subset of privileges, in order to prevent one zone from being able to perform operations that might affect other zones. The set of privileges limits the capabilities of @@ -137,8 +133,6 @@ list of privileges available within a zone can be displayed using the \fBppriv\fR(1) utility. For more information about privileges, see \fBprivileges\fR(5). .SS "Device Restrictions" -.sp -.LP The set of devices available within a zone is restricted, to prevent a process in one zone from interfering with processes in other zones. For example, a process in a zone should not be able to modify kernel memory using @@ -153,8 +147,6 @@ that can run in a non-global zone. For example, the \fBeeprom\fR(1M), \fBprtdiag\fR(1M), and \fBprtconf\fR(1M) utilities do not work in a zone since they rely on devices that are not normally available. .SS "Brands" -.sp -.LP A zone may be assigned a brand when it is initially created. A branded zone is one whose software does not match that software found in the global zone. The software may include Solaris software configured or laid out differently, or it @@ -162,8 +154,6 @@ may include non-Solaris software. The particular collection of software is called a "brand" (see \fBbrands\fR(5)). Once installed, a zone's brand may not be changed unless the zone is first uninstalled. .SS "File Systems" -.sp -.LP Each zone has its own section of the file system hierarchy, rooted at a directory known as the zone root. Processes inside the zone can access only files within that part of the hierarchy, that is, files that are located @@ -182,9 +172,15 @@ in multiple zones, while preserving the security guarantees supplied by zones. NFS and autofs mounts established within a zone are local to that zone; they cannot be accessed from other zones, including the global zone. The mounts are removed when the zone is halted or rebooted. -.SS "Networking" .sp .LP +A zone can share filesystems using \fBnfs\fR(4) or \fBsmb\fR(4) +subject to the restrictions earlier in this section, plus the additional +restriction that file sharing can only be done from filesystems a zone +completely controls. Some \fBbrands\fR(5) do not have the zone root set to a +filesystem boundary. \fBsharefs\fR(7FS) can instantiate per-zone subject to +the brand restrictions. +.SS "Networking" A zone has its own port number space for \fBTCP\fR, \fBUDP\fR, and \fBSCTP\fR applications and typically one or more separate \fBIP\fR addresses (but some configurations of Trusted Extensions share IP address(es) between zones). @@ -230,8 +226,6 @@ The full \fBIP\fR-level functionality in the form of \fBDHCP\fR client, \fBIPsec\fR and \fBIP\fR Filter, is available in exclusive-\fBIP\fR zones and not in shared-\fBIP\fR zones. .SS "Host Identifiers" -.sp -.LP A zone is capable of emulating a 32-bit host identifier, which can be configured via \fBzonecfg\fR(1M), for the purpose of system consolidation. If a zone emulates a host identifier, then commands such as \fBhostid\fR(1) and @@ -240,10 +234,9 @@ zone emulates a host identifier, then commands such as \fBhostid\fR(1) and display or return the zone's emulated host identifier rather than the host machine's identifier. .SH SEE ALSO -.sp -.LP \fBhostid\fR(1), \fBzlogin\fR(1), \fBzonename\fR(1), \fBin.rlogind\fR(1M), \fBsshd\fR(1M), \fBsysdef\fR(1M), \fBzoneadm\fR(1M), \fBzonecfg\fR(1M), \fBkill\fR(2), \fBpriocntl\fR(2), \fBsysinfo\fR(2), \fBgethostid\fR(3C), -\fBgetzoneid\fR(3C), \fBucred_get\fR(3C), \fBproc\fR(4), \fBattributes\fR(5), -\fBbrands\fR(5), \fBprivileges\fR(5), \fBcrgetzoneid\fR(9F) +\fBgetzoneid\fR(3C), \fBucred_get\fR(3C), \fBnfs\fR(4), \fBproc\fR(4), +\fBsmb\fR(4), \fBattributes\fR(5), \fBbrands\fR(5), \fBprivileges\fR(5), +\fBsharefs\fR(7FS), \fBcrgetzoneid\fR(9F) diff --git a/usr/src/man/man7fs/sharefs.7fs b/usr/src/man/man7fs/sharefs.7fs index 860d2aeeb5..f79febc992 100644 --- a/usr/src/man/man7fs/sharefs.7fs +++ b/usr/src/man/man7fs/sharefs.7fs @@ -3,19 +3,19 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH SHAREFS 7FS "Oct 31, 2007" +.\" +.\" Copyright 2020 Joyent, Inc. +.TH SHAREFS 7FS "February 4, 2020" .SH NAME sharefs \- Kernel sharetab filesystem .SH DESCRIPTION +The \fBsharefs\fR filesystem describes the state of all shares currently +loaded by the kernel, and shared by the invoking zone. It is mounted during +boot time as a read-only file at \fB/etc/dfs/sharetab\fR. .sp .LP -The \fBsharefs\fR filesystem describes the state of all shares currently loaded -by the kernel. It is mounted during boot time as a read-only file at -\fB/etc/dfs/sharetab\fR. -.sp -.LP -Filesystem contents are dynamic and reflect the current set of shares in the -system. File contents are described in \fBsharetab\fR(4). +Filesystem contents are dynamic and reflect the current set of shares in the +zone. File contents are described in \fBsharetab\fR(4). .sp .LP File contents can be modified as a result of \fBshare\fR(1M), @@ -25,7 +25,6 @@ File contents can be modified as a result of \fBshare\fR(1M), .LP The module may not be unloaded dynamically by the kernel. .SH FILES -.sp .ne 2 .na \fB\fB/etc/dfs/sharetab\fR\fR @@ -35,7 +34,5 @@ System record of shared file systems. .RE .SH SEE ALSO -.sp -.LP \fBshare\fR(1M), \fBsharectl\fR(1M), \fBsharemgr\fR(1M), \fBzfs\fR(1M), -\fBsharetab\fR(4) +\fBsharetab\fR(4), \fBzones\fR(5) diff --git a/usr/src/uts/common/io/openprom.c b/usr/src/uts/common/io/openprom.c index 6fe363fa45..c21febbc14 100644 --- a/usr/src/uts/common/io/openprom.c +++ b/usr/src/uts/common/io/openprom.c @@ -363,7 +363,7 @@ opromioctl_cb(void *avp, int has_changed) char *valbuf; int error = 0; uint_t userbufsize; - pnode_t node_id; + pnode_t node_id = OBP_NONODE; char propname[OBP_MAXPROPNAME]; st = argp->st; diff --git a/usr/src/uts/sun4u/bignum/Makefile b/usr/src/uts/sun4u/bignum/Makefile index cb324146ef..7fe5cd6025 100644 --- a/usr/src/uts/sun4u/bignum/Makefile +++ b/usr/src/uts/sun4u/bignum/Makefile @@ -37,7 +37,6 @@ COM1_DIR = $(COMMONBASE)/bignum # MODULE = bignum OBJECTS = $(BIGNUM_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(BIGNUM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_MISC_DIR)/$(MODULE) # @@ -49,7 +48,6 @@ include $(UTSBASE)/sun4u/Makefile.sun4u # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -57,12 +55,8 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # LDFLAGS += -dy -Nmisc/kcf -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) -I$(CRYPTODIR) -I$(COM1_DIR) +CFLAGS += -I$(CRYPTODIR) -I$(COM1_DIR) CFLAGS += -DUMUL64 -LINTFLAGS += -I$(CRYPTODIR) -I$(COM1_DIR) CERRWARN += -_gcc=-Wno-unused-function # @@ -78,12 +72,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # |