svn commit: r323697 - vendor/tcpdump/4.9.2

2017-09-17 Thread Gordon Tetlow 
Author: gordon
Date: Mon Sep 18 04:12:46 2017
New Revision: 323697
URL: https://svnweb.freebsd.org/changeset/base/323697

Log:
  Tag tcpdump-4.9.2.
  
  Approved by:  emaste (mentor)

Added:
  vendor/tcpdump/4.9.2/
 - copied from r323696, vendor/tcpdump/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323696 - in vendor/tcpdump/dist: . tests

2017-09-17 Thread Gordon Tetlow 
Author: gordon
Date: Mon Sep 18 04:10:54 2017
New Revision: 323696
URL: https://svnweb.freebsd.org/changeset/base/323696

Log:
  Vendor import of tcpdump 4.9.2.
  
  Approved by:  emaste (mentor)

Added:
  vendor/tcpdump/dist/funcattrs.h   (contents, props changed)
  vendor/tcpdump/dist/tests/802_15_4-data.out
  vendor/tcpdump/dist/tests/802_15_4-data.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/802_15_4-oobr-1.out
  vendor/tcpdump/dist/tests/802_15_4-oobr-1.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/802_15_4-oobr-2.out
  vendor/tcpdump/dist/tests/802_15_4-oobr-2.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/802_15_4_beacon.out
  vendor/tcpdump/dist/tests/802_15_4_beacon.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/arp-oobr.out
  vendor/tcpdump/dist/tests/arp-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/beep-oobr.out
  vendor/tcpdump/dist/tests/beep-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/bgp-aigp-oobr-nossl.out
  vendor/tcpdump/dist/tests/bgp-aigp-oobr-ssl.out
  vendor/tcpdump/dist/tests/bgp-aigp-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/bgp-as-path-oobr-nossl.out
  vendor/tcpdump/dist/tests/bgp-as-path-oobr-ssl.out
  vendor/tcpdump/dist/tests/bgp-as-path-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/bgp_mvpn_6_and_7.out
  vendor/tcpdump/dist/tests/bgp_mvpn_6_and_7.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/bgp_pmsi_tunnel-oobr.out
  vendor/tcpdump/dist/tests/bgp_pmsi_tunnel-oobr.pcap   (contents, props 
changed)
  vendor/tcpdump/dist/tests/bgp_vpn_rt-oobr.out
  vendor/tcpdump/dist/tests/bgp_vpn_rt-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/bootp_asan-2.out
  vendor/tcpdump/dist/tests/bootp_asan-2.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/bootp_asan.out
  vendor/tcpdump/dist/tests/bootp_asan.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/cfm_sender_id-oobr.out
  vendor/tcpdump/dist/tests/cfm_sender_id-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/decnet-oobr.out
  vendor/tcpdump/dist/tests/decnet-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/decnet-shorthdr-oobr.out
  vendor/tcpdump/dist/tests/decnet-shorthdr-oobr.pcap   (contents, props 
changed)
  vendor/tcpdump/dist/tests/dhcp6_reconf_asan.out
  vendor/tcpdump/dist/tests/dhcp6_reconf_asan.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/dns-zlip-1.out
  vendor/tcpdump/dist/tests/dns-zlip-1.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/dns-zlip-2.out
  vendor/tcpdump/dist/tests/dns-zlip-2.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/dns-zlip-3.out
  vendor/tcpdump/dist/tests/dns-zlip-3.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/dns_fwdptr.out
  vendor/tcpdump/dist/tests/dns_fwdptr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/eap_extract_read2_asan.out
  vendor/tcpdump/dist/tests/eap_extract_read2_asan.pcap   (contents, props 
changed)
  vendor/tcpdump/dist/tests/eigrp-tlv-oobr.out
  vendor/tcpdump/dist/tests/eigrp-tlv-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/esis_opt_prot-oobr.out
  vendor/tcpdump/dist/tests/esis_opt_prot-oobr.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/esis_snpa_asan-2.out
  vendor/tcpdump/dist/tests/esis_snpa_asan-2.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/esis_snpa_asan-3.out
  vendor/tcpdump/dist/tests/esis_snpa_asan-3.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/esis_snpa_asan-4.out
  vendor/tcpdump/dist/tests/esis_snpa_asan-4.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/esis_snpa_asan-5.out
  vendor/tcpdump/dist/tests/esis_snpa_asan-5.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/esis_snpa_asan.out
  vendor/tcpdump/dist/tests/esis_snpa_asan.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/extract_read2_asan.out
  vendor/tcpdump/dist/tests/extract_read2_asan.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/getname_2_read4_asan.out
  vendor/tcpdump/dist/tests/getname_2_read4_asan.pcap   (contents, props 
changed)
  vendor/tcpdump/dist/tests/hncp_dhcpv4data-oobr.out
  vendor/tcpdump/dist/tests/hncp_dhcpv4data-oobr.pcap   (contents, props 
changed)
  vendor/tcpdump/dist/tests/hncp_dhcpv6data-oobr.out
  vendor/tcpdump/dist/tests/hncp_dhcpv6data-oobr.pcap   (contents, props 
changed)
  vendor/tcpdump/dist/tests/hoobr_aodv_extension.out
  vendor/tcpdump/dist/tests/hoobr_aodv_extension.pcap   (contents, props 
changed)
  vendor/tcpdump/dist/tests/hoobr_chdlc_print.out
  vendor/tcpdump/dist/tests/hoobr_chdlc_print.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/hoobr_juniper.out
  vendor/tcpdump/dist/tests/hoobr_juniper.pcap   (contents, props changed)
  vendor/tcpdump/dist/tests/hoobr_juniper2.out
  vendor/tcpdump/dist/tests/hoobr_juniper2.pcap

svn commit: r323695 - svnadmin/conf

2017-09-17 Thread Gordon Tetlow 
Author: gordon
Date: Mon Sep 18 04:09:59 2017
New Revision: 323695
URL: https://svnweb.freebsd.org/changeset/base/323695

Log:
  Add myself to import new tcpdump image.
  
  Approved by:  emaste (mentor)

Modified:
  svnadmin/conf/sizelimit.conf

Modified: svnadmin/conf/sizelimit.conf
==
--- svnadmin/conf/sizelimit.confMon Sep 18 00:17:53 2017
(r323694)
+++ svnadmin/conf/sizelimit.confMon Sep 18 04:09:59 2017
(r323695)
@@ -19,6 +19,7 @@ bapt
 brooks
 davidcs
 dim
+gordon
 imp
 jb
 jeff
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323694 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet

2017-09-17 Thread Cy Schubert 
Author: cy
Date: Mon Sep 18 00:17:53 2017
New Revision: 323694
URL: https://svnweb.freebsd.org/changeset/base/323694

Log:
  MFC r323478:
  
  Improve the wording of a comment describing why EAGAIN is the error code.

Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_state.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_state.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_state.c
==
--- stable/11/sys/contrib/ipfilter/netinet/ip_state.c   Mon Sep 18 00:13:48 
2017(r323693)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_state.c   Mon Sep 18 00:17:53 
2017(r323694)
@@ -1383,10 +1383,10 @@ ipf_state_add(softc, fin, stsave, flags)
int out;
 
/*
-* If a packet that was created locally is trying to go out but we
-* do not match here here because of this lock, it is likely that
-* the policy will block it and return network unreachable back up
-* the stack. To mitigate this error, EAGAIN is returned instead,
+* If a locally created packet is trying to egress but it
+* does not match because of this lock, it is likely that
+* the policy will block it and return network unreachable further
+* up the stack. To mitigate this error, EAGAIN is returned instead,
 * telling the IP stack to try sending this packet again later.
 */
if (softs->ipf_state_lock) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323694 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet

2017-09-17 Thread Cy Schubert 
Author: cy
Date: Mon Sep 18 00:17:53 2017
New Revision: 323694
URL: https://svnweb.freebsd.org/changeset/base/323694

Log:
  MFC r323478:
  
  Improve the wording of a comment describing why EAGAIN is the error code.

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_state.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_state.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_state.c
==
--- stable/10/sys/contrib/ipfilter/netinet/ip_state.c   Mon Sep 18 00:13:48 
2017(r323693)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_state.c   Mon Sep 18 00:17:53 
2017(r323694)
@@ -1383,10 +1383,10 @@ ipf_state_add(softc, fin, stsave, flags)
int out;
 
/*
-* If a packet that was created locally is trying to go out but we
-* do not match here here because of this lock, it is likely that
-* the policy will block it and return network unreachable back up
-* the stack. To mitigate this error, EAGAIN is returned instead,
+* If a locally created packet is trying to egress but it
+* does not match because of this lock, it is likely that
+* the policy will block it and return network unreachable further
+* up the stack. To mitigate this error, EAGAIN is returned instead,
 * telling the IP stack to try sending this packet again later.
 */
if (softs->ipf_state_lock) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323693 - in stable: 10/kerberos5/lib/libkafs5 11/kerberos5/lib/libkafs5

2017-09-17 Thread Cy Schubert 
Author: cy
Date: Mon Sep 18 00:13:48 2017
New Revision: 323693
URL: https://svnweb.freebsd.org/changeset/base/323693

Log:
  MFC r322112:
  
  krb5_err.h is generated from a .et file in kerberos5/lib/libkrb5.
  As kerberos5/lib/krb5 include files are already referenced it makes
  no sense to generate it again here.

Modified:
  stable/11/kerberos5/lib/libkafs5/Makefile
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/kerberos5/lib/libkafs5/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/kerberos5/lib/libkafs5/Makefile
==
--- stable/11/kerberos5/lib/libkafs5/Makefile   Sun Sep 17 23:40:16 2017
(r323692)
+++ stable/11/kerberos5/lib/libkafs5/Makefile   Mon Sep 18 00:13:48 2017
(r323693)
@@ -22,7 +22,7 @@ MLINKS=   kafs5.3 k_afs_cell_of_file.3 \
kafs5.3 krb_afslog.3 \
kafs5.3 krb_afslog_uid.3
 
-SRCS=  afssys.c afskrb5.c common.c krb5_err.h
+SRCS=  afssys.c afskrb5.c common.c
 
 CFLAGS+=   -I${KRB5DIR}/lib/kafs \
-I${KRB5DIR}/lib/krb5 \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323693 - in stable: 10/kerberos5/lib/libkafs5 11/kerberos5/lib/libkafs5

2017-09-17 Thread Cy Schubert 
Author: cy
Date: Mon Sep 18 00:13:48 2017
New Revision: 323693
URL: https://svnweb.freebsd.org/changeset/base/323693

Log:
  MFC r322112:
  
  krb5_err.h is generated from a .et file in kerberos5/lib/libkrb5.
  As kerberos5/lib/krb5 include files are already referenced it makes
  no sense to generate it again here.

Modified:
  stable/10/kerberos5/lib/libkafs5/Makefile
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/kerberos5/lib/libkafs5/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/kerberos5/lib/libkafs5/Makefile
==
--- stable/10/kerberos5/lib/libkafs5/Makefile   Sun Sep 17 23:40:16 2017
(r323692)
+++ stable/10/kerberos5/lib/libkafs5/Makefile   Mon Sep 18 00:13:48 2017
(r323693)
@@ -23,7 +23,7 @@ MLINKS=   kafs5.3 k_afs_cell_of_file.3 \
kafs5.3 krb_afslog.3 \
kafs5.3 krb_afslog_uid.3
 
-SRCS=  afssys.c afskrb5.c common.c krb5_err.h
+SRCS=  afssys.c afskrb5.c common.c
 SRCS=  afssys.c \
afskrb5.c \
common.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323692 - in head/sys/compat: linsysfs linux

2017-09-17 Thread Conrad Meyer 
Author: cem
Date: Sun Sep 17 23:40:16 2017
New Revision: 323692
URL: https://svnweb.freebsd.org/changeset/base/323692

Log:
  linsysfs(5): Add support for recent libdrm
  
  Expose more information about PCI devices (and GPUs in particular) via
  linsysfs to libdrm.
  
  This allows unmodified modern 64-bit Linux libdrm to work, which allows
  modern Linux Mesa to work.  The submitter reports that he tested the change
  with an Ubuntu 16.04 chroot + amdgpu from graphics/drm-next-kmod.
  
  PR:   222375
  Submitted by: Greg V 

Modified:
  head/sys/compat/linsysfs/linsysfs.c
  head/sys/compat/linux/linux_util.c

Modified: head/sys/compat/linsysfs/linsysfs.c
==
--- head/sys/compat/linsysfs/linsysfs.c Sun Sep 17 22:58:13 2017
(r323691)
+++ head/sys/compat/linsysfs/linsysfs.c Sun Sep 17 23:40:16 2017
(r323692)
@@ -133,20 +133,135 @@ linsysfs_link_scsi_host(PFS_FILL_ARGS)
return (0);
 }
 
+static int
+linsysfs_fill_data(PFS_FILL_ARGS)
+{
+   sbuf_printf(sb, "%s", pn->pn_data);
+   return (0);
+}
+
+static int
+linsysfs_fill_vendor(PFS_FILL_ARGS)
+{
+   sbuf_printf(sb, "0x%04x\n", pci_get_vendor((device_t)pn->pn_data));
+   return (0);
+}
+
+static int
+linsysfs_fill_device(PFS_FILL_ARGS)
+{
+   sbuf_printf(sb, "0x%04x\n", pci_get_device((device_t)pn->pn_data));
+   return (0);
+}
+
+static int
+linsysfs_fill_subvendor(PFS_FILL_ARGS)
+{
+   sbuf_printf(sb, "0x%04x\n", pci_get_subvendor((device_t)pn->pn_data));
+   return (0);
+}
+
+static int
+linsysfs_fill_subdevice(PFS_FILL_ARGS)
+{
+   sbuf_printf(sb, "0x%04x\n", pci_get_subdevice((device_t)pn->pn_data));
+   return (0);
+}
+
+static int
+linsysfs_fill_revid(PFS_FILL_ARGS)
+{
+   sbuf_printf(sb, "0x%x\n", pci_get_revid((device_t)pn->pn_data));
+   return (0);
+}
+
+/*
+ * Filler function for PCI uevent file
+ */
+static int
+linsysfs_fill_uevent_pci(PFS_FILL_ARGS)
+{
+   device_t dev;
+
+   dev = (device_t)pn->pn_data;
+   sbuf_printf(sb, "DRIVER=%s\nPCI_CLASS=%X\nPCI_ID=%04X:%04X\n"
+   "PCI_SUBSYS_ID=%04X:%04X\nPCI_SLOT_NAME=%04d:%02x:%02x.%x\n",
+   linux_driver_get_name_dev(dev), pci_get_class(dev),
+   pci_get_vendor(dev), pci_get_device(dev), pci_get_subvendor(dev),
+   pci_get_subdevice(dev), pci_get_domain(dev), pci_get_bus(dev),
+   pci_get_slot(dev), pci_get_function(dev));
+   return (0);
+}
+
+/*
+ * Filler function for drm uevent file
+ */
+static int
+linsysfs_fill_uevent_drm(PFS_FILL_ARGS)
+{
+   device_t dev;
+   int unit;
+
+   dev = (device_t)pn->pn_data;
+   unit = device_get_unit(dev);
+   sbuf_printf(sb,
+   "MAJOR=226\nMINOR=%d\nDEVNAME=drm/%d\nDEVTYPE=dri_minor\n", unit,
+   unit);
+   return (0);
+}
+
+static char *
+get_full_pfs_path(struct pfs_node *cur)
+{
+   char *temp, *path;
+
+   temp = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+   path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+   path[0] = '\0';
+
+   do {
+   snprintf(temp, MAXPATHLEN, "%s/%s", cur->pn_name, path);
+   strlcpy(path, temp, MAXPATHLEN);
+   cur = cur->pn_parent;
+   } while (cur->pn_parent != NULL);
+
+   path[strlen(path) - 1] = '\0'; /* remove extra slash */
+   free(temp, M_TEMP);
+   return (path);
+}
+
+/*
+ * Filler function for symlink from drm char device to PCI device
+ */
+static int
+linsysfs_fill_vgapci(PFS_FILL_ARGS)
+{
+   char *path;
+
+   path = get_full_pfs_path((struct pfs_node*)pn->pn_data);
+   sbuf_printf(sb, "../../../%s", path);
+   free(path, M_TEMP);
+   return (0);
+}
+
 #define PCI_DEV "pci"
+#define DRMN_DEV "drmn"
 static int
-linsysfs_run_bus(device_t dev, struct pfs_node *dir, struct pfs_node *scsi, 
char *path,
-   char *prefix)
+linsysfs_run_bus(device_t dev, struct pfs_node *dir, struct pfs_node *scsi, 
struct pfs_node *chardev,
+  char *path, char *prefix)
 {
struct scsi_host_queue *scsi_host;
-   struct pfs_node *sub_dir;
+   struct pfs_node *sub_dir, *cur_file, *cur_chardev;
int i, nchildren;
device_t *children, parent;
devclass_t devclass;
const char *name = NULL;
struct pci_devinfo *dinfo;
-   char *device, *host, *new_path = path;
+   char *device, *host, *new_path, *chardevname;
 
+   new_path = path;
+   chardevname = malloc(16, M_TEMP, M_WAITOK);
+
parent = device_get_parent(dev);
if (parent) {
devclass = device_get_devclass(parent);
@@ -171,6 +286,36 @@ linsysfs_run_bus(device_t dev, struct pfs_node *dir, s
strcat(new_path, device);
dir = pfs_create_dir(dir, device,
NULL, NULL, NULL, 0);
+   cur_file = pfs_create_file(dir, "vendor",
+

svn commit: r323690 - head/sys/x86/x86

2017-09-17 Thread Conrad Meyer 
Author: cem
Date: Sun Sep 17 22:58:13 2017
New Revision: 323690
URL: https://svnweb.freebsd.org/changeset/base/323690

Log:
  MCA: Expand AMD Thresholding support to cover all banks
  
  When it was added in r314636, AMD Thresholding was hardcoded to only
  bank 4 (Northbridge) for some reason.  However, even on family 10h the
  MCAx_MISC register Valid/Present bits determine whether thresholding is
  supported on that bank.
  
  Expand thresholding support to monitor all monitorable banks.  This
  simplifies some of the logic and makes it more consistent with our Intel
  CMCI support.
  
  Reviewed by:  markj (earlier version)
  Sponsored by: Dell EMC Isilon
  Differential Revision:https://reviews.freebsd.org/D12321

Modified:
  head/sys/x86/x86/local_apic.c
  head/sys/x86/x86/mca.c

Modified: head/sys/x86/x86/local_apic.c
==
--- head/sys/x86/x86/local_apic.c   Sun Sep 17 22:18:01 2017
(r323689)
+++ head/sys/x86/x86/local_apic.c   Sun Sep 17 22:58:13 2017
(r323690)
@@ -1426,8 +1426,9 @@ native_lapic_enable_mca_elvt(void)
 
value = lapic_read32(LAPIC_EXT_LVT0 + APIC_ELVT_MCA);
if ((value & APIC_LVT_M) == 0) {
-   printf("AMD MCE Thresholding Extended LVT is already active\n");
-   return (-1);
+   if (bootverbose)
+   printf("AMD MCE Thresholding Extended LVT is already 
active\n");
+   return (APIC_ELVT_MCA);
}
lapics[apic_id].la_elvts[APIC_ELVT_MCA].lvt_masked = 0;
lapics[apic_id].la_elvts[APIC_ELVT_MCA].lvt_active = 1;

Modified: head/sys/x86/x86/mca.c
==
--- head/sys/x86/x86/mca.c  Sun Sep 17 22:18:01 2017(r323689)
+++ head/sys/x86/x86/mca.c  Sun Sep 17 22:58:13 2017(r323690)
@@ -124,7 +124,7 @@ static struct mtx mca_lock;
 
 #ifdef DEV_APIC
 static struct cmc_state **cmc_state;   /* Indexed by cpuid, bank. */
-static struct amd_et_state *amd_et_state;  /* Indexed by cpuid. */
+static struct amd_et_state **amd_et_state; /* Indexed by cpuid, bank. */
 static int cmc_throttle = 60;  /* Time in seconds to throttle CMCI. */
 
 static int amd_elvt = -1;
@@ -645,9 +645,7 @@ amd_thresholding_update(enum scan_mode mode, int bank,
int new_threshold;
int count;
 
-   KASSERT(bank == MC_AMDNB_BANK,
-   ("%s: unexpected bank %d", __func__, bank));
-   cc = _et_state[PCPU_GET(cpuid)];
+   cc = _et_state[PCPU_GET(cpuid)][bank];
misc = rdmsr(MSR_MC_MISC(bank));
count = (misc & MC_MISC_AMD_CNT_MASK) >> MC_MISC_AMD_CNT_SHIFT;
count = count - (MC_MISC_AMD_CNT_MAX - cc->cur_threshold);
@@ -841,9 +839,13 @@ cmci_setup(void)
 static void
 amd_thresholding_setup(void)
 {
+   int i;
 
-   amd_et_state = malloc((mp_maxid + 1) * sizeof(struct amd_et_state),
-   M_MCA, M_WAITOK | M_ZERO);
+   amd_et_state = malloc((mp_maxid + 1) * sizeof(struct amd_et_state *),
+   M_MCA, M_WAITOK);
+   for (i = 0; i <= mp_maxid; i++)
+   amd_et_state[i] = malloc(sizeof(struct amd_et_state) *
+   mca_banks, M_MCA, M_WAITOK | M_ZERO);
SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO,
"cmc_throttle", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
_throttle, 0, sysctl_positive_int, "I",
@@ -964,44 +966,59 @@ cmci_resume(int i)
wrmsr(MSR_MC_CTL2(i), ctl);
 }
 
+/*
+ * Apply an AMD ET configuration to the corresponding MSR.
+ */
 static void
-amd_thresholding_start(struct amd_et_state *cc)
+amd_thresholding_start(struct amd_et_state *cc, int bank)
 {
uint64_t misc;
 
KASSERT(amd_elvt >= 0, ("ELVT offset is not set"));
-   misc = rdmsr(MSR_MC_MISC(MC_AMDNB_BANK));
+
+   misc = rdmsr(MSR_MC_MISC(bank));
+
misc &= ~MC_MISC_AMD_INT_MASK;
misc |= MC_MISC_AMD_INT_LVT;
+
misc &= ~MC_MISC_AMD_LVT_MASK;
misc |= (uint64_t)amd_elvt << MC_MISC_AMD_LVT_SHIFT;
+
misc &= ~MC_MISC_AMD_CNT_MASK;
misc |= (uint64_t)(MC_MISC_AMD_CNT_MAX - cc->cur_threshold)
<< MC_MISC_AMD_CNT_SHIFT;
+
misc &= ~MC_MISC_AMD_OVERFLOW;
misc |= MC_MISC_AMD_CNTEN;
 
-   wrmsr(MSR_MC_MISC(MC_AMDNB_BANK), misc);
+   wrmsr(MSR_MC_MISC(bank), misc);
 }
 
 static void
-amd_thresholding_init(void)
+amd_thresholding_monitor(int i)
 {
struct amd_et_state *cc;
uint64_t misc;
 
+   /*
+* Kludge: On 10h, banks after 4 are not thresholding but also may have
+* bogus Valid bits.  Skip them.  This is definitely fixed in 15h, but
+* I have not investigated whether it is fixed in earlier models.
+*/
+   if (CPUID_TO_FAMILY(cpu_id) < 0x15 && i >= 5)
+   return;
+
/* The counter must be valid and present. */
-   misc =

svn commit: r323691 - in head/sys: dev/iicbus modules/i2c modules/i2c/icee

2017-09-17 Thread Ian Lepore 
Author: ian
Date: Sun Sep 17 22:58:13 2017
New Revision: 323691
URL: https://svnweb.freebsd.org/changeset/base/323691

Log:
  Give icee(4) a detach() method so it can be used as a module.  Add a
  module makefile for it.

Added:
  head/sys/modules/i2c/icee/
  head/sys/modules/i2c/icee/Makefile   (contents, props changed)
Modified:
  head/sys/dev/iicbus/icee.c
  head/sys/modules/i2c/Makefile

Modified: head/sys/dev/iicbus/icee.c
==
--- head/sys/dev/iicbus/icee.c  Sun Sep 17 22:58:13 2017(r323690)
+++ head/sys/dev/iicbus/icee.c  Sun Sep 17 22:58:13 2017(r323691)
@@ -206,17 +206,34 @@ icee_attach(device_t dev)
return (0);
 }
 
+static int
+icee_detach(device_t dev)
+{
+   struct icee_softc *sc = device_get_softc(dev);
+
+   destroy_dev(sc->cdev);
+   return (0);
+}
+
 static int 
 icee_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 {
+   struct icee_softc *sc;
 
+   sc = CDEV2SOFTC(dev);
+   if (device_get_state(sc->dev) < DS_BUSY)
+   device_busy(sc->dev);
+
return (0);
 }
 
 static int
 icee_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
+   struct icee_softc *sc;
 
+   sc = CDEV2SOFTC(dev);
+   device_unbusy(sc->dev);
return (0);
 }
 
@@ -345,6 +362,7 @@ icee_write(struct cdev *dev, struct uio *uio, int iofl
 static device_method_t icee_methods[] = {
DEVMETHOD(device_probe, icee_probe),
DEVMETHOD(device_attach,icee_attach),
+   DEVMETHOD(device_detach,icee_detach),
 
DEVMETHOD_END
 };

Modified: head/sys/modules/i2c/Makefile
==
--- head/sys/modules/i2c/Makefile   Sun Sep 17 22:58:13 2017
(r323690)
+++ head/sys/modules/i2c/Makefile   Sun Sep 17 22:58:13 2017
(r323691)
@@ -6,6 +6,7 @@ SUBDIR = \
ds1307 \
ds13rtc \
ds3231 \
+   icee \
if_ic \
iic \
iicbb \

Added: head/sys/modules/i2c/icee/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/modules/i2c/icee/Makefile  Sun Sep 17 22:58:13 2017
(r323691)
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.PATH: ${SRCTOP}/sys/dev/iicbus
+KMOD=  icee
+SRCS=  icee.c
+
+SRCS+= \
+   bus_if.h \
+   device_if.h \
+   iicbus_if.h \
+   ofw_bus_if.h \
+   opt_platform.h \
+
+.include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323689 - head/sys/fs/nfsclient

2017-09-17 Thread Rick Macklem 
Author: rmacklem
Date: Sun Sep 17 22:18:01 2017
New Revision: 323689
URL: https://svnweb.freebsd.org/changeset/base/323689

Log:
  Fix bogus FREAD with NFSV4OPEN_ACCESSREAD. No functional change.
  
  The code in nfscl_doflayoutio() bogusly used FREAD instead of
  NFSV4OPEN_ACCESSREAD. Since both happen to be defined as "1", this
  worked and the patch doesn't result in a functional change.
  Found by inspection during development of Flex File Layout support.
  
  MFC after:2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clrpcops.c

Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==
--- head/sys/fs/nfsclient/nfs_clrpcops.cSun Sep 17 21:41:51 2017
(r323688)
+++ head/sys/fs/nfsclient/nfs_clrpcops.cSun Sep 17 22:18:01 2017
(r323689)
@@ -5674,7 +5674,7 @@ nfscl_doflayoutio(vnode_t vp, struct uio *uiop, int *i
np->n_flag &= ~NDSCOMMIT;
mtx_unlock(>n_mtx);
}
-   } else if (rwflag == FREAD)
+   } else if (rwflag == NFSV4OPEN_ACCESSREAD)
error = nfsrpc_readds(vp, uiop, stateidp, eofp, *dspp,
io_off, xfer, fhp, cred, p);
else {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323687 - head/sys/powerpc/powerpc

2017-09-17 Thread Justin Hibbits 
Author: jhibbits
Date: Sun Sep 17 20:07:20 2017
New Revision: 323687
URL: https://svnweb.freebsd.org/changeset/base/323687

Log:
  Don't use a non-zero argument for __builtin_frame_address
  
  __builtin_frame_address with a non-zero argument is unsafe and rejected by
  newer gcc.  Since it doesn't seem to impact the stacktrace, don't bother
  with gymnastics to unwind to a different frame for starting.
  
  PR:   kern/220118
  MFC after:2 weeks

Modified:
  head/sys/powerpc/powerpc/stack_machdep.c

Modified: head/sys/powerpc/powerpc/stack_machdep.c
==
--- head/sys/powerpc/powerpc/stack_machdep.cSun Sep 17 19:54:27 2017
(r323686)
+++ head/sys/powerpc/powerpc/stack_machdep.cSun Sep 17 20:07:20 2017
(r323687)
@@ -110,6 +110,6 @@ stack_save(struct stack *st)
 {
register_t frame;
 
-   frame = (register_t)__builtin_frame_address(1);
+   frame = (register_t)__builtin_frame_address(0);
stack_capture(st, frame);
 }
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323684 - head/sys/powerpc/powerpc

2017-09-17 Thread Justin Hibbits 
Author: jhibbits
Date: Sun Sep 17 19:40:17 2017
New Revision: 323684
URL: https://svnweb.freebsd.org/changeset/base/323684

Log:
  Print the correct bitmask for the running Book-E CPU
  
  All the Book-E world is no longer e500v{1,2}.  e500mc the 64-bit derivatives 
do
  not use the DOZE/NAP bits with MSR[WE], instead using the `wait' instruction 
to
  wait for interrupts, and SoC plane controls (via CCSR) for power management.
  
  MFC after:1 week

Modified:
  head/sys/powerpc/powerpc/cpu.c

Modified: head/sys/powerpc/powerpc/cpu.c
==
--- head/sys/powerpc/powerpc/cpu.c  Sun Sep 17 19:14:38 2017
(r323683)
+++ head/sys/powerpc/powerpc/cpu.c  Sun Sep 17 19:40:17 2017
(r323684)
@@ -530,16 +530,32 @@ cpu_booke_setup(int cpuid, uint16_t vers)
 {
 #ifdef BOOKE_E500
register_t hid0;
+   const char *bitmask;
 
hid0 = mfspr(SPR_HID0);
 
-   /* Programe power-management mode. */
-   hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP);
-   hid0 |= HID0_DOZE;
+   switch (vers) {
+   case FSL_E500mc:
+   bitmask = HID0_E500MC_BITMASK;
+   break;
+   case FSL_E5500:
+   case FSL_E6500:
+   bitmask = HID0_E5500_BITMASK;
+   break;
+   case FSL_E500v1:
+   case FSL_E500v2:
+   /* Only e500v1/v2 support HID0 power management setup. */
 
-   mtspr(SPR_HID0, hid0);
+   /* Programe power-management mode. */
+   hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP);
+   hid0 |= HID0_DOZE;
 
-   printf("cpu%d: HID0 %b\n", cpuid, (int)hid0, HID0_E500_BITMASK);
+   mtspr(SPR_HID0, hid0);
+   default:
+   bitmask = HID0_E500_BITMASK;
+   break;
+   }
+   printf("cpu%d: HID0 %b\n", cpuid, (int)hid0, bitmask);
 #endif
 
if (cpu_idle_hook == NULL)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323683 - in head: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src contrib/file/tests lib/libmagic

2017-09-17 Thread Gordon Tetlow 
Author: gordon
Date: Sun Sep 17 19:14:38 2017
New Revision: 323683
URL: https://svnweb.freebsd.org/changeset/base/323683

Log:
  MFV r323678: file 5.32
  
  Approved by:  emaste (mentor)
  MFC after:2 weeks
  Differential Revision:https://reviews.freebsd.org/D12400

Added:
  head/contrib/file/magic/Magdir/apache
 - copied unchanged from r323678, vendor/file/dist/magic/Magdir/apache
  head/contrib/file/magic/Magdir/bhl
 - copied unchanged from r323678, vendor/file/dist/magic/Magdir/bhl
  head/contrib/file/magic/Magdir/gconv
 - copied unchanged from r323678, vendor/file/dist/magic/Magdir/gconv
  head/contrib/file/magic/Magdir/gpu
 - copied unchanged from r323678, vendor/file/dist/magic/Magdir/gpu
  head/contrib/file/magic/Magdir/webassembly
 - copied unchanged from r323678, vendor/file/dist/magic/Magdir/webassembly
  head/contrib/file/magic/Magdir/yara
 - copied unchanged from r323678, vendor/file/dist/magic/Magdir/yara
  head/contrib/file/tests/hddrawcopytool.result
 - copied unchanged from r323678, 
vendor/file/dist/tests/hddrawcopytool.result
  head/contrib/file/tests/hddrawcopytool.testfile
 - copied unchanged from r323678, 
vendor/file/dist/tests/hddrawcopytool.testfile
Modified:
  head/contrib/file/ChangeLog
  head/contrib/file/aclocal.m4
  head/contrib/file/config.guess
  head/contrib/file/config.sub
  head/contrib/file/configure
  head/contrib/file/configure.ac
  head/contrib/file/doc/file.man
  head/contrib/file/doc/libmagic.man
  head/contrib/file/doc/magic.man
  head/contrib/file/magic/Localstuff
  head/contrib/file/magic/Magdir/adventure
  head/contrib/file/magic/Magdir/amanda
  head/contrib/file/magic/Magdir/amigaos
  head/contrib/file/magic/Magdir/android
  head/contrib/file/magic/Magdir/animation
  head/contrib/file/magic/Magdir/apple
  head/contrib/file/magic/Magdir/archive
  head/contrib/file/magic/Magdir/att3b
  head/contrib/file/magic/Magdir/audio
  head/contrib/file/magic/Magdir/blackberry
  head/contrib/file/magic/Magdir/blender
  head/contrib/file/magic/Magdir/c-lang
  head/contrib/file/magic/Magdir/cad
  head/contrib/file/magic/Magdir/cafebabe
  head/contrib/file/magic/Magdir/clipper
  head/contrib/file/magic/Magdir/coff
  head/contrib/file/magic/Magdir/commands
  head/contrib/file/magic/Magdir/compress
  head/contrib/file/magic/Magdir/console
  head/contrib/file/magic/Magdir/cups
  head/contrib/file/magic/Magdir/database
  head/contrib/file/magic/Magdir/der
  head/contrib/file/magic/Magdir/diff
  head/contrib/file/magic/Magdir/dolby
  head/contrib/file/magic/Magdir/dump
  head/contrib/file/magic/Magdir/dyadic
  head/contrib/file/magic/Magdir/editors
  head/contrib/file/magic/Magdir/filesystems
  head/contrib/file/magic/Magdir/flash
  head/contrib/file/magic/Magdir/fonts
  head/contrib/file/magic/Magdir/fsav
  head/contrib/file/magic/Magdir/games
  head/contrib/file/magic/Magdir/geo
  head/contrib/file/magic/Magdir/gnu
  head/contrib/file/magic/Magdir/gpt
  head/contrib/file/magic/Magdir/gringotts
  head/contrib/file/magic/Magdir/hitachi-sh
  head/contrib/file/magic/Magdir/ibm370
  head/contrib/file/magic/Magdir/ibm6000
  head/contrib/file/magic/Magdir/icc
  head/contrib/file/magic/Magdir/images
  head/contrib/file/magic/Magdir/intel
  head/contrib/file/magic/Magdir/isz
  head/contrib/file/magic/Magdir/jpeg
  head/contrib/file/magic/Magdir/kerberos
  head/contrib/file/magic/Magdir/kml
  head/contrib/file/magic/Magdir/linux
  head/contrib/file/magic/Magdir/lisp
  head/contrib/file/magic/Magdir/m4
  head/contrib/file/magic/Magdir/macintosh
  head/contrib/file/magic/Magdir/make
  head/contrib/file/magic/Magdir/maple
  head/contrib/file/magic/Magdir/marc21
  head/contrib/file/magic/Magdir/mathematica
  head/contrib/file/magic/Magdir/metastore
  head/contrib/file/magic/Magdir/meteorological
  head/contrib/file/magic/Magdir/microfocus
  head/contrib/file/magic/Magdir/mime
  head/contrib/file/magic/Magdir/misctools
  head/contrib/file/magic/Magdir/modem
  head/contrib/file/magic/Magdir/mozilla
  head/contrib/file/magic/Magdir/msdos
  head/contrib/file/magic/Magdir/msvc
  head/contrib/file/magic/Magdir/msx
  head/contrib/file/magic/Magdir/mup
  head/contrib/file/magic/Magdir/nasa
  head/contrib/file/magic/Magdir/netbsd
  head/contrib/file/magic/Magdir/netscape
  head/contrib/file/magic/Magdir/nitpicker
  head/contrib/file/magic/Magdir/os2
  head/contrib/file/magic/Magdir/os9
  head/contrib/file/magic/Magdir/pbf
  head/contrib/file/magic/Magdir/pc88
  head/contrib/file/magic/Magdir/pc98
  head/contrib/file/magic/Magdir/pdf
  head/contrib/file/magic/Magdir/pdp
  head/contrib/file/magic/Magdir/perl
  head/contrib/file/magic/Magdir/pgf
  head/contrib/file/magic/Magdir/pgp
  head/contrib/file/magic/Magdir/printer
  head/contrib/file/magic/Magdir/project
  head/contrib/file/magic/Magdir/psdbms
  head/contrib/file/magic/Magdir/python
  head/contrib/file/magic/Magdir/riff
  head/contrib/file/magic/Magdir/ruby
  head/contrib/file/magic/Magdir/sccs

svn commit: r323681 - in stable/11/sys: kern sys

2017-09-17 Thread Alan Cox 
Author: alc
Date: Sun Sep 17 16:45:50 2017
New Revision: 323681
URL: https://svnweb.freebsd.org/changeset/base/323681

Log:
  MFC r321840,322041
The blist_meta_* routines that process a subtree take arguments 'radix'
and 'skip', which denote, respectively, the largest number of blocks that
can be managed by a subtree of that height, and one less than the number
of nodes in a subtree of that height.  This change removes the 'skip'
argument from those functions because 'skip' can be trivially computed
from 'radius'.  This change also redefines 'skip' so that it denotes the
number of nodes in the subtree, and so changes loop upper bound tests from
'<= skip' to '< skip' to account for the change.
  
The 'skip' field is also removed from the blist struct.
  
The self-test program is changed so that the print command includes the
cursor value in the output.
  
In case readers are misled by expressions that combine multiplication and
division, add parentheses to make the precedence explicit.

Modified:
  stable/11/sys/kern/subr_blist.c
  stable/11/sys/sys/blist.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/subr_blist.c
==
--- stable/11/sys/kern/subr_blist.c Sun Sep 17 16:45:12 2017
(r323680)
+++ stable/11/sys/kern/subr_blist.c Sun Sep 17 16:45:50 2017
(r323681)
@@ -110,6 +110,7 @@ __FBSDID("$FreeBSD$");
 #definebitcount64(x)   __bitcount64((uint64_t)(x))
 #define malloc(a,b,c)  calloc(a, 1)
 #define free(a,b)  free(a)
+#define CTASSERT(expr)
 
 #include 
 
@@ -123,27 +124,52 @@ void panic(const char *ctl, ...);
 static daddr_t blst_leaf_alloc(blmeta_t *scan, daddr_t blk, int count,
daddr_t cursor);
 static daddr_t blst_meta_alloc(blmeta_t *scan, daddr_t blk, daddr_t count,
-   daddr_t radix, daddr_t skip, daddr_t cursor);
+   daddr_t radix, daddr_t cursor);
 static void blst_leaf_free(blmeta_t *scan, daddr_t relblk, int count);
 static void blst_meta_free(blmeta_t *scan, daddr_t freeBlk, daddr_t count,
-   daddr_t radix, daddr_t skip, daddr_t blk);
+   daddr_t radix, daddr_t blk);
 static void blst_copy(blmeta_t *scan, daddr_t blk, daddr_t radix,
-   daddr_t skip, blist_t dest, daddr_t count);
+   blist_t dest, daddr_t count);
 static daddr_t blst_leaf_fill(blmeta_t *scan, daddr_t blk, int count);
 static daddr_t blst_meta_fill(blmeta_t *scan, daddr_t allocBlk, daddr_t count,
-   daddr_t radix, daddr_t skip, daddr_t blk);
-static daddr_t blst_radix_init(blmeta_t *scan, daddr_t radix, daddr_t skip,
-   daddr_t count);
+   daddr_t radix, daddr_t blk);
+static daddr_t blst_radix_init(blmeta_t *scan, daddr_t radix, daddr_t count);
 #ifndef _KERNEL
 static voidblst_radix_print(blmeta_t *scan, daddr_t blk, daddr_t radix,
-   daddr_t skip, int tab);
+   int tab);
 #endif
 
 #ifdef _KERNEL
 static MALLOC_DEFINE(M_SWAP, "SWAP", "Swap space");
 #endif
 
+CTASSERT(BLIST_BMAP_RADIX % BLIST_META_RADIX == 0);
+
 /*
+ * For a subtree that can represent the state of up to 'radix' blocks, the
+ * number of leaf nodes of the subtree is L=radix/BLIST_BMAP_RADIX.  If 'm'
+ * is short for BLIST_META_RADIX, then for a tree of height h with L=m**h
+ * leaf nodes, the total number of tree nodes is 1 + m + m**2 + ... + m**h,
+ * or, equivalently, (m**(h+1)-1)/(m-1).  This quantity is called 'skip'
+ * in the 'meta' functions that process subtrees.  Since integer division
+ * discards remainders, we can express this computation as
+ * skip = (m * m**h) / (m - 1)
+ * skip = (m * (radix / BLIST_BMAP_RADIX)) / (m - 1)
+ * and since m divides BLIST_BMAP_RADIX, we can simplify further to
+ * skip = (radix / (BLIST_BMAP_RADIX / m)) / (m - 1)
+ * skip = radix / ((BLIST_BMAP_RADIX / m) * (m - 1))
+ * so that simple integer division by a constant can safely be used for the
+ * calculation.
+ */
+static inline daddr_t
+radix_to_skip(daddr_t radix)
+{
+
+   return (radix /
+   ((BLIST_BMAP_RADIX / BLIST_META_RADIX) * (BLIST_META_RADIX - 1)));
+}
+
+/*
  * blist_create() - create a blist capable of handling up to the specified
  * number of blocks
  *
@@ -157,18 +183,16 @@ blist_t
 blist_create(daddr_t blocks, int flags)
 {
blist_t bl;
-   daddr_t nodes, radix, skip;
+   daddr_t nodes, radix;
 
/*
-* Calculate radix and skip field used for scanning.
+* Calculate the radix field used for scanning.
 */
radix = BLIST_BMAP_RADIX;
-   skip = 0;
while (radix < blocks) {
radix *= BLIST_META_RADIX;
-   skip = (skip + 1) * BLIST_META_RADIX;
}
-   nodes = 1 + blst_radix_init(NULL, radix, skip, blocks);
+   nodes = 1 +

svn commit: r323680 - releng/10.4/lib/libfetch

2017-09-17 Thread Marius Strobl 
Author: marius
Date: Sun Sep 17 16:45:12 2017
New Revision: 323680
URL: https://svnweb.freebsd.org/changeset/base/323680

Log:
  MF10: r323660, MFC: r322669
  
  In fetch_resolve() if the port number or service name is included
  in the host argument (e. g. "www.freebsd.org:443"), correctly set
  the service pointer accordingly.  Previously, the service pointer
  was set to the separator instead, causing getaddrinfo(3) to fail.
  
  Approved by:  re (kib)

Modified:
  releng/10.4/lib/libfetch/common.c
Directory Properties:
  releng/10.4/   (props changed)

Modified: releng/10.4/lib/libfetch/common.c
==
--- releng/10.4/lib/libfetch/common.c   Sun Sep 17 15:58:16 2017
(r323679)
+++ releng/10.4/lib/libfetch/common.c   Sun Sep 17 16:45:12 2017
(r323680)
@@ -291,7 +291,7 @@ fetch_resolve(const char *addr, int port, int af)
goto syserr;
service = sbuf;
} else if (*sep != '\0') {
-   service = sep;
+   service = sep + 1;
} else {
service = NULL;
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323679 - vendor/file/5.32

2017-09-17 Thread Gordon Tetlow 
Author: gordon
Date: Sun Sep 17 15:58:16 2017
New Revision: 323679
URL: https://svnweb.freebsd.org/changeset/base/323679

Log:
  Tag file 5.32.

Added:
  vendor/file/5.32/
 - copied from r323678, vendor/file/dist/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323678 - in vendor/file/dist: . doc magic magic/Magdir python src tests

2017-09-17 Thread Gordon Tetlow 
Author: gordon
Date: Sun Sep 17 15:57:06 2017
New Revision: 323678
URL: https://svnweb.freebsd.org/changeset/base/323678

Log:
  Vendor import of file 5.32.

Added:
  vendor/file/dist/magic/Magdir/apache   (contents, props changed)
  vendor/file/dist/magic/Magdir/bhl
  vendor/file/dist/magic/Magdir/gconv
  vendor/file/dist/magic/Magdir/gpu
  vendor/file/dist/magic/Magdir/webassembly
  vendor/file/dist/magic/Magdir/yara
  vendor/file/dist/tests/hddrawcopytool.result
  vendor/file/dist/tests/hddrawcopytool.testfile   (contents, props changed)
Modified:
  vendor/file/dist/ChangeLog
  vendor/file/dist/aclocal.m4
  vendor/file/dist/config.guess
  vendor/file/dist/config.sub
  vendor/file/dist/configure
  vendor/file/dist/configure.ac
  vendor/file/dist/doc/file.man
  vendor/file/dist/doc/libmagic.man
  vendor/file/dist/doc/magic.man
  vendor/file/dist/magic/Localstuff
  vendor/file/dist/magic/Magdir/adventure
  vendor/file/dist/magic/Magdir/amanda
  vendor/file/dist/magic/Magdir/amigaos
  vendor/file/dist/magic/Magdir/android
  vendor/file/dist/magic/Magdir/animation
  vendor/file/dist/magic/Magdir/apple
  vendor/file/dist/magic/Magdir/archive
  vendor/file/dist/magic/Magdir/att3b
  vendor/file/dist/magic/Magdir/audio
  vendor/file/dist/magic/Magdir/blackberry
  vendor/file/dist/magic/Magdir/blender
  vendor/file/dist/magic/Magdir/c-lang
  vendor/file/dist/magic/Magdir/cad
  vendor/file/dist/magic/Magdir/cafebabe
  vendor/file/dist/magic/Magdir/clipper
  vendor/file/dist/magic/Magdir/coff
  vendor/file/dist/magic/Magdir/commands
  vendor/file/dist/magic/Magdir/compress
  vendor/file/dist/magic/Magdir/console
  vendor/file/dist/magic/Magdir/cups
  vendor/file/dist/magic/Magdir/database
  vendor/file/dist/magic/Magdir/der
  vendor/file/dist/magic/Magdir/diff
  vendor/file/dist/magic/Magdir/dolby
  vendor/file/dist/magic/Magdir/dump
  vendor/file/dist/magic/Magdir/dyadic
  vendor/file/dist/magic/Magdir/editors
  vendor/file/dist/magic/Magdir/filesystems
  vendor/file/dist/magic/Magdir/flash
  vendor/file/dist/magic/Magdir/fonts
  vendor/file/dist/magic/Magdir/fsav
  vendor/file/dist/magic/Magdir/games
  vendor/file/dist/magic/Magdir/geo
  vendor/file/dist/magic/Magdir/gnu
  vendor/file/dist/magic/Magdir/gpt
  vendor/file/dist/magic/Magdir/gringotts
  vendor/file/dist/magic/Magdir/hitachi-sh
  vendor/file/dist/magic/Magdir/ibm370
  vendor/file/dist/magic/Magdir/ibm6000
  vendor/file/dist/magic/Magdir/icc
  vendor/file/dist/magic/Magdir/images
  vendor/file/dist/magic/Magdir/intel
  vendor/file/dist/magic/Magdir/isz
  vendor/file/dist/magic/Magdir/jpeg
  vendor/file/dist/magic/Magdir/kerberos
  vendor/file/dist/magic/Magdir/kml
  vendor/file/dist/magic/Magdir/linux
  vendor/file/dist/magic/Magdir/lisp
  vendor/file/dist/magic/Magdir/m4
  vendor/file/dist/magic/Magdir/macintosh
  vendor/file/dist/magic/Magdir/make
  vendor/file/dist/magic/Magdir/maple
  vendor/file/dist/magic/Magdir/marc21
  vendor/file/dist/magic/Magdir/mathematica
  vendor/file/dist/magic/Magdir/metastore
  vendor/file/dist/magic/Magdir/meteorological
  vendor/file/dist/magic/Magdir/microfocus
  vendor/file/dist/magic/Magdir/mime
  vendor/file/dist/magic/Magdir/misctools
  vendor/file/dist/magic/Magdir/modem
  vendor/file/dist/magic/Magdir/mozilla
  vendor/file/dist/magic/Magdir/msdos
  vendor/file/dist/magic/Magdir/msvc
  vendor/file/dist/magic/Magdir/msx
  vendor/file/dist/magic/Magdir/mup
  vendor/file/dist/magic/Magdir/nasa
  vendor/file/dist/magic/Magdir/netbsd
  vendor/file/dist/magic/Magdir/netscape
  vendor/file/dist/magic/Magdir/nitpicker
  vendor/file/dist/magic/Magdir/os2
  vendor/file/dist/magic/Magdir/os9
  vendor/file/dist/magic/Magdir/pbf
  vendor/file/dist/magic/Magdir/pc88
  vendor/file/dist/magic/Magdir/pc98
  vendor/file/dist/magic/Magdir/pdf
  vendor/file/dist/magic/Magdir/pdp
  vendor/file/dist/magic/Magdir/perl
  vendor/file/dist/magic/Magdir/pgf
  vendor/file/dist/magic/Magdir/pgp
  vendor/file/dist/magic/Magdir/printer
  vendor/file/dist/magic/Magdir/project
  vendor/file/dist/magic/Magdir/psdbms
  vendor/file/dist/magic/Magdir/python
  vendor/file/dist/magic/Magdir/riff
  vendor/file/dist/magic/Magdir/ruby
  vendor/file/dist/magic/Magdir/sccs
  vendor/file/dist/magic/Magdir/scientific
  vendor/file/dist/magic/Magdir/sendmail
  vendor/file/dist/magic/Magdir/sequent
  vendor/file/dist/magic/Magdir/sgml
  vendor/file/dist/magic/Magdir/sharc
  vendor/file/dist/magic/Magdir/sketch
  vendor/file/dist/magic/Magdir/sql
  vendor/file/dist/magic/Magdir/ssl
  vendor/file/dist/magic/Magdir/sysex
  vendor/file/dist/magic/Magdir/terminfo
  vendor/file/dist/magic/Magdir/vms
  vendor/file/dist/magic/Magdir/vmware
  vendor/file/dist/magic/Magdir/vorbis
  vendor/file/dist/magic/Magdir/windows
  vendor/file/dist/magic/Magdir/xenix
  vendor/file/dist/magic/Magdir/xilinx
  vendor/file/dist/magic/Magdir/xwindows
  vendor/file/dist/magic/Makefile.am
  vendor/file/dist/magic/Makefile.in
  vendor/file/dist/python/magic.py

svn commit: r323677 - in stable/11/sys: kern sparc64/sparc64 vm

2017-09-17 Thread Mark Johnston 
Author: markj
Date: Sun Sep 17 15:45:39 2017
New Revision: 323677
URL: https://svnweb.freebsd.org/changeset/base/323677

Log:
  MFC r322405, r322406:
  Modify vm_page_grab_pages() to handle VM_ALLOC_NOWAIT, use it in
  sendfile_swapin().

Modified:
  stable/11/sys/kern/kern_sendfile.c
  stable/11/sys/kern/vfs_bio.c
  stable/11/sys/sparc64/sparc64/pmap.c
  stable/11/sys/vm/vm_glue.c
  stable/11/sys/vm/vm_page.c
  stable/11/sys/vm/vm_page.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_sendfile.c
==
--- stable/11/sys/kern/kern_sendfile.c  Sun Sep 17 15:40:12 2017
(r323676)
+++ stable/11/sys/kern/kern_sendfile.c  Sun Sep 17 15:45:39 2017
(r323677)
@@ -308,7 +308,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, o
 int npages, int rhpages, int flags)
 {
vm_page_t *pa = sfio->pa;
-   int nios;
+   int grabbed, nios;
 
nios = 0;
flags = (flags & SF_NODISKIO) ? VM_ALLOC_NOWAIT : 0;
@@ -318,14 +318,14 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, o
 * only required pages.  Readahead pages are dealt with later.
 */
VM_OBJECT_WLOCK(obj);
-   for (int i = 0; i < npages; i++) {
-   pa[i] = vm_page_grab(obj, OFF_TO_IDX(vmoff(i, off)),
-   VM_ALLOC_WIRED | VM_ALLOC_NORMAL | flags);
-   if (pa[i] == NULL) {
-   npages = i;
-   rhpages = 0;
-   break;
-   }
+
+   grabbed = vm_page_grab_pages(obj, OFF_TO_IDX(off),
+   VM_ALLOC_NORMAL | VM_ALLOC_WIRED | flags, pa, npages);
+   if (grabbed < npages) {
+   for (int i = grabbed; i < npages; i++)
+   pa[i] = NULL;
+   npages = grabbed;
+   rhpages = 0;
}
 
for (int i = 0; i < npages;) {

Modified: stable/11/sys/kern/vfs_bio.c
==
--- stable/11/sys/kern/vfs_bio.cSun Sep 17 15:40:12 2017
(r323676)
+++ stable/11/sys/kern/vfs_bio.cSun Sep 17 15:45:39 2017
(r323677)
@@ -2756,7 +2756,7 @@ vfs_vmio_extend(struct buf *bp, int desiredpages, int 
 * deadlocks once allocbuf() is called after
 * pages are vfs_busy_pages().
 */
-   vm_page_grab_pages(obj,
+   (void)vm_page_grab_pages(obj,
OFF_TO_IDX(bp->b_offset) + bp->b_npages,
VM_ALLOC_SYSTEM | VM_ALLOC_IGN_SBUSY |
VM_ALLOC_NOBUSY | VM_ALLOC_WIRED,

Modified: stable/11/sys/sparc64/sparc64/pmap.c
==
--- stable/11/sys/sparc64/sparc64/pmap.cSun Sep 17 15:40:12 2017
(r323676)
+++ stable/11/sys/sparc64/sparc64/pmap.cSun Sep 17 15:45:39 2017
(r323677)
@@ -1252,7 +1252,7 @@ pmap_pinit(pmap_t pm)
CPU_ZERO(>pm_active);
 
VM_OBJECT_WLOCK(pm->pm_tsb_obj);
-   vm_page_grab_pages(pm->pm_tsb_obj, 0, VM_ALLOC_NORMAL |
+   (void)vm_page_grab_pages(pm->pm_tsb_obj, 0, VM_ALLOC_NORMAL |
VM_ALLOC_NOBUSY | VM_ALLOC_WIRED | VM_ALLOC_ZERO, ma, TSB_PAGES);
VM_OBJECT_WUNLOCK(pm->pm_tsb_obj);
for (i = 0; i < TSB_PAGES; i++)

Modified: stable/11/sys/vm/vm_glue.c
==
--- stable/11/sys/vm/vm_glue.c  Sun Sep 17 15:40:12 2017(r323676)
+++ stable/11/sys/vm/vm_glue.c  Sun Sep 17 15:45:39 2017(r323677)
@@ -391,7 +391,7 @@ vm_thread_new(struct thread *td, int pages)
 * page of stack.
 */
VM_OBJECT_WLOCK(ksobj);
-   vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY |
+   (void)vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY |
VM_ALLOC_WIRED, ma, pages);
for (i = 0; i < pages; i++)
ma[i]->valid = VM_PAGE_BITS_ALL;
@@ -568,7 +568,7 @@ vm_thread_swapin(struct thread *td)
pages = td->td_kstack_pages;
ksobj = td->td_kstack_obj;
VM_OBJECT_WLOCK(ksobj);
-   vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_WIRED, ma,
+   (void)vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_WIRED, ma,
pages);
for (int i = 0; i < pages;) {
int j, a, count, rv;

Modified: stable/11/sys/vm/vm_page.c
==
--- stable/11/sys/vm/vm_page.c  Sun Sep 17 15:40:12 2017(r323676)
+++ stable/11/sys/vm/vm_page.c  Sun Sep 17 15:45:39 2017(r323677)
@@ -3147,13 +3147,15 @@ retrylookup:
  * optional allocation flags:
  * VM_ALLOC_IGN_SBUSY  do not sleep on soft busy pages
  * VM_ALLOC_NOBUSY do not exclusive busy the page
+ * VM_ALLOC_NOWAIT

Re: svn commit: r323290 - head/sys/vm

2017-09-17 Thread Mark Johnston 
On Sun, Sep 17, 2017 at 02:56:44PM +0200, Andreas Tobler wrote:
> On 17.09.17 00:28, Mark Johnston wrote:
> > Thanks. Could you please try applying the patch at the end of this email
> > and see if that fixes the issue? I have not yet tried to compile it,
> > sorry.
> 
> Excellent! I can confirm the two platforms, 32- and 64-bit powerpc, are 
> back to life. Both are running since a few hours and perfom ports 
> rebuild now.
> 
> Thank you very much for your prompt response and help.

Thanks Andreas, committed as r323676.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323676 - head/sys/powerpc/aim

2017-09-17 Thread Mark Johnston 
Author: markj
Date: Sun Sep 17 15:40:12 2017
New Revision: 323676
URL: https://svnweb.freebsd.org/changeset/base/323676

Log:
  Implement mmu_page_init for AIM platforms.
  
  As of r323290 we cannot rely on the vm_page array being
  zero-initialized.
  
  Reported and tested by:   andreast
  MFC after:1 week

Modified:
  head/sys/powerpc/aim/mmu_oea.c
  head/sys/powerpc/aim/mmu_oea64.c

Modified: head/sys/powerpc/aim/mmu_oea.c
==
--- head/sys/powerpc/aim/mmu_oea.c  Sun Sep 17 14:03:54 2017
(r323675)
+++ head/sys/powerpc/aim/mmu_oea.c  Sun Sep 17 15:40:12 2017
(r323676)
@@ -287,6 +287,7 @@ boolean_t moea_is_referenced(mmu_t, vm_page_t);
 int moea_ts_referenced(mmu_t, vm_page_t);
 vm_offset_t moea_map(mmu_t, vm_offset_t *, vm_paddr_t, vm_paddr_t, int);
 boolean_t moea_page_exists_quick(mmu_t, pmap_t, vm_page_t);
+void moea_page_init(mmu_t, vm_page_t);
 int moea_page_wired_mappings(mmu_t, vm_page_t);
 void moea_pinit(mmu_t, pmap_t);
 void moea_pinit0(mmu_t, pmap_t);
@@ -334,6 +335,7 @@ static mmu_method_t moea_methods[] = {
MMUMETHOD(mmu_ts_referenced,moea_ts_referenced),
MMUMETHOD(mmu_map,  moea_map),
MMUMETHOD(mmu_page_exists_quick,moea_page_exists_quick),
+   MMUMETHOD(mmu_page_init,moea_page_init),
MMUMETHOD(mmu_page_wired_mappings,moea_page_wired_mappings),
MMUMETHOD(mmu_pinit,moea_pinit),
MMUMETHOD(mmu_pinit0,   moea_pinit0),
@@ -1592,6 +1594,15 @@ moea_page_exists_quick(mmu_t mmu, pmap_t pmap, vm_page
}
rw_wunlock(_global_lock);
return (rv);
+}
+
+void
+moea_page_init(mmu_t mmu __unused, vm_page_t m)
+{
+
+   m->md.mdpg_attrs = 0;
+   m->md.mdpg_cache_attrs = VM_MEMATTR_DEFAULT;
+   LIST_INIT(>md.mdpg_pvoh);
 }
 
 /*

Modified: head/sys/powerpc/aim/mmu_oea64.c
==
--- head/sys/powerpc/aim/mmu_oea64.cSun Sep 17 14:03:54 2017
(r323675)
+++ head/sys/powerpc/aim/mmu_oea64.cSun Sep 17 15:40:12 2017
(r323676)
@@ -251,6 +251,7 @@ boolean_t moea64_is_referenced(mmu_t, vm_page_t);
 int moea64_ts_referenced(mmu_t, vm_page_t);
 vm_offset_t moea64_map(mmu_t, vm_offset_t *, vm_paddr_t, vm_paddr_t, int);
 boolean_t moea64_page_exists_quick(mmu_t, pmap_t, vm_page_t);
+void moea64_page_init(mmu_t, vm_page_t);
 int moea64_page_wired_mappings(mmu_t, vm_page_t);
 void moea64_pinit(mmu_t, pmap_t);
 void moea64_pinit0(mmu_t, pmap_t);
@@ -298,6 +299,7 @@ static mmu_method_t moea64_methods[] = {
MMUMETHOD(mmu_ts_referenced,moea64_ts_referenced),
MMUMETHOD(mmu_map,  moea64_map),
MMUMETHOD(mmu_page_exists_quick,moea64_page_exists_quick),
+   MMUMETHOD(mmu_page_init,moea64_page_init),
MMUMETHOD(mmu_page_wired_mappings,moea64_page_wired_mappings),
MMUMETHOD(mmu_pinit,moea64_pinit),
MMUMETHOD(mmu_pinit0,   moea64_pinit0),
@@ -1896,6 +1898,15 @@ moea64_page_exists_quick(mmu_t mmu, pmap_t pmap, vm_pa
}
PV_PAGE_UNLOCK(m);
return (rv);
+}
+
+void
+moea64_page_init(mmu_t mmu __unused, vm_page_t m)
+{
+
+   m->md.mdpg_attrs = 0;
+   m->md.mdpg_cache_attrs = VM_MEMATTR_DEFAULT;
+   LIST_INIT(>md.mdpg_pvoh);
 }
 
 /*
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323675 - head/lib/libsysdecode

2017-09-17 Thread Ed Maste 
Author: emaste
Date: Sun Sep 17 14:03:54 2017
New Revision: 323675
URL: https://svnweb.freebsd.org/changeset/base/323675

Log:
  libsysdecode: report invalid cap_rights_t
  
  Previously we'd have an assertion failure in cap_rights_is_set if
  sysdecode_cap_rights is called with an invalid cap_rights_t, so test for
  validity first.
  
  PR:   58
  Reviewed by:  cem
  MFC after:1 month
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D12391

Modified:
  head/lib/libsysdecode/flags.c

Modified: head/lib/libsysdecode/flags.c
==
--- head/lib/libsysdecode/flags.c   Sun Sep 17 10:47:21 2017
(r323674)
+++ head/lib/libsysdecode/flags.c   Sun Sep 17 14:03:54 2017
(r323675)
@@ -1028,8 +1028,15 @@ void
 sysdecode_cap_rights(FILE *fp, cap_rights_t *rightsp)
 {
struct name_table *t;
+   int i;
bool comma;
 
+   for (i = 0; i < CAPARSIZE(rightsp); i++) {
+   if (CAPIDXBIT(rightsp->cr_rights[i]) != 1 << i) {
+   fprintf(fp, "invalid cap_rights_t");
+   return;
+   }
+   }
comma = false;
for (t = caprights; t->str != NULL; t++) {
if (cap_rights_is_set(rightsp, t->val)) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r323290 - head/sys/vm

2017-09-17 Thread Andreas Tobler 

On 17.09.17 00:28, Mark Johnston wrote:

On Sat, Sep 16, 2017 at 09:01:56PM +0200, Andreas Tobler wrote:

On 14.09.17 22:32, Mark Johnston wrote:

On Thu, Sep 14, 2017 at 09:51:17PM +0200, Andreas Tobler wrote:

Hi Mark,

On 07.09.17 23:43, Mark Johnston wrote:

Author: markj
Date: Thu Sep  7 21:43:39 2017
New Revision: 323290
URL: https://svnweb.freebsd.org/changeset/base/323290

Log:
 Speed up vm_page_array initialization.
 
 We currently initialize the vm_page array in three passes: one to zero

 the array, one to initialize the "order" field of each page (necessary
 when inserting them into the vm_phys buddy allocator one-by-one), and
 one to initialize the remaining non-zero fields and individually insert
 each page into the allocator.
 
 Merge the three passes into one following a suggestion from alc:

 initialize vm_page fields in a single pass, and use vm_phys_free_contig()
 to efficiently insert physical memory segments into the buddy allocator.
 This reduces the initialization time to a third or a quarter of what it
 was before on most systems that I tested.
 
 Reviewed by:	alc, kib

 MFC after: 3 weeks
 Differential Revision: https://reviews.freebsd.org/D12248

Modified:
 head/sys/vm/vm_page.c
 head/sys/vm/vm_phys.c
 head/sys/vm/vm_phys.h


I just found out that this commit breaks booting my powerpc64 Quad G5.
It hangs, pressing ctrl-t shows: cmd: sh [*vm active pagequeue].

Sometimes it hangs earlier when the kbd is not there yet (usb), then I
can't get the process/task where it hangs.

Note, this kernel is compiled with the default gcc (4.2.1-FreeBSD)

Any ideas how to find out what's wrong?


Are you able to break into DDB when the hang occurs? If so, the output
of "show page" would be helpful.


Unfortunately not from the beginning. The keyboard is usb and it gets
installed late. Once it survives the loading of the kbd and co, I can
enter into ddb. But it is a trial and error. So far I didn't succeed to
come that far.


Are you running with INVARIANTS configured? If not, please try that.


The above was w/o INVARIANTS. With invariants the kernel panics
immediately after boot, see pic.


Thanks. Could you please try applying the patch at the end of this email
and see if that fixes the issue? I have not yet tried to compile it,
sorry.


Excellent! I can confirm the two platforms, 32- and 64-bit powerpc, are 
back to life. Both are running since a few hours and perfom ports 
rebuild now.


Thank you very much for your prompt response and help.

Andreas
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323674 - stable/11/sys/dev/ichwd

2017-09-17 Thread Konstantin Belousov 
Author: kib
Date: Sun Sep 17 10:47:21 2017
New Revision: 323674
URL: https://svnweb.freebsd.org/changeset/base/323674

Log:
  MFC r323387, r323388:
  Add definitions of (new) bits for TCO registers from the
  Lewisburg/Sunrise Point documentation.

Modified:
  stable/11/sys/dev/ichwd/ichwd.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ichwd/ichwd.h
==
--- stable/11/sys/dev/ichwd/ichwd.h Sun Sep 17 10:45:08 2017
(r323673)
+++ stable/11/sys/dev/ichwd/ichwd.h Sun Sep 17 10:47:21 2017
(r323674)
@@ -309,6 +309,8 @@ struct ichwd_softc {
 #defineTCO2_CNT0x08 /* TCO Control 2 */
 #defineTCO_MESSAGE10x0c /* TCO Message 1 */
 #defineTCO_MESSAGE20x0d /* TCO Message 2 */
+#defineTCO_WDSTATUS0x0e /* TCO Watchdog status */
+#defineTCO_TMR 0x12 /* TCP Reload value */
 
 /* bit definitions for SMI_EN and SMI_STS */
 #defineSMI_TCO_EN  0x2000
@@ -317,23 +319,45 @@ struct ichwd_softc {
 
 /* timer value mask for TCO_RLD and TCO_TMR */
 #defineTCO_TIMER_MASK  0x1f
+#defineTCO_TIMER_MASK2 0x2f
 
 /* status bits for TCO1_STS */
-#defineTCO_NEWCENTURY  0x80 /* set for RTC year roll over (99 
to 00) */
-#defineTCO_TIMEOUT 0x08 /* timed out */
-#defineTCO_INT_STS 0x04 /* data out (DO NOT USE) */
-#defineTCO_SMI_STS 0x02 /* data in (DO NOT USE) */
+#defineTCO_SLVSEL  0x2000  /* TCO Slave Select Soft Strap 
*/
+#defineTCO_CPUSERR_STS 0x1000
+#defineTCO_CPUSMI_STS  0x0400
+#defineTCO_CPUSCI_STS  0x0200
+#defineTCO_BIOSWR_STS  0x0100
+#defineTCO_NEWCENTURY  0x0080  /* set for RTC year roll over
+  (99 to 00) */
+#defineTCO_TIMEOUT 0x0008  /* timed out */
+#defineTCO_INT_STS 0x0004  /* data out (DO NOT USE) */
+#defineTCO_SMI_STS 0x0002  /* data in (DO NOT USE) */
+#defineTCO_NMI2SMI_STS 0x0001
 
 /* status bits for TCO2_STS */
-#defineTCO_BOOT_STS0x04 /* failed to come out of reset */
-#defineTCO_SECOND_TO_STS   0x02 /* ran down twice */
+#defineTCO_SMLINK_SLAVE_SMI0x0010
+#defineTCO_BOOT_STS0x0004  /* failed to come out of reset 
*/
+#defineTCO_SECOND_TO_STS   0x0002  /* ran down twice */
+#defineTCO_INTRD_DET   0x0001
 
 /* control bits for TCO1_CNT */
+#defineTCO_LOCK0x1000  /* SMI_BASE.TCO_EN 
locked */
 #defineTCO_TMR_HALT0x0800  /* clear to enable WDT 
*/
 #defineTCO_NMI2SMI_EN  0x0200  /* convert NMIs to SMIs 
*/
 #defineTCO_CNT_PRESERVETCO_NMI2SMI_EN  /* preserve these bits 
*/
 #defineTCO_NMI_NOW 0x0100  /* trigger an NMI */
 
+/* control bits for TCO2_CNT */
+#defineTCO_OS_POLICY   0x0030  /* mask */
+#defineTCO_OS_POLICY_BOOT  0x
+#defineTCO_OS_POLICY_SHUTD 0x0010
+#defineTCO_OS_POLICY_NOLOAD0x0020
+#defineTCO_SMB_ALERT_DISABLE   0x0008
+#defineTCO_INTRD_SEL   0x0003  /* mask */
+#defineTCO_INTRD_SEL_SILENT0x
+#defineTCO_INTRD_SEL_INTR  0x0001
+#defineTCO_INTRD_SEL_SMI   0x0002
+
 /*
  * Masks for the TCO timer value field in TCO_RLD.
  * If the datasheets are to be believed, the minimum value actually varies
@@ -345,9 +369,15 @@ struct ichwd_softc {
 #defineTCO_RLD1_TMR_MAX0x003f
 #defineTCO_RLD2_TMR_MAX0x03ff
 
-/* approximate length in nanoseconds of one WDT tick (about 0.6 sec) for TCO 
v1/v2 */
+/*
+ * Approximate length in nanoseconds of one WDT tick (about 0.6 sec)
+ * for TCO v1/v2/v4
+ */
 #defineICHWD_TICK  6
-/* approximate length in nanoseconds of one WDT tick (about 1.0 sec) for TCO 
v3 */
+/*
+ * Approximate length in nanoseconds of one WDT tick (about 1.0 sec)
+ * for TCO v3
+ */
 #defineICHWD_TCO_V3_TICK   10
 
 #endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323673 - stable/11/sys/dev/ichwd

2017-09-17 Thread Konstantin Belousov 
Author: kib
Date: Sun Sep 17 10:45:08 2017
New Revision: 323673
URL: https://svnweb.freebsd.org/changeset/base/323673

Log:
  MFC r323386:
  Style: tab after #define.

Modified:
  stable/11/sys/dev/ichwd/ichwd.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ichwd/ichwd.h
==
--- stable/11/sys/dev/ichwd/ichwd.h Sun Sep 17 10:43:27 2017
(r323672)
+++ stable/11/sys/dev/ichwd/ichwd.h Sun Sep 17 10:45:08 2017
(r323673)
@@ -29,7 +29,7 @@
  */
 
 #ifndef _ICHWD_H_
-#define _ICHWD_H_
+#define_ICHWD_H_
 
 struct ichwd_device {
uint16_t device;
@@ -60,279 +60,279 @@ struct ichwd_softc {
eventhandler_tag ev_tag;
 };
 
-#define VENDORID_INTEL 0x8086
-#define DEVICEID_BAYTRAIL  0x0f1c
-#define DEVICEID_CPT0  0x1c40
-#define DEVICEID_CPT1  0x1c41
-#define DEVICEID_CPT2  0x1c42
-#define DEVICEID_CPT3  0x1c43
-#define DEVICEID_CPT4  0x1c44
-#define DEVICEID_CPT5  0x1c45
-#define DEVICEID_CPT6  0x1c46
-#define DEVICEID_CPT7  0x1c47
-#define DEVICEID_CPT8  0x1c48
-#define DEVICEID_CPT9  0x1c49
-#define DEVICEID_CPT10 0x1c4a
-#define DEVICEID_CPT11 0x1c4b
-#define DEVICEID_CPT12 0x1c4c
-#define DEVICEID_CPT13 0x1c4d
-#define DEVICEID_CPT14 0x1c4e
-#define DEVICEID_CPT15 0x1c4f
-#define DEVICEID_CPT16 0x1c50
-#define DEVICEID_CPT17 0x1c51
-#define DEVICEID_CPT18 0x1c52
-#define DEVICEID_CPT19 0x1c53
-#define DEVICEID_CPT20 0x1c54
-#define DEVICEID_CPT21 0x1c55
-#define DEVICEID_CPT22 0x1c56
-#define DEVICEID_CPT23 0x1c57
-#define DEVICEID_CPT24 0x1c58
-#define DEVICEID_CPT25 0x1c59
-#define DEVICEID_CPT26 0x1c5a
-#define DEVICEID_CPT27 0x1c5b
-#define DEVICEID_CPT28 0x1c5c
-#define DEVICEID_CPT29 0x1c5d
-#define DEVICEID_CPT30 0x1c5e
-#define DEVICEID_CPT31 0x1c5f
-#define DEVICEID_PATSBURG_LPC1 0x1d40
-#define DEVICEID_PATSBURG_LPC2 0x1d41
-#define DEVICEID_PPT0  0x1e40
-#define DEVICEID_PPT1  0x1e41
-#define DEVICEID_PPT2  0x1e42
-#define DEVICEID_PPT3  0x1e43
-#define DEVICEID_PPT4  0x1e44
-#define DEVICEID_PPT5  0x1e45
-#define DEVICEID_PPT6  0x1e46
-#define DEVICEID_PPT7  0x1e47
-#define DEVICEID_PPT8  0x1e48
-#define DEVICEID_PPT9  0x1e49
-#define DEVICEID_PPT10 0x1e4a
-#define DEVICEID_PPT11 0x1e4b
-#define DEVICEID_PPT12 0x1e4c
-#define DEVICEID_PPT13 0x1e4d
-#define DEVICEID_PPT14 0x1e4e
-#define DEVICEID_PPT15 0x1e4f
-#define DEVICEID_PPT16 0x1e50
-#define DEVICEID_PPT17 0x1e51
-#define DEVICEID_PPT18 0x1e52
-#define DEVICEID_PPT19 0x1e53
-#define DEVICEID_PPT20 0x1e54
-#define DEVICEID_PPT21 0x1e55
-#define DEVICEID_PPT22 0x1e56
-#define DEVICEID_PPT23 0x1e57
-#define DEVICEID_PPT24 0x1e58
-#define DEVICEID_PPT25 0x1e59
-#define DEVICEID_PPT26 0x1e5a
-#define DEVICEID_PPT27 0x1e5b
-#define DEVICEID_PPT28 0x1e5c
-#define DEVICEID_PPT29 0x1e5d
-#define DEVICEID_PPT30 0x1e5e
-#define DEVICEID_PPT31 0x1e5f
-#define DEVICEID_AVN0  0x1f38
-#define DEVICEID_AVN1  0x1f39
-#define DEVICEID_AVN2  0x1f3a
-#define DEVICEID_AVN3  0x1f3b
-#define DEVICEID_BRASWELL  0x229c
-#define DEVICEID_DH89XXCC_LPC  0x2310
-#define DEVICEID_COLETOCRK_LPC 0x2390
-#define DEVICEID_82801AA   0x2410
-#define DEVICEID_82801AB   0x2420
-#define DEVICEID_82801BA   0x2440
-#define DEVICEID_82801BAM  0x244c
-#define DEVICEID_82801CA   0x2480
-#define DEVICEID_82801CAM  0x248c
-#define DEVICEID_82801DB   0x24c0
-#define DEVICEID_82801DBM  0x24cc
-#define DEVICEID_82801E0x2450
-#define DEVICEID_82801EB   0x24dc
-#define DEVICEID_82801EBR  0x24d0
-#define DEVICEID_6300ESB   0x25a1
-#define DEVICEID_82801FBR  0x2640
-#define DEVICEID_ICH6M 0x2641
-#define DEVICEID_ICH6W 0x2642
-#define DEVICEID_63XXESB   0x2670
-#define DEVICEID_ICH7  0x27b8
-#define DEVICEID_ICH7DH0x27b0
-#define DEVICEID_ICH7M 0x27b9
-#define DEVICEID_NM10  0x27bc
-#define DEVICEID_ICH7MDH   0x27bd
-#define DEVICEID_ICH8  0x2810
-#define DEVICEID_ICH8DH0x2812
-#define DEVICEID_ICH8DO0x2814
-#define DEVICEID_ICH8M 0x2815
-#define DEVICEID_ICH8ME0x2811
-#define DEVICEID_ICH9  0x2918
-#define DEVICEID_ICH9DH0x2912
-#define DEVICEID_ICH9DO0x2914
-#define DEVICEID_ICH9M 0x2919
-#define DEVICEID_ICH9ME0x2917

svn commit: r323672 - stable/11/sys/dev/ichwd

2017-09-17 Thread Konstantin Belousov 
Author: kib
Date: Sun Sep 17 10:43:27 2017
New Revision: 323672
URL: https://svnweb.freebsd.org/changeset/base/323672

Log:
  MFC r314477 (by imp):
  Fix TCO v3 tick convert.

Modified:
  stable/11/sys/dev/ichwd/ichwd.c
  stable/11/sys/dev/ichwd/ichwd.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ichwd/ichwd.c
==
--- stable/11/sys/dev/ichwd/ichwd.c Sun Sep 17 10:28:45 2017
(r323671)
+++ stable/11/sys/dev/ichwd/ichwd.c Sun Sep 17 10:43:27 2017
(r323672)
@@ -512,7 +512,13 @@ ichwd_event(void *arg, unsigned int cmd, int *error)
 
/* convert from power-of-two-ns to WDT ticks */
cmd &= WD_INTERVAL;
-   timeout = ((uint64_t)1 << cmd) / ICHWD_TICK;
+   
+   if (sc->tco_version == 3) {
+   timeout = ((uint64_t)1 << cmd) / ICHWD_TCO_V3_TICK;
+   } else {
+   timeout = ((uint64_t)1 << cmd) / ICHWD_TICK;
+   }
+   
if (cmd) {
if (!sc->active)
ichwd_tmr_enable(sc);

Modified: stable/11/sys/dev/ichwd/ichwd.h
==
--- stable/11/sys/dev/ichwd/ichwd.h Sun Sep 17 10:28:45 2017
(r323671)
+++ stable/11/sys/dev/ichwd/ichwd.h Sun Sep 17 10:43:27 2017
(r323672)
@@ -345,7 +345,9 @@ struct ichwd_softc {
 #define TCO_RLD1_TMR_MAX   0x003f
 #define TCO_RLD2_TMR_MAX   0x03ff
 
-/* approximate length in nanoseconds of one WDT tick (about 0.6 sec) */
+/* approximate length in nanoseconds of one WDT tick (about 0.6 sec) for TCO 
v1/v2 */
 #define ICHWD_TICK 6
+/* approximate length in nanoseconds of one WDT tick (about 1.0 sec) for TCO 
v3 */
+#define ICHWD_TCO_V3_TICK  10
 
 #endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323671 - in head: . sbin/geom/class/eli

2017-09-17 Thread Mariusz Zaborski 
Author: oshogbo
Date: Sun Sep 17 10:28:45 2017
New Revision: 323671
URL: https://svnweb.freebsd.org/changeset/base/323671

Log:
  Fix language used in the r322923.
  
  Pointed out by: wblock@
  MFC after:  1 week
  X-MFC-with: r322923

Modified:
  head/UPDATING
  head/sbin/geom/class/eli/geli.8

Modified: head/UPDATING
==
--- head/UPDATING   Sun Sep 17 09:27:27 2017(r323670)
+++ head/UPDATING   Sun Sep 17 10:28:45 2017(r323671)
@@ -66,8 +66,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
soft-float everything else should be affected.
 
 20170826:
-   During boot the geli passphrase will be hidden. To restore previous
-   behavior see geli(8) configuration options.
+   The geli password typed at boot is now hidden.  To restore the previous
+   behavior, see geli(8) for configuration options.
 
 20170825:
Move PMTUD blackhole counters to TCPSTATS and remove them from bare

Modified: head/sbin/geom/class/eli/geli.8
==
--- head/sbin/geom/class/eli/geli.8 Sun Sep 17 09:27:27 2017
(r323670)
+++ head/sbin/geom/class/eli/geli.8 Sun Sep 17 10:28:45 2017
(r323671)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 26, 2017
+.Dd September 17, 2017
 .Dt GELI 8
 .Os
 .Sh NAME
@@ -280,8 +280,10 @@ To inhibit backups, you can use
 as the
 .Ar backupfile .
 .It Fl d
-While booting from this encrypted root filesystem enable visibility of
-passphrase length.
+When entering the passphrase to boot from this encrypted root filesystem, echo
+.Ql *
+characters.
+This makes the length of the passphrase visible.
 .It Fl e Ar ealgo
 Encryption algorithm to use.
 Currently supported algorithms are:
@@ -494,11 +496,14 @@ subcommand.
 .It Fl B
 Remove the BOOT flag from the given providers.
 .It Fl d
-While booting from this encrypted root filesystem enable visibility of
-passphrase length.
+When entering the passphrase to boot from this encrypted root filesystem, echo
+.Ql *
+characters.
+This makes the length of the passphrase visible.
 .It Fl D
-While booting from this encrypted root filesystem disable visibility of
-passphrase length.
+Disable echoing of any characters when a passphrase is entered to boot from 
this
+encrypted root filesystem.
+This hides the passphrase length.
 .It Fl g
 Enable booting from this encrypted root filesystem.
 The boot loader prompts for the passphrase and loads
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323670 - head/sys/netinet

2017-09-17 Thread Michael Tuexen 
Author: tuexen
Date: Sun Sep 17 09:27:27 2017
New Revision: 323670
URL: https://svnweb.freebsd.org/changeset/base/323670

Log:
  Fix an accounting bug and use sctp_timer_start to start a timer.
  
  MFC after:1 week

Modified:
  head/sys/netinet/sctp_indata.c

Modified: head/sys/netinet/sctp_indata.c
==
--- head/sys/netinet/sctp_indata.c  Sun Sep 17 06:35:33 2017
(r323669)
+++ head/sys/netinet/sctp_indata.c  Sun Sep 17 09:27:27 2017
(r323670)
@@ -1594,9 +1594,17 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struc
next_fsn, control->fsn_included);
TAILQ_REMOVE(>reasm, at, sctp_next);
lenadded = sctp_add_chk_to_control(control, 
strm, stcb, asoc, at, SCTP_READ_LOCK_NOT_HELD);
-   asoc->size_on_all_streams += lenadded;
if (control->on_read_q) {
do_wakeup = 1;
+   } else {
+   /*
+* We only add to the
+* size-on-all-streams if its not on
+* the read q. The read q flag will
+* cause a sballoc so its accounted
+* for there.
+*/
+   asoc->size_on_all_streams += lenadded;
}
next_fsn++;
if (control->end_added && 
control->pdapi_started) {
@@ -4229,8 +4237,7 @@ again:
}
if (net->flight_size) {
j++;
-   (void)SCTP_OS_TIMER_START(>rxt_timer.timer, 
to_ticks,
-   sctp_timeout_handler, >rxt_timer);
+   sctp_timer_start(SCTP_TIMER_TYPE_SEND, stcb->sctp_ep, 
stcb, net);
if (net->window_probe) {
net->window_probe = 0;
}
@@ -4242,8 +4249,7 @@ again:
 */
net->window_probe = 0;
if 
(!SCTP_OS_TIMER_PENDING(>rxt_timer.timer)) {
-   
SCTP_OS_TIMER_START(>rxt_timer.timer, to_ticks,
-   sctp_timeout_handler, 
>rxt_timer);
+   sctp_timer_start(SCTP_TIMER_TYPE_SEND, 
stcb->sctp_ep, stcb, net);
}
} else if 
(SCTP_OS_TIMER_PENDING(>rxt_timer.timer)) {
sctp_timer_stop(SCTP_TIMER_TYPE_SEND, 
stcb->sctp_ep,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323669 - stable/10/share/misc

2017-09-17 Thread Baptiste Daroussin 
Author: bapt
Date: Sun Sep 17 06:35:33 2017
New Revision: 323669
URL: https://svnweb.freebsd.org/changeset/base/323669

Log:
  MFC r323160:
  
  Update pci_vendors to 2017-09-01

Modified:
  stable/10/share/misc/pci_vendors
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/misc/pci_vendors
==
--- stable/10/share/misc/pci_vendorsSun Sep 17 06:34:51 2017
(r323668)
+++ stable/10/share/misc/pci_vendorsSun Sep 17 06:35:33 2017
(r323669)
@@ -3,8 +3,8 @@
 #
 #  List of PCI ID's
 #
-#  Version: 2017.07.27
-#  Date:2017-07-27 03:15:02
+#  Version: 2017.09.01
+#  Date:2017-09-01 03:15:02
 #
 #  Maintained by Albert Pool, Martin Mares, and other volunteers from
 #  the PCI ID Project at http://pci-ids.ucw.cz/.
@@ -41,7 +41,8 @@
0680  Ultra ATA/133 IDE RAID CONTROLLER CARD
 # Wrong ID used in subsystem ID of the TELES.S0/PCI 2.x ISDN adapter
 00a7  Teles AG (Wrong ID)
-0100  Ncipher Corp Ltd
+# nee nCipher
+0100  Thales e-Security
 0123  General Dynamics
 # 018a is not LevelOne but there is a board misprogrammed
 018a  LevelOne
@@ -327,6 +328,7 @@
1033 8336  SAS1068
0056  SAS1064ET PCI-Express Fusion-MPT SAS
1014 03bb  ServeRAID BR10il SAS/SATA Controller v2
+   8086 34dc  AXX4SASMOD RAID Controller
0057  M1064E MegaRAID SAS
8086 346c  Embedded Software RAID Technology II (ESTRII)
0058  SAS1068E PCI-Express Fusion-MPT SAS
@@ -369,7 +371,16 @@
1028 1f38  PERC H710 Mini (for monolithics)
15d9 0690  LSI MegaRAID ROMB
8086 3510  RMS25PB080 RAID Controller
+   8086 3511  RMS25PB040 RAID Controller
+   8086 3512  RMT3PB080 RAID Controller
8086 3513  RMS25CB080 RAID Controller
+   8086 3514  RMS25CB040 RAID Controller
+   8086 351c  RMS25PB080N RAID Controller
+   8086 351d  RMS25CB080N RAID Controller
+   8086 9265  RS25DB080 RAID Controller
+   8086 9268  RS25AB080 RAID Controller
+   8086 9285  RS25NB008 RAID Controller
+   8086 9288  RS25SB008 RAID Controller
005c  SAS1064A PCI-X Fusion-MPT SAS
005d  MegaRAID SAS-3 3108 [Invader]
1000 9361  MegaRAID SAS 9361-8i
@@ -389,6 +400,12 @@
17aa 1052  ThinkServer RAID 720i
17aa 1053  ThinkServer RAID 720ix
1d49 0600  ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter
+   8086 351e  RMS3CC080 RAID Controller
+   8086 351f  RMS3CC040 RAID Controller
+   8086 9360  RS3DC080 RAID Controller
+   8086 9362  RS3DC040 RAID Controller
+   8086 9380  RS3SC008 RAID Controller
+   8086 9381  RS3MC044 RAID Controller
005e  SAS1066 PCI-X Fusion-MPT SAS
005f  MegaRAID SAS-3 3008 [Fury]
1028 1f44  PERC H330 Adapter
@@ -444,6 +461,7 @@
1028 1f20  PERC H200 Embedded
1028 1f22  Internal Tape Adapter
8086 350f  RMS2LL040 RAID Controller
+   8086 3700  SSD 910 Series
0073  MegaRAID SAS 2008 [Falcon]
1000 9240  MegaRAID SAS 9240-8i
1000 9241  MegaRAID SAS 9240-4i
@@ -499,12 +517,18 @@
1043 8480  PIKE-2108 16PD
1734 1176  RAID Ctrl SAS 6G 5/6 512MB (D2616)
1734 1177  RAID Ctrl SAS 6G 0/1 (D2607)
-   8086 9256  MegaRAID SAS 9260DE-8i
+   8086 350b  RMS2MH080 RAID Controller
+   8086 9256  MegaRAID SAS 9260DE-8i RS2BL080DE
8086 9260  RAID Controller RS2BL040
8086 9261  RAID Controller RS2BL080
-   8086 9264  Warm Beach (Caster Lite)
+   8086 9264  RAID Controller RT3WB080 Warm Beach (Caster Lite)
8086 9267  RAID Controller RS2VB040
8086 9268  RAID Controller RS2VB080
+   8086 9275  RAID Controller RS2PI008DE
+   8086 9276  RAID Controller RS2WG160
+   8086 9280  RAID Controller RS2PI008
+   8086 9282  RAID Controller RS2MB044
+   8086 9290  RAID Controller RS2SG244
007c  MegaRAID SAS 1078DE
1014 0395  ServeRAID-AR10is SAS/SATA Controller
007e  SSS6200 PCI-Express Flash SSD
@@ -535,6 +559,14 @@
1000 3040  9207-8e SAS2.1 HBA
1000 3050  SAS9217-8i
1590 0044  H220i
+   8086 3000  RS25GB008 RAID Controller
+   8086 3060  RS25FB044 RAID Controller
+   8086 3516  RMS25JB080 RAID Controller
+   8086 3517  RMS25JB040 RAID Controller
+   8086 3518  RMS25KB080 RAID Controller
+   8086 3519  RMS25KB040 RAID Controller
+

svn commit: r323668 - stable/11/share/misc

2017-09-17 Thread Baptiste Daroussin 
Author: bapt
Date: Sun Sep 17 06:34:51 2017
New Revision: 323668
URL: https://svnweb.freebsd.org/changeset/base/323668

Log:
  MFC r323160:
  
  Update pci_vendors to 2017-09-01

Modified:
  stable/11/share/misc/pci_vendors
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/misc/pci_vendors
==
--- stable/11/share/misc/pci_vendorsSun Sep 17 06:33:42 2017
(r323667)
+++ stable/11/share/misc/pci_vendorsSun Sep 17 06:34:51 2017
(r323668)
@@ -3,8 +3,8 @@
 #
 #  List of PCI ID's
 #
-#  Version: 2017.07.27
-#  Date:2017-07-27 03:15:02
+#  Version: 2017.09.01
+#  Date:2017-09-01 03:15:02
 #
 #  Maintained by Albert Pool, Martin Mares, and other volunteers from
 #  the PCI ID Project at http://pci-ids.ucw.cz/.
@@ -41,7 +41,8 @@
0680  Ultra ATA/133 IDE RAID CONTROLLER CARD
 # Wrong ID used in subsystem ID of the TELES.S0/PCI 2.x ISDN adapter
 00a7  Teles AG (Wrong ID)
-0100  Ncipher Corp Ltd
+# nee nCipher
+0100  Thales e-Security
 0123  General Dynamics
 # 018a is not LevelOne but there is a board misprogrammed
 018a  LevelOne
@@ -327,6 +328,7 @@
1033 8336  SAS1068
0056  SAS1064ET PCI-Express Fusion-MPT SAS
1014 03bb  ServeRAID BR10il SAS/SATA Controller v2
+   8086 34dc  AXX4SASMOD RAID Controller
0057  M1064E MegaRAID SAS
8086 346c  Embedded Software RAID Technology II (ESTRII)
0058  SAS1068E PCI-Express Fusion-MPT SAS
@@ -369,7 +371,16 @@
1028 1f38  PERC H710 Mini (for monolithics)
15d9 0690  LSI MegaRAID ROMB
8086 3510  RMS25PB080 RAID Controller
+   8086 3511  RMS25PB040 RAID Controller
+   8086 3512  RMT3PB080 RAID Controller
8086 3513  RMS25CB080 RAID Controller
+   8086 3514  RMS25CB040 RAID Controller
+   8086 351c  RMS25PB080N RAID Controller
+   8086 351d  RMS25CB080N RAID Controller
+   8086 9265  RS25DB080 RAID Controller
+   8086 9268  RS25AB080 RAID Controller
+   8086 9285  RS25NB008 RAID Controller
+   8086 9288  RS25SB008 RAID Controller
005c  SAS1064A PCI-X Fusion-MPT SAS
005d  MegaRAID SAS-3 3108 [Invader]
1000 9361  MegaRAID SAS 9361-8i
@@ -389,6 +400,12 @@
17aa 1052  ThinkServer RAID 720i
17aa 1053  ThinkServer RAID 720ix
1d49 0600  ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter
+   8086 351e  RMS3CC080 RAID Controller
+   8086 351f  RMS3CC040 RAID Controller
+   8086 9360  RS3DC080 RAID Controller
+   8086 9362  RS3DC040 RAID Controller
+   8086 9380  RS3SC008 RAID Controller
+   8086 9381  RS3MC044 RAID Controller
005e  SAS1066 PCI-X Fusion-MPT SAS
005f  MegaRAID SAS-3 3008 [Fury]
1028 1f44  PERC H330 Adapter
@@ -444,6 +461,7 @@
1028 1f20  PERC H200 Embedded
1028 1f22  Internal Tape Adapter
8086 350f  RMS2LL040 RAID Controller
+   8086 3700  SSD 910 Series
0073  MegaRAID SAS 2008 [Falcon]
1000 9240  MegaRAID SAS 9240-8i
1000 9241  MegaRAID SAS 9240-4i
@@ -499,12 +517,18 @@
1043 8480  PIKE-2108 16PD
1734 1176  RAID Ctrl SAS 6G 5/6 512MB (D2616)
1734 1177  RAID Ctrl SAS 6G 0/1 (D2607)
-   8086 9256  MegaRAID SAS 9260DE-8i
+   8086 350b  RMS2MH080 RAID Controller
+   8086 9256  MegaRAID SAS 9260DE-8i RS2BL080DE
8086 9260  RAID Controller RS2BL040
8086 9261  RAID Controller RS2BL080
-   8086 9264  Warm Beach (Caster Lite)
+   8086 9264  RAID Controller RT3WB080 Warm Beach (Caster Lite)
8086 9267  RAID Controller RS2VB040
8086 9268  RAID Controller RS2VB080
+   8086 9275  RAID Controller RS2PI008DE
+   8086 9276  RAID Controller RS2WG160
+   8086 9280  RAID Controller RS2PI008
+   8086 9282  RAID Controller RS2MB044
+   8086 9290  RAID Controller RS2SG244
007c  MegaRAID SAS 1078DE
1014 0395  ServeRAID-AR10is SAS/SATA Controller
007e  SSS6200 PCI-Express Flash SSD
@@ -535,6 +559,14 @@
1000 3040  9207-8e SAS2.1 HBA
1000 3050  SAS9217-8i
1590 0044  H220i
+   8086 3000  RS25GB008 RAID Controller
+   8086 3060  RS25FB044 RAID Controller
+   8086 3516  RMS25JB080 RAID Controller
+   8086 3517  RMS25JB040 RAID Controller
+   8086 3518  RMS25KB080 RAID Controller
+   8086 3519  RMS25KB040 RAID Controller
+

svn commit: r323667 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

2017-09-17 Thread Baptiste Daroussin 
Author: bapt
Date: Sun Sep 17 06:33:42 2017
New Revision: 323667
URL: https://svnweb.freebsd.org/changeset/base/323667

Log:
  MFC r323051:
  
  Add sysctls for arc shrinking and growing values
  
  The default value for arc_no_grow_shift may not be optimal when using
  several GiB ARC. Expose it via sysctl allows users to tune it easily.
  
  Also expose arc_grow_retry via sysctl for the same reason. The default value 
of
  60s might, in case of intensive load, be too long.
  
  Submitted by: Nikita Kozlov 
  Reviewed by:  mav, manu, bapt
  Sponsored by: blade
  Differential Revision:https://reviews.freebsd.org/D12144

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c  Sun Sep 
17 06:32:05 2017(r323666)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c  Sun Sep 
17 06:33:42 2017(r323667)
@@ -358,6 +358,7 @@ uint64_t zfs_arc_meta_limit = 0;
 uint64_t zfs_arc_meta_min = 0;
 int zfs_arc_grow_retry = 0;
 int zfs_arc_shrink_shift = 0;
+int zfs_arc_no_grow_shift = 0;
 int zfs_arc_p_min_shift = 0;
 uint64_t zfs_arc_average_blocksize = 8 * 1024; /* 8KB */
 u_int zfs_arc_free_target = 0;
@@ -371,6 +372,7 @@ static int sysctl_vfs_zfs_arc_free_target(SYSCTL_HANDL
 static int sysctl_vfs_zfs_arc_meta_limit(SYSCTL_HANDLER_ARGS);
 static int sysctl_vfs_zfs_arc_max(SYSCTL_HANDLER_ARGS);
 static int sysctl_vfs_zfs_arc_min(SYSCTL_HANDLER_ARGS);
+static int sysctl_vfs_zfs_arc_no_grow_shift(SYSCTL_HANDLER_ARGS);
 
 #if defined(__FreeBSD__) && defined(_KERNEL)
 static void
@@ -385,17 +387,25 @@ SYSINIT(arc_free_target_init, SI_SUB_KTHREAD_PAGE, SI_
 TUNABLE_QUAD("vfs.zfs.arc_meta_limit", _arc_meta_limit);
 TUNABLE_QUAD("vfs.zfs.arc_meta_min", _arc_meta_min);
 TUNABLE_INT("vfs.zfs.arc_shrink_shift", _arc_shrink_shift);
+TUNABLE_INT("vfs.zfs.arc_grow_retry", _arc_grow_retry);
+TUNABLE_INT("vfs.zfs.arc_no_grow_shift", _arc_no_grow_shift);
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_max, CTLTYPE_U64 | CTLFLAG_RWTUN,
 0, sizeof(uint64_t), sysctl_vfs_zfs_arc_max, "QU", "Maximum ARC size");
 SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_min, CTLTYPE_U64 | CTLFLAG_RWTUN,
 0, sizeof(uint64_t), sysctl_vfs_zfs_arc_min, "QU", "Minimum ARC size");
+SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_no_grow_shift, CTLTYPE_U32 | CTLFLAG_RWTUN,
+0, sizeof(uint32_t), sysctl_vfs_zfs_arc_no_grow_shift, "U",
+"log2(fraction of ARC which must be free to allow growing)");
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_average_blocksize, CTLFLAG_RDTUN,
 _arc_average_blocksize, 0,
 "ARC average blocksize");
 SYSCTL_INT(_vfs_zfs, OID_AUTO, arc_shrink_shift, CTLFLAG_RW,
 _shrink_shift, 0,
 "log2(fraction of arc to reclaim)");
+SYSCTL_INT(_vfs_zfs, OID_AUTO, arc_grow_retry, CTLFLAG_RW,
+_grow_retry, 0,
+"Wait in seconds before considering growing ARC");
 SYSCTL_INT(_vfs_zfs, OID_AUTO, compressed_arc_enabled, CTLFLAG_RDTUN,
 _compressed_arc_enabled, 0, "Enable compressed ARC");
 
@@ -1065,6 +1075,24 @@ sysctl_vfs_zfs_arc_meta_limit(SYSCTL_HANDLER_ARGS)
 }
 
 static int
+sysctl_vfs_zfs_arc_no_grow_shift(SYSCTL_HANDLER_ARGS)
+{
+   uint32_t val;
+   int err;
+
+   val = arc_no_grow_shift;
+   err = sysctl_handle_32(oidp, , 0, req);
+   if (err != 0 || req->newptr == NULL)
+   return (err);
+
+if (val >= arc_shrink_shift)
+   return (EINVAL);
+
+   arc_no_grow_shift = val;
+   return (0);
+}
+
+static int
 sysctl_vfs_zfs_arc_max(SYSCTL_HANDLER_ARGS)
 {
uint64_t val;
@@ -6505,6 +6533,8 @@ arc_init(void)
if (zfs_arc_shrink_shift > 0)
arc_shrink_shift = zfs_arc_shrink_shift;
 
+   if (zfs_arc_no_grow_shift > 0)
+   arc_no_grow_shift = zfs_arc_no_grow_shift;
/*
 * Ensure that arc_no_grow_shift is less than arc_shrink_shift.
 */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323666 - stable/11/usr.bin/netstat

2017-09-17 Thread Baptiste Daroussin 
Author: bapt
Date: Sun Sep 17 06:32:05 2017
New Revision: 323666
URL: https://svnweb.freebsd.org/changeset/base/323666

Log:
  MFC r323016:
  
  Don't call kresolv_list() if using netstat on live kernel
  
  kresolve_list() is calling many kldsym(2). Removing that call on when 
collecting
  stats for the running kernel improves the startup time and CPU usage.
  
  Submitted by: Nikita Kozlov (nikita.koz...@blade-group.com)
  Reviewed by:  cem
  Sponsored by: blade
  Differential Revision:https://reviews.freebsd.org/D12151

Modified:
  stable/11/usr.bin/netstat/main.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/netstat/main.c
==
--- stable/11/usr.bin/netstat/main.cSun Sep 17 04:15:12 2017
(r323665)
+++ stable/11/usr.bin/netstat/main.cSun Sep 17 06:32:05 2017
(r323666)
@@ -422,13 +422,12 @@ main(int argc, char *argv[])
if (!live) {
if (setgid(getgid()) != 0)
xo_err(-1, "setgid");
+   /* Load all necessary kvm symbols */
+   kresolve_list(nl);
}
 
if (xflag && Tflag)
xo_errx(1, "-x and -T are incompatible, pick one.");
-
-   /* Load all necessary kvm symbols */
-   kresolve_list(nl);
 
if (Bflag) {
if (!live)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"