svn commit: r317184 - stable/9/sys/dev/qlxgbe
Author: davidcs Date: Thu Apr 20 04:36:49 2017 New Revision: 317184 URL: https://svnweb.freebsd.org/changeset/base/317184 Log: MFC r316183 Upgrade firmware and other related files to version 5.4.64 Modified: stable/9/sys/dev/qlxgbe/ql_boot.c stable/9/sys/dev/qlxgbe/ql_fw.c stable/9/sys/dev/qlxgbe/ql_minidump.c stable/9/sys/dev/qlxgbe/ql_reset.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sys/dev/qlxgbe/ql_boot.c == --- stable/9/sys/dev/qlxgbe/ql_boot.c Thu Apr 20 04:33:47 2017 (r317183) +++ stable/9/sys/dev/qlxgbe/ql_boot.c Thu Apr 20 04:36:49 2017 (r317184) @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); unsigned int ql83xx_bootloader_version_major = 5; unsigned int ql83xx_bootloader_version_minor = 4; -unsigned int ql83xx_bootloader_version_sub = 62; +unsigned int ql83xx_bootloader_version_sub = 64; unsigned char ql83xx_bootloader[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -10957,9 +10957,9 @@ unsigned char ql83xx_bootloader[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x02, 0x00, 0x40, 0x40, 0x05, 0x04, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x40, 0x40, 0x05, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x97, 0x0e + 0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x95, 0x0e }; unsigned int ql83xx_bootloader_len = 131072; Modified: stable/9/sys/dev/qlxgbe/ql_fw.c == --- stable/9/sys/dev/qlxgbe/ql_fw.c Thu Apr 20 04:33:47 2017 (r317183) +++ stable/9/sys/dev/qlxgbe/ql_fw.c Thu Apr 20 04:36:49 2017 (r317184) @@ -35,32 +35,32 @@ __FBSDID("$FreeBSD$"); unsigned int ql83xx_firmware_version_major = 5; unsigned int ql83xx_firmware_version_minor = 4; -unsigned int ql83xx_firmware_version_sub = 62; +unsigned int ql83xx_firmware_version_sub = 64; unsigned char ql83xx_firmware[] = { - 0x03, 0x00, 0x40, 0x40, 0x05, 0x04, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc4, 0x5e, 0x1b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x88, 0xcd, 0x7d, 0x72, 0x3d, 0x1f, 0x5f, 0xe0, + 0x03, 0x00, 0x40, 0x40, 0x05, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe4, 0x42, 0x1b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x5f, 0x7e, 0x74, 0x37, 0x27, 0xc9, 0xab, 0x39, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8b, 0xef, 0x03, 0x00, + 0xe0, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7d, 0xef, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x44, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b, 0xf9, 0x03, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x7a, 0x9f, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x46, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xdd, 0x4e, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0xf9, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9f, 0x90, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x46, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x9f, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xe5, 0x98, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x71, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x65, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x89, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x73, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
svn commit: r317183 - stable/10/sys/dev/qlxgbe
Author: davidcs Date: Thu Apr 20 04:33:47 2017 New Revision: 317183 URL: https://svnweb.freebsd.org/changeset/base/317183 Log: MFC r316183 Upgrade firmware and other related files to version 5.4.64 Modified: stable/10/sys/dev/qlxgbe/ql_boot.c stable/10/sys/dev/qlxgbe/ql_fw.c stable/10/sys/dev/qlxgbe/ql_minidump.c stable/10/sys/dev/qlxgbe/ql_reset.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/qlxgbe/ql_boot.c == --- stable/10/sys/dev/qlxgbe/ql_boot.c Thu Apr 20 04:26:47 2017 (r317182) +++ stable/10/sys/dev/qlxgbe/ql_boot.c Thu Apr 20 04:33:47 2017 (r317183) @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); unsigned int ql83xx_bootloader_version_major = 5; unsigned int ql83xx_bootloader_version_minor = 4; -unsigned int ql83xx_bootloader_version_sub = 62; +unsigned int ql83xx_bootloader_version_sub = 64; unsigned char ql83xx_bootloader[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -10957,9 +10957,9 @@ unsigned char ql83xx_bootloader[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x02, 0x00, 0x40, 0x40, 0x05, 0x04, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x40, 0x40, 0x05, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x97, 0x0e + 0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x95, 0x0e }; unsigned int ql83xx_bootloader_len = 131072; Modified: stable/10/sys/dev/qlxgbe/ql_fw.c == --- stable/10/sys/dev/qlxgbe/ql_fw.cThu Apr 20 04:26:47 2017 (r317182) +++ stable/10/sys/dev/qlxgbe/ql_fw.cThu Apr 20 04:33:47 2017 (r317183) @@ -35,32 +35,32 @@ __FBSDID("$FreeBSD$"); unsigned int ql83xx_firmware_version_major = 5; unsigned int ql83xx_firmware_version_minor = 4; -unsigned int ql83xx_firmware_version_sub = 62; +unsigned int ql83xx_firmware_version_sub = 64; unsigned char ql83xx_firmware[] = { - 0x03, 0x00, 0x40, 0x40, 0x05, 0x04, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc4, 0x5e, 0x1b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x88, 0xcd, 0x7d, 0x72, 0x3d, 0x1f, 0x5f, 0xe0, + 0x03, 0x00, 0x40, 0x40, 0x05, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe4, 0x42, 0x1b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x5f, 0x7e, 0x74, 0x37, 0x27, 0xc9, 0xab, 0x39, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8b, 0xef, 0x03, 0x00, + 0xe0, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7d, 0xef, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x44, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b, 0xf9, 0x03, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x7a, 0x9f, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x46, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xdd, 0x4e, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0xf9, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9f, 0x90, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x46, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x9f, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xe5, 0x98, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x71, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x65, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x89, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x73, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
svn commit: r317182 - stable/11/sys/dev/qlxgbe
Author: davidcs Date: Thu Apr 20 04:26:47 2017 New Revision: 317182 URL: https://svnweb.freebsd.org/changeset/base/317182 Log: MFC r316183 Upgrade firmware and other related files to version 5.4.64 Modified: stable/11/sys/dev/qlxgbe/ql_boot.c stable/11/sys/dev/qlxgbe/ql_fw.c stable/11/sys/dev/qlxgbe/ql_minidump.c stable/11/sys/dev/qlxgbe/ql_reset.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/qlxgbe/ql_boot.c == --- stable/11/sys/dev/qlxgbe/ql_boot.c Thu Apr 20 03:43:37 2017 (r317181) +++ stable/11/sys/dev/qlxgbe/ql_boot.c Thu Apr 20 04:26:47 2017 (r317182) @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); unsigned int ql83xx_bootloader_version_major = 5; unsigned int ql83xx_bootloader_version_minor = 4; -unsigned int ql83xx_bootloader_version_sub = 62; +unsigned int ql83xx_bootloader_version_sub = 64; unsigned char ql83xx_bootloader[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -10957,9 +10957,9 @@ unsigned char ql83xx_bootloader[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x02, 0x00, 0x40, 0x40, 0x05, 0x04, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x40, 0x40, 0x05, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x97, 0x0e + 0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x95, 0x0e }; unsigned int ql83xx_bootloader_len = 131072; Modified: stable/11/sys/dev/qlxgbe/ql_fw.c == --- stable/11/sys/dev/qlxgbe/ql_fw.cThu Apr 20 03:43:37 2017 (r317181) +++ stable/11/sys/dev/qlxgbe/ql_fw.cThu Apr 20 04:26:47 2017 (r317182) @@ -35,32 +35,32 @@ __FBSDID("$FreeBSD$"); unsigned int ql83xx_firmware_version_major = 5; unsigned int ql83xx_firmware_version_minor = 4; -unsigned int ql83xx_firmware_version_sub = 62; +unsigned int ql83xx_firmware_version_sub = 64; unsigned char ql83xx_firmware[] = { - 0x03, 0x00, 0x40, 0x40, 0x05, 0x04, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc4, 0x5e, 0x1b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x88, 0xcd, 0x7d, 0x72, 0x3d, 0x1f, 0x5f, 0xe0, + 0x03, 0x00, 0x40, 0x40, 0x05, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe4, 0x42, 0x1b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x5f, 0x7e, 0x74, 0x37, 0x27, 0xc9, 0xab, 0x39, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe0, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8b, 0xef, 0x03, 0x00, + 0xe0, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7d, 0xef, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x44, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b, 0xf9, 0x03, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x7a, 0x9f, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x46, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xdd, 0x4e, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0xf9, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x9f, 0x90, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x46, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x9f, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xe5, 0x98, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x71, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x65, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xfc, 0x89, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x73, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
svn commit: r317181 - head/share/man/man5
Author: ngie Date: Thu Apr 20 03:43:37 2017 New Revision: 317181 URL: https://svnweb.freebsd.org/changeset/base/317181 Log: Regenerate src.conf(5) after recent additions/clarifications Sponsored by: Dell EMC Isilon Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Thu Apr 20 03:41:42 2017 (r317180) +++ head/share/man/man5/src.conf.5 Thu Apr 20 03:43:37 2017 (r317181) @@ -465,6 +465,13 @@ When set, it enforces these options: .It .Va WITHOUT_TESTS_SUPPORT .El +.It Va WITH_CXX +Set to build +.Xr c++ 1 +and related libraries. +.Pp +This is a default setting on +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_DEBUG_FILES Set to avoid building or installing standalone debug files for each executable binary and shared library. @@ -740,6 +747,14 @@ You should consider installing the textp .Pp This is a default setting on riscv/riscv64 and riscv/riscv64sf. +.It Va WITH_GROFF +Set to build +.Xr groff 1 +and +.Xr vgrind 1 . +.Pp +This is a default setting on +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_GSSAPI Set to not build libgssapi. .It Va WITHOUT_HAST @@ -1222,10 +1237,17 @@ Set to not build .Xr ppp 8 and related programs. .It Va WITHOUT_PROFILE -Set to avoid compiling profiled libraries. +Set to not build profiled libraries for use with +.Xr gprof 8 . .Pp This is a default setting on riscv/riscv64 and riscv/riscv64sf. +.It Va WITH_PROFILE +Set to build profiled libraries for use with +.Xr gprof 8 . +.Pp +This is a default setting on +amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITHOUT_QUOTAS Set to not build .Xr quota 1 @@ -1269,6 +1291,10 @@ Set to not build Set to not build .Xr routed 8 utility. +.It Va WITH_RPCBIND_WARMSTART_SUPPORT +Set to build +.Xr rpcbind 8 +with warmstart support. .It Va WITHOUT_SENDMAIL Set to not build .Xr sendmail 8 ___ 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: r317180 - head/sys/dev/qlxgbe
Author: davidcs Date: Thu Apr 20 03:41:42 2017 New Revision: 317180 URL: https://svnweb.freebsd.org/changeset/base/317180 Log: Cleanup QLA_LOCK/QLA_UNLOCK macros remove unused QLA_TX_LOCK/QLA_TX_UNLOCK macros format qla_error_recovery() MFC after:3 days Modified: head/sys/dev/qlxgbe/ql_hw.c head/sys/dev/qlxgbe/ql_ioctl.c head/sys/dev/qlxgbe/ql_os.c head/sys/dev/qlxgbe/ql_os.h Modified: head/sys/dev/qlxgbe/ql_hw.c == --- head/sys/dev/qlxgbe/ql_hw.c Thu Apr 20 03:36:09 2017(r317179) +++ head/sys/dev/qlxgbe/ql_hw.c Thu Apr 20 03:41:42 2017(r317180) @@ -183,9 +183,9 @@ qla_sysctl_stop_pegs(SYSCTL_HANDLER_ARGS if (ret == 1) { ha = (qla_host_t *)arg1; - (void)QLA_LOCK(ha, __func__, 0); + QLA_LOCK(ha); qla_stop_pegs(ha); - QLA_UNLOCK(ha, __func__); + QLA_UNLOCK(ha); } return err; Modified: head/sys/dev/qlxgbe/ql_ioctl.c == --- head/sys/dev/qlxgbe/ql_ioctl.c Thu Apr 20 03:36:09 2017 (r317179) +++ head/sys/dev/qlxgbe/ql_ioctl.c Thu Apr 20 03:41:42 2017 (r317180) @@ -233,10 +233,10 @@ ql_eioctl(struct cdev *dev, u_long cmd, break; } - (void)QLA_LOCK(ha, __func__, 0); + QLA_LOCK(ha); if (!ha->hw.mdump_done) ha->qla_initiate_recovery = 1; - QLA_UNLOCK(ha, __func__); + QLA_UNLOCK(ha); #define QLNX_DUMP_WAIT_SECS30 @@ -254,9 +254,9 @@ ql_eioctl(struct cdev *dev, u_long cmd, break; } - (void)QLA_LOCK(ha, __func__, 0); + QLA_LOCK(ha); ha->hw.mdump_done = 0; - QLA_UNLOCK(ha, __func__); + QLA_UNLOCK(ha); if ((rval = copyout(ha->hw.mdump_template, fw_dump->minidump, ha->hw.mdump_template_size))) { Modified: head/sys/dev/qlxgbe/ql_os.c == --- head/sys/dev/qlxgbe/ql_os.c Thu Apr 20 03:36:09 2017(r317179) +++ head/sys/dev/qlxgbe/ql_os.c Thu Apr 20 03:41:42 2017(r317180) @@ -519,9 +519,9 @@ qla_pci_detach(device_t dev) ifp = ha->ifp; - (void)QLA_LOCK(ha, __func__, 0); + QLA_LOCK(ha); qla_stop(ha); - QLA_UNLOCK(ha, __func__); + QLA_UNLOCK(ha); qla_release(ha); @@ -890,9 +890,9 @@ qla_init(void *arg) QL_DPRINT2(ha, (ha->pci_dev, "%s: enter\n", __func__)); - (void)QLA_LOCK(ha, __func__, 0); + QLA_LOCK(ha); qla_init_locked(ha); - QLA_UNLOCK(ha, __func__); + QLA_UNLOCK(ha); QL_DPRINT2(ha, (ha->pci_dev, "%s: exit\n", __func__)); } @@ -924,13 +924,9 @@ qla_set_multi(qla_host_t *ha, uint32_t a if_maddr_runlock(ifp); - //if (QLA_LOCK(ha, __func__, 1) == 0) { - // ret = ql_hw_set_multi(ha, mta, mcnt, add_multi); - // QLA_UNLOCK(ha, __func__); - //} - QLA_LOCK(ha, __func__, 1); + QLA_LOCK(ha); ret = ql_hw_set_multi(ha, mta, mcnt, add_multi); - QLA_UNLOCK(ha, __func__); + QLA_UNLOCK(ha); return (ret); } @@ -953,9 +949,9 @@ qla_ioctl(struct ifnet *ifp, u_long cmd, if (ifa->ifa_addr->sa_family == AF_INET) { ifp->if_flags |= IFF_UP; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { - (void)QLA_LOCK(ha, __func__, 0); + QLA_LOCK(ha); qla_init_locked(ha); - QLA_UNLOCK(ha, __func__); + QLA_UNLOCK(ha); } QL_DPRINT4(ha, (ha->pci_dev, "%s: SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n", @@ -975,10 +971,12 @@ qla_ioctl(struct ifnet *ifp, u_long cmd, if (ifr->ifr_mtu > QLA_MAX_MTU) { ret = EINVAL; } else { - (void) QLA_LOCK(ha, __func__, 0); + QLA_LOCK(ha); + ifp->if_mtu = ifr->ifr_mtu; ha->max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; + if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) { ret = ql_set_max_mtu(ha, ha->max_frame_size, ha->hw.rcv_cntxt_id); @@ -990,7 +988,7 @@ qla_ioctl(struct ifnet *ifp, u_long cmd, ha->std_replenish = QL_STD_REPLENISH_THRES; -
svn commit: r317179 - head/tools/build/options
Author: ngie Date: Thu Apr 20 03:36:09 2017 New Revision: 317179 URL: https://svnweb.freebsd.org/changeset/base/317179 Log: Clean up WITH*_PROFILE - Clarify that profiled libraries are usable with gprof(8). - Add WITH_PROFILE to complement WITHOUT_PROFILE and placate makeman. MFC after:7 weeks Sponsored by: Dell EMC Isilon Added: head/tools/build/options/WITH_PROFILE - copied, changed from r317167, head/tools/build/options/WITHOUT_PROFILE Modified: head/tools/build/options/WITHOUT_PROFILE Modified: head/tools/build/options/WITHOUT_PROFILE == --- head/tools/build/options/WITHOUT_PROFILEThu Apr 20 03:32:30 2017 (r317178) +++ head/tools/build/options/WITHOUT_PROFILEThu Apr 20 03:36:09 2017 (r317179) @@ -1,2 +1,3 @@ .\" $FreeBSD$ -Set to avoid compiling profiled libraries. +Set to not build profiled libraries for use with +.Xr gprof 8 . Copied and modified: head/tools/build/options/WITH_PROFILE (from r317167, head/tools/build/options/WITHOUT_PROFILE) == --- head/tools/build/options/WITHOUT_PROFILEWed Apr 19 20:35:47 2017 (r317167, copy source) +++ head/tools/build/options/WITH_PROFILE Thu Apr 20 03:36:09 2017 (r317179) @@ -1,2 +1,3 @@ .\" $FreeBSD$ -Set to avoid compiling profiled libraries. +Set to build profiled libraries for use with +.Xr gprof 8 . ___ 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: r317178 - head/tools/build/options
Author: ngie Date: Thu Apr 20 03:32:30 2017 New Revision: 317178 URL: https://svnweb.freebsd.org/changeset/base/317178 Log: Add WITH_GROFF to complement WITHOUT_GROFF and placate complaints from makeman MFC after:7 weeks Sponsored by: Dell EMC Isilon Added: head/tools/build/options/WITH_GROFF - copied, changed from r317167, head/tools/build/options/WITHOUT_GROFF Copied and modified: head/tools/build/options/WITH_GROFF (from r317167, head/tools/build/options/WITHOUT_GROFF) == --- head/tools/build/options/WITHOUT_GROFF Wed Apr 19 20:35:47 2017 (r317167, copy source) +++ head/tools/build/options/WITH_GROFF Thu Apr 20 03:32:30 2017 (r317178) @@ -1,7 +1,5 @@ .\" $FreeBSD$ -Set to not build +Set to build .Xr groff 1 and .Xr vgrind 1 . -You should consider installing the textproc/groff port to not break -.Xr man 1 . ___ 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: r317094 - head/share/mk
On 20/4/17 3:13 am, Justin Hibbits wrote: On Wed, Apr 19, 2017 at 11:33 AM, Rodney W. Grimeswrote: On Wednesday, April 19, 2017 01:28:37 AM Slawa Olhovchenkov wrote: On Tue, Apr 18, 2017 at 12:45:25PM -0700, John Baldwin wrote: On Tuesday, April 18, 2017 07:30:13 PM Slawa Olhovchenkov wrote: On Tue, Apr 18, 2017 at 04:27:48PM +, John Baldwin wrote: Author: jhb Date: Tue Apr 18 16:27:48 2017 New Revision: 317094 URL: https://svnweb.freebsd.org/changeset/base/317094 Log: Disable in-tree GDB by default on x86, mips, and powerpc. GDB in ports contains all of the functionality as GDB in base (including kgdb) for these platforms along with additional functionality. In-tree GDB remains enabled on ARM and sparc64. GDB in ports does not currently support kernel debugging on arm, and ports GDB for sparc64 has not been tested (though it does include sparc64 support). Reviewed by:bdrewery, emaste, imp Relnotes: yes Sponsored by: DARPA / AFRL Differential Revision: https://reviews.freebsd.org/D10399 Generating core.txt now complety broken? No. crashinfo has supported gdb from ports for quite a while now. If you 'pkg install gdb' crashinfo defaults to using the ports gdb over the base one already. I am about clean install, w/o ports. Until we get some sort of klldb support that will not work. However, we already have platforms now where /usr/bin/gdb doesn't work for that. riscv and aarch64 aren't supported in ancient gdb, and the MIPS /usr/bin/gdb didn't really work for me in my testing. So we break what worked on a Tier1 Platform? With my "user" hat on these are the exact kind of breakages that send me looking for another platform to run on. We far to often just go oh you can do X y and Z to get around what we broke forgetting that the user 6 months from now when this hits a release isnt gona come ask, he may just go down the road to something else. Remove gdb WHEN klldb can replace it, not a day before. Using "oh its broken on aarch64 and mips" is not a reason to break things on i386/amd64. It's not removed, it's disabled by default now. As the commit message states, gdb in ports is much more feature filled than gdb in base Yes, I know we want to get gnu stuff out of the tree, but that needs to come AFTER a proper replacement is avaliable. Also, how to generate core.txt after crash, reboot and install gdb from ports? (port instaled after crash) You can always run crashinfo by hand. /me starts to look for a new OS, this one is not very good at user support. I'd say this more warrants a set of "blessed" packages to include on install disks so we get this functionality without the extra step. I've been pushing this idea for years.. The idea of "critical" packages, where failure to build/work is regarded as much as a reason to stop-ship as a failure in the base itself. - Justin -- Rod Grimes rgri...@freebsd.org ___ 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: r317094 - head/share/mk
On 20/4/17 3:13 am, Justin Hibbits wrote: On Wed, Apr 19, 2017 at 11:33 AM, Rodney W. Grimeswrote: On Wednesday, April 19, 2017 01:28:37 AM Slawa Olhovchenkov wrote: On Tue, Apr 18, 2017 at 12:45:25PM -0700, John Baldwin wrote: On Tuesday, April 18, 2017 07:30:13 PM Slawa Olhovchenkov wrote: On Tue, Apr 18, 2017 at 04:27:48PM +, John Baldwin wrote: Author: jhb Date: Tue Apr 18 16:27:48 2017 New Revision: 317094 URL: https://svnweb.freebsd.org/changeset/base/317094 Log: Disable in-tree GDB by default on x86, mips, and powerpc. GDB in ports contains all of the functionality as GDB in base (including kgdb) for these platforms along with additional functionality. In-tree GDB remains enabled on ARM and sparc64. GDB in ports does not currently support kernel debugging on arm, and ports GDB for sparc64 has not been tested (though it does include sparc64 support). Reviewed by:bdrewery, emaste, imp Relnotes: yes Sponsored by: DARPA / AFRL Differential Revision: https://reviews.freebsd.org/D10399 Generating core.txt now complety broken? No. crashinfo has supported gdb from ports for quite a while now. If you 'pkg install gdb' crashinfo defaults to using the ports gdb over the base one already. I am about clean install, w/o ports. Until we get some sort of klldb support that will not work. However, we already have platforms now where /usr/bin/gdb doesn't work for that. riscv and aarch64 aren't supported in ancient gdb, and the MIPS /usr/bin/gdb didn't really work for me in my testing. So we break what worked on a Tier1 Platform? With my "user" hat on these are the exact kind of breakages that send me looking for another platform to run on. We far to often just go oh you can do X y and Z to get around what we broke forgetting that the user 6 months from now when this hits a release isnt gona come ask, he may just go down the road to something else. Remove gdb WHEN klldb can replace it, not a day before. Using "oh its broken on aarch64 and mips" is not a reason to break things on i386/amd64. It's not removed, it's disabled by default now. As the commit message states, gdb in ports is much more feature filled than gdb in base yeah but we ship both (on 10.3) because we've had issues where one or the other crashes.. Yes, I know we want to get gnu stuff out of the tree, but that needs to come AFTER a proper replacement is avaliable. Also, how to generate core.txt after crash, reboot and install gdb from ports? (port instaled after crash) You can always run crashinfo by hand. /me starts to look for a new OS, this one is not very good at user support. I'd say this more warrants a set of "blessed" packages to include on install disks so we get this functionality without the extra step. - Justin -- Rod Grimes rgri...@freebsd.org ___ 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: r317171 - head/sys/dev/vt
On 19 April 2017 at 18:21, Jung-uk Kimwrote: > Author: jkim > Date: Wed Apr 19 22:21:15 2017 > New Revision: 317171 > URL: https://svnweb.freebsd.org/changeset/base/317171 > > Log: > Micro-optimize vt_set_border(). I expect we'll eventually have vt drivers that have a non-trivial vd_drawrect, making the previous implementation preferable. Can you comment a bit more on this change? ___ 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: r317094 - head/share/mk
On 19/4/2017 17:18, Rodney W. Grimes wrote: [ Charset windows-1252 unsupported, converting... ] Generating core.txt now complety broken? No. crashinfo has supported gdb from ports for quite a while now. If you 'pkg install gdb' crashinfo defaults to using the ports gdb over the base one already. I am about clean install, w/o ports. Until we get some sort of klldb support that will not work. However, we already have platforms now where /usr/bin/gdb doesn't work for that. riscv and aarch64 aren't supported in ancient gdb, and the MIPS /usr/bin/gdb didn't really work for me in my testing. So we break what worked on a Tier1 Platform? With my "user" hat on these are the exact kind of breakages that send me looking for another platform to run on. We far to often just go oh you can do X y and Z to get around what we broke forgetting that the user 6 months from now when this hits a release isnt gona come ask, he may just go down the road to something else. Remove gdb WHEN klldb can replace it, not a day before. Using "oh its broken on aarch64 and mips" is not a reason to break things on i386/amd64. Yes, I know we want to get gnu stuff out of the tree, but that needs to come AFTER a proper replacement is avaliable. Also, how to generate core.txt after crash, reboot and install gdb from ports? (port instaled after crash) You can always run crashinfo by hand. /me starts to look for a new OS, this one is not very good at user support. # crashinfo Please install GDB and run 'crashinfo' again. The easiest way to install GDB is: pkg install gdb Unable to find matching kernel for /var/crash/vmcore.1 https://reviews.freebsd.org/D10429 This should be good enough to keep the user from looking for a new OS. It also gets a much better version of GDB onto the box, which will make the user happier than giving them an ancient one and letting them flail around with it for a while before learning that they should install a newer one. Actually this is exactly what I would expect from Linux! Does linux include a kernel debugger now? Last I heard Linus was against debuggers, just as he was once against version control ... and Codes of Conduct. Why do we need to pull the trigger on GDB other than to pull the trigger to say we are GPL free, if that is the reason then this is the wrong way to go about it. Well, one of the reasons may be that we need a debugger that supports newer DWARF. At some time we started hacking our llvm to not use a recent dwarf versions(4?). Pedro. ___ 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: r317177 - head/sys/netinet
Author: np Date: Wed Apr 19 23:06:07 2017 New Revision: 317177 URL: https://svnweb.freebsd.org/changeset/base/317177 Log: Free lro_hash unconditionally, just like lro_mbuf_data a few lines later. Fix whitespace nit while here. Modified: head/sys/netinet/tcp_lro.c Modified: head/sys/netinet/tcp_lro.c == --- head/sys/netinet/tcp_lro.c Wed Apr 19 22:50:19 2017(r317176) +++ head/sys/netinet/tcp_lro.c Wed Apr 19 23:06:07 2017(r317177) @@ -175,17 +175,15 @@ tcp_lro_free(struct lro_ctrl *lc) } /* free hash table */ - if (lc->lro_hash != NULL) { - free(lc->lro_hash, M_LRO); - lc->lro_hash = NULL; - } + free(lc->lro_hash, M_LRO); + lc->lro_hash = NULL; lc->lro_hashsz = 0; /* free mbuf array, if any */ for (x = 0; x != lc->lro_mbuf_count; x++) m_freem(lc->lro_mbuf_data[x].mb); lc->lro_mbuf_count = 0; - + /* free allocated memory, if any */ free(lc->lro_mbuf_data, M_LRO); lc->lro_mbuf_data = 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"
Re: svn commit: r317094 - head/share/mk
> On Apr 19, 2017, at 15:22, Warner Loshwrote: ... >> Actually this is exactly what I would expect from Linux! >> >> Why do we need to pull the trigger on GDB other than to pull the trigger >> to say we are GPL free, if that is the reason then this is the wrong >> way to go about it. > > I think "gdb in base is horribly broken" is the real reason. You need > the port to do anything non-trivial these days. > > Plus core set this as a goal for the project after it was clear that > was a consensus desire several years ago. Can't fault someone for > working towards that goal. +1 to Warner's sentiments. gdb in base doesn't work well with threads (6.x never did ;/..), and lacks support for other things (like python debugging). Being able to debug threads reliably is a make or break thing. So while I understand and in general agree with you Rod, I completely disagree on the practical end of things. I'm actually kind of curious as to why this isn't being done globally.. but I assume that it was described in one of the many threads some time ago about the status quo for debugging with gdb on tier-two architectures. Thanks, -Ngie ___ 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: r317176 - head/sys/sys
Author: glebius Date: Wed Apr 19 22:50:19 2017 New Revision: 317176 URL: https://svnweb.freebsd.org/changeset/base/317176 Log: Bump __FreeBSD_version due to r317061, struct vmmeter changes. Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hWed Apr 19 22:48:27 2017(r317175) +++ head/sys/sys/param.hWed Apr 19 22:50:19 2017(r317176) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1200028 /* Master, propagated to newvers */ +#define __FreeBSD_version 1200029 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ 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: r317175 - head/sys/dev/syscons
Author: glebius Date: Wed Apr 19 22:48:27 2017 New Revision: 317175 URL: https://svnweb.freebsd.org/changeset/base/317175 Log: Fix build without SC_PIXEL_MODE defined. Modified: head/sys/dev/syscons/scvgarndr.c Modified: head/sys/dev/syscons/scvgarndr.c == --- head/sys/dev/syscons/scvgarndr.cWed Apr 19 22:43:11 2017 (r317174) +++ head/sys/dev/syscons/scvgarndr.cWed Apr 19 22:48:27 2017 (r317175) @@ -173,7 +173,8 @@ static const struct mousedata mouse9x13 0x0c00, 0x0c00, 0x0600, 0x0600, 0x, 0x, 0x, 0x, }, 9, 13, }; - +#endif +#if defined(SC_PIXEL_MODE) static const struct mousedata mouse10x16 = { { 0xc000, 0xa000, 0x9000, 0x8800, 0x8400, 0x8200, 0x8100, 0x8080, 0x8040, 0x83c0, 0x9200, 0xa900, 0xc900, 0x0480, 0x0480, 0x0300, }, { ___ 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: r317168 - in head: share/mk tools/build/options usr.sbin/rpcbind
> On Apr 19, 2017, at 13:45, Ngie Cooperwrote: > > Author: ngie > Date: Wed Apr 19 20:45:46 2017 > New Revision: 317168 > URL: https://svnweb.freebsd.org/changeset/base/317168 > > Log: > Add a knob, WITH*_RPCBIND_WARMSTART_SUPPORT, to allow the end-user to build > rpcbind(8) with/without warmstart support. > > The knob defaults to off to preserve POLA for the feature. > > See rpcbind(8) for more details about the warmstart feature. I haven't regenerated src.conf(5) yet due to other items I noticed were missing when running makeman. I'll regenerate it sometime today. Thanks, -Ngie ___ 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: r317174 - head/sys/dev/vt
Author: jkim Date: Wed Apr 19 22:43:11 2017 New Revision: 317174 URL: https://svnweb.freebsd.org/changeset/base/317174 Log: Revert r316796. It is not necessary since r317173. Modified: head/sys/dev/vt/vt_cpulogos.c Modified: head/sys/dev/vt/vt_cpulogos.c == --- head/sys/dev/vt/vt_cpulogos.c Wed Apr 19 22:41:24 2017 (r317173) +++ head/sys/dev/vt/vt_cpulogos.c Wed Apr 19 22:43:11 2017 (r317174) @@ -153,7 +153,6 @@ vt_fini_logos(void *dummy __unused) struct winsize wsz; term_pos_t size; unsigned int i; - int row; if (!vt_draw_logo_cpus) return; @@ -171,7 +170,7 @@ vt_fini_logos(void *dummy __unused) vt_draw_logo_cpus = 0; VT_UNLOCK(vd); - for (i = row = 0; i < VT_MAXWINDOWS; i++) { + for (i = 0; i < VT_MAXWINDOWS; i++) { vw = vd->vd_windows[i]; if (vw == NULL) continue; @@ -194,16 +193,11 @@ vt_fini_logos(void *dummy __unused) vt_compute_drawable_area(vw); if (vd->vd_curwindow == vw) { - row = vw->vw_draw_area.tr_begin.tp_row; vd->vd_flags |= VDF_INVALID; vt_resume_flush_timer(vd, 0); } VT_UNLOCK(vd); } - - if (row > 0 && vd->vd_driver->vd_drawrect != NULL) - vd->vd_driver->vd_drawrect(vd, 0, 0, vd->vd_width, row - 1, - 1, TC_BLACK); } static void ___ 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: r317173 - head/sys/dev/vt
Author: jkim Date: Wed Apr 19 22:41:24 2017 New Revision: 317173 URL: https://svnweb.freebsd.org/changeset/base/317173 Log: Always clear borders when the terminal is flushed. PR: 202288 Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c == --- head/sys/dev/vt/vt_core.c Wed Apr 19 22:27:26 2017(r317172) +++ head/sys/dev/vt/vt_core.c Wed Apr 19 22:41:24 2017(r317173) @@ -1149,6 +1149,34 @@ vt_mark_mouse_position_as_dirty(struct v } #endif +static void +vt_set_border(struct vt_window *vw, term_color_t c) +{ + struct vt_device *vd = vw->vw_device; + term_rect_t *vda = >vw_draw_area; + int x, y; + + /* Top bar. */ + for (y = 0; y < vda->tr_begin.tp_row; y++) + for (x = 0; x < vd->vd_width; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); + + for (y = vda->tr_begin.tp_row; y <= vda->tr_end.tp_row; y++) { + /* Left bar. */ + for (x = 0; x < vda->tr_begin.tp_col; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); + + /* Right bar. */ + for (x = vda->tr_end.tp_col + 1; x < vd->vd_width; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); + } + + /* Bottom bar. */ + for (y = vda->tr_end.tp_row + 1; y < vd->vd_height; y++) + for (x = 0; x < vd->vd_width; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); +} + static int vt_flush(struct vt_device *vd) { @@ -1214,6 +1242,7 @@ vt_flush(struct vt_device *vd) if (vd->vd_flags & VDF_INVALID) { vd->vd_flags &= ~VDF_INVALID; + vt_set_border(vw, TC_BLACK); vt_termrect(vd, vf, ); if (vt_draw_logo_cpus) vtterm_draw_cpu_logos(vd); @@ -1528,34 +1557,6 @@ vtterm_opened(struct terminal *tm, int o VT_UNLOCK(vd); } -static void -vt_set_border(struct vt_window *vw, term_color_t c) -{ - struct vt_device *vd = vw->vw_device; - term_rect_t *vda = >vw_draw_area; - int x, y; - - /* Top bar. */ - for (y = 0; y < vda->tr_begin.tp_row; y++) - for (x = 0; x < vd->vd_width; x++) - vd->vd_driver->vd_setpixel(vd, x, y, c); - - for (y = vda->tr_begin.tp_row; y <= vda->tr_end.tp_row; y++) { - /* Left bar. */ - for (x = 0; x < vda->tr_begin.tp_col; x++) - vd->vd_driver->vd_setpixel(vd, x, y, c); - - /* Right bar. */ - for (x = vda->tr_end.tp_col + 1; x < vd->vd_width; x++) - vd->vd_driver->vd_setpixel(vd, x, y, c); - } - - /* Bottom bar. */ - for (y = vda->tr_end.tp_row + 1; y < vd->vd_height; y++) - for (x = 0; x < vd->vd_width; x++) - vd->vd_driver->vd_setpixel(vd, x, y, c); -} - static int vt_change_font(struct vt_window *vw, struct vt_font *vf) { @@ -1621,7 +1622,6 @@ vt_change_font(struct vt_window *vw, str /* Force a full redraw the next timer tick. */ if (vd->vd_curwindow == vw) { - vt_set_border(vw, TC_BLACK); vd->vd_flags |= VDF_INVALID; vt_resume_flush_timer(vw->vw_device, 0); } ___ 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: r317094 - head/share/mk
At this point is there anything that the gdb port does not do, that the base version does? I know a lot of work has gone into making it a strict superset. mcl ___ 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: r317172 - head/sys/netinet
Author: np Date: Wed Apr 19 22:27:26 2017 New Revision: 317172 URL: https://svnweb.freebsd.org/changeset/base/317172 Log: Do not leak lro_hash on failure to allocate lro_mbuf_data. MFC after:1 week Modified: head/sys/netinet/tcp_lro.c Modified: head/sys/netinet/tcp_lro.c == --- head/sys/netinet/tcp_lro.c Wed Apr 19 22:21:15 2017(r317171) +++ head/sys/netinet/tcp_lro.c Wed Apr 19 22:27:26 2017(r317172) @@ -144,6 +144,7 @@ tcp_lro_init_args(struct lro_ctrl *lc, s /* check for out of memory */ if (lc->lro_mbuf_data == NULL) { + free(lc->lro_hash, M_LRO); memset(lc, 0, sizeof(*lc)); return (ENOMEM); } ___ 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: r317094 - head/share/mk
On Wed, Apr 19, 2017 at 4:18 PM, Rodney W. Grimeswrote: > [ Charset windows-1252 unsupported, converting... ] >> > Generating core.txt now complety broken? >> >> No. crashinfo has supported gdb from ports for quite a while now. >> If you 'pkg install gdb' crashinfo defaults to using the ports gdb over >> the base one already. >> >>> >> >>> I am about clean install, w/o ports. >> >> >> >> Until we get some sort of klldb support that will not work. However, >> >> we already have platforms now where /usr/bin/gdb doesn't work for that. >> >> riscv and aarch64 aren't supported in ancient gdb, and the MIPS >> >> /usr/bin/gdb didn't really work for me in my testing. >> > >> > So we break what worked on a Tier1 Platform? With my "user" hat on >> > these are the exact kind of breakages that send me looking for another >> > platform to run on. We far to often just go oh you can do X y and Z >> > to get around what we broke forgetting that the user 6 months from now >> > when this hits a release isnt gona come ask, he may just go down the >> > road to something else. >> > >> > Remove gdb WHEN klldb can replace it, not a day before. Using "oh its >> > broken on aarch64 and mips" is not a reason to break things on i386/amd64. >> > >> > Yes, I know we want to get gnu stuff out of the tree, but that needs >> > to come AFTER a proper replacement is avaliable. >> > >> >> >> >>> Also, how to generate core.txt after crash, reboot and install gdb >> >>> from ports? (port instaled after crash) >> >> >> >> You can always run crashinfo by hand. >> > >> > /me starts to look for a new OS, this one is not very good at user support. >> >> # crashinfo >> Please install GDB and run 'crashinfo' again. >> The easiest way to install GDB is: pkg install gdb >> Unable to find matching kernel for /var/crash/vmcore.1 >> >> https://reviews.freebsd.org/D10429 >> >> This should be good enough to keep the user from looking for a new OS. >> It also gets a much better version of GDB onto the box, which will make >> the user happier than giving them an ancient one and letting them flail >> around with it for a while before learning that they should install a >> newer one. > > Actually this is exactly what I would expect from Linux! > > Why do we need to pull the trigger on GDB other than to pull the trigger > to say we are GPL free, if that is the reason then this is the wrong > way to go about it. I think "gdb in base is horribly broken" is the real reason. You need the port to do anything non-trivial these days. Plus core set this as a goal for the project after it was clear that was a consensus desire several years ago. Can't fault someone for working towards that goal. > As I said, pull the trigger when you have a new tool in base to replace > what I have expected to be in base, have been using in base for 2.5 > decades, and not a day before. > > Your fixing a single point issue, crashinfo, where is my debugger, and > why cant it do the crashinfo stuff??? Things break with progress. That's always been true. We lost functionality when we kicked perl and TCL out of the tree. We lost functionality when we kicked sysinstall to the curb, etc. However, we've also gained functionality as well with things like clang. It's always balancing act. I think we've bent over too far backwards with gdb, and it's time to kick it to the curb entirely. Warner ___ 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: r317171 - head/sys/dev/vt
Author: jkim Date: Wed Apr 19 22:21:15 2017 New Revision: 317171 URL: https://svnweb.freebsd.org/changeset/base/317171 Log: Micro-optimize vt_set_border(). Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c == --- head/sys/dev/vt/vt_core.c Wed Apr 19 22:20:41 2017(r317170) +++ head/sys/dev/vt/vt_core.c Wed Apr 19 22:21:15 2017(r317171) @@ -1528,43 +1528,32 @@ vtterm_opened(struct terminal *tm, int o VT_UNLOCK(vd); } -static int +static void vt_set_border(struct vt_window *vw, term_color_t c) { struct vt_device *vd = vw->vw_device; - - if (vd->vd_driver->vd_drawrect == NULL) - return (ENOTSUP); + term_rect_t *vda = >vw_draw_area; + int x, y; /* Top bar. */ - if (vw->vw_draw_area.tr_begin.tp_row > 0) - vd->vd_driver->vd_drawrect(vd, - 0, 0, - vd->vd_width - 1, vw->vw_draw_area.tr_begin.tp_row - 1, - 1, c); - - /* Left bar. */ - if (vw->vw_draw_area.tr_begin.tp_col > 0) - vd->vd_driver->vd_drawrect(vd, - 0, 0, - vw->vw_draw_area.tr_begin.tp_col - 1, vd->vd_height - 1, - 1, c); - - /* Right bar. */ - if (vw->vw_draw_area.tr_end.tp_col < vd->vd_width) - vd->vd_driver->vd_drawrect(vd, - vw->vw_draw_area.tr_end.tp_col - 1, 0, - vd->vd_width - 1, vd->vd_height - 1, - 1, c); + for (y = 0; y < vda->tr_begin.tp_row; y++) + for (x = 0; x < vd->vd_width; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); + + for (y = vda->tr_begin.tp_row; y <= vda->tr_end.tp_row; y++) { + /* Left bar. */ + for (x = 0; x < vda->tr_begin.tp_col; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); + + /* Right bar. */ + for (x = vda->tr_end.tp_col + 1; x < vd->vd_width; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); + } /* Bottom bar. */ - if (vw->vw_draw_area.tr_end.tp_row < vd->vd_height) - vd->vd_driver->vd_drawrect(vd, - 0, vw->vw_draw_area.tr_end.tp_row - 1, - vd->vd_width - 1, vd->vd_height - 1, - 1, c); - - return (0); + for (y = vda->tr_end.tp_row + 1; y < vd->vd_height; y++) + for (x = 0; x < vd->vd_width; x++) + vd->vd_driver->vd_setpixel(vd, x, y, c); } static int ___ 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: r317170 - head/sys/netinet
Author: np Date: Wed Apr 19 22:20:41 2017 New Revision: 317170 URL: https://svnweb.freebsd.org/changeset/base/317170 Log: Remove redundant assignment. Modified: head/sys/netinet/tcp_lro.c Modified: head/sys/netinet/tcp_lro.c == --- head/sys/netinet/tcp_lro.c Wed Apr 19 21:18:06 2017(r317169) +++ head/sys/netinet/tcp_lro.c Wed Apr 19 22:20:41 2017(r317170) @@ -115,7 +115,6 @@ tcp_lro_init_args(struct lro_ctrl *lc, s lc->lro_bad_csum = 0; lc->lro_queued = 0; lc->lro_flushed = 0; - lc->lro_cnt = 0; lc->lro_mbuf_count = 0; lc->lro_mbuf_max = lro_mbufs; lc->lro_cnt = lro_entries; ___ 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: r317094 - head/share/mk
[ Charset windows-1252 unsupported, converting... ] > > Generating core.txt now complety broken? > > No. crashinfo has supported gdb from ports for quite a while now. > If you 'pkg install gdb' crashinfo defaults to using the ports gdb over > the base one already. > >>> > >>> I am about clean install, w/o ports. > >> > >> Until we get some sort of klldb support that will not work. However, > >> we already have platforms now where /usr/bin/gdb doesn't work for that. > >> riscv and aarch64 aren't supported in ancient gdb, and the MIPS > >> /usr/bin/gdb didn't really work for me in my testing. > > > > So we break what worked on a Tier1 Platform? With my "user" hat on > > these are the exact kind of breakages that send me looking for another > > platform to run on. We far to often just go oh you can do X y and Z > > to get around what we broke forgetting that the user 6 months from now > > when this hits a release isnt gona come ask, he may just go down the > > road to something else. > > > > Remove gdb WHEN klldb can replace it, not a day before. Using "oh its > > broken on aarch64 and mips" is not a reason to break things on i386/amd64. > > > > Yes, I know we want to get gnu stuff out of the tree, but that needs > > to come AFTER a proper replacement is avaliable. > > > >> > >>> Also, how to generate core.txt after crash, reboot and install gdb > >>> from ports? (port instaled after crash) > >> > >> You can always run crashinfo by hand. > > > > /me starts to look for a new OS, this one is not very good at user support. > > # crashinfo > Please install GDB and run 'crashinfo' again. > The easiest way to install GDB is: pkg install gdb > Unable to find matching kernel for /var/crash/vmcore.1 > > https://reviews.freebsd.org/D10429 > > This should be good enough to keep the user from looking for a new OS. > It also gets a much better version of GDB onto the box, which will make > the user happier than giving them an ancient one and letting them flail > around with it for a while before learning that they should install a > newer one. Actually this is exactly what I would expect from Linux! Why do we need to pull the trigger on GDB other than to pull the trigger to say we are GPL free, if that is the reason then this is the wrong way to go about it. As I said, pull the trigger when you have a new tool in base to replace what I have expected to be in base, have been using in base for 2.5 decades, and not a day before. Your fixing a single point issue, crashinfo, where is my debugger, and why cant it do the crashinfo stuff??? -- Rod Grimes rgri...@freebsd.org ___ 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: r317169 - head/release/tools
Author: gjb Date: Wed Apr 19 21:18:06 2017 New Revision: 317169 URL: https://svnweb.freebsd.org/changeset/base/317169 Log: Trim trailing '/release/..' when setting _OBJDIR so arm64/aarch64 boot1.efifat is properly located when creating virtual machine images. Sponsored by: The FreeBSD Foundation Modified: head/release/tools/vmimage.subr Modified: head/release/tools/vmimage.subr == --- head/release/tools/vmimage.subr Wed Apr 19 20:45:46 2017 (r317168) +++ head/release/tools/vmimage.subr Wed Apr 19 21:18:06 2017 (r317169) @@ -15,6 +15,7 @@ write_partition_layout() { fi _OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)" + _OBJDIR="$(realpath ${_OBJDIR})" if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot" 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: r317168 - in head: share/mk tools/build/options usr.sbin/rpcbind
Author: ngie Date: Wed Apr 19 20:45:46 2017 New Revision: 317168 URL: https://svnweb.freebsd.org/changeset/base/317168 Log: Add a knob, WITH*_RPCBIND_WARMSTART_SUPPORT, to allow the end-user to build rpcbind(8) with/without warmstart support. The knob defaults to off to preserve POLA for the feature. See rpcbind(8) for more details about the warmstart feature. MFC after:7 weeks Relnotes: yes Sponsored by: Dell EMC Isilon Added: head/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT (contents, props changed) Modified: head/share/mk/src.opts.mk head/usr.sbin/rpcbind/Makefile Modified: head/share/mk/src.opts.mk == --- head/share/mk/src.opts.mk Wed Apr 19 20:35:47 2017(r317167) +++ head/share/mk/src.opts.mk Wed Apr 19 20:45:46 2017(r317168) @@ -186,6 +186,7 @@ __DEFAULT_NO_OPTIONS = \ OFED \ OPENLDAP \ REPRODUCIBLE_BUILD \ +RPCBIND_WARMSTART_SUPPORT \ SHARED_TOOLCHAIN \ SORT_THREADS \ SVN \ Added: head/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT Wed Apr 19 20:45:46 2017(r317168) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to build +.Xr rpcbind 8 +with warmstart support. Modified: head/usr.sbin/rpcbind/Makefile == --- head/usr.sbin/rpcbind/Makefile Wed Apr 19 20:35:47 2017 (r317167) +++ head/usr.sbin/rpcbind/Makefile Wed Apr 19 20:45:46 2017 (r317168) @@ -14,6 +14,10 @@ CFLAGS+= -DPORTMAP CFLAGS+= -DINET6 .endif +.if ${MK_RPCBIND_WARMSTART_SUPPORT} != "no" +CFLAGS+= -DWARMSTART +.endif + .if ${MK_TCP_WRAPPERS} != "no" CFLAGS+= -DLIBWRAP LIBADD+= wrap ___ 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: r317167 - head/tools/build/options
Author: ngie Date: Wed Apr 19 20:35:47 2017 New Revision: 317167 URL: https://svnweb.freebsd.org/changeset/base/317167 Log: Add WITH_CXX to complement WITHOUT_CXX and placate makeman's complaints MFC after:7 weeks Sponsored by: Dell EMC Isilon Added: head/tools/build/options/WITH_CXX - copied, changed from r317153, head/tools/build/options/WITHOUT_CXX Copied and modified: head/tools/build/options/WITH_CXX (from r317153, head/tools/build/options/WITHOUT_CXX) == --- head/tools/build/options/WITHOUT_CXXWed Apr 19 17:32:32 2017 (r317153, copy source) +++ head/tools/build/options/WITH_CXX Wed Apr 19 20:35:47 2017 (r317167) @@ -1,8 +1,4 @@ .\" $FreeBSD$ -Set to not build +Set to build .Xr c++ 1 and related libraries. -It will also prevent building of -.Xr gperf 1 -and -.Xr devd 8 . ___ 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: r317166 - head/usr.bin/pom
Author: manu Date: Wed Apr 19 20:35:04 2017 New Revision: 317166 URL: https://svnweb.freebsd.org/changeset/base/317166 Log: pom: Remove useless cap_rights_init Pointy-Hat: manu Reported by: bapt Modified: head/usr.bin/pom/pom.c Modified: head/usr.bin/pom/pom.c == --- head/usr.bin/pom/pom.c Wed Apr 19 20:27:48 2017(r317165) +++ head/usr.bin/pom/pom.c Wed Apr 19 20:35:04 2017(r317166) @@ -86,7 +86,6 @@ static void usage(char *progname); int main(int argc, char **argv) { - cap_rights_t rights; time_t tt; struct tm GMT, tmd; double days, today, tomorrow; @@ -96,7 +95,6 @@ main(int argc, char **argv) if (caph_limit_stdio() < 0) err(1, "unable to limit capabitilities for stdio"); - cap_rights_init(, CAP_WRITE); caph_cache_catpages(); if (cap_enter() < 0 && errno != ENOSYS) ___ 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: r317165 - head/usr.bin/pom
Author: manu Date: Wed Apr 19 20:27:48 2017 New Revision: 317165 URL: https://svnweb.freebsd.org/changeset/base/317165 Log: Capsicumize pom Since pom is the only binary that can save lives, capsicumize it to be sure that it's safe to run it. Reviewed by: bapt Modified: head/usr.bin/pom/pom.c Modified: head/usr.bin/pom/pom.c == --- head/usr.bin/pom/pom.c Wed Apr 19 20:27:13 2017(r317164) +++ head/usr.bin/pom/pom.c Wed Apr 19 20:27:48 2017(r317165) @@ -53,6 +53,11 @@ __FBSDID("$FreeBSD$"); * */ +#include +#include + +#include +#include #include #include #include @@ -81,6 +86,7 @@ static void usage(char *progname); int main(int argc, char **argv) { + cap_rights_t rights; time_t tt; struct tm GMT, tmd; double days, today, tomorrow; @@ -88,6 +94,14 @@ main(int argc, char **argv) char *odate = NULL, *otime = NULL; char *progname = argv[0]; + if (caph_limit_stdio() < 0) + err(1, "unable to limit capabitilities for stdio"); + cap_rights_init(, CAP_WRITE); + + caph_cache_catpages(); + if (cap_enter() < 0 && errno != ENOSYS) + err(1, "unable to enter capability mode"); + while ((ch = getopt(argc, argv, "d:pt:")) != -1) switch (ch) { case 'd': ___ 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: r317164 - head/usr.sbin/rpcbind
Author: ngie Date: Wed Apr 19 20:27:13 2017 New Revision: 317164 URL: https://svnweb.freebsd.org/changeset/base/317164 Log: Fix indentation per style.Makefile(5) MFC after:7 weeks Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpcbind/Makefile Modified: head/usr.sbin/rpcbind/Makefile == --- head/usr.sbin/rpcbind/Makefile Wed Apr 19 20:23:27 2017 (r317163) +++ head/usr.sbin/rpcbind/Makefile Wed Apr 19 20:27:13 2017 (r317164) @@ -15,12 +15,12 @@ CFLAGS+= -DINET6 .endif .if ${MK_TCP_WRAPPERS} != "no" -CFLAGS+= -DLIBWRAP -LIBADD+= wrap +CFLAGS+= -DLIBWRAP +LIBADD+= wrap .endif .if ${MK_TESTS} != "no" -SUBDIR+= tests +SUBDIR+= tests .endif WARNS?=1 ___ 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: r317163 - head/usr.sbin/rpcbind
Author: ngie Date: Wed Apr 19 20:23:27 2017 New Revision: 317163 URL: https://svnweb.freebsd.org/changeset/base/317163 Log: rpcbind(8): post-humously document -w (warmstart) support added in r74462 warmstart support saves portmap/rpcbind(8) registration state on exit and restores the saved registration state on restart. MFC after:7 weeks Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpcbind/rpcbind.8 Modified: head/usr.sbin/rpcbind/rpcbind.8 == --- head/usr.sbin/rpcbind/rpcbind.8 Wed Apr 19 20:04:45 2017 (r317162) +++ head/usr.sbin/rpcbind/rpcbind.8 Wed Apr 19 20:23:27 2017 (r317163) @@ -10,7 +10,7 @@ .Nd universal addresses to RPC program number mapper .Sh SYNOPSIS .Nm -.Op Fl 6adiLlsW +.Op Fl 6adiLlswW .Op Fl h Ar bindip .Sh DESCRIPTION The @@ -135,6 +135,22 @@ clients from using to connect to services from a privileged port. .It Fl W Enable libwrap (TCP wrappers) support. +.It Fl w +Enable the warmstart feature. +.Pp +The warmstart feature saves RPC registrations on termination. +Any saved RPC registrations are restored on restart if +.Fl w +is specified. +This feature helps avoid RPC service interruption when restarting +.Nm . +warmstart support must be compiled in to +.Nm . +Portmap registrations are stored in +.Pa /tmp/portmap.file . +.Nm +registrations are stored in +.Pa /tmp/rpcbind.file . .El .Sh NOTES All RPC servers must be restarted if @@ -142,6 +158,12 @@ All RPC servers must be restarted if is restarted. .Sh FILES .Bl -tag -width /var/run/rpcbind.sock -compact +.It Pa /tmp/portmap.file +saved portmap registrations file. +.It Pa /tmp/rpcbind.file +saved +.Nm +registrations file. .It Pa /var/run/rpcbind.sock socket used for local connections. .El ___ 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: r317094 - head/share/mk
> Generating core.txt now complety broken? No. crashinfo has supported gdb from ports for quite a while now. If you 'pkg install gdb' crashinfo defaults to using the ports gdb over the base one already. >>> >>> I am about clean install, w/o ports. >> >> Until we get some sort of klldb support that will not work. However, >> we already have platforms now where /usr/bin/gdb doesn't work for that. >> riscv and aarch64 aren't supported in ancient gdb, and the MIPS >> /usr/bin/gdb didn't really work for me in my testing. > > So we break what worked on a Tier1 Platform? With my "user" hat on > these are the exact kind of breakages that send me looking for another > platform to run on. We far to often just go oh you can do X y and Z > to get around what we broke forgetting that the user 6 months from now > when this hits a release isnt gona come ask, he may just go down the > road to something else. > > Remove gdb WHEN klldb can replace it, not a day before. Using "oh its > broken on aarch64 and mips" is not a reason to break things on i386/amd64. > > Yes, I know we want to get gnu stuff out of the tree, but that needs > to come AFTER a proper replacement is avaliable. > >> >>> Also, how to generate core.txt after crash, reboot and install gdb >>> from ports? (port instaled after crash) >> >> You can always run crashinfo by hand. > > /me starts to look for a new OS, this one is not very good at user support. # crashinfo Please install GDB and run 'crashinfo' again. The easiest way to install GDB is: pkg install gdb Unable to find matching kernel for /var/crash/vmcore.1 https://reviews.freebsd.org/D10429 This should be good enough to keep the user from looking for a new OS. It also gets a much better version of GDB onto the box, which will make the user happier than giving them an ancient one and letting them flail around with it for a while before learning that they should install a newer one. Eric ___ 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: r317162 - head/usr.sbin/rpcbind
Author: ngie Date: Wed Apr 19 20:04:45 2017 New Revision: 317162 URL: https://svnweb.freebsd.org/changeset/base/317162 Log: rpcbind(8): add a description for /var/run/rpcbind.sock under the FILES section MFC after:7 weeks Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpcbind/rpcbind.8 Modified: head/usr.sbin/rpcbind/rpcbind.8 == --- head/usr.sbin/rpcbind/rpcbind.8 Wed Apr 19 19:55:38 2017 (r317161) +++ head/usr.sbin/rpcbind/rpcbind.8 Wed Apr 19 20:04:45 2017 (r317162) @@ -143,6 +143,7 @@ is restarted. .Sh FILES .Bl -tag -width /var/run/rpcbind.sock -compact .It Pa /var/run/rpcbind.sock +socket used for local connections. .El .Sh SEE ALSO .Xr rpcbind 3 , ___ 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: r317161 - head/usr.bin/which
Author: ngie Date: Wed Apr 19 19:55:38 2017 New Revision: 317161 URL: https://svnweb.freebsd.org/changeset/base/317161 Log: which(1): sort #includes No functional change [intended]. MFC after:7 weeks Sponsored by: Dell EMC Isilon Modified: head/usr.bin/which/which.c Modified: head/usr.bin/which/which.c == --- head/usr.bin/which/which.c Wed Apr 19 19:52:40 2017(r317160) +++ head/usr.bin/which/which.c Wed Apr 19 19:55:38 2017(r317161) @@ -28,9 +28,8 @@ __FBSDID("$FreeBSD$"); -#include #include - +#include #include #include #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: r317160 - head/usr.bin/which
Author: ngie Date: Wed Apr 19 19:52:40 2017 New Revision: 317160 URL: https://svnweb.freebsd.org/changeset/base/317160 Log: Clean up trailing whitespace No functional changes MFC after:1 week Sponsored by: Dell EMC Isilon Modified: head/usr.bin/which/which.c Modified: head/usr.bin/which/which.c == --- head/usr.bin/which/which.c Wed Apr 19 19:06:47 2017(r317159) +++ head/usr.bin/which/which.c Wed Apr 19 19:52:40 2017(r317160) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); static void usage(void); static int print_matches(char *, char *); - + static int silent; static int allpaths; @@ -81,7 +81,7 @@ main(int argc, char **argv) while (argc > 0) { memcpy(path, p, pathlen); - + if (strlen(*argv) >= FILENAME_MAX || print_matches(path, *argv) == -1) status = EXIT_FAILURE; ___ 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: r316978 - in head: contrib/zstd etc/mtree lib lib/libzstd share/mk usr.bin usr.bin/zstd
On 19 April 2017 at 11:22, Ruslan Bukinwrote: > > I committed. Please upstream that. As jhb pointed out we should probably add __bswapdi2 to compiler-rt (it's already there for ARM). I would assume that libgcc also has it, and this is a workaround for our slightly unusual case of GCC w/ a compiler-rt patched for RISC-V. If so this should not be sent upstream. ___ 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: r317094 - head/share/mk
On Wed, Apr 19, 2017 at 11:33 AM, Rodney W. Grimeswrote: >> On Wednesday, April 19, 2017 01:28:37 AM Slawa Olhovchenkov wrote: >> > On Tue, Apr 18, 2017 at 12:45:25PM -0700, John Baldwin wrote: >> > >> > > On Tuesday, April 18, 2017 07:30:13 PM Slawa Olhovchenkov wrote: >> > > > On Tue, Apr 18, 2017 at 04:27:48PM +, John Baldwin wrote: >> > > > >> > > > > Author: jhb >> > > > > Date: Tue Apr 18 16:27:48 2017 >> > > > > New Revision: 317094 >> > > > > URL: https://svnweb.freebsd.org/changeset/base/317094 >> > > > > >> > > > > Log: >> > > > > Disable in-tree GDB by default on x86, mips, and powerpc. >> > > > > >> > > > > GDB in ports contains all of the functionality as GDB in base >> > > > > (including kgdb) for these platforms along with additional >> > > > > functionality. In-tree GDB remains enabled on ARM and sparc64. >> > > > > GDB in ports does not currently support kernel debugging on arm, >> > > > > and ports GDB for sparc64 has not been tested (though it does >> > > > > include sparc64 support). >> > > > > >> > > > > Reviewed by:bdrewery, emaste, imp >> > > > > Relnotes: yes >> > > > > Sponsored by: DARPA / AFRL >> > > > > Differential Revision: https://reviews.freebsd.org/D10399 >> > > > >> > > > Generating core.txt now complety broken? >> > > >> > > No. crashinfo has supported gdb from ports for quite a while now. >> > > If you 'pkg install gdb' crashinfo defaults to using the ports gdb over >> > > the base one already. >> > >> > I am about clean install, w/o ports. >> >> Until we get some sort of klldb support that will not work. However, >> we already have platforms now where /usr/bin/gdb doesn't work for that. >> riscv and aarch64 aren't supported in ancient gdb, and the MIPS >> /usr/bin/gdb didn't really work for me in my testing. > > So we break what worked on a Tier1 Platform? With my "user" hat on > these are the exact kind of breakages that send me looking for another > platform to run on. We far to often just go oh you can do X y and Z > to get around what we broke forgetting that the user 6 months from now > when this hits a release isnt gona come ask, he may just go down the > road to something else. > > Remove gdb WHEN klldb can replace it, not a day before. Using "oh its > broken on aarch64 and mips" is not a reason to break things on i386/amd64. > It's not removed, it's disabled by default now. As the commit message states, gdb in ports is much more feature filled than gdb in base > Yes, I know we want to get gnu stuff out of the tree, but that needs > to come AFTER a proper replacement is avaliable. > >> >> > Also, how to generate core.txt after crash, reboot and install gdb >> > from ports? (port instaled after crash) >> >> You can always run crashinfo by hand. > > /me starts to look for a new OS, this one is not very good at user support. I'd say this more warrants a set of "blessed" packages to include on install disks so we get this functionality without the extra step. - Justin > > > -- > Rod Grimes rgri...@freebsd.org > ___ 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: r317159 - head/contrib/libstdc++/config/abi/pre
Author: emaste Date: Wed Apr 19 19:06:47 2017 New Revision: 317159 URL: https://svnweb.freebsd.org/changeset/base/317159 Log: libstdc++: fix symbol version script for LLD LLD is less tolerant of inconsistencies in the symbol version script. - Add a ; on the last entry in a version block - Remove duplicated symbols, retaining those in the earliest block Reviewed by: bdrewery MFC after:1 month Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D10428 Modified: head/contrib/libstdc++/config/abi/pre/gnu.ver Modified: head/contrib/libstdc++/config/abi/pre/gnu.ver == --- head/contrib/libstdc++/config/abi/pre/gnu.ver Wed Apr 19 18:59:38 2017(r317158) +++ head/contrib/libstdc++/config/abi/pre/gnu.ver Wed Apr 19 19:06:47 2017(r317159) @@ -121,7 +121,7 @@ GLIBCXX_3.4 { std::__moneypunct_cache*; std::__numpunct_cache*; std::__timepunct_cache*; - __gnu_debug::_Error_formatter* + __gnu_debug::_Error_formatter*; }; # Names not in an 'extern' block are mangled names. @@ -604,34 +604,6 @@ GLIBCXX_3.4.4 { } GLIBCXX_3.4.3; GLIBCXX_3.4.5 { - -# std::string -_ZNKSs11_M_disjunctEPKc; -_ZNKSs15_M_check_lengthE[jm][jm]PKc; -_ZNSs4_Rep26_M_set_length_and_sharableE*; -_ZNSs7_M_copyEPcPKc[jm]; -_ZNSs7_M_moveEPcPKc[jm]; -_ZNSs9_M_assignEPc[jm]c; - -# std::wstring -_ZNKSbIwSt11char_traitsIwESaIwEE11_M_disjunctEPKw; -_ZNKSbIwSt11char_traitsIwESaIwEE15_M_check_lengthE[jm][jm]PKc; -_ZNSbIwSt11char_traitsIwESaIwEE4_Rep26_M_set_length_and_sharableE*; -_ZNSbIwSt11char_traitsIwESaIwEE7_M_copyEPwPKw[jm]; -_ZNSbIwSt11char_traitsIwESaIwEE7_M_moveEPwPKw[jm]; -_ZNSbIwSt11char_traitsIwESaIwEE9_M_assignEPw[jm]w; - -_ZNKSt13basic_fstreamI[cw]St11char_traitsI[cw]EE7is_openEv; -_ZNKSt14basic_ifstreamI[cw]St11char_traitsI[cw]EE7is_openEv; -_ZNKSt14basic_ofstreamI[cw]St11char_traitsI[cw]EE7is_openEv; - -_ZNSi6ignoreE[ilv]; -_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreE[ilv]; - -_ZNSt11char_traitsI[cw]E2eqERK[cw]S2_; - -_ZNSt19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEppEv; - } GLIBCXX_3.4.4; GLIBCXX_3.4.6 { @@ -643,8 +615,6 @@ GLIBCXX_3.4.6 { _ZNSt15basic_stringbufI[cw]St11char_traitsI[cw]ESaI[cw]EE9showmanycEv; -_ZNKSt15basic_stringbufIwSt11char_traitsIwESaIwEE3strEv; - _ZN9__gnu_cxx6__poolILb1EE13_M_initializeEv; } GLIBCXX_3.4.5; ___ 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: r317158 - in head: share/man/man5 share/mk tools/build/options
On 19 April 2017 at 14:59, Ed Mastewrote: > Author: emaste > Date: Wed Apr 19 18:59:38 2017 > New Revision: 317158 > URL: https://svnweb.freebsd.org/changeset/base/317158 > > Log: > Remove WITHOUT_GNU and WITHOUT_GNU_SUPPORT src.conf.knobs > > These have no effect (and WITHOUT_GNU is documented as having no > effect). I intend to later introduce a WITHOUT_GPL knob to serve a > similar purpose as WITHOUT_GNU's previously documented intent, but with > a more accurate name. To avoid confusion over the transition though just > remove the existing, nonfunctional ones. Closed the editor too early: Reviewed by: jhb, bapt Differential Revision: https://reviews.freebsd.org/D10418 ___ 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: r317158 - in head: share/man/man5 share/mk tools/build/options
Author: emaste Date: Wed Apr 19 18:59:38 2017 New Revision: 317158 URL: https://svnweb.freebsd.org/changeset/base/317158 Log: Remove WITHOUT_GNU and WITHOUT_GNU_SUPPORT src.conf.knobs These have no effect (and WITHOUT_GNU is documented as having no effect). I intend to later introduce a WITHOUT_GPL knob to serve a similar purpose as WITHOUT_GNU's previously documented intent, but with a more accurate name. To avoid confusion over the transition though just remove the existing, nonfunctional ones. Deleted: head/tools/build/options/WITHOUT_GNU head/tools/build/options/WITHOUT_GNU_SUPPORT Modified: head/share/man/man5/src.conf.5 head/share/mk/src.opts.mk Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Wed Apr 19 18:35:34 2017 (r317157) +++ head/share/man/man5/src.conf.5 Wed Apr 19 18:59:38 2017 (r317158) @@ -1,6 +1,6 @@ -.\" DO NOT EDIT-- this file is automatically generated. +.\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd April 18, 2017 +.Dd April 19, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -700,19 +700,6 @@ Set to build .Pp This is a default setting on arm/arm, arm/armeb, arm/armv6 and sparc64/sparc64. -.It Va WITHOUT_GNU -Set to not build contributed GNU software as a part of the base system. -This option can be useful if the system built must not contain any code -covered by the GNU Public License due to legal reasons. -.Bf -symbolic -The option has no effect yet. -.Ef -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_GNU_SUPPORT -.El .It Va WITHOUT_GNUCXX Do not build the GNU C++ stack (g++, libstdc++). This is the default on platforms where clang is the system compiler. @@ -736,8 +723,6 @@ Set to not build GNU .It Va WITHOUT_GNU_GREP_COMPAT Set this option to omit the gnu extensions to grep from being included in BSD grep. -.It Va WITHOUT_GNU_SUPPORT -Set to build some programs without optional GNU support. .It Va WITHOUT_GPIO Set to not build .Xr gpioctl 8 Modified: head/share/mk/src.opts.mk == --- head/share/mk/src.opts.mk Wed Apr 19 18:35:34 2017(r317157) +++ head/share/mk/src.opts.mk Wed Apr 19 18:59:38 2017(r317158) @@ -96,7 +96,6 @@ __DEFAULT_YES_OPTIONS = \ FTP \ GAMES \ GCOV \ -GNU \ GNU_DIFF \ GNU_GREP \ GNU_GREP_COMPAT \ @@ -450,7 +449,6 @@ MK_${vv:H}:=${MK_${vv:T}} .for var in \ BLACKLIST \ BZIP2 \ -GNU \ INET \ INET6 \ KERBEROS \ ___ 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: r317145 - in stable/11/sys: boot/mips/uboot conf
On 19 April 2017 at 12:24, Rodney W. Grimeswrote: >> >> The linker script CONSTRUCTORS keyword is only meaningful "when linking >> object file formats which do not support arbitrary sections, such as >> ECOFF and XCOFF"[1] and is ignored for other object file formats. >> >> LLVM's lld does not yet accept (and ignore) CONSTRUCTORS, so just remove >> CONSTRUCTORS from the linker script as it has no effect. >> >> [1] https://sourceware.org/binutils/docs/ld/Output-Section-Keywords.html > > links to external data is probably not a good idea in > commit messages as it tends to disappear in time. I understand your point, but think it should be phrased differently: commit messages should stand alone. Some projects use a commit message style that consists of little more than "Fixes bug #1723" or "rdar://90210", and I agree that is insufficient. In the quoted commit message above the relevant content from the binutils documentation is quoted inline, and the URL acts as a reference for the citation. I'd argue that a citation without the URL is less useful today, and not really any worse in the case that sourceware.org disappears, given the existence of the Internet Archive and search engines that could locate the content based on the quoted content and/or portions of the URL. ___ 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: r317094 - head/share/mk
> On Wednesday, April 19, 2017 01:28:37 AM Slawa Olhovchenkov wrote: > > On Tue, Apr 18, 2017 at 12:45:25PM -0700, John Baldwin wrote: > > > > > On Tuesday, April 18, 2017 07:30:13 PM Slawa Olhovchenkov wrote: > > > > On Tue, Apr 18, 2017 at 04:27:48PM +, John Baldwin wrote: > > > > > > > > > Author: jhb > > > > > Date: Tue Apr 18 16:27:48 2017 > > > > > New Revision: 317094 > > > > > URL: https://svnweb.freebsd.org/changeset/base/317094 > > > > > > > > > > Log: > > > > > Disable in-tree GDB by default on x86, mips, and powerpc. > > > > > > > > > > GDB in ports contains all of the functionality as GDB in base > > > > > (including kgdb) for these platforms along with additional > > > > > functionality. In-tree GDB remains enabled on ARM and sparc64. > > > > > GDB in ports does not currently support kernel debugging on arm, > > > > > and ports GDB for sparc64 has not been tested (though it does > > > > > include sparc64 support). > > > > > > > > > > Reviewed by:bdrewery, emaste, imp > > > > > Relnotes: yes > > > > > Sponsored by: DARPA / AFRL > > > > > Differential Revision: https://reviews.freebsd.org/D10399 > > > > > > > > Generating core.txt now complety broken? > > > > > > No. crashinfo has supported gdb from ports for quite a while now. > > > If you 'pkg install gdb' crashinfo defaults to using the ports gdb over > > > the base one already. > > > > I am about clean install, w/o ports. > > Until we get some sort of klldb support that will not work. However, > we already have platforms now where /usr/bin/gdb doesn't work for that. > riscv and aarch64 aren't supported in ancient gdb, and the MIPS > /usr/bin/gdb didn't really work for me in my testing. So we break what worked on a Tier1 Platform? With my "user" hat on these are the exact kind of breakages that send me looking for another platform to run on. We far to often just go oh you can do X y and Z to get around what we broke forgetting that the user 6 months from now when this hits a release isnt gona come ask, he may just go down the road to something else. Remove gdb WHEN klldb can replace it, not a day before. Using "oh its broken on aarch64 and mips" is not a reason to break things on i386/amd64. Yes, I know we want to get gnu stuff out of the tree, but that needs to come AFTER a proper replacement is avaliable. > > > Also, how to generate core.txt after crash, reboot and install gdb > > from ports? (port instaled after crash) > > You can always run crashinfo by hand. /me starts to look for a new OS, this one is not very good at user support. -- Rod Grimes rgri...@freebsd.org ___ 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: r317157 - head/sys/dev/syscons
Author: bde Date: Wed Apr 19 18:35:34 2017 New Revision: 317157 URL: https://svnweb.freebsd.org/changeset/base/317157 Log: Fix missing support for drawing the mouse cursor in depth 24 of direct mode. Use the general DRAWPIXEL() macro with its bigger case statement (twice) instead of our big case statement (once). DRAWPIXEL() is more complicated since it is not missing support for depth 24 or complications for colors in depth 16 (we currently hard-code black and white so the complications for colors are not needed). DRAWPIXEL() also does the bpp calculation in the inner loop. Compilers optimize DRAWPIXEL() well enough, and the main text drawing method always depended on this. In direct mode, mouse cursor drawing is now similar to normal text drawing except it draws in 2 hard-coded colors instead of 1 variable color. This also fixes a nested hard-coding of colors. DRAWPIXEL() uses the palette in all cases, but the direct code didn't use the palette for its hard-coded black. This only had an effect in depth 8, since changing the palette is not supported in other depths. Modified: head/sys/dev/syscons/scvgarndr.c Modified: head/sys/dev/syscons/scvgarndr.c == --- head/sys/dev/syscons/scvgarndr.cWed Apr 19 18:11:08 2017 (r317156) +++ head/sys/dev/syscons/scvgarndr.cWed Apr 19 18:35:34 2017 (r317157) @@ -1127,10 +1127,6 @@ vga_pxlmouse_direct(scr_stat *scp, int x int line_width, pixel_size; int xend, yend; int i, j; - uint32_t *u32; - uint16_t *u16; - uint8_t *u8; - int bpp; mdp = (scp->font_size < 14) ? : @@ -1144,11 +1140,6 @@ vga_pxlmouse_direct(scr_stat *scp, int x yend <= (scp->yoff + scp->ysize) * scp->font_size) return; - bpp = scp->sc->adp->va_info.vi_depth; - - if ((bpp == 16) && (scp->sc->adp->va_info.vi_pixel_fsizes[1] == 5)) - bpp = 15; - line_width = scp->sc->adp->va_line_width; pixel_size = scp->sc->adp->va_info.vi_pixel_size; @@ -1165,43 +1156,12 @@ vga_pxlmouse_direct(scr_stat *scp, int x do_on: p = scp->sc->adp->va_window + y * line_width + x * pixel_size; - - for (i = 0; i < (yend - y); i++) { - for (j = (xend - x - 1); j >= 0; j--) { - switch (bpp) { - case 32: - u32 = (uint32_t*)(p + j * pixel_size); - if (mdp->md_interior[i] & (1 << (15 - j))) - writel(u32, vga_palette32[15]); - else if (mdp->md_border[i] & (1 << (15 - j))) - writel(u32, 0); - break; - case 16: - u16 = (uint16_t*)(p + j * pixel_size); - if (mdp->md_interior[i] & (1 << (15 - j))) - writew(u16, vga_palette16[15]); - else if (mdp->md_border[i] & (1 << (15 - j))) - writew(u16, 0); - break; - case 15: - u16 = (uint16_t*)(p + j * pixel_size); - if (mdp->md_interior[i] & (1 << (15 - j))) - writew(u16, vga_palette15[15]); - else if (mdp->md_border[i] & (1 << (15 - j))) - writew(u16, 0); - break; - case 8: - u8 = (uint8_t*)(p + j * pixel_size); - if (mdp->md_interior[i] & (1 << (15 - j))) - writeb(u8, 15); - else if (mdp->md_border[i] & (1 << (15 - j))) - writeb(u8, 0); - break; - } - } - - p += line_width; - } + for (i = 0; i < yend - y; i++, p += line_width) + for (j = xend - x - 1; j >= 0; j--) + if (mdp->md_interior[i] & (1 << (15 - j))) + DRAW_PIXEL(scp, p + j * pixel_size, 15); + else if (mdp->md_border[i] & (1 << (15 - j))) + DRAW_PIXEL(scp, p + j * pixel_size, 0); } static void ___ 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: r317145 - in stable/11/sys: boot/mips/uboot conf
On Wed, Apr 19, 2017 at 09:24:18AM -0700, Rodney W. Grimes wrote: > > New Revision: 317145 > > URL: https://svnweb.freebsd.org/changeset/base/317145 > > > > Log: > > ... > > [1] https://sourceware.org/binutils/docs/ld/Output-Section-Keywords.html > > links to external data is probably not a good idea in > commit messages as it tends to disappear in time. Unfortunately this is the best we can do here (apart from quoting relevant parts, but that is also not always an option). Any URL is better than nothing, and even if it disappears one day there's webarchive.org. > netbsd.org, openbsd.org, etc are propably next safer, but nothing says > one of those can not go poof some day. OpenBSD's PR links were all broken at least few years ago, not sure of right now. (Listing PR number itself would be still useful.) ./danfe ___ 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: r317145 - in stable/11/sys: boot/mips/uboot conf
[ Charset UTF-8 unsupported, converting... ] > Author: emaste > Date: Wed Apr 19 15:33:24 2017 > New Revision: 317145 > URL: https://svnweb.freebsd.org/changeset/base/317145 > > Log: > MFC r303442, r305343: remove CONSTRUCTORS from linker scripts > > r303442: remove CONSTRUCTORS from kernel linker scripts > > r305343: remove CONSTRUCTORS from MIPS uboot linker script > > The linker script CONSTRUCTORS keyword is only meaningful "when linking > object file formats which do not support arbitrary sections, such as > ECOFF and XCOFF"[1] and is ignored for other object file formats. > > LLVM's lld does not yet accept (and ignore) CONSTRUCTORS, so just remove > CONSTRUCTORS from the linker script as it has no effect. > > [1] https://sourceware.org/binutils/docs/ld/Output-Section-Keywords.html links to external data is probably not a good idea in commit messages as it tends to disappear in time. There are some notable exceptions, ie *.freebsd.org:// is normally safe, but does get broken (there are reference to phab.freebsd.org that is now review.freebsd.org. Thoug most commiters might know this someone external reading svn logs would not.) netbsd.org, openbsd.org, etc are propably next safer, but nothing says one of those can not go poof some day. Same of Illumos.org which we frequently reference. -- Rod Grimes rgri...@freebsd.org ___ 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: r317156 - head/tools/build/options
Author: emaste Date: Wed Apr 19 18:11:08 2017 New Revision: 317156 URL: https://svnweb.freebsd.org/changeset/base/317156 Log: makeman: add a comment describing purpose and invocation Reviewed by: jhb, ngie MFC after:2 weeks Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D10389 Modified: head/tools/build/options/makeman Modified: head/tools/build/options/makeman == --- head/tools/build/options/makemanWed Apr 19 18:01:53 2017 (r317155) +++ head/tools/build/options/makemanWed Apr 19 18:11:08 2017 (r317156) @@ -1,8 +1,22 @@ #!/bin/sh # # This file is in the public domain. -# # $FreeBSD$ +# +# This script is used to create the src.conf.5 man page, using template text +# contained herein and the contents of the WITH_* and WITHOUT_* files in the +# same directory. Each WITH_* and WITHOUT_* file documents the effect of the +# /etc/src.conf knob with the same name. +# +# This script invokes "make showconfig" for each supported architecture in +# order to determine, for each option, whether the default setting is always +# WITH, always WITHOUT, or is architecture-dependent. It also determines +# and describes dependencies between options. +# +# Usage: +# +# cd tools/build/options +# sh makeman > ../../../share/man/man5/src.conf.5 set -o errexit export LC_ALL=C @@ -128,7 +142,7 @@ main() fbsdid='$'FreeBSD'$' cat
Re: svn commit: r317061 - in head: libexec/rpc.rstatd sys/amd64/amd64 sys/amd64/include sys/arm/arm sys/arm/include sys/arm64/include sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/compat/linprocf
On Mon, Apr 17, 2017 at 7:34 PM, Gleb Smirnoffwrote: > Author: glebius > Date: Mon Apr 17 17:34:47 2017 > New Revision: 317061 > URL: https://svnweb.freebsd.org/changeset/base/317061 > > Log: > - Remove 'struct vmmeter' from 'struct pcpu', leaving only global vmmeter > in place. To do per-cpu stats, convert all fields that previously were > maintained in the vmmeters that sit in pcpus to counter(9). > - Since some vmmeter stats may be touched at very early stages of boot, > before we have set up UMA and we can do counter_u64_alloc(), provide an > early counter mechanism: > o Leave one spare uint64_t in struct pcpu, named pc_early_dummy_counter. > o Point counter(9) fields of vmmeter to pcpu[0].pc_early_dummy_counter, > so that at early stages of boot, before counters are allocated we > already > point to a counter that can be safely written to. > o For sparc64 that required a whole dummy pcpu[MAXCPU] array. Hi, This seems to break a few ports, the most important ones: http://gohan2.ysv.freebsd.org/data/head-amd64-default-baseline/p438755_s317076/logs/errors/net-snmp-5.7.3_15.log http://gohan2.ysv.freebsd.org/data/head-amd64-default-baseline/p438755_s317076/logs/errors/sigar-1.7.3_2.log Cheers, Antoine ___ 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: r317155 - head/usr.sbin/rpcbind
Author: ngie Date: Wed Apr 19 18:01:53 2017 New Revision: 317155 URL: https://svnweb.freebsd.org/changeset/base/317155 Log: rpcbind(8): wordsmith -h description and mention -W in the SYNOPSIS section -W was already documented in the OPTIONS section. MFC after:7 weeks Reported by: igor (-h wordsmith'ing) Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpcbind/rpcbind.8 Modified: head/usr.sbin/rpcbind/rpcbind.8 == --- head/usr.sbin/rpcbind/rpcbind.8 Wed Apr 19 17:51:32 2017 (r317154) +++ head/usr.sbin/rpcbind/rpcbind.8 Wed Apr 19 18:01:53 2017 (r317155) @@ -2,7 +2,7 @@ .\" Copyright 1989 AT .\" Copyright 1991 Sun Microsystems, Inc. .\" $FreeBSD$ -.Dd March 6, 2014 +.Dd April 19, 2017 .Dt RPCBIND 8 .Os .Sh NAME @@ -10,7 +10,7 @@ .Nd universal addresses to RPC program number mapper .Sh SYNOPSIS .Nm -.Op Fl 6adiLls +.Op Fl 6adiLlsW .Op Fl h Ar bindip .Sh DESCRIPTION The @@ -85,7 +85,7 @@ is also specified. With this option, the name-to-address translation consistency checks are shown in detail. .It Fl h Ar bindip -Specify specific IP addresses to bind to for TCP and UDP requests. +IP addresses to bind to when servicing TCP and UDP requests. This option may be specified multiple times and is typically necessary when running on a multi-homed host. ___ 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: r317154 - head/usr.sbin/rpcbind
Author: ngie Date: Wed Apr 19 17:51:32 2017 New Revision: 317154 URL: https://svnweb.freebsd.org/changeset/base/317154 Log: Print out the signal number on exit in terminate(..) if WARMSTART is compiled into rpcbind. The signal number can provide helpful diagnostic info. MFC after:1 week Obtained from:Isilon OneFS Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/rpcbind/rpcbind.c Modified: head/usr.sbin/rpcbind/rpcbind.c == --- head/usr.sbin/rpcbind/rpcbind.c Wed Apr 19 17:32:32 2017 (r317153) +++ head/usr.sbin/rpcbind/rpcbind.c Wed Apr 19 17:51:32 2017 (r317154) @@ -757,12 +757,13 @@ rbllist_add(rpcprog_t prog, rpcvers_t ve * Catch the signal and die */ static void -terminate(int dummy __unused) +terminate(int signum __unused) { close(rpcbindlockfd); #ifdef WARMSTART syslog(LOG_ERR, - "rpcbind terminating on signal. Restart with \"rpcbind -w\""); + "rpcbind terminating on signal %d. Restart with \"rpcbind -w\"", + signum); write_warmstart(); /* Dump yourself */ #endif exit(2); ___ 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: r317144 - head/contrib/zstd/lib/common
On Wednesday, April 19, 2017 03:24:34 PM Ruslan Bukin wrote: > Author: br > Date: Wed Apr 19 15:24:33 2017 > New Revision: 317144 > URL: https://svnweb.freebsd.org/changeset/base/317144 > > Log: > Don't use __builtin_bswap for RISC-V due to undefined reference > in compiler. > > This unbreaks RISC-V world build. > > Sponsored by: DARPA, AFRL We should probably add an implementation of __bswapdi2() for riscv to libcompiler_rt instead? -- John Baldwin ___ 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: r317143 - in head/sys/cam: . ata scsi
On Wed, Apr 19, 2017 at 03:04:53PM +, Scott Long wrote: > Author: scottl > Date: Wed Apr 19 15:04:52 2017 > New Revision: 317143 > URL: https://svnweb.freebsd.org/changeset/base/317143 > > Log: > Add infrastructure to the ATA and SCSI transports that supports > using a driver-supplied sbuf for printing device discovery > announcements. This helps ensure that messages to the console > will be properly serialized (through sbuf_putbuf) and not be > truncated and interleaved with other messages. The > infrastructure mirrors the existing xpt_announce_periph() > entry point and is opt-in for now. No content or formatting > changes are visible to the operator other than the new coherency. > > While here, eliminate the stack usage of the temporary > announcement buffer in some of the drivers. It's moved to the > softc for now, but future work will eliminate it entirely by > making the code flow more linear. Future work will also address > locking so that the sbufs can be dynamically sized. > > The scsi_da, scs_cd, scsi_ses, and ata_da drivers are converted > at this point, other drivers can be converted at a later date. > A tunable+sysctl, kern.cam.announce_nosbuf, exists for testing > purposes but will be removed later. > > TODO: > Eliminate all of the code duplication and temporary buffers. The > old printf-based methods will be retired, and xpt_announce_periph() > will just be a wrapper that uses a dynamically sized sbuf. This > requires that the register and deregister paths be made malloc-safe, > which they aren't currently. Thanks! MFC planed? ___ 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: r317153 - stable/11/sys/conf
Author: bdrewery Date: Wed Apr 19 17:32:32 2017 New Revision: 317153 URL: https://svnweb.freebsd.org/changeset/base/317153 Log: MFC r316533: Support assym.s in DPSRCS to depend on it but not link it in. Modified: stable/11/sys/conf/kmod.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/kmod.mk == --- stable/11/sys/conf/kmod.mk Wed Apr 19 17:29:54 2017(r317152) +++ stable/11/sys/conf/kmod.mk Wed Apr 19 17:32:32 2017(r317153) @@ -451,7 +451,7 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quir ${AWK} -f ${SYSDIR}/tools/acpi_quirks2h.awk ${SYSDIR}/dev/acpica/acpi_quirks .endif -.if !empty(SRCS:Massym.s) +.if !empty(SRCS:Massym.s) || !empty(DPSRCS:Massym.s) CLEANFILES+= assym.s genassym.o DEPENDOBJS+= genassym.o assym.s: genassym.o ___ 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: r317152 - stable/11/sys/modules/dtrace/dtrace
Author: bdrewery Date: Wed Apr 19 17:29:54 2017 New Revision: 317152 URL: https://svnweb.freebsd.org/changeset/base/317152 Log: MFC r316534: Stop building assym.o into the module. Modified: stable/11/sys/modules/dtrace/dtrace/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/modules/dtrace/dtrace/Makefile == --- stable/11/sys/modules/dtrace/dtrace/MakefileWed Apr 19 17:06:32 2017(r317151) +++ stable/11/sys/modules/dtrace/dtrace/MakefileWed Apr 19 17:29:54 2017(r317152) @@ -27,7 +27,7 @@ CFLAGS+= -I${SYSDIR}/cddl/contrib/openso SRCS+= bus_if.h device_if.h vnode_if.h # Needed for dtrace_asm.S -SRCS+= assym.s +DPSRCS+= assym.s # These are needed for assym.s SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h @@ -55,11 +55,6 @@ EXPORT_SYMS= dtrace_register \ dtrace_asm.o: assym.s -.if ${MACHINE_CPUARCH} == "arm" -assym.o: assym.s - ${AS} -meabi=5 -o assym.o assym.s -.endif - .include CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h ___ 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: r317151 - in head/sys/riscv: include riscv
Author: br Date: Wed Apr 19 17:06:32 2017 New Revision: 317151 URL: https://svnweb.freebsd.org/changeset/base/317151 Log: Follow r317061 "Remove struct vmmeter from struct pcpu" with MD changes for RISC-V. This unbreaks RISC-V build. Sponsored by: DARPA, AFRL Modified: head/sys/riscv/include/counter.h head/sys/riscv/include/pcpu.h head/sys/riscv/riscv/intr_machdep.c head/sys/riscv/riscv/minidump_machdep.c Modified: head/sys/riscv/include/counter.h == --- head/sys/riscv/include/counter.hWed Apr 19 16:24:51 2017 (r317150) +++ head/sys/riscv/include/counter.hWed Apr 19 17:06:32 2017 (r317151) @@ -34,6 +34,10 @@ #include #endif +extern struct pcpu __pcpu[]; + +#defineEARLY_COUNTER &__pcpu[0].pc_early_dummy_counter + #definecounter_enter() critical_enter() #definecounter_exit() critical_exit() Modified: head/sys/riscv/include/pcpu.h == --- head/sys/riscv/include/pcpu.h Wed Apr 19 16:24:51 2017 (r317150) +++ head/sys/riscv/include/pcpu.h Wed Apr 19 17:06:32 2017 (r317151) @@ -46,7 +46,7 @@ #definePCPU_MD_FIELDS \ uint32_t pc_pending_ipis; /* IPIs pending to this CPU */ \ - char __pad[125] + char __pad[61] #ifdef _KERNEL Modified: head/sys/riscv/riscv/intr_machdep.c == --- head/sys/riscv/riscv/intr_machdep.c Wed Apr 19 16:24:51 2017 (r317150) +++ head/sys/riscv/riscv/intr_machdep.c Wed Apr 19 17:06:32 2017 (r317151) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -231,7 +232,7 @@ riscv_cpu_intr(struct trapframe *frame) event = intr_events[active_irq]; /* Update counters */ atomic_add_long(riscv_intr_counters[active_irq], 1); - PCPU_INC(cnt.v_intr); + VM_CNT_INC(v_intr); break; default: event = NULL; Modified: head/sys/riscv/riscv/minidump_machdep.c == --- head/sys/riscv/riscv/minidump_machdep.c Wed Apr 19 16:24:51 2017 (r317150) +++ head/sys/riscv/riscv/minidump_machdep.c Wed Apr 19 17:06:32 2017 (r317151) @@ -37,11 +37,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include #include #include #include + #include #include #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: r317150 - head/sys/dev/syscons
Author: bde Date: Wed Apr 19 16:24:51 2017 New Revision: 317150 URL: https://svnweb.freebsd.org/changeset/base/317150 Log: Stop using a saveunder method for mouse cursor drawing in the vga direct mode renderer. I thought that reads were not much slower than writes, so that the method only tripled the time for the whole function, but I recently measured that video memory reads can be up to 53 times slower than writes in tighter loops than here. Loop overheap here reduces the multiplier to only 16-20 on Haswell. Start cleaning up and fixing larger bugs in this function. Only replace the 22-line removal loop by a 3-line one for now, since adjusting the old loop would have required many palette calculations which are better done in the DRAW_PIXEL() macro. This also fixes missing support for depth 24, but only for removal. Removal is currently sloppy at the right bottom corner. It sometimes leaks border color into the text window. This is soon cleaned up by the caller. The planar renderer has complications to clip at the corner. Modified: head/sys/dev/syscons/scvgarndr.c Modified: head/sys/dev/syscons/scvgarndr.c == --- head/sys/dev/syscons/scvgarndr.cWed Apr 19 16:16:41 2017 (r317149) +++ head/sys/dev/syscons/scvgarndr.cWed Apr 19 16:24:51 2017 (r317150) @@ -238,12 +238,6 @@ static uint16_t vga_palette15[16] = { 0x, 0x0016, 0x02c0, 0x02d6, 0x5800, 0x5816, 0x5940, 0x5ad6, 0x294a, 0x295f, 0x2bea, 0x2bff, 0x7d4a, 0x7d5f, 0x7fea, 0x7fff }; - -#ifndef SC_NO_CUTPASTE -static uint32_t mouse_buf32[256]; -static uint16_t mouse_buf16[256]; -static uint8_t mouse_buf8[256]; -#endif #endif static void @@ -1132,8 +1126,6 @@ vga_pxlmouse_direct(scr_stat *scp, int x vm_offset_t p; int line_width, pixel_size; int xend, yend; - static int x_old = 0, xend_old = 0; - static int y_old = 0, yend_old = 0; int i, j; uint32_t *u32; uint16_t *u16; @@ -1163,39 +1155,12 @@ vga_pxlmouse_direct(scr_stat *scp, int x if (on) goto do_on; - /* -* Repaint overlap with the border and nearby. Unlike in the planar -* case, we kept track of everything under the cursor so can restore -* it all, but we don't completely trust the saved state to be still -* relevant, so do nothing if it is obviously stale. -*/ - if (x != x_old || y != y_old || xend != xend_old || yend != yend_old) - return; - - p = scp->sc->adp->va_window + y_old * line_width + x_old * pixel_size; - - for (i = 0; i < (yend_old - y_old); i++) { - for (j = (xend_old - x_old - 1); j >= 0; j--) { - switch (bpp) { - case 32: - u32 = (uint32_t*)(p + j * pixel_size); - writel(u32, mouse_buf32[i * 16 + j]); - break; - case 16: - /* FALLTHROUGH */ - case 15: - u16 = (uint16_t*)(p + j * pixel_size); - writew(u16, mouse_buf16[i * 16 + j]); - break; - case 8: - u8 = (uint8_t*)(p + j * pixel_size); - writeb(u8, mouse_buf8[i * 16 + j]); - break; - } - } + /* Repaint overlap with the border (mess up the corner a little). */ + p = scp->sc->adp->va_window + y * line_width + x * pixel_size; + for (i = 0; i < yend - y; i++, p += line_width) + for (j = xend - x - 1; j >= 0; j--) + DRAW_PIXEL(scp, p + j * pixel_size, scp->border); - p += line_width; - } return; do_on: @@ -1206,7 +1171,6 @@ do_on: switch (bpp) { case 32: u32 = (uint32_t*)(p + j * pixel_size); - mouse_buf32[i * 16 + j] = *u32; if (mdp->md_interior[i] & (1 << (15 - j))) writel(u32, vga_palette32[15]); else if (mdp->md_border[i] & (1 << (15 - j))) @@ -1214,7 +1178,6 @@ do_on: break; case 16: u16 = (uint16_t*)(p + j * pixel_size); - mouse_buf16[i * 16 + j] = *u16; if (mdp->md_interior[i] & (1 << (15 - j))) writew(u16, vga_palette16[15]); else if (mdp->md_border[i] & (1 << (15 - j))) @@ -1222,7 +1185,6 @@ do_on: break;
Re: svn commit: r317094 - head/share/mk
On Wednesday, April 19, 2017 01:28:37 AM Slawa Olhovchenkov wrote: > On Tue, Apr 18, 2017 at 12:45:25PM -0700, John Baldwin wrote: > > > On Tuesday, April 18, 2017 07:30:13 PM Slawa Olhovchenkov wrote: > > > On Tue, Apr 18, 2017 at 04:27:48PM +, John Baldwin wrote: > > > > > > > Author: jhb > > > > Date: Tue Apr 18 16:27:48 2017 > > > > New Revision: 317094 > > > > URL: https://svnweb.freebsd.org/changeset/base/317094 > > > > > > > > Log: > > > > Disable in-tree GDB by default on x86, mips, and powerpc. > > > > > > > > GDB in ports contains all of the functionality as GDB in base > > > > (including kgdb) for these platforms along with additional > > > > functionality. In-tree GDB remains enabled on ARM and sparc64. > > > > GDB in ports does not currently support kernel debugging on arm, > > > > and ports GDB for sparc64 has not been tested (though it does > > > > include sparc64 support). > > > > > > > > Reviewed by: bdrewery, emaste, imp > > > > Relnotes: yes > > > > Sponsored by: DARPA / AFRL > > > > Differential Revision:https://reviews.freebsd.org/D10399 > > > > > > Generating core.txt now complety broken? > > > > No. crashinfo has supported gdb from ports for quite a while now. > > If you 'pkg install gdb' crashinfo defaults to using the ports gdb over > > the base one already. > > I am about clean install, w/o ports. Until we get some sort of klldb support that will not work. However, we already have platforms now where /usr/bin/gdb doesn't work for that. riscv and aarch64 aren't supported in ancient gdb, and the MIPS /usr/bin/gdb didn't really work for me in my testing. > Also, how to generate core.txt after crash, reboot and install gdb > from ports? (port instaled after crash) You can always run crashinfo by hand. -- John Baldwin ___ 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: r317149 - in stable/11: sys/conf sys/libkern sys/libkern/x86 sys/sys tests/sys/kern
Author: markj Date: Wed Apr 19 16:16:41 2017 New Revision: 317149 URL: https://svnweb.freebsd.org/changeset/base/317149 Log: MFC r313006 (by cem), r315983 (by bde): Add an SSE4.2 implementation of crc32 for x86. Added: stable/11/sys/libkern/x86/ - copied from r313006, head/sys/libkern/x86/ stable/11/tests/sys/kern/libkern_crc32.c - copied unchanged from r313006, head/tests/sys/kern/libkern_crc32.c Modified: stable/11/sys/conf/files.amd64 stable/11/sys/conf/files.i386 stable/11/sys/libkern/crc32.c stable/11/sys/libkern/x86/crc32_sse42.c stable/11/sys/sys/libkern.h stable/11/tests/sys/kern/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/files.amd64 == --- stable/11/sys/conf/files.amd64 Wed Apr 19 16:12:02 2017 (r317148) +++ stable/11/sys/conf/files.amd64 Wed Apr 19 16:16:41 2017 (r317149) @@ -552,6 +552,9 @@ isa/syscons_isa.c optionalsc isa/vga_isa.c optionalvga kern/kern_clocksource.cstandard kern/link_elf_obj.cstandard +libkern/x86/crc32_sse42.c standard +libkern/memmove.c standard +libkern/memset.c standard # # IA32 binary support # @@ -609,9 +612,6 @@ compat/ndis/subr_pe.c optionalndisapi compat/ndis/subr_usbd.coptionalndisapi pci compat/ndis/winx64_wrap.S optionalndisapi pci # -libkern/memmove.c standard -libkern/memset.c standard -# # x86 real mode BIOS emulator, required by dpms/pci/vesa # compat/x86bios/x86bios.c optional x86bios | dpms | pci | vesa Modified: stable/11/sys/conf/files.i386 == --- stable/11/sys/conf/files.i386 Wed Apr 19 16:12:02 2017 (r317148) +++ stable/11/sys/conf/files.i386 Wed Apr 19 16:16:41 2017 (r317149) @@ -564,6 +564,7 @@ libkern/qdivrem.c standard libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard +libkern/x86/crc32_sse42.c standard i386/xbox/xbox.c optional xbox i386/xbox/xboxfb.c optional xboxfb dev/fb/boot_font.c optional xboxfb Modified: stable/11/sys/libkern/crc32.c == --- stable/11/sys/libkern/crc32.c Wed Apr 19 16:12:02 2017 (r317148) +++ stable/11/sys/libkern/crc32.c Wed Apr 19 16:16:41 2017 (r317149) @@ -46,8 +46,14 @@ __FBSDID("$FreeBSD$"); #include +#include #include +#if defined(__amd64__) || defined(__i386__) +#include +#include +#endif + const uint32_t crc32_tab[] = { 0x, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, @@ -749,6 +755,11 @@ calculate_crc32c(uint32_t crc32c, const unsigned char *buffer, unsigned int length) { +#if defined(__amd64__) || defined(__i386__) + if ((cpu_feature2 & CPUID2_SSE42) != 0) { + return (sse42_crc32c(crc32c, buffer, length)); + } else +#endif if (length < 4) { return (singletable_crc32c(crc32c, buffer, length)); } else { Modified: stable/11/sys/libkern/x86/crc32_sse42.c == --- head/sys/libkern/x86/crc32_sse42.c Tue Jan 31 03:26:32 2017 (r313006) +++ stable/11/sys/libkern/x86/crc32_sse42.c Wed Apr 19 16:16:41 2017 (r317149) @@ -31,14 +31,40 @@ __FBSDID("$FreeBSD$"); */ #ifdef USERSPACE_TESTING #include +#include #else #include -#include -#include #include +#include #endif -#include +static __inline uint32_t +_mm_crc32_u8(uint32_t x, uint8_t y) +{ + /* +* clang (at least 3.9.[0-1]) pessimizes "rm" (y) and "m" (y) +* significantly and "r" (y) a lot by copying y to a different +* local variable (on the stack or in a register), so only use +* the latter. This costs a register and an instruction but +* not a uop. +*/ + __asm("crc32b %1,%0" : "+r" (x) : "r" (y)); + return (x); +} + +static __inline uint32_t +_mm_crc32_u32(uint32_t x, uint32_t y) +{ + __asm("crc32l %1,%0" : "+r" (x) : "r" (y)); + return (x); +} + +static __inline uint64_t +_mm_crc32_u64(uint64_t x, uint64_t y) +{ + __asm("crc32q %1,%0" : "+r" (x) : "r" (y)); + return (x); +} /* CRC-32C (iSCSI) polynomial in reversed bit order. */ #define POLY 0x82f63b78 @@ -47,12 +73,18 @@ __FBSDID("$FreeBSD$"); * Block sizes for three-way parallel crc computation. LONG and SHORT must * both be powers of two. */ -#define LONG 8192 -#define SHORT 256 +#define LONG 128
svn commit: r317148 - head/sys/compat/linuxkpi/common/src
Author: markj Date: Wed Apr 19 16:12:02 2017 New Revision: 317148 URL: https://svnweb.freebsd.org/changeset/base/317148 Log: Drop Giant before sleeping in linux_wait_for_{timeout_,}common(). Reported and tested by: Pete WrightReviewed by: hselasky (previous version) MFC after:2 weeks Differential Revision:https://reviews.freebsd.org/D10414 Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c == --- head/sys/compat/linuxkpi/common/src/linux_compat.c Wed Apr 19 15:59:16 2017(r317147) +++ head/sys/compat/linuxkpi/common/src/linux_compat.c Wed Apr 19 16:12:02 2017(r317148) @@ -1321,28 +1321,38 @@ linux_complete_common(struct completion long linux_wait_for_common(struct completion *c, int flags) { + long error; + if (SCHEDULER_STOPPED()) return (0); + DROP_GIANT(); + if (flags != 0) flags = SLEEPQ_INTERRUPTIBLE | SLEEPQ_SLEEP; else flags = SLEEPQ_SLEEP; + error = 0; for (;;) { sleepq_lock(c); if (c->done) break; sleepq_add(c, NULL, "completion", flags, 0); if (flags & SLEEPQ_INTERRUPTIBLE) { - if (sleepq_wait_sig(c, 0) != 0) - return (-ERESTARTSYS); + if (sleepq_wait_sig(c, 0) != 0) { + error = -ERESTARTSYS; + goto intr; + } } else sleepq_wait(c, 0); } c->done--; sleepq_release(c); - return (0); +intr: + PICKUP_GIANT(); + + return (error); } /* @@ -1351,18 +1361,22 @@ linux_wait_for_common(struct completion long linux_wait_for_timeout_common(struct completion *c, long timeout, int flags) { - long end = jiffies + timeout; + long end = jiffies + timeout, error; + int ret; if (SCHEDULER_STOPPED()) return (0); + DROP_GIANT(); + if (flags != 0) flags = SLEEPQ_INTERRUPTIBLE | SLEEPQ_SLEEP; else flags = SLEEPQ_SLEEP; - for (;;) { - int ret; + error = 0; + ret = 0; + for (;;) { sleepq_lock(c); if (c->done) break; @@ -1375,16 +1389,20 @@ linux_wait_for_timeout_common(struct com if (ret != 0) { /* check for timeout or signal */ if (ret == EWOULDBLOCK) - return (0); + error = 0; else - return (-ERESTARTSYS); + error = -ERESTARTSYS; + goto intr; } } c->done--; sleepq_release(c); +intr: + PICKUP_GIANT(); + /* return how many jiffies are left */ - return (linux_timer_jiffies_until(end)); + return (ret != 0 ? error : linux_timer_jiffies_until(end)); } int ___ 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: r317147 - stable/11/sys/arm64/arm64
Author: andrew Date: Wed Apr 19 15:59:16 2017 New Revision: 317147 URL: https://svnweb.freebsd.org/changeset/base/317147 Log: MFC 313772: Load the new sp_el0 with interrupts disabled in fork_trampoline. If an interrupt arrives in fork_trampoline after sp_el0 was written we may then switch to a new thread, enter userland so change this stack pointer, then return to this code with the wrong value. This fixes this case by moving the load of sp_el0 until after interrupts have been disabled. Modified: stable/11/sys/arm64/arm64/swtch.S Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm64/arm64/swtch.S == --- stable/11/sys/arm64/arm64/swtch.S Wed Apr 19 15:46:34 2017 (r317146) +++ stable/11/sys/arm64/arm64/swtch.S Wed Apr 19 15:59:16 2017 (r317147) @@ -241,11 +241,6 @@ ENTRY(fork_trampoline) mov fp, #0 /* Stack traceback stops here. */ bl _C_LABEL(fork_exit) - /* Restore sp and lr */ - ldp x0, x1, [sp] - msr sp_el0, x0 - mov lr, x1 - /* Restore the registers other than x0 and x1 */ ldp x2, x3, [sp, #TF_X + 2 * 8] ldp x4, x5, [sp, #TF_X + 4 * 8] @@ -261,14 +256,18 @@ ENTRY(fork_trampoline) ldp x24, x25, [sp, #TF_X + 24 * 8] ldp x26, x27, [sp, #TF_X + 26 * 8] ldp x28, x29, [sp, #TF_X + 28 * 8] - /* Skip x30 as it was restored above as lr */ /* * Disable interrupts to avoid -* overwriting spsr_el1 by an IRQ exception. +* overwriting spsr_el1 and sp_el0 by an IRQ exception. */ msr daifset, #2 + /* Restore sp and lr */ + ldp x0, x1, [sp] + msr sp_el0, x0 + mov lr, x1 + /* Restore elr and spsr */ ldp x0, x1, [sp, #16] msr elr_el1, x0 ___ 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: r317146 - stable/11/sys/conf
Author: andrew Date: Wed Apr 19 15:46:34 2017 New Revision: 317146 URL: https://svnweb.freebsd.org/changeset/base/317146 Log: MFC 305355: Explicitly include all .rodata.* sections in the kernel .rodata. This helps link the kernel with lld as it will then put all these into a single .rodata section. Modified: stable/11/sys/conf/ldscript.arm64 Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/ldscript.arm64 == --- stable/11/sys/conf/ldscript.arm64 Wed Apr 19 15:33:24 2017 (r317145) +++ stable/11/sys/conf/ldscript.arm64 Wed Apr 19 15:46:34 2017 (r317146) @@ -18,7 +18,7 @@ SECTIONS _etext = .; PROVIDE (etext = .); .fini : { *(.fini)} =0x9090 - .rodata: { *(.rodata) *(.gnu.linkonce.r*) } + .rodata: { *(.rodata*) *(.gnu.linkonce.r*) } .rodata1 : { *(.rodata1) } .interp : { *(.interp) } .hash : { *(.hash) } ___ 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: r317145 - in stable/11/sys: boot/mips/uboot conf
Author: emaste Date: Wed Apr 19 15:33:24 2017 New Revision: 317145 URL: https://svnweb.freebsd.org/changeset/base/317145 Log: MFC r303442, r305343: remove CONSTRUCTORS from linker scripts r303442: remove CONSTRUCTORS from kernel linker scripts r305343: remove CONSTRUCTORS from MIPS uboot linker script The linker script CONSTRUCTORS keyword is only meaningful "when linking object file formats which do not support arbitrary sections, such as ECOFF and XCOFF"[1] and is ignored for other object file formats. LLVM's lld does not yet accept (and ignore) CONSTRUCTORS, so just remove CONSTRUCTORS from the linker script as it has no effect. [1] https://sourceware.org/binutils/docs/ld/Output-Section-Keywords.html Reported by: andrew Sponsored by: The FreeBSD Foundation Modified: stable/11/sys/boot/mips/uboot/ldscript.mips stable/11/sys/conf/ldscript.amd64 stable/11/sys/conf/ldscript.arm stable/11/sys/conf/ldscript.arm64 stable/11/sys/conf/ldscript.i386 stable/11/sys/conf/ldscript.mips stable/11/sys/conf/ldscript.mips.cfe stable/11/sys/conf/ldscript.mips.mips64 stable/11/sys/conf/ldscript.mips.octeon1 stable/11/sys/conf/ldscript.powerpc stable/11/sys/conf/ldscript.powerpc64 stable/11/sys/conf/ldscript.riscv stable/11/sys/conf/ldscript.sparc64 Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/boot/mips/uboot/ldscript.mips == --- stable/11/sys/boot/mips/uboot/ldscript.mips Wed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/boot/mips/uboot/ldscript.mips Wed Apr 19 15:33:24 2017 (r317145) @@ -55,7 +55,6 @@ SECTIONS { *(.data) *(.gnu.linkonce.d*) -CONSTRUCTORS } .data1 : { *(.data1) } .got1 : { *(.got1) } Modified: stable/11/sys/conf/ldscript.amd64 == --- stable/11/sys/conf/ldscript.amd64 Wed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/conf/ldscript.amd64 Wed Apr 19 15:33:24 2017 (r317145) @@ -160,7 +160,6 @@ SECTIONS { *(.data .data.* .gnu.linkonce.d.*) KEEP (*(.gnu.linkonce.d.*personality*)) -SORT(CONSTRUCTORS) } .data1 : { *(.data1) } _edata = .; PROVIDE (edata = .); Modified: stable/11/sys/conf/ldscript.arm == --- stable/11/sys/conf/ldscript.arm Wed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/conf/ldscript.arm Wed Apr 19 15:33:24 2017 (r317145) @@ -76,7 +76,6 @@ SECTIONS { *(.data) *(.gnu.linkonce.d*) -CONSTRUCTORS } .data1 : { *(.data1) } . = ALIGN(32 / 8); Modified: stable/11/sys/conf/ldscript.arm64 == --- stable/11/sys/conf/ldscript.arm64 Wed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/conf/ldscript.arm64 Wed Apr 19 15:33:24 2017 (r317145) @@ -76,7 +76,6 @@ SECTIONS { *(.data) *(.gnu.linkonce.d*) -CONSTRUCTORS } .data1 : { *(.data1) } . = ALIGN(32 / 8); Modified: stable/11/sys/conf/ldscript.i386 == --- stable/11/sys/conf/ldscript.i386Wed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/conf/ldscript.i386Wed Apr 19 15:33:24 2017 (r317145) @@ -137,7 +137,6 @@ SECTIONS { *(.data .data.* .gnu.linkonce.d.*) KEEP (*(.gnu.linkonce.d.*personality*)) -SORT(CONSTRUCTORS) } .data1 : { *(.data1) } _edata = .; PROVIDE (edata = .); Modified: stable/11/sys/conf/ldscript.mips == --- stable/11/sys/conf/ldscript.mipsWed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/conf/ldscript.mipsWed Apr 19 15:33:24 2017 (r317145) @@ -184,7 +184,6 @@ SECTIONS *(.data) *(.data.*) *(.gnu.linkonce.d.*) -SORT(CONSTRUCTORS) } .data1 : { *(.data1) } .eh_frame : { KEEP (*(.eh_frame)) } Modified: stable/11/sys/conf/ldscript.mips.cfe == --- stable/11/sys/conf/ldscript.mips.cfeWed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/conf/ldscript.mips.cfeWed Apr 19 15:33:24 2017 (r317145) @@ -201,7 +201,6 @@ SECTIONS *(.data) *(.data.*) *(.gnu.linkonce.d.*) -SORT(CONSTRUCTORS) } :data .data1 : { *(.data1) } .eh_frame : { KEEP (*(.eh_frame)) } Modified: stable/11/sys/conf/ldscript.mips.mips64 == --- stable/11/sys/conf/ldscript.mips.mips64 Wed Apr 19 15:24:33 2017 (r317144) +++ stable/11/sys/conf/ldscript.mips.mips64 Wed Apr 19 15:33:24 2017
Re: svn commit: r316978 - in head: contrib/zstd etc/mtree lib lib/libzstd share/mk usr.bin usr.bin/zstd
On Wed, Apr 19, 2017 at 04:53:25PM +0200, Baptiste Daroussin wrote: > On Wed, Apr 19, 2017 at 02:21:06PM +, Ruslan Bukin wrote: > > This break RISC-V world build: > > /home/br/obj//riscv.riscv64/usr/home/br/dev/freebsd-head/tmp/usr/lib/libprivatezstd.so: > > undefined reference to `__bswap > > si2' > > /home/br/obj//riscv.riscv64/usr/home/br/dev/freebsd-head/tmp/usr/lib/libprivatezstd.so: > > undefined reference to `__bswap > > di2' > > > > Here is patch that makes it compilable: > > > > diff --git a/contrib/zstd/lib/common/xxhash.c > > b/contrib/zstd/lib/common/xxhash.c > > index eb44222c5fc..d59a22a0638 100644 > > --- a/contrib/zstd/lib/common/xxhash.c > > +++ b/contrib/zstd/lib/common/xxhash.c > > @@ -206,7 +206,7 @@ static U64 XXH_read64(const void* memPtr) > > #if defined(_MSC_VER) /* Visual Studio */ > > # define XXH_swap32 _byteswap_ulong > > # define XXH_swap64 _byteswap_uint64 > > -#elif GCC_VERSION >= 403 > > +#elif (GCC_VERSION >= 403 && !defined(__riscv__)) > > # define XXH_swap32 __builtin_bswap32 > > # define XXH_swap64 __builtin_bswap64 > > #else > > > > Ruslan > > Thank you, can you please commit it? Have you upstreamed it, do you want me to > do it? (I have already signed the facebook agreement) > I committed. Please upstream that. thanks Ruslan ___ 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: r317144 - head/contrib/zstd/lib/common
Author: br Date: Wed Apr 19 15:24:33 2017 New Revision: 317144 URL: https://svnweb.freebsd.org/changeset/base/317144 Log: Don't use __builtin_bswap for RISC-V due to undefined reference in compiler. This unbreaks RISC-V world build. Sponsored by: DARPA, AFRL Modified: head/contrib/zstd/lib/common/xxhash.c Modified: head/contrib/zstd/lib/common/xxhash.c == --- head/contrib/zstd/lib/common/xxhash.c Wed Apr 19 15:04:52 2017 (r317143) +++ head/contrib/zstd/lib/common/xxhash.c Wed Apr 19 15:24:33 2017 (r317144) @@ -206,7 +206,7 @@ static U64 XXH_read64(const void* memPtr #if defined(_MSC_VER) /* Visual Studio */ # define XXH_swap32 _byteswap_ulong # define XXH_swap64 _byteswap_uint64 -#elif GCC_VERSION >= 403 +#elif (GCC_VERSION >= 403 && !defined(__riscv__)) # define XXH_swap32 __builtin_bswap32 # define XXH_swap64 __builtin_bswap64 #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: r317143 - in head/sys/cam: . ata scsi
Author: scottl Date: Wed Apr 19 15:04:52 2017 New Revision: 317143 URL: https://svnweb.freebsd.org/changeset/base/317143 Log: Add infrastructure to the ATA and SCSI transports that supports using a driver-supplied sbuf for printing device discovery announcements. This helps ensure that messages to the console will be properly serialized (through sbuf_putbuf) and not be truncated and interleaved with other messages. The infrastructure mirrors the existing xpt_announce_periph() entry point and is opt-in for now. No content or formatting changes are visible to the operator other than the new coherency. While here, eliminate the stack usage of the temporary announcement buffer in some of the drivers. It's moved to the softc for now, but future work will eliminate it entirely by making the code flow more linear. Future work will also address locking so that the sbufs can be dynamically sized. The scsi_da, scs_cd, scsi_ses, and ata_da drivers are converted at this point, other drivers can be converted at a later date. A tunable+sysctl, kern.cam.announce_nosbuf, exists for testing purposes but will be removed later. TODO: Eliminate all of the code duplication and temporary buffers. The old printf-based methods will be retired, and xpt_announce_periph() will just be a wrapper that uses a dynamically sized sbuf. This requires that the register and deregister paths be made malloc-safe, which they aren't currently. Sponsored by: Netflix Modified: head/sys/cam/ata/ata_all.c head/sys/cam/ata/ata_all.h head/sys/cam/ata/ata_da.c head/sys/cam/ata/ata_xpt.c head/sys/cam/cam_periph.c head/sys/cam/cam_xpt.c head/sys/cam/cam_xpt_internal.h head/sys/cam/cam_xpt_periph.h head/sys/cam/scsi/scsi_all.c head/sys/cam/scsi/scsi_all.h head/sys/cam/scsi/scsi_cd.c head/sys/cam/scsi/scsi_da.c head/sys/cam/scsi/scsi_enc.c head/sys/cam/scsi/scsi_enc_internal.h head/sys/cam/scsi/scsi_xpt.c Modified: head/sys/cam/ata/ata_all.c == --- head/sys/cam/ata/ata_all.c Wed Apr 19 14:49:18 2017(r317142) +++ head/sys/cam/ata/ata_all.c Wed Apr 19 15:04:52 2017(r317143) @@ -382,12 +382,10 @@ void ata_print_ident(struct ata_params *ident_data) { const char *proto; - char product[48], revision[16], ata[12], sata[12]; + char ata[12], sata[12]; + + ata_print_ident_short(ident_data); - cam_strvis(product, ident_data->model, sizeof(ident_data->model), - sizeof(product)); - cam_strvis(revision, ident_data->revision, sizeof(ident_data->revision), - sizeof(revision)); proto = (ident_data->config == ATA_PROTO_CFA) ? "CFA" : (ident_data->config & ATA_PROTO_ATAPI) ? "ATAPI" : "ATA"; if (ata_version(ident_data->version_major) == 0) { @@ -412,7 +410,55 @@ ata_print_ident(struct ata_params *ident snprintf(sata, sizeof(sata), " SATA"); } else sata[0] = 0; - printf("<%s %s> %s%s device\n", product, revision, ata, sata); + printf(" %s%s device\n", ata, sata); +} + +void +ata_print_ident_sbuf(struct ata_params *ident_data, struct sbuf *sb) +{ + const char *proto, *sata; + int version; + + ata_print_ident_short_sbuf(ident_data, sb); + sbuf_printf(sb, " "); + + proto = (ident_data->config == ATA_PROTO_CFA) ? "CFA" : + (ident_data->config & ATA_PROTO_ATAPI) ? "ATAPI" : "ATA"; + version = ata_version(ident_data->version_major); + + switch (version) { + case 0: + sbuf_printf(sb, "%s", proto); + break; + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + sbuf_printf(sb, "%s-%d", proto, version); + break; + case 8: + sbuf_printf(sb, "%s8-ACS", proto); + break; + default: + sbuf_printf(sb, "ACS-%d %s", version - 7, proto); + break; + } + + if (ident_data->satacapabilities && ident_data->satacapabilities != 0x) { + if (ident_data->satacapabilities & ATA_SATA_GEN3) + sata = " SATA 3.x"; + else if (ident_data->satacapabilities & ATA_SATA_GEN2) + sata = " SATA 2.x"; + else if (ident_data->satacapabilities & ATA_SATA_GEN1) + sata = " SATA 1.x"; + else + sata = " SATA"; + } else + sata = ""; + sbuf_printf(sb, "%s device\n", sata); } void @@ -428,18 +474,38 @@ ata_print_ident_short(struct ata_params } void +ata_print_ident_short_sbuf(struct ata_params *ident_data, struct sbuf *sb) +{ + + sbuf_printf(sb, "<"); + cam_strvis_sbuf(sb, ident_data->model, sizeof(ident_data->model), 0); +
Re: svn commit: r316978 - in head: contrib/zstd etc/mtree lib lib/libzstd share/mk usr.bin usr.bin/zstd
On Wed, Apr 19, 2017 at 02:21:06PM +, Ruslan Bukin wrote: > This break RISC-V world build: > /home/br/obj//riscv.riscv64/usr/home/br/dev/freebsd-head/tmp/usr/lib/libprivatezstd.so: > undefined reference to `__bswap > si2' > /home/br/obj//riscv.riscv64/usr/home/br/dev/freebsd-head/tmp/usr/lib/libprivatezstd.so: > undefined reference to `__bswap > di2' > > Here is patch that makes it compilable: > > diff --git a/contrib/zstd/lib/common/xxhash.c > b/contrib/zstd/lib/common/xxhash.c > index eb44222c5fc..d59a22a0638 100644 > --- a/contrib/zstd/lib/common/xxhash.c > +++ b/contrib/zstd/lib/common/xxhash.c > @@ -206,7 +206,7 @@ static U64 XXH_read64(const void* memPtr) > #if defined(_MSC_VER) /* Visual Studio */ > # define XXH_swap32 _byteswap_ulong > # define XXH_swap64 _byteswap_uint64 > -#elif GCC_VERSION >= 403 > +#elif (GCC_VERSION >= 403 && !defined(__riscv__)) > # define XXH_swap32 __builtin_bswap32 > # define XXH_swap64 __builtin_bswap64 > #else > > Ruslan Thank you, can you please commit it? Have you upstreamed it, do you want me to do it? (I have already signed the facebook agreement) Best regards, Bapt signature.asc Description: PGP signature
svn commit: r317142 - head/sys/dev/fb
Author: bde Date: Wed Apr 19 14:49:18 2017 New Revision: 317142 URL: https://svnweb.freebsd.org/changeset/base/317142 Log: When we don't use the parameter table in the BIOS, also don't use most of our tweaked modes based on it. In practice, this means limiting the tweaked modes to at most 80x50 based on 80x25, so there are no 90-column, 80x30 or 80x60 modes. This happens when the the initial mode is is not in the parameter table. We always detected this case, but assumed that the (necessarily nonstandard) parameters of the initial mode could be tweaked just as blindly as the probably-standard parameters of initial modes in the table. On 1 laptop system with near-VGA where the initial mode is nonstandard, this is because the hardware apparently doesn't support 9-bit mode, but otherwise has standard timing. The initial mode has 8-bit mode CRTC horizontal parameters similar to those in syscons' 90-column modes and in EGA modes. Tweaking these values for the 90-column modes has little effect except to print the extra 10 columns off the screen. Tweaking from 80x25 to 80x30 requires changing from 400 scan lines to 480. This can probably be made to work, but syscons blindly applies values based on standard timing. This gives blank output. Tweaking from 80x25 to 80x50 doesn't change the CRTC timing and works. Modified: head/sys/dev/fb/vga.c Modified: head/sys/dev/fb/vga.c == --- head/sys/dev/fb/vga.c Wed Apr 19 14:43:51 2017(r317141) +++ head/sys/dev/fb/vga.c Wed Apr 19 14:49:18 2017(r317142) @@ -939,7 +939,7 @@ probe_adapters(void) #if !defined(VGA_NO_BIOS) && !defined(VGA_NO_MODE_CHANGE) u_char *mp; #endif -int i; +int height, i, width; /* do this test only once */ if (vga_init_done) @@ -1134,15 +1134,34 @@ probe_adapters(void) case COMP_DIFFERENT: default: /* -* Don't use the parameter table in BIOS. It doesn't -* look familiar to us. Video mode switching is allowed -* only if the new mode is the same as or based on -* the initial mode. +* Don't use the parameter table in the BIOS, since +* even the BIOS doesn't use it for the initial mode. +* Restrict the tweaked modes to (in practice) 80x50 +* from 80x25 with 400 scan lines, since the only safe +* tweak is changing the characters from 8x16 to 8x8. */ video_mode_ptr = NULL; bzero(mode_map, sizeof(mode_map)); mode_map[adp->va_initial_mode] = adpstate.regs; rows_offset = 1; + + width = height = -1; + for (i = 0; i < nitems(bios_vmode); ++i) { + if (bios_vmode[i].vi_mode == adp->va_initial_mode) { + width = bios_vmode[i].vi_width; + height = bios_vmode[i].vi_height; + break; + } + } + for (i = 0; i < nitems(bios_vmode); ++i) { + if (bios_vmode[i].vi_mode != adp->va_initial_mode && + map_mode_num(bios_vmode[i].vi_mode) == +adp->va_initial_mode && + (bios_vmode[i].vi_width != width || +bios_vmode[i].vi_height != 2 * height)) { + bios_vmode[i].vi_mode = NA; + } + } break; } } ___ 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: r317141 - head/contrib/elftoolchain/readelf
Author: emaste Date: Wed Apr 19 14:43:51 2017 New Revision: 317141 URL: https://svnweb.freebsd.org/changeset/base/317141 Log: readelf: dump MIPS abiflags section This is not fully fleshed out but is sufficient to dump the SHT_MIPS_ABIFLAGS used in FreeBSD. Reviewed by: imp MFC after:2 weeks Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D8241 Modified: head/contrib/elftoolchain/readelf/readelf.c Modified: head/contrib/elftoolchain/readelf/readelf.c == --- head/contrib/elftoolchain/readelf/readelf.c Wed Apr 19 14:07:35 2017 (r317140) +++ head/contrib/elftoolchain/readelf/readelf.c Wed Apr 19 14:43:51 2017 (r317141) @@ -296,6 +296,7 @@ static void dump_elf(struct readelf *re) static void dump_dyn_val(struct readelf *re, GElf_Dyn *dyn, uint32_t stab); static void dump_dynamic(struct readelf *re); static void dump_liblist(struct readelf *re); +static void dump_mips_abiflags(struct readelf *re, struct section *s); static void dump_mips_attributes(struct readelf *re, uint8_t *p, uint8_t *pe); static void dump_mips_odk_reginfo(struct readelf *re, uint8_t *p, size_t sz); static void dump_mips_options(struct readelf *re, struct section *s); @@ -325,6 +326,7 @@ static const char *dwarf_regname(struct static struct dumpop *find_dumpop(struct readelf *re, size_t si, const char *sn, int op, int t); static int get_ent_count(struct section *s, int *ent_count); +static int get_mips_register_size(uint8_t flag); static char *get_regoff_str(struct readelf *re, Dwarf_Half reg, Dwarf_Addr off); static const char *get_string(struct readelf *re, int strtab, size_t off); @@ -4111,6 +4113,10 @@ dump_mips_specific_info(struct readelf * } } + if (s->name != NULL && (!strcmp(s->name, ".MIPS.abiflags") || + (s->type == SHT_MIPS_ABIFLAGS))) + dump_mips_abiflags(re, s); + /* * Dump .reginfo if present (although it will be ignored by an OS if a * .MIPS.options section is present, according to SGI mips64 spec). @@ -4124,6 +4130,82 @@ dump_mips_specific_info(struct readelf * } static void +dump_mips_abiflags(struct readelf *re, struct section *s) +{ + Elf_Data *d; + uint8_t *p; + int elferr; + uint32_t isa_ext, ases, flags1, flags2; + uint16_t version; + uint8_t isa_level, isa_rev, gpr_size, cpr1_size, cpr2_size, fp_abi; + + if ((d = elf_rawdata(s->scn, NULL)) == NULL) { + elferr = elf_errno(); + if (elferr != 0) + warnx("elf_rawdata failed: %s", + elf_errmsg(elferr)); + return; + } + if (d->d_size != 24) { + warnx("invalid MIPS abiflags section size"); + return; + } + + p = d->d_buf; + version = re->dw_decode(, 2); + printf("MIPS ABI Flags Version: %u", version); + if (version != 0) { + printf(" (unknown)\n\n"); + return; + } + printf("\n\n"); + + isa_level = re->dw_decode(, 1); + isa_rev = re->dw_decode(, 1); + gpr_size = re->dw_decode(, 1); + cpr1_size = re->dw_decode(, 1); + cpr2_size = re->dw_decode(, 1); + fp_abi = re->dw_decode(, 1); + isa_ext = re->dw_decode(, 4); + ases = re->dw_decode(, 4); + flags1 = re->dw_decode(, 4); + flags2 = re->dw_decode(, 4); + + printf("ISA: "); + if (isa_rev <= 1) + printf("MIPS%u\n", isa_level); + else + printf("MIPS%ur%u\n", isa_level, isa_rev); + printf("GPR size: %d\n", get_mips_register_size(gpr_size)); + printf("CPR1 size: %d\n", get_mips_register_size(cpr1_size)); + printf("CPR2 size: %d\n", get_mips_register_size(cpr2_size)); + printf("FP ABI: "); + switch (fp_abi) { + case 3: + printf("Soft float"); + break; + default: + printf("%u", fp_abi); + break; + } + printf("\nISA Extension: %u\n", isa_ext); + printf("ASEs: %u\n", ases); + printf("FLAGS 1: %08x\n", flags1); + printf("FLAGS 2: %08x\n", flags2); +} + +static int +get_mips_register_size(uint8_t flag) +{ + switch (flag) { + case 0: return 0; + case 1: return 32; + case 2: return 64; + case 3: return 128; + default: return -1; + } +} +static void dump_mips_reginfo(struct readelf *re, struct section *s) { Elf_Data *d; ___ 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: r316978 - in head: contrib/zstd etc/mtree lib lib/libzstd share/mk usr.bin usr.bin/zstd
This break RISC-V world build: /home/br/obj//riscv.riscv64/usr/home/br/dev/freebsd-head/tmp/usr/lib/libprivatezstd.so: undefined reference to `__bswap si2' /home/br/obj//riscv.riscv64/usr/home/br/dev/freebsd-head/tmp/usr/lib/libprivatezstd.so: undefined reference to `__bswap di2' Here is patch that makes it compilable: diff --git a/contrib/zstd/lib/common/xxhash.c b/contrib/zstd/lib/common/xxhash.c index eb44222c5fc..d59a22a0638 100644 --- a/contrib/zstd/lib/common/xxhash.c +++ b/contrib/zstd/lib/common/xxhash.c @@ -206,7 +206,7 @@ static U64 XXH_read64(const void* memPtr) #if defined(_MSC_VER) /* Visual Studio */ # define XXH_swap32 _byteswap_ulong # define XXH_swap64 _byteswap_uint64 -#elif GCC_VERSION >= 403 +#elif (GCC_VERSION >= 403 && !defined(__riscv__)) # define XXH_swap32 __builtin_bswap32 # define XXH_swap64 __builtin_bswap64 #else Ruslan On Sat, Apr 15, 2017 at 08:05:22PM +, Baptiste Daroussin wrote: > Author: bapt > Date: Sat Apr 15 20:05:22 2017 > New Revision: 316978 > URL: https://svnweb.freebsd.org/changeset/base/316978 > > Log: > Import zstandard 1.1.4 in base > > zstandard is a new compression library/tool which is very fast at > compression/decompression > > For now import as a private library > > Added: > head/contrib/zstd/ > - copied from r316976, vendor/zstd/dist/ > head/lib/libzstd/ > head/lib/libzstd/Makefile (contents, props changed) > head/usr.bin/zstd/ > head/usr.bin/zstd/Makefile (contents, props changed) > Modified: > head/etc/mtree/BSD.usr.dist > head/lib/Makefile > head/share/mk/src.libnames.mk > head/usr.bin/Makefile > > Modified: head/etc/mtree/BSD.usr.dist > == > --- head/etc/mtree/BSD.usr.dist Sat Apr 15 20:03:50 2017 > (r316977) > +++ head/etc/mtree/BSD.usr.dist Sat Apr 15 20:05:22 2017 > (r316978) > @@ -17,6 +17,8 @@ > .. > ucl > .. > +zstd > +.. > .. > .. > lib > > Modified: head/lib/Makefile > == > --- head/lib/Makefile Sat Apr 15 20:03:50 2017(r316977) > +++ head/lib/Makefile Sat Apr 15 20:05:22 2017(r316978) > @@ -90,6 +90,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ > libxo \ > liby \ > libz \ > + libzstd \ > ncurses > > # Inter-library dependencies. When the makefile for a library contains LDADD > > Added: head/lib/libzstd/Makefile > == > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/lib/libzstd/Makefile Sat Apr 15 20:05:22 2017(r316978) > @@ -0,0 +1,34 @@ > +# $FreeBSD$ > + > +LIB= zstd > +SRCS=entropy_common.c \ > + error_private.c \ > + fse_decompress.c \ > + pool.c \ > + threading.c \ > + xxhash.c \ > + zstd_common.c \ > + fse_compress.c \ > + huf_compress.c \ > + zstd_compress.c \ > + zstdmt_compress.c \ > + huf_decompress.c \ > + zstd_decompress.c \ > + zbuff_common.c \ > + zbuff_compress.c \ > + zbuff_decompress.c \ > + cover.c \ > + divsufsort.c \ > + zdict.c > +WARNS= 2 > +INCS=zstd.h > +CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ > + > +PRIVATELIB= yes > + > +ZSTDDIR= ${SRCTOP}/contrib/zstd > +.PATH: ${ZSTDDIR}/lib/common ${ZSTDDIR}/lib/compress \ > + ${ZSTDDIR}/lib/decompress ${ZSTDDIR}/lib/deprecated \ > + ${ZSTDDIR}/lib/dictBuilder ${ZSTDDIR}/lib > + > +.include > > Modified: head/share/mk/src.libnames.mk > == > --- head/share/mk/src.libnames.mk Sat Apr 15 20:03:50 2017 > (r316977) > +++ head/share/mk/src.libnames.mk Sat Apr 15 20:05:22 2017 > (r316978) > @@ -24,7 +24,8 @@ _PRIVATELIBS= \ > sqlite3 \ > ssh \ > ucl \ > - unbound > + unbound \ > + zstd > > _INTERNALLIBS= \ > amu \ > > Modified: head/usr.bin/Makefile > == > --- head/usr.bin/Makefile Sat Apr 15 20:03:50 2017(r316977) > +++ head/usr.bin/Makefile Sat Apr 15 20:05:22 2017(r316978) > @@ -189,7 +189,8 @@ SUBDIR= alias \ > xo \ > xz \ > xzdec \ > - yes > + yes \ > + zstd > > # NB: keep these sorted by MK_* knobs > > > Added: head/usr.bin/zstd/Makefile > == > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/usr.bin/zstd/MakefileSat Apr 15 20:05:22 2017 > (r316978) > @@ -0,0 +1,21 @@ > +# $FreeBSD$ > + > +PROG=
svn commit: r317140 - in stable/11: share/mk sys/boot/efi sys/boot/efi/loader/arch/arm64
Author: andrew Date: Wed Apr 19 14:07:35 2017 New Revision: 317140 URL: https://svnweb.freebsd.org/changeset/base/317140 Log: Fix the arm64 userland building with lld: MFC 308124: On arm64 build the efi loader with -fPIC. Without this clang 3.9 will generate relocation in the self relocation code. MFC 316608: Add -fPIC to the standalone build flags on arm64. This is needed as loader.efi is position independend, however we were not building it as such causing a build failure when building with lld. MFC 315452: Mark the EFI PE header as allocated. While ld.bfd doesn't seem to care about not having this flag ld.lld fails to link without it. Modified: stable/11/share/mk/bsd.stand.mk stable/11/sys/boot/efi/Makefile.inc stable/11/sys/boot/efi/loader/arch/arm64/start.S Directory Properties: stable/11/ (props changed) Modified: stable/11/share/mk/bsd.stand.mk == --- stable/11/share/mk/bsd.stand.mk Wed Apr 19 13:24:32 2017 (r317139) +++ stable/11/share/mk/bsd.stand.mk Wed Apr 19 14:07:35 2017 (r317140) @@ -17,7 +17,7 @@ CFLAGS+= -fPIC -mno-red-zone CFLAGS+= -Os .endif .if ${MACHINE_CPUARCH} == "aarch64" -CFLAGS+= -mgeneral-regs-only +CFLAGS+= -fPIC -mgeneral-regs-only .endif .if ${MACHINE_CPUARCH} == "mips" CFLAGS+= -G0 -fno-pic -mno-abicalls Modified: stable/11/sys/boot/efi/Makefile.inc == --- stable/11/sys/boot/efi/Makefile.inc Wed Apr 19 13:24:32 2017 (r317139) +++ stable/11/sys/boot/efi/Makefile.inc Wed Apr 19 14:07:35 2017 (r317140) @@ -20,6 +20,7 @@ CFLAGS+= -mno-aes .if ${MACHINE_CPUARCH} == "aarch64" CFLAGS+= -fshort-wchar +CFLAGS+= -fPIC .endif .if ${MACHINE_CPUARCH} == "arm" Modified: stable/11/sys/boot/efi/loader/arch/arm64/start.S == --- stable/11/sys/boot/efi/loader/arch/arm64/start.SWed Apr 19 13:24:32 2017(r317139) +++ stable/11/sys/boot/efi/loader/arch/arm64/start.SWed Apr 19 14:07:35 2017(r317140) @@ -40,7 +40,7 @@ #defineIMAGE_SCN_MEM_EXECUTE 0x2000 #defineIMAGE_SCN_MEM_READ 0x4000 - .section .peheader + .section .peheader,"a" efi_start: /* The MS-DOS Stub, only used to get the offset of the COFF header */ .ascii "MZ" ___ 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: r316811 - head/sys/contrib/ipfilter/netinet
In message, Hans Petter Sela sky writes: > On 04/19/17 14:24, Hans Petter Selasky wrote: > > -static ipf_rdx_node_t *ipf_rx_match __P((ipf_rdx_head_t *, addrfamily_t > ^^^ was removal of this prototype intended? > > > *)); > > +/*$NetBSD: radix_ipf.c,v 1.6 2015/12/15 12:30:34 christos Exp $*/ Both lines were inadvertently added. It's been fixed now. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r317139 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Wed Apr 19 13:24:32 2017 New Revision: 317139 URL: https://svnweb.freebsd.org/changeset/base/317139 Log: Restore prototype accidently removed by r316811. Also remove $NetBSD$ accidentally added. Reported by: hps, lwhsu Modified: head/sys/contrib/ipfilter/netinet/radix_ipf.c Modified: head/sys/contrib/ipfilter/netinet/radix_ipf.c == --- head/sys/contrib/ipfilter/netinet/radix_ipf.c Wed Apr 19 13:04:34 2017(r317138) +++ head/sys/contrib/ipfilter/netinet/radix_ipf.c Wed Apr 19 13:24:32 2017(r317139) @@ -38,7 +38,7 @@ static void buildnodes __P((addrfamily_t static ipf_rdx_node_t *ipf_rx_find_addr __P((ipf_rdx_node_t *, u_32_t *)); static ipf_rdx_node_t *ipf_rx_lookup __P((ipf_rdx_head_t *, addrfamily_t *, addrfamily_t *)); -/* $NetBSD: radix_ipf.c,v 1.6 2015/12/15 12:30:34 christos Exp $ */ +static ipf_rdx_node_t *ipf_rx_match __P((ipf_rdx_head_t *, addrfamily_t *)); /* * Foreword. ___ 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: r317138 - head/sys/compat/linuxkpi/common/include/linux
Author: hselasky Date: Wed Apr 19 13:04:34 2017 New Revision: 317138 URL: https://svnweb.freebsd.org/changeset/base/317138 Log: Use __typeof() instead of typeof() in some RCU related macros in the LinuxKPI. MFC after:1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/rcupdate.h Modified: head/sys/compat/linuxkpi/common/include/linux/rcupdate.h == --- head/sys/compat/linuxkpi/common/include/linux/rcupdate.hWed Apr 19 13:03:29 2017(r317137) +++ head/sys/compat/linuxkpi/common/include/linux/rcupdate.hWed Apr 19 13:04:34 2017(r317138) @@ -36,7 +36,7 @@ #defineLINUX_KFREE_RCU_OFFSET_MAX 4096/* exclusive */ #defineRCU_INITIALIZER(v) \ - ((typeof(*(v)) __force __rcu *)(v)) + ((__typeof(*(v)) *)(v)) #defineRCU_INIT_POINTER(p, v) do { \ (p) = (v); \ @@ -74,10 +74,10 @@ } while (0) #definercu_access_pointer(p) \ - ((typeof(*p) __force __kernel *)(READ_ONCE(p))) + ((__typeof(*p) *)(READ_ONCE(p))) #definercu_dereference_protected(p, c) \ - ((typeof(*p) __force __kernel *)(p)) + ((__typeof(*p) *)(p)) #definercu_dereference(p) \ rcu_dereference_protected(p, 0) ___ 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: r317137 - in head/sys/compat/linuxkpi/common: include/linux src
Author: hselasky Date: Wed Apr 19 13:03:29 2017 New Revision: 317137 URL: https://svnweb.freebsd.org/changeset/base/317137 Log: Fix problem regarding priority inversion when using the concurrency kit, CK, in the LinuxKPI. When threads are pinned to a CPU core or when there is only one CPU, it can happen that a higher priority thread can call the CK synchronize function while a lower priority thread holds the read lock. Because the CK's synchronize is a simple wait loop this can lead to a deadlock situation. To solve this problem use the recently introduced CK's wait callback function. When detecting a CK blocking condition figure out the lowest priority among the blockers and update the calling thread's priority and yield. If another CPU core is holding the read lock, pin the thread to the blocked CPU core and update the priority. The calling threads priority and CPU bindings are restored before return. If a thread holding a CK read lock is detected to be sleeping, pause() will be used instead of yield(). MFC after:1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/sched.h head/sys/compat/linuxkpi/common/include/linux/srcu.h head/sys/compat/linuxkpi/common/src/linux_rcu.c Modified: head/sys/compat/linuxkpi/common/include/linux/sched.h == --- head/sys/compat/linuxkpi/common/include/linux/sched.h Wed Apr 19 12:39:45 2017(r317136) +++ head/sys/compat/linuxkpi/common/include/linux/sched.h Wed Apr 19 13:03:29 2017(r317137) @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -72,6 +72,8 @@ struct task_struct { unsigned bsd_ioctl_len; struct completion parked; struct completion exited; + TAILQ_ENTRY(task_struct) rcu_entry; + int rcu_recurse; }; #definecurrent ({ \ Modified: head/sys/compat/linuxkpi/common/include/linux/srcu.h == --- head/sys/compat/linuxkpi/common/include/linux/srcu.hWed Apr 19 12:39:45 2017(r317136) +++ head/sys/compat/linuxkpi/common/include/linux/srcu.hWed Apr 19 13:03:29 2017(r317137) @@ -29,9 +29,7 @@ #ifndef_LINUX_SRCU_H_ #define_LINUX_SRCU_H_ -struct srcu_epoch_record; struct srcu_struct { - struct srcu_epoch_record *ss_epoch_record; }; #definesrcu_dereference(ptr,srcu) ((__typeof(*(ptr)) *)(ptr)) Modified: head/sys/compat/linuxkpi/common/src/linux_rcu.c == --- head/sys/compat/linuxkpi/common/src/linux_rcu.c Wed Apr 19 12:39:45 2017(r317136) +++ head/sys/compat/linuxkpi/common/src/linux_rcu.c Wed Apr 19 13:03:29 2017(r317137) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -45,26 +46,34 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include -struct callback_head; -struct writer_epoch_record { - ck_epoch_record_t epoch_record; - struct mtx head_lock; - struct mtx sync_lock; - struct task task; - STAILQ_HEAD(, callback_head) head; -} __aligned(CACHE_LINE_SIZE); +/* + * By defining CONFIG_NO_RCU_SKIP LinuxKPI RCU locks and asserts will + * not be skipped during panic(). + */ +#ifdef CONFIG_NO_RCU_SKIP +#defineRCU_SKIP(void) 0 +#else +#defineRCU_SKIP(void) unlikely(SCHEDULER_STOPPED() || kdb_active) +#endif struct callback_head { STAILQ_ENTRY(callback_head) entry; rcu_callback_t func; }; -struct srcu_epoch_record { +struct linux_epoch_head { + STAILQ_HEAD(, callback_head) cb_head; + struct mtx lock; + struct task task; +} __aligned(CACHE_LINE_SIZE); + +struct linux_epoch_record { ck_epoch_record_t epoch_record; - struct mtx read_lock; - struct mtx sync_lock; -}; + TAILQ_HEAD(, task_struct) ts_head; + int cpuid; +} __aligned(CACHE_LINE_SIZE); /* * Verify that "struct rcu_head" is big enough to hold "struct @@ -72,57 +81,42 @@ struct srcu_epoch_record { * compile flags for including ck_epoch.h to all clients of the * LinuxKPI. */ -CTASSERT(sizeof(struct rcu_head) >= sizeof(struct callback_head)); +CTASSERT(sizeof(struct rcu_head) == sizeof(struct callback_head)); /* * Verify that "epoch_record" is at beginning of "struct - * writer_epoch_record": + * linux_epoch_record": */ -CTASSERT(offsetof(struct writer_epoch_record, epoch_record) == 0); - -/* - * Verify that "epoch_record" is at beginning of "struct - * srcu_epoch_record": - */ -CTASSERT(offsetof(struct srcu_epoch_record, epoch_record) == 0); +CTASSERT(offsetof(struct linux_epoch_record, epoch_record) == 0); static ck_epoch_t linux_epoch; -static
svn commit: r317136 - head/tools/tools/nanobsd/embedded
Author: n_hibma Date: Wed Apr 19 12:39:45 2017 New Revision: 317136 URL: https://svnweb.freebsd.org/changeset/base/317136 Log: A test was moved but without the definition of $d. The test however always succeeds because 'test -d' always returns true. Also some speling fixes. Modified: head/tools/tools/nanobsd/embedded/common Modified: head/tools/tools/nanobsd/embedded/common == --- head/tools/tools/nanobsd/embedded/commonWed Apr 19 11:38:07 2017 (r317135) +++ head/tools/tools/nanobsd/embedded/commonWed Apr 19 12:39:45 2017 (r317136) @@ -65,7 +65,7 @@ # Long Term # o common tooling for creating images for odd-ball platforms # o support for boot loaders other than uboot in the image -# or via special insturctions +# or via special instructions # o No pony support. Sadly, you cannot have a pony. # @@ -343,8 +343,8 @@ die( ) { # Automatically include the packaging port here so it is always first so it # builds the port and adds the package so we can add other packages. #XXX Doesn't work for cross build, so punting until I can integreate qemu-static -#XXX or poudere, both of which require priv'd execution. Or qemu-system, which -#XXX is super, super slow. +#XXX or poudriere, both of which require priv'd execution. Or qemu-system, +#XXX which is super, super slow. #add_port ports-mgmt/pkg #add_port security/sudo #add_port ftp/curl @@ -480,6 +480,7 @@ dos_boot_part ( ) ( ) if [ -n "$NANO_BOOT_PKG" ]; then + local d=/usr/local/share/u-boot/${NANO_BOOT_PKG} if [ ! -d ${d} ]; then echo ${NANO_BOOT_PKG} not installed. Sadly, it must be. exit 1 @@ -492,7 +493,7 @@ if [ -n "$NANO_BOOT_PKG" ]; then fi product_custom ( ) ( - # not quie ready to tweak these in nopriv build + # not quite ready to tweak these in nopriv build if [ -z ${NANO_NOPRIV_BUILD} ]; then # Last second tweaks -- generally not needed chown -R root:wheel ${NANO_WORLDDIR}/root ___ 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: r316811 - head/sys/contrib/ipfilter/netinet
On 04/19/17 14:24, Hans Petter Selasky wrote: -static ipf_rdx_node_t *ipf_rx_match __P((ipf_rdx_head_t *, addrfamily_t ^^^ was removal of this prototype intended? *)); +/*$NetBSD: radix_ipf.c,v 1.6 2015/12/15 12:30:34 christos Exp $*/ --HPS ___ 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: r316811 - head/sys/contrib/ipfilter/netinet
On 04/14/17 07:13, Cy Schubert wrote: Author: cy Date: Fri Apr 14 05:13:50 2017 New Revision: 316811 URL: https://svnweb.freebsd.org/changeset/base/316811 Log: Add missing free()'s after calls to randomize(). PR: NetBSD PR/50559 Obtained from:Netbsd radix_ipf.c r1.6 MFC after:1 week Modified: head/sys/contrib/ipfilter/netinet/radix_ipf.c Modified: head/sys/contrib/ipfilter/netinet/radix_ipf.c == --- head/sys/contrib/ipfilter/netinet/radix_ipf.c Fri Apr 14 05:12:01 2017(r316810) +++ head/sys/contrib/ipfilter/netinet/radix_ipf.c Fri Apr 14 05:13:50 2017(r316811) @@ -38,7 +38,7 @@ static void buildnodes __P((addrfamily_t static ipf_rdx_node_t *ipf_rx_find_addr __P((ipf_rdx_node_t *, u_32_t *)); static ipf_rdx_node_t *ipf_rx_lookup __P((ipf_rdx_head_t *, addrfamily_t *, addrfamily_t *)); -static ipf_rdx_node_t *ipf_rx_match __P((ipf_rdx_head_t *, addrfamily_t *)); +/* $NetBSD: radix_ipf.c,v 1.6 2015/12/15 12:30:34 christos Exp $ */ /* * Foreword. @@ -1509,6 +1509,8 @@ random_add(rnh) add_addr(rnh, i, order[i]); checktree(rnh); } + + free(order); } @@ -1526,5 +1528,7 @@ random_delete(rnh) delete_addr(rnh, i); checktree(rnh); } + + free(order); } #endif /* RDX_DEBUG */ I'm seeing this compilation warning: freebsd/sys/contrib/ipfilter/netinet/radix_ipf.c:184: warning: function declaration isn't a prototype [-Wstrict-prototypes] *** [radix_ipf.o] Error code 1 --HPS ___ 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: r317135 - head/sys/compat/linuxkpi/common/src
Author: hselasky Date: Wed Apr 19 11:38:07 2017 New Revision: 317135 URL: https://svnweb.freebsd.org/changeset/base/317135 Log: Zero number of CPUs should be translated into the default number of CPUs when allocating a LinuxKPI workqueue. This also ensures that the created taskqueue always have a non-zero number of worker threads. MFC after:1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/src/linux_work.c Modified: head/sys/compat/linuxkpi/common/src/linux_work.c == --- head/sys/compat/linuxkpi/common/src/linux_work.cWed Apr 19 11:13:32 2017(r317134) +++ head/sys/compat/linuxkpi/common/src/linux_work.cWed Apr 19 11:38:07 2017(r317135) @@ -57,6 +57,8 @@ struct workqueue_struct *system_long_wq; struct workqueue_struct *system_unbound_wq; struct workqueue_struct *system_power_efficient_wq; +static int linux_default_wq_cpus = 4; + static void linux_delayed_work_timer_fn(void *); /* @@ -497,6 +499,12 @@ linux_create_workqueue_common(const char { struct workqueue_struct *wq; + /* +* If zero CPUs are specified use the default number of CPUs: +*/ + if (cpus == 0) + cpus = linux_default_wq_cpus; + wq = kmalloc(sizeof(*wq), M_WAITOK | M_ZERO); wq->taskqueue = taskqueue_create(name, M_WAITOK, taskqueue_thread_enqueue, >taskqueue); @@ -537,6 +545,9 @@ linux_work_init(void *arg) if (max_wq_cpus < 4) max_wq_cpus = 4; + /* set default number of CPUs */ + linux_default_wq_cpus = max_wq_cpus; + linux_system_short_wq = alloc_workqueue("linuxkpi_short_wq", 0, max_wq_cpus); linux_system_long_wq = alloc_workqueue("linuxkpi_long_wq", 0, max_wq_cpus); ___ 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: r317134 - stable/11/sys/fs/nfsclient
Author: kib Date: Wed Apr 19 11:13:32 2017 New Revision: 317134 URL: https://svnweb.freebsd.org/changeset/base/317134 Log: MFC r316532: Make nfs pageout coherent with the dirty state of the buffers. Modified: stable/11/sys/fs/nfsclient/nfs_clbio.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/nfsclient/nfs_clbio.c == --- stable/11/sys/fs/nfsclient/nfs_clbio.c Wed Apr 19 11:11:51 2017 (r317133) +++ stable/11/sys/fs/nfsclient/nfs_clbio.c Wed Apr 19 11:13:32 2017 (r317134) @@ -266,9 +266,7 @@ ncl_putpages(struct vop_putpages_args *a { struct uio uio; struct iovec iov; - vm_offset_t kva; - struct buf *bp; - int iomode, must_commit, i, error, npages, count; + int i, error, npages, count; off_t offset; int *rtvals; struct vnode *vp; @@ -322,44 +320,26 @@ ncl_putpages(struct vop_putpages_args *a } mtx_unlock(>n_mtx); - /* -* We use only the kva address for the buffer, but this is extremely -* convenient and fast. -*/ - bp = getpbuf(_pbuf_freecnt); - - kva = (vm_offset_t) bp->b_data; - pmap_qenter(kva, pages, npages); PCPU_INC(cnt.v_vnodeout); PCPU_ADD(cnt.v_vnodepgsout, count); - iov.iov_base = (caddr_t) kva; + iov.iov_base = unmapped_buf; iov.iov_len = count; uio.uio_iov = uio.uio_iovcnt = 1; uio.uio_offset = offset; uio.uio_resid = count; - uio.uio_segflg = UIO_SYSSPACE; + uio.uio_segflg = UIO_NOCOPY; uio.uio_rw = UIO_WRITE; uio.uio_td = td; - if ((ap->a_sync & VM_PAGER_PUT_SYNC) == 0) - iomode = NFSWRITE_UNSTABLE; - else - iomode = NFSWRITE_FILESYNC; - - error = ncl_writerpc(vp, , cred, , _commit, 0); + error = VOP_WRITE(vp, , vnode_pager_putpages_ioflags(ap->a_sync), + cred); crfree(cred); - pmap_qremove(kva, npages); - relpbuf(bp, _pbuf_freecnt); - - if (error == 0 || !nfs_keep_dirty_on_error) { + if (error == 0 || !nfs_keep_dirty_on_error) vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid); - if (must_commit) - ncl_clearcommit(vp->v_mount); - } - return rtvals[0]; + return (rtvals[0]); } /* @@ -1385,7 +1365,8 @@ ncl_vinvalbuf(struct vnode *vp, int flag /* * Now, flush as required. */ - if ((flags & V_SAVE) && (vp->v_bufobj.bo_object != NULL)) { + if ((flags & (V_SAVE | V_VMIO)) == V_SAVE && +vp->v_bufobj.bo_object != NULL) { VM_OBJECT_WLOCK(vp->v_bufobj.bo_object); vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC); VM_OBJECT_WUNLOCK(vp->v_bufobj.bo_object); ___ 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: r317133 - stable/11/sys/fs/nfsclient
Author: kib Date: Wed Apr 19 11:11:51 2017 New Revision: 317133 URL: https://svnweb.freebsd.org/changeset/base/317133 Log: MFC r316531: Handle nfs IO_ASYNC write requests asynchronously. Modified: stable/11/sys/fs/nfsclient/nfs_clbio.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/nfsclient/nfs_clbio.c == --- stable/11/sys/fs/nfsclient/nfs_clbio.c Wed Apr 19 11:10:02 2017 (r317132) +++ stable/11/sys/fs/nfsclient/nfs_clbio.c Wed Apr 19 11:11:51 2017 (r317133) @@ -1275,7 +1275,7 @@ again: error = error1; break; } - } else if ((n + on) == biosize) { + } else if ((n + on) == biosize || (ioflag & IO_ASYNC) != 0) { bp->b_flags |= B_ASYNC; (void) ncl_writebp(bp, 0, NULL); } 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: r317132 - stable/11/sys/fs/nfsclient
Author: kib Date: Wed Apr 19 11:10:02 2017 New Revision: 317132 URL: https://svnweb.freebsd.org/changeset/base/317132 Log: MFC r316529: Handle possible vnode reclamation after ncl_vinvalbuf() call. Modified: stable/11/sys/fs/nfsclient/nfs_clbio.c stable/11/sys/fs/nfsclient/nfs_clvnops.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/fs/nfsclient/nfs_clbio.c == --- stable/11/sys/fs/nfsclient/nfs_clbio.c Wed Apr 19 10:57:57 2017 (r317131) +++ stable/11/sys/fs/nfsclient/nfs_clbio.c Wed Apr 19 11:10:02 2017 (r317132) @@ -394,8 +394,8 @@ nfs_bioread_check_cons(struct vnode *vp, */ old_lock = ncl_upgrade_vnlock(vp); if (vp->v_iflag & VI_DOOMED) { - ncl_downgrade_vnlock(vp, old_lock); - return (EBADF); + error = EBADF; + goto out; } mtx_lock(>n_mtx); @@ -406,7 +406,9 @@ nfs_bioread_check_cons(struct vnode *vp, panic("nfs: bioread, not dir"); ncl_invaldir(vp); error = ncl_vinvalbuf(vp, V_SAVE, td, 1); - if (error) + if (error == 0 && (vp->v_iflag & VI_DOOMED) != 0) + error = EBADF; + if (error != 0) goto out; } np->n_attrstamp = 0; @@ -429,7 +431,9 @@ nfs_bioread_check_cons(struct vnode *vp, if (vp->v_type == VDIR) ncl_invaldir(vp); error = ncl_vinvalbuf(vp, V_SAVE, td, 1); - if (error) + if (error == 0 && (vp->v_iflag & VI_DOOMED) != 0) + error = EBADF; + if (error != 0) goto out; mtx_lock(>n_mtx); np->n_mtime = vattr.va_mtime; @@ -439,7 +443,7 @@ nfs_bioread_check_cons(struct vnode *vp, } out: ncl_downgrade_vnlock(vp, old_lock); - return error; + return (error); } /* @@ -623,6 +627,9 @@ ncl_bioread(struct vnode *vp, struct uio while (error == NFSERR_BAD_COOKIE) { ncl_invaldir(vp); error = ncl_vinvalbuf(vp, 0, td, 1); + if (error == 0 && (vp->v_iflag & VI_DOOMED) != 0) + return (EBADF); + /* * Yuck! The directory has been modified on the * server. The only way to get the block is by @@ -943,8 +950,11 @@ ncl_write(struct vop_write_args *ap) #endif np->n_attrstamp = 0; KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); - error = ncl_vinvalbuf(vp, V_SAVE, td, 1); - if (error) + error = ncl_vinvalbuf(vp, V_SAVE | ((ioflag & + IO_VMIO) != 0 ? V_VMIO : 0), td, 1); + if (error == 0 && (vp->v_iflag & VI_DOOMED) != 0) + error = EBADF; + if (error != 0) return (error); } else mtx_unlock(>n_mtx); @@ -1023,8 +1033,12 @@ ncl_write(struct vop_write_args *ap) if (wouldcommit > nmp->nm_wcommitsize) { np->n_attrstamp = 0; KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); - error = ncl_vinvalbuf(vp, V_SAVE, td, 1); - if (error) + error = ncl_vinvalbuf(vp, V_SAVE | ((ioflag & + IO_VMIO) != 0 ? V_VMIO : 0), td, 1); + if (error == 0 && + (vp->v_iflag & VI_DOOMED) != 0) + error = EBADF; + if (error != 0) return (error); wouldcommit = biosize; } Modified: stable/11/sys/fs/nfsclient/nfs_clvnops.c == --- stable/11/sys/fs/nfsclient/nfs_clvnops.cWed Apr 19 10:57:57 2017 (r317131) +++ stable/11/sys/fs/nfsclient/nfs_clvnops.cWed Apr 19 11:10:02 2017 (r317132) @@ -520,6 +520,8 @@ nfs_open(struct vop_open_args *ap) if (np->n_flag & NMODIFIED) { mtx_unlock(>n_mtx); error = ncl_vinvalbuf(vp, V_SAVE, ap->a_td, 1); + if (error == 0 && (vp->v_iflag & VI_DOOMED) != 0) + return (EBADF); if (error == EINTR || error == EIO) {
svn commit: r317131 - stable/10/lib/libc/gen
Author: kib Date: Wed Apr 19 10:57:57 2017 New Revision: 317131 URL: https://svnweb.freebsd.org/changeset/base/317131 Log: MFC r316739: Fix reporting of _SC_SEM_NSEMS_MAX and _SC_SEM_VALUE_MAX. Modified: stable/10/lib/libc/gen/sysconf.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/gen/sysconf.c == --- stable/10/lib/libc/gen/sysconf.cWed Apr 19 10:54:08 2017 (r317130) +++ stable/10/lib/libc/gen/sysconf.cWed Apr 19 10:57:57 2017 (r317131) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include/* we just need the limits */ +#include #include #include @@ -298,13 +299,9 @@ do_NAME_MAX: mib[1] = CTL_P1003_1B_RTSIG_MAX; goto yesno; case _SC_SEM_NSEMS_MAX: - mib[0] = CTL_P1003_1B; - mib[1] = CTL_P1003_1B_SEM_NSEMS_MAX; - goto yesno; + return (-1); case _SC_SEM_VALUE_MAX: - mib[0] = CTL_P1003_1B; - mib[1] = CTL_P1003_1B_SEM_VALUE_MAX; - goto yesno; + return (SEM_VALUE_MAX); case _SC_SIGQUEUE_MAX: mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_SIGQUEUE_MAX; ___ 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: r317130 - stable/11/lib/libc/gen
Author: kib Date: Wed Apr 19 10:54:08 2017 New Revision: 317130 URL: https://svnweb.freebsd.org/changeset/base/317130 Log: MFC r316739: Fix reporting of _SC_SEM_NSEMS_MAX and _SC_SEM_VALUE_MAX. Modified: stable/11/lib/libc/gen/sysconf.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/gen/sysconf.c == --- stable/11/lib/libc/gen/sysconf.cWed Apr 19 09:07:04 2017 (r317129) +++ stable/11/lib/libc/gen/sysconf.cWed Apr 19 10:54:08 2017 (r317130) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include/* we just need the limits */ +#include #include #include #include "un-namespace.h" @@ -299,13 +300,9 @@ do_NAME_MAX: mib[1] = CTL_P1003_1B_RTSIG_MAX; goto yesno; case _SC_SEM_NSEMS_MAX: - mib[0] = CTL_P1003_1B; - mib[1] = CTL_P1003_1B_SEM_NSEMS_MAX; - goto yesno; + return (-1); case _SC_SEM_VALUE_MAX: - mib[0] = CTL_P1003_1B; - mib[1] = CTL_P1003_1B_SEM_VALUE_MAX; - goto yesno; + return (SEM_VALUE_MAX); case _SC_SIGQUEUE_MAX: mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_SIGQUEUE_MAX; ___ 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"