svn commit: r284867 - stable/10/sys/dev/sfxge
Author: arybchik
Date: Fri Jun 26 06:08:52 2015
New Revision: 284867
URL: https://svnweb.freebsd.org/changeset/base/284867
Log:
MFC: r284747
sfxge: skip VPD info population if access is denied
The patch allows to run on unprivileged PF (PFIOV) passed to
a virtual machine.
Reviewed by:gnn
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/sfxge.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/sfxge.c
==
--- stable/10/sys/dev/sfxge/sfxge.c Fri Jun 26 04:14:05 2015
(r284866)
+++ stable/10/sys/dev/sfxge/sfxge.c Fri Jun 26 06:08:52 2015
(r284867)
@@ -902,8 +902,15 @@ sfxge_vpd_init(struct sfxge_softc *sc)
efx_vpd_value_t value;
int rc;
- if ((rc = efx_vpd_size(sc-enp, sc-vpd_size)) != 0)
+ if ((rc = efx_vpd_size(sc-enp, sc-vpd_size)) != 0) {
+ /*
+* Unpriviledged functions deny VPD access.
+* Simply skip VPD in this case.
+*/
+ if (rc == EACCES)
+ goto done;
goto fail;
+ }
sc-vpd_data = malloc(sc-vpd_size, M_SFXGE, M_WAITOK);
if ((rc = efx_vpd_read(sc-enp, sc-vpd_data, sc-vpd_size)) != 0)
goto fail2;
@@ -932,6 +939,7 @@ sfxge_vpd_init(struct sfxge_softc *sc)
for (keyword[1] = 'A'; keyword[1] = 'Z'; keyword[1]++)
sfxge_vpd_try_add(sc, vpd_list, EFX_VPD_RO, keyword);
+done:
return (0);
fail2:
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to svn-src-stable-10-unsubscr...@freebsd.org
svn commit: r284868 - stable/10/sys/fs/tmpfs
Author: kib Date: Fri Jun 26 06:25:14 2015 New Revision: 284868 URL: https://svnweb.freebsd.org/changeset/base/284868 Log: MFC r284594: Restore the td_cookie value upon detach. Modified: stable/10/sys/fs/tmpfs/tmpfs_subr.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/tmpfs/tmpfs_subr.c == --- stable/10/sys/fs/tmpfs/tmpfs_subr.c Fri Jun 26 06:08:52 2015 (r284867) +++ stable/10/sys/fs/tmpfs/tmpfs_subr.c Fri Jun 26 06:25:14 2015 (r284868) @@ -1031,6 +1031,7 @@ tmpfs_dir_detach(struct vnode *vp, struc tmpfs_free_dirent(tmp, xde); } } + de-td_cookie = de-td_hash; } else RB_REMOVE(tmpfs_dir, head, de); ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to svn-src-stable-10-unsubscr...@freebsd.org
svn commit: r284876 - stable/10/sys/dev/ixgbe
Author: erj Date: Fri Jun 26 17:13:23 2015 New Revision: 284876 URL: https://svnweb.freebsd.org/changeset/base/284876 Log: Limit the number of autoconfigured queues to 8. This limit was in a previous version of the driver, but it is being re- added to match the behavior of previous versions of 10. It prevents the driver from using too many MSI-X vectors on systems with a large number of logical CPU cores. Thanks to j...@slowblink.com for bringing up this issue. Approved by: jfv (mentor) Modified: stable/10/sys/dev/ixgbe/if_ix.c Modified: stable/10/sys/dev/ixgbe/if_ix.c == --- stable/10/sys/dev/ixgbe/if_ix.c Fri Jun 26 16:14:00 2015 (r284875) +++ stable/10/sys/dev/ixgbe/if_ix.c Fri Jun 26 17:13:23 2015 (r284876) @@ -285,7 +285,8 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix */ static int ixgbe_num_queues = 0; SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, ixgbe_num_queues, 0, -Number of queues to configure, 0 indicates autoconfigure); +Number of queues to configure up to a maximum of 8; +0 indicates autoconfigure); /* ** Number of TX descriptors per ring, @@ -548,7 +549,6 @@ ixgbe_attach(device_t dev) /* Check PCIE slot type/speed/width */ ixgbe_get_slot_info(hw); - /* Set an initial default flow control value */ adapter-fc = ixgbe_fc_full; @@ -2328,6 +2328,9 @@ ixgbe_setup_msix(struct adapter *adapter if (ixgbe_num_queues != 0) queues = ixgbe_num_queues; + /* Set max queues to 8 when autoconfiguring */ + else if ((ixgbe_num_queues == 0) (queues 8)) + queues = 8; /* reflect correct sysctl value */ ixgbe_num_queues = queues; ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to svn-src-stable-10-unsubscr...@freebsd.org
svn commit: r284879 - stable/10/sys/dev/hpt27xx
Author: delphij Date: Fri Jun 26 19:55:01 2015 New Revision: 284879 URL: https://svnweb.freebsd.org/changeset/base/284879 Log: MFC r267386,269611,284730: Update vendor driver to 1.2.7. This update improves driver reliability and adds support of 4Kn drives and report LUNs command. Many thanks to HighPoint for providing this driver update. Modified: stable/10/sys/dev/hpt27xx/README stable/10/sys/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu (contents, props changed) stable/10/sys/dev/hpt27xx/array.h stable/10/sys/dev/hpt27xx/him.h stable/10/sys/dev/hpt27xx/himfuncs.h stable/10/sys/dev/hpt27xx/hpt27xx_config.c stable/10/sys/dev/hpt27xx/hpt27xx_config.h stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c stable/10/sys/dev/hpt27xx/hpt27xx_osm_bsd.c stable/10/sys/dev/hpt27xx/hptintf.h stable/10/sys/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu stable/10/sys/dev/hpt27xx/ldm.h stable/10/sys/dev/hpt27xx/list.h stable/10/sys/dev/hpt27xx/os_bsd.h stable/10/sys/dev/hpt27xx/osm.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/hpt27xx/README == --- stable/10/sys/dev/hpt27xx/READMEFri Jun 26 18:03:19 2015 (r284878) +++ stable/10/sys/dev/hpt27xx/READMEFri Jun 26 19:55:01 2015 (r284879) @@ -1,10 +1,34 @@ RocketRAID Controller Driver for FreeBSD -Copyright (C) 2011 HighPoint Technologies, Inc. All rights reserved. +Copyright (C) 2005-2015 HighPoint Technologies, Inc. All rights reserved. # Revision History: - v1.0 2011-12-27 -First source code release + v1.2.7.1 06/08/2015 + * Add 10.x comment and correct file name in readme. + + v1.2.7 05/22/2015 + * Support Report Luns command. + + v1.2.6 04/13/2015 + * Fix a bug that some disks will be dropped when data integrity test over + one hour on 32bit system. + + v1.2.5 01/26/2015 +* Fix a bug that failed to verify controller by retrying 8 times. +* Supported 4Kn drive. + + v1.2.4 09/29/2014 +* Fix a bug that memory would be corrupted and caused strange system + behavior when running IO and WebGUI + + v1.2.3 01/24/2014 +* fixup system crash while write date to raid5. + + v1.1 07/01/2013 +* Fix 2nd RAID controller can not load as multipath issue. + + v1.0 12/13/2011 +* First source code release # @@ -40,7 +64,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hpt27xx-freebsd-src-v1.0-111227.tgz + # tar xvzf /your/path/to/HPT27xx_FreeBSD_Src_v1.2.7.1_15_06_08.tgz 3) Update the kernel configuration file to include the HighPoint source. Assume the configure file is GENERIC, and new kernel configure file is @@ -62,8 +86,8 @@ Revision History: compile-withuudecode $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu \ no-implicit-rule - dev/hpt27xx/os_bsd.c optionalhpt27xx - dev/hpt27xx/osm_bsd.c optionalhpt27xx + dev/hpt27xx/hpt27xx_os_bsd.c optionalhpt27xx + dev/hpt27xx/hpt27xx_osm_bsd.c optionalhpt27xx dev/hpt27xx/hpt27xx_config.c optionalhpt27xx For amd64 system, edit /usr/src/sys/conf/files.amd64 and append the lines @@ -74,13 +98,13 @@ Revision History: compile-withuudecode $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu \ no-implicit-rule - dev/hpt27xx/os_bsd.c optionalhpt27xx - dev/hpt27xx/osm_bsd.c optionalhpt27xx + dev/hpt27xx/hpt27xx_os_bsd.c optionalhpt27xx + dev/hpt27xx/hpt27xx_osm_bsd.c optionalhpt27xx dev/hpt27xx/hpt27xx_config.c optionalhpt27xx 6) Rebuild and install the kernel: - a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386: + a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386/10.x-i386: # cd /usr/src/sys/i386/conf/ # /usr/sbin/config MYKERNEL @@ -89,7 +113,7 @@ Revision History: # make # make install - b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64: + b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64/10.x-amd64: # cd /usr/src/sys/amd64/conf/ # /usr/sbin/config MYKERNEL @@ -122,7 +146,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hpt27xx-freebsd-src-v1.0-111227.tgz + # tar xvzf /your/path/to/HPT27xx_FreeBSD_Src_v1.2.7.1_15_06_08.tgz 4) Build the driver module: @@ -136,7 +160,7 @@ Revision History: # cp hpt27xx.ko
