svn commit: r286429 - head/sys/kern
Author: ian Date: Fri Aug 7 23:31:31 2015 New Revision: 286429 URL: https://svnweb.freebsd.org/changeset/base/286429 Log: Only process the PPS event types currently enabled in pps_params.mode. This makes the PPS API behave correctly, but isn't ideal -- we still end up capturing PPS data for non-enabled edges, we just don't process the data into an event that becomes visible outside of kern_tc. That's because the event type isn't passed to pps_capture(), so it can't do the filtering. Any solution for capture filtering is going to require touching every driver. Modified: head/sys/kern/kern_tc.c Modified: head/sys/kern/kern_tc.c == --- head/sys/kern/kern_tc.c Fri Aug 7 23:03:17 2015(r286428) +++ head/sys/kern/kern_tc.c Fri Aug 7 23:31:31 2015(r286429) @@ -1703,6 +1703,9 @@ pps_event(struct pps_state *pps, int eve #endif KASSERT(pps != NULL, (NULL pps pointer in pps_event)); + /* Nothing to do if not currently set to capture this event type. */ + if ((event pps-ppsparam.mode) == 0) + return; /* If the timecounter was wound up underneath us, bail out. */ if (pps-capgen == 0 || pps-capgen != atomic_load_acq_int(pps-capth-th_generation)) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r286410 - in head: etc etc/rc.d sys/dev/ath sys/dev/ath/ath_rate/sample sys/dev/bwi sys/dev/bwn sys/dev/if_ndis sys/dev/ipw sys/dev/iwi sys/dev/iwn sys/dev/malo sys/dev/mwl sys/dev/ral
Hi, Since I'm on holidays, and I really don't have time to tidy up after this commit: * everyone can commit to the wireless stuff to get this fixed up and working; * if hostap mode stays broken for more than 4 days, I'm going to back all the changes out. (And yes, gleb did run this stuff by me a few times and I'm okay with the general theory of this, but we'll see how it pans out. I'm totally fine with completely rolling it back if it's a failed experiment.) -adrian ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286437 - in head/sys: dev/ath dev/ath/ath_rate/sample dev/bwi dev/bwn dev/if_ndis dev/ipw dev/iwi dev/iwn dev/malo dev/mwl dev/ral dev/usb/wlan dev/wi dev/wpi dev/wtap net80211
Author: adrian
Date: Sat Aug 8 01:10:17 2015
New Revision: 286437
URL: https://svnweb.freebsd.org/changeset/base/286437
Log:
Revert the wifi ifnet changes until things are more baked and tested.
* 286410
* 286413
* 286416
The initial commit broke a variety of debug and features that aren't
in the GENERIC kernels but are enabled in other platforms.
Modified:
head/sys/dev/ath/ath_rate/sample/sample.c
head/sys/dev/ath/ath_rate/sample/sample.h
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_ath_beacon.c
head/sys/dev/ath/if_ath_debug.h
head/sys/dev/ath/if_ath_keycache.c
head/sys/dev/ath/if_ath_misc.h
head/sys/dev/ath/if_ath_rx.c
head/sys/dev/ath/if_ath_rx_edma.c
head/sys/dev/ath/if_ath_sysctl.c
head/sys/dev/ath/if_ath_tdma.c
head/sys/dev/ath/if_ath_tx.c
head/sys/dev/ath/if_ath_tx_edma.c
head/sys/dev/ath/if_athvar.h
head/sys/dev/bwi/bwimac.c
head/sys/dev/bwi/bwiphy.c
head/sys/dev/bwi/bwirf.c
head/sys/dev/bwi/if_bwi.c
head/sys/dev/bwi/if_bwivar.h
head/sys/dev/bwn/if_bwn.c
head/sys/dev/bwn/if_bwnvar.h
head/sys/dev/if_ndis/if_ndis.c
head/sys/dev/if_ndis/if_ndisvar.h
head/sys/dev/ipw/if_ipw.c
head/sys/dev/ipw/if_ipwvar.h
head/sys/dev/iwi/if_iwi.c
head/sys/dev/iwi/if_iwivar.h
head/sys/dev/iwn/if_iwn.c
head/sys/dev/iwn/if_iwnvar.h
head/sys/dev/malo/if_malo.c
head/sys/dev/malo/if_malo.h
head/sys/dev/mwl/if_mwl.c
head/sys/dev/mwl/if_mwl_pci.c
head/sys/dev/mwl/if_mwlvar.h
head/sys/dev/ral/if_ral_pci.c
head/sys/dev/ral/rt2560.c
head/sys/dev/ral/rt2560var.h
head/sys/dev/ral/rt2661.c
head/sys/dev/ral/rt2661var.h
head/sys/dev/ral/rt2860.c
head/sys/dev/ral/rt2860var.h
head/sys/dev/usb/wlan/if_rsu.c
head/sys/dev/usb/wlan/if_rsureg.h
head/sys/dev/usb/wlan/if_rum.c
head/sys/dev/usb/wlan/if_rumvar.h
head/sys/dev/usb/wlan/if_run.c
head/sys/dev/usb/wlan/if_runvar.h
head/sys/dev/usb/wlan/if_uath.c
head/sys/dev/usb/wlan/if_uathvar.h
head/sys/dev/usb/wlan/if_upgt.c
head/sys/dev/usb/wlan/if_upgtvar.h
head/sys/dev/usb/wlan/if_ural.c
head/sys/dev/usb/wlan/if_uralvar.h
head/sys/dev/usb/wlan/if_urtw.c
head/sys/dev/usb/wlan/if_urtwn.c
head/sys/dev/usb/wlan/if_urtwnreg.h
head/sys/dev/usb/wlan/if_urtwvar.h
head/sys/dev/usb/wlan/if_zyd.c
head/sys/dev/usb/wlan/if_zydreg.h
head/sys/dev/wi/if_wi.c
head/sys/dev/wi/if_wi_pccard.c
head/sys/dev/wi/if_wi_pci.c
head/sys/dev/wi/if_wivar.h
head/sys/dev/wpi/if_wpi.c
head/sys/dev/wpi/if_wpivar.h
head/sys/dev/wtap/if_wtap.c
head/sys/dev/wtap/if_wtapvar.h
head/sys/net80211/ieee80211.c
head/sys/net80211/ieee80211_ddb.c
head/sys/net80211/ieee80211_freebsd.c
head/sys/net80211/ieee80211_ioctl.c
head/sys/net80211/ieee80211_output.c
head/sys/net80211/ieee80211_power.c
head/sys/net80211/ieee80211_proto.c
head/sys/net80211/ieee80211_proto.h
head/sys/net80211/ieee80211_regdomain.c
head/sys/net80211/ieee80211_scan_sta.c
head/sys/net80211/ieee80211_var.h
Modified: head/sys/dev/ath/ath_rate/sample/sample.c
==
--- head/sys/dev/ath/ath_rate/sample/sample.c Sat Aug 8 00:57:27 2015
(r286436)
+++ head/sys/dev/ath/ath_rate/sample/sample.c Sat Aug 8 01:10:17 2015
(r286437)
@@ -488,7 +488,8 @@ ath_rate_findrate(struct ath_softc *sc,
#defineRATE(ix)(DOT11RATE(ix) / 2)
struct sample_node *sn = ATH_NODE_SAMPLE(an);
struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc);
- struct ieee80211com *ic = sc-sc_ic;
+ struct ifnet *ifp = sc-sc_ifp;
+ struct ieee80211com *ic = ifp-if_l2com;
const HAL_RATE_TABLE *rt = sc-sc_currates;
const int size_bin = size_to_bin(frameLen);
int rix, mrr, best_rix, change_rates;
@@ -855,7 +856,8 @@ ath_rate_tx_complete(struct ath_softc *s
const struct ath_rc_series *rc, const struct ath_tx_status *ts,
int frame_size, int nframes, int nbad)
{
- struct ieee80211com *ic = sc-sc_ic;
+ struct ifnet *ifp = sc-sc_ifp;
+ struct ieee80211com *ic = ifp-if_l2com;
struct sample_node *sn = ATH_NODE_SAMPLE(an);
int final_rix, short_tries, long_tries;
const HAL_RATE_TABLE *rt = sc-sc_currates;
@@ -1301,7 +1303,8 @@ static int
ath_rate_sysctl_stats(SYSCTL_HANDLER_ARGS)
{
struct ath_softc *sc = arg1;
- struct ieee80211com *ic = sc-sc_ic;
+ struct ifnet *ifp = sc-sc_ifp;
+ struct ieee80211com *ic = ifp-if_l2com;
int error, v;
v = 0;
Modified: head/sys/dev/ath/ath_rate/sample/sample.h
==
--- head/sys/dev/ath/ath_rate/sample/sample.h Sat Aug 8 00:57:27 2015
(r286436)
+++ head/sys/dev/ath/ath_rate/sample/sample.h Sat Aug 8 01:10:17 2015
(r286437)
@@ -134,7 +134,8 @@ static unsigned calc_usecs_unicast_packe
int long_retries, int is_ht40)
{
const
Re: svn commit: r286410 - in head: etc etc/rc.d sys/dev/ath sys/dev/ath/ath_rate/sample sys/dev/bwi sys/dev/bwn sys/dev/if_ndis sys/dev/ipw sys/dev/iwi sys/dev/iwn sys/dev/malo sys/dev/mwl sys/dev/ral
Gleb, At least for ath(4), TDMA doesn't work, ATH_DEBUG doesn't work, IFF_DUMPPKTS() has an extra brace, and that's what I found in the last 15 minutes of this, compiling one of the many MIPS kernels that we have in -HEAD for hardware that people are using. I left this up to you to run to completion, and a single 'make universe' would've found these issues. Instead, head is actively broken leading into a weekend. There's at least one report of a hostapd problem, which indicates that hostapd didn't get enough testing. I don't know if adhoc or monitor mode got tested. I understand if mesh/tdma weren't tested - I'm slowly chipping away at those. I've just reverted the work. Let's get all the debug stuff more thoroughly tested and get more exposure before we try to land this again. If there are any follow up issues with the reversion then please poke me and I'll get it tested. Thanks, -adrian On 7 August 2015 at 16:49, Adrian Chadd adrian.ch...@gmail.com wrote: Hi, Since I'm on holidays, and I really don't have time to tidy up after this commit: * everyone can commit to the wireless stuff to get this fixed up and working; * if hostap mode stays broken for more than 4 days, I'm going to back all the changes out. (And yes, gleb did run this stuff by me a few times and I'm okay with the general theory of this, but we'll see how it pans out. I'm totally fine with completely rolling it back if it's a failed experiment.) -adrian ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286439 - head/share/man/man4
Author: marcel
Date: Sat Aug 8 04:59:27 2015
New Revision: 286439
URL: https://svnweb.freebsd.org/changeset/base/286439
Log:
Document the application interface.
Modified:
head/share/man/man4/proto.4
Modified: head/share/man/man4/proto.4
==
--- head/share/man/man4/proto.4 Sat Aug 8 01:45:53 2015(r286438)
+++ head/share/man/man4/proto.4 Sat Aug 8 04:59:27 2015(r286439)
@@ -25,7 +25,7 @@
.\
.\ $FreeBSD$
.\
-.Dd July 19, 2015
+.Dd August 7, 2015
.Dt PROTO 4
.Os
.\
@@ -74,7 +74,285 @@ logic in user space.
Especially hardware diagnostics requires a somewhat user-friendly interface
and adequate reporting.
Neither is done easily as kernel code.
-.\
+.Ss I/O port resources
+Device special files created for I/O port resources allow
+.Xr lseek 2 ,
+.Xr read 2 ,
+.Xr write 2
+and
+.Xr ioctl 2
+operations to be performed on them.
+The
+.Xr read 2
+and
+.Xr write 2
+system calls are used to perform input and output (resp.) on the port.
+The amount of data that can be read or written at any single time is either
+1, 2 or 4 bytes.
+While the
+.Nm
+driver does not prevent reading or writing 8 bytes at a time for some
+architectures, it should not be assumed that such actually produces
+correct results.
+The
+.Xr lseek 2
+system call is used to select the port number, relative to the I/O port
+region being represented by the device special file.
+If, for example, the device special file corresponds to an I/O port region
+from 0x3f8 to 0x3ff inclusive, then an offset of 4 given to lseek with a
+whence value of SEEK_SET will target port 0x3fc on the next read or write
+operation.
+The
+.Xr ioctl 2
+system call can be used for the
+.Dv PROTO_IOC_REGION
+request.
+This ioctl request returns the extend of the resource covered by this
+device special file. The extend is returned in the following structure:
+.Bd -literal
+struct proto_ioc_region {
+unsigned long address;
+unsigned long size;
+};
+.Ed
+.Ss Memory mapped I/O resources
+The device special files created for memory mapped I/O resources behave
+in the same way as those created for I/O port resources.
+Additionally, device special files for memory mapped I/O resources allow
+the memory to be mapped into the process' address space using
+.Xr mmap 2 .
+Reads and writes to the memory address returned by
+.Xr mmap 2
+go directly to the hardware.
+As such the use of
+.Xr read 2
+and
+.Xr write 2
+can be avoided, reducing the access overhead significantly.
+Alignment and access width constraints put forth by the underlying device
+apply.
+Also, make sure the compiler does not optimize memory accesses away or has
+them coalesced into bigger accesses.
+.Ss DMA pseudo resource
+A device special file named
+.Pa busdma
+is created for the purpose of doing DMA.
+It only supports
+.Xr ioctl 2
+and only for the
+.Dv PROTO_IOC_BUSDMA
+request.
+This device special file does not support
+.Xr read 2
+nor
+.Xr write 2 .
+The
+.Dv PROTO_IOC_BUSDMA
+request has an argument that is both in and out and is defined as
+follows:
+.Bd -literal
+struct proto_ioc_busdma {
+unsigned intrequest;
+unsigned long key;
+union {
+struct {
+unsigned long align;
+unsigned long bndry;
+unsigned long maxaddr;
+unsigned long maxsz;
+unsigned long maxsegsz;
+unsigned intnsegs;
+unsigned intdatarate;
+unsigned intflags;
+} tag;
+struct {
+unsigned long tag;
+unsigned intflags;
+unsigned long virt_addr;
+unsigned long virt_size;
+unsigned intphys_nsegs;
+unsigned long phys_addr;
+unsigned long bus_addr;
+unsigned intbus_nsegs;
+} md;
+struct {
+unsigned intop;
+unsigned long base;
+unsigned long size;
+} sync;
+} u;
+unsigned long result;
+};
+.Ed
+The
+.Va request
+field is used to specify which DMA operation is to be performed.
+The
+.Va key
+field is used to specify which object the operation applies to.
+An object is either a tag or a memory descriptor (md).
+The following DMA operations are defined:
+.Bl -tag -width
+.It PROTO_IOC_BUSDMA_TAG_CREATE
+Create a root tag.
+The
+.Va result
+field is set on output with the key of the DMA tag.
+The tag is created with the constraints given by the
+.Va tag
+sub-structure. These constraints correspond roughly to those that can be
+given to the
+.Xr bus_dma_tag_create 9
+function.
+.It
svn commit: r286440 - svnadmin/conf
Author: rpaulo Date: Sat Aug 8 05:58:42 2015 New Revision: 286440 URL: https://svnweb.freebsd.org/changeset/base/286440 Log: Add myself for the iwm import. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confSat Aug 8 04:59:27 2015 (r286439) +++ svnadmin/conf/sizelimit.confSat Aug 8 05:58:42 2015 (r286440) @@ -44,3 +44,4 @@ rwatson sam stas thompsa +rpaulo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286428 - vendor/clang/clang-trunk-r242221
Author: dim Date: Fri Aug 7 23:03:17 2015 New Revision: 286428 URL: https://svnweb.freebsd.org/changeset/base/286428 Log: Tag clang trunk r242221. Added: - copied from r286427, vendor/clang/dist/ Directory Properties: vendor/clang/clang-trunk-r242221/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286427 - in vendor/clang/dist: docs include/clang-c include/clang/AST include/clang/ASTMatchers include/clang/ASTMatchers/Dynamic include/clang/Basic include/clang/CodeGen include/clan...
Author: dim Date: Fri Aug 7 23:02:44 2015 New Revision: 286427 URL: https://svnweb.freebsd.org/changeset/base/286427 Log: Vendor import of clang trunk r242221: https://llvm.org/svn/llvm-project/cfe/trunk@242221 Added: vendor/clang/dist/include/clang/CodeGen/ObjectFilePCHContainerOperations.h (contents, props changed) vendor/clang/dist/lib/CodeGen/ObjectFilePCHContainerOperations.cpp (contents, props changed) vendor/clang/dist/test/Analysis/analyzer-checker-config.c (contents, props changed) vendor/clang/dist/test/CodeGen/arm-long-calls.c (contents, props changed) vendor/clang/dist/test/CodeGen/asm-attrs.c (contents, props changed) vendor/clang/dist/test/CodeGen/available-externally-hidden.cpp (contents, props changed) vendor/clang/dist/test/CodeGenCXX/cfi-ms-rtti.cpp (contents, props changed) vendor/clang/dist/test/CodeGenCXX/eh-aggregate-copy-destroy.cpp (contents, props changed) vendor/clang/dist/test/CodeGenCXX/eh-aggregated-inits-unwind.cpp (contents, props changed) vendor/clang/dist/test/CodeGenCXX/eh-aggregated-inits.cpp (contents, props changed) vendor/clang/dist/test/CodeGenCXX/pr24097.cpp (contents, props changed) vendor/clang/dist/test/CodeGenCXX/sanitize-dtor-callback.cpp (contents, props changed) vendor/clang/dist/test/CodeGenObjC/parameterized_classes.m vendor/clang/dist/test/Driver/cuda-options.cu vendor/clang/dist/test/Driver/ppc-dependent-options.cpp (contents, props changed) vendor/clang/dist/test/Driver/ppc-endian.c (contents, props changed) vendor/clang/dist/test/Index/annotate-parameterized-classes.m vendor/clang/dist/test/Index/comment-objc-parameterized-classes.m vendor/clang/dist/test/Index/complete-parameterized-classes.m vendor/clang/dist/test/Index/index-file.cu vendor/clang/dist/test/Modules/Inputs/diagnostics-aux-2.modulemap vendor/clang/dist/test/Modules/Inputs/merge-template-pattern-visibility/ vendor/clang/dist/test/Modules/Inputs/merge-template-pattern-visibility/a.h (contents, props changed) vendor/clang/dist/test/Modules/Inputs/merge-template-pattern-visibility/b.h (contents, props changed) vendor/clang/dist/test/Modules/Inputs/merge-template-pattern-visibility/module.modulemap vendor/clang/dist/test/Modules/Inputs/multiple-include/ vendor/clang/dist/test/Modules/Inputs/multiple-include/a.h (contents, props changed) vendor/clang/dist/test/Modules/Inputs/multiple-include/b.h (contents, props changed) vendor/clang/dist/test/Modules/Inputs/multiple-include/c.h (contents, props changed) vendor/clang/dist/test/Modules/Inputs/multiple-include/module.modulemap vendor/clang/dist/test/Modules/Inputs/multiple-include/x.h (contents, props changed) vendor/clang/dist/test/Modules/merge-template-pattern-visibility.cpp (contents, props changed) vendor/clang/dist/test/Modules/multiple-include.cpp (contents, props changed) vendor/clang/dist/test/Modules/pch_container.m vendor/clang/dist/test/OpenMP/cancel_codegen.cpp (contents, props changed) vendor/clang/dist/test/PCH/objc_kindof.m vendor/clang/dist/test/PCH/objc_parameterized_classes.m vendor/clang/dist/test/Profile/Inputs/gcc-flag-compatibility.proftext vendor/clang/dist/test/Profile/gcc-flag-compatibility.c (contents, props changed) vendor/clang/dist/test/Sema/inline-asm-validate-tmpl.cpp (contents, props changed) vendor/clang/dist/test/Sema/tls_alignment.cpp (contents, props changed) vendor/clang/dist/test/SemaCXX/cast-lvalue-to-rvalue-reference.cpp (contents, props changed) vendor/clang/dist/test/SemaObjC/kindof.m vendor/clang/dist/test/SemaObjC/parameterized_classes.m vendor/clang/dist/test/SemaObjC/parameterized_classes_collection_literal.m vendor/clang/dist/test/SemaObjC/parameterized_classes_subst.m vendor/clang/dist/test/SemaObjCXX/Inputs/nullability-pragmas-generics-1.h (contents, props changed) vendor/clang/dist/test/SemaObjCXX/parameterized_classes.mm vendor/clang/dist/test/SemaObjCXX/parameterized_classes_subst.mm Modified: vendor/clang/dist/docs/ClangFormatStyleOptions.rst vendor/clang/dist/docs/CrossCompilation.rst vendor/clang/dist/docs/LanguageExtensions.rst vendor/clang/dist/docs/PCHInternals.rst vendor/clang/dist/docs/UsersManual.rst vendor/clang/dist/include/clang-c/BuildSystem.h vendor/clang/dist/include/clang/AST/ASTContext.h vendor/clang/dist/include/clang/AST/DataRecursiveASTVisitor.h vendor/clang/dist/include/clang/AST/DeclObjC.h vendor/clang/dist/include/clang/AST/ExprObjC.h vendor/clang/dist/include/clang/AST/RecursiveASTVisitor.h vendor/clang/dist/include/clang/AST/Type.h vendor/clang/dist/include/clang/AST/TypeLoc.h vendor/clang/dist/include/clang/ASTMatchers/ASTMatchers.h vendor/clang/dist/include/clang/ASTMatchers/ASTMatchersInternal.h vendor/clang/dist/include/clang/ASTMatchers/Dynamic/VariantValue.h vendor/clang/dist/include/clang/Basic/Attr.td
svn commit: r286426 - vendor/llvm/llvm-trunk-r242221
Author: dim Date: Fri Aug 7 23:02:14 2015 New Revision: 286426 URL: https://svnweb.freebsd.org/changeset/base/286426 Log: Tag llvm trunk r242221. Added: - copied from r286425, vendor/llvm/dist/ Directory Properties: vendor/llvm/llvm-trunk-r242221/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r286410 - in head: etc etc/rc.d sys/dev/ath sys/dev/ath/ath_rate/sample sys/dev/bwi sys/dev/bwn sys/dev/if_ndis sys/dev/ipw sys/dev/iwi sys/dev/iwn sys/dev/malo sys/dev/mwl sys/dev/ral
On 07 Aug 2015, at 11:43 , Gleb Smirnoff gleb...@freebsd.org wrote: Author: glebius Date: Fri Aug 7 11:43:14 2015 New Revision: 286410 URL: https://svnweb.freebsd.org/changeset/base/286410 At least ath is still not compiling. Just to give you a short selection of what I am seeing. I would have expected a change like this to pass universe before commit .. sparc64.LINT /scratch/tmp/bz/head.svn/sys/modules/ath/../../dev/ath/if_ath.c: In function 'ath_intr': /scratch/tmp/bz/head.svn/sys/modules/ath/../../dev/ath/if_ath.c:2106: error: 'ifp' undeclared (first use in this function) /scratch/tmp/bz/head.svn/sys/modules/ath/../../dev/ath/if_ath.c:2106: error: (Each undeclared identifier is reported only once /scratch/tmp/bz/head.svn/sys/modules/ath/../../dev/ath/if_ath.c:2106: error: for each function it appears in.) bmake: stopped in /scratch/tmp/bz/head.svn/sys/modules/ath /scratch/tmp/bz/head.svn/sys/modules/ath/../../dev/ath/if_ath_tdma.c: In function 'ath_tdma_config': /scratch/tmp/bz/head.svn/sys/modules/ath/../../dev/ath/if_ath_tdma.c:253: error: ‘struct ath_softc' has no member named 'sc_ifp' mips.AP135 /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c: In function 'ath_resume': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c:1901: error: 'ifp' undeclared (first use in this function) /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c:1901: error: (Each undeclared identifier is reported only once /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c:1901: error: for each function it appears in.) /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c: In function 'ath_intr': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c:2106: error: 'ifp' undeclared (first use in this function) /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c: In function 'ath_init': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c:2428: error: 'ifp' undeclared (first use in this function) /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c: In function 'ath_tx_processq': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath.c:4571: error: 'struct ath_softc' has no member named 'sc_ifp' --- if_ath.o --- *** [if_ath.o] Error code 1 bmake: stopped in /storage/head/obj/mips.mips/scratch/tmp/bz/head.svn/sys/AP135 /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c: In function 'ath_tx_normal_setup': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:1789: error: expected ')' before 'ieee80211_dump_pkt' /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:1838: error: expected expression before '}' token cc1: warnings being treated as errors /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:1546: warning: unused variable 'ah' [-Wunused-variable] /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c: In function 'ath_tx_raw_start': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:2207: error: expected ')' before 'ieee80211_dump_pkt' /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:2328: error: expected expression before '}' token /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:2090: warning: unused variable 'queue_to_head' [-Wunused-variable] /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:2085: warning: unused variable 'ds' [-Wunused-variable] /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:2077: warning: unused variable 'vap' [-Wunused-variable] /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:2076: warning: unused variable 'ah' [-Wunused-variable] /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:2075: warning: unused variable 'ic' [-Wunused-variable] /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c: In function 'ath_tx_tid_drain_print': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:3804: error: expected ')' before 'ieee80211_dump_pkt' /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tx.c:3807: error: expected expression before '}' token --- if_ath_tx.o --- *** [if_ath_tx.o] Error code 1 bmake: stopped in /storage/head/obj/mips.mips/scratch/tmp/bz/head.svn/sys/AP135 /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tdma.c: In function 'ath_tdma_config': /scratch/tmp/bz/head.svn/sys/dev/ath/if_ath_tdma.c:253: error: 'struct ath_softc' has no member named 'sc_ifp' --- if_ath_tdma.o --- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286425 - in vendor/llvm/dist: . autoconf bindings/python/llvm cmake/modules docs include/llvm include/llvm-c include/llvm/ADT include/llvm/Analysis include/llvm/Bitcode include/llvm/Co...
Author: dim Date: Fri Aug 7 23:01:33 2015 New Revision: 286425 URL: https://svnweb.freebsd.org/changeset/base/286425 Log: Vendor import of llvm trunk r242221: https://llvm.org/svn/llvm-project/llvm/trunk@242221 Added: vendor/llvm/dist/include/llvm/IR/IntrinsicsWebAssembly.td vendor/llvm/dist/include/llvm/Transforms/Utils/LoopVersioning.h (contents, props changed) vendor/llvm/dist/lib/MC/MCSchedule.cpp (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/BitTracker.cpp (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/BitTracker.h (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/HexagonBitTracker.cpp (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/HexagonBitTracker.h (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/HexagonCommonGEP.cpp (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/HexagonGenExtract.cpp (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/HexagonGenInsert.cpp (contents, props changed) vendor/llvm/dist/lib/Target/Hexagon/HexagonGenPredicate.cpp (contents, props changed) vendor/llvm/dist/lib/Target/WebAssembly/WebAssemblyInstrCall.td vendor/llvm/dist/lib/Target/WebAssembly/WebAssemblyInstrConv.td vendor/llvm/dist/lib/Target/WebAssembly/WebAssemblyInstrFloat.td vendor/llvm/dist/lib/Target/WebAssembly/WebAssemblyInstrInteger.td vendor/llvm/dist/lib/Target/WebAssembly/WebAssemblyInstrMemory.td vendor/llvm/dist/lib/Transforms/IPO/ElimAvailExtern.cpp (contents, props changed) vendor/llvm/dist/lib/Transforms/Utils/LoopVersioning.cpp (contents, props changed) vendor/llvm/dist/test/Analysis/LoopAccessAnalysis/pointer-with-unknown-bounds.ll vendor/llvm/dist/test/Bitcode/fcmp-fast.ll vendor/llvm/dist/test/CodeGen/AArch64/arm64-nvcast.ll vendor/llvm/dist/test/CodeGen/AArch64/nest-register.ll vendor/llvm/dist/test/CodeGen/AArch64/xbfiz.ll vendor/llvm/dist/test/CodeGen/AMDGPU/ds_read2_superreg.ll vendor/llvm/dist/test/CodeGen/AMDGPU/invariant-load-no-alias-store.ll vendor/llvm/dist/test/CodeGen/AMDGPU/v_mac.ll vendor/llvm/dist/test/CodeGen/ARM/Windows/trivial-gnu-object.ll vendor/llvm/dist/test/CodeGen/ARM/cttz.ll vendor/llvm/dist/test/CodeGen/ARM/cttz_vector.ll vendor/llvm/dist/test/CodeGen/ARM/nest-register.ll vendor/llvm/dist/test/CodeGen/ARM/subtarget-features-long-calls.ll vendor/llvm/dist/test/CodeGen/Generic/run-pass.ll vendor/llvm/dist/test/CodeGen/Hexagon/Atomics.ll vendor/llvm/dist/test/CodeGen/Hexagon/common-gep-basic.ll vendor/llvm/dist/test/CodeGen/Hexagon/common-gep-icm.ll vendor/llvm/dist/test/CodeGen/Hexagon/extract-basic.ll vendor/llvm/dist/test/CodeGen/Hexagon/insert-basic.ll vendor/llvm/dist/test/CodeGen/Hexagon/predicate-logical.ll vendor/llvm/dist/test/CodeGen/Hexagon/predicate-rcmp.ll vendor/llvm/dist/test/CodeGen/MIR/X86/basic-block-liveins.mir vendor/llvm/dist/test/CodeGen/MIR/X86/dead-register-flag.mir vendor/llvm/dist/test/CodeGen/MIR/X86/expected-different-implicit-operand.mir vendor/llvm/dist/test/CodeGen/MIR/X86/expected-different-implicit-register-flag.mir vendor/llvm/dist/test/CodeGen/MIR/X86/expected-named-register-livein.mir vendor/llvm/dist/test/CodeGen/MIR/X86/expected-register-after-flags.mir vendor/llvm/dist/test/CodeGen/MIR/X86/expected-subregister-after-colon.mir vendor/llvm/dist/test/CodeGen/MIR/X86/fixed-stack-objects.mir vendor/llvm/dist/test/CodeGen/MIR/X86/implicit-register-flag.mir vendor/llvm/dist/test/CodeGen/MIR/X86/killed-register-flag.mir vendor/llvm/dist/test/CodeGen/MIR/X86/missing-implicit-operand.mir vendor/llvm/dist/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir vendor/llvm/dist/test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir vendor/llvm/dist/test/CodeGen/MIR/X86/spill-slot-fixed-stack-objects.mir vendor/llvm/dist/test/CodeGen/MIR/X86/stack-objects.mir vendor/llvm/dist/test/CodeGen/MIR/X86/subregister-operands.mir vendor/llvm/dist/test/CodeGen/MIR/X86/undef-register-flag.mir vendor/llvm/dist/test/CodeGen/MIR/X86/undefined-register-class.mir vendor/llvm/dist/test/CodeGen/MIR/X86/undefined-virtual-register.mir vendor/llvm/dist/test/CodeGen/MIR/X86/unknown-subregister-index.mir vendor/llvm/dist/test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir vendor/llvm/dist/test/CodeGen/MIR/X86/variable-sized-stack-objects.mir vendor/llvm/dist/test/CodeGen/MIR/X86/virtual-registers.mir vendor/llvm/dist/test/CodeGen/MIR/frame-info.mir vendor/llvm/dist/test/CodeGen/MIR/machine-function-missing-body-error.mir vendor/llvm/dist/test/CodeGen/NVPTX/loop-vectorize.ll vendor/llvm/dist/test/CodeGen/NVPTX/lower-aggr-copies.ll vendor/llvm/dist/test/CodeGen/PowerPC/ppc32-nest.ll vendor/llvm/dist/test/CodeGen/PowerPC/ppc64-nest.ll vendor/llvm/dist/test/CodeGen/PowerPC/swaps-le-5.ll vendor/llvm/dist/test/CodeGen/SPARC/multiple-div.ll
svn commit: r286423 - head/sys/kern
Author: ian
Date: Fri Aug 7 21:14:19 2015
New Revision: 286423
URL: https://svnweb.freebsd.org/changeset/base/286423
Log:
RFC 2783 requires a status of ETIMEDOUT, not EWOULDBLOCK, on a timeout.
Modified:
head/sys/kern/kern_tc.c
Modified: head/sys/kern/kern_tc.c
==
--- head/sys/kern/kern_tc.c Fri Aug 7 20:18:55 2015(r286422)
+++ head/sys/kern/kern_tc.c Fri Aug 7 21:14:19 2015(r286423)
@@ -1541,8 +1541,12 @@ pps_fetch(struct pps_fetch_args *fapi, s
} else {
err = tsleep(pps, PCATCH, ppsfch, timo);
}
- if (err == EWOULDBLOCK fapi-timeout.tv_sec == -1) {
- continue;
+ if (err == EWOULDBLOCK) {
+ if (fapi-timeout.tv_sec == -1) {
+ continue;
+ } else {
+ return (ETIMEDOUT);
+ }
} else if (err != 0) {
return (err);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286401 - in head/sys: i386/include pc98/include
Author: kib Date: Fri Aug 7 05:59:58 2015 New Revision: 286401 URL: https://svnweb.freebsd.org/changeset/base/286401 Log: Remove unused i386 header privatespace.h. For the native kernel, its use was removed in r173592 (Nov 2007), yet Xen PV bits continued referencing the privatespace structure, and were removed in r282274 (Apr 2015). Discussed with: jhb Sponsored by: The FreeBSD Foundation Deleted: head/sys/i386/include/privatespace.h head/sys/pc98/include/privatespace.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286402 - head/contrib/bsnmp/snmp_mibII
Author: araujo (ports committer)
Date: Fri Aug 7 06:15:01 2015
New Revision: 286402
URL: https://svnweb.freebsd.org/changeset/base/286402
Log:
Fix variable 'old' is used uninitialized whenever '' condition is false.
Spotted by clang.
Differential Revision:D2721
Reviewed by: rodrigc, bapt
Modified:
head/contrib/bsnmp/snmp_mibII/mibII_ip.c
Modified: head/contrib/bsnmp/snmp_mibII/mibII_ip.c
==
--- head/contrib/bsnmp/snmp_mibII/mibII_ip.cFri Aug 7 05:59:58 2015
(r286401)
+++ head/contrib/bsnmp/snmp_mibII/mibII_ip.cFri Aug 7 06:15:01 2015
(r286402)
@@ -151,7 +151,7 @@ int
op_ip(struct snmp_context *ctx, struct snmp_value *value,
u_int sub, u_int idx __unused, enum snmp_op op)
{
- int old;
+ int old = 0;
switch (op) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286406 - head/sys/cam/ctl
Author: araujo (ports committer)
Date: Fri Aug 7 08:30:43 2015
New Revision: 286406
URL: https://svnweb.freebsd.org/changeset/base/286406
Log:
Wrap some unused functions with notyet, it is necessary to be able to
build the modules/ctl directly.
Remove a dead MALLOC_DEFINE.
Differential Revision:D3329
Reviewed by: mav
Sponsored by: gandi.net
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Fri Aug 7 08:24:12 2015(r286405)
+++ head/sys/cam/ctl/ctl.c Fri Aug 7 08:30:43 2015(r286406)
@@ -511,7 +511,6 @@ static struct cdevsw ctl_cdevsw = {
MALLOC_DEFINE(M_CTL, ctlmem, Memory used for CTL);
-MALLOC_DEFINE(M_CTLIO, ctlio, Memory used for CTL requests);
static int ctl_module_event_handler(module_t, int /*modeventtype_t*/, void *);
@@ -14274,6 +14273,7 @@ ctl_init_isc_msg(void)
printf(CTL: Still calling this thing\n);
}
+#ifdef notyet
/*
* Init component
* Initializes component into configuration defined by bootMode
@@ -14365,6 +14365,7 @@ struct ctl_ha_component ctl_ha_component
.start = ctl_isc_start,
.quiesce = ctl_isc_quiesce
};
+#endif
/*
* vim: ts=8
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286408 - head/sys/dev/mmc/host
Author: andrew
Date: Fri Aug 7 08:57:58 2015
New Revision: 286408
URL: https://svnweb.freebsd.org/changeset/base/286408
Log:
Attach dwmmc to the ofwbus, som devicetrees place it here.
Sponsored by: ABT Systems Ltd
Modified:
head/sys/dev/mmc/host/dwmmc.c
Modified: head/sys/dev/mmc/host/dwmmc.c
==
--- head/sys/dev/mmc/host/dwmmc.c Fri Aug 7 08:54:50 2015
(r286407)
+++ head/sys/dev/mmc/host/dwmmc.c Fri Aug 7 08:57:58 2015
(r286408)
@@ -1208,4 +1208,5 @@ static driver_t dwmmc_driver = {
static devclass_t dwmmc_devclass;
DRIVER_MODULE(dwmmc, simplebus, dwmmc_driver, dwmmc_devclass, 0, 0);
+DRIVER_MODULE(dwmmc, ofwbus, dwmmc_driver, dwmmc_devclass, 0, 0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286404 - head/sys/geom
Author: kib
Date: Fri Aug 7 08:13:34 2015
New Revision: 286404
URL: https://svnweb.freebsd.org/changeset/base/286404
Log:
The condition to use direct processing for the unmapped bio is
reverted. We can do direct processing when g_io_check() does not need
to perform transient remapping of the bio, otherwise the thread has to
sleep.
Reviewed by: mav (previous version)
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/geom/geom_io.c
Modified: head/sys/geom/geom_io.c
==
--- head/sys/geom/geom_io.c Fri Aug 7 07:05:47 2015(r286403)
+++ head/sys/geom/geom_io.c Fri Aug 7 08:13:34 2015(r286404)
@@ -520,8 +520,8 @@ g_io_request(struct bio *bp, struct g_co
direct = (cp-flags G_CF_DIRECT_SEND)
(pp-flags G_PF_DIRECT_RECEIVE)
!g_is_geom_thread(curthread)
-(((pp-flags G_PF_ACCEPT_UNMAPPED) == 0
- (bp-bio_flags BIO_UNMAPPED) != 0) || THREAD_CAN_SLEEP());
+((pp-flags G_PF_ACCEPT_UNMAPPED) != 0 ||
+(bp-bio_flags BIO_UNMAPPED) == 0 || THREAD_CAN_SLEEP());
if (direct) {
/* Block direct execution if less then half of stack left. */
size_t st, su;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286403 - head/usr.bin/ypmatch
Author: araujo (ports committer)
Date: Fri Aug 7 07:05:47 2015
New Revision: 286403
URL: https://svnweb.freebsd.org/changeset/base/286403
Log:
Remove an extra new line on usage().
Rename domain to domainname to be identical to the man page.
Reported by: bde
Modified:
head/usr.bin/ypmatch/ypmatch.c
Modified: head/usr.bin/ypmatch/ypmatch.c
==
--- head/usr.bin/ypmatch/ypmatch.c Fri Aug 7 06:15:01 2015
(r286402)
+++ head/usr.bin/ypmatch/ypmatch.c Fri Aug 7 07:05:47 2015
(r286403)
@@ -66,8 +66,8 @@ static void
usage(void)
{
fprintf(stderr, %s\n%s\n,
- usage: ypmatch [-kt] [-d domain] key ... mapname,
- ypmatch -x\n);
+ usage: ypmatch [-kt] [-d domainname] key ... mapname,
+ ypmatch -x);
fprintf(stderr,
where\n
\tmapname may be either a mapname or a nickname for a map.\n
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286405 - head/sys/geom
Author: kib
Date: Fri Aug 7 08:24:12 2015
New Revision: 286405
URL: https://svnweb.freebsd.org/changeset/base/286405
Log:
Minor style cleanup of the code surrounding r286404.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/geom/geom_io.c
Modified: head/sys/geom/geom_io.c
==
--- head/sys/geom/geom_io.c Fri Aug 7 08:13:34 2015(r286404)
+++ head/sys/geom/geom_io.c Fri Aug 7 08:24:12 2015(r286405)
@@ -517,11 +517,11 @@ g_io_request(struct bio *bp, struct g_co
getbinuptime(bp-bio_t0);
#ifdef GET_STACK_USAGE
- direct = (cp-flags G_CF_DIRECT_SEND)
-(pp-flags G_PF_DIRECT_RECEIVE)
-!g_is_geom_thread(curthread)
-((pp-flags G_PF_ACCEPT_UNMAPPED) != 0 ||
-(bp-bio_flags BIO_UNMAPPED) == 0 || THREAD_CAN_SLEEP());
+ direct = (cp-flags G_CF_DIRECT_SEND) != 0
+ (pp-flags G_PF_DIRECT_RECEIVE) != 0
+ !g_is_geom_thread(curthread)
+ ((pp-flags G_PF_ACCEPT_UNMAPPED) != 0 ||
+ (bp-bio_flags BIO_UNMAPPED) == 0 || THREAD_CAN_SLEEP());
if (direct) {
/* Block direct execution if less then half of stack left. */
size_t st, su;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286407 - head/sys/dev/mmc/host
Author: andrew Date: Fri Aug 7 08:54:50 2015 New Revision: 286407 URL: https://svnweb.freebsd.org/changeset/base/286407 Log: Stop including machine/fdt.h, it's unneeded, and purposefully unimplemented on arm64. Sponsored by: ABT Systems Ltd Modified: head/sys/dev/mmc/host/dwmmc.c Modified: head/sys/dev/mmc/host/dwmmc.c == --- head/sys/dev/mmc/host/dwmmc.c Fri Aug 7 08:30:43 2015 (r286406) +++ head/sys/dev/mmc/host/dwmmc.c Fri Aug 7 08:54:50 2015 (r286407) @@ -56,7 +56,6 @@ __FBSDID($FreeBSD$); #include dev/ofw/ofw_bus_subr.h #include machine/bus.h -#include machine/fdt.h #include machine/cpu.h #include machine/intr.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286409 - head/usr.sbin/bhyve
Author: brueffer Date: Fri Aug 7 10:48:52 2015 New Revision: 286409 URL: https://svnweb.freebsd.org/changeset/base/286409 Log: Manpage cleanup. - new sentence - new line - fix manpage references - fix macro usage - fix a typo MFC after:1 week Modified: head/usr.sbin/bhyve/bhyve.8 Modified: head/usr.sbin/bhyve/bhyve.8 == --- head/usr.sbin/bhyve/bhyve.8 Fri Aug 7 08:57:58 2015(r286408) +++ head/usr.sbin/bhyve/bhyve.8 Fri Aug 7 10:48:52 2015(r286409) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd September 17, 2014 +.Dd August 7, 2015 .Dt BHYVE 8 .Os .Sh NAME @@ -50,7 +50,7 @@ Parameters such as the number of virtual I/O connectivity can be specified with command-line parameters. .Pp The guest operating system must be loaded with -.Xr bhyveload 4 +.Xr bhyveload 8 or a similar boot loader before running .Nm . .Pp @@ -61,8 +61,8 @@ exit is detected. .Bl -tag -width 10n .It Fl a The guest's local APIC is configured in xAPIC mode. -The xAPIC mode is the default setting so this option is redundant. It will be -deprecated in a future version. +The xAPIC mode is the default setting so this option is redundant. +It will be deprecated in a future version. .It Fl A Generate ACPI tables. Required for @@ -124,7 +124,7 @@ Force the guest virtual CPU to exit when .It Fl s Ar slot,emulation Ns Op , Ns Ar conf Configure a virtual PCI slot and function. .Pp -.Nm bhyve +.Nm provides PCI bus emulation and virtual devices that can be attached to slots on the bus. There are 32 available slots, with the option of providing up to 8 functions @@ -136,11 +136,19 @@ per slot. .Pp The .Ar pcislot -value is 0 to 31. The optional function value is 0 to 7. The optional +value is 0 to 31. +The optional +.Ar function +value is 0 to 7. +The optional .Ar bus value is 0 to 255. -If not specified, the function value defaults to 0. -If not specified, the bus value defaults to 0. +If not specified, the +.Ar function +value defaults to 0. +If not specified, the +.Ar bus +value defaults to 0. .It Ar emulation .Bl -tag -width 10n .It Li hostbridge | Li amd_hostbridge @@ -221,7 +229,9 @@ TTY devices: .Bl -tag -width 10n .It Li stdio Connect the serial port to the standard input and output of -the bhyve process. +the +.Nm +process. .It Pa /dev/xxx Use the host TTY device for serial port I/O. .El @@ -265,7 +275,8 @@ in the guest's System Management BIOS Sy By default a UUID is generated from the host's hostname and .Ar vmname . .It Fl w -Ignore accesses to unimplemented Model Specific Registers (MSRs). This is intended for debug purposes. +Ignore accesses to unimplemented Model Specific Registers (MSRs). +This is intended for debug purposes. .It Fl W Force virtio PCI device emulations to use MSI interrupts instead of MSI-X interrupts. @@ -280,7 +291,7 @@ This should be the same as that created .El .Sh EXAMPLES The guest operating system must have been loaded with -.Xr bhyveload 4 +.Xr bhyveload 8 or a similar boot loader before .Xr bhyve 4 can be run. @@ -308,7 +319,7 @@ Run an 8GB quad-CPU virtual machine with CD-ROM, a single virtio network port, an AMD hostbridge, and the console port connected to an .Xr nmdm 4 -null-model device. +null-modem device. .Bd -literal -offset indent bhyve -c 4 \e\ -s 0,amd_hostbridge -s 1,lpc \\ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286416 - head/sys/dev/usb/wlan
Author: glebius
Date: Fri Aug 7 16:23:16 2015
New Revision: 286416
URL: https://svnweb.freebsd.org/changeset/base/286416
Log:
Fix mtx_assert() argument.
Modified:
head/sys/dev/usb/wlan/if_zyd.c
Modified: head/sys/dev/usb/wlan/if_zyd.c
==
--- head/sys/dev/usb/wlan/if_zyd.c Fri Aug 7 14:38:26 2015
(r286415)
+++ head/sys/dev/usb/wlan/if_zyd.c Fri Aug 7 16:23:16 2015
(r286416)
@@ -2581,7 +2581,7 @@ zyd_start(struct zyd_softc *sc)
struct ieee80211_node *ni;
struct mbuf *m;
- ZYD_LOCK_ASSERT(sc, MA_LOCKED);
+ ZYD_LOCK_ASSERT(sc, MA_OWNED);
while (sc-tx_nfree 0 (m = mbufq_dequeue(sc-sc_snd)) != NULL) {
ni = (struct ieee80211_node *)m-m_pkthdr.rcvif;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286415 - head/sys/dev/ata
Author: mav
Date: Fri Aug 7 14:38:26 2015
New Revision: 286415
URL: https://svnweb.freebsd.org/changeset/base/286415
Log:
Add unmapped I/O support to ata(4) driver.
Main problem there was PIO mode support, that required KVA mapping.
Handle that case using recently added pmap_quick_enter_page(9) KPI,
mapping data pages to KVA one at a time.
Modified:
head/sys/dev/ata/ata-all.c
head/sys/dev/ata/ata-lowlevel.c
Modified: head/sys/dev/ata/ata-all.c
==
--- head/sys/dev/ata/ata-all.c Fri Aug 7 14:12:51 2015(r286414)
+++ head/sys/dev/ata/ata-all.c Fri Aug 7 14:38:26 2015(r286415)
@@ -1074,7 +1074,7 @@ ataaction(struct cam_sim *sim, union ccb
cpi-version_num = 1; /* XXX??? */
cpi-hba_inquiry = PI_SDTR_ABLE;
cpi-target_sprt = 0;
- cpi-hba_misc = PIM_SEQSCAN;
+ cpi-hba_misc = PIM_SEQSCAN | PIM_UNMAPPED;
cpi-hba_eng_cnt = 0;
if (ch-flags ATA_NO_SLAVE)
cpi-max_target = 0;
Modified: head/sys/dev/ata/ata-lowlevel.c
==
--- head/sys/dev/ata/ata-lowlevel.c Fri Aug 7 14:12:51 2015
(r286414)
+++ head/sys/dev/ata/ata-lowlevel.c Fri Aug 7 14:38:26 2015
(r286415)
@@ -32,6 +32,7 @@ __FBSDID($FreeBSD$);
#include sys/kernel.h
#include sys/endian.h
#include sys/ata.h
+#include sys/bio.h
#include sys/conf.h
#include sys/ctype.h
#include sys/bus.h
@@ -44,6 +45,12 @@ __FBSDID($FreeBSD$);
#include dev/ata/ata-pci.h
#include ata_if.h
+#include vm/vm.h
+#include vm/pmap.h
+
+#include cam/cam.h
+#include cam/cam_ccb.h
+
/* prototypes */
static int ata_generic_status(device_t dev);
static int ata_wait(struct ata_channel *ch, int unit, u_int8_t);
@@ -811,86 +818,176 @@ ata_tf_write(struct ata_request *request
static void
ata_pio_read(struct ata_request *request, int length)
{
-struct ata_channel *ch = device_get_softc(request-parent);
-uint8_t *addr;
-int size = min(request-transfersize, length);
-int resid;
-uint8_t buf[2] __aligned(sizeof(int16_t));
-#ifndef __NO_STRICT_ALIGNMENT
-int i;
-#endif
+ struct ata_channel *ch = device_get_softc(request-parent);
+ struct bio *bio;
+ uint8_t *addr;
+ vm_offset_t page;
+ int todo, done, off, moff, resid, size, i;
+ uint8_t buf[2] __aligned(2);
+
+ todo = min(request-transfersize, length);
+ page = done = resid = 0;
+ while (done todo) {
+ size = todo - done;
+
+ /* Prepare data address and limit size (if not sequential). */
+ off = request-donecount + done;
+ if ((request-flags ATA_R_DATA_IN_CCB) == 0 ||
+ (request-ccb-ccb_h.flags CAM_DATA_MASK) ==
CAM_DATA_VADDR) {
+ addr = (uint8_t *)request-data + off;
+ } else if ((request-ccb-ccb_h.flags CAM_DATA_MASK) ==
CAM_DATA_BIO) {
+ bio = (struct bio *)request-data;
+ if ((bio-bio_flags BIO_UNMAPPED) == 0) {
+ addr = (uint8_t *)bio-bio_data + off;
+ } else {
+ moff = bio-bio_ma_offset + off;
+ page = pmap_quick_enter_page(
+ bio-bio_ma[moff / PAGE_SIZE]);
+ moff %= PAGE_SIZE;
+ size = min(size, PAGE_SIZE - moff);
+ addr = (void *)(page + moff);
+ }
+ } else
+ panic(ata_pio_read: Unsupported CAM data type %x\n,
+ (request-ccb-ccb_h.flags CAM_DATA_MASK));
+
+ /* We may have extra byte already red but not stored. */
+ if (resid) {
+ addr[0] = buf[1];
+ addr++;
+ done++;
+ size--;
+ }
-addr = (uint8_t *)request-data + request-donecount;
-if (__predict_false(ch-flags ATA_USE_16BIT ||
- (size % sizeof(int32_t)) || ((uintptr_t)addr % sizeof(int32_t {
+ /* Process main part of data. */
+ resid = size % 2;
+ if (__predict_false((ch-flags ATA_USE_16BIT) ||
+ (size % 4) != 0 || ((uintptr_t)addr % 4) != 0)) {
#ifndef __NO_STRICT_ALIGNMENT
- if (__predict_false((uintptr_t)addr % sizeof(int16_t))) {
- for (i = 0, resid = size ~1; resid 0; resid -=
- sizeof(int16_t)) {
- *(uint16_t *)buf = ATA_IDX_INW_STRM(ch, ATA_DATA);
- addr[i++] = buf[0];
- addr[i++] = buf[1];
- }
- } else
+ if (__predict_false((uintptr_t)addr % 2)) {
+
svn commit: r286414 - head/sys/cam/ctl
Author: mav
Date: Fri Aug 7 14:12:51 2015
New Revision: 286414
URL: https://svnweb.freebsd.org/changeset/base/286414
Log:
Add more ifdefs to fix build with GCC after r286406.
Modified:
head/sys/cam/ctl/ctl.c
head/sys/cam/ctl/ctl.h
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Fri Aug 7 12:34:20 2015(r286413)
+++ head/sys/cam/ctl/ctl.c Fri Aug 7 14:12:51 2015(r286414)
@@ -374,9 +374,11 @@ SYSCTL_INT(_kern_cam_ctl, OID_AUTO, debu
*/
#define SCSI_EVPD_NUM_SUPPORTED_PAGES 10
+#ifdef notyet
static void ctl_isc_event_handler(ctl_ha_channel chanel, ctl_ha_event event,
int param);
static void ctl_copy_sense_data(union ctl_ha_msg *src, union ctl_io *dest);
+#endif
static int ctl_init(void);
void ctl_shutdown(void);
static int ctl_open(struct cdev *dev, int flags, int fmt, struct thread *td);
@@ -444,7 +446,9 @@ static int ctl_scsiio_lun_check(struct c
const struct ctl_cmd_entry *entry,
struct ctl_scsiio *ctsio);
//static int ctl_check_rtr(union ctl_io *pending_io, struct ctl_softc *softc);
+#ifdef notyet
static void ctl_failover(void);
+#endif
static void ctl_clear_ua(struct ctl_softc *ctl_softc, uint32_t initidx,
ctl_ua_type ua_type);
static int ctl_scsiio_precheck(struct ctl_softc *ctl_softc,
@@ -483,7 +487,9 @@ static void ctl_work_thread(void *arg);
static void ctl_enqueue_incoming(union ctl_io *io);
static void ctl_enqueue_rtr(union ctl_io *io);
static void ctl_enqueue_done(union ctl_io *io);
+#ifdef notyet
static void ctl_enqueue_isc(union ctl_io *io);
+#endif
static const struct ctl_cmd_entry *
ctl_get_cmd_entry(struct ctl_scsiio *ctsio, int *sa);
static const struct ctl_cmd_entry *
@@ -528,6 +534,7 @@ static struct ctl_frontend ioctl_fronten
.name = ioctl,
};
+#ifdef notyet
static void
ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc,
union ctl_ha_msg *msg_info)
@@ -962,6 +969,7 @@ ctl_copy_sense_data(union ctl_ha_msg *sr
dest-scsiio.sense_len = src-scsi.sense_len;
dest-io_hdr.status = src-hdr.status;
}
+#endif
static void
ctl_est_ua(struct ctl_lun *lun, uint32_t initidx, ctl_ua_type ua)
@@ -11369,6 +11377,7 @@ ctl_failover_io(union ctl_io *io, int ha
ctl_done(io);
}
+#ifdef notyet
static void
ctl_failover(void)
{
@@ -11609,6 +11618,7 @@ ctl_failover(void)
ctl_pause_rtr = 0;
mtx_unlock(softc-ctl_lock);
}
+#endif
static void
ctl_clear_ua(struct ctl_softc *ctl_softc, uint32_t initidx,
@@ -14252,6 +14262,7 @@ ctl_enqueue_done(union ctl_io *io)
wakeup(thr);
}
+#ifdef notyet
static void
ctl_enqueue_isc(union ctl_io *io)
{
@@ -14273,7 +14284,6 @@ ctl_init_isc_msg(void)
printf(CTL: Still calling this thing\n);
}
-#ifdef notyet
/*
* Init component
* Initializes component into configuration defined by bootMode
Modified: head/sys/cam/ctl/ctl.h
==
--- head/sys/cam/ctl/ctl.h Fri Aug 7 12:34:20 2015(r286413)
+++ head/sys/cam/ctl/ctl.h Fri Aug 7 14:12:51 2015(r286414)
@@ -191,7 +191,9 @@ void ctl_data_submit_done(union ctl_io *
void ctl_config_read_done(union ctl_io *io);
void ctl_config_write_done(union ctl_io *io);
void ctl_portDB_changed(int portnum);
+#ifdef notyet
void ctl_init_isc_msg(void);
+#endif
/*
* KPI to manipulate LUN/port options
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286418 - head/sys/ofed/include/linux
Author: markj Date: Fri Aug 7 18:30:11 2015 New Revision: 286418 URL: https://svnweb.freebsd.org/changeset/base/286418 Log: ipv4_is_zeronet() and ipv4_is_loopback() expect an address in network order, but IN_ZERONET and IN_LOOPBACK expect it in host order. Submitted by: Tao Liu tao@isilon.com MFC after:1 week Sponsored by: EMC / Isilon Storage Division Modified: head/sys/ofed/include/linux/in.h Modified: head/sys/ofed/include/linux/in.h == --- head/sys/ofed/include/linux/in.hFri Aug 7 17:22:37 2015 (r286417) +++ head/sys/ofed/include/linux/in.hFri Aug 7 18:30:11 2015 (r286418) @@ -37,7 +37,7 @@ #include netinet/in.h #include asm/byteorder.h -#defineipv4_is_zeronet IN_ZERONET -#defineipv4_is_loopbackIN_LOOPBACK +#defineipv4_is_zeronet(be) IN_ZERONET(ntohl(be)) +#defineipv4_is_loopback(be)IN_LOOPBACK(ntohl(be)) #endif /* _LINUX_IN_H_ */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286417 - head/usr.bin/mkimg
Author: marcel Date: Fri Aug 7 17:22:37 2015 New Revision: 286417 URL: https://svnweb.freebsd.org/changeset/base/286417 Log: o Fix a typo. o Describe the file formats mkimg can create. Modified: head/usr.bin/mkimg/mkimg.1 Modified: head/usr.bin/mkimg/mkimg.1 == --- head/usr.bin/mkimg/mkimg.1 Fri Aug 7 16:23:16 2015(r286416) +++ head/usr.bin/mkimg/mkimg.1 Fri Aug 7 17:22:37 2015(r286417) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 22, 2015 +.Dd August 7, 2015 .Dt MKIMG 1 .Os .Sh NAME @@ -141,7 +141,7 @@ utility will create images that are iden .Pp A set of long options exist to query about the .Nm -utilty itself. +utility itself. Options in this set should be given by themselves because the .Nm utility exits immediately after providing the requested information. @@ -165,6 +165,85 @@ run the .Nm utility without any arguments. This will print a usage message with all the necessary details. +.Sh DISK FORMATS +The +.Nm +utility supports a number of output file formats. +A short description of these is given below. +.Ss QCOW and QCOW2 +QCOW stands for QEMU Copy On Write. +It's a sparse file format akin to VHD and VMDK and QCOW represents the +first version. +QCOW2 represents version 2 of the file format. +Version 2 is not backward compatible with version 1 and adds support for +snapshots among other things. +The QCOW file formats are natively supported by QEMU and Xen. +To write QCOW, specify +.Fl f Ar qcow +on the command line. +To write version 2 QCOW, specify +.Fl f Ar qcow2 +on the command line. +The preferred file extension is .qcow iand .qcow2 for QCOW and QCOW2 +(resp.), but .qcow is sometimes used for version 2 files as well. +.Ss RAW file format +This file format is a sector by sector representation of an actual disk. +There is no extra information that describes or relates to the format +itself. The size of the file is the size of the (virtual) disk. +This file format is suitable for being copyied onto a disk with utilities +like +.Nm dd . +To write a raw disk file, either omit the +.Fl f +option, or specify +.Fl f Ar raw +on the command line. +The preferred file extension is one of .img or .raw, but there's no +real convention for it. +.Ss Dynamic VHD and Fixed VHD +Microsoft's Virtual Hard Disk file formats. +The dynamic format is a sparse format akin to QCOW and VMDK. +The fixed format is effectively a raw format with a footer appended to the +file and as such it's often indistinguishable from the raw format. +The fixed file format has been added to support Microsoft's Azure platform +and due to inconsistencies in interpretation of the footer is not compatible +with utilities like +.Nm qemu +when it is specifically instructed to interpreted the file as a VHD file. +By default +.Nm qemu +will treat the file as a raw disk file, which mostly works fine. +To have +.Nm +create a dynamic VHD file, specify +.Fl f Ar vhd +on the command line. +To create a fixed VHD file for use by Azure, specify +.Fl f Ar vhdf +on the command line. +The preferred file extension is .vhd. +.Ss VMDK +VMware's Virtual Machine Disk file format. +It's a sparse file format akin to QCOW and VHD and supported by many +virtualization solutions. +To create a VMDK file, specify +.Fl f Ar vmdk +on the command line. +The preferred file extension is .vmdk. +.Pp +Not all virtualization solutions support all file formats, but often those +virtualization environments have utilities to convert from one format to +another. +Note however that conversion may require that the virtual disk size is +changed to match the constraints of the output format and this may invalidate +the contents of the disk image. +For example, the GUID Partition Table (GPT) scheme has a header in the last +sector on the disk. +When changing the disk size, the GPT must be changed so that the last header +is moved accordingly. +This is typically not part of the conversion process. +If possible, use an output format specifically for the environment in which +the file is intended to be used. .Sh ENVIRONMENT .Bl -tag -width TMPDIR -compact .It Ev TMPDIR @@ -235,6 +314,7 @@ utility supports assigning labels to the In the following example the file system partition is labeled as 'backup': .Dl % mkimg -s gpt -p freebsd-ufs/backup:=file-system.ufs -o gpt.img .Sh SEE ALSO +.Xr dd 1 , .Xr gpart 8 , .Xr makefs 8 , .Xr mdconfig 8 , ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286419 - head/usr.bin/mkimg
Author: marcel Date: Fri Aug 7 18:40:44 2015 New Revision: 286419 URL: https://svnweb.freebsd.org/changeset/base/286419 Log: Fix typo introduced in previous commit. Pointed out by: Nikolai Lifanov lifanov at mail.lifanov.com Modified: head/usr.bin/mkimg/mkimg.1 Modified: head/usr.bin/mkimg/mkimg.1 == --- head/usr.bin/mkimg/mkimg.1 Fri Aug 7 18:30:11 2015(r286418) +++ head/usr.bin/mkimg/mkimg.1 Fri Aug 7 18:40:44 2015(r286419) @@ -184,7 +184,7 @@ on the command line. To write version 2 QCOW, specify .Fl f Ar qcow2 on the command line. -The preferred file extension is .qcow iand .qcow2 for QCOW and QCOW2 +The preferred file extension is .qcow and .qcow2 for QCOW and QCOW2 (resp.), but .qcow is sometimes used for version 2 files as well. .Ss RAW file format This file format is a sector by sector representation of an actual disk. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r286420 - head/cddl/lib/libdtrace
Author: markj
Date: Fri Aug 7 19:56:22 2015
New Revision: 286420
URL: https://svnweb.freebsd.org/changeset/base/286420
Log:
- Use an explicit depends_on module kernel guard in DTrace libraries that
reference types defined in the kernel. Otherwise dtrace(1) expects to find
CTF definitions for all referenced types, which is not very reasonable
when it is being used in a build environment. This was previously worked
around by adding -x nolibs to dtrace -h or -G invocations, but as of
r283025, dtrace(1) actually handles dependencies properly, so this is no
longer necessary.
- Remove pragma ident directives from DTrace libraries, as they're being
phased out upstream as well.
Submitted by: Krister Johansen krister.johan...@isilon.com [1]
MFC after:1 week
Sponsored by: EMC / Isilon Storage Division
Description of fields to fill in above: 76 columns --|
PR: If a GNATS PR is affected by the change.
Submitted by: If someone else sent in the change.
Reviewed by: If someone else reviewed your modification.
Approved by: If you needed approval for this commit.
Obtained from:If the change is from a third party.
MFC after:N [day[s]|week[s]|month[s]]. Request a reminder
email.
MFH: Ports tree branch name. Request approval for
merge.
Relnotes: Set to 'yes' for mention in release notes.
Security: Vulnerability reference (one per line) or
description.
Sponsored by: If the change was sponsored by an organization.
Differential Revision:https://reviews.freebsd.org/D### (*full* phabric
URL needed).
Empty fields above will be automatically removed.
Mlibdtrace/io.d
Mlibdtrace/ip.d
Mlibdtrace/nfs.d
Mlibdtrace/nfssrv.d
Mlibdtrace/psinfo.d
Mlibdtrace/regs_x86.d
Mlibdtrace/sched.d
Mlibdtrace/siftr.d
Mlibdtrace/tcp.d
Mlibdtrace/udp.d
Modified:
head/cddl/lib/libdtrace/io.d
head/cddl/lib/libdtrace/ip.d
head/cddl/lib/libdtrace/nfs.d
head/cddl/lib/libdtrace/nfssrv.d
head/cddl/lib/libdtrace/psinfo.d
head/cddl/lib/libdtrace/regs_x86.d
head/cddl/lib/libdtrace/sched.d
head/cddl/lib/libdtrace/siftr.d
head/cddl/lib/libdtrace/tcp.d
head/cddl/lib/libdtrace/udp.d
Modified: head/cddl/lib/libdtrace/io.d
==
--- head/cddl/lib/libdtrace/io.dFri Aug 7 18:40:44 2015
(r286419)
+++ head/cddl/lib/libdtrace/io.dFri Aug 7 19:56:22 2015
(r286420)
@@ -25,8 +25,7 @@
* Use is subject to license terms.
*/
-#pragma ident %Z%%M% %I% %E% SMI
-
+#pragma D depends_on module kernel
#pragma D depends_on provider io
typedef struct devinfo {
Modified: head/cddl/lib/libdtrace/ip.d
==
--- head/cddl/lib/libdtrace/ip.dFri Aug 7 18:40:44 2015
(r286419)
+++ head/cddl/lib/libdtrace/ip.dFri Aug 7 19:56:22 2015
(r286420)
@@ -25,6 +25,7 @@
* Copyright (c) 2013 Mark Johnston ma...@freebsd.org
*/
+#pragma D depends_on module kernel
#pragma D depends_on provider ip
/*
Modified: head/cddl/lib/libdtrace/nfs.d
==
--- head/cddl/lib/libdtrace/nfs.d Fri Aug 7 18:40:44 2015
(r286419)
+++ head/cddl/lib/libdtrace/nfs.d Fri Aug 7 19:56:22 2015
(r286420)
@@ -30,6 +30,7 @@
#pragmaD depends_on library ip.d
#pragmaD depends_on library net.d
+#pragmaD depends_on module kernel
#pragmaD depends_on module nfs
typedef struct nfsv4opinfo {
Modified: head/cddl/lib/libdtrace/nfssrv.d
==
--- head/cddl/lib/libdtrace/nfssrv.dFri Aug 7 18:40:44 2015
(r286419)
+++ head/cddl/lib/libdtrace/nfssrv.dFri Aug 7 19:56:22 2015
(r286420)
@@ -30,7 +30,8 @@
#pragmaD depends_on library ip.d
#pragmaD depends_on library net.d
-#pragmaD depends_on module nfs.d
+#pragmaD depends_on library nfs.d
+#pragmaD depends_on module kernel
#pragma D depends_on module nfssrv
#pragma D binding 1.5 translator
Modified: head/cddl/lib/libdtrace/psinfo.d
==
--- head/cddl/lib/libdtrace/psinfo.dFri Aug 7 18:40:44 2015
(r286419)
+++ head/cddl/lib/libdtrace/psinfo.dFri Aug 7 19:56:22 2015
(r286420)
@@ -28,6 +28,8 @@
* Use is subject to license terms.
*/
+#pragma D depends_on module kernel
+
typedef struct psinfo {
int pr_nlwp;/* number of threads */
pid_t pr_pid; /* unique process id */
Modified:
svn commit: r286410 - in head: etc etc/rc.d sys/dev/ath sys/dev/ath/ath_rate/sample sys/dev/bwi sys/dev/bwn sys/dev/if_ndis sys/dev/ipw sys/dev/iwi sys/dev/iwn sys/dev/malo sys/dev/mwl sys/dev/ral ...
Author: glebius Date: Fri Aug 7 11:43:14 2015 New Revision: 286410 URL: https://svnweb.freebsd.org/changeset/base/286410 Log: Change KPI of how device drivers that provide wireless connectivity interact with the net80211 stack. Historical background: originally wireless devices created an interface, just like Ethernet devices do. Name of an interface matched the name of the driver that created. Later, wlan(4) layer was introduced, and the wlanX interfaces become the actual interface, leaving original ones as a parent interface of wlanX. Kernelwise, the KPI between net80211 layer and a driver became a mix of methods that pass a pointer to struct ifnet as identifier and methods that pass pointer to struct ieee80211com. From user point of view, the parent interface just hangs on in the ifconfig list, and user can't do anything useful with it. Now, the struct ifnet goes away. The struct ieee80211com is the only KPI between a device driver and net80211. Details: - The struct ieee80211com is embedded into drivers softc. - Packets are sent via new ic_transmit method, which is very much like the previous if_transmit. - Bringing parent up/down is done via new ic_parent method, which notifies driver about any changes: number of wlan(4) interfaces, number of them in promisc or allmulti state. - Device specific ioctls (if any) are received on new ic_ioctl method. - Packets/errors accounting are done by the stack. In certain cases, when driver experiences errors and can not attribute them to any specific interface, driver updates ic_oerrors or ic_ierrors counters. Details on interface configuration with new world order: - A sequence of commands needed to bring up wireless DOESNT change. - /etc/rc.conf parameters DON'T change. - List of devices that can be used to create wlan(4) interfaces is now provided by net.wlan.devices sysctl. Most drivers in this change were converted by me, except of wpi(4), that was done by Andriy Voskoboinyk. Big thanks to Kevin Lo for testing changes to at least 8 drivers. Thanks to Olivier Cochard, gjb@, mmoll@, op@ and lev@, who also participated in testing. Details here: https://wiki.freebsd.org/projects/ifnet/net80211 Still, drivers: ndis, wtap, mwl, ipw, bwn, wi, upgt, uath were not tested. Changes to mwl, ipw, bwn, wi, upgt are trivial and chances of problems are low. The wtap wasn't compilable even before this change. But the ndis driver is complex, and it is likely to be broken with this commit. Help with testing and debugging it is appreciated. Differential Revision:D2655, D2740 Sponsored by: Nginx, Inc. Sponsored by: Netflix Modified: head/etc/network.subr head/etc/rc.d/netif head/sys/dev/ath/ath_rate/sample/sample.c head/sys/dev/ath/ath_rate/sample/sample.h head/sys/dev/ath/if_ath.c head/sys/dev/ath/if_ath_beacon.c head/sys/dev/ath/if_ath_debug.h head/sys/dev/ath/if_ath_keycache.c head/sys/dev/ath/if_ath_misc.h head/sys/dev/ath/if_ath_rx.c head/sys/dev/ath/if_ath_rx_edma.c head/sys/dev/ath/if_ath_sysctl.c head/sys/dev/ath/if_ath_tdma.c head/sys/dev/ath/if_ath_tx.c head/sys/dev/ath/if_ath_tx_edma.c head/sys/dev/ath/if_athvar.h head/sys/dev/bwi/bwimac.c head/sys/dev/bwi/bwiphy.c head/sys/dev/bwi/bwirf.c head/sys/dev/bwi/if_bwi.c head/sys/dev/bwi/if_bwivar.h head/sys/dev/bwn/if_bwn.c head/sys/dev/bwn/if_bwnvar.h head/sys/dev/if_ndis/if_ndis.c head/sys/dev/if_ndis/if_ndisvar.h head/sys/dev/ipw/if_ipw.c head/sys/dev/ipw/if_ipwvar.h head/sys/dev/iwi/if_iwi.c head/sys/dev/iwi/if_iwivar.h head/sys/dev/iwn/if_iwn.c head/sys/dev/iwn/if_iwnvar.h head/sys/dev/malo/if_malo.c head/sys/dev/malo/if_malo.h head/sys/dev/mwl/if_mwl.c head/sys/dev/mwl/if_mwl_pci.c head/sys/dev/mwl/if_mwlvar.h head/sys/dev/ral/if_ral_pci.c head/sys/dev/ral/rt2560.c head/sys/dev/ral/rt2560var.h head/sys/dev/ral/rt2661.c head/sys/dev/ral/rt2661var.h head/sys/dev/ral/rt2860.c head/sys/dev/ral/rt2860var.h head/sys/dev/usb/wlan/if_rsu.c head/sys/dev/usb/wlan/if_rsureg.h head/sys/dev/usb/wlan/if_rum.c head/sys/dev/usb/wlan/if_rumvar.h head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_runvar.h head/sys/dev/usb/wlan/if_uath.c head/sys/dev/usb/wlan/if_uathvar.h head/sys/dev/usb/wlan/if_upgt.c head/sys/dev/usb/wlan/if_upgtvar.h head/sys/dev/usb/wlan/if_ural.c head/sys/dev/usb/wlan/if_uralvar.h head/sys/dev/usb/wlan/if_urtw.c head/sys/dev/usb/wlan/if_urtwn.c head/sys/dev/usb/wlan/if_urtwnreg.h head/sys/dev/usb/wlan/if_urtwvar.h head/sys/dev/usb/wlan/if_zyd.c head/sys/dev/usb/wlan/if_zydreg.h head/sys/dev/wi/if_wi.c head/sys/dev/wi/if_wi_pccard.c head/sys/dev/wi/if_wi_pci.c head/sys/dev/wi/if_wivar.h head/sys/dev/wpi/if_wpi.c head/sys/dev/wpi/if_wpivar.h head/sys/dev/wtap/if_wtap.c head/sys/dev/wtap/if_wtapvar.h head/sys/net80211/ieee80211.c
svn commit: r286411 - head/share/man/man9
Author: jah Date: Fri Aug 7 12:13:15 2015 New Revision: 286411 URL: https://svnweb.freebsd.org/changeset/base/286411 Log: Create man page for pmap_quick_enter_page(9) and pmap_quick_remove_page(9) Reviewed by: kib, brueffer, wblock Approved by: kib (mentor) Differential Revision:https://reviews.freebsd.org/D3312 Added: head/share/man/man9/pmap_quick_enter_page.9 (contents, props changed) Modified: head/share/man/man9/Makefile head/share/man/man9/pmap.9 Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileFri Aug 7 11:43:14 2015 (r286410) +++ head/share/man/man9/MakefileFri Aug 7 12:13:15 2015 (r286411) @@ -223,6 +223,7 @@ MAN=accept_filter.9 \ pmap_pinit.9 \ pmap_protect.9 \ pmap_qenter.9 \ + pmap_quick_enter_page.9 \ pmap_release.9 \ pmap_remove.9 \ pmap_resident_count.9 \ @@ -1265,6 +1266,7 @@ MLINKS+=pmap_is_modified.9 pmap_ts_refer MLINKS+=pmap_pinit.9 pmap_pinit0.9 \ pmap_pinit.9 pmap_pinit2.9 MLINKS+=pmap_qenter.9 pmap_qremove.9 +MLINKS+=pmap_quick_enter_page.9 pmap_quick_remove_page.9 MLINKS+=pmap_remove.9 pmap_remove_all.9 \ pmap_remove.9 pmap_remove_pages.9 MLINKS+=pmap_resident_count.9 pmap_wired_count.9 Modified: head/share/man/man9/pmap.9 == --- head/share/man/man9/pmap.9 Fri Aug 7 11:43:14 2015(r286410) +++ head/share/man/man9/pmap.9 Fri Aug 7 12:13:15 2015(r286411) @@ -111,6 +111,8 @@ operation. .Xr pmap_protect 9 , .Xr pmap_qenter 9 , .Xr pmap_qremove 9 , +.Xr pmap_quick_enter_page 9 , +.Xr pmap_quick_remove_page 9 , .Xr pmap_release 9 , .Xr pmap_remove 9 , .Xr pmap_remove_all 9 , Added: head/share/man/man9/pmap_quick_enter_page.9 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man9/pmap_quick_enter_page.9 Fri Aug 7 12:13:15 2015 (r286411) @@ -0,0 +1,103 @@ +.\ +.\ Copyright (c) 2015 Jason A. Harmening j...@freebsd.org +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\ SUCH DAMAGE. +.\ +.\ $FreeBSD$ +.\ +.Dd August 6, 2015 +.Dt PMAP_QUICK_ENTER_PAGE 9 +.Os +.Sh NAME +.Nm pmap_quick_enter_page , +.Nm pmap_quick_remove_page +.Nd manage fast, single-page kernel address space mappings +.Sh SYNOPSIS +.In sys/param.h +.In vm/vm.h +.In vm/pmap.h +.Ft vm_offset_t +.Fn pmap_quick_enter_page vm_page_t m +.Ft void +.Fn pmap_quick_remove_page vm_offset_t kva +.Sh DESCRIPTION +The +.Fn pmap_quick_enter_page +function accepts a single page +.Fa m , +and enters this page into a preallocated address in kernel virtual +address (KVA) space. +This function is intended for temporary mappings that will only +be used for a very short period, for example a copy operation on +the page contents. +.Pp +The +.Fn pmap_quick_remove_page +function removes a mapping previously created by +.Fn pmap_quick_enter_page +at +.Fa kva , +making the KVA frame used by +.Fn pmap_quick_enter_page +available for reuse. +.Pp +On many architectures, +.Fn pmap_quick_enter_page +uses a per-CPU pageframe. +In those cases, it must disable preemption on the local CPU. +The corresponding call to +.Fn pmap_quick_remove_page +then re-enables preemption. +It is therefore not safe for machine-independent code to sleep +or perform locking operations while holding these mappings. +Current implementations only guarantee the availability of a single +page for the calling thread, so calls to +.Fn pmap_quick_enter_page +must not be
svn commit: r286413 - head/sys/dev/mwl
Author: glebius
Date: Fri Aug 7 12:34:20 2015
New Revision: 286413
URL: https://svnweb.freebsd.org/changeset/base/286413
Log:
Fix !MWL_DEBUG build.
Modified:
head/sys/dev/mwl/if_mwl.c
Modified: head/sys/dev/mwl/if_mwl.c
==
--- head/sys/dev/mwl/if_mwl.c Fri Aug 7 12:24:25 2015(r286412)
+++ head/sys/dev/mwl/if_mwl.c Fri Aug 7 12:34:20 2015(r286413)
@@ -245,10 +245,10 @@ enum {
static void mwl_printrxbuf(const struct mwl_rxbuf *bf, u_int ix);
static void mwl_printtxbuf(const struct mwl_txbuf *bf, u_int qnum, u_int ix);
#else
-#defineIFF_DUMPPKTS_RECV(sc, wh) do {} while (0)
-#defineIFF_DUMPPKTS_XMIT(sc) do {} while (0)
-#defineDPRINTF(sc, m, fmt, ...)do {} while (0)
-#defineKEYPRINTF(sc, k, mac) do {} while (0)
+#defineIFF_DUMPPKTS_RECV(sc, wh) 0
+#defineIFF_DUMPPKTS_XMIT(sc) 0
+#defineDPRINTF(sc, m, fmt, ...)do { (void )sc; } while (0)
+#defineKEYPRINTF(sc, k, mac) do { (void )sc; } while (0)
#endif
static MALLOC_DEFINE(M_MWLDEV, mwldev, mwl driver dma buffers);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
