From owner-svn-src-all@freebsd.org Sun Nov 26 02:00:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9337DF7ED5;
Sun, 26 Nov 2017 02:00:45 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 27995785C0;
Sun, 26 Nov 2017 02:00:45 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQ20iLm056342;
Sun, 26 Nov 2017 02:00:44 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQ20X3q056232;
Sun, 26 Nov 2017 02:00:33 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711260200.vAQ20X3q056232@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sun, 26 Nov 2017 02:00:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326219 - in head/lib: csu/amd64 csu/arm csu/common
csu/mips csu/powerpc csu/powerpc64 csu/sparc64 libarchive libbluetooth
libbsdstat libc_nonshared libcalendar libcam libcompat/4.1 lib...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/lib: csu/amd64 csu/arm csu/common csu/mips
csu/powerpc csu/powerpc64 csu/sparc64 libarchive libbluetooth libbsdstat
libc_nonshared libcalendar libcam libcompat/4.1 libcrypt libdevinfo
libdevst...
X-SVN-Commit-Revision: 326219
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 02:00:45 -0000
Author: pfg
Date: Sun Nov 26 02:00:33 2017
New Revision: 326219
URL: https://svnweb.freebsd.org/changeset/base/326219
Log:
lib: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using mis-identified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/lib/csu/amd64/crt1.c
head/lib/csu/arm/crt1.c
head/lib/csu/common/crtbrand.c
head/lib/csu/common/ignore_init.c
head/lib/csu/common/notes.h
head/lib/csu/mips/crt1.c
head/lib/csu/powerpc/crt1.c
head/lib/csu/powerpc64/crt1.c
head/lib/csu/sparc64/crt1.c
head/lib/libarchive/config_freebsd.h
head/lib/libbluetooth/bluetooth.c
head/lib/libbluetooth/bluetooth.h
head/lib/libbluetooth/dev.c
head/lib/libbluetooth/hci.c
head/lib/libbsdstat/bsdstat.c
head/lib/libbsdstat/bsdstat.h
head/lib/libc_nonshared/__stub.c
head/lib/libcalendar/calendar.c
head/lib/libcalendar/calendar.h
head/lib/libcalendar/easter.c
head/lib/libcam/camlib.c
head/lib/libcompat/4.1/ftime.c
head/lib/libcrypt/crypt-md5.c
head/lib/libcrypt/crypt-nthash.c
head/lib/libcrypt/crypt-sha256.c
head/lib/libcrypt/crypt-sha512.c
head/lib/libcrypt/crypt.c
head/lib/libcrypt/crypt.h
head/lib/libdevinfo/devinfo.c
head/lib/libdevinfo/devinfo.h
head/lib/libdevinfo/devinfo_var.h
head/lib/libdevstat/devstat.c
head/lib/libdevstat/devstat.h
head/lib/libfetch/common.c
head/lib/libfetch/common.h
head/lib/libfetch/fetch.c
head/lib/libfetch/fetch.h
head/lib/libfetch/file.c
head/lib/libfetch/ftp.c
head/lib/libfetch/http.c
head/lib/libgeom/geom_ctl.c
head/lib/libgeom/geom_getxml.c
head/lib/libgeom/geom_stats.c
head/lib/libgeom/geom_util.c
head/lib/libgeom/geom_xml2tree.c
head/lib/libgeom/libgeom.h
head/lib/libgssapi/context.h
head/lib/libgssapi/cred.h
head/lib/libgssapi/gss_accept_sec_context.c
head/lib/libgssapi/gss_acquire_cred.c
head/lib/libgssapi/gss_add_cred.c
head/lib/libgssapi/gss_add_oid_set_member.c
head/lib/libgssapi/gss_canonicalize_name.c
head/lib/libgssapi/gss_compare_name.c
head/lib/libgssapi/gss_context_time.c
head/lib/libgssapi/gss_create_empty_oid_set.c
head/lib/libgssapi/gss_decapsulate_token.c
head/lib/libgssapi/gss_delete_sec_context.c
head/lib/libgssapi/gss_display_name.c
head/lib/libgssapi/gss_duplicate_name.c
head/lib/libgssapi/gss_duplicate_oid.c
head/lib/libgssapi/gss_encapsulate_token.c
head/lib/libgssapi/gss_export_name.c
head/lib/libgssapi/gss_export_sec_context.c
head/lib/libgssapi/gss_get_mic.c
head/lib/libgssapi/gss_import_name.c
head/lib/libgssapi/gss_import_sec_context.c
head/lib/libgssapi/gss_indicate_mechs.c
head/lib/libgssapi/gss_init_sec_context.c
head/lib/libgssapi/gss_inquire_context.c
head/lib/libgssapi/gss_inquire_cred.c
head/lib/libgssapi/gss_inquire_cred_by_mech.c
head/lib/libgssapi/gss_inquire_mechs_for_name.c
head/lib/libgssapi/gss_inquire_names_for_mech.c
head/lib/libgssapi/gss_inquire_sec_context_by_oid.c
head/lib/libgssapi/gss_krb5.c
head/lib/libgssapi/gss_mech_switch.c
head/lib/libgssapi/gss_names.c
head/lib/libgssapi/gss_pname_to_uid.c
head/lib/libgssapi/gss_process_context_token.c
head/lib/libgssapi/gss_release_buffer.c
head/lib/libgssapi/gss_release_cred.c
head/lib/libgssapi/gss_release_name.c
head/lib/libgssapi/gss_release_oid_set.c
head/lib/libgssapi/gss_seal.c
head/lib/libgssapi/gss_sign.c
head/lib/libgssapi/gss_test_oid_set_member.c
head/lib/libgssapi/gss_unseal.c
head/lib/libgssapi/gss_unwrap.c
head/lib/libgssapi/gss_utils.c
head/lib/libgssapi/gss_verify.c
head/lib/libgssapi/gss_verify_mic.c
head/lib/libgssapi/gss_wrap.c
head/lib/libgssapi/gss_wrap_size_limit.c
head/lib/libgssapi/mech_switch.h
head/lib/libgssapi/name.h
head/lib/libgssapi/spnego.h
head/lib/libgssapi/utils.h
head/lib/libiconv_modules/BIG5/citrus_big5.h
head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
head/lib/libiconv_modules/EUC/citrus_euc.h
head/lib/libiconv_modules/EUCTW/citrus_euctw.c
head/lib/libiconv_modules/EUCTW/citrus_euctw.h
head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
head/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
head/lib/libiconv_modules/HZ/citrus_hz.c
head/lib/libiconv_modules/HZ/citrus_hz.h
head/lib/libiconv_modules/ISO2022/citrus_iso2022.c
head/lib/libiconv_modules/ISO2022/citrus_iso2022.h
head/lib/libiconv_modules/JOHAB/citrus_johab.c
head/lib/libiconv_modules/JOHAB/citrus_johab.h
head/lib/libiconv_modules/MSKanji/citrus_mskanji.c
head/lib/libiconv_modules/MSKanji/citrus_mskanji.h
head/lib/libiconv_modules/UES/citrus_ues.c
head/lib/libiconv_modules/UES/citrus_ues.h
head/lib/libiconv_modules/UTF1632/citrus_utf1632.c
head/lib/libiconv_modules/UTF1632/citrus_utf1632.h
head/lib/libiconv_modules/UTF7/citrus_utf7.c
head/lib/libiconv_modules/UTF7/citrus_utf7.h
head/lib/libiconv_modules/UTF8/citrus_utf8.h
head/lib/libiconv_modules/VIQR/citrus_viqr.c
head/lib/libiconv_modules/VIQR/citrus_viqr.h
head/lib/libiconv_modules/ZW/citrus_zw.c
head/lib/libiconv_modules/ZW/citrus_zw.h
head/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
head/lib/libiconv_modules/iconv_none/citrus_iconv_none.h
head/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
head/lib/libiconv_modules/iconv_std/citrus_iconv_std.h
head/lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h
head/lib/libiconv_modules/mapper_646/citrus_mapper_646.c
head/lib/libiconv_modules/mapper_646/citrus_mapper_646.h
head/lib/libiconv_modules/mapper_none/citrus_mapper_none.c
head/lib/libiconv_modules/mapper_none/citrus_mapper_none.h
head/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c
head/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h
head/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
head/lib/libiconv_modules/mapper_std/citrus_mapper_std.h
head/lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h
head/lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h
head/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c
head/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h
head/lib/libjail/jail.c
head/lib/libjail/jail.h
head/lib/libjail/jail_getid.c
head/lib/libkiconv/kiconv_sysctl.c
head/lib/libkiconv/quirks.c
head/lib/libkiconv/quirks.h
head/lib/libkiconv/xlat16_iconv.c
head/lib/libkvm/kvm_getswapinfo.c
head/lib/libkvm/kvm_minidump_amd64.c
head/lib/libkvm/kvm_minidump_arm.c
head/lib/libkvm/kvm_minidump_i386.c
head/lib/libkvm/kvm_minidump_mips.c
head/lib/libkvm/kvm_vnet.c
head/lib/libmemstat/memstat.c
head/lib/libmemstat/memstat.h
head/lib/libmemstat/memstat_all.c
head/lib/libmemstat/memstat_internal.h
head/lib/libmemstat/memstat_malloc.c
head/lib/libmemstat/memstat_uma.c
head/lib/libmp/mpasbn.c
head/lib/libnandfs/libnandfs.h
head/lib/libnandfs/nandfs.c
head/lib/libnetbsd/rmd160.h
head/lib/libnetbsd/sha1.h
head/lib/libnetbsd/sha2.h
head/lib/libnetbsd/stdlib.h
head/lib/libnetbsd/strsuftoll.c
head/lib/libnetbsd/util.c
head/lib/libnv/common_impl.h
head/lib/libnv/msgio.c
head/lib/libnv/msgio.h
head/lib/libpam/libpam/security/pam_mod_misc.h
head/lib/libpam/modules/pam_chroot/pam_chroot.c
head/lib/libpam/modules/pam_deny/pam_deny.c
head/lib/libpam/modules/pam_echo/pam_echo.c
head/lib/libpam/modules/pam_exec/pam_exec.c
head/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c
head/lib/libpam/modules/pam_group/pam_group.c
head/lib/libpam/modules/pam_guest/pam_guest.c
head/lib/libpam/modules/pam_ksu/pam_ksu.c
head/lib/libpam/modules/pam_login_access/pam_login_access.c
head/lib/libpam/modules/pam_login_access/pam_login_access.h
head/lib/libpam/modules/pam_nologin/pam_nologin.c
head/lib/libpam/modules/pam_opie/pam_opie.c
head/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c
head/lib/libpam/modules/pam_permit/pam_permit.c
head/lib/libpam/modules/pam_radius/pam_radius.c
head/lib/libpam/modules/pam_rhosts/pam_rhosts.c
head/lib/libpam/modules/pam_rootok/pam_rootok.c
head/lib/libpam/modules/pam_securetty/pam_securetty.c
head/lib/libpam/modules/pam_self/pam_self.c
head/lib/libpam/modules/pam_ssh/pam_ssh.c
head/lib/libpam/modules/pam_tacplus/pam_tacplus.c
head/lib/libpam/modules/pam_unix/pam_unix.c
head/lib/libpjdlog/pjdlog.c
head/lib/libpjdlog/pjdlog.h
head/lib/libpmc/libpmc.c
head/lib/libpmc/libpmcinternal.h
head/lib/libpmc/pmc.h
head/lib/libpmc/pmclog.c
head/lib/libpmc/pmclog.h
head/lib/libproc/_libproc.h
head/lib/libproc/libproc.h
head/lib/libproc/proc_bkpt.c
head/lib/libproc/proc_create.c
head/lib/libproc/proc_regs.c
head/lib/libproc/proc_rtld.c
head/lib/libproc/proc_sym.c
head/lib/libproc/proc_util.c
head/lib/libprocstat/common_kvm.h
head/lib/libprocstat/core.c
head/lib/libprocstat/core.h
head/lib/libprocstat/libprocstat.h
head/lib/libprocstat/libprocstat_internal.h
head/lib/libprocstat/smbfs.c
head/lib/libprocstat/udf.c
head/lib/libprocstat/zfs.c
head/lib/libradius/radlib.c
head/lib/libradius/radlib.h
head/lib/libradius/radlib_private.h
head/lib/libradius/radlib_vs.h
head/lib/librpcsec_gss/rpcsec_gss_conf.c
head/lib/librpcsec_gss/rpcsec_gss_misc.c
head/lib/librt/aio.c
head/lib/librt/mq.c
head/lib/librt/sigev_thread.c
head/lib/librt/sigev_thread.h
head/lib/librt/timer.c
head/lib/librtld_db/rtld_db.c
head/lib/librtld_db/rtld_db.h
head/lib/libsdp/sdp-int.h
head/lib/libsdp/sdp.h
head/lib/libsdp/search.c
head/lib/libsdp/service.c
head/lib/libsdp/session.c
head/lib/libsdp/util.c
head/lib/libstdbuf/stdbuf.c
head/lib/libstdthreads/call_once.c
head/lib/libstdthreads/cnd.c
head/lib/libstdthreads/mtx.c
head/lib/libstdthreads/thrd.c
head/lib/libstdthreads/threads.h
head/lib/libstdthreads/tss.c
head/lib/libtacplus/taclib.c
head/lib/libtacplus/taclib.h
head/lib/libtacplus/taclib_private.h
head/lib/libthr/arch/amd64/include/pthread_md.h
head/lib/libthr/arch/arm/include/pthread_md.h
head/lib/libthr/arch/i386/include/pthread_md.h
head/lib/libthr/arch/mips/include/pthread_md.h
head/lib/libthr/arch/powerpc/include/pthread_md.h
head/lib/libthr/arch/sparc64/include/pthread_md.h
head/lib/libthr/thread/thr_affinity.c
head/lib/libthr/thread/thr_barrier.c
head/lib/libthr/thread/thr_barrierattr.c
head/lib/libthr/thread/thr_cancel.c
head/lib/libthr/thread/thr_cond.c
head/lib/libthr/thread/thr_create.c
head/lib/libthr/thread/thr_detach.c
head/lib/libthr/thread/thr_event.c
head/lib/libthr/thread/thr_getcpuclockid.c
head/lib/libthr/thread/thr_getthreadid_np.c
head/lib/libthr/thread/thr_join.c
head/lib/libthr/thread/thr_kern.c
head/lib/libthr/thread/thr_list.c
head/lib/libthr/thread/thr_main_np.c
head/lib/libthr/thread/thr_once.c
head/lib/libthr/thread/thr_printf.c
head/lib/libthr/thread/thr_private.h
head/lib/libthr/thread/thr_pspinlock.c
head/lib/libthr/thread/thr_rtld.c
head/lib/libthr/thread/thr_rwlock.c
head/lib/libthr/thread/thr_rwlockattr.c
head/lib/libthr/thread/thr_sem.c
head/lib/libthr/thread/thr_sig.c
head/lib/libthr/thread/thr_sleepq.c
head/lib/libthr/thread/thr_stack.c
head/lib/libthr/thread/thr_umtx.c
head/lib/libthr/thread/thr_umtx.h
head/lib/libthread_db/arch/amd64/libpthread_md.c
head/lib/libthread_db/arch/arm/libpthread_md.c
head/lib/libthread_db/arch/i386/libpthread_md.c
head/lib/libthread_db/arch/powerpc/libpthread_md.c
head/lib/libthread_db/arch/sparc64/libpthread_md.c
head/lib/libthread_db/kse.h
head/lib/libthread_db/libpthread_db.c
head/lib/libthread_db/libpthread_db.h
head/lib/libthread_db/libthr_db.c
head/lib/libthread_db/thread_db.c
head/lib/libthread_db/thread_db.h
head/lib/libthread_db/thread_db_int.h
head/lib/libufs/block.c
head/lib/libufs/cgroup.c
head/lib/libufs/inode.c
head/lib/libufs/libufs.h
head/lib/libufs/sblock.c
head/lib/libufs/type.c
head/lib/libugidfw/ugidfw.c
head/lib/libugidfw/ugidfw.h
head/lib/libulog/ulog.h
head/lib/libulog/ulog_login.c
head/lib/libulog/ulog_login_pseudo.c
head/lib/libulog/utempter.c
head/lib/libulog/utempter.h
head/lib/libusb/libusb.h
head/lib/libusb/libusb01.c
head/lib/libusb/libusb10.c
head/lib/libusb/libusb10.h
head/lib/libusb/libusb10_desc.c
head/lib/libusb/libusb10_io.c
head/lib/libusb/libusb20.c
head/lib/libusb/libusb20.h
head/lib/libusb/libusb20_desc.c
head/lib/libusb/libusb20_desc.h
head/lib/libusb/libusb20_int.h
head/lib/libusb/libusb20_ugen20.c
head/lib/libusb/libusb_global_linux.h
head/lib/libusb/usb.h
head/lib/libusbhid/data.c
head/lib/libusbhid/descr.c
head/lib/libusbhid/descr_compat.c
head/lib/libusbhid/parse.c
head/lib/libusbhid/usage.c
head/lib/libusbhid/usbhid.h
head/lib/libusbhid/usbvar.h
head/lib/libutil/auth.c
head/lib/libutil/expand_number.c
head/lib/libutil/flopen.c
head/lib/libutil/fparseln.c
head/lib/libutil/gr_util.c
head/lib/libutil/humanize_number.c
head/lib/libutil/kinfo_getallproc.c
head/lib/libutil/kinfo_getproc.c
head/lib/libutil/kld.c
head/lib/libutil/libutil.h
head/lib/libutil/login_crypt.c
head/lib/libutil/pidfile.c
head/lib/libutil/property.c
head/lib/libutil/quotafile.c
head/lib/libutil/realhostname.c
head/lib/libutil/stub.c
head/lib/libutil/trimdomain.c
head/lib/libvgl/bitmap.c
head/lib/libvgl/keyboard.c
head/lib/libvgl/main.c
head/lib/libvgl/mouse.c
head/lib/libvgl/simple.c
head/lib/libvgl/text.c
head/lib/libvgl/vgl.h
head/lib/libvmmapi/vmmapi.c
head/lib/libvmmapi/vmmapi.h
head/lib/libvmmapi/vmmapi_freebsd.c
head/lib/libypclnt/ypclnt.h
head/lib/libypclnt/ypclnt_connect.c
head/lib/libypclnt/ypclnt_error.c
head/lib/libypclnt/ypclnt_free.c
head/lib/libypclnt/ypclnt_get.c
head/lib/libypclnt/ypclnt_new.c
head/lib/libypclnt/ypclnt_passwd.c
head/lib/msun/amd64/fenv.c
head/lib/msun/arm/fenv.c
head/lib/msun/arm/fenv.h
head/lib/msun/i387/fenv.c
head/lib/msun/i387/invtrig.c
head/lib/msun/ld128/invtrig.c
head/lib/msun/ld128/invtrig.h
head/lib/msun/ld128/k_expl.h
head/lib/msun/ld128/s_exp2l.c
head/lib/msun/ld128/s_expl.c
head/lib/msun/ld128/s_logl.c
head/lib/msun/ld128/s_nanl.c
head/lib/msun/ld80/invtrig.c
head/lib/msun/ld80/invtrig.h
head/lib/msun/ld80/k_expl.h
head/lib/msun/ld80/s_exp2l.c
head/lib/msun/ld80/s_expl.c
head/lib/msun/ld80/s_logl.c
head/lib/msun/ld80/s_nanl.c
head/lib/msun/mips/fenv.c
head/lib/msun/mips/fenv.h
head/lib/msun/powerpc/fenv.c
head/lib/msun/powerpc/fenv.h
head/lib/msun/sparc64/fenv.c
head/lib/msun/sparc64/fenv.h
head/lib/msun/src/catrig.c
head/lib/msun/src/catrigf.c
head/lib/msun/src/e_remainderl.c
head/lib/msun/src/e_sqrtl.c
head/lib/msun/src/fenv-softfloat.h
head/lib/msun/src/imprecise.c
head/lib/msun/src/k_exp.c
head/lib/msun/src/k_expf.c
head/lib/msun/src/s_carg.c
head/lib/msun/src/s_cargf.c
head/lib/msun/src/s_cargl.c
head/lib/msun/src/s_ccosh.c
head/lib/msun/src/s_ccoshf.c
head/lib/msun/src/s_cexp.c
head/lib/msun/src/s_cexpf.c
head/lib/msun/src/s_cimag.c
head/lib/msun/src/s_cimagf.c
head/lib/msun/src/s_cimagl.c
head/lib/msun/src/s_conj.c
head/lib/msun/src/s_conjf.c
head/lib/msun/src/s_conjl.c
head/lib/msun/src/s_copysignl.c
head/lib/msun/src/s_cosl.c
head/lib/msun/src/s_cproj.c
head/lib/msun/src/s_cprojf.c
head/lib/msun/src/s_cprojl.c
head/lib/msun/src/s_creal.c
head/lib/msun/src/s_crealf.c
head/lib/msun/src/s_creall.c
head/lib/msun/src/s_csinh.c
head/lib/msun/src/s_csinhf.c
head/lib/msun/src/s_csqrt.c
head/lib/msun/src/s_csqrtf.c
head/lib/msun/src/s_csqrtl.c
head/lib/msun/src/s_ctanh.c
head/lib/msun/src/s_ctanhf.c
head/lib/msun/src/s_exp2.c
head/lib/msun/src/s_exp2f.c
head/lib/msun/src/s_fabsl.c
head/lib/msun/src/s_fdim.c
head/lib/msun/src/s_fma.c
head/lib/msun/src/s_fmaf.c
head/lib/msun/src/s_fmal.c
head/lib/msun/src/s_fmax.c
head/lib/msun/src/s_fmaxf.c
head/lib/msun/src/s_fmaxl.c
head/lib/msun/src/s_fmin.c
head/lib/msun/src/s_fminf.c
head/lib/msun/src/s_fminl.c
head/lib/msun/src/s_frexpl.c
head/lib/msun/src/s_isfinite.c
head/lib/msun/src/s_isnan.c
head/lib/msun/src/s_isnormal.c
head/lib/msun/src/s_lrint.c
head/lib/msun/src/s_lround.c
head/lib/msun/src/s_modfl.c
head/lib/msun/src/s_nan.c
head/lib/msun/src/s_nearbyint.c
head/lib/msun/src/s_rintl.c
head/lib/msun/src/s_round.c
head/lib/msun/src/s_roundf.c
head/lib/msun/src/s_roundl.c
head/lib/msun/src/s_scalbln.c
head/lib/msun/src/s_signbit.c
head/lib/msun/src/s_sinl.c
head/lib/msun/src/s_tanl.c
head/lib/msun/src/s_tgammaf.c
head/lib/msun/x86/fenv.h
Modified: head/lib/csu/amd64/crt1.c
==============================================================================
--- head/lib/csu/amd64/crt1.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/amd64/crt1.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,5 +1,7 @@
/* LINTLIBRARY */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/lib/csu/arm/crt1.c
==============================================================================
--- head/lib/csu/arm/crt1.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/arm/crt1.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,5 +1,7 @@
/* LINTLIBRARY */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright 1996-1998 John D. Polstra.
Modified: head/lib/csu/common/crtbrand.c
==============================================================================
--- head/lib/csu/common/crtbrand.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/common/crtbrand.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2000 David E. O'Brien, John D. Polstra.
* All rights reserved.
*
Modified: head/lib/csu/common/ignore_init.c
==============================================================================
--- head/lib/csu/common/ignore_init.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/common/ignore_init.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/lib/csu/common/notes.h
==============================================================================
--- head/lib/csu/common/notes.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/common/notes.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/lib/csu/mips/crt1.c
==============================================================================
--- head/lib/csu/mips/crt1.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/mips/crt1.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
* Copyright (c) 1995 Christopher G. Demetriou
Modified: head/lib/csu/powerpc/crt1.c
==============================================================================
--- head/lib/csu/powerpc/crt1.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/powerpc/crt1.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,5 +1,7 @@
/* LINTLIBRARY */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright 1996-1998 John D. Polstra.
Modified: head/lib/csu/powerpc64/crt1.c
==============================================================================
--- head/lib/csu/powerpc64/crt1.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/powerpc64/crt1.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,5 +1,7 @@
/* LINTLIBRARY */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright 1996-1998 John D. Polstra.
Modified: head/lib/csu/sparc64/crt1.c
==============================================================================
--- head/lib/csu/sparc64/crt1.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/csu/sparc64/crt1.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,5 +1,7 @@
/* LINTLIBRARY */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2001 David E. O'Brien.
* All rights reserved.
* Copyright (c) 1995, 1998 Berkeley Software Design, Inc.
Modified: head/lib/libarchive/config_freebsd.h
==============================================================================
--- head/lib/libarchive/config_freebsd.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libarchive/config_freebsd.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2007 Tim Kientzle
* All rights reserved.
*
Modified: head/lib/libbluetooth/bluetooth.c
==============================================================================
--- head/lib/libbluetooth/bluetooth.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libbluetooth/bluetooth.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
Modified: head/lib/libbluetooth/bluetooth.h
==============================================================================
--- head/lib/libbluetooth/bluetooth.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libbluetooth/bluetooth.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
Modified: head/lib/libbluetooth/dev.c
==============================================================================
--- head/lib/libbluetooth/dev.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libbluetooth/dev.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
Modified: head/lib/libbluetooth/hci.c
==============================================================================
--- head/lib/libbluetooth/hci.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libbluetooth/hci.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -3,6 +3,8 @@
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
Modified: head/lib/libbsdstat/bsdstat.c
==============================================================================
--- head/lib/libbsdstat/bsdstat.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libbsdstat/bsdstat.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/lib/libbsdstat/bsdstat.h
==============================================================================
--- head/lib/libbsdstat/bsdstat.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libbsdstat/bsdstat.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/lib/libc_nonshared/__stub.c
==============================================================================
--- head/lib/libc_nonshared/__stub.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libc_nonshared/__stub.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Peter Wemm
* All rights reserved.
*
Modified: head/lib/libcalendar/calendar.c
==============================================================================
--- head/lib/libcalendar/calendar.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcalendar/calendar.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
Modified: head/lib/libcalendar/calendar.h
==============================================================================
--- head/lib/libcalendar/calendar.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcalendar/calendar.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
Modified: head/lib/libcalendar/easter.c
==============================================================================
--- head/lib/libcalendar/easter.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcalendar/easter.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Wolfgang Helbig
* All rights reserved.
*
Modified: head/lib/libcam/camlib.c
==============================================================================
--- head/lib/libcam/camlib.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcam/camlib.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998, 1999, 2002 Kenneth D. Merry.
* All rights reserved.
*
Modified: head/lib/libcompat/4.1/ftime.c
==============================================================================
--- head/lib/libcompat/4.1/ftime.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcompat/4.1/ftime.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
*
Modified: head/lib/libcrypt/crypt-md5.c
==============================================================================
--- head/lib/libcrypt/crypt-md5.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcrypt/crypt-md5.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/lib/libcrypt/crypt-nthash.c
==============================================================================
--- head/lib/libcrypt/crypt-nthash.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcrypt/crypt-nthash.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Michael Bretterklieber
* All rights reserved.
*
Modified: head/lib/libcrypt/crypt-sha256.c
==============================================================================
--- head/lib/libcrypt/crypt-sha256.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcrypt/crypt-sha256.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/lib/libcrypt/crypt-sha512.c
==============================================================================
--- head/lib/libcrypt/crypt-sha512.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcrypt/crypt-sha512.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/lib/libcrypt/crypt.c
==============================================================================
--- head/lib/libcrypt/crypt.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcrypt/crypt.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Mark Murray
* Copyright (c) 2014 Dag-Erling Smørgrav
* All rights reserved.
Modified: head/lib/libcrypt/crypt.h
==============================================================================
--- head/lib/libcrypt/crypt.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libcrypt/crypt.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,5 +1,7 @@
/* LINTLIBRARY */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999
* Mark Murray. All rights reserved.
*
Modified: head/lib/libdevinfo/devinfo.c
==============================================================================
--- head/lib/libdevinfo/devinfo.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libdevinfo/devinfo.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
Modified: head/lib/libdevinfo/devinfo.h
==============================================================================
--- head/lib/libdevinfo/devinfo.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libdevinfo/devinfo.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
Modified: head/lib/libdevinfo/devinfo_var.h
==============================================================================
--- head/lib/libdevinfo/devinfo_var.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libdevinfo/devinfo_var.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
Modified: head/lib/libdevstat/devstat.c
==============================================================================
--- head/lib/libdevstat/devstat.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libdevstat/devstat.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
*
Modified: head/lib/libdevstat/devstat.h
==============================================================================
--- head/lib/libdevstat/devstat.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libdevstat/devstat.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998 Kenneth D. Merry.
* All rights reserved.
*
Modified: head/lib/libfetch/common.c
==============================================================================
--- head/lib/libfetch/common.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libfetch/common.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-2016 Dag-Erling Smørgrav
* Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
* All rights reserved.
Modified: head/lib/libfetch/common.h
==============================================================================
--- head/lib/libfetch/common.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libfetch/common.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-2014 Dag-Erling Smørgrav
* All rights reserved.
*
Modified: head/lib/libfetch/fetch.c
==============================================================================
--- head/lib/libfetch/fetch.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libfetch/fetch.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-2004 Dag-Erling Smørgrav
* All rights reserved.
*
Modified: head/lib/libfetch/fetch.h
==============================================================================
--- head/lib/libfetch/fetch.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libfetch/fetch.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-2004 Dag-Erling Smørgrav
* All rights reserved.
*
Modified: head/lib/libfetch/file.c
==============================================================================
--- head/lib/libfetch/file.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libfetch/file.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
Modified: head/lib/libfetch/ftp.c
==============================================================================
--- head/lib/libfetch/ftp.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libfetch/ftp.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
Modified: head/lib/libfetch/http.c
==============================================================================
--- head/lib/libfetch/http.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libfetch/http.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000-2014 Dag-Erling Smørgrav
* All rights reserved.
*
Modified: head/lib/libgeom/geom_ctl.c
==============================================================================
--- head/lib/libgeom/geom_ctl.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgeom/geom_ctl.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/lib/libgeom/geom_getxml.c
==============================================================================
--- head/lib/libgeom/geom_getxml.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgeom/geom_getxml.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/lib/libgeom/geom_stats.c
==============================================================================
--- head/lib/libgeom/geom_stats.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgeom/geom_stats.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/lib/libgeom/geom_util.c
==============================================================================
--- head/lib/libgeom/geom_util.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgeom/geom_util.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/lib/libgeom/geom_xml2tree.c
==============================================================================
--- head/lib/libgeom/geom_xml2tree.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgeom/geom_xml2tree.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/lib/libgeom/libgeom.h
==============================================================================
--- head/lib/libgeom/libgeom.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgeom/libgeom.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/lib/libgssapi/context.h
==============================================================================
--- head/lib/libgssapi/context.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/context.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/cred.h
==============================================================================
--- head/lib/libgssapi/cred.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/cred.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_accept_sec_context.c
==============================================================================
--- head/lib/libgssapi/gss_accept_sec_context.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_accept_sec_context.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_acquire_cred.c
==============================================================================
--- head/lib/libgssapi/gss_acquire_cred.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_acquire_cred.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_add_cred.c
==============================================================================
--- head/lib/libgssapi/gss_add_cred.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_add_cred.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_add_oid_set_member.c
==============================================================================
--- head/lib/libgssapi/gss_add_oid_set_member.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_add_oid_set_member.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_canonicalize_name.c
==============================================================================
--- head/lib/libgssapi/gss_canonicalize_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_canonicalize_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_compare_name.c
==============================================================================
--- head/lib/libgssapi/gss_compare_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_compare_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_context_time.c
==============================================================================
--- head/lib/libgssapi/gss_context_time.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_context_time.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_create_empty_oid_set.c
==============================================================================
--- head/lib/libgssapi/gss_create_empty_oid_set.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_create_empty_oid_set.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_decapsulate_token.c
==============================================================================
--- head/lib/libgssapi/gss_decapsulate_token.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_decapsulate_token.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_delete_sec_context.c
==============================================================================
--- head/lib/libgssapi/gss_delete_sec_context.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_delete_sec_context.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_display_name.c
==============================================================================
--- head/lib/libgssapi/gss_display_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_display_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_duplicate_name.c
==============================================================================
--- head/lib/libgssapi/gss_duplicate_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_duplicate_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_duplicate_oid.c
==============================================================================
--- head/lib/libgssapi/gss_duplicate_oid.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_duplicate_oid.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_encapsulate_token.c
==============================================================================
--- head/lib/libgssapi/gss_encapsulate_token.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_encapsulate_token.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_export_name.c
==============================================================================
--- head/lib/libgssapi/gss_export_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_export_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_export_sec_context.c
==============================================================================
--- head/lib/libgssapi/gss_export_sec_context.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_export_sec_context.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_get_mic.c
==============================================================================
--- head/lib/libgssapi/gss_get_mic.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_get_mic.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_import_name.c
==============================================================================
--- head/lib/libgssapi/gss_import_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_import_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_import_sec_context.c
==============================================================================
--- head/lib/libgssapi/gss_import_sec_context.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_import_sec_context.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_indicate_mechs.c
==============================================================================
--- head/lib/libgssapi/gss_indicate_mechs.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_indicate_mechs.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_init_sec_context.c
==============================================================================
--- head/lib/libgssapi/gss_init_sec_context.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_init_sec_context.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_inquire_context.c
==============================================================================
--- head/lib/libgssapi/gss_inquire_context.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_inquire_context.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_inquire_cred.c
==============================================================================
--- head/lib/libgssapi/gss_inquire_cred.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_inquire_cred.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_inquire_cred_by_mech.c
==============================================================================
--- head/lib/libgssapi/gss_inquire_cred_by_mech.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_inquire_cred_by_mech.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_inquire_mechs_for_name.c
==============================================================================
--- head/lib/libgssapi/gss_inquire_mechs_for_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_inquire_mechs_for_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_inquire_names_for_mech.c
==============================================================================
--- head/lib/libgssapi/gss_inquire_names_for_mech.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_inquire_names_for_mech.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_inquire_sec_context_by_oid.c
==============================================================================
--- head/lib/libgssapi/gss_inquire_sec_context_by_oid.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_inquire_sec_context_by_oid.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_krb5.c
==============================================================================
--- head/lib/libgssapi/gss_krb5.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_krb5.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_mech_switch.c
==============================================================================
--- head/lib/libgssapi/gss_mech_switch.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_mech_switch.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_names.c
==============================================================================
--- head/lib/libgssapi/gss_names.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_names.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_pname_to_uid.c
==============================================================================
--- head/lib/libgssapi/gss_pname_to_uid.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_pname_to_uid.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/lib/libgssapi/gss_process_context_token.c
==============================================================================
--- head/lib/libgssapi/gss_process_context_token.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_process_context_token.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_release_buffer.c
==============================================================================
--- head/lib/libgssapi/gss_release_buffer.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_release_buffer.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_release_cred.c
==============================================================================
--- head/lib/libgssapi/gss_release_cred.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_release_cred.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_release_name.c
==============================================================================
--- head/lib/libgssapi/gss_release_name.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_release_name.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_release_oid_set.c
==============================================================================
--- head/lib/libgssapi/gss_release_oid_set.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_release_oid_set.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_seal.c
==============================================================================
--- head/lib/libgssapi/gss_seal.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_seal.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_sign.c
==============================================================================
--- head/lib/libgssapi/gss_sign.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_sign.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_test_oid_set_member.c
==============================================================================
--- head/lib/libgssapi/gss_test_oid_set_member.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_test_oid_set_member.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_unseal.c
==============================================================================
--- head/lib/libgssapi/gss_unseal.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_unseal.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_unwrap.c
==============================================================================
--- head/lib/libgssapi/gss_unwrap.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_unwrap.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_utils.c
==============================================================================
--- head/lib/libgssapi/gss_utils.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_utils.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_verify.c
==============================================================================
--- head/lib/libgssapi/gss_verify.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_verify.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_verify_mic.c
==============================================================================
--- head/lib/libgssapi/gss_verify_mic.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_verify_mic.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_wrap.c
==============================================================================
--- head/lib/libgssapi/gss_wrap.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_wrap.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/gss_wrap_size_limit.c
==============================================================================
--- head/lib/libgssapi/gss_wrap_size_limit.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/gss_wrap_size_limit.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/mech_switch.h
==============================================================================
--- head/lib/libgssapi/mech_switch.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/mech_switch.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/name.h
==============================================================================
--- head/lib/libgssapi/name.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/name.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/spnego.h
==============================================================================
--- head/lib/libgssapi/spnego.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/spnego.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libgssapi/utils.h
==============================================================================
--- head/lib/libgssapi/utils.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libgssapi/utils.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/lib/libiconv_modules/BIG5/citrus_big5.h
==============================================================================
--- head/lib/libiconv_modules/BIG5/citrus_big5.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/BIG5/citrus_big5.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_big5.h,v 1.2 2003/06/25 09:51:41 tshiozak Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
==============================================================================
--- head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_dechanyu.c,v 1.4 2011/11/19 18:20:13 tnozaki Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2007 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h
==============================================================================
--- head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_dechanyu.h,v 1.1 2007/04/01 18:52:32 tnozaki Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2006 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/EUC/citrus_euc.h
==============================================================================
--- head/lib/libiconv_modules/EUC/citrus_euc.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/EUC/citrus_euc.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_euc.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/EUCTW/citrus_euctw.c
==============================================================================
--- head/lib/libiconv_modules/EUCTW/citrus_euctw.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/EUCTW/citrus_euctw.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_euctw.c,v 1.11 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/EUCTW/citrus_euctw.h
==============================================================================
--- head/lib/libiconv_modules/EUCTW/citrus_euctw.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/EUCTW/citrus_euctw.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_euctw.h,v 1.2 2003/06/25 09:51:42 tshiozak Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2002 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
==============================================================================
--- head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_gbk2k.c,v 1.7 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/GBK2K/citrus_gbk2k.h
==============================================================================
--- head/lib/libiconv_modules/GBK2K/citrus_gbk2k.h Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/GBK2K/citrus_gbk2k.h Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_gbk2k.h,v 1.2 2003/06/25 09:51:43 tshiozak Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2003 Citrus Project,
* All rights reserved.
*
Modified: head/lib/libiconv_modules/HZ/citrus_hz.c
==============================================================================
--- head/lib/libiconv_modules/HZ/citrus_hz.c Sat Nov 25 23:41:05 2017 (r326218)
+++ head/lib/libiconv_modules/HZ/citrus_hz.c Sun Nov 26 02:00:33 2017 (r326219)
@@ -2,6 +2,8 @@
/* $NetBSD: citrus_hz.c,v 1.2 2008/06/14 16:01:07 tnozaki Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c)2004, 2006 Citrus Project,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Sun Nov 26 03:53:22 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01542DFBDF9;
Sun, 26 Nov 2017 03:53:22 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C8C0F7C2B4;
Sun, 26 Nov 2017 03:53:21 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQ3rKn5006995;
Sun, 26 Nov 2017 03:53:20 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQ3rKDE006990;
Sun, 26 Nov 2017 03:53:20 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201711260353.vAQ3rKDE006990@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 26 Nov 2017 03:53:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326220 - in head: . sys/powerpc/aim sys/powerpc/booke
sys/powerpc/powerpc
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: in head: . sys/powerpc/aim sys/powerpc/booke
sys/powerpc/powerpc
X-SVN-Commit-Revision: 326220
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 03:53:22 -0000
Author: nwhitehorn
Date: Sun Nov 26 03:53:20 2017
New Revision: 326220
URL: https://svnweb.freebsd.org/changeset/base/326220
Log:
Use the cookie now set by loader to determine whether the value passed to
PowerPC kernels in r6 is actually metadata from loader(8) or gibberish
left in r6, which is not required to be anything under the
PAPR/ePAPR/CHRP/OF standards, by another boot loader.
Note that, as a result, systems need a new boot loader to boot PPC kernels
after this revision without ending up at a mountroot prompt. New boot
loaders are backwards compatible and can boot older kernels.
Reviewed by: jhibbits
MFC after: 2 months
Modified:
head/UPDATING
head/sys/powerpc/aim/locore32.S
head/sys/powerpc/aim/locore64.S
head/sys/powerpc/booke/booke_machdep.c
head/sys/powerpc/powerpc/machdep.c
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sun Nov 26 02:00:33 2017 (r326219)
+++ head/UPDATING Sun Nov 26 03:53:20 2017 (r326220)
@@ -51,6 +51,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ******************************
+20171125:
+ PowerPC users must update loader(8) by rebuilding world before
+ installing a new kernel, as the protocol connecting them has
+ changed. Without the update, loader metadata will not be passed
+ successfully to the kernel and users will have to enter their
+ root partition at the kernel mountroot prompt to continue booting.
+ Newer versions of loader can boot old kernels without issue.
+
201711xx:
The LOADER_FIREWIRE_SUPPORT build variable as been renamed to
WITH/OUT_LOADER_FIREWIRE. LOADER_{NO_,}GELI_SUPPORT has been renamed
Modified: head/sys/powerpc/aim/locore32.S
==============================================================================
--- head/sys/powerpc/aim/locore32.S Sun Nov 26 02:00:33 2017 (r326219)
+++ head/sys/powerpc/aim/locore32.S Sun Nov 26 03:53:20 2017 (r326220)
@@ -79,13 +79,14 @@ __start:
/* Set up temporary stack pointer */
lwz %r1,8(%r30)
add %r1,%r1,%r30
- addi %r1,%r1,(8+TMPSTKSZ-32)
+ addi %r1,%r1,(8+TMPSTKSZ-40)
/* Relocate self */
stw %r3,16(%r1)
stw %r4,20(%r1)
stw %r5,24(%r1)
stw %r6,28(%r1)
+ stw %r7,32(%r1)
lwz %r3,0(%r30) /* _DYNAMIC in %r3 */
add %r3,%r3,%r30
@@ -99,6 +100,7 @@ __start:
lwz %r4,20(%r1)
lwz %r5,24(%r1)
lwz %r6,28(%r1)
+ lwz %r7,32(%r1)
/* MD setup */
bl powerpc_init
Modified: head/sys/powerpc/aim/locore64.S
==============================================================================
--- head/sys/powerpc/aim/locore64.S Sun Nov 26 02:00:33 2017 (r326219)
+++ head/sys/powerpc/aim/locore64.S Sun Nov 26 03:53:20 2017 (r326220)
@@ -73,6 +73,7 @@ btext:
* r4: ignored
* r5: OF client interface pointer (or zero)
* r6: Loader metadata pointer (or zero)
+ * r7: Magic cookie (0xfb5d104d) to indicate that r6 has loader metadata
*/
.text
ASENTRY_NOPROF(__start)
@@ -108,6 +109,8 @@ ASENTRY_NOPROF(__start)
std %r4,56(%r1)
std %r5,64(%r1)
std %r6,72(%r1)
+ std %r7,80(%r1)
+
bl 1f
.llong _DYNAMIC-.
1: mflr %r3
@@ -120,6 +123,7 @@ ASENTRY_NOPROF(__start)
ld %r4,56(%r1)
ld %r5,64(%r1)
ld %r6,72(%r1)
+ ld %r7,80(%r1)
/* Begin CPU init */
mr %r4,%r2 /* Replace ignored r4 with tocbase for trap handlers */
Modified: head/sys/powerpc/booke/booke_machdep.c
==============================================================================
--- head/sys/powerpc/booke/booke_machdep.c Sun Nov 26 02:00:33 2017 (r326219)
+++ head/sys/powerpc/booke/booke_machdep.c Sun Nov 26 03:53:20 2017 (r326220)
@@ -200,7 +200,8 @@ extern void *int_performance_counter;
("Handler " #handler " too far from interrupt vector base")); \
mtspr(ivor, (uintptr_t)(&handler) & 0xffffUL);
-uintptr_t powerpc_init(vm_offset_t fdt, vm_offset_t, vm_offset_t, void *mdp);
+uintptr_t powerpc_init(vm_offset_t fdt, vm_offset_t, vm_offset_t, void *mdp,
+ vm_offset_t mdp_cookie);
void booke_cpu_init(void);
void
@@ -346,7 +347,11 @@ booke_init(u_long arg1, u_long arg2)
break;
}
- ret = powerpc_init(dtbp, 0, 0, mdp);
+ /*
+ * Last element is a magic cookie that indicates that the metadata
+ * pointer is meaningful.
+ */
+ ret = powerpc_init(dtbp, 0, 0, mdp, (mdp == NULL) ? 0 : 0xfb5d104d);
/* Enable caches */
booke_enable_l1_cache();
Modified: head/sys/powerpc/powerpc/machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/machdep.c Sun Nov 26 02:00:33 2017 (r326219)
+++ head/sys/powerpc/powerpc/machdep.c Sun Nov 26 03:53:20 2017 (r326220)
@@ -154,7 +154,8 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup,
SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size,
CTLFLAG_RD, &cacheline_size, 0, "");
-uintptr_t powerpc_init(vm_offset_t, vm_offset_t, vm_offset_t, void *);
+uintptr_t powerpc_init(vm_offset_t, vm_offset_t, vm_offset_t, void *,
+ vm_offset_t);
long Maxmem = 0;
long realmem = 0;
@@ -232,7 +233,8 @@ void aim_cpu_init(vm_offset_t toc);
void booke_cpu_init(void);
uintptr_t
-powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offset_t ofentry, void *mdp)
+powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offset_t ofentry, void *mdp,
+ vm_offset_t mdp_cookie)
{
struct pcpu *pc;
struct cpuref bsp;
@@ -251,8 +253,11 @@ powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offs
startkernel = __startkernel;
endkernel = __endkernel;
- /* Check for ePAPR loader, which puts a magic value into r6 */
- if (mdp == (void *)0x65504150)
+ /*
+ * If the metadata pointer cookie is not set to the magic value,
+ * the number in mdp should be treated as nonsense.
+ */
+ if (mdp_cookie != 0xfb5d104d)
mdp = NULL;
#ifdef AIM
@@ -352,7 +357,8 @@ powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offs
platform_probe_and_attach();
/*
- * Set up real per-cpu data.
+ * Set up per-cpu data for the BSP now that the platform can tell
+ * us which that is.
*/
if (platform_smp_get_bsp(&bsp) != 0)
bsp.cr_cpuid = 0;
From owner-svn-src-all@freebsd.org Sun Nov 26 04:34:14 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D122DFCFF2;
Sun, 26 Nov 2017 04:34:14 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 293057D6EE;
Sun, 26 Nov 2017 04:34:14 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQ4YD3U023978;
Sun, 26 Nov 2017 04:34:13 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQ4YDvp023977;
Sun, 26 Nov 2017 04:34:13 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201711260434.vAQ4YDvp023977@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 26 Nov 2017 04:34:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326222 - head/sys/powerpc/pseries
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: head/sys/powerpc/pseries
X-SVN-Commit-Revision: 326222
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 04:34:14 -0000
Author: nwhitehorn
Date: Sun Nov 26 04:34:13 2017
New Revision: 326222
URL: https://svnweb.freebsd.org/changeset/base/326222
Log:
Remove another extern int n_slbs made redundant by declaring this in
mmu_oea64.h.
MFC after: 3 weeks
Modified:
head/sys/powerpc/pseries/mmu_phyp.c
Modified: head/sys/powerpc/pseries/mmu_phyp.c
==============================================================================
--- head/sys/powerpc/pseries/mmu_phyp.c Sun Nov 26 04:19:53 2017 (r326221)
+++ head/sys/powerpc/pseries/mmu_phyp.c Sun Nov 26 04:34:13 2017 (r326222)
@@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$");
#include "phyp-hvcall.h"
-extern int n_slbs;
-
static struct rmlock mphyp_eviction_lock;
/*
From owner-svn-src-all@freebsd.org Sun Nov 26 04:55:24 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4919DFD50F;
Sun, 26 Nov 2017 04:55:24 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 801017DF40;
Sun, 26 Nov 2017 04:55:24 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQ4tNLA032531;
Sun, 26 Nov 2017 04:55:23 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQ4tN2x032530;
Sun, 26 Nov 2017 04:55:23 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711260455.vAQ4tN2x032530@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 26 Nov 2017 04:55:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326223 - head
X-SVN-Group: head
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: head
X-SVN-Commit-Revision: 326223
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 04:55:24 -0000
Author: delphij
Date: Sun Nov 26 04:55:23 2017
New Revision: 326223
URL: https://svnweb.freebsd.org/changeset/base/326223
Log:
Fill in date.
Modified:
head/UPDATING
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sun Nov 26 04:34:13 2017 (r326222)
+++ head/UPDATING Sun Nov 26 04:55:23 2017 (r326223)
@@ -59,7 +59,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
root partition at the kernel mountroot prompt to continue booting.
Newer versions of loader can boot old kernels without issue.
-201711xx:
+20171110:
The LOADER_FIREWIRE_SUPPORT build variable as been renamed to
WITH/OUT_LOADER_FIREWIRE. LOADER_{NO_,}GELI_SUPPORT has been renamed
to WITH/OUT_LOADER_GELI.
From owner-svn-src-all@freebsd.org Sun Nov 26 06:31:35 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF7E5DFE778;
Sun, 26 Nov 2017 06:31:35 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id ACA437FC07;
Sun, 26 Nov 2017 06:31:35 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQ6VYmx074719;
Sun, 26 Nov 2017 06:31:34 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQ6VYCt074718;
Sun, 26 Nov 2017 06:31:34 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201711260631.vAQ6VYCt074718@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sun, 26 Nov 2017 06:31:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326224 - head
X-SVN-Group: head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head
X-SVN-Commit-Revision: 326224
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 06:31:36 -0000
Author: cy
Date: Sun Nov 26 06:31:34 2017
New Revision: 326224
URL: https://svnweb.freebsd.org/changeset/base/326224
Log:
Fix spelling error (probably typo).
Modified:
head/ObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Sun Nov 26 04:55:23 2017 (r326223)
+++ head/ObsoleteFiles.inc Sun Nov 26 06:31:34 2017 (r326224)
@@ -38,7 +38,7 @@
# xargs -n1 | sort | uniq -d;
# done
-# 20171118: Remove old etc capser failes
+# 20171118: Remove old etc capser files
OLD_FILES+=etc/casper/system.dns
OLD_FILES+=etc/casper/system.grp
OLD_FILES+=etc/casper/system.pwd
From owner-svn-src-all@freebsd.org Sun Nov 26 06:49:38 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93370DFEC7E;
Sun, 26 Nov 2017 06:49:38 +0000 (UTC) (envelope-from pho@holm.cc)
Received: from relay01.pair.com (relay01.pair.com [209.68.5.15])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 173E3802DF;
Sun, 26 Nov 2017 06:49:38 +0000 (UTC) (envelope-from pho@holm.cc)
Received: from x2.osted.lan (87-58-223-204-dynamic.dk.customer.tdc.net
[87.58.223.204])
by relay01.pair.com (Postfix) with ESMTP id C9FA3D00370;
Sun, 26 Nov 2017 01:49:30 -0500 (EST)
Received: from x2.osted.lan (localhost [127.0.0.1])
by x2.osted.lan (8.14.9/8.14.9) with ESMTP id vAQ6nSHk069074
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Sun, 26 Nov 2017 07:49:28 +0100 (CET)
(envelope-from pho@x2.osted.lan)
Received: (from pho@localhost)
by x2.osted.lan (8.14.9/8.14.9/Submit) id vAQ6nRTG069073;
Sun, 26 Nov 2017 07:49:27 +0100 (CET) (envelope-from pho)
Date: Sun, 26 Nov 2017 07:49:27 +0100
From: Peter Holm <peter@holm.cc>
To: Mateusz Guzik <mjg@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326200 - head/sys/kern
Message-ID: <20171126064927.GA68986@x2.osted.lan>
References: <201711252049.vAPKnRaA026691@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201711252049.vAPKnRaA026691@repo.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 06:49:38 -0000
On Sat, Nov 25, 2017 at 08:49:27PM +0000, Mateusz Guzik wrote:
> Author: mjg
> Date: Sat Nov 25 20:49:27 2017
> New Revision: 326200
> URL: https://svnweb.freebsd.org/changeset/base/326200
>
> Log:
> Add the missing lockstat check for thread lock.
>
> Modified:
> head/sys/kern/kern_mutex.c
>
> Modified: head/sys/kern/kern_mutex.c
> ==============================================================================
> --- head/sys/kern/kern_mutex.c Sat Nov 25 20:37:13 2017 (r326199)
Hi Mateusz,
Could this be yours?
spin lock 0xffffffff81ddc100 (turnstile chain) held by 0xfffff80014e57000 (tid 100277) too long
panic: spin lock held too long
cpuid = 20
time = 1511677687
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe104f86ea40
vpanic() at vpanic+0x268/frame 0xfffffe104f86eb10
kproc_shutdown() at kproc_shutdown/frame 0xfffffe104f86eb70
_mtx_lock_spin_failed() at _mtx_lock_spin_failed+0x87/frame 0xfffffe104f86eba0
_mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x4ba/frame 0xfffffe104f86ed10
__mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x21f/frame 0xfffffe104f86edb0
turnstile_trywait() at turnstile_trywait+0x32/frame 0xfffffe104f86edd0
__rw_rlock_hard() at __rw_rlock_hard+0x118/frame 0xfffffe104f86ee60
__rw_rlock_int() at __rw_rlock_int+0xd5/frame 0xfffffe104f86ee90
getblk() at getblk+0xdb/frame 0xfffffe104f86ef40
breadn_flags() at breadn_flags+0x6e/frame 0xfffffe104f86eff0
ffs_getcg() at ffs_getcg+0x20d/frame 0xfffffe104f86f0d0
ffs_nodealloccg() at ffs_nodealloccg+0xd0/frame 0xfffffe104f86f210
ffs_hashalloc() at ffs_hashalloc+0xb7/frame 0xfffffe104f86f290
ffs_valloc() at ffs_valloc+0x1c1/frame 0xfffffe104f86f390
ufs_makeinode() at ufs_makeinode+0xba/frame 0xfffffe104f86f520
ufs_create() at ufs_create+0x34/frame 0xfffffe104f86f540
VOP_CREATE_APV() at VOP_CREATE_APV+0x241/frame 0xfffffe104f86f5c0
VOP_CREATE() at VOP_CREATE+0x59/frame 0xfffffe104f86f620
vn_open_cred() at vn_open_cred+0x311/frame 0xfffffe104f86f770
vn_open() at vn_open+0x4c/frame 0xfffffe104f86f7b0
kern_openat() at kern_openat+0x212/frame 0xfffffe104f86f920
syscallenter() at syscallenter+0x4e4/frame 0xfffffe104f86f9f0
amd64_syscall() at amd64_syscall+0x4d/frame 0xfffffe104f86fab0
https://people.freebsd.org/~pho/stress/log/mateusz004.txt
- Peter
From owner-svn-src-all@freebsd.org Sun Nov 26 09:29:35 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E67E1DB9E20;
Sun, 26 Nov 2017 09:29:35 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B0C1064FB4;
Sun, 26 Nov 2017 09:29:35 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQ9TYLf047844;
Sun, 26 Nov 2017 09:29:34 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQ9TYpk047843;
Sun, 26 Nov 2017 09:29:34 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201711260929.vAQ9TYpk047843@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 26 Nov 2017 09:29:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326225 - head/sys/arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: head/sys/arm64/arm64
X-SVN-Commit-Revision: 326225
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 09:29:36 -0000
Author: andrew
Date: Sun Nov 26 09:29:34 2017
New Revision: 326225
URL: https://svnweb.freebsd.org/changeset/base/326225
Log:
Make the arm64 pmap_invalidate functions static inline. This fixes building
with DIAGNOSTIC.
PR: 223874
Reported by: emaste
MFC after: 1 week
Modified:
head/sys/arm64/arm64/pmap.c
Modified: head/sys/arm64/arm64/pmap.c
==============================================================================
--- head/sys/arm64/arm64/pmap.c Sun Nov 26 06:31:34 2017 (r326224)
+++ head/sys/arm64/arm64/pmap.c Sun Nov 26 09:29:34 2017 (r326225)
@@ -896,7 +896,7 @@ SYSCTL_ULONG(_vm_pmap_l2, OID_AUTO, promotions, CTLFLA
/*
* Invalidate a single TLB entry.
*/
-PMAP_INLINE void
+static __inline void
pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
{
@@ -910,7 +910,7 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
sched_unpin();
}
-PMAP_INLINE void
+static __inline void
pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
{
vm_offset_t addr;
@@ -927,7 +927,7 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm
sched_unpin();
}
-PMAP_INLINE void
+static __inline void
pmap_invalidate_all(pmap_t pmap)
{
From owner-svn-src-all@freebsd.org Sun Nov 26 09:46:54 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4E2CDBA9D5;
Sun, 26 Nov 2017 09:46:54 +0000 (UTC)
(envelope-from andrew@fubar.geek.nz)
Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16])
by mx1.freebsd.org (Postfix) with ESMTP id 4081B65992;
Sun, 26 Nov 2017 09:46:53 +0000 (UTC)
(envelope-from andrew@fubar.geek.nz)
Received: from [IPv6:2a02:c7f:1e13:cf00:84de:169d:1c70:7c3d] (unknown
[IPv6:2a02:c7f:1e13:cf00:84de:169d:1c70:7c3d])
by fry.fubar.geek.nz (Postfix) with ESMTPSA id 199A24E6DC;
Sun, 26 Nov 2017 09:46:47 +0000 (UTC)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: svn commit: r326218 - head/sys/kern
From: Andrew Turner <andrew@fubar.geek.nz>
In-Reply-To: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
Date: Sun, 26 Nov 2017 09:46:46 +0000
Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <59383A7D-FC99-4748-9561-53D968C4B150@fubar.geek.nz>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
X-Mailer: Apple Mail (2.3273)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 09:46:54 -0000
On 25 Nov 2017, at 23:41, Nathan Whitehorn <nwhitehorn@freebsd.org> =
wrote:
>=20
> Author: nwhitehorn
> Date: Sat Nov 25 23:41:05 2017
> New Revision: 326218
> URL: https://svnweb.freebsd.org/changeset/base/326218
>=20
> Log:
> Remove some, but not all, assumptions that the BSP is CPU 0 and that =
CPUs
> are numbered densely from there to n_cpus.
>=20
> MFC after: 1 month
>=20
> Modified:
> head/sys/kern/kern_clock.c
> head/sys/kern/kern_clocksource.c
> head/sys/kern/kern_shutdown.c
> head/sys/kern/kern_timeout.c
> head/sys/kern/sched_ule.c
> head/sys/kern/subr_pcpu.c
>=20
...
> Modified: head/sys/kern/subr_pcpu.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 =
(r326217)
> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 =
(r326218)
> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
> struct pcpu *
> pcpu_find(u_int cpuid)
> {
> + KASSERT(cpuid_to_pcpu[cpuid] !=3D NULL,
> + ("Getting uninitialized PCPU %d", cpuid));
>=20
> return (cpuid_to_pcpu[cpuid]);
> }
This breaks on one arm64 simulator I have where the device tree lists 8 =
cpus, but only 2 are enabled in the simulation. The ofw_cpu device nodes =
for these are cpu0 and cpu4 so the call to cpu_find in ofw_cpu_attach =
will hit this KASSERT when the CPU has not been enabled.
Andrew
cpu0: <Open Firmware CPU> on cpulist0
cpu1: <Open Firmware CPU> on cpulist0
panic: Getting uninitialized PCPU 1
cpuid =3D 0
time =3D 1
KDB: stack backtrace:
db_trace_self() at db_trace_self_wrapper+0x28
pc =3D 0xffff0000005f03e8 lr =3D 0xffff000000087048
sp =3D 0xffff0000000105a0 fp =3D 0xffff0000000107b0
db_trace_self_wrapper() at vpanic+0x184
pc =3D 0xffff000000087048 lr =3D 0xffff000000316448
sp =3D 0xffff0000000107c0 fp =3D 0xffff000000010840
vpanic() at kassert_panic+0x158
pc =3D 0xffff000000316448 lr =3D 0xffff0000003162c0
sp =3D 0xffff000000010850 fp =3D 0xffff000000010910
kassert_panic() at pcpu_find+0x3c
pc =3D 0xffff0000003162c0 lr =3D 0xffff000000359450
sp =3D 0xffff000000010920 fp =3D 0xffff000000010930
pcpu_find() at ofw_cpu_attach+0x114
pc =3D 0xffff000000359450 lr =3D 0xffff0000001692d4
sp =3D 0xffff000000010940 fp =3D 0xffff000000010970
ofw_cpu_attach() at device_attach+0x40c
pc =3D 0xffff0000001692d4 lr =3D 0xffff00000034822c
sp =3D 0xffff000000010980 fp =3D 0xffff0000000109d0
device_attach() at bus_generic_attach+0x5c
pc =3D 0xffff00000034822c lr =3D 0xffff00000034952c
sp =3D 0xffff0000000109e0 fp =3D 0xffff000000010a00
bus_generic_attach() at device_attach+0x40c
pc =3D 0xffff00000034952c lr =3D 0xffff00000034822c
sp =3D 0xffff000000010a10 fp =3D 0xffff000000010a60
device_attach() at bus_generic_new_pass+0x12c
pc =3D 0xffff00000034822c lr =3D 0xffff000000349c0c
sp =3D 0xffff000000010a70 fp =3D 0xffff000000010aa0
bus_generic_new_pass() at bus_generic_new_pass+0xe4
pc =3D 0xffff000000349c0c lr =3D 0xffff000000349bc4
sp =3D 0xffff000000010ab0 fp =3D 0xffff000000010ae0
bus_generic_new_pass() at bus_generic_new_pass+0xe4
pc =3D 0xffff000000349bc4 lr =3D 0xffff000000349bc4
sp =3D 0xffff000000010af0 fp =3D 0xffff000000010b20
bus_generic_new_pass() at bus_set_pass+0x8c
pc =3D 0xffff000000349bc4 lr =3D 0xffff000000345aec
sp =3D 0xffff000000010b30 fp =3D 0xffff000000010b60
bus_set_pass() at mi_startup+0xc8
pc =3D 0xffff000000345aec lr =3D 0xffff0000002b43e8
sp =3D 0xffff000000010b70 fp =3D 0xffff000000010bb0
mi_startup() at virtdone+0x54
pc =3D 0xffff0000002b43e8 lr =3D 0xffff000000001084
sp =3D 0xffff000000010bc0 fp =3D 0x0000000000000000
KDB: enter: panic
From owner-svn-src-all@freebsd.org Sun Nov 26 10:02:44 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 959E6DBB32F;
Sun, 26 Nov 2017 10:02:44 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6C98866244;
Sun, 26 Nov 2017 10:02:44 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQA2hxw064363;
Sun, 26 Nov 2017 10:02:43 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQA2hTU064362;
Sun, 26 Nov 2017 10:02:43 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201711261002.vAQA2hTU064362@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 26 Nov 2017 10:02:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326226 - head/sbin/sysctl
X-SVN-Group: head
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: head/sbin/sysctl
X-SVN-Commit-Revision: 326226
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 10:02:44 -0000
Author: kib
Date: Sun Nov 26 10:02:43 2017
New Revision: 326226
URL: https://svnweb.freebsd.org/changeset/base/326226
Log:
Improve sysctl(8) pretty printing of some structures.
S_vmtotal:
Use unsigned format to print unsigned memory counters from struct
vmtotal.
Remove unneeded cast, style locals declarations.
S_efi_map:
Make printing of the memory regions descriptions less MD by
using uintmax_t formats.
Noted by and discussed with: bde
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Modified:
head/sbin/sysctl/sysctl.c
Modified: head/sbin/sysctl/sysctl.c
==============================================================================
--- head/sbin/sysctl/sysctl.c Sun Nov 26 09:29:34 2017 (r326225)
+++ head/sbin/sysctl/sysctl.c Sun Nov 26 10:02:43 2017 (r326226)
@@ -608,33 +608,33 @@ S_timeval(size_t l2, void *p)
static int
S_vmtotal(size_t l2, void *p)
{
- struct vmtotal *v = (struct vmtotal *)p;
- int pageKilo = getpagesize() / 1024;
+ struct vmtotal *v;
+ int pageKilo;
if (l2 != sizeof(*v)) {
warnx("S_vmtotal %zu != %zu", l2, sizeof(*v));
return (1);
}
- printf(
- "\nSystem wide totals computed every five seconds:"
+ v = p;
+ pageKilo = getpagesize() / 1024;
+
+#define pg2k(a) ((uintmax_t)(a) * pageKilo)
+ printf("\nSystem wide totals computed every five seconds:"
" (values in kilobytes)\n");
printf("===============================================\n");
- printf(
- "Processes:\t\t(RUNQ: %hd Disk Wait: %hd Page Wait: "
- "%hd Sleep: %hd)\n",
+ printf("Processes:\t\t(RUNQ: %d Disk Wait: %d Page Wait: "
+ "%d Sleep: %d)\n",
v->t_rq, v->t_dw, v->t_pw, v->t_sl);
- printf(
- "Virtual Memory:\t\t(Total: %jdK Active: %jdK)\n",
- (intmax_t)v->t_vm * pageKilo, (intmax_t)v->t_avm * pageKilo);
- printf("Real Memory:\t\t(Total: %jdK Active: %jdK)\n",
- (intmax_t)v->t_rm * pageKilo, (intmax_t)v->t_arm * pageKilo);
- printf("Shared Virtual Memory:\t(Total: %jdK Active: %jdK)\n",
- (intmax_t)v->t_vmshr * pageKilo, (intmax_t)v->t_avmshr * pageKilo);
- printf("Shared Real Memory:\t(Total: %jdK Active: %jdK)\n",
- (intmax_t)v->t_rmshr * pageKilo, (intmax_t)v->t_armshr * pageKilo);
- printf("Free Memory:\t%jdK", (intmax_t)v->t_free * pageKilo);
-
+ printf("Virtual Memory:\t\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_vm), pg2k(v->t_avm));
+ printf("Real Memory:\t\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_rm), pg2k(v->t_arm));
+ printf("Shared Virtual Memory:\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_vmshr), pg2k(v->t_avmshr));
+ printf("Shared Real Memory:\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_rmshr), pg2k(v->t_armshr));
+ printf("Free Memory:\t%juK", pg2k(v->t_free));
return (0);
}
@@ -695,8 +695,9 @@ S_efi_map(size_t l2, void *p)
type = types[map->md_type];
else
type = "<INVALID>";
- printf("\n%23s %012lx %12p %08lx ", type, map->md_phys,
- map->md_virt, map->md_pages);
+ printf("\n%23s %012jx %12p %08jx ", type,
+ (uintmax_t)map->md_phys, map->md_virt,
+ (uintmax_t)map->md_pages);
if (map->md_attr & EFI_MD_ATTR_UC)
printf("UC ");
if (map->md_attr & EFI_MD_ATTR_WC)
From owner-svn-src-all@freebsd.org Sun Nov 26 10:43:19 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B9D3DC0323
for <svn-src-all@mailman.ysv.freebsd.org>;
Sun, 26 Nov 2017 10:43:19 +0000 (UTC)
(envelope-from oliver.pinter@hardenedbsd.org)
Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com
[IPv6:2a00:1450:400c:c09::22a])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id E2C13672C9
for <svn-src-all@freebsd.org>; Sun, 26 Nov 2017 10:43:18 +0000 (UTC)
(envelope-from oliver.pinter@hardenedbsd.org)
Received: by mail-wm0-x22a.google.com with SMTP id r68so29152687wmr.3
for <svn-src-all@freebsd.org>; Sun, 26 Nov 2017 02:43:18 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:cc; bh=TGpflkdaqYEztpwm0aeRI28T61O5iJ3WYCW7i1C54XM=;
b=nj9xB+C6amjer/FE4ml3Aoy2dTD8lI1JEYkHd36U33QIt7k/jjWix5oRTDm9xjn7DD
I08X6VuuPVp5ywXMPxxzFNP3yDykXBZlM9zhsagKGF8beh6fUH7zUXim3AUqzsoDhOfU
1efblSi6IWXWuAMiW/dmvz6r3MCqaZ8fRAUm+0iCz3bPQuwyDBhJUdadfjxe0jPnSWEU
AlD/2pnuhCeP689V5mtyYpQPB8bWAL2f+8SmMQ2oA6gZ65QcbzB6ZE0H+IRYDNrjIRA0
2MUyx3jrpfbKQ93GQ3hdO42rEHsSSHrLOnmcvSigmnBFR1VWvNWCgU5UkEFAeMjWqNR6
Y7ig==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:in-reply-to:references:from:date
:message-id:subject:to:cc;
bh=TGpflkdaqYEztpwm0aeRI28T61O5iJ3WYCW7i1C54XM=;
b=uYOMENtyBIA2pmmD+vBMPVqYUZ4ArP5d6xlfg9tV7eKlmoUNsUJXWx+HEnvM5HTJY4
EMrDwPi9yn807BniNpJ4lfWe1/LwbzjPhvqYl2qP16T75guORso3QoEHFhMa//ehRGBj
ztjV4rjD8hOKsXPdpOuv2rxlahKq9XDEg3lNE8cMTK2gyjrFHY+OCumfuf6oLOW3Gnvy
DTjLcKdFXG4WPhTA/3WB81YUb/MDzfLaGbzBoUu0CTcvMtTQHtcR2HhlPNcV7j4tJNxx
ZAE3kY5/6H3obFDPZy6E9Veh8X7sPiExS9PtKYAQSbgxmyDdAlpQYPqsqum5Zw5aGDfM
Fg9w==
X-Gm-Message-State: AJaThX5IF5BHRaMlnAvzagaOhqVNucqb3G7ctiS8XBLWrsjAWys+uOxH
6R40fw2i9y3n5FUmItgr5uCzxugKwV6f9UeTInK4xQ==
X-Google-Smtp-Source: AGs4zMaxJr/pXYd3XQSK/Z3iR2x+o7PvkPmkqbKQIM6EU+mXOKzwqNPlgdbG5wmjZnderb00P0YnhD039Tgxejigwas=
X-Received: by 10.80.180.187 with SMTP id w56mr47003559edd.15.1511692996971;
Sun, 26 Nov 2017 02:43:16 -0800 (PST)
MIME-Version: 1.0
Received: by 10.80.149.174 with HTTP; Sun, 26 Nov 2017 02:43:16 -0800 (PST)
In-Reply-To: <201711260631.vAQ6VYCt074718@repo.freebsd.org>
References: <201711260631.vAQ6VYCt074718@repo.freebsd.org>
From: Oliver Pinter <oliver.pinter@hardenedbsd.org>
Date: Sun, 26 Nov 2017 11:43:16 +0100
Message-ID: <CAPQ4ffs+kaenLzT=vd4HhokgMVoLa1pi3XNwh0xT5zOJSg1bUA@mail.gmail.com>
Subject: Re: svn commit: r326224 - head
To: Cy Schubert <cy@freebsd.org>
Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.25
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 10:43:19 -0000
On Sunday, November 26, 2017, Cy Schubert <cy@freebsd.org> wrote:
> Author: cy
> Date: Sun Nov 26 06:31:34 2017
> New Revision: 326224
> URL: https://svnweb.freebsd.org/changeset/base/326224
>
> Log:
> Fix spelling error (probably typo).
>
> Modified:
> head/ObsoleteFiles.inc
>
> Modified: head/ObsoleteFiles.inc
> ============================================================
> ==================
> --- head/ObsoleteFiles.inc Sun Nov 26 04:55:23 2017 (r326223)
> +++ head/ObsoleteFiles.inc Sun Nov 26 06:31:34 2017 (r326224)
> @@ -38,7 +38,7 @@
> # xargs -n1 | sort | uniq -d;
> # done
>
> -# 20171118: Remove old etc capser failes
> +# 20171118: Remove old etc capser files
There is an other one: capser -> casper.
> OLD_FILES+=etc/casper/system.dns
> OLD_FILES+=etc/casper/system.grp
> OLD_FILES+=etc/casper/system.pwd
> _______________________________________________
> svn-src-head@freebsd.org <javascript:;> mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org
> <javascript:;>"
>
From owner-svn-src-all@freebsd.org Sun Nov 26 14:28:28 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF5BDDE75A5;
Sun, 26 Nov 2017 14:28:28 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8BD5C6C313;
Sun, 26 Nov 2017 14:28:28 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQESRgE073127;
Sun, 26 Nov 2017 14:28:27 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQESRxo073124;
Sun, 26 Nov 2017 14:28:27 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201711261428.vAQESRxo073124@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 26 Nov 2017 14:28:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326227 - in head/sys/arm64: arm64 include
X-SVN-Group: head
X-SVN-Commit-Author: ed
X-SVN-Commit-Paths: in head/sys/arm64: arm64 include
X-SVN-Commit-Revision: 326227
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 14:28:28 -0000
Author: ed
Date: Sun Nov 26 14:28:27 2017
New Revision: 326227
URL: https://svnweb.freebsd.org/changeset/base/326227
Log:
Make 32-bit system calls end up in svc_handler().
The nice thing about ARM64 is that it's pretty elegant to install
separate trap/exception handlers for 32-bit and 64-bit processes. That
said, for all other architectures (e.g., i386 on amd64) we always let
32-bit counterparts go through the regular system call codepath. Let's
do the same on ARM64.
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D13146
Modified:
head/sys/arm64/arm64/exception.S
head/sys/arm64/arm64/trap.c
head/sys/arm64/include/armreg.h
Modified: head/sys/arm64/arm64/exception.S
==============================================================================
--- head/sys/arm64/arm64/exception.S Sun Nov 26 10:02:43 2017 (r326226)
+++ head/sys/arm64/arm64/exception.S Sun Nov 26 14:28:27 2017 (r326227)
@@ -219,8 +219,8 @@ exception_vectors:
vempty /* FIQ 64-bit EL0 */
vector el0_error /* Error 64-bit EL0 */
- vempty /* Synchronous 32-bit EL0 */
- vempty /* IRQ 32-bit EL0 */
+ vector el0_sync /* Synchronous 32-bit EL0 */
+ vector el0_irq /* IRQ 32-bit EL0 */
vempty /* FIQ 32-bit EL0 */
- vempty /* Error 32-bit EL0 */
+ vector el0_error /* Error 32-bit EL0 */
Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c Sun Nov 26 10:02:43 2017 (r326226)
+++ head/sys/arm64/arm64/trap.c Sun Nov 26 14:28:27 2017 (r326227)
@@ -381,7 +381,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame
panic("VFP exception in userland");
#endif
break;
- case EXCP_SVC:
+ case EXCP_SVC32:
+ case EXCP_SVC64:
svc_handler(td, frame);
break;
case EXCP_INSN_ABORT_L:
Modified: head/sys/arm64/include/armreg.h
==============================================================================
--- head/sys/arm64/include/armreg.h Sun Nov 26 10:02:43 2017 (r326226)
+++ head/sys/arm64/include/armreg.h Sun Nov 26 14:28:27 2017 (r326227)
@@ -123,7 +123,8 @@
#define EXCP_UNKNOWN 0x00 /* Unkwn exception */
#define EXCP_FP_SIMD 0x07 /* VFP/SIMD trap */
#define EXCP_ILL_STATE 0x0e /* Illegal execution state */
-#define EXCP_SVC 0x15 /* SVC trap */
+#define EXCP_SVC32 0x11 /* SVC trap for AArch32 */
+#define EXCP_SVC64 0x15 /* SVC trap for AArch64 */
#define EXCP_MSR 0x18 /* MSR/MRS trap */
#define EXCP_INSN_ABORT_L 0x20 /* Instruction abort, from lower EL */
#define EXCP_INSN_ABORT 0x21 /* Instruction abort, from same EL */
From owner-svn-src-all@freebsd.org Sun Nov 26 14:45:58 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28EE2DE7CFD;
Sun, 26 Nov 2017 14:45:58 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 033F76CD05;
Sun, 26 Nov 2017 14:45:57 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQEjvH4081544;
Sun, 26 Nov 2017 14:45:57 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQEjuan081539;
Sun, 26 Nov 2017 14:45:56 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201711261445.vAQEjuan081539@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 26 Nov 2017 14:45:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326228 - in head/sys: amd64/cloudabi32 amd64/cloudabi64
arm/cloudabi32 arm64/cloudabi64 i386/cloudabi32
X-SVN-Group: head
X-SVN-Commit-Author: ed
X-SVN-Commit-Paths: in head/sys: amd64/cloudabi32 amd64/cloudabi64
arm/cloudabi32 arm64/cloudabi64 i386/cloudabi32
X-SVN-Commit-Revision: 326228
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 14:45:58 -0000
Author: ed
Date: Sun Nov 26 14:45:56 2017
New Revision: 326228
URL: https://svnweb.freebsd.org/changeset/base/326228
Log:
Use TO_PTR() to convert integers to pointers.
For FreeBSD/arm64's cloudabi32 support, I'm going to need a TO_PTR() in
this place. Also use it for all of the other source files, so that the
difference remains as minimal as possible.
MFC after: 2 weeks
Modified:
head/sys/amd64/cloudabi32/cloudabi32_sysvec.c
head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
head/sys/arm/cloudabi32/cloudabi32_sysvec.c
head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
head/sys/i386/cloudabi32/cloudabi32_sysvec.c
Modified: head/sys/amd64/cloudabi32/cloudabi32_sysvec.c
==============================================================================
--- head/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:28:27 2017 (r326227)
+++ head/sys/amd64/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:45:56 2017 (r326228)
@@ -86,7 +86,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag
{
ia32_setregs(td, imgp, stack);
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Nov 26 14:28:27 2017 (r326227)
+++ head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Sun Nov 26 14:45:56 2017 (r326228)
@@ -83,7 +83,7 @@ cloudabi64_proc_setregs(struct thread *td, struct imag
regs = td->td_frame;
regs->tf_rdi = stack + sizeof(register_t) +
roundup(sizeof(cloudabi64_tcb_t), sizeof(register_t));
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
@@ -188,7 +188,7 @@ cloudabi64_thread_setregs(struct thread *td,
frame->tf_rdi = td->td_tid;
frame->tf_rsi = attr->argument;
- return (cpu_set_user_tls(td, (void *)tcbptr));
+ return (cpu_set_user_tls(td, TO_PTR(tcbptr)));
}
static struct sysentvec cloudabi64_elf_sysvec = {
Modified: head/sys/arm/cloudabi32/cloudabi32_sysvec.c
==============================================================================
--- head/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:28:27 2017 (r326227)
+++ head/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:45:56 2017 (r326228)
@@ -63,7 +63,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag
regs = td->td_frame;
regs->tf_r0 =
stack + roundup(sizeof(cloudabi32_tcb_t), sizeof(register_t));
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
Modified: head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Nov 26 14:28:27 2017 (r326227)
+++ head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Nov 26 14:45:56 2017 (r326228)
@@ -63,7 +63,7 @@ cloudabi64_proc_setregs(struct thread *td, struct imag
regs = td->td_frame;
regs->tf_x[0] =
stack + roundup(sizeof(cloudabi64_tcb_t), sizeof(register_t));
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
Modified: head/sys/i386/cloudabi32/cloudabi32_sysvec.c
==============================================================================
--- head/sys/i386/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:28:27 2017 (r326227)
+++ head/sys/i386/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:45:56 2017 (r326228)
@@ -81,7 +81,7 @@ cloudabi32_proc_setregs(struct thread *td, struct imag
{
exec_setregs(td, imgp, stack);
- (void)cpu_set_user_tls(td, (void *)stack);
+ (void)cpu_set_user_tls(td, TO_PTR(stack));
}
static int
From owner-svn-src-all@freebsd.org Sun Nov 26 14:53:57 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C1DEDE8149;
Sun, 26 Nov 2017 14:53:57 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 68F2E6D18F;
Sun, 26 Nov 2017 14:53:57 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQEruwe085476;
Sun, 26 Nov 2017 14:53:56 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQErufx085474;
Sun, 26 Nov 2017 14:53:56 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201711261453.vAQErufx085474@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 26 Nov 2017 14:53:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326229 - in head/sys: arm/cloudabi32 arm64/cloudabi64
X-SVN-Group: head
X-SVN-Commit-Author: ed
X-SVN-Commit-Paths: in head/sys: arm/cloudabi32 arm64/cloudabi64
X-SVN-Commit-Revision: 326229
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 14:53:57 -0000
Author: ed
Date: Sun Nov 26 14:53:56 2017
New Revision: 326229
URL: https://svnweb.freebsd.org/changeset/base/326229
Log:
Correct some more places where TO_PTR() should be used.
These were missed in r326228.
MFC after: 2 weeks
Modified:
head/sys/arm/cloudabi32/cloudabi32_sysvec.c
head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
Modified: head/sys/arm/cloudabi32/cloudabi32_sysvec.c
==============================================================================
--- head/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:45:56 2017 (r326228)
+++ head/sys/arm/cloudabi32/cloudabi32_sysvec.c Sun Nov 26 14:53:56 2017 (r326229)
@@ -165,7 +165,7 @@ cloudabi32_thread_setregs(struct thread *td,
frame->tf_r1 = attr->argument;
/* Set up TLS. */
- return (cpu_set_user_tls(td, (void *)tcb));
+ return (cpu_set_user_tls(td, TO_PTR(tcb)));
}
static struct sysentvec cloudabi32_elf_sysvec = {
Modified: head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Nov 26 14:45:56 2017 (r326228)
+++ head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Sun Nov 26 14:53:56 2017 (r326229)
@@ -157,7 +157,7 @@ cloudabi64_thread_setregs(struct thread *td,
frame->tf_x[1] = attr->argument;
/* Set up TLS. */
- return (cpu_set_user_tls(td, (void *)tcb));
+ return (cpu_set_user_tls(td, TO_PTR(tcb)));
}
static struct sysentvec cloudabi64_elf_sysvec = {
From owner-svn-src-all@freebsd.org Sun Nov 26 14:56:25 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E460DE81FC;
Sun, 26 Nov 2017 14:56:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1B3B36D302;
Sun, 26 Nov 2017 14:56:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQEuOSn085625;
Sun, 26 Nov 2017 14:56:24 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQEuOoo085622;
Sun, 26 Nov 2017 14:56:24 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201711261456.vAQEuOoo085622@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 26 Nov 2017 14:56:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326230 - in head/sys/arm64: arm64 include
X-SVN-Group: head
X-SVN-Commit-Author: ed
X-SVN-Commit-Paths: in head/sys/arm64: arm64 include
X-SVN-Commit-Revision: 326230
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 14:56:25 -0000
Author: ed
Date: Sun Nov 26 14:56:23 2017
New Revision: 326230
URL: https://svnweb.freebsd.org/changeset/base/326230
Log:
Add a Saved Process Status Register bit for AArch32 execution mode.
The documentation on the Saved Process Status Register (SPSR) is a bit
weird; the M[4] bit is documented separately from M[3:0]. The M[4] bit
can be toggled to switch to 32-bit execution mode. This functionality is
orthogonal to M[3:0].
Change the definition of PSR_M_MASK to no longer include M[4]. Add a new
definition, PSR_AARCH32 that can be used to toggle 32-bit independently.
This bit will be used by the cloudabi32 code to force execution of
userspace code in 32-bit mode.
Reviewed by: andrew
Differential Revision: https://reviews.freebsd.org/D13148
Modified:
head/sys/arm64/arm64/machdep.c
head/sys/arm64/include/armreg.h
Modified: head/sys/arm64/arm64/machdep.c
==============================================================================
--- head/sys/arm64/arm64/machdep.c Sun Nov 26 14:53:56 2017 (r326229)
+++ head/sys/arm64/arm64/machdep.c Sun Nov 26 14:56:23 2017 (r326230)
@@ -405,7 +405,7 @@ set_mcontext(struct thread *td, mcontext_t *mcp)
spsr = mcp->mc_gpregs.gp_spsr;
if ((spsr & PSR_M_MASK) != PSR_M_EL0t ||
- (spsr & (PSR_F | PSR_I | PSR_A | PSR_D)) != 0)
+ (spsr & (PSR_AARCH32 | PSR_F | PSR_I | PSR_A | PSR_D)) != 0)
return (EINVAL);
memcpy(tf->tf_x, mcp->mc_gpregs.gp_x, sizeof(tf->tf_x));
Modified: head/sys/arm64/include/armreg.h
==============================================================================
--- head/sys/arm64/include/armreg.h Sun Nov 26 14:53:56 2017 (r326229)
+++ head/sys/arm64/include/armreg.h Sun Nov 26 14:56:23 2017 (r326230)
@@ -549,7 +549,6 @@
/* SPSR_EL1 */
/*
* When the exception is taken in AArch64:
- * M[4] is 0 for AArch64 mode
* M[3:2] is the exception level
* M[1] is unused
* M[0] is the SP select:
@@ -561,8 +560,9 @@
#define PSR_M_EL1h 0x00000005
#define PSR_M_EL2t 0x00000008
#define PSR_M_EL2h 0x00000009
-#define PSR_M_MASK 0x0000001f
+#define PSR_M_MASK 0x0000000f
+#define PSR_AARCH32 0x00000010
#define PSR_F 0x00000040
#define PSR_I 0x00000080
#define PSR_A 0x00000100
From owner-svn-src-all@freebsd.org Sun Nov 26 16:12:11 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98E61DEA914;
Sun, 26 Nov 2017 16:12:11 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 733716EE4F;
Sun, 26 Nov 2017 16:12:11 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQGCAbU018514;
Sun, 26 Nov 2017 16:12:10 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQGCASx018512;
Sun, 26 Nov 2017 16:12:10 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711261612.vAQGCASx018512@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 26 Nov 2017 16:12:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326231 - head/lib/libefivar
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/lib/libefivar
X-SVN-Commit-Revision: 326231
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 16:12:11 -0000
Author: imp
Date: Sun Nov 26 16:12:10 2017
New Revision: 326231
URL: https://svnweb.freebsd.org/changeset/base/326231
Log:
Add efidp_format_device_path_node to format a single node in a device
path, much like efidp_format_device_path will format the entire path.
Sponsored by: Netflix
Modified:
head/lib/libefivar/efivar-dp-format.c
head/lib/libefivar/efivar-dp.h
Modified: head/lib/libefivar/efivar-dp-format.c
==============================================================================
--- head/lib/libefivar/efivar-dp-format.c Sun Nov 26 14:56:23 2017 (r326230)
+++ head/lib/libefivar/efivar-dp-format.c Sun Nov 26 16:12:10 2017 (r326231)
@@ -2272,7 +2272,6 @@ static const DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePath
{0, 0, NULL}
};
-#ifndef __FreeBSD__
/**
Converts a device node to its string representation.
@@ -2288,7 +2287,7 @@ static const DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePath
is NULL or there was insufficient memory.
**/
-CHAR16 *
+static char *
EFIAPI
UefiDevicePathLibConvertDeviceNodeToText (
IN CONST EFI_DEVICE_PATH_PROTOCOL *DeviceNode,
@@ -2299,6 +2298,7 @@ UefiDevicePathLibConvertDeviceNodeToText (
POOL_PRINT Str;
UINTN Index;
DEVICE_PATH_TO_TEXT ToText;
+ EFI_DEVICE_PATH_PROTOCOL *Node;
if (DeviceNode == NULL) {
return NULL;
@@ -2310,6 +2310,7 @@ UefiDevicePathLibConvertDeviceNodeToText (
// Process the device path node
// If not found, use a generic function
//
+ Node = __DECONST(EFI_DEVICE_PATH_PROTOCOL *, DeviceNode);
ToText = DevPathToTextNodeGeneric;
for (Index = 0; mUefiDevicePathLibToTextTable[Index].Function != NULL; Index++) {
if (DevicePathType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].Type &&
@@ -2323,12 +2324,11 @@ UefiDevicePathLibConvertDeviceNodeToText (
//
// Print this node
//
- ToText (&Str, (VOID *) DeviceNode, DisplayOnly, AllowShortcuts);
+ ToText (&Str, (VOID *) Node, DisplayOnly, AllowShortcuts);
ASSERT (Str.Str != NULL);
return Str.Str;
}
-#endif
/**
Converts a device path to its text representation.
@@ -2431,8 +2431,26 @@ efidp_format_device_path(char *buf, size_t len, const_
return retval;
}
+ssize_t
+efidp_format_device_path_node(char *buf, size_t len, const_efidp dp, ssize_t max)
+{
+ char *str;
+ ssize_t retval;
+
+ str = UefiDevicePathLibConvertDeviceNodeToText (
+ __DECONST(EFI_DEVICE_PATH_PROTOCOL *, dp), FALSE, TRUE);
+ if (str == NULL)
+ return -1;
+ strlcpy(buf, str, len);
+ retval = strlen(str);
+ free(str);
+
+ return retval;
+}
+
size_t
efidp_size(const_efidp dp)
{
+
return GetDevicePathSize(__DECONST(EFI_DEVICE_PATH_PROTOCOL *, dp));
}
Modified: head/lib/libefivar/efivar-dp.h
==============================================================================
--- head/lib/libefivar/efivar-dp.h Sun Nov 26 14:56:23 2017 (r326230)
+++ head/lib/libefivar/efivar-dp.h Sun Nov 26 16:12:10 2017 (r326231)
@@ -60,6 +60,8 @@ typedef const efidp_data *const_efidp;
*/
ssize_t efidp_format_device_path(char *buf, size_t len, const_efidp dp,
ssize_t max);
+ssize_t efidp_format_device_path_node(char *buf, size_t len, const_efidp dp,
+ ssize_t max);
ssize_t efidp_parse_device_path(char *path, efidp out, size_t max);
size_t efidp_size(const_efidp);
From owner-svn-src-all@freebsd.org Sun Nov 26 16:41:31 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D432EDEB2D0;
Sun, 26 Nov 2017 16:41:31 +0000 (UTC)
(envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A10F56FD67;
Sun, 26 Nov 2017 16:41:31 +0000 (UTC)
(envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQGfU9b030210;
Sun, 26 Nov 2017 16:41:30 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQGfU6C030209;
Sun, 26 Nov 2017 16:41:30 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <201711261641.vAQGfU6C030209@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Sun, 26 Nov 2017 16:41:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326232 - head/lib/libzstd
X-SVN-Group: head
X-SVN-Commit-Author: mmel
X-SVN-Commit-Paths: head/lib/libzstd
X-SVN-Commit-Revision: 326232
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 16:41:31 -0000
Author: mmel
Date: Sun Nov 26 16:41:30 2017
New Revision: 326232
URL: https://svnweb.freebsd.org/changeset/base/326232
Log:
Addd work around for LLVM bug 35023.
Clang crashes when compiling zstd_compress.c with optimization for ARM targets.
https://bugs.llvm.org/show_bug.cgi?id=35023
Modified:
head/lib/libzstd/Makefile
Modified: head/lib/libzstd/Makefile
==============================================================================
--- head/lib/libzstd/Makefile Sun Nov 26 16:12:10 2017 (r326231)
+++ head/lib/libzstd/Makefile Sun Nov 26 16:41:30 2017 (r326232)
@@ -38,4 +38,9 @@ ZSTDDIR= ${SRCTOP}/sys/contrib/zstd
${ZSTDDIR}/lib/decompress ${ZSTDDIR}/lib/deprecated \
${ZSTDDIR}/lib/dictBuilder ${ZSTDDIR}/lib
+# Work around for LLVM bug 35023, https://bugs.llvm.org/show_bug.cgi?id=35023
+.if ${MACHINE_ARCH:Marm*} != ""
+CFLAGS.zstd_compress.c+= -O0
+.endif
+
.include <bsd.lib.mk>
From owner-svn-src-all@freebsd.org Sun Nov 26 17:07:32 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 335E7DEBB8D;
Sun, 26 Nov 2017 17:07:32 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id EFF007069A;
Sun, 26 Nov 2017 17:07:31 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from comporellon.tachypleus.net (cpe-75-82-218-62.socal.res.rr.com
[75.82.218.62]) (authenticated bits=0)
by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id vAQH7Smu022084
(version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
Sun, 26 Nov 2017 09:07:29 -0800
Subject: Re: svn commit: r326218 - head/sys/kern
To: Andrew Turner <andrew@fubar.geek.nz>
Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<59383A7D-FC99-4748-9561-53D968C4B150@fubar.geek.nz>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <62864c22-e458-2f13-2b33-9dc075ed2ef2@freebsd.org>
Date: Sun, 26 Nov 2017 09:07:27 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <59383A7D-FC99-4748-9561-53D968C4B150@fubar.geek.nz>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Sonic-CAuth: UmFuZG9tSVbOx2+VNdBpwjTv0t7WeLmL/f9MFlSF+kMdCphldoJW1OC/H5DuW/WvOmN0mi8SkQTadR+QjIfgIpdF/k6r3TrKvJqdY78bre8=
X-Sonic-ID: C;tBkvSMzS5xGNausnWtmBlw== M;0hCSSMzS5xGNausnWtmBlw==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 17:07:32 -0000
On 11/26/17 01:46, Andrew Turner wrote:
> On 25 Nov 2017, at 23:41, Nathan Whitehorn <nwhitehorn@freebsd.org> wrote:
>> Author: nwhitehorn
>> Date: Sat Nov 25 23:41:05 2017
>> New Revision: 326218
>> URL: https://svnweb.freebsd.org/changeset/base/326218
>>
>> Log:
>> Remove some, but not all, assumptions that the BSP is CPU 0 and that CPUs
>> are numbered densely from there to n_cpus.
>>
>> MFC after: 1 month
>>
>> Modified:
>> head/sys/kern/kern_clock.c
>> head/sys/kern/kern_clocksource.c
>> head/sys/kern/kern_shutdown.c
>> head/sys/kern/kern_timeout.c
>> head/sys/kern/sched_ule.c
>> head/sys/kern/subr_pcpu.c
>>
> ...
>> Modified: head/sys/kern/subr_pcpu.c
>> ==============================================================================
>> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 (r326217)
>> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 (r326218)
>> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
>> struct pcpu *
>> pcpu_find(u_int cpuid)
>> {
>> + KASSERT(cpuid_to_pcpu[cpuid] != NULL,
>> + ("Getting uninitialized PCPU %d", cpuid));
>>
>> return (cpuid_to_pcpu[cpuid]);
>> }
> This breaks on one arm64 simulator I have where the device tree lists 8 cpus, but only 2 are enabled in the simulation. The ofw_cpu device nodes for these are cpu0 and cpu4 so the call to cpu_find in ofw_cpu_attach will hit this KASSERT when the CPU has not been enabled.
>
> Andrew
>
> cpu0: <Open Firmware CPU> on cpulist0
> cpu1: <Open Firmware CPU> on cpulist0
> panic: Getting uninitialized PCPU 1
> cpuid = 0
> time = 1
> KDB: stack backtrace:
> db_trace_self() at db_trace_self_wrapper+0x28
> pc = 0xffff0000005f03e8 lr = 0xffff000000087048
> sp = 0xffff0000000105a0 fp = 0xffff0000000107b0
That's unfortunate. Removing the new KASSERT is probably not the right
option, since all it is doing is indicating a pre-existing bug.
Specifically, it is preventing ofw_cpu from using a NULL pointer for CPU
4, which I suppose it was previously happily doing (it would only get
dereferenced if you had cpufreq support, hence no previous panic).
A super quick-and-dirty fix would be to be fail attach on
CPU_ABSENT(device_get_unit(dev)), which restores the previous buggy
behavior but without the panic. If you do not actually use ofw_cpu for
anything, we could also just disable it temporarily on your platform
(it's off for some PPC systems, you will note, for similar reasons).
A real fix is somewhat complex, since the driver relies on being able to
get a mapping from platform-specific numbers in the device tree to an
entry in pcpu, which intrinsically relies on reverse-engineering the
platform's mapping between some kind of hardware CPU ID and the kernel
CPU numbering. I can't think of a way to do that internally. We could
make some kind of platform macro, but the whole concept is even somewhat
dubious at the moment since a number of IBM systems with SMT don't even
have a 1:1 relationship between CPUs as FreeBSD defines them and device
tree nodes, so it's possible we need a serious rearchitecture of the driver.
Please let me know how I can help get this fixed.
-Nathan
From owner-svn-src-all@freebsd.org Sun Nov 26 17:27:54 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21273DEC3C1
for <svn-src-all@mailman.ysv.freebsd.org>;
Sun, 26 Nov 2017 17:27:54 +0000 (UTC) (envelope-from ian@freebsd.org)
Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org
[54.200.247.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id EEA7171257
for <svn-src-all@freebsd.org>; Sun, 26 Nov 2017 17:27:53 +0000 (UTC)
(envelope-from ian@freebsd.org)
X-MHO-User: 269aab30-d2cf-11e7-97f4-9d8903e843e3
X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information
X-Originating-IP: 73.78.92.27
X-Mail-Handler: DuoCircle Outbound SMTP
Received: from ilsoft.org (unknown [73.78.92.27])
by outbound1.ore.mailhop.org (Halon) with ESMTPSA
id 269aab30-d2cf-11e7-97f4-9d8903e843e3;
Sun, 26 Nov 2017 17:28:01 +0000 (UTC)
Received: from rev (rev [172.22.42.240])
by ilsoft.org (8.15.2/8.15.2) with ESMTP id vAQHRje6001319;
Sun, 26 Nov 2017 10:27:45 -0700 (MST) (envelope-from ian@freebsd.org)
Message-ID: <1511717265.23588.43.camel@freebsd.org>
Subject: Re: svn commit: r326095 - head/usr.sbin/bsdinstall/scripts
From: Ian Lepore <ian@freebsd.org>
To: Bruce Evans <brde@optusnet.com.au>
Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org
Date: Sun, 26 Nov 2017 10:27:45 -0700
In-Reply-To: <20171125201623.J1236@besplex.bde.org>
References: <201711231729.vANHTVmo092083@pdx.rh.CN85.dnsmgr.net>
<F94B65A7-D2AA-47FB-90C4-439DDFDD1AC7@shxd.cx>
<20171124201621.K980@besplex.bde.org>
<1511539000.94268.17.camel@freebsd.org>
<20171125201623.J1236@besplex.bde.org>
Content-Type: text/plain; charset="ISO-8859-1"
X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 17:27:54 -0000
On Sat, 2017-11-25 at 22:09 +1100, Bruce Evans wrote:
> On Fri, 24 Nov 2017, Ian Lepore wrote:
>
> [...]
>
> Is there any use for ntp as a client if you have an atomic clock? Just to
> validate both it and ntpd?
>
> Bruce
Ntpd treats the atomic clock as one of its peers... the clock emits a
PPS pulse and serves as a refclock peer. There generally also needs to
be a network peer, or another type of refclock such as a gps receiver,
to tell ntpd how to number the seconds. Some atomic clocks are able to
number the seconds as well (such as a Microsemi 5071a cesium), but
that's not a feature that's used often in my experience.
When the frequency output of the atomic clock directly drives the
kernel timecounter (obviously using some custom hardware), ntpd isn't
very good at being just a network protocol server. It really wants to
steer the kernel clock based on phase/frequency measurements from some
peer. There are dregs of old "LOCKCLOCK" support code in ntpd which is
supposed to handle the "clock is externally steered" case, but when I
tried to configure and build it to run that way last year, I had no
success (which could be due to poor documentation and my
misunderstanding of it, or could just be the support has bitrotted).
-- Ian
From owner-svn-src-all@freebsd.org Sun Nov 26 18:19:03 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5638BDED68D;
Sun, 26 Nov 2017 18:19:03 +0000 (UTC)
(envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 0FFBE72DD6;
Sun, 26 Nov 2017 18:19:02 +0000 (UTC)
(envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQIJ24B068967;
Sun, 26 Nov 2017 18:19:02 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQIJ1Pj068961;
Sun, 26 Nov 2017 18:19:01 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201711261819.vAQIJ1Pj068961@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tuexen set sender to
tuexen@FreeBSD.org using -f
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sun, 26 Nov 2017 18:19:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326233 - in head: sbin/ipfw sys/netinet sys/netpfil/ipfw
X-SVN-Group: head
X-SVN-Commit-Author: tuexen
X-SVN-Commit-Paths: in head: sbin/ipfw sys/netinet sys/netpfil/ipfw
X-SVN-Commit-Revision: 326233
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 18:19:03 -0000
Author: tuexen
Date: Sun Nov 26 18:19:01 2017
New Revision: 326233
URL: https://svnweb.freebsd.org/changeset/base/326233
Log:
Add to ipfw support for sending an SCTP packet containing an ABORT chunk.
This is similar to the TCP case. where a TCP RST segment can be sent.
There is one limitation: When sending an ABORT in response to an incoming
packet, it should be tested if there is no ABORT chunk in the received
packet. Currently, it is only checked if the first chunk is an ABORT
chunk to avoid parsing the whole packet, which could result in a DOS attack.
Thanks to Timo Voelker for helping me to test this patch.
Reviewed by: bcr@ (man page part), ae@ (generic, non-SCTP part)
Differential Revision: https://reviews.freebsd.org/D13239
Modified:
head/sbin/ipfw/ipfw.8
head/sbin/ipfw/ipfw2.c
head/sbin/ipfw/ipfw2.h
head/sys/netinet/ip_fw.h
head/sys/netpfil/ipfw/ip_fw2.c
head/sys/netpfil/ipfw/ip_fw_log.c
Modified: head/sbin/ipfw/ipfw.8
==============================================================================
--- head/sbin/ipfw/ipfw.8 Sun Nov 26 16:41:30 2017 (r326232)
+++ head/sbin/ipfw/ipfw.8 Sun Nov 26 18:19:01 2017 (r326233)
@@ -1,7 +1,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 2, 2017
+.Dd November 26, 2017
.Dt IPFW 8
.Os
.Sh NAME
@@ -1173,6 +1173,14 @@ ipfw add reass all from any to any in
.Ed
.Pp
is all you need at the beginning of your ruleset.
+.It Cm abort
+Discard packets that match this rule, and if the packet is an SCTP packet,
+try to send an SCTP packet containing an ABORT chunk.
+The search terminates.
+.It Cm abort6
+Discard packets that match this rule, and if the packet is an SCTP packet,
+try to send an SCTP packet containing an ABORT chunk.
+The search terminates.
.El
.Ss RULE BODY
The body of a rule contains zero or more patterns (such as
Modified: head/sbin/ipfw/ipfw2.c
==============================================================================
--- head/sbin/ipfw/ipfw2.c Sun Nov 26 16:41:30 2017 (r326232)
+++ head/sbin/ipfw/ipfw2.c Sun Nov 26 18:19:01 2017 (r326233)
@@ -244,6 +244,8 @@ static struct _s_x rule_eactions[] = {
};
static struct _s_x rule_actions[] = {
+ { "abort6", TOK_ABORT6 },
+ { "abort", TOK_ABORT },
{ "accept", TOK_ACCEPT },
{ "pass", TOK_ACCEPT },
{ "allow", TOK_ACCEPT },
@@ -1507,6 +1509,8 @@ show_static_rule(struct cmdline_opts *co, struct forma
case O_REJECT:
if (cmd->arg1 == ICMP_REJECT_RST)
bprintf(bp, "reset");
+ else if (cmd->arg1 == ICMP_REJECT_ABORT)
+ bprintf(bp, "abort");
else if (cmd->arg1 == ICMP_UNREACH_HOST)
bprintf(bp, "reject");
else
@@ -1516,6 +1520,8 @@ show_static_rule(struct cmdline_opts *co, struct forma
case O_UNREACH6:
if (cmd->arg1 == ICMP6_UNREACH_RST)
bprintf(bp, "reset6");
+ else if (cmd->arg1 == ICMP6_UNREACH_ABORT)
+ bprintf(bp, "abort6");
else
print_unreach6_code(bp, cmd->arg1);
break;
@@ -3752,6 +3758,16 @@ compile_rule(char *av[], uint32_t *rbuf, int *rbufsize
break;
}
errx(EX_DATAERR, "Invalid state name %s", *av);
+ break;
+
+ case TOK_ABORT:
+ action->opcode = O_REJECT;
+ action->arg1 = ICMP_REJECT_ABORT;
+ break;
+
+ case TOK_ABORT6:
+ action->opcode = O_UNREACH6;
+ action->arg1 = ICMP6_UNREACH_ABORT;
break;
case TOK_ACCEPT:
Modified: head/sbin/ipfw/ipfw2.h
==============================================================================
--- head/sbin/ipfw/ipfw2.h Sun Nov 26 16:41:30 2017 (r326232)
+++ head/sbin/ipfw/ipfw2.h Sun Nov 26 18:19:01 2017 (r326233)
@@ -81,6 +81,8 @@ enum tokens {
TOK_STARTBRACE,
TOK_ENDBRACE,
+ TOK_ABORT6,
+ TOK_ABORT,
TOK_ACCEPT,
TOK_COUNT,
TOK_EACTION,
Modified: head/sys/netinet/ip_fw.h
==============================================================================
--- head/sys/netinet/ip_fw.h Sun Nov 26 16:41:30 2017 (r326232)
+++ head/sys/netinet/ip_fw.h Sun Nov 26 18:19:01 2017 (r326233)
@@ -728,6 +728,8 @@ struct _ipfw_dyn_rule {
#define ICMP_REJECT_RST 0x100 /* fake ICMP code (send a TCP RST) */
#define ICMP6_UNREACH_RST 0x100 /* fake ICMPv6 code (send a TCP RST) */
+#define ICMP_REJECT_ABORT 0x101 /* fake ICMP code (send an SCTP ABORT) */
+#define ICMP6_UNREACH_ABORT 0x101 /* fake ICMPv6 code (send an SCTP ABORT) */
/*
* These are used for lookup tables.
Modified: head/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw2.c Sun Nov 26 16:41:30 2017 (r326232)
+++ head/sys/netpfil/ipfw/ip_fw2.c Sun Nov 26 18:19:01 2017 (r326233)
@@ -80,6 +80,8 @@ __FBSDID("$FreeBSD$");
#include <netinet/udp.h>
#include <netinet/udp_var.h>
#include <netinet/sctp.h>
+#include <netinet/sctp_crc32.h>
+#include <netinet/sctp_header.h>
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
@@ -469,6 +471,113 @@ verify_path(struct in_addr src, struct ifnet *ifp, u_i
}
/*
+ * Generate an SCTP packet containing an ABORT chunk. The verification tag
+ * is given by vtag. The T-bit is set in the ABORT chunk if and only if
+ * reflected is not 0.
+ */
+
+static struct mbuf *
+ipfw_send_abort(struct mbuf *replyto, struct ipfw_flow_id *id, u_int32_t vtag,
+ int reflected)
+{
+ struct mbuf *m;
+ struct ip *ip;
+#ifdef INET6
+ struct ip6_hdr *ip6;
+#endif
+ struct sctphdr *sctp;
+ struct sctp_chunkhdr *chunk;
+ u_int16_t hlen, plen, tlen;
+
+ MGETHDR(m, M_NOWAIT, MT_DATA);
+ if (m == NULL)
+ return (NULL);
+
+ M_SETFIB(m, id->fib);
+#ifdef MAC
+ if (replyto != NULL)
+ mac_netinet_firewall_reply(replyto, m);
+ else
+ mac_netinet_firewall_send(m);
+#else
+ (void)replyto; /* don't warn about unused arg */
+#endif
+
+ switch (id->addr_type) {
+ case 4:
+ hlen = sizeof(struct ip);
+ break;
+#ifdef INET6
+ case 6:
+ hlen = sizeof(struct ip6_hdr);
+ break;
+#endif
+ default:
+ /* XXX: log me?!? */
+ FREE_PKT(m);
+ return (NULL);
+ }
+ plen = sizeof(struct sctphdr) + sizeof(struct sctp_chunkhdr);
+ tlen = hlen + plen;
+ m->m_data += max_linkhdr;
+ m->m_flags |= M_SKIP_FIREWALL;
+ m->m_pkthdr.len = m->m_len = tlen;
+ m->m_pkthdr.rcvif = NULL;
+ bzero(m->m_data, tlen);
+
+ switch (id->addr_type) {
+ case 4:
+ ip = mtod(m, struct ip *);
+
+ ip->ip_v = 4;
+ ip->ip_hl = sizeof(struct ip) >> 2;
+ ip->ip_tos = IPTOS_LOWDELAY;
+ ip->ip_len = htons(tlen);
+ ip->ip_id = htons(0);
+ ip->ip_off = htons(0);
+ ip->ip_ttl = V_ip_defttl;
+ ip->ip_p = IPPROTO_SCTP;
+ ip->ip_sum = 0;
+ ip->ip_src.s_addr = htonl(id->dst_ip);
+ ip->ip_dst.s_addr = htonl(id->src_ip);
+
+ sctp = (struct sctphdr *)(ip + 1);
+ break;
+#ifdef INET6
+ case 6:
+ ip6 = mtod(m, struct ip6_hdr *);
+
+ ip6->ip6_vfc = IPV6_VERSION;
+ ip6->ip6_plen = htons(plen);
+ ip6->ip6_nxt = IPPROTO_SCTP;
+ ip6->ip6_hlim = IPV6_DEFHLIM;
+ ip6->ip6_src = id->dst_ip6;
+ ip6->ip6_dst = id->src_ip6;
+
+ sctp = (struct sctphdr *)(ip6 + 1);
+ break;
+#endif
+ }
+
+ sctp->src_port = htons(id->dst_port);
+ sctp->dest_port = htons(id->src_port);
+ sctp->v_tag = htonl(vtag);
+ sctp->checksum = htonl(0);
+
+ chunk = (struct sctp_chunkhdr *)(sctp + 1);
+ chunk->chunk_type = SCTP_ABORT_ASSOCIATION;
+ chunk->chunk_flags = 0;
+ if (reflected != 0) {
+ chunk->chunk_flags |= SCTP_HAD_NO_TCB;
+ }
+ chunk->chunk_length = htons(sizeof(struct sctp_chunkhdr));
+
+ sctp->checksum = sctp_calculate_cksum(m, hlen);
+
+ return (m);
+}
+
+/*
* Generate a TCP packet, containing either a RST or a keepalive.
* When flags & TH_RST, we are sending a RST packet, because of a
* "reset" action matched the packet.
@@ -730,7 +839,71 @@ send_reject6(struct ip_fw_args *args, int code, u_int
NULL);
}
FREE_PKT(m);
- } else if (code != ICMP6_UNREACH_RST) { /* Send an ICMPv6 unreach. */
+ } else if (code == ICMP6_UNREACH_ABORT &&
+ args->f_id.proto == IPPROTO_SCTP) {
+ struct mbuf *m0;
+ struct sctphdr *sctp;
+ u_int32_t v_tag;
+ int reflected;
+
+ sctp = (struct sctphdr *)((char *)ip6 + hlen);
+ reflected = 1;
+ v_tag = ntohl(sctp->v_tag);
+ /* Investigate the first chunk header if available */
+ if (m->m_len >= hlen + sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr)) {
+ struct sctp_chunkhdr *chunk;
+
+ chunk = (struct sctp_chunkhdr *)(sctp + 1);
+ switch (chunk->chunk_type) {
+ case SCTP_INITIATION:
+ /*
+ * Packets containing an INIT chunk MUST have
+ * a zero v-tag.
+ */
+ if (v_tag != 0) {
+ v_tag = 0;
+ break;
+ }
+ /* INIT chunk MUST NOT be bundled */
+ if (m->m_pkthdr.len >
+ hlen + sizeof(struct sctphdr) +
+ ntohs(chunk->chunk_length) + 3) {
+ break;
+ }
+ /* Use the initiate tag if available */
+ if ((m->m_len >= hlen + sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr) +
+ offsetof(struct sctp_init, a_rwnd))) {
+ struct sctp_init *init;
+
+ init = (struct sctp_init *)(chunk + 1);
+ v_tag = ntohl(init->initiate_tag);
+ reflected = 0;
+ }
+ break;
+ case SCTP_ABORT_ASSOCIATION:
+ /*
+ * If the packet contains an ABORT chunk, don't
+ * reply.
+ * XXX: We should search through all chunks,
+ * but don't do to avoid attacks.
+ */
+ v_tag = 0;
+ break;
+ }
+ }
+ if (v_tag == 0) {
+ m0 = NULL;
+ } else {
+ m0 = ipfw_send_abort(args->m, &(args->f_id), v_tag,
+ reflected);
+ }
+ if (m0 != NULL)
+ ip6_output(m0, NULL, NULL, 0, NULL, NULL, NULL);
+ FREE_PKT(m);
+ } else if (code != ICMP6_UNREACH_RST && code != ICMP6_UNREACH_ABORT) {
+ /* Send an ICMPv6 unreach. */
#if 0
/*
* Unlike above, the mbufs need to line up with the ip6 hdr,
@@ -770,9 +943,10 @@ send_reject(struct ip_fw_args *args, int code, int ipl
if (args->L3offset)
m_adj(m, args->L3offset);
#endif
- if (code != ICMP_REJECT_RST) { /* Send an ICMP unreach */
+ if (code != ICMP_REJECT_RST && code != ICMP_REJECT_ABORT) {
+ /* Send an ICMP unreach */
icmp_error(args->m, ICMP_UNREACH, code, 0L, 0);
- } else if (args->f_id.proto == IPPROTO_TCP) {
+ } else if (code == ICMP_REJECT_RST && args->f_id.proto == IPPROTO_TCP) {
struct tcphdr *const tcp =
L3HDR(struct tcphdr, mtod(args->m, struct ip *));
if ( (tcp->th_flags & TH_RST) == 0) {
@@ -784,6 +958,68 @@ send_reject(struct ip_fw_args *args, int code, int ipl
ip_output(m, NULL, NULL, 0, NULL, NULL);
}
FREE_PKT(args->m);
+ } else if (code == ICMP_REJECT_ABORT &&
+ args->f_id.proto == IPPROTO_SCTP) {
+ struct mbuf *m;
+ struct sctphdr *sctp;
+ struct sctp_chunkhdr *chunk;
+ struct sctp_init *init;
+ u_int32_t v_tag;
+ int reflected;
+
+ sctp = L3HDR(struct sctphdr, mtod(args->m, struct ip *));
+ reflected = 1;
+ v_tag = ntohl(sctp->v_tag);
+ if (iplen >= (ip->ip_hl << 2) + sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr)) {
+ /* Look at the first chunk header if available */
+ chunk = (struct sctp_chunkhdr *)(sctp + 1);
+ switch (chunk->chunk_type) {
+ case SCTP_INITIATION:
+ /*
+ * Packets containing an INIT chunk MUST have
+ * a zero v-tag.
+ */
+ if (v_tag != 0) {
+ v_tag = 0;
+ break;
+ }
+ /* INIT chunk MUST NOT be bundled */
+ if (iplen >
+ (ip->ip_hl << 2) + sizeof(struct sctphdr) +
+ ntohs(chunk->chunk_length) + 3) {
+ break;
+ }
+ /* Use the initiate tag if available */
+ if ((iplen >= (ip->ip_hl << 2) +
+ sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr) +
+ offsetof(struct sctp_init, a_rwnd))) {
+ init = (struct sctp_init *)(chunk + 1);
+ v_tag = ntohl(init->initiate_tag);
+ reflected = 0;
+ }
+ break;
+ case SCTP_ABORT_ASSOCIATION:
+ /*
+ * If the packet contains an ABORT chunk, don't
+ * reply.
+ * XXX: We should search through all chunks,
+ * but don't do to avoid attacks.
+ */
+ v_tag = 0;
+ break;
+ }
+ }
+ if (v_tag == 0) {
+ m = NULL;
+ } else {
+ m = ipfw_send_abort(args->m, &(args->f_id), v_tag,
+ reflected);
+ }
+ if (m != NULL)
+ ip_output(m, NULL, NULL, 0, NULL, NULL);
+ FREE_PKT(args->m);
} else
FREE_PKT(args->m);
args->m = NULL;
@@ -1203,7 +1439,18 @@ do { \
break;
case IPPROTO_SCTP:
- PULLUP_TO(hlen, ulp, struct sctphdr);
+ if (pktlen >= hlen + sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr) +
+ offsetof(struct sctp_init, a_rwnd))
+ PULLUP_LEN(hlen, ulp,
+ sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr) +
+ offsetof(struct sctp_init, a_rwnd));
+ else if (pktlen >= hlen + sizeof(struct sctphdr))
+ PULLUP_LEN(hlen, ulp, pktlen - hlen);
+ else
+ PULLUP_LEN(hlen, ulp,
+ sizeof(struct sctphdr));
src_port = SCTP(ulp)->src_port;
dst_port = SCTP(ulp)->dest_port;
break;
@@ -1380,7 +1627,18 @@ do { \
break;
case IPPROTO_SCTP:
- PULLUP_TO(hlen, ulp, struct sctphdr);
+ if (pktlen >= hlen + sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr) +
+ offsetof(struct sctp_init, a_rwnd))
+ PULLUP_LEN(hlen, ulp,
+ sizeof(struct sctphdr) +
+ sizeof(struct sctp_chunkhdr) +
+ offsetof(struct sctp_init, a_rwnd));
+ else if (pktlen >= hlen + sizeof(struct sctphdr))
+ PULLUP_LEN(hlen, ulp, pktlen - hlen);
+ else
+ PULLUP_LEN(hlen, ulp,
+ sizeof(struct sctphdr));
src_port = SCTP(ulp)->src_port;
dst_port = SCTP(ulp)->dest_port;
break;
Modified: head/sys/netpfil/ipfw/ip_fw_log.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_log.c Sun Nov 26 16:41:30 2017 (r326232)
+++ head/sys/netpfil/ipfw/ip_fw_log.c Sun Nov 26 18:19:01 2017 (r326233)
@@ -165,6 +165,8 @@ ipfw_log(struct ip_fw_chain *chain, struct ip_fw *f, u
case O_REJECT:
if (cmd->arg1==ICMP_REJECT_RST)
action = "Reset";
+ else if (cmd->arg1==ICMP_REJECT_ABORT)
+ action = "Abort";
else if (cmd->arg1==ICMP_UNREACH_HOST)
action = "Reject";
else
@@ -175,6 +177,8 @@ ipfw_log(struct ip_fw_chain *chain, struct ip_fw *f, u
case O_UNREACH6:
if (cmd->arg1==ICMP6_UNREACH_RST)
action = "Reset";
+ else if (cmd->arg1==ICMP6_UNREACH_ABORT)
+ action = "Abort";
else
snprintf(SNPARGS(action2, 0), "Unreach %d",
cmd->arg1);
From owner-svn-src-all@freebsd.org Sun Nov 26 18:33:44 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4EF93DEDE84;
Sun, 26 Nov 2017 18:33:44 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id EA34F7384A;
Sun, 26 Nov 2017 18:33:43 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from tom.home (kib@localhost [127.0.0.1])
by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id vAQIXb85063511
(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Sun, 26 Nov 2017 20:33:38 +0200 (EET)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua vAQIXb85063511
Received: (from kostik@localhost)
by tom.home (8.15.2/8.15.2/Submit) id vAQIXbgi063510;
Sun, 26 Nov 2017 20:33:37 +0200 (EET)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
using -f
Date: Sun, 26 Nov 2017 20:33:37 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Ed Schouten <ed@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326227 - in head/sys/arm64: arm64 include
Message-ID: <20171126183337.GH2272@kib.kiev.ua>
References: <201711261428.vAQESRxo073124@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201711261428.vAQESRxo073124@repo.freebsd.org>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
autolearn_force=no version=3.4.1
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 18:33:44 -0000
On Sun, Nov 26, 2017 at 02:28:27PM +0000, Ed Schouten wrote:
> Author: ed
> Date: Sun Nov 26 14:28:27 2017
> New Revision: 326227
> URL: https://svnweb.freebsd.org/changeset/base/326227
>
> Log:
> Make 32-bit system calls end up in svc_handler().
>
> The nice thing about ARM64 is that it's pretty elegant to install
> separate trap/exception handlers for 32-bit and 64-bit processes. That
> said, for all other architectures (e.g., i386 on amd64) we always let
> 32-bit counterparts go through the regular system call codepath. Let's
> do the same on ARM64.
We don't and never did on amd64.
For amd64, IDT entry for int $0x80 points to a handler which, by its
nature, is different from the native syscall entry. Then, i386 ABI-specific
ia32_syscall() C handler is called from the trampoline, and reuses the
subr_syscall.c code by inclusion.
In other words, there is no reused code, except MI syscallenter/syscallret.
>
> Reviewed by: andrew
> Differential Revision: https://reviews.freebsd.org/D13146
>
> Modified:
> head/sys/arm64/arm64/exception.S
> head/sys/arm64/arm64/trap.c
> head/sys/arm64/include/armreg.h
>
> Modified: head/sys/arm64/arm64/exception.S
> ==============================================================================
> --- head/sys/arm64/arm64/exception.S Sun Nov 26 10:02:43 2017 (r326226)
> +++ head/sys/arm64/arm64/exception.S Sun Nov 26 14:28:27 2017 (r326227)
> @@ -219,8 +219,8 @@ exception_vectors:
> vempty /* FIQ 64-bit EL0 */
> vector el0_error /* Error 64-bit EL0 */
>
> - vempty /* Synchronous 32-bit EL0 */
> - vempty /* IRQ 32-bit EL0 */
> + vector el0_sync /* Synchronous 32-bit EL0 */
> + vector el0_irq /* IRQ 32-bit EL0 */
> vempty /* FIQ 32-bit EL0 */
> - vempty /* Error 32-bit EL0 */
> + vector el0_error /* Error 32-bit EL0 */
>
>
> Modified: head/sys/arm64/arm64/trap.c
> ==============================================================================
> --- head/sys/arm64/arm64/trap.c Sun Nov 26 10:02:43 2017 (r326226)
> +++ head/sys/arm64/arm64/trap.c Sun Nov 26 14:28:27 2017 (r326227)
> @@ -381,7 +381,8 @@ do_el0_sync(struct thread *td, struct trapframe *frame
> panic("VFP exception in userland");
> #endif
> break;
> - case EXCP_SVC:
> + case EXCP_SVC32:
> + case EXCP_SVC64:
> svc_handler(td, frame);
> break;
> case EXCP_INSN_ABORT_L:
>
> Modified: head/sys/arm64/include/armreg.h
> ==============================================================================
> --- head/sys/arm64/include/armreg.h Sun Nov 26 10:02:43 2017 (r326226)
> +++ head/sys/arm64/include/armreg.h Sun Nov 26 14:28:27 2017 (r326227)
> @@ -123,7 +123,8 @@
> #define EXCP_UNKNOWN 0x00 /* Unkwn exception */
> #define EXCP_FP_SIMD 0x07 /* VFP/SIMD trap */
> #define EXCP_ILL_STATE 0x0e /* Illegal execution state */
> -#define EXCP_SVC 0x15 /* SVC trap */
> +#define EXCP_SVC32 0x11 /* SVC trap for AArch32 */
> +#define EXCP_SVC64 0x15 /* SVC trap for AArch64 */
> #define EXCP_MSR 0x18 /* MSR/MRS trap */
> #define EXCP_INSN_ABORT_L 0x20 /* Instruction abort, from lower EL */
> #define EXCP_INSN_ABORT 0x21 /* Instruction abort, from same EL */
From owner-svn-src-all@freebsd.org Sun Nov 26 19:16:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D73EDDEE7EF;
Sun, 26 Nov 2017 19:16:46 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A3DE87492A;
Sun, 26 Nov 2017 19:16:46 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQJGjRC093766;
Sun, 26 Nov 2017 19:16:45 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQJGjiJ093765;
Sun, 26 Nov 2017 19:16:45 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711261916.vAQJGjiJ093765@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 26 Nov 2017 19:16:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326234 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 326234
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 19:16:46 -0000
Author: markj
Date: Sun Nov 26 19:16:45 2017
New Revision: 326234
URL: https://svnweb.freebsd.org/changeset/base/326234
Log:
Remove unneeded initializations from vm_phys_init_page().
The page allocator always initializes the aflags and oflags fields.
Reviewed by: alc, kib
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D13242
Modified:
head/sys/vm/vm_phys.c
Modified: head/sys/vm/vm_phys.c
==============================================================================
--- head/sys/vm/vm_phys.c Sun Nov 26 18:19:01 2017 (r326233)
+++ head/sys/vm/vm_phys.c Sun Nov 26 19:16:45 2017 (r326234)
@@ -742,7 +742,7 @@ vm_phys_init_page(vm_paddr_t pa)
m->wire_count = 0;
m->busy_lock = VPB_UNBUSIED;
m->hold_count = 0;
- m->flags = m->aflags = m->oflags = 0;
+ m->flags = 0;
m->phys_addr = pa;
m->queue = PQ_NONE;
m->psind = 0;
From owner-svn-src-all@freebsd.org Sun Nov 26 19:17:56 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D595DEE874;
Sun, 26 Nov 2017 19:17:56 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5771A74A89;
Sun, 26 Nov 2017 19:17:56 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQJHtCv093852;
Sun, 26 Nov 2017 19:17:55 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQJHt0m093849;
Sun, 26 Nov 2017 19:17:55 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711261917.vAQJHt0m093849@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 26 Nov 2017 19:17:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326235 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 326235
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 19:17:56 -0000
Author: markj
Date: Sun Nov 26 19:17:55 2017
New Revision: 326235
URL: https://svnweb.freebsd.org/changeset/base/326235
Log:
Move vm_phys_init_page() to vm_page.c.
Suggested by: kib
Reviewed by: alc, kib
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D13250
Modified:
head/sys/vm/vm_page.c
head/sys/vm/vm_phys.c
head/sys/vm/vm_phys.h
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Sun Nov 26 19:16:45 2017 (r326234)
+++ head/sys/vm/vm_page.c Sun Nov 26 19:17:55 2017 (r326235)
@@ -423,6 +423,31 @@ vm_page_domain_init(struct vm_domain *vmd)
}
/*
+ * Initialize a physical page in preparation for adding it to the free
+ * lists.
+ */
+static void
+vm_page_init_page(vm_paddr_t pa)
+{
+ vm_page_t m;
+
+ m = vm_phys_paddr_to_vm_page(pa);
+ m->object = NULL;
+ m->wire_count = 0;
+ m->busy_lock = VPB_UNBUSIED;
+ m->hold_count = 0;
+ m->flags = 0;
+ m->phys_addr = pa;
+ m->queue = PQ_NONE;
+ m->psind = 0;
+ m->segind = vm_phys_paddr_to_segind(pa);
+ m->order = VM_NFREEORDER;
+ m->pool = VM_FREEPOOL_DEFAULT;
+ m->valid = m->dirty = 0;
+ pmap_page_init(m);
+}
+
+/*
* vm_page_startup:
*
* Initializes the resident memory module. Allocates physical memory for
@@ -670,7 +695,7 @@ vm_page_startup(vm_offset_t vaddr)
for (segind = 0; segind < vm_phys_nsegs; segind++) {
seg = &vm_phys_segs[segind];
for (pa = seg->start; pa < seg->end; pa += PAGE_SIZE)
- vm_phys_init_page(pa);
+ vm_page_init_page(pa);
/*
* Add the segment to the free lists only if it is covered by
Modified: head/sys/vm/vm_phys.c
==============================================================================
--- head/sys/vm/vm_phys.c Sun Nov 26 19:16:45 2017 (r326234)
+++ head/sys/vm/vm_phys.c Sun Nov 26 19:17:55 2017 (r326235)
@@ -171,7 +171,6 @@ static vm_page_t vm_phys_alloc_seg_contig(struct vm_ph
vm_paddr_t boundary);
static void _vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end, int domain);
static void vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end);
-static int vm_phys_paddr_to_segind(vm_paddr_t pa);
static void vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl,
int order);
@@ -729,31 +728,6 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_f
}
/*
- * Initialize a physical page in preparation for adding it to the free
- * lists.
- */
-void
-vm_phys_init_page(vm_paddr_t pa)
-{
- vm_page_t m;
-
- m = vm_phys_paddr_to_vm_page(pa);
- m->object = NULL;
- m->wire_count = 0;
- m->busy_lock = VPB_UNBUSIED;
- m->hold_count = 0;
- m->flags = 0;
- m->phys_addr = pa;
- m->queue = PQ_NONE;
- m->psind = 0;
- m->segind = vm_phys_paddr_to_segind(pa);
- m->order = VM_NFREEORDER;
- m->pool = VM_FREEPOOL_DEFAULT;
- m->valid = m->dirty = 0;
- pmap_page_init(m);
-}
-
-/*
* Allocate a contiguous, power of two-sized set of physical pages
* from the free lists.
*
@@ -1064,7 +1038,7 @@ vm_phys_fictitious_unreg_range(vm_paddr_t start, vm_pa
/*
* Find the segment containing the given physical address.
*/
-static int
+int
vm_phys_paddr_to_segind(vm_paddr_t pa)
{
struct vm_phys_seg *seg;
Modified: head/sys/vm/vm_phys.h
==============================================================================
--- head/sys/vm/vm_phys.h Sun Nov 26 19:16:45 2017 (r326234)
+++ head/sys/vm/vm_phys.h Sun Nov 26 19:17:55 2017 (r326235)
@@ -82,7 +82,7 @@ vm_page_t vm_phys_fictitious_to_vm_page(vm_paddr_t pa)
void vm_phys_free_contig(vm_page_t m, u_long npages);
void vm_phys_free_pages(vm_page_t m, int order);
void vm_phys_init(void);
-void vm_phys_init_page(vm_paddr_t pa);
+int vm_phys_paddr_to_segind(vm_paddr_t pa);
vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa);
vm_page_t vm_phys_scan_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
u_long alignment, vm_paddr_t boundary, int options);
From owner-svn-src-all@freebsd.org Sun Nov 26 19:54:06 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69413DEF3C9;
Sun, 26 Nov 2017 19:54:06 +0000 (UTC)
(envelope-from etnapierala@gmail.com)
Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com
[IPv6:2a00:1450:400c:c0c::242])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id ED66E75C25;
Sun, 26 Nov 2017 19:54:05 +0000 (UTC)
(envelope-from etnapierala@gmail.com)
Received: by mail-wr0-x242.google.com with SMTP id o14so24508430wrf.9;
Sun, 26 Nov 2017 11:54:05 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=sender:date:from:to:cc:subject:message-id:mail-followup-to
:references:mime-version:content-disposition:in-reply-to:user-agent;
bh=rZ72yx3HFlvs5oZ4XynAQRNqZ/GgAJymQyLb887764o=;
b=o6LfYI5fnBm0Bed1nrHGEr5qs07MtbO7PCtCc/7jFnww5pLa8ekea0dEWiAITmoKLV
M/wm+6nTbd+wNB0HYvJ3z//30Hdzj//0MUhh3slp03bOIuxNcwmvrwNYb9C9Ub/o6ekh
cJLo4077svQtdE4wgD+mq4A9iZk0fgmUt5MSGJ1MwPf1Qtdn7ei35Upa4PjmnO0a+Ctp
/a3PLieM2kXrjAAXH4KOeWy4Oz/ZgSPRcBVOlddKOaiITyIRH2cNWlwyqtcLZLGLer+h
UCJfvcW9SAJG9ugi0Ja8VlHisPniwMR4jMepVnTneA0yxgY1lNtwqgQdFEEVwHSvJgNE
TTRA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:sender:date:from:to:cc:subject:message-id
:mail-followup-to:references:mime-version:content-disposition
:in-reply-to:user-agent;
bh=rZ72yx3HFlvs5oZ4XynAQRNqZ/GgAJymQyLb887764o=;
b=esgUe4/k80FRz6n4HO8TU46fth6wOudc2wBnBIPGStEHoyV3/TUlEZQf7I12tBrEiT
8S5llQ28tDZcgMktGFVMt/rerqSqOBc9uqDIzgdGoTE0uAv2PHW8A/eMXDV2kpu6HXS3
a3SamgLZEkDUn0K9q4JQSUkKkg9bPmwFKOKFLDx78EoxhxTw3r7/SxISTKDsm/AYigJ+
TcoqQfzGR3Ab5AVvElTfi/gCenwGwbA6Oacah8U6HG0Zrd7oa5sOhb//1Xjam/zwdi9q
dvM+7B/GVRbQg86KkScSIx0ItMjLxnrTZI4hftNo67KE6hRTNsHtFh0ti4zyIZTQ5IT8
I0Fw==
X-Gm-Message-State: AJaThX6vfVrAJG9CrnfPo4TZUDT7W8kyarmhhxT43PrvXdFFvk6Ti3rN
wdVOSJR3h60vm99Z1rXvDnuaNQ==
X-Google-Smtp-Source: AGs4zMZreihIsdv28XXcuFS02t/1P4IXI0h8FpnK/Zk51Ezq+vss7Umm9HL7hvrXaYVOhzjt8ZFR2g==
X-Received: by 10.223.139.140 with SMTP id o12mr11960742wra.280.1511726043098;
Sun, 26 Nov 2017 11:54:03 -0800 (PST)
Received: from brick (cpc92302-cmbg19-2-0-cust461.5-4.cable.virginm.net.
[82.1.209.206])
by smtp.gmail.com with ESMTPSA id c2sm14597814wrg.57.2017.11.26.11.54.02
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Sun, 26 Nov 2017 11:54:02 -0800 (PST)
Sender: =?UTF-8?Q?Edward_Tomasz_Napiera=C5=82a?= <etnapierala@gmail.com>
Date: Sun, 26 Nov 2017 19:54:01 +0000
From: Edward Tomasz Napierala <trasz@freebsd.org>
To: Bruce Evans <brde@optusnet.com.au>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326125 - head/usr.sbin/kgmon
Message-ID: <20171126195401.GA3787@brick>
Mail-Followup-To: Bruce Evans <brde@optusnet.com.au>,
src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
References: <201711231241.vANCf58n091345@repo.freebsd.org>
<20171124002239.T1335@besplex.bde.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171124002239.T1335@besplex.bde.org>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 19:54:06 -0000
On 1124T0138, Bruce Evans wrote:
> On Thu, 23 Nov 2017, Edward Tomasz Napierala wrote:
>
> > Log:
> > Mark kgmon(8) obsolete, redirecting users to pmcstat(8).
>
> It isn't obsolete. pmcstat can't do at least full (non-statistical)
> call graphs and high-resolution profiling.
[snip detailed explanation]
Thanks. Based on your arguments (and on the fact that I've tried
again to use it, following instructions from the URL below[1], and
this time it actually worked), I think I'll revert this commit,
and just add an ".Xr pmcstat 8" instead.
1. http://lserinol.blogspot.co.uk/2009/01/freebsd-kernel-profiling-with-kgmon.html
From owner-svn-src-all@freebsd.org Sun Nov 26 20:30:03 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 928B0DEFA93;
Sun, 26 Nov 2017 20:30:03 +0000 (UTC)
(envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4E630767F5;
Sun, 26 Nov 2017 20:30:03 +0000 (UTC)
(envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQKU2GO025184;
Sun, 26 Nov 2017 20:30:02 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQKU2sT025183;
Sun, 26 Nov 2017 20:30:02 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201711262030.vAQKU2sT025183@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sun, 26 Nov 2017 20:30:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326236 - head/sys/powerpc/booke
X-SVN-Group: head
X-SVN-Commit-Author: jhibbits
X-SVN-Commit-Paths: head/sys/powerpc/booke
X-SVN-Commit-Revision: 326236
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 20:30:03 -0000
Author: jhibbits
Date: Sun Nov 26 20:30:02 2017
New Revision: 326236
URL: https://svnweb.freebsd.org/changeset/base/326236
Log:
Synchronize TLB1 mappings when created
This allows modules creating mappings to be loaded post-boot, after SMP has
started. Without this, the TLB1 mappings can become unsynchronized and lead
to kernel page faults when accessed on the alternate CPUs.
MFC after: 3 weeks
Modified:
head/sys/powerpc/booke/pmap.c
Modified: head/sys/powerpc/booke/pmap.c
==============================================================================
--- head/sys/powerpc/booke/pmap.c Sun Nov 26 19:17:55 2017 (r326235)
+++ head/sys/powerpc/booke/pmap.c Sun Nov 26 20:30:02 2017 (r326236)
@@ -3872,31 +3872,27 @@ tlb1_read_entry(tlb_entry_t *entry, unsigned int slot)
tsize2size((entry->mas1 & MAS1_TSIZE_MASK) >> MAS1_TSIZE_SHIFT);
}
-/*
- * Write given entry to TLB1 hardware.
- */
+struct tlbwrite_args {
+ tlb_entry_t *e;
+ unsigned int idx;
+};
+
static void
-tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
+tlb1_write_entry_int(void *arg)
{
- register_t msr;
+ struct tlbwrite_args *args = arg;
uint32_t mas0;
- //debugf("tlb1_write_entry: s\n");
-
/* Select entry */
- mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(idx);
- //debugf("tlb1_write_entry: mas0 = 0x%08x\n", mas0);
+ mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(args->idx);
- msr = mfmsr();
- __asm __volatile("wrteei 0");
-
mtspr(SPR_MAS0, mas0);
__asm __volatile("isync");
- mtspr(SPR_MAS1, e->mas1);
+ mtspr(SPR_MAS1, args->e->mas1);
__asm __volatile("isync");
- mtspr(SPR_MAS2, e->mas2);
+ mtspr(SPR_MAS2, args->e->mas2);
__asm __volatile("isync");
- mtspr(SPR_MAS3, e->mas3);
+ mtspr(SPR_MAS3, args->e->mas3);
__asm __volatile("isync");
switch ((mfpvr() >> 16) & 0xFFFF) {
case FSL_E500mc:
@@ -3906,7 +3902,7 @@ tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
__asm __volatile("isync");
/* FALLTHROUGH */
case FSL_E500v2:
- mtspr(SPR_MAS7, e->mas7);
+ mtspr(SPR_MAS7, args->e->mas7);
__asm __volatile("isync");
break;
default:
@@ -3914,9 +3910,42 @@ tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
}
__asm __volatile("tlbwe; isync; msync");
- mtmsr(msr);
- //debugf("tlb1_write_entry: e\n");
+}
+
+static void
+tlb1_write_entry_sync(void *arg)
+{
+ /* Empty synchronization point for smp_rendezvous(). */
+}
+
+/*
+ * Write given entry to TLB1 hardware.
+ */
+static void
+tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
+{
+ struct tlbwrite_args args;
+
+ args.e = e;
+ args.idx = idx;
+
+#ifdef SMP
+ if ((e->mas2 & _TLB_ENTRY_SHARED) && smp_started) {
+ mb();
+ smp_rendezvous(tlb1_write_entry_sync,
+ tlb1_write_entry_int,
+ tlb1_write_entry_sync, &args);
+ } else
+#endif
+ {
+ register_t msr;
+
+ msr = mfmsr();
+ __asm __volatile("wrteei 0");
+ tlb1_write_entry_int(&args);
+ mtmsr(msr);
+ }
}
/*
From owner-svn-src-all@freebsd.org Sun Nov 26 21:10:49 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4113BDF09A5;
Sun, 26 Nov 2017 21:10:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 0022078163;
Sun, 26 Nov 2017 21:10:48 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAQLAmRM043214;
Sun, 26 Nov 2017 21:10:48 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAQLAmNF043213;
Sun, 26 Nov 2017 21:10:48 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201711262110.vAQLAmNF043213@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Sun, 26 Nov 2017 21:10:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326237 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: mjg
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 326237
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 21:10:49 -0000
Author: mjg
Date: Sun Nov 26 21:10:47 2017
New Revision: 326237
URL: https://svnweb.freebsd.org/changeset/base/326237
Log:
rw: fix runlock_hard when new readers show up
When waiters/writer spinner flags are set no new readers can show up unless
they already have a different rw rock read locked. The change in r326195 failed
to take that into account - in presence of new readers it would spin until
they all drain, which would be lead to trouble if e.g. they go off cpu and
can get scheduled because of this thread.
Reported by: pho
Modified:
head/sys/kern/kern_rwlock.c
Modified: head/sys/kern/kern_rwlock.c
==============================================================================
--- head/sys/kern/kern_rwlock.c Sun Nov 26 20:30:02 2017 (r326236)
+++ head/sys/kern/kern_rwlock.c Sun Nov 26 21:10:47 2017 (r326237)
@@ -769,6 +769,11 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td
turnstile_chain_lock(&rw->lock_object);
v = RW_READ_VALUE(rw);
retry_ts:
+ if (__predict_false(RW_READERS(v) > 1)) {
+ turnstile_chain_unlock(&rw->lock_object);
+ continue;
+ }
+
v &= (RW_LOCK_WAITERS | RW_LOCK_WRITE_SPINNER);
MPASS(v & RW_LOCK_WAITERS);
From owner-svn-src-all@freebsd.org Sun Nov 26 21:11:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D914DF0A0B;
Sun, 26 Nov 2017 21:11:23 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: from mail-qk0-x22a.google.com (mail-qk0-x22a.google.com
[IPv6:2607:f8b0:400d:c09::22a])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id B8F6E7840D;
Sun, 26 Nov 2017 21:11:22 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: by mail-qk0-x22a.google.com with SMTP id j202so30129882qke.10;
Sun, 26 Nov 2017 13:11:22 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:cc; bh=qYgcawa7NNQ/z0Wbi+tgCmv1q7y++mxXZyEsu5GPzo4=;
b=MJbLx+4/QCsMuZWfz3XvrOLwkfDeKwVdZTr63X9H4+3B3a64VaplI8hk/5jCedpQsd
fkQOEcU34Fvd6ApmR6I07s8abM3G1NexntBt5lFkFO6afrsRGPgnxSF0Iwv8mWtAT9LU
MCh3CUI4QVQzUKJdZ/OczcwORsxO8kcohVk4wR90VU7Q33NFb90ycW2kePVAfOpWa/zI
2UMbGSdND8h09DLrt03TxVBOXn01azRNSEkqlJUZ1q3oyjiw/mOi66uyABgIZxDd+5PK
XHdpDii37XQ9yQlsWSt9zBpsFM0adg8TGHG0ecm2MqOHTNQPPvVhrjXEos+B0wIA9iIT
6J1w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:in-reply-to:references:from:date
:message-id:subject:to:cc;
bh=qYgcawa7NNQ/z0Wbi+tgCmv1q7y++mxXZyEsu5GPzo4=;
b=PyW5Vvrl0drkivppmrXtwI5Owuaj6CMS0f8cWga2wpt9M2kBUQdy34k4GBX3ZbuuGD
CkIMtdURJHaJBhQvR7817NIe81X2e85vcFs8n8fMTo72PWhS0xxTPMnqtVLxYUcLzs37
yMtNgvy4dE2U5ib7AgBtDrXrrNQPV4A7fuVTVkfOeu0m+kAh7SIregXua4q4dFrTX5EC
kvDa9b8ZvJn7oOCQryzRLBrUpBYUq9HVqnEiGUuZ8wHvYXL0DfBeaYQzaum9i2Y9Rz4O
5cEEXlGjl0kQ0rCnPB5QfIKzFqgSI3Dr4ZWU02QMYZlFX2ndy3iwQmZvKVtiY0+uCfej
QqzA==
X-Gm-Message-State: AJaThX5ylqCoDmC1vEk0XghZzR0+PDb526bgRX2hV/eatFwrAKTY0N5v
87LV1cEldvcnypBk67TxLDLBSa2iMt9SGhEmvhdlWg==
X-Google-Smtp-Source: AGs4zMYq8Nrno/icUrsRZ/N77SuhZSJvyjk+NnUtZE/UAfAwyI+jzpXSPa6Q05g7lomjy2Bf3Hl7Sqi+clpVEHF6NPc=
X-Received: by 10.55.182.129 with SMTP id g123mr47884663qkf.243.1511730681842;
Sun, 26 Nov 2017 13:11:21 -0800 (PST)
MIME-Version: 1.0
Received: by 10.200.29.17 with HTTP; Sun, 26 Nov 2017 13:11:21 -0800 (PST)
In-Reply-To: <20171126064927.GA68986@x2.osted.lan>
References: <201711252049.vAPKnRaA026691@repo.freebsd.org>
<20171126064927.GA68986@x2.osted.lan>
From: Mateusz Guzik <mjguzik@gmail.com>
Date: Sun, 26 Nov 2017 22:11:21 +0100
Message-ID: <CAGudoHGzi08_Th3DDkyMSWG006akL=fhF08SfZzgE2CBCA1H4Q@mail.gmail.com>
Subject: Re: svn commit: r326200 - head/sys/kern
To: Peter Holm <peter@holm.cc>
Cc: Mateusz Guzik <mjg@freebsd.org>, src-committers@freebsd.org,
svn-src-all@freebsd.org, svn-src-head@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.25
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 21:11:23 -0000
On Sun, Nov 26, 2017 at 7:49 AM, Peter Holm <peter@holm.cc> wrote:
> On Sat, Nov 25, 2017 at 08:49:27PM +0000, Mateusz Guzik wrote:
> > Author: mjg
> > Date: Sat Nov 25 20:49:27 2017
> > New Revision: 326200
> > URL: https://svnweb.freebsd.org/changeset/base/326200
> >
> > Log:
> > Add the missing lockstat check for thread lock.
> >
> > Modified:
> > head/sys/kern/kern_mutex.c
> >
> > Modified: head/sys/kern/kern_mutex.c
> > ============================================================
> ==================
> > --- head/sys/kern/kern_mutex.c Sat Nov 25 20:37:13 2017
> (r326199)
>
> Hi Mateusz,
>
> Could this be yours?
>
> spin lock 0xffffffff81ddc100 (turnstile chain) held by 0xfffff80014e57000
> (tid 100277) too long
> panic: spin lock held too long
> cpuid = 20
> time = 1511677687
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> 0xfffffe104f86ea40
> vpanic() at vpanic+0x268/frame 0xfffffe104f86eb10
> kproc_shutdown() at kproc_shutdown/frame 0xfffffe104f86eb70
> _mtx_lock_spin_failed() at _mtx_lock_spin_failed+0x87/frame
> 0xfffffe104f86eba0
> _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x4ba/frame
> 0xfffffe104f86ed10
> __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x21f/frame
> 0xfffffe104f86edb0
> turnstile_trywait() at turnstile_trywait+0x32/frame 0xfffffe104f86edd0
> __rw_rlock_hard() at __rw_rlock_hard+0x118/frame 0xfffffe104f86ee60
> __rw_rlock_int() at __rw_rlock_int+0xd5/frame 0xfffffe104f86ee90
> getblk() at getblk+0xdb/frame 0xfffffe104f86ef40
> breadn_flags() at breadn_flags+0x6e/frame 0xfffffe104f86eff0
> ffs_getcg() at ffs_getcg+0x20d/frame 0xfffffe104f86f0d0
> ffs_nodealloccg() at ffs_nodealloccg+0xd0/frame 0xfffffe104f86f210
> ffs_hashalloc() at ffs_hashalloc+0xb7/frame 0xfffffe104f86f290
> ffs_valloc() at ffs_valloc+0x1c1/frame 0xfffffe104f86f390
> ufs_makeinode() at ufs_makeinode+0xba/frame 0xfffffe104f86f520
> ufs_create() at ufs_create+0x34/frame 0xfffffe104f86f540
> VOP_CREATE_APV() at VOP_CREATE_APV+0x241/frame 0xfffffe104f86f5c0
> VOP_CREATE() at VOP_CREATE+0x59/frame 0xfffffe104f86f620
> vn_open_cred() at vn_open_cred+0x311/frame 0xfffffe104f86f770
> vn_open() at vn_open+0x4c/frame 0xfffffe104f86f7b0
> kern_openat() at kern_openat+0x212/frame 0xfffffe104f86f920
> syscallenter() at syscallenter+0x4e4/frame 0xfffffe104f86f9f0
> amd64_syscall() at amd64_syscall+0x4d/frame 0xfffffe104f86fab0
>
> https://people.freebsd.org/~pho/stress/log/mateusz004.txt
>
> - Peter
>
Fixed in r326237.
--
Mateusz Guzik <mjguzik gmail.com>
From owner-svn-src-all@freebsd.org Sun Nov 26 21:14:39 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11CF8DF0BCD;
Sun, 26 Nov 2017 21:14:39 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: from mail-qk0-x233.google.com (mail-qk0-x233.google.com
[IPv6:2607:f8b0:400d:c09::233])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id BFC9B7865E;
Sun, 26 Nov 2017 21:14:38 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: by mail-qk0-x233.google.com with SMTP id v137so30108777qkb.1;
Sun, 26 Nov 2017 13:14:38 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:cc; bh=ia+h9vrEgU/SZs78pAbsT9QeeNN3JmH23PO64UK6m1Q=;
b=dbsKtjKG4eT9cYuG/CiQA+vOXLvxjlz4oQiNIUqbbmtBJmeL5ehJLKmRvGpT522oz+
2GLKuZ1Y6D1hsmrJ37xiiWY/gv3S0YhlzAz/b/ngeEwa0R8O5BtrNwFbnE+rjJ1J78rm
HJA2HKQesekiwCiX6MRgYCxzFU11O64qPalqDa2R2o9Jwn0uHry2nUPKaekOyfna1aF3
rhUDOl3y0x9aRTUlgDKxgQgf769KyZJqbKYe5bmWf/BbEl0ni877oP20M5zJxcbyT+mw
PFasIt40J1IHf2vNfFS3asKzQShoLghcSoMzmkLA9Y8/DF0W/OmChKGonvGEip+b7xBk
2WJA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:in-reply-to:references:from:date
:message-id:subject:to:cc;
bh=ia+h9vrEgU/SZs78pAbsT9QeeNN3JmH23PO64UK6m1Q=;
b=jkwmlUztNk6jeRRPN1MJoenGwn1kgdGLmsfm92bQndngtzGgJ0InpBrnKskcCicaJX
U79gXSWjSJyB2EaJmN1pwebxaGqyFkSqWKC7AjJjsEBfm7CcltcOa7Ny8nJfdtGrbf1e
muOH835PzYLdTaFK+xk0gbt8avsHK5Y2wA+7Q3Zz6sh1b1KmCZsoqF8/LqfOv8MSpMhl
XI3W9t/IgUYZXkF+yMIW8MXhcO3XwcQln02syDGSFOuVWN3yxKQoNBYuczpHZokbJK9d
77k833rFoPu+fUvdB5zKnfXrowcyse9F9NIOJeEKrSirnDahchGmriS7n/VlTpOJTzmQ
rZjA==
X-Gm-Message-State: AJaThX5FEFcVDuCqfR8qRVdBrM5zSsKPzMVB8JK9eVTQdjWOD4kMlMsw
lyZgkiNekDiKNz7T52lCJxdUAKBZtnNCX4KbaMI=
X-Google-Smtp-Source: AGs4zMbtd5/qHgFYfNYwGO/GFfqe+NznxDbK/YAfDAq0aJeg1uDQHJWbVgSXgSZL62bAphjNhoFSpSyxuVe/oBQFDp4=
X-Received: by 10.55.127.71 with SMTP id a68mr9911993qkd.90.1511730877803;
Sun, 26 Nov 2017 13:14:37 -0800 (PST)
MIME-Version: 1.0
Received: by 10.200.29.17 with HTTP; Sun, 26 Nov 2017 13:14:37 -0800 (PST)
In-Reply-To: <201711262110.vAQLAmNF043213@repo.freebsd.org>
References: <201711262110.vAQLAmNF043213@repo.freebsd.org>
From: Mateusz Guzik <mjguzik@gmail.com>
Date: Sun, 26 Nov 2017 22:14:37 +0100
Message-ID: <CAGudoHF8xE1Sg0MUD5=uQ0sJGejFWCCwcp8vv6RK7HR3tTMRjA@mail.gmail.com>
Subject: Re: svn commit: r326237 - head/sys/kern
To: Mateusz Guzik <mjg@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.25
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Nov 2017 21:14:39 -0000
On Sun, Nov 26, 2017 at 10:10 PM, Mateusz Guzik <mjg@freebsd.org> wrote:
> Author: mjg
> Date: Sun Nov 26 21:10:47 2017
> New Revision: 326237
> URL: https://svnweb.freebsd.org/changeset/base/326237
>
> Log:
> rw: fix runlock_hard when new readers show up
>
> When waiters/writer spinner flags are set no new readers can show up
> unless
> they already have a different rw rock read locked. The change in r326195
> failed
> to take that into account - in presence of new readers it would spin
> until
> they all drain, which would be lead to trouble if e.g. they go off cpu
> and
> can get scheduled because of this thread.
>
>
Now that's an amazingly bad commit message. Typos and whatnot aside,
I of course meant they *can't* get on the cpu. The thread in runlock slow
path holds a spinlock and loops with it.
> Reported by: pho
>
> Modified:
> head/sys/kern/kern_rwlock.c
>
> Modified: head/sys/kern/kern_rwlock.c
> ============================================================
> ==================
> --- head/sys/kern/kern_rwlock.c Sun Nov 26 20:30:02 2017 (r326236)
> +++ head/sys/kern/kern_rwlock.c Sun Nov 26 21:10:47 2017 (r326237)
> @@ -769,6 +769,11 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td
> turnstile_chain_lock(&rw->lock_object);
> v = RW_READ_VALUE(rw);
> retry_ts:
> + if (__predict_false(RW_READERS(v) > 1)) {
> + turnstile_chain_unlock(&rw->lock_object);
> + continue;
> + }
> +
> v &= (RW_LOCK_WAITERS | RW_LOCK_WRITE_SPINNER);
> MPASS(v & RW_LOCK_WAITERS);
>
> _______________________________________________
> 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-unsubscribe@freebsd.org"
>
--
Mateusz Guzik <mjguzik gmail.com>
From owner-svn-src-all@freebsd.org Mon Nov 27 00:26:35 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 640A5DF45AD;
Mon, 27 Nov 2017 00:26:35 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 19F8D7CF80;
Mon, 27 Nov 2017 00:26:35 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR0QYqx026136;
Mon, 27 Nov 2017 00:26:34 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR0QYpR026135;
Mon, 27 Nov 2017 00:26:34 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711270026.vAR0QYpR026135@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 27 Nov 2017 00:26:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326238 - stable/11/share/man/man4
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/11/share/man/man4
X-SVN-Commit-Revision: 326238
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 00:26:35 -0000
Author: markj
Date: Mon Nov 27 00:26:33 2017
New Revision: 326238
URL: https://svnweb.freebsd.org/changeset/base/326238
Log:
MFC r319824 (by sevan), r320624, r326173:
Fixups for the lockstat provider man page.
Modified:
stable/11/share/man/man4/dtrace_lockstat.4
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man4/dtrace_lockstat.4
==============================================================================
--- stable/11/share/man/man4/dtrace_lockstat.4 Sun Nov 26 21:10:47 2017 (r326237)
+++ stable/11/share/man/man4/dtrace_lockstat.4 Mon Nov 27 00:26:33 2017 (r326238)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 9, 2017
+.Dd July 3, 2017
.Dt DTRACE_LOCKSTAT 4
.Os
.Sh NAME
@@ -54,198 +54,247 @@
.Sh DESCRIPTION
The DTrace
.Nm lockstat
-provider allows the tracing of events related to locking on FreeBSD.
+provider allows the tracing of events related to locking on
+.Fx .
.Pp
The
.Nm lockstat
-provider contains DTrace probe for inspecting the kernel's lock
+provider contains DTrace probes for inspecting the kernel's lock
state transitions.
-Tracepoints exist for several types of kernel
-locking primitives, including mutexes, spin, reader-writer,
-and shared exclusive locks.
-An attempt has been made to provide a regular and easy to understand
-interface to the
+Probes exist for the
+.Xr mutex 9 ,
+.Xr rwlock 9
+and
+.Xr sx 9
+lock types.
+The
+.Xr lockstat 1
+utility can be used to collect and display data collected from the
.Nm lockstat
provider.
-Each type of lock has an
+Each type of lock has
.Fn acquire
and
.Fn release
-probe which exposes the lock structure that is being operated upon.
+probes which expose the lock structure being operated upon,
+as well as probes which fire when a thread contends with other threads
+for ownership of a lock.
.Pp
-Whenever an MTX_DEF mutex is acquired the
-.Fn lockstat:::adaptive-acquire
-probe fires.
-The only argument is a pointer to the lock structure which describes
-the lock that is being acquired.
-.Pp
The
+.Fn lockstat:::adaptive-acquire
+and
.Fn lockstat:::adaptive-release
-probe fires whenever an adaptive lock is released.
+probes fire when an
+.Dv MTX_DEF
+.Xr mutex 9
+is acquired and released, respectively.
The only argument is a pointer to the lock structure which describes
-the lock that is being released.
+the lock being acquired or released.
.Pp
The
.Fn lockstat:::adaptive-spin
-probe fires when an adaptive lock is acquired.
+probe fires when a thread spins while waiting for a
+.Dv MTX_DEF
+.Xr mutex 9
+to be released by another thread.
The first argument is a pointer to the lock structure that describes
the lock and the second argument is the amount of time,
-in nanoseconds,
-that the mutex spent spinning.
-.Pp
+in nanoseconds, that the mutex spent spinning.
The
.Fn lockstat:::adaptive-block
-probe fires whenever thread takes itself off of the CPU
-while trying to acquire the lock.
+probe fires when a thread takes itself off the CPU while trying to acquire an
+.Dv MTX_DEF
+.Xr mutex 9
+that is owned by another thread.
The first argument is a pointer to the lock structure that describes
the lock and the second argument is the length of time,
-in nanoseconds,
-that the waiting thread was blocked.
-The
+in nanoseconds, that the waiting thread was blocked.
+The
.Fn lockstat:::adaptive-block
-probe fires only after the lock has been successfully acquired,
-after the adaptive-acquire probe fires.
-.Pp
-Whenever a spin mutex is acquired the
-.Fn lockstat:::spin-acquire
+and
+.Fn lockstat:::adaptive-spin
+probes fire only after the lock has been successfully acquired,
+and in particular, after the
+.Fn lockstat:::adaptive-acquire
probe fires.
-The only argument is a pointer to the lock structure which describes
-the lock that is being acquired.
.Pp
The
+.Fn lockstat:::spin-acquire
+and
.Fn lockstat:::spin-release
-probe fires whenever a spin mutex is released.
+probes fire when a
+.Dv MTX_SPIN
+.Xr mutex 9
+is acquired and released, respectively.
The only argument is a pointer to the lock structure which describes
-the lock that is being released.
+the lock being acquired or released.
.Pp
The
.Fn lockstat:::spin-spin
-probe fires when a thread stops spinning waiting for a spin mutex.
+probe fires when a thread spins while waiting for a
+.Dv MTX_SPIN
+.Xr mutex 9
+to be released by another thread.
The first argument is a pointer to the lock structure that describes
the lock and the second argument is the length of the time
spent spinning, in nanoseconds.
-.Pp
-Whenever a reader-writer lock is acquired the
-.Fn lockstat:::rw-acquire
+The
+.Fn lockstat:::spin-spin
+probe fires only after the lock has been successfully acquired,
+and in particular, after the
+.Fn lockstat:::spin-acquire
probe fires.
-The only argument is a pointer to the structure which describes
-the lock that is being acquired.
.Pp
The
+.Fn lockstat:::rw-acquire
+and
.Fn lockstat:::rw-release
-probe fires whenever a reader-writer lock is released.
+probes fire when a
+.Xr rwlock 9
+is acquired and released, respectively.
+The first argument is a pointer to the structure which describes
+the lock being acquired.
+The second argument is
+.Dv 0
+if the lock is being acquired or released as a writer, and
+.Dv 1
+if it is being acquired or released as a reader.
.Pp
The
.Fn lockstat:::rw-block
-probe fires whenever a thread removes itself from the CPU while
-waiting to acquire the lock.
-The first argument is a pointer to the lock structure that describes
-the lock and the second argument is the length of time,
-in nanoseconds,
-that the waiting thread was blocked.
-The third argument is 1 if the thread was were spinning while
-trying to acquire a read lock,
-otherwise it will be 0 indicating that we were spinning for the write lock.
-The fourth argument is 1 if we were waiting for a reader to release the lock,
-otherwise it will be 0 indicating that we were waiting for a writer
-to release the lock.
-The fifth argument is the number of readers that held the lock when
-we started spinning; in particular, argument 5 is non-zero only
-if the fourth argument is 1.
-.Pp
+probe fires when a thread removes itself from the CPU while
+waiting to acquire a
+.Xr rwlock 9 .
The
.Fn lockstat:::rw-spin
-probe fires when a reader-writer lock takes itself off the CPU
-while waiting for the lock.
+probe fires when a thread spins while waiting to acquire a
+.Xr rwlock 9 .
+Both probes take the same set of arguments.
The first argument is a pointer to the lock structure that describes
-the lock and the second argument returns an integer count of the
-number of spins that were completed.
+the lock.
+The second argument is the length of time, in nanoseconds,
+that the waiting thread was off the CPU or spinning for the lock.
+The third argument is
+.Dv 0
+if the thread is attempting to acquire the lock as a writer, and
+.Dv 1
+if the thread is attempting to acquire the lock as a reader.
+The fourth argument is
+.Dv 0
+if the thread is waiting for a writer to release the lock, and
+.Dv 1
+if the thread is waiting for a reader to release the lock.
+The fifth argument is the number of readers that held the lock when
+the thread first attempted to acquire the lock.
+This argument will be
+.Dv 0
+if the fourth argument is
+.Dv 0 .
.Pp
The
.Fn lockstat:::rw-upgrade
-probe fires whenever a thread tries to upgrade a lock from a
+probe fires when a thread successfully upgrades a held
+.Xr rwlock 9
read lock to a write lock.
-The only argument is a pointer to the structure which describes
-the lock that is being acquired.
-.Pp
+The
.Fn lockstat:::rw-downgrade
-probe fires whenever a thread tries downgrades a lock from a
-read and write lock to a read lock.
+probe fires when a thread downgrades a held
+.Xr rwlock 9
+write lock to a read lock.
The only argument is a pointer to the structure which describes
-the lock that is being acquired.
+the lock being acquired.
.Pp
-Whenever a shared-exclusive lock is acquired the
-.Fn lockstat:::sx-acquire
-probe fires.
-The only argument is a pointer to the structure which describes
-the lock that is being acquired.
-.Pp
The
+.Fn lockstat:::sx-acquire
+and
.Fn lockstat:::sx-release
-probe fires whenever an adaptive lock is released.
-The only argument is a pointer to the lock structure which describes
-the lock that is being released.
+probes fire when a
+.Xr sx 9
+is acquired and released, respectively.
+The first argument is a pointer to the structure which describes
+the lock being acquired.
+The second argument is
+.Dv 0
+if the shared lock is being acquired or released, and
+.Dv 1
+if the exclusive lock is being acquired or released.
.Pp
The
.Fn lockstat:::sx-block
-probe fires whenever a thread takes itself off the CPU while
-waiting for the lock.
-The first argument is a pointer to the structure that describes
-the lock and the second argument is the length of time,
-in nanoseconds,
-that the waiting thread was blocked.
-The third argument is 1 if the thread was were spinning while
-trying to acquire a read lock,
-otherwise it will be 0 indicating that we were spinning for the write lock.
-The fourth argument is 1 if we were waiting for a reader to release the lock,
-otherwise it will be 0 indicating that we were waiting for a writer
-to release the lock.
-The fifth argument is the number of readers that held the lock when
-we started spinning; in particular, argument 5 is non-zero only
-if the fourth argument is 1.
-.Pp
+probe fires when a thread takes itself off the CPU while
+waiting to acquire a
+.Xr sx 9 .
The
.Fn lockstat:::sx-spin
-probe fires when a thread takes itself off of the CPU while
-waiting for the lock.
-The first argument is a pointer to the structure that describes
-the lock and the second argument returns an integer count of the
-number of spins that were completed.
+probe fires when a thread spins while waiting to acquire a
+.Xr sx 9 .
+Both probes take the same set of arguments.
+The first argument is a pointer to the lock structure that describes
+the lock.
+The second argument is the length of time, in nanoseconds,
+that the waiting thread was off the CPU or spinning for the lock.
+The third argument is
+.Dv 0
+if the thread is attempting to acquire the lock as a writer, and
+.Dv 1
+if the thread is attempting to acquire the lock as a reader.
+The fourth argument is
+.Dv 0
+if the thread is waiting for a writer to release the lock, and
+.Dv 1
+if the thread is waiting for a reader to release the lock.
+The fifth argument is the number of readers that held the lock when
+the thread first attempted to acquire the lock.
+This argument will be
+.Dv 0
+if the fourth argument is
+.Dv 0 .
.Pp
The
.Fn lockstat:::sx-upgrade
-probe fires whenever a thread tries to upgrade a lock from a
-shared lock to a shared-exclusive lock.
+probe fires when a thread successfully upgrades a held
+.Xr sx 9
+shared lock to an exclusive lock.
The only argument is a pointer to the structure which describes
-the lock that is being upgraded.
-.Pp
+the lock being acquired.
The
.Fn lockstat:::sx-downgrade
-probe fires whenever a thread downgrades a lock from a
-shared-exclusive lock to a shared lock.
-The only argument is a pointer to the structure which describes
-the lock that is being downgraded.
+probe fires when a thread downgrades a held
+.Xr sx 9
+exclusive lock to a shared lock.
.Pp
The
.Fn lockstat:::thread-spin
-probe fires whenever a thread spins on a spin lock.
+probe fires when a thread spins on a thread lock, which is a specialized
+.Dv MTX_SPIN
+.Xr mutex 9 .
The first argument is a pointer to the structure that describes
the lock and the second argument is the length of time,
-in nanoseconds,
-that the thread was spinning.
+in nanoseconds, that the thread was spinning.
.Sh SEE ALSO
.Xr dtrace 1 ,
.Xr lockstat 1 ,
.Xr locking 9 ,
+.Xr mutex 9 ,
+.Xr rwlock 9 ,
.Xr SDT 9 ,
+.Xr sx 9
.Sh HISTORY
The
.Nm lockstat
-provider first appeared in OpenSolaris.
-The FreeBSD implementation of the
+provider first appeared in Solaris.
+The
+.Fx
+implementation of the
.Nm lockstat
provider first appeared in
.Fx 9.
.Sh AUTHORS
This manual page was written by
.An George V. Neville-Neil Aq Mt gnn@FreeBSD.org .
+.Sh BUGS
+Probes for
+.Xr lockmgr 9
+and
+.Xr rmlock 9
+locks have not yet been added.
From owner-svn-src-all@freebsd.org Mon Nov 27 02:28:41 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D43C1DF63EE;
Mon, 27 Nov 2017 02:28:41 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A17937FB09;
Mon, 27 Nov 2017 02:28:41 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR2SeCi075496;
Mon, 27 Nov 2017 02:28:40 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR2Se0s075495;
Mon, 27 Nov 2017 02:28:40 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201711270228.vAR2Se0s075495@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Mon, 27 Nov 2017 02:28:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326239 - head/tools
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/tools
X-SVN-Commit-Revision: 326239
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 02:28:41 -0000
Author: brd (doc,ports committer)
Date: Mon Nov 27 02:28:40 2017
New Revision: 326239
URL: https://svnweb.freebsd.org/changeset/base/326239
Log:
Fix handling -U. It does not take any arguments.
Approved by: will
Modified:
head/tools/install.sh
Modified: head/tools/install.sh
==============================================================================
--- head/tools/install.sh Mon Nov 27 00:26:33 2017 (r326238)
+++ head/tools/install.sh Mon Nov 27 02:28:40 2017 (r326239)
@@ -34,9 +34,9 @@ linkmode=""
while [ $# -gt 0 ]; do
case $1 in
-d) dirmode="YES"; shift;;
- -[bCcpSsv]) shift;;
- -[BDfghMmNoTU]) shift; shift;;
- -[BDfghMmNoTU]*) shift;;
+ -[bCcpSsUv]) shift;;
+ -[BDfghMmNoT]) shift; shift;;
+ -[BDfghMmNoT]*) shift;;
-l)
shift
case $1 in
From owner-svn-src-all@freebsd.org Mon Nov 27 02:43:28 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C216FDF6839;
Mon, 27 Nov 2017 02:43:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8EA2F8026A;
Mon, 27 Nov 2017 02:43:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR2hRLU083872;
Mon, 27 Nov 2017 02:43:27 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR2hRtD083871;
Mon, 27 Nov 2017 02:43:27 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711270243.vAR2hRtD083871@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 02:43:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326240 - stable/11/lib/libc/iconv
X-SVN-Group: stable-11
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: stable/11/lib/libc/iconv
X-SVN-Commit-Revision: 326240
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 02:43:28 -0000
Author: pfg
Date: Mon Nov 27 02:43:27 2017
New Revision: 326240
URL: https://svnweb.freebsd.org/changeset/base/326240
Log:
MFC r326028:
iconv: Fix a pointer mismatch.
Catch NULL pointer earlier, check for empty string later.
Apparently this fixes a GCC8 warning.
Obtained from: NetBSD (CVS Rev. 1.21, 1.22) through DragonFlyBSD
Modified:
stable/11/lib/libc/iconv/citrus_none.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libc/iconv/citrus_none.c
==============================================================================
--- stable/11/lib/libc/iconv/citrus_none.c Mon Nov 27 02:28:40 2017 (r326239)
+++ stable/11/lib/libc/iconv/citrus_none.c Mon Nov 27 02:43:27 2017 (r326240)
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/* $NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $ */
+/* $NetBSD: citrus_none.c,v 1.22 2017/07/13 16:00:30 christos Exp $ */
/*-
* Copyright (c) 2002 Citrus Project,
@@ -164,7 +164,7 @@ _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __r
struct iconv_hooks *hooks)
{
- if (s == NULL) {
+ if (*s == NULL) {
*nresult = 0;
return (0);
}
@@ -176,7 +176,7 @@ _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __r
if (pwc != NULL)
*pwc = (_wc_t)(unsigned char) **s;
- *nresult = *s == '\0' ? 0 : 1;
+ *nresult = **s == '\0' ? 0 : 1;
if ((hooks != NULL) && (hooks->wc_hook != NULL))
hooks->wc_hook(*pwc, hooks->data);
From owner-svn-src-all@freebsd.org Mon Nov 27 02:44:37 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8906DF68E3;
Mon, 27 Nov 2017 02:44:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 74F57803DC;
Mon, 27 Nov 2017 02:44:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR2ia7U083968;
Mon, 27 Nov 2017 02:44:36 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR2ia0h083967;
Mon, 27 Nov 2017 02:44:36 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711270244.vAR2ia0h083967@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 02:44:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326241 - stable/10/lib/libc/iconv
X-SVN-Group: stable-10
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: stable/10/lib/libc/iconv
X-SVN-Commit-Revision: 326241
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 02:44:37 -0000
Author: pfg
Date: Mon Nov 27 02:44:36 2017
New Revision: 326241
URL: https://svnweb.freebsd.org/changeset/base/326241
Log:
MFC r326028:
iconv: Fix a pointer mismatch.
Catch NULL pointer earlier, check for empty string later.
Apparently this fixes a GCC8 warning.
Obtained from: NetBSD (CVS Rev. 1.21, 1.22) through DragonFlyBSD
Modified:
stable/10/lib/libc/iconv/citrus_none.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/iconv/citrus_none.c
==============================================================================
--- stable/10/lib/libc/iconv/citrus_none.c Mon Nov 27 02:43:27 2017 (r326240)
+++ stable/10/lib/libc/iconv/citrus_none.c Mon Nov 27 02:44:36 2017 (r326241)
@@ -164,7 +164,7 @@ _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __r
struct iconv_hooks *hooks)
{
- if (s == NULL) {
+ if (*s == NULL) {
*nresult = 0;
return (0);
}
@@ -176,7 +176,7 @@ _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __r
if (pwc != NULL)
*pwc = (_wc_t)(unsigned char) **s;
- *nresult = *s == '\0' ? 0 : 1;
+ *nresult = **s == '\0' ? 0 : 1;
if ((hooks != NULL) && (hooks->wc_hook != NULL))
hooks->wc_hook(*pwc, hooks->data);
From owner-svn-src-all@freebsd.org Mon Nov 27 03:35:28 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77267DF76B0;
Mon, 27 Nov 2017 03:35:28 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail106.syd.optusnet.com.au (mail106.syd.optusnet.com.au
[211.29.132.42])
by mx1.freebsd.org (Postfix) with ESMTP id 414E01F25;
Mon, 27 Nov 2017 03:35:27 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail106.syd.optusnet.com.au (Postfix) with ESMTPS id 8F01A3C3F80;
Mon, 27 Nov 2017 14:35:20 +1100 (AEDT)
Date: Mon, 27 Nov 2017 14:35:19 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Edward Tomasz Napierala <trasz@freebsd.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326125 - head/usr.sbin/kgmon
In-Reply-To: <20171126195401.GA3787@brick>
Message-ID: <20171127141834.V1162@besplex.bde.org>
References: <201711231241.vANCf58n091345@repo.freebsd.org>
<20171124002239.T1335@besplex.bde.org> <20171126195401.GA3787@brick>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=cK6QihWN c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=1PkGfIDIAAAA:8 a=4mXlgclT9S5zBQdJ5p4A:9
a=CjuIK1q_8ugA:10 a=4u2QYngNSdgA:10 a=jcL-Sa2L8s019nTZ0LyB:22
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 03:35:28 -0000
On Sun, 26 Nov 2017, Edward Tomasz Napierala wrote:
> On 1124T0138, Bruce Evans wrote:
>> On Thu, 23 Nov 2017, Edward Tomasz Napierala wrote:
>>
>>> Log:
>>> Mark kgmon(8) obsolete, redirecting users to pmcstat(8).
>>
>> It isn't obsolete. pmcstat can't do at least full (non-statistical)
>> call graphs and high-resolution profiling.
>
> [snip detailed explanation]
>
> Thanks. Based on your arguments (and on the fact that I've tried
> again to use it, following instructions from the URL below[1], and
> this time it actually worked), I think I'll revert this commit,
> and just add an ".Xr pmcstat 8" instead.
Thanks.
> 1. http://lserinol.blogspot.co.uk/2009/01/freebsd-kernel-profiling-with-kgmon.html
This is very basic (only the about confinguration), but that makes it short
enough to put in a section 4 man page or just in kgdb(8). I don't know of
any tutorial for how to use either kgmon or pmcstat.
Bruce
From owner-svn-src-all@freebsd.org Mon Nov 27 03:47:13 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1689DF7931;
Mon, 27 Nov 2017 03:47:13 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6E13E2478;
Mon, 27 Nov 2017 03:47:13 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR3lCVJ009990;
Mon, 27 Nov 2017 03:47:12 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR3lC8U009989;
Mon, 27 Nov 2017 03:47:12 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711270347.vAR3lC8U009989@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 27 Nov 2017 03:47:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326242 - stable/11/sys/kern
X-SVN-Group: stable-11
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: stable/11/sys/kern
X-SVN-Commit-Revision: 326242
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 03:47:13 -0000
Author: delphij
Date: Mon Nov 27 03:47:12 2017
New Revision: 326242
URL: https://svnweb.freebsd.org/changeset/base/326242
Log:
MFC r325755: Be more careful when doing calculation with request from
userland.
Modified:
stable/11/sys/kern/kern_proc.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/kern_proc.c
==============================================================================
--- stable/11/sys/kern/kern_proc.c Mon Nov 27 02:44:36 2017 (r326241)
+++ stable/11/sys/kern/kern_proc.c Mon Nov 27 03:47:12 2017 (r326242)
@@ -1933,7 +1933,7 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
if (error != 0 || req->newptr == NULL)
return (error);
- if (req->newlen + sizeof(struct pargs) > ps_arg_cache_limit)
+ if (req->newlen > ps_arg_cache_limit - sizeof(struct pargs))
return (ENOMEM);
newpa = pargs_alloc(req->newlen);
error = SYSCTL_IN(req, newpa->ar_args, req->newlen);
From owner-svn-src-all@freebsd.org Mon Nov 27 03:49:52 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D96DCDF7AB6;
Mon, 27 Nov 2017 03:49:52 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A60A2270C;
Mon, 27 Nov 2017 03:49:52 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR3npvd010122;
Mon, 27 Nov 2017 03:49:51 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR3npp1010121;
Mon, 27 Nov 2017 03:49:51 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711270349.vAR3npp1010121@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 27 Nov 2017 03:49:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326243 - stable/10/sys/kern
X-SVN-Group: stable-10
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: stable/10/sys/kern
X-SVN-Commit-Revision: 326243
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 03:49:53 -0000
Author: delphij
Date: Mon Nov 27 03:49:51 2017
New Revision: 326243
URL: https://svnweb.freebsd.org/changeset/base/326243
Log:
MFC r325755: Be more careful when doing calculation with request from
userland.
Modified:
stable/10/sys/kern/kern_proc.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_proc.c
==============================================================================
--- stable/10/sys/kern/kern_proc.c Mon Nov 27 03:47:12 2017 (r326242)
+++ stable/10/sys/kern/kern_proc.c Mon Nov 27 03:49:51 2017 (r326243)
@@ -1858,7 +1858,7 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
if (error != 0 || req->newptr == NULL)
return (error);
- if (req->newlen + sizeof(struct pargs) > ps_arg_cache_limit)
+ if (req->newlen > ps_arg_cache_limit - sizeof(struct pargs))
return (ENOMEM);
newpa = pargs_alloc(req->newlen);
error = SYSCTL_IN(req, newpa->ar_args, req->newlen);
From owner-svn-src-all@freebsd.org Mon Nov 27 04:15:04 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B71C8DF822E;
Mon, 27 Nov 2017 04:15:04 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 806C6323E;
Mon, 27 Nov 2017 04:15:04 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR4F3xr022232;
Mon, 27 Nov 2017 04:15:03 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR4F3o9022231;
Mon, 27 Nov 2017 04:15:03 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711270415.vAR4F3o9022231@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 27 Nov 2017 04:15:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326244 - head/usr.sbin/inetd
X-SVN-Group: head
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: head/usr.sbin/inetd
X-SVN-Commit-Revision: 326244
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 04:15:04 -0000
Author: delphij
Date: Mon Nov 27 04:15:03 2017
New Revision: 326244
URL: https://svnweb.freebsd.org/changeset/base/326244
Log:
Don't assign rs as we will assign it later.
MFC after: 2 weeks
Modified:
head/usr.sbin/inetd/builtins.c
Modified: head/usr.sbin/inetd/builtins.c
==============================================================================
--- head/usr.sbin/inetd/builtins.c Mon Nov 27 03:49:51 2017 (r326243)
+++ head/usr.sbin/inetd/builtins.c Mon Nov 27 04:15:03 2017 (r326244)
@@ -166,10 +166,8 @@ chargen_stream(int s, struct servtab *sep)
inetd_setproctitle(sep->se_service, s);
- if (!endring) {
+ if (!endring)
initring();
- rs = ring;
- }
text[LINESIZ] = '\r';
text[LINESIZ + 1] = '\n';
From owner-svn-src-all@freebsd.org Mon Nov 27 04:24:49 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D51DEDF8553;
Mon, 27 Nov 2017 04:24:49 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9C1643731;
Mon, 27 Nov 2017 04:24:49 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR4OmaJ026428;
Mon, 27 Nov 2017 04:24:48 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR4OmJp026427;
Mon, 27 Nov 2017 04:24:48 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201711270424.vAR4OmJp026427@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Mon, 27 Nov 2017 04:24:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326245 - head
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head
X-SVN-Commit-Revision: 326245
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 04:24:49 -0000
Author: brd (doc,ports committer)
Date: Mon Nov 27 04:24:48 2017
New Revision: 326245
URL: https://svnweb.freebsd.org/changeset/base/326245
Log:
Fix another typo
Pointy hat to: oshogbo
Modified:
head/ObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Mon Nov 27 04:15:03 2017 (r326244)
+++ head/ObsoleteFiles.inc Mon Nov 27 04:24:48 2017 (r326245)
@@ -38,7 +38,7 @@
# xargs -n1 | sort | uniq -d;
# done
-# 20171118: Remove old etc capser files
+# 20171118: Remove old etc casper files
OLD_FILES+=etc/casper/system.dns
OLD_FILES+=etc/casper/system.grp
OLD_FILES+=etc/casper/system.pwd
From owner-svn-src-all@freebsd.org Mon Nov 27 04:29:59 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E782CDF8645;
Mon, 27 Nov 2017 04:29:59 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au
[211.29.132.80])
by mx1.freebsd.org (Postfix) with ESMTP id A990C38BD;
Mon, 27 Nov 2017 04:29:58 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id 60C64D615D5;
Mon, 27 Nov 2017 15:29:51 +1100 (AEDT)
Date: Mon, 27 Nov 2017 15:29:51 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Andrew Turner <andrew@freebsd.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326225 - head/sys/arm64/arm64
In-Reply-To: <201711260929.vAQ9TYpk047843@repo.freebsd.org>
Message-ID: <20171127143528.J1162@besplex.bde.org>
References: <201711260929.vAQ9TYpk047843@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=KeqiiUQD c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=cgg7eyTytd09u3vOAx0A:9 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 04:30:00 -0000
On Sun, 26 Nov 2017, Andrew Turner wrote:
> Log:
> Make the arm64 pmap_invalidate functions static inline. This fixes building
> with DIAGNOSTIC.
This is fairly broken on x86 too.
> Modified: head/sys/arm64/arm64/pmap.c
> ==============================================================================
> --- head/sys/arm64/arm64/pmap.c Sun Nov 26 06:31:34 2017 (r326224)
> +++ head/sys/arm64/arm64/pmap.c Sun Nov 26 09:29:34 2017 (r326225)
> @@ -896,7 +896,7 @@ SYSCTL_ULONG(_vm_pmap_l2, OID_AUTO, promotions, CTLFLA
> /*
> * Invalidate a single TLB entry.
> */
> -PMAP_INLINE void
> +static __inline void
> pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
PMAP_INLINE is now only used once on arm64 (for pmap_kremove). It gives
a small optimization or pessimization by inlining, but is fragile and
broken in some cases.
In the DIAGNOSTIC case, it is usually or always defined as empty. This is
silly. It does nothing except insignificantly simplify debugging and
expose the 2 bugs fixed in this commit. These bugs are:
- on arm64, the pmap_invalidate*() functions are not declared in a header
file or used outside of pmap.c, but they were declared as gnu
[implicit-extern] inline for the reachable !DIAGNOSTIC case.
- complier bug: compilers don't detect the error that extern functions
are not prototyped before they are defined in the gnu [implicit-extern]
inline case
The bugs are exposed by the DIAGNOSTIC case. Then the functions are
plain implicit-extern.
There is also an unreachable !DIAGNOSTIC case for non-gcc compatible
compilers. On x86 and arm64, this uses explicit-extern inline. This
gives C99 extern inline, which is confusing and probably doesn't worked.
If it worked, then it might be used instead of forcing gnu implicit-extern
inline if possible.
Plain arm is quite different:
arm/pmap-v4.c defines PMAP_INLINE as plain implicit-extern __inline in the
!PMAP_DEBUG case. But this macro is completely different than the one of
the same name in most other pmap files. It is only used when preceded by
'static', and thus is just for debugging, while its normal use is for
inlining public functions. Some static functions are inlined without this
obfuscation. i386 had the same obfuscation and more in FreeBSD-4 (it also
used PMAP_INLINE for extern functions).
arm/pmap-v6.c is more like arm64/pmap.c. It ifdefs on DIAGNOSTIC but gives
plain implicit-extern C99 __inline only for extern functions where arm64
gives gnu implicit-extern non-C99 inline.
There are also style bugs. Most places use __inline, but arm64 uses inline.
amd64/pmap.c uses __inline except twice for PMAP_INLINE and once for
pmap_unwire_ptp().
Bruce
From owner-svn-src-all@freebsd.org Mon Nov 27 04:55:03 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5A4ADF8D90;
Mon, 27 Nov 2017 04:55:03 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7B8016381F;
Mon, 27 Nov 2017 04:55:02 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
[73.231.226.104])
by mail.baldwin.cx (Postfix) with ESMTPSA id 7F02E10A7DB;
Sun, 26 Nov 2017 23:54:56 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326218 - head/sys/kern
Date: Sun, 26 Nov 2017 20:50:12 -0800
Message-ID: <3170692.kvv90QqB0X@ralph.baldwin.cx>
User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; )
In-Reply-To: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3
(mail.baldwin.cx); Sun, 26 Nov 2017 23:54:56 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx
X-Virus-Status: Clean
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 04:55:03 -0000
On Saturday, November 25, 2017 11:41:05 PM Nathan Whitehorn wrote:
> Author: nwhitehorn
> Date: Sat Nov 25 23:41:05 2017
> New Revision: 326218
> URL: https://svnweb.freebsd.org/changeset/base/326218
>
> Log:
> Remove some, but not all, assumptions that the BSP is CPU 0 and that CPUs
> are numbered densely from there to n_cpus.
>
> MFC after: 1 month
>
> Modified:
> head/sys/kern/kern_clock.c
> head/sys/kern/kern_clocksource.c
> head/sys/kern/kern_shutdown.c
> head/sys/kern/kern_timeout.c
> head/sys/kern/sched_ule.c
> head/sys/kern/subr_pcpu.c
>
> Modified: head/sys/kern/kern_clock.c
> ==============================================================================
> --- head/sys/kern/kern_clock.c Sat Nov 25 23:23:24 2017 (r326217)
> +++ head/sys/kern/kern_clock.c Sat Nov 25 23:41:05 2017 (r326218)
> @@ -573,7 +573,9 @@ hardclock_cnt(int cnt, int usermode)
> void
> hardclock_sync(int cpu)
> {
> - int *t = DPCPU_ID_PTR(cpu, pcputicks);
> + int *t;
> + KASSERT(!CPU_ABSENT(cpu), ("Absent CPU %d", cpu));
Blank line before the KASSERT() perhaps?
> + t = DPCPU_ID_PTR(cpu, pcputicks);
>
> *t = ticks;
Probably don't need this blank line though?
> }
>
> Modified: head/sys/kern/sched_ule.c
> ==============================================================================
> --- head/sys/kern/sched_ule.c Sat Nov 25 23:23:24 2017 (r326217)
> +++ head/sys/kern/sched_ule.c Sat Nov 25 23:41:05 2017 (r326218)
> @@ -2444,6 +2451,7 @@ sched_add(struct thread *td, int flags)
> * Pick the destination cpu and if it isn't ours transfer to the
> * target cpu.
> */
> + td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
> cpu = sched_pickcpu(td, flags);
It is not obvious why every sched_add() needs this once you've fixed thread0.
Shouldn't new threads just inherit from thread0's already-fixed value? If not,
perhaps fix thread0's value sooner?
> tdq = sched_setcpu(td, cpu, flags);
> tdq_add(tdq, td, flags);
>
> Modified: head/sys/kern/subr_pcpu.c
> ==============================================================================
> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 (r326217)
> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 (r326218)
> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
> struct pcpu *
> pcpu_find(u_int cpuid)
> {
> + KASSERT(cpuid_to_pcpu[cpuid] != NULL,
> + ("Getting uninitialized PCPU %d", cpuid));
This KASSERT seems unnecessary? If the caller uses an invalid one, it will
just fault anyway.
> return (cpuid_to_pcpu[cpuid]);
> }
> @@ -409,7 +411,7 @@ DB_SHOW_ALL_COMMAND(pcpu, db_show_cpu_all)
> int id;
>
> db_printf("Current CPU: %d\n\n", PCPU_GET(cpuid));
> - for (id = 0; id <= mp_maxid; id++) {
> + CPU_FOREACH(id) {
If you remove the KASSERT you don't need this change since it checks the return
value of pcpu_find() (which you didn't change). In particular, this DDB command
shows all valid pcpu structures safely even if that set is inconsistent with
the all_cpus mask (or the old version did at least). There is also nothing about
this that assumes BSP == 0 either. CPU_FOREACH() is doing a loop from 0 to
mp_maxid under the covers as well.
> pc = pcpu_find(id);
> if (pc != NULL) {
> show_pcpu(pc);
>
--
John Baldwin
From owner-svn-src-all@freebsd.org Mon Nov 27 06:07:05 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEA5FDF9FE3;
Mon, 27 Nov 2017 06:07:05 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id AB6AE654B9;
Mon, 27 Nov 2017 06:07:05 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from comporellon.tachypleus.net (cpe-75-82-218-62.socal.res.rr.com
[75.82.218.62]) (authenticated bits=0)
by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id vAR66upx031049
(version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
Sun, 26 Nov 2017 22:06:57 -0800
Subject: Re: svn commit: r326218 - head/sys/kern
To: John Baldwin <jhb@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<3170692.kvv90QqB0X@ralph.baldwin.cx>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <abfdf2b1-bb2f-4eb1-a448-bfee68158577@freebsd.org>
Date: Sun, 26 Nov 2017 22:06:56 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <3170692.kvv90QqB0X@ralph.baldwin.cx>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Sonic-CAuth: UmFuZG9tSVagWHczlbvJRDm0AMTcXUN6Kw+98q+0DBDpaFwCBJt2AgHb44cMcM/ocXU1FFaS0eV9YTuzYL6mICnGBZoOrrubOnA7STh6Cfw=
X-Sonic-ID: C;UKBqLDnT5xGY9+snWtmBlw== M;nGbLLDnT5xGY9+snWtmBlw==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 06:07:05 -0000
On 11/26/17 20:50, John Baldwin wrote:
> On Saturday, November 25, 2017 11:41:05 PM Nathan Whitehorn wrote:
>> Author: nwhitehorn
>> Date: Sat Nov 25 23:41:05 2017
>> New Revision: 326218
>> URL: https://svnweb.freebsd.org/changeset/base/326218
>>
>> Log:
>> Remove some, but not all, assumptions that the BSP is CPU 0 and that CPUs
>> are numbered densely from there to n_cpus.
>>
>> MFC after: 1 month
>>
>> Modified:
>> head/sys/kern/kern_clock.c
>> head/sys/kern/kern_clocksource.c
>> head/sys/kern/kern_shutdown.c
>> head/sys/kern/kern_timeout.c
>> head/sys/kern/sched_ule.c
>> head/sys/kern/subr_pcpu.c
>>
>> Modified: head/sys/kern/kern_clock.c
>> ==============================================================================
>> --- head/sys/kern/kern_clock.c Sat Nov 25 23:23:24 2017 (r326217)
>> +++ head/sys/kern/kern_clock.c Sat Nov 25 23:41:05 2017 (r326218)
>> @@ -573,7 +573,9 @@ hardclock_cnt(int cnt, int usermode)
>> void
>> hardclock_sync(int cpu)
>> {
>> - int *t = DPCPU_ID_PTR(cpu, pcputicks);
>> + int *t;
>> + KASSERT(!CPU_ABSENT(cpu), ("Absent CPU %d", cpu));
> Blank line before the KASSERT() perhaps?
>
>> + t = DPCPU_ID_PTR(cpu, pcputicks);
>>
>> *t = ticks;
> Probably don't need this blank line though?
Those are both good ideas.
>
>> }
>>
>> Modified: head/sys/kern/sched_ule.c
>> ==============================================================================
>> --- head/sys/kern/sched_ule.c Sat Nov 25 23:23:24 2017 (r326217)
>> +++ head/sys/kern/sched_ule.c Sat Nov 25 23:41:05 2017 (r326218)
>> @@ -2444,6 +2451,7 @@ sched_add(struct thread *td, int flags)
>> * Pick the destination cpu and if it isn't ours transfer to the
>> * target cpu.
>> */
>> + td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
>> cpu = sched_pickcpu(td, flags);
> It is not obvious why every sched_add() needs this once you've fixed thread0.
> Shouldn't new threads just inherit from thread0's already-fixed value? If not,
> perhaps fix thread0's value sooner?
That's a fair point. I don't remember the rationale for this now; the
changes are over a year old from the powernv branch. I do remember
setting thread0's CPU early not working, but have forgotten why. I will
try to remember...
>> tdq = sched_setcpu(td, cpu, flags);
>> tdq_add(tdq, td, flags);
>>
>> Modified: head/sys/kern/subr_pcpu.c
>> ==============================================================================
>> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 (r326217)
>> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 (r326218)
>> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
>> struct pcpu *
>> pcpu_find(u_int cpuid)
>> {
>> + KASSERT(cpuid_to_pcpu[cpuid] != NULL,
>> + ("Getting uninitialized PCPU %d", cpuid));
> This KASSERT seems unnecessary? If the caller uses an invalid one, it will
> just fault anyway.
It won't necessarily fault. For example, on PowerPC, NULL is a valid
address that does not trigger faults. It's unfortunately quite
complicated to fix this in a general way. Even if it did fault, this
makes the fault more informative (and has found at least one bug on
arm64 already).
>
>> return (cpuid_to_pcpu[cpuid]);
>> }
>> @@ -409,7 +411,7 @@ DB_SHOW_ALL_COMMAND(pcpu, db_show_cpu_all)
>> int id;
>>
>> db_printf("Current CPU: %d\n\n", PCPU_GET(cpuid));
>> - for (id = 0; id <= mp_maxid; id++) {
>> + CPU_FOREACH(id) {
> If you remove the KASSERT you don't need this change since it checks the return
> value of pcpu_find() (which you didn't change). In particular, this DDB command
> shows all valid pcpu structures safely even if that set is inconsistent with
> the all_cpus mask (or the old version did at least). There is also nothing about
> this that assumes BSP == 0 either. CPU_FOREACH() is doing a loop from 0 to
> mp_maxid under the covers as well.
True. CPU_FOREACH just seemed simpler here and future-proof if it ever
started doing something more complex.
-Nathan
>
>> pc = pcpu_find(id);
>> if (pc != NULL) {
>> show_pcpu(pc);
>>
>
From owner-svn-src-all@freebsd.org Mon Nov 27 06:49:50 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E6ACDFA993;
Mon, 27 Nov 2017 06:49:50 +0000 (UTC) (envelope-from pho@holm.cc)
Received: from relay01.pair.com (relay01.pair.com [209.68.5.15])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id CE890665FF;
Mon, 27 Nov 2017 06:49:49 +0000 (UTC) (envelope-from pho@holm.cc)
Received: from x2.osted.lan (87-58-223-204-dynamic.dk.customer.tdc.net
[87.58.223.204])
by relay01.pair.com (Postfix) with ESMTP id A3F1DD0035A;
Mon, 27 Nov 2017 01:49:42 -0500 (EST)
Received: from x2.osted.lan (localhost [127.0.0.1])
by x2.osted.lan (8.14.9/8.14.9) with ESMTP id vAR6neVg091445
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Mon, 27 Nov 2017 07:49:40 +0100 (CET)
(envelope-from pho@x2.osted.lan)
Received: (from pho@localhost)
by x2.osted.lan (8.14.9/8.14.9/Submit) id vAR6nes4091444;
Mon, 27 Nov 2017 07:49:40 +0100 (CET) (envelope-from pho)
Date: Mon, 27 Nov 2017 07:49:40 +0100
From: Peter Holm <peter@holm.cc>
To: Mateusz Guzik <mjguzik@gmail.com>
Cc: Mateusz Guzik <mjg@freebsd.org>, src-committers@freebsd.org,
svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject: Re: svn commit: r326200 - head/sys/kern
Message-ID: <20171127064940.GA91390@x2.osted.lan>
References: <201711252049.vAPKnRaA026691@repo.freebsd.org>
<20171126064927.GA68986@x2.osted.lan>
<CAGudoHGzi08_Th3DDkyMSWG006akL=fhF08SfZzgE2CBCA1H4Q@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAGudoHGzi08_Th3DDkyMSWG006akL=fhF08SfZzgE2CBCA1H4Q@mail.gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 06:49:50 -0000
On Sun, Nov 26, 2017 at 10:11:21PM +0100, Mateusz Guzik wrote:
> On Sun, Nov 26, 2017 at 7:49 AM, Peter Holm <peter@holm.cc> wrote:
>
> > On Sat, Nov 25, 2017 at 08:49:27PM +0000, Mateusz Guzik wrote:
> > > Author: mjg
> > > Date: Sat Nov 25 20:49:27 2017
> > > New Revision: 326200
> > > URL: https://svnweb.freebsd.org/changeset/base/326200
> > >
> > > Log:
> > > Add the missing lockstat check for thread lock.
> > >
> > > Modified:
> > > head/sys/kern/kern_mutex.c
> > >
> > > Modified: head/sys/kern/kern_mutex.c
> > > ============================================================
> > ==================
> > > --- head/sys/kern/kern_mutex.c Sat Nov 25 20:37:13 2017
> > (r326199)
> >
> > Hi Mateusz,
> >
> > Could this be yours?
> >
> > spin lock 0xffffffff81ddc100 (turnstile chain) held by 0xfffff80014e57000
> > (tid 100277) too long
> > panic: spin lock held too long
> > cpuid = 20
> > time = 1511677687
> > KDB: stack backtrace:
> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> > 0xfffffe104f86ea40
> > vpanic() at vpanic+0x268/frame 0xfffffe104f86eb10
> > kproc_shutdown() at kproc_shutdown/frame 0xfffffe104f86eb70
> > _mtx_lock_spin_failed() at _mtx_lock_spin_failed+0x87/frame
> > 0xfffffe104f86eba0
> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x4ba/frame
> > 0xfffffe104f86ed10
> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x21f/frame
> > 0xfffffe104f86edb0
> > turnstile_trywait() at turnstile_trywait+0x32/frame 0xfffffe104f86edd0
> > __rw_rlock_hard() at __rw_rlock_hard+0x118/frame 0xfffffe104f86ee60
> > __rw_rlock_int() at __rw_rlock_int+0xd5/frame 0xfffffe104f86ee90
> > getblk() at getblk+0xdb/frame 0xfffffe104f86ef40
> > breadn_flags() at breadn_flags+0x6e/frame 0xfffffe104f86eff0
> > ffs_getcg() at ffs_getcg+0x20d/frame 0xfffffe104f86f0d0
> > ffs_nodealloccg() at ffs_nodealloccg+0xd0/frame 0xfffffe104f86f210
> > ffs_hashalloc() at ffs_hashalloc+0xb7/frame 0xfffffe104f86f290
> > ffs_valloc() at ffs_valloc+0x1c1/frame 0xfffffe104f86f390
> > ufs_makeinode() at ufs_makeinode+0xba/frame 0xfffffe104f86f520
> > ufs_create() at ufs_create+0x34/frame 0xfffffe104f86f540
> > VOP_CREATE_APV() at VOP_CREATE_APV+0x241/frame 0xfffffe104f86f5c0
> > VOP_CREATE() at VOP_CREATE+0x59/frame 0xfffffe104f86f620
> > vn_open_cred() at vn_open_cred+0x311/frame 0xfffffe104f86f770
> > vn_open() at vn_open+0x4c/frame 0xfffffe104f86f7b0
> > kern_openat() at kern_openat+0x212/frame 0xfffffe104f86f920
> > syscallenter() at syscallenter+0x4e4/frame 0xfffffe104f86f9f0
> > amd64_syscall() at amd64_syscall+0x4d/frame 0xfffffe104f86fab0
> >
> > https://people.freebsd.org/~pho/stress/log/mateusz004.txt
> >
> > - Peter
> >
>
> Fixed in r326237.
>
Yes, that fixed the issue reported.
After some more tests I got this one:
20171127 01:19:57 all (31/561): mkfifo2c.sh
spin lock 0xffffffff81edace0 (smp rendezvous) held by 0xfffff80d2ae31000 (tid 100529) too long
panic: spin lock held too long
cpuid = 14
time = 1511742163
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe105096c0b0
vpanic() at vpanic+0x19c/frame 0xfffffe105096c130
panic() at panic+0x43/frame 0xfffffe105096c190
_mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame 0xfffffe105096c200
__mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame 0xfffffe105096c240
smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame 0xfffffe105096c2c0
smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame 0xfffffe105096c2f0
pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame 0xfffffe105096c340
allocbuf() at allocbuf+0x107/frame 0xfffffe105096c3b0
brelse() at brelse+0x219/frame 0xfffffe105096c400
trunc_dependencies() at trunc_dependencies+0x745/frame 0xfffffe105096c4a0
softdep_setup_freeblocks() at softdep_setup_freeblocks+0x7b4/frame 0xfffffe105096c510
ffs_truncate() at ffs_truncate+0x6b8/frame 0xfffffe105096c700
ufs_inactive() at ufs_inactive+0x1cb/frame 0xfffffe105096c740
VOP_INACTIVE_APV() at VOP_INACTIVE_APV+0xfd/frame 0xfffffe105096c770
vinactive() at vinactive+0xe3/frame 0xfffffe105096c7c0
vputx() at vputx+0x31e/frame 0xfffffe105096c820
kern_rmdirat() at kern_rmdirat+0x1c9/frame 0xfffffe105096c980
amd64_syscall() at amd64_syscall+0x7ab/frame 0xfffffe105096cab0
Not so much more info here, I'm afraid:
https://people.freebsd.org/~pho/stress/log/mateusz005.txt
--
Peter
From owner-svn-src-all@freebsd.org Mon Nov 27 08:27:43 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8EBB9DFC0A5;
Mon, 27 Nov 2017 08:27:43 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail105.syd.optusnet.com.au (mail105.syd.optusnet.com.au
[211.29.132.249])
by mx1.freebsd.org (Postfix) with ESMTP id 4A2B468C54;
Mon, 27 Nov 2017 08:27:42 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail105.syd.optusnet.com.au (Postfix) with ESMTPS id 593DB10440E8;
Mon, 27 Nov 2017 19:27:34 +1100 (AEDT)
Date: Mon, 27 Nov 2017 19:27:34 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
cc: John Baldwin <jhb@freebsd.org>, src-committers@freebsd.org,
svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject: Re: svn commit: r326218 - head/sys/kern
In-Reply-To: <abfdf2b1-bb2f-4eb1-a448-bfee68158577@freebsd.org>
Message-ID: <20171127183109.C1790@besplex.bde.org>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<3170692.kvv90QqB0X@ralph.baldwin.cx>
<abfdf2b1-bb2f-4eb1-a448-bfee68158577@freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=bc8baKHB c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=1QgWAXTlbbf8hjtPRX8A:9 a=yrE8NTKN8dZdtXkm:21
a=Fgy4hgLG1BemluUb:21 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 08:27:43 -0000
On Sun, 26 Nov 2017, Nathan Whitehorn wrote:
> On 11/26/17 20:50, John Baldwin wrote:
>> On Saturday, November 25, 2017 11:41:05 PM Nathan Whitehorn wrote:
>>> ...
>>> Modified: head/sys/kern/kern_clock.c
>>> ==============================================================================
>>> --- head/sys/kern/kern_clock.c Sat Nov 25 23:23:24 2017
>>> (r326217)
>>> +++ head/sys/kern/kern_clock.c Sat Nov 25 23:41:05 2017
>>> (r326218)
>>> @@ -573,7 +573,9 @@ hardclock_cnt(int cnt, int usermode)
>>> void
>>> hardclock_sync(int cpu)
>>> {
>>> - int *t = DPCPU_ID_PTR(cpu, pcputicks);
>>> + int *t;
>>> + KASSERT(!CPU_ABSENT(cpu), ("Absent CPU %d", cpu));
>> Blank line before the KASSERT() perhaps?
>>
>>> + t = DPCPU_ID_PTR(cpu, pcputicks);
>>> *t = ticks;
>> Probably don't need this blank line though?
>
> Those are both good ideas.
Preserving the existing normal style is an even better idea. The change
does fix 2 style bugs (indentation of t and initializing it in its
declaration) as well as adding 2.
>>> Modified: head/sys/kern/subr_pcpu.c
>>> ==============================================================================
>>> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017
>>> (r326217)
>>> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017
>>> (r326218)
>>> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
>>> struct pcpu *
>>> pcpu_find(u_int cpuid)
>>> {
>>> + KASSERT(cpuid_to_pcpu[cpuid] != NULL,
>>> + ("Getting uninitialized PCPU %d", cpuid));
>> This KASSERT seems unnecessary? If the caller uses an invalid one, it will
>> just fault anyway.
This also removes the blank line after the declarations and adds a bogus
one after the new statement.
> It won't necessarily fault. For example, on PowerPC, NULL is a valid address
> that does not trigger faults. It's unfortunately quite complicated to fix
> this in a general way. Even if it did fault, this makes the fault more
> informative (and has found at least one bug on arm64 already).
On arches that trap null pointer accesses, the KASSERT() itself will fault.
This makes the fault less informative.
Trapping of null pointers (with offset < PAGE_SIZE) is currently broken on
i386 by a hack to support acpi wakeup.
Bruce
From owner-svn-src-all@freebsd.org Mon Nov 27 09:57:38 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5C81DFD4CC;
Mon, 27 Nov 2017 09:57:38 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9355A6AFBE;
Mon, 27 Nov 2017 09:57:38 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAR9vbpr063860;
Mon, 27 Nov 2017 09:57:37 GMT (envelope-from phk@FreeBSD.org)
Received: (from phk@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAR9vbRh063859;
Mon, 27 Nov 2017 09:57:37 GMT (envelope-from phk@FreeBSD.org)
Message-Id: <201711270957.vAR9vbRh063859@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: phk set sender to phk@FreeBSD.org
using -f
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 27 Nov 2017 09:57:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326246 - head/lib/libc/stdio
X-SVN-Group: head
X-SVN-Commit-Author: phk
X-SVN-Commit-Paths: head/lib/libc/stdio
X-SVN-Commit-Revision: 326246
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 09:57:38 -0000
Author: phk
Date: Mon Nov 27 09:57:37 2017
New Revision: 326246
URL: https://svnweb.freebsd.org/changeset/base/326246
Log:
Truncate negative lengths to zero
Modified:
head/lib/libc/stdio/xprintf_hexdump.c
Modified: head/lib/libc/stdio/xprintf_hexdump.c
==============================================================================
--- head/lib/libc/stdio/xprintf_hexdump.c Mon Nov 27 04:24:48 2017 (r326245)
+++ head/lib/libc/stdio/xprintf_hexdump.c Mon Nov 27 09:57:37 2017 (r326246)
@@ -50,6 +50,7 @@ int
__printf_render_hexdump(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
{
unsigned char *p;
+ int i;
unsigned u, l, j, a;
char buf[100], *q;
int ret;
@@ -59,7 +60,10 @@ __printf_render_hexdump(struct __printf_io *io, const
else
l = 16;
p = *((unsigned char **)arg[0]);
- u = *((unsigned *)arg[1]);
+ i = *((int *)arg[1]);
+ if (i < 0)
+ i = 0;
+ u = i;
ret = 0;
a = 0;
From owner-svn-src-all@freebsd.org Mon Nov 27 12:34:24 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60565E4F093;
Mon, 27 Nov 2017 12:34:24 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2A6326F111;
Mon, 27 Nov 2017 12:34:24 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARCYNsV030404;
Mon, 27 Nov 2017 12:34:23 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARCYNtA030403;
Mon, 27 Nov 2017 12:34:23 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201711271234.vARCYNtA030403@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 27 Nov 2017 12:34:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326247 - head/usr.sbin/kgmon
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: head/usr.sbin/kgmon
X-SVN-Commit-Revision: 326247
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 12:34:24 -0000
Author: trasz
Date: Mon Nov 27 12:34:23 2017
New Revision: 326247
URL: https://svnweb.freebsd.org/changeset/base/326247
Log:
Revert r326125.
It turns out kgmon(8) still works, and provides some functionality that's
not provided by pmcstat(8).
Reported by: bde@
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Modified:
head/usr.sbin/kgmon/kgmon.8
Modified: head/usr.sbin/kgmon/kgmon.8
==============================================================================
--- head/usr.sbin/kgmon/kgmon.8 Mon Nov 27 09:57:37 2017 (r326246)
+++ head/usr.sbin/kgmon/kgmon.8 Mon Nov 27 12:34:23 2017 (r326247)
@@ -28,7 +28,7 @@
.\" @(#)kgmon.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd November 23, 2017
+.Dd June 6, 1993
.Dt KGMON 8
.Os
.Sh NAME
@@ -40,13 +40,6 @@
.Op Fl M Ar core
.Op Fl N Ar system
.Sh DESCRIPTION
-.Bf -symbolic
-This command is obsolete.
-Users are advised to use
-.Xr pmcstat 8
-instead.
-.Ef
-.Pp
The
.Nm
utility is used when profiling the operating system.
From owner-svn-src-all@freebsd.org Mon Nov 27 12:37:15 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4F1CE4F14B;
Mon, 27 Nov 2017 12:37:15 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9E93F6F270;
Mon, 27 Nov 2017 12:37:15 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARCbESl030541;
Mon, 27 Nov 2017 12:37:14 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARCbEBp030539;
Mon, 27 Nov 2017 12:37:14 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201711271237.vARCbEBp030539@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 27 Nov 2017 12:37:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326248 - in head: usr.bin/gprof usr.sbin/kgmon
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: in head: usr.bin/gprof usr.sbin/kgmon
X-SVN-Commit-Revision: 326248
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 12:37:15 -0000
Author: trasz
Date: Mon Nov 27 12:37:14 2017
New Revision: 326248
URL: https://svnweb.freebsd.org/changeset/base/326248
Log:
.Xr pmcstat(8) from kgmon(8) and gprof(1).
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Modified:
head/usr.bin/gprof/gprof.1
head/usr.sbin/kgmon/kgmon.8
Modified: head/usr.bin/gprof/gprof.1
==============================================================================
--- head/usr.bin/gprof/gprof.1 Mon Nov 27 12:34:23 2017 (r326247)
+++ head/usr.bin/gprof/gprof.1 Mon Nov 27 12:37:14 2017 (r326248)
@@ -28,7 +28,7 @@
.\" @(#)gprof.1 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd December 25, 2008
+.Dd November 27, 2017
.Dt GPROF 1
.Os
.Sh NAME
@@ -272,7 +272,8 @@ Summarized dynamic call graph and profile.
.Sh SEE ALSO
.Xr cc 1 ,
.Xr profil 2 ,
-.Xr clocks 7
+.Xr clocks 7 ,
+.Xr pmcstat 8
.\" .Xr monitor 3 ,
.\" .Xr prof 1
.Rs
Modified: head/usr.sbin/kgmon/kgmon.8
==============================================================================
--- head/usr.sbin/kgmon/kgmon.8 Mon Nov 27 12:34:23 2017 (r326247)
+++ head/usr.sbin/kgmon/kgmon.8 Mon Nov 27 12:37:14 2017 (r326248)
@@ -28,7 +28,7 @@
.\" @(#)kgmon.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd June 6, 1993
+.Dd November 27, 2017
.Dt KGMON 8
.Os
.Sh NAME
@@ -121,7 +121,8 @@ file with the warning that the data may be
inconsistent if profiling is in progress.
.Sh SEE ALSO
.Xr gprof 1 ,
-.Xr config 8
+.Xr config 8 ,
+.Xr pmcstat 8
.Sh HISTORY
The
.Nm
From owner-svn-src-all@freebsd.org Mon Nov 27 12:39:37 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33D97E4F233;
Mon, 27 Nov 2017 12:39:37 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id F254E6F4B0;
Mon, 27 Nov 2017 12:39:36 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARCdavM030659;
Mon, 27 Nov 2017 12:39:36 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARCda8t030658;
Mon, 27 Nov 2017 12:39:36 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201711271239.vARCda8t030658@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 27 Nov 2017 12:39:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326249 - head/share/man/man6
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: head/share/man/man6
X-SVN-Commit-Revision: 326249
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 12:39:37 -0000
Author: trasz
Date: Mon Nov 27 12:39:35 2017
New Revision: 326249
URL: https://svnweb.freebsd.org/changeset/base/326249
Log:
Update intro(6) - remove hint that doesn't work, add explicit list
of games instead, and mention the "bsdgames" port.
Reviewed by: bcr@
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D13196
Modified:
head/share/man/man6/intro.6
Modified: head/share/man/man6/intro.6
==============================================================================
--- head/share/man/man6/intro.6 Mon Nov 27 12:37:14 2017 (r326248)
+++ head/share/man/man6/intro.6 Mon Nov 27 12:39:35 2017 (r326249)
@@ -27,30 +27,33 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 16, 1997
+.Dd November 27, 2017
.Dt INTRO 6
.Os
.Sh NAME
.Nm intro
.Nd "introduction to games"
.Sh DESCRIPTION
-This section contains information about games.
+This section contains information about the traditional BSD games.
The games
are located in
.Pa /usr/bin
if installed.
-You can get a short overview about all the games with the
-command:
-.Bd -literal -offset indent
-$ apropos '\\(6\\)'
-.Ed
.Sh FILES
.Bl -tag -width /usr/bin -compact
.It Pa /usr/bin
location of games
.El
.Sh SEE ALSO
-.Xr intro 1
+.Xr intro 1 ,
+.Xr banner 6 ,
+.Xr caesar 6 ,
+.Xr fortune 6 ,
+.Xr grdc 6 ,
+.Xr morse 6 ,
+.Xr number 6 ,
+.Xr pom 6 ,
+.Xr random 6
.Sh HISTORY
In earlier versions of
.Fx ,
@@ -61,3 +64,5 @@ The
.Nm
section manual page appeared in
.Fx 2.2 .
+Most of the games were moved into the bsdgames port in
+.Fx 5.0 .
From owner-svn-src-all@freebsd.org Mon Nov 27 12:44:05 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5230BE4F4F5;
Mon, 27 Nov 2017 12:44:05 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1CDAA6F9E4;
Mon, 27 Nov 2017 12:44:05 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARCi4tY034494;
Mon, 27 Nov 2017 12:44:04 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARCi4Qt034493;
Mon, 27 Nov 2017 12:44:04 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201711271244.vARCi4Qt034493@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 27 Nov 2017 12:44:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326250 - head/etc/autofs
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: head/etc/autofs
X-SVN-Commit-Revision: 326250
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 12:44:05 -0000
Author: trasz
Date: Mon Nov 27 12:44:03 2017
New Revision: 326250
URL: https://svnweb.freebsd.org/changeset/base/326250
Log:
Change formatting; no functional changes.
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Modified:
head/etc/autofs/Makefile
Modified: head/etc/autofs/Makefile
==============================================================================
--- head/etc/autofs/Makefile Mon Nov 27 12:39:35 2017 (r326249)
+++ head/etc/autofs/Makefile Mon Nov 27 12:44:03 2017 (r326250)
@@ -1,6 +1,11 @@
# $FreeBSD$
-FILES= include_ldap include_nis special_hosts special_media special_noauto special_null
+FILES= include_ldap \
+ include_nis \
+ special_hosts \
+ special_media \
+ special_noauto \
+ special_null
NO_OBJ=
FILESDIR= /etc/autofs
From owner-svn-src-all@freebsd.org Mon Nov 27 12:46:19 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FE71E4F5DC;
Mon, 27 Nov 2017 12:46:19 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 49C276FB5E;
Mon, 27 Nov 2017 12:46:19 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARCkIPN034634;
Mon, 27 Nov 2017 12:46:18 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARCkIgm034632;
Mon, 27 Nov 2017 12:46:18 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201711271246.vARCkIgm034632@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 27 Nov 2017 12:46:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326251 - head/etc/autofs
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: head/etc/autofs
X-SVN-Commit-Revision: 326251
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 12:46:19 -0000
Author: trasz
Date: Mon Nov 27 12:46:18 2017
New Revision: 326251
URL: https://svnweb.freebsd.org/changeset/base/326251
Log:
Rename /etc/autofs/include_nis to /etc/autofs/include_nis_nullfs, to indicate
that this script provides nullfs map rewriting for local mounts.
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Added:
head/etc/autofs/include_nis_nullfs
- copied, changed from r326250, head/etc/autofs/include_nis
Deleted:
head/etc/autofs/include_nis
Modified:
head/etc/autofs/Makefile
Modified: head/etc/autofs/Makefile
==============================================================================
--- head/etc/autofs/Makefile Mon Nov 27 12:44:03 2017 (r326250)
+++ head/etc/autofs/Makefile Mon Nov 27 12:46:18 2017 (r326251)
@@ -1,7 +1,7 @@
# $FreeBSD$
FILES= include_ldap \
- include_nis \
+ include_nis_nullfs \
special_hosts \
special_media \
special_noauto \
Copied and modified: head/etc/autofs/include_nis_nullfs (from r326250, head/etc/autofs/include_nis)
==============================================================================
--- head/etc/autofs/include_nis Mon Nov 27 12:44:03 2017 (r326250, copy source)
+++ head/etc/autofs/include_nis_nullfs Mon Nov 27 12:46:18 2017 (r326251)
@@ -28,14 +28,14 @@
#
#
-# /etc/autofs/include_nis
+# /etc/autofs/include_nis_nullfs
#
# automountd Directory Services script for NIS
#
# SYNOPSIS
-# include_nis <mapname>
+# include_nis_nullfs <mapname>
#
-# include_nis <mapname> <key>
+# include_nis_nullfs <mapname> <key>
#
# DESCRIPTION
#
From owner-svn-src-all@freebsd.org Mon Nov 27 12:50:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF9E2E4F6E7;
Mon, 27 Nov 2017 12:50:27 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A99616FDBC;
Mon, 27 Nov 2017 12:50:27 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARCoQ2N034974;
Mon, 27 Nov 2017 12:50:26 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARCoQVI034972;
Mon, 27 Nov 2017 12:50:26 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201711271250.vARCoQVI034972@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 27 Nov 2017 12:50:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326252 - head/etc/autofs
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: head/etc/autofs
X-SVN-Commit-Revision: 326252
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 12:50:28 -0000
Author: trasz
Date: Mon Nov 27 12:50:26 2017
New Revision: 326252
URL: https://svnweb.freebsd.org/changeset/base/326252
Log:
Add /etc/autofs/include_nis, a non-rewriting NIS map.
Submitted by: G. Paul Ziemba
Suggested by: asomers@
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Added:
head/etc/autofs/include_nis (contents, props changed)
Modified:
head/etc/autofs/Makefile
Modified: head/etc/autofs/Makefile
==============================================================================
--- head/etc/autofs/Makefile Mon Nov 27 12:46:18 2017 (r326251)
+++ head/etc/autofs/Makefile Mon Nov 27 12:50:26 2017 (r326252)
@@ -1,6 +1,7 @@
# $FreeBSD$
FILES= include_ldap \
+ include_nis \
include_nis_nullfs \
special_hosts \
special_media \
Added: head/etc/autofs/include_nis
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/autofs/include_nis Mon Nov 27 12:50:26 2017 (r326252)
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+if [ -n "$2" ]; then
+ ypmatch $2 $1
+ exit 0
+fi
+
+if [ -n "$1" ]; then
+ ypcat -k $1
+ exit 0
+fi
From owner-svn-src-all@freebsd.org Mon Nov 27 14:13:32 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 877F9E52362;
Mon, 27 Nov 2017 14:13:32 +0000 (UTC) (envelope-from dch@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3879772B1D;
Mon, 27 Nov 2017 14:13:32 +0000 (UTC) (envelope-from dch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAREDVmp074053;
Mon, 27 Nov 2017 14:13:31 GMT (envelope-from dch@FreeBSD.org)
Received: (from dch@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAREDVSQ074050;
Mon, 27 Nov 2017 14:13:31 GMT (envelope-from dch@FreeBSD.org)
Message-Id: <201711271413.vAREDVSQ074050@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org
using -f
From: Dave Cottlehuber <dch@FreeBSD.org>
Date: Mon, 27 Nov 2017 14:13:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326253 - in head: share/misc usr.bin/calendar/calendars
X-SVN-Group: head
X-SVN-Commit-Author: dch
X-SVN-Commit-Paths: in head: share/misc usr.bin/calendar/calendars
X-SVN-Commit-Revision: 326253
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 14:13:32 -0000
Author: dch (ports committer)
Date: Mon Nov 27 14:13:30 2017
New Revision: 326253
URL: https://svnweb.freebsd.org/changeset/base/326253
Log:
add myself as ports committer, mentor jrm + swills
Approved by: jrm
Differential Revision: https://reviews.freebsd.org/D13268
Modified:
head/share/misc/committers-ports.dot
head/usr.bin/calendar/calendars/calendar.freebsd
Modified: head/share/misc/committers-ports.dot
==============================================================================
--- head/share/misc/committers-ports.dot Mon Nov 27 12:50:26 2017 (r326252)
+++ head/share/misc/committers-ports.dot Mon Nov 27 14:13:30 2017 (r326253)
@@ -87,6 +87,7 @@ danilo [label="Danilo E. Gondolfo\ndanilo@FreeBSD.org\
db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"]
dbaio [label="Danilo G. Baio\ndbaio@FreeBSD.org\n2017/05/03"]
dbn [label="David Naylor\ndbn@FreeBSD.org\n2013/01/14"]
+dch [label="Dave Cottlehuber\ndch@FreeBSD.org\n2017/09/09"]
decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"]
delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"]
demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"]
@@ -445,6 +446,7 @@ jadawin -> wen
joerg -> netchild
+jrm -> dch
jrm -> jwb
junovitch -> tz
@@ -627,6 +629,7 @@ stas -> araujo
steve -> netchild
+swills -> dch
swills -> feld
swills -> jmd
swills -> jrm
Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==============================================================================
--- head/usr.bin/calendar/calendars/calendar.freebsd Mon Nov 27 12:50:26 2017 (r326252)
+++ head/usr.bin/calendar/calendars/calendar.freebsd Mon Nov 27 14:13:30 2017 (r326253)
@@ -127,6 +127,7 @@
03/26 Jonathan Anderson <jonathan@FreeBSD.org> born in Ottawa, Ontario, Canada, 1983
03/27 Josef El-Rayes <josef@FreeBSD.org> born in Linz, Austria, 1982
03/28 Sean C. Farley <scf@FreeBSD.org> born in Indianapolis, Indiana, United States, 1970
+03/29 Dave Cottlehuber <dch@FreeBSD.org> born in Christchurch, New Zealand, 1973
03/29 Thierry Thomas <thierry@FreeBSD.org> born in Luxeuil les Bains, France, 1961
03/30 Po-Chuan Hsieh <sunpoet@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1978
03/31 First quarter status reports are due on 04/15
From owner-svn-src-all@freebsd.org Mon Nov 27 14:51:48 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C49CBE534A2;
Mon, 27 Nov 2017 14:51:48 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8F3F3741EA;
Mon, 27 Nov 2017 14:51:48 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAREpl9P091111;
Mon, 27 Nov 2017 14:51:47 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAREplUh091110;
Mon, 27 Nov 2017 14:51:47 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271451.vAREplUh091110@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 14:51:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-svnadmin@freebsd.org
Subject: svn commit: r326254 - svnadmin/conf
X-SVN-Group: svnadmin
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: svnadmin/conf
X-SVN-Commit-Revision: 326254
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 14:51:48 -0000
Author: pfg
Date: Mon Nov 27 14:51:47 2017
New Revision: 326254
URL: https://svnweb.freebsd.org/changeset/base/326254
Log:
Add myself to sizelimits override to tag a lot of SPDX IDs.
Modified:
svnadmin/conf/sizelimit.conf
Modified: svnadmin/conf/sizelimit.conf
==============================================================================
--- svnadmin/conf/sizelimit.conf Mon Nov 27 14:13:30 2017 (r326253)
+++ svnadmin/conf/sizelimit.conf Mon Nov 27 14:51:47 2017 (r326254)
@@ -27,4 +27,5 @@ mm
np
obrien
peter
+pfg
rwatson
From owner-svn-src-all@freebsd.org Mon Nov 27 14:52:55 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2917CE53530;
Mon, 27 Nov 2017 14:52:55 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 45E3C744A4;
Mon, 27 Nov 2017 14:52:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAREqr1E091289;
Mon, 27 Nov 2017 14:52:53 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAREqgAM091182;
Mon, 27 Nov 2017 14:52:42 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271452.vAREqgAM091182@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 14:52:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326255 - in head/sys/dev: aac aacraid adb adlink
advansys ae age agp aha ahci aic aic7xxx aic7xxx/aicasm alc ale altera/atse
altera/avgen altera/jtag_uart altera/sdcard amdsbwd amdtemp...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/dev: aac aacraid adb adlink advansys ae age
agp aha ahci aic aic7xxx aic7xxx/aicasm alc ale altera/atse altera/avgen
altera/jtag_uart altera/sdcard amdsbwd amdtemp amr arcmsr asmc ata ata/...
X-SVN-Commit-Revision: 326255
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 14:52:55 -0000
Author: pfg
Date: Mon Nov 27 14:52:40 2017
New Revision: 326255
URL: https://svnweb.freebsd.org/changeset/base/326255
Log:
sys/dev: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/dev/aac/aac.c
head/sys/dev/aac/aac_cam.c
head/sys/dev/aac/aac_debug.c
head/sys/dev/aac/aac_disk.c
head/sys/dev/aac/aac_linux.c
head/sys/dev/aac/aac_pci.c
head/sys/dev/aac/aac_tables.h
head/sys/dev/aac/aacreg.h
head/sys/dev/aac/aacvar.h
head/sys/dev/aacraid/aacraid.c
head/sys/dev/aacraid/aacraid_cam.c
head/sys/dev/aacraid/aacraid_debug.c
head/sys/dev/aacraid/aacraid_debug.h
head/sys/dev/aacraid/aacraid_linux.c
head/sys/dev/aacraid/aacraid_pci.c
head/sys/dev/aacraid/aacraid_reg.h
head/sys/dev/aacraid/aacraid_var.h
head/sys/dev/adb/adb.h
head/sys/dev/adb/adb_bus.c
head/sys/dev/adb/adb_buttons.c
head/sys/dev/adb/adb_kbd.c
head/sys/dev/adb/adb_mouse.c
head/sys/dev/adb/adbvar.h
head/sys/dev/adlink/adlink.c
head/sys/dev/advansys/adv_isa.c
head/sys/dev/advansys/adv_pci.c
head/sys/dev/advansys/advansys.c
head/sys/dev/advansys/advansys.h
head/sys/dev/advansys/advlib.c
head/sys/dev/advansys/advlib.h
head/sys/dev/advansys/adw_pci.c
head/sys/dev/advansys/adwcam.c
head/sys/dev/advansys/adwlib.c
head/sys/dev/advansys/adwlib.h
head/sys/dev/advansys/adwvar.h
head/sys/dev/ae/if_ae.c
head/sys/dev/ae/if_aereg.h
head/sys/dev/ae/if_aevar.h
head/sys/dev/age/if_age.c
head/sys/dev/age/if_agereg.h
head/sys/dev/age/if_agevar.h
head/sys/dev/agp/agp.c
head/sys/dev/agp/agp_ali.c
head/sys/dev/agp/agp_amd.c
head/sys/dev/agp/agp_amd64.c
head/sys/dev/agp/agp_apple.c
head/sys/dev/agp/agp_ati.c
head/sys/dev/agp/agp_i810.c
head/sys/dev/agp/agp_i810.h
head/sys/dev/agp/agp_intel.c
head/sys/dev/agp/agp_nvidia.c
head/sys/dev/agp/agp_sis.c
head/sys/dev/agp/agp_via.c
head/sys/dev/agp/agppriv.h
head/sys/dev/agp/agpreg.h
head/sys/dev/agp/agpvar.h
head/sys/dev/aha/aha.c
head/sys/dev/aha/aha_isa.c
head/sys/dev/aha/ahareg.h
head/sys/dev/ahci/ahci.c
head/sys/dev/ahci/ahci.h
head/sys/dev/ahci/ahciem.c
head/sys/dev/aic/aic.c
head/sys/dev/aic/aic6360reg.h
head/sys/dev/aic/aic_isa.c
head/sys/dev/aic/aic_pccard.c
head/sys/dev/aic/aicvar.h
head/sys/dev/aic7xxx/ahc_isa.c
head/sys/dev/aic7xxx/aic7770.c
head/sys/dev/aic7xxx/aic79xx.c
head/sys/dev/aic7xxx/aic79xx.h
head/sys/dev/aic7xxx/aic79xx_inline.h
head/sys/dev/aic7xxx/aic79xx_pci.c
head/sys/dev/aic7xxx/aic7xxx.c
head/sys/dev/aic7xxx/aic7xxx.h
head/sys/dev/aic7xxx/aic7xxx_93cx6.h
head/sys/dev/aic7xxx/aic7xxx_inline.h
head/sys/dev/aic7xxx/aic7xxx_pci.c
head/sys/dev/aic7xxx/aicasm/aicasm.c
head/sys/dev/aic7xxx/aicasm/aicasm.h
head/sys/dev/aic7xxx/aicasm/aicasm_gram.y
head/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
head/sys/dev/aic7xxx/aicasm/aicasm_scan.l
head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
head/sys/dev/alc/if_alc.c
head/sys/dev/alc/if_alcreg.h
head/sys/dev/alc/if_alcvar.h
head/sys/dev/ale/if_ale.c
head/sys/dev/ale/if_alereg.h
head/sys/dev/ale/if_alevar.h
head/sys/dev/altera/atse/a_api.h
head/sys/dev/altera/atse/if_atse.c
head/sys/dev/altera/atse/if_atse_fdt.c
head/sys/dev/altera/atse/if_atse_nexus.c
head/sys/dev/altera/atse/if_atsereg.h
head/sys/dev/altera/avgen/altera_avgen.c
head/sys/dev/altera/avgen/altera_avgen.h
head/sys/dev/altera/avgen/altera_avgen_fdt.c
head/sys/dev/altera/avgen/altera_avgen_nexus.c
head/sys/dev/altera/jtag_uart/altera_jtag_uart.h
head/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
head/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c
head/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
head/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
head/sys/dev/altera/sdcard/altera_sdcard.c
head/sys/dev/altera/sdcard/altera_sdcard.h
head/sys/dev/altera/sdcard/altera_sdcard_disk.c
head/sys/dev/altera/sdcard/altera_sdcard_fdt.c
head/sys/dev/altera/sdcard/altera_sdcard_io.c
head/sys/dev/altera/sdcard/altera_sdcard_nexus.c
head/sys/dev/amdsbwd/amdsbwd.c
head/sys/dev/amdtemp/amdtemp.c
head/sys/dev/amr/amr.c
head/sys/dev/amr/amr_cam.c
head/sys/dev/amr/amr_disk.c
head/sys/dev/amr/amr_linux.c
head/sys/dev/amr/amr_pci.c
head/sys/dev/amr/amr_tables.h
head/sys/dev/amr/amrio.h
head/sys/dev/amr/amrreg.h
head/sys/dev/amr/amrvar.h
head/sys/dev/arcmsr/arcmsr.c
head/sys/dev/arcmsr/arcmsr.h
head/sys/dev/asmc/asmc.c
head/sys/dev/asmc/asmcvar.h
head/sys/dev/ata/ata-all.c
head/sys/dev/ata/ata-all.h
head/sys/dev/ata/ata-card.c
head/sys/dev/ata/ata-dma.c
head/sys/dev/ata/ata-isa.c
head/sys/dev/ata/ata-lowlevel.c
head/sys/dev/ata/ata-pci.c
head/sys/dev/ata/ata-pci.h
head/sys/dev/ata/ata-sata.c
head/sys/dev/ata/chipsets/ata-acard.c
head/sys/dev/ata/chipsets/ata-acerlabs.c
head/sys/dev/ata/chipsets/ata-amd.c
head/sys/dev/ata/chipsets/ata-ati.c
head/sys/dev/ata/chipsets/ata-cenatek.c
head/sys/dev/ata/chipsets/ata-cypress.c
head/sys/dev/ata/chipsets/ata-cyrix.c
head/sys/dev/ata/chipsets/ata-fsl.c
head/sys/dev/ata/chipsets/ata-highpoint.c
head/sys/dev/ata/chipsets/ata-intel.c
head/sys/dev/ata/chipsets/ata-ite.c
head/sys/dev/ata/chipsets/ata-jmicron.c
head/sys/dev/ata/chipsets/ata-marvell.c
head/sys/dev/ata/chipsets/ata-micron.c
head/sys/dev/ata/chipsets/ata-national.c
head/sys/dev/ata/chipsets/ata-netcell.c
head/sys/dev/ata/chipsets/ata-nvidia.c
head/sys/dev/ata/chipsets/ata-promise.c
head/sys/dev/ata/chipsets/ata-serverworks.c
head/sys/dev/ata/chipsets/ata-siliconimage.c
head/sys/dev/ata/chipsets/ata-sis.c
head/sys/dev/ata/chipsets/ata-via.c
head/sys/dev/ath/ah_osdep.c
head/sys/dev/ath/ah_osdep.h
head/sys/dev/ath/ath_dfs/null/dfs_null.c
head/sys/dev/ath/ath_hal/ar9002/ar9002phy.h
head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.h
head/sys/dev/ath/ath_hal/ar9002/ar9285_cal.c
head/sys/dev/ath/ath_hal/ar9002/ar9285_cal.h
head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h
head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h
head/sys/dev/ath/ath_hal/ar9002/ar9285phy.h
head/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c
head/sys/dev/ath/ath_hal/ar9002/ar9287_cal.h
head/sys/dev/ath/ath_hal/ar9002/ar9287_olc.c
head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
head/sys/dev/ath/ath_rate/amrr/amrr.c
head/sys/dev/ath/ath_rate/amrr/amrr.h
head/sys/dev/ath/ath_rate/onoe/onoe.c
head/sys/dev/ath/ath_rate/onoe/onoe.h
head/sys/dev/ath/ath_rate/sample/sample.c
head/sys/dev/ath/ath_rate/sample/sample.h
head/sys/dev/ath/ath_rate/sample/tx_schedules.h
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_ath_ahb.c
head/sys/dev/ath/if_ath_alq.c
head/sys/dev/ath/if_ath_alq.h
head/sys/dev/ath/if_ath_beacon.c
head/sys/dev/ath/if_ath_beacon.h
head/sys/dev/ath/if_ath_btcoex.c
head/sys/dev/ath/if_ath_btcoex.h
head/sys/dev/ath/if_ath_debug.c
head/sys/dev/ath/if_ath_debug.h
head/sys/dev/ath/if_ath_keycache.c
head/sys/dev/ath/if_ath_keycache.h
head/sys/dev/ath/if_ath_led.c
head/sys/dev/ath/if_ath_led.h
head/sys/dev/ath/if_ath_lna_div.c
head/sys/dev/ath/if_ath_lna_div.h
head/sys/dev/ath/if_ath_misc.h
head/sys/dev/ath/if_ath_pci.c
head/sys/dev/ath/if_ath_rx.c
head/sys/dev/ath/if_ath_rx.h
head/sys/dev/ath/if_ath_rx_edma.c
head/sys/dev/ath/if_ath_rx_edma.h
head/sys/dev/ath/if_ath_spectral.c
head/sys/dev/ath/if_ath_spectral.h
head/sys/dev/ath/if_ath_sysctl.c
head/sys/dev/ath/if_ath_sysctl.h
head/sys/dev/ath/if_ath_tdma.c
head/sys/dev/ath/if_ath_tdma.h
head/sys/dev/ath/if_ath_tsf.h
head/sys/dev/ath/if_ath_tx.c
head/sys/dev/ath/if_ath_tx.h
head/sys/dev/ath/if_ath_tx_edma.c
head/sys/dev/ath/if_ath_tx_edma.h
head/sys/dev/ath/if_ath_tx_ht.c
head/sys/dev/ath/if_ath_tx_ht.h
head/sys/dev/ath/if_athdfs.h
head/sys/dev/ath/if_athioctl.h
head/sys/dev/ath/if_athrate.h
head/sys/dev/ath/if_athvar.h
head/sys/dev/atkbdc/atkbd.c
head/sys/dev/atkbdc/atkbd_atkbdc.c
head/sys/dev/atkbdc/atkbdc.c
head/sys/dev/atkbdc/atkbdc_ebus.c
head/sys/dev/atkbdc/atkbdc_isa.c
head/sys/dev/atkbdc/atkbdc_subr.c
head/sys/dev/atkbdc/atkbdc_subr.h
head/sys/dev/atkbdc/atkbdcreg.h
head/sys/dev/atkbdc/atkbdreg.h
head/sys/dev/auxio/auxio.c
head/sys/dev/auxio/auxioreg.h
head/sys/dev/bfe/if_bfe.c
head/sys/dev/bfe/if_bfereg.h
head/sys/dev/bktr/bktr_audio.c
head/sys/dev/bktr/bktr_audio.h
head/sys/dev/bktr/bktr_card.c
head/sys/dev/bktr/bktr_card.h
head/sys/dev/bktr/bktr_core.c
head/sys/dev/bktr/bktr_core.h
head/sys/dev/bktr/bktr_i2c.c
head/sys/dev/bktr/bktr_i2c.h
head/sys/dev/bktr/bktr_mem.c
head/sys/dev/bktr/bktr_mem.h
head/sys/dev/bktr/bktr_os.c
head/sys/dev/bktr/bktr_os.h
head/sys/dev/bktr/bktr_reg.h
head/sys/dev/bktr/bktr_tuner.c
head/sys/dev/bktr/bktr_tuner.h
head/sys/dev/bktr/ioctl_meteor.h
head/sys/dev/bktr/msp34xx.c
head/sys/dev/bm/if_bm.c
head/sys/dev/bm/if_bmreg.h
head/sys/dev/bm/if_bmvar.h
head/sys/dev/buslogic/bt.c
head/sys/dev/buslogic/bt_isa.c
head/sys/dev/buslogic/bt_pci.c
head/sys/dev/buslogic/btreg.h
head/sys/dev/bvm/bvm_console.c
head/sys/dev/bvm/bvm_dbg.c
head/sys/dev/bwi/bitops.h
head/sys/dev/bwi/if_bwi_pci.c
head/sys/dev/bwn/if_bwn.c
head/sys/dev/bwn/if_bwnreg.h
head/sys/dev/bwn/if_bwnvar.h
head/sys/dev/cadence/if_cgem.c
head/sys/dev/cadence/if_cgem_hw.h
head/sys/dev/cardbus/cardbus.c
head/sys/dev/cardbus/cardbus_cis.c
head/sys/dev/cardbus/cardbus_cis.h
head/sys/dev/cardbus/cardbus_device.c
head/sys/dev/cardbus/cardbusreg.h
head/sys/dev/cardbus/cardbusvar.h
head/sys/dev/cas/if_cas.c
head/sys/dev/cas/if_casreg.h
head/sys/dev/cas/if_casvar.h
head/sys/dev/cesa/cesa.c
head/sys/dev/cesa/cesa.h
head/sys/dev/cfe/cfe_api.c
head/sys/dev/cfe/cfe_api.h
head/sys/dev/cfe/cfe_api_int.h
head/sys/dev/cfe/cfe_console.c
head/sys/dev/cfe/cfe_env.c
head/sys/dev/cfe/cfe_error.h
head/sys/dev/cfe/cfe_ioctl.h
head/sys/dev/cfe/cfe_resource.c
head/sys/dev/cfi/cfi_bus_ixp4xx.c
head/sys/dev/cfi/cfi_bus_nexus.c
head/sys/dev/cfi/cfi_disk.c
head/sys/dev/ciss/ciss.c
head/sys/dev/ciss/cissio.h
head/sys/dev/ciss/cissreg.h
head/sys/dev/ciss/cissvar.h
head/sys/dev/cm/if_cm_isa.c
head/sys/dev/cm/smc90cx6.c
head/sys/dev/cm/smc90cx6reg.h
head/sys/dev/cm/smc90cx6var.h
head/sys/dev/cmx/cmx_pccard.c
head/sys/dev/cmx/cmxreg.h
head/sys/dev/cmx/cmxvar.h
head/sys/dev/coretemp/coretemp.c
head/sys/dev/cpuctl/cpuctl.c
head/sys/dev/cpufreq/ichss.c
head/sys/dev/cs/if_cs.c
head/sys/dev/cs/if_cs_isa.c
head/sys/dev/cs/if_cs_pccard.c
head/sys/dev/cs/if_csreg.h
head/sys/dev/cs/if_csvar.h
head/sys/dev/cxgb/bin2h.pl
head/sys/dev/cxgb/common/cxgb_ael1002.c
head/sys/dev/cxgb/common/cxgb_aq100x.c
head/sys/dev/cxgb/common/cxgb_common.h
head/sys/dev/cxgb/common/cxgb_firmware_exports.h
head/sys/dev/cxgb/common/cxgb_mc5.c
head/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
head/sys/dev/cxgb/common/cxgb_regs.h
head/sys/dev/cxgb/common/cxgb_sge_defs.h
head/sys/dev/cxgb/common/cxgb_t3_cpl.h
head/sys/dev/cxgb/common/cxgb_t3_hw.c
head/sys/dev/cxgb/common/cxgb_tcb.h
head/sys/dev/cxgb/common/cxgb_tn1010.c
head/sys/dev/cxgb/common/cxgb_vsc7323.c
head/sys/dev/cxgb/common/cxgb_vsc8211.c
head/sys/dev/cxgb/common/cxgb_xgmac.c
head/sys/dev/cxgb/cxgb_adapter.h
head/sys/dev/cxgb/cxgb_ioctl.h
head/sys/dev/cxgb/cxgb_main.c
head/sys/dev/cxgb/cxgb_offload.h
head/sys/dev/cxgb/cxgb_osdep.h
head/sys/dev/cxgb/cxgb_sge.c
head/sys/dev/cxgb/cxgb_t3fw.h
head/sys/dev/cxgb/sys/mvec.h
head/sys/dev/cxgb/sys/uipc_mvec.c
head/sys/dev/cxgb/t3b_protocol_sram.h
head/sys/dev/cxgb/t3b_tp_eeprom.h
head/sys/dev/cxgb/t3c_protocol_sram.h
head/sys/dev/cxgb/t3c_tp_eeprom.h
head/sys/dev/cxgbe/adapter.h
head/sys/dev/cxgbe/common/common.h
head/sys/dev/cxgbe/common/t4_hw.c
head/sys/dev/cxgbe/common/t4_hw.h
head/sys/dev/cxgbe/common/t4_msg.h
head/sys/dev/cxgbe/common/t4_regs.h
head/sys/dev/cxgbe/common/t4_regs_values.h
head/sys/dev/cxgbe/common/t4_tcb.h
head/sys/dev/cxgbe/iw_cxgbe/cm.c
head/sys/dev/cxgbe/iw_cxgbe/cq.c
head/sys/dev/cxgbe/iw_cxgbe/device.c
head/sys/dev/cxgbe/iw_cxgbe/ev.c
head/sys/dev/cxgbe/iw_cxgbe/id_table.c
head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
head/sys/dev/cxgbe/iw_cxgbe/mem.c
head/sys/dev/cxgbe/iw_cxgbe/provider.c
head/sys/dev/cxgbe/iw_cxgbe/qp.c
head/sys/dev/cxgbe/iw_cxgbe/resource.c
head/sys/dev/cxgbe/iw_cxgbe/t4.h
head/sys/dev/cxgbe/iw_cxgbe/user.h
head/sys/dev/cxgbe/offload.h
head/sys/dev/cxgbe/osdep.h
head/sys/dev/cxgbe/t4_ioctl.h
head/sys/dev/cxgbe/t4_l2t.c
head/sys/dev/cxgbe/t4_l2t.h
head/sys/dev/cxgbe/t4_main.c
head/sys/dev/cxgbe/t4_sge.c
head/sys/dev/cxgbe/t4_tracer.c
head/sys/dev/cxgbe/tom/t4_connect.c
head/sys/dev/cxgbe/tom/t4_cpl_io.c
head/sys/dev/cxgbe/tom/t4_ddp.c
head/sys/dev/cxgbe/tom/t4_listen.c
head/sys/dev/cxgbe/tom/t4_tom.c
head/sys/dev/cxgbe/tom/t4_tom.h
head/sys/dev/cxgbe/tom/t4_tom_l2t.c
head/sys/dev/cxgbe/tom/t4_tom_l2t.h
head/sys/dev/cy/cy.c
head/sys/dev/cy/cy_isa.c
head/sys/dev/cy/cy_pci.c
head/sys/dev/cy/cyvar.h
head/sys/dev/de/dc21040reg.h
head/sys/dev/de/if_de.c
head/sys/dev/de/if_devar.h
head/sys/dev/dpt/dpt.h
head/sys/dev/dpt/dpt_pci.c
head/sys/dev/dpt/dpt_scsi.c
head/sys/dev/drm2/drm_gem.c
head/sys/dev/drm2/drm_gem_names.c
head/sys/dev/drm2/drm_gem_names.h
head/sys/dev/drm2/drm_linux_list_sort.c
head/sys/dev/drm2/i915/i915_gem.c
head/sys/dev/ed/ax88x90reg.h
head/sys/dev/ed/dl100xxreg.h
head/sys/dev/ed/if_ed.c
head/sys/dev/ed/if_ed_3c503.c
head/sys/dev/ed/if_ed_hpp.c
head/sys/dev/ed/if_ed_isa.c
head/sys/dev/ed/if_ed_novell.c
head/sys/dev/ed/if_ed_pccard.c
head/sys/dev/ed/if_ed_pci.c
head/sys/dev/ed/if_ed_rtl80x9.c
head/sys/dev/ed/if_ed_sic.c
head/sys/dev/ed/if_ed_wd80x3.c
head/sys/dev/ed/if_edvar.h
head/sys/dev/ed/rtl80x9reg.h
head/sys/dev/ed/tc5299jreg.h
head/sys/dev/ep/if_ep.c
head/sys/dev/ep/if_ep_isa.c
head/sys/dev/ep/if_ep_pccard.c
head/sys/dev/ep/if_epreg.h
head/sys/dev/ep/if_epvar.h
head/sys/dev/esp/am53c974reg.h
head/sys/dev/esp/esp_pci.c
head/sys/dev/esp/esp_sbus.c
head/sys/dev/esp/ncr53c9x.c
head/sys/dev/esp/ncr53c9xreg.h
head/sys/dev/esp/ncr53c9xvar.h
head/sys/dev/etherswitch/arswitch/arswitch.c
head/sys/dev/etherswitch/arswitch/arswitch_7240.c
head/sys/dev/etherswitch/arswitch/arswitch_7240.h
head/sys/dev/etherswitch/arswitch/arswitch_8216.c
head/sys/dev/etherswitch/arswitch/arswitch_8216.h
head/sys/dev/etherswitch/arswitch/arswitch_8226.c
head/sys/dev/etherswitch/arswitch/arswitch_8226.h
head/sys/dev/etherswitch/arswitch/arswitch_8316.c
head/sys/dev/etherswitch/arswitch/arswitch_8316.h
head/sys/dev/etherswitch/arswitch/arswitch_8327.c
head/sys/dev/etherswitch/arswitch/arswitch_8327.h
head/sys/dev/etherswitch/arswitch/arswitch_9340.c
head/sys/dev/etherswitch/arswitch/arswitch_9340.h
head/sys/dev/etherswitch/arswitch/arswitch_phy.c
head/sys/dev/etherswitch/arswitch/arswitch_phy.h
head/sys/dev/etherswitch/arswitch/arswitch_reg.c
head/sys/dev/etherswitch/arswitch/arswitch_reg.h
head/sys/dev/etherswitch/arswitch/arswitch_vlans.c
head/sys/dev/etherswitch/arswitch/arswitch_vlans.h
head/sys/dev/etherswitch/arswitch/arswitchreg.h
head/sys/dev/etherswitch/arswitch/arswitchvar.h
head/sys/dev/etherswitch/etherswitch.c
head/sys/dev/etherswitch/ip17x/ip175c.c
head/sys/dev/etherswitch/ip17x/ip175c.h
head/sys/dev/etherswitch/ip17x/ip175d.c
head/sys/dev/etherswitch/ip17x/ip175d.h
head/sys/dev/etherswitch/ip17x/ip17x.c
head/sys/dev/etherswitch/ip17x/ip17x_phy.c
head/sys/dev/etherswitch/ip17x/ip17x_phy.h
head/sys/dev/etherswitch/ip17x/ip17x_reg.h
head/sys/dev/etherswitch/ip17x/ip17x_var.h
head/sys/dev/etherswitch/ip17x/ip17x_vlans.c
head/sys/dev/etherswitch/ip17x/ip17x_vlans.h
head/sys/dev/etherswitch/miiproxy.c
head/sys/dev/etherswitch/miiproxy.h
head/sys/dev/etherswitch/rtl8366/rtl8366rb.c
head/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
head/sys/dev/etherswitch/ukswitch/ukswitch.c
head/sys/dev/ex/if_ex.c
head/sys/dev/ex/if_ex_isa.c
head/sys/dev/ex/if_ex_pccard.c
head/sys/dev/ex/if_exreg.h
head/sys/dev/ex/if_exvar.h
head/sys/dev/exca/exca.c
head/sys/dev/exca/excareg.h
head/sys/dev/exca/excavar.h
head/sys/dev/fb/creator.c
head/sys/dev/fb/creatorreg.h
head/sys/dev/fb/fb.c
head/sys/dev/fb/fbd.c
head/sys/dev/fb/fbreg.h
head/sys/dev/fb/machfb.c
head/sys/dev/fb/s3_pci.c
head/sys/dev/fb/splash.c
head/sys/dev/fb/splash_bmp.c
head/sys/dev/fb/splash_pcx.c
head/sys/dev/fb/splash_txt.c
head/sys/dev/fb/splashreg.h
head/sys/dev/fb/vesa.c
head/sys/dev/fb/vesa.h
head/sys/dev/fb/vga.c
head/sys/dev/fb/vgareg.h
head/sys/dev/fdc/fdc_acpi.c
head/sys/dev/fdc/fdc_isa.c
head/sys/dev/fdc/fdc_pccard.c
head/sys/dev/fdc/fdcvar.h
head/sys/dev/fdt/fdt_common.c
head/sys/dev/fdt/fdt_common.h
head/sys/dev/fdt/fdt_powerpc.c
head/sys/dev/fdt/fdt_slicer.c
head/sys/dev/fdt/simplebus.c
head/sys/dev/ffec/if_ffec.c
head/sys/dev/ffec/if_ffecreg.h
head/sys/dev/filemon/filemon.c
head/sys/dev/filemon/filemon.h
head/sys/dev/filemon/filemon_wrapper.c
head/sys/dev/firewire/firewire.c
head/sys/dev/firewire/firewire.h
head/sys/dev/firewire/firewire_phy.h
head/sys/dev/firewire/firewirereg.h
head/sys/dev/firewire/fwdev.c
head/sys/dev/firewire/fwohci.c
head/sys/dev/firewire/fwohci_pci.c
head/sys/dev/firewire/fwohcireg.h
head/sys/dev/firewire/fwohcivar.h
head/sys/dev/firewire/iec13213.h
head/sys/dev/firewire/iec68113.h
head/sys/dev/firewire/sbp.c
head/sys/dev/firewire/sbp.h
head/sys/dev/flash/at45d.c
head/sys/dev/flash/mx25l.c
head/sys/dev/flash/mx25lreg.h
head/sys/dev/fxp/if_fxp.c
head/sys/dev/fxp/if_fxpreg.h
head/sys/dev/fxp/if_fxpvar.h
head/sys/dev/gem/if_gem.c
head/sys/dev/gem/if_gem_pci.c
head/sys/dev/gem/if_gem_sbus.c
head/sys/dev/gem/if_gemreg.h
head/sys/dev/gem/if_gemvar.h
head/sys/dev/glxiic/glxiic.c
head/sys/dev/glxsb/glxsb.h
head/sys/dev/glxsb/glxsb_hash.c
head/sys/dev/gpio/gpiobus.c
head/sys/dev/gpio/gpiobusvar.h
head/sys/dev/gpio/gpioc.c
head/sys/dev/gpio/gpioiic.c
head/sys/dev/gpio/gpioled.c
head/sys/dev/gpio/ofw_gpiobus.c
head/sys/dev/gxemul/cons/gxemul_cons.c
head/sys/dev/gxemul/disk/gxemul_disk.c
head/sys/dev/gxemul/disk/gxemul_diskreg.h
head/sys/dev/gxemul/ether/gxreg.h
head/sys/dev/gxemul/ether/if_gx.c
head/sys/dev/hifn/hifn7751.c
head/sys/dev/hifn/hifn7751reg.h
head/sys/dev/hifn/hifn7751var.h
head/sys/dev/hme/if_hme.c
head/sys/dev/hme/if_hme_pci.c
head/sys/dev/hme/if_hme_sbus.c
head/sys/dev/hme/if_hmereg.h
head/sys/dev/hme/if_hmevar.h
head/sys/dev/hpt27xx/array.h
head/sys/dev/hpt27xx/him.h
head/sys/dev/hpt27xx/himfuncs.h
head/sys/dev/hpt27xx/hpt27xx_config.c
head/sys/dev/hpt27xx/hpt27xx_config.h
head/sys/dev/hpt27xx/hpt27xx_os_bsd.c
head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
head/sys/dev/hpt27xx/hptintf.h
head/sys/dev/hpt27xx/ldm.h
head/sys/dev/hpt27xx/list.h
head/sys/dev/hpt27xx/os_bsd.h
head/sys/dev/hpt27xx/osm.h
head/sys/dev/hpt27xx/wj.h
head/sys/dev/hptiop/hptiop.c
head/sys/dev/hptiop/hptiop.h
head/sys/dev/hptmv/access601.h
head/sys/dev/hptmv/array.h
head/sys/dev/hptmv/atapi.h
head/sys/dev/hptmv/command.h
head/sys/dev/hptmv/entry.c
head/sys/dev/hptmv/global.h
head/sys/dev/hptmv/gui_lib.c
head/sys/dev/hptmv/hptintf.h
head/sys/dev/hptmv/hptproc.c
head/sys/dev/hptmv/ioctl.c
head/sys/dev/hptmv/mv.c
head/sys/dev/hptmv/mvOs.h
head/sys/dev/hptmv/mvSata.h
head/sys/dev/hptmv/mvStorageDev.h
head/sys/dev/hptmv/osbsd.h
head/sys/dev/hptmv/raid5n.h
head/sys/dev/hptmv/vdevice.h
head/sys/dev/hptnr/array.h
head/sys/dev/hptnr/him.h
head/sys/dev/hptnr/himfuncs.h
head/sys/dev/hptnr/hptintf.h
head/sys/dev/hptnr/hptnr_config.c
head/sys/dev/hptnr/hptnr_config.h
head/sys/dev/hptnr/hptnr_os_bsd.c
head/sys/dev/hptnr/hptnr_osm_bsd.c
head/sys/dev/hptnr/ldm.h
head/sys/dev/hptnr/list.h
head/sys/dev/hptnr/os_bsd.h
head/sys/dev/hptnr/osm.h
head/sys/dev/hptnr/wj.h
head/sys/dev/hptrr/array.h
head/sys/dev/hptrr/him.h
head/sys/dev/hptrr/himfuncs.h
head/sys/dev/hptrr/hptintf.h
head/sys/dev/hptrr/hptrr_config.c
head/sys/dev/hptrr/hptrr_config.h
head/sys/dev/hptrr/hptrr_os_bsd.c
head/sys/dev/hptrr/hptrr_osm_bsd.c
head/sys/dev/hptrr/ldm.h
head/sys/dev/hptrr/list.h
head/sys/dev/hptrr/os_bsd.h
head/sys/dev/hptrr/osm.h
head/sys/dev/hwpmc/hwpmc_amd.c
head/sys/dev/hwpmc/hwpmc_amd.h
head/sys/dev/hwpmc/hwpmc_arm.c
head/sys/dev/hwpmc/hwpmc_core.c
head/sys/dev/hwpmc/hwpmc_core.h
head/sys/dev/hwpmc/hwpmc_intel.c
head/sys/dev/hwpmc/hwpmc_logging.c
head/sys/dev/hwpmc/hwpmc_mips.c
head/sys/dev/hwpmc/hwpmc_mips24k.c
head/sys/dev/hwpmc/hwpmc_mod.c
head/sys/dev/hwpmc/hwpmc_mpc7xxx.c
head/sys/dev/hwpmc/hwpmc_octeon.c
head/sys/dev/hwpmc/hwpmc_pentium.c
head/sys/dev/hwpmc/hwpmc_pentium.h
head/sys/dev/hwpmc/hwpmc_piv.c
head/sys/dev/hwpmc/hwpmc_piv.h
head/sys/dev/hwpmc/hwpmc_powerpc.c
head/sys/dev/hwpmc/hwpmc_powerpc.h
head/sys/dev/hwpmc/hwpmc_ppc970.c
head/sys/dev/hwpmc/hwpmc_ppro.c
head/sys/dev/hwpmc/hwpmc_ppro.h
head/sys/dev/hwpmc/hwpmc_soft.c
head/sys/dev/hwpmc/hwpmc_soft.h
head/sys/dev/hwpmc/hwpmc_sparc64.c
head/sys/dev/hwpmc/hwpmc_tsc.c
head/sys/dev/hwpmc/hwpmc_tsc.h
head/sys/dev/hwpmc/hwpmc_uncore.c
head/sys/dev/hwpmc/hwpmc_uncore.h
head/sys/dev/hwpmc/hwpmc_x86.c
head/sys/dev/hwpmc/hwpmc_xscale.c
head/sys/dev/hwpmc/hwpmc_xscale.h
head/sys/dev/hwpmc/pmc_events.h
head/sys/dev/hyperv/include/hyperv.h
head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
head/sys/dev/hyperv/storvsc/hv_vstorage.h
head/sys/dev/hyperv/utilities/hv_kvp.h
head/sys/dev/ic/cd1400.h
head/sys/dev/ic/cd180.h
head/sys/dev/ic/i8259.h
head/sys/dev/ic/quicc.h
head/sys/dev/ic/sab82532.h
head/sys/dev/ic/via6522reg.h
head/sys/dev/ic/z8530.h
head/sys/dev/ichwd/ichwd.c
head/sys/dev/ichwd/ichwd.h
head/sys/dev/ida/ida.c
head/sys/dev/ida/ida_disk.c
head/sys/dev/ida/ida_pci.c
head/sys/dev/ida/idareg.h
head/sys/dev/ida/idavar.h
head/sys/dev/iicbus/ad7417.c
head/sys/dev/iicbus/ad7418.c
head/sys/dev/iicbus/adt746x.c
head/sys/dev/iicbus/ds1631.c
head/sys/dev/iicbus/ds1672.c
head/sys/dev/iicbus/ds1775.c
head/sys/dev/iicbus/icee.c
head/sys/dev/iicbus/if_ic.c
head/sys/dev/iicbus/iic.c
head/sys/dev/iicbus/iic.h
head/sys/dev/iicbus/iicbb.c
head/sys/dev/iicbus/iicbus.c
head/sys/dev/iicbus/iicbus.h
head/sys/dev/iicbus/iicoc.c
head/sys/dev/iicbus/iicoc.h
head/sys/dev/iicbus/iiconf.c
head/sys/dev/iicbus/iiconf.h
head/sys/dev/iicbus/iicsmb.c
head/sys/dev/iicbus/max6690.c
head/sys/dev/iicbus/s35390a.c
head/sys/dev/iir/iir.c
head/sys/dev/iir/iir.h
head/sys/dev/iir/iir_ctrl.c
head/sys/dev/iir/iir_pci.c
head/sys/dev/io/iodev.c
head/sys/dev/io/iodev.h
head/sys/dev/ipmi/ipmi.c
head/sys/dev/ipmi/ipmi_acpi.c
head/sys/dev/ipmi/ipmi_isa.c
head/sys/dev/ipmi/ipmi_kcs.c
head/sys/dev/ipmi/ipmi_linux.c
head/sys/dev/ipmi/ipmi_pci.c
head/sys/dev/ipmi/ipmi_smbios.c
head/sys/dev/ipmi/ipmi_smbus.c
head/sys/dev/ipmi/ipmi_smic.c
head/sys/dev/ipmi/ipmi_ssif.c
head/sys/dev/ipmi/ipmivars.h
head/sys/dev/ips/ips.c
head/sys/dev/ips/ips.h
head/sys/dev/ips/ips_commands.c
head/sys/dev/ips/ips_disk.c
head/sys/dev/ips/ips_disk.h
head/sys/dev/ips/ips_ioctl.c
head/sys/dev/ips/ips_ioctl.h
head/sys/dev/ips/ips_pci.c
head/sys/dev/ips/ipsreg.h
head/sys/dev/ipw/if_ipw.c
head/sys/dev/ipw/if_ipwreg.h
head/sys/dev/ipw/if_ipwvar.h
head/sys/dev/isci/environment.h
head/sys/dev/isci/isci.c
head/sys/dev/isci/isci.h
head/sys/dev/isci/isci_controller.c
head/sys/dev/isci/isci_domain.c
head/sys/dev/isci/isci_interrupt.c
head/sys/dev/isci/isci_io_request.c
head/sys/dev/isci/isci_logger.c
head/sys/dev/isci/isci_oem_parameters.c
head/sys/dev/isci/isci_remote_device.c
head/sys/dev/isci/isci_sysctl.c
head/sys/dev/isci/isci_task_request.c
head/sys/dev/isci/isci_timer.c
head/sys/dev/isci/scil/intel_ata.h
head/sys/dev/isci/scil/intel_pci.h
head/sys/dev/isci/scil/intel_sas.h
head/sys/dev/isci/scil/intel_sat.h
head/sys/dev/isci/scil/intel_sata.h
head/sys/dev/isci/scil/intel_scsi.h
head/sys/dev/isci/scil/sati.c
head/sys/dev/isci/scil/sati.h
head/sys/dev/isci/scil/sati_abort_task_set.c
head/sys/dev/isci/scil/sati_abort_task_set.h
head/sys/dev/isci/scil/sati_atapi.c
head/sys/dev/isci/scil/sati_atapi.h
head/sys/dev/isci/scil/sati_callbacks.h
head/sys/dev/isci/scil/sati_design.h
head/sys/dev/isci/scil/sati_device.c
head/sys/dev/isci/scil/sati_device.h
head/sys/dev/isci/scil/sati_inquiry.c
head/sys/dev/isci/scil/sati_inquiry.h
head/sys/dev/isci/scil/sati_log_sense.c
head/sys/dev/isci/scil/sati_log_sense.h
head/sys/dev/isci/scil/sati_lun_reset.c
head/sys/dev/isci/scil/sati_lun_reset.h
head/sys/dev/isci/scil/sati_mode_pages.c
head/sys/dev/isci/scil/sati_mode_pages.h
head/sys/dev/isci/scil/sati_mode_select.c
head/sys/dev/isci/scil/sati_mode_select.h
head/sys/dev/isci/scil/sati_mode_sense.c
head/sys/dev/isci/scil/sati_mode_sense.h
head/sys/dev/isci/scil/sati_mode_sense_10.c
head/sys/dev/isci/scil/sati_mode_sense_10.h
head/sys/dev/isci/scil/sati_mode_sense_6.c
head/sys/dev/isci/scil/sati_mode_sense_6.h
head/sys/dev/isci/scil/sati_move.c
head/sys/dev/isci/scil/sati_move.h
head/sys/dev/isci/scil/sati_passthrough.c
head/sys/dev/isci/scil/sati_passthrough.h
head/sys/dev/isci/scil/sati_read.c
head/sys/dev/isci/scil/sati_read.h
head/sys/dev/isci/scil/sati_read_buffer.c
head/sys/dev/isci/scil/sati_read_buffer.h
head/sys/dev/isci/scil/sati_read_capacity.c
head/sys/dev/isci/scil/sati_read_capacity.h
head/sys/dev/isci/scil/sati_reassign_blocks.c
head/sys/dev/isci/scil/sati_reassign_blocks.h
head/sys/dev/isci/scil/sati_report_luns.c
head/sys/dev/isci/scil/sati_report_luns.h
head/sys/dev/isci/scil/sati_request_sense.c
head/sys/dev/isci/scil/sati_request_sense.h
head/sys/dev/isci/scil/sati_start_stop_unit.c
head/sys/dev/isci/scil/sati_start_stop_unit.h
head/sys/dev/isci/scil/sati_synchronize_cache.c
head/sys/dev/isci/scil/sati_synchronize_cache.h
head/sys/dev/isci/scil/sati_test_unit_ready.c
head/sys/dev/isci/scil/sati_test_unit_ready.h
head/sys/dev/isci/scil/sati_translator_sequence.h
head/sys/dev/isci/scil/sati_types.h
head/sys/dev/isci/scil/sati_unmap.c
head/sys/dev/isci/scil/sati_unmap.h
head/sys/dev/isci/scil/sati_util.c
head/sys/dev/isci/scil/sati_util.h
head/sys/dev/isci/scil/sati_verify.c
head/sys/dev/isci/scil/sati_verify.h
head/sys/dev/isci/scil/sati_write.c
head/sys/dev/isci/scil/sati_write.h
head/sys/dev/isci/scil/sati_write_and_verify.c
head/sys/dev/isci/scil/sati_write_and_verify.h
head/sys/dev/isci/scil/sati_write_buffer.c
head/sys/dev/isci/scil/sati_write_buffer.h
head/sys/dev/isci/scil/sati_write_long.c
head/sys/dev/isci/scil/sati_write_long.h
head/sys/dev/isci/scil/sci_abstract_list.c
head/sys/dev/isci/scil/sci_abstract_list.h
head/sys/dev/isci/scil/sci_base_controller.c
head/sys/dev/isci/scil/sci_base_controller.h
head/sys/dev/isci/scil/sci_base_domain.c
head/sys/dev/isci/scil/sci_base_domain.h
head/sys/dev/isci/scil/sci_base_iterator.c
head/sys/dev/isci/scil/sci_base_iterator.h
head/sys/dev/isci/scil/sci_base_library.c
head/sys/dev/isci/scil/sci_base_library.h
head/sys/dev/isci/scil/sci_base_logger.c
head/sys/dev/isci/scil/sci_base_logger.h
head/sys/dev/isci/scil/sci_base_memory_descriptor_list.c
head/sys/dev/isci/scil/sci_base_memory_descriptor_list.h
head/sys/dev/isci/scil/sci_base_memory_descriptor_list_decorator.c
head/sys/dev/isci/scil/sci_base_object.c
head/sys/dev/isci/scil/sci_base_object.h
head/sys/dev/isci/scil/sci_base_observer.c
head/sys/dev/isci/scil/sci_base_observer.h
head/sys/dev/isci/scil/sci_base_phy.c
head/sys/dev/isci/scil/sci_base_phy.h
head/sys/dev/isci/scil/sci_base_port.c
head/sys/dev/isci/scil/sci_base_port.h
head/sys/dev/isci/scil/sci_base_remote_device.c
head/sys/dev/isci/scil/sci_base_remote_device.h
head/sys/dev/isci/scil/sci_base_request.c
head/sys/dev/isci/scil/sci_base_request.h
head/sys/dev/isci/scil/sci_base_state.h
head/sys/dev/isci/scil/sci_base_state_machine.c
head/sys/dev/isci/scil/sci_base_state_machine.h
head/sys/dev/isci/scil/sci_base_state_machine_logger.c
head/sys/dev/isci/scil/sci_base_state_machine_logger.h
head/sys/dev/isci/scil/sci_base_state_machine_observer.c
head/sys/dev/isci/scil/sci_base_state_machine_observer.h
head/sys/dev/isci/scil/sci_base_subject.c
head/sys/dev/isci/scil/sci_base_subject.h
head/sys/dev/isci/scil/sci_controller.h
head/sys/dev/isci/scil/sci_controller_constants.h
head/sys/dev/isci/scil/sci_fast_list.h
head/sys/dev/isci/scil/sci_iterator.h
head/sys/dev/isci/scil/sci_library.h
head/sys/dev/isci/scil/sci_logger.h
head/sys/dev/isci/scil/sci_memory_descriptor_list.h
head/sys/dev/isci/scil/sci_memory_descriptor_list_decorator.h
head/sys/dev/isci/scil/sci_object.h
head/sys/dev/isci/scil/sci_overview.h
head/sys/dev/isci/scil/sci_pool.h
head/sys/dev/isci/scil/sci_simple_list.h
head/sys/dev/isci/scil/sci_status.h
head/sys/dev/isci/scil/sci_types.h
head/sys/dev/isci/scil/sci_util.c
head/sys/dev/isci/scil/sci_util.h
head/sys/dev/isci/scil/scic_config_parameters.h
head/sys/dev/isci/scil/scic_controller.h
head/sys/dev/isci/scil/scic_io_request.h
head/sys/dev/isci/scil/scic_library.h
head/sys/dev/isci/scil/scic_logger.h
head/sys/dev/isci/scil/scic_overview.h
head/sys/dev/isci/scil/scic_phy.h
head/sys/dev/isci/scil/scic_port.h
head/sys/dev/isci/scil/scic_remote_device.h
head/sys/dev/isci/scil/scic_sds_controller.c
head/sys/dev/isci/scil/scic_sds_controller.h
head/sys/dev/isci/scil/scic_sds_controller_registers.h
head/sys/dev/isci/scil/scic_sds_library.c
head/sys/dev/isci/scil/scic_sds_library.h
head/sys/dev/isci/scil/scic_sds_logger.h
head/sys/dev/isci/scil/scic_sds_pci.c
head/sys/dev/isci/scil/scic_sds_pci.h
head/sys/dev/isci/scil/scic_sds_phy.c
head/sys/dev/isci/scil/scic_sds_phy.h
head/sys/dev/isci/scil/scic_sds_phy_registers.h
head/sys/dev/isci/scil/scic_sds_port.c
head/sys/dev/isci/scil/scic_sds_port.h
head/sys/dev/isci/scil/scic_sds_port_configuration_agent.c
head/sys/dev/isci/scil/scic_sds_port_configuration_agent.h
head/sys/dev/isci/scil/scic_sds_port_registers.h
head/sys/dev/isci/scil/scic_sds_remote_device.c
head/sys/dev/isci/scil/scic_sds_remote_device.h
head/sys/dev/isci/scil/scic_sds_remote_node_context.c
head/sys/dev/isci/scil/scic_sds_remote_node_context.h
head/sys/dev/isci/scil/scic_sds_remote_node_table.c
head/sys/dev/isci/scil/scic_sds_remote_node_table.h
head/sys/dev/isci/scil/scic_sds_request.c
head/sys/dev/isci/scil/scic_sds_request.h
head/sys/dev/isci/scil/scic_sds_sgpio.c
head/sys/dev/isci/scil/scic_sds_smp_remote_device.c
head/sys/dev/isci/scil/scic_sds_smp_request.c
head/sys/dev/isci/scil/scic_sds_smp_request.h
head/sys/dev/isci/scil/scic_sds_ssp_request.c
head/sys/dev/isci/scil/scic_sds_stp_packet_request.c
head/sys/dev/isci/scil/scic_sds_stp_packet_request.h
head/sys/dev/isci/scil/scic_sds_stp_pio_request.h
head/sys/dev/isci/scil/scic_sds_stp_remote_device.c
head/sys/dev/isci/scil/scic_sds_stp_request.c
head/sys/dev/isci/scil/scic_sds_stp_request.h
head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.c
head/sys/dev/isci/scil/scic_sds_unsolicited_frame_control.h
head/sys/dev/isci/scil/scic_sgpio.h
head/sys/dev/isci/scil/scic_task_request.h
head/sys/dev/isci/scil/scic_user_callback.h
head/sys/dev/isci/scil/scif_config_parameters.h
head/sys/dev/isci/scil/scif_controller.h
head/sys/dev/isci/scil/scif_domain.h
head/sys/dev/isci/scil/scif_io_request.h
head/sys/dev/isci/scil/scif_library.h
head/sys/dev/isci/scil/scif_logger.h
head/sys/dev/isci/scil/scif_overview.h
head/sys/dev/isci/scil/scif_remote_device.h
head/sys/dev/isci/scil/scif_sas_constants.h
head/sys/dev/isci/scil/scif_sas_controller.c
head/sys/dev/isci/scil/scif_sas_controller.h
head/sys/dev/isci/scil/scif_sas_controller_state_handlers.c
head/sys/dev/isci/scil/scif_sas_controller_states.c
head/sys/dev/isci/scil/scif_sas_design.h
head/sys/dev/isci/scil/scif_sas_domain.c
head/sys/dev/isci/scil/scif_sas_domain.h
head/sys/dev/isci/scil/scif_sas_domain_state_handlers.c
head/sys/dev/isci/scil/scif_sas_domain_states.c
head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.c
head/sys/dev/isci/scil/scif_sas_high_priority_request_queue.h
head/sys/dev/isci/scil/scif_sas_internal_io_request.c
head/sys/dev/isci/scil/scif_sas_internal_io_request.h
head/sys/dev/isci/scil/scif_sas_io_request.c
head/sys/dev/isci/scil/scif_sas_io_request.h
head/sys/dev/isci/scil/scif_sas_io_request_state_handlers.c
head/sys/dev/isci/scil/scif_sas_io_request_states.c
head/sys/dev/isci/scil/scif_sas_library.c
head/sys/dev/isci/scil/scif_sas_library.h
head/sys/dev/isci/scil/scif_sas_logger.h
head/sys/dev/isci/scil/scif_sas_remote_device.c
head/sys/dev/isci/scil/scif_sas_remote_device.h
head/sys/dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c
head/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c
head/sys/dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c
head/sys/dev/isci/scil/scif_sas_remote_device_starting_substates.c
head/sys/dev/isci/scil/scif_sas_remote_device_state_handlers.c
head/sys/dev/isci/scil/scif_sas_remote_device_states.c
head/sys/dev/isci/scil/scif_sas_request.c
head/sys/dev/isci/scil/scif_sas_request.h
head/sys/dev/isci/scil/scif_sas_sati_binding.h
head/sys/dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c
head/sys/dev/isci/scil/scif_sas_smp_io_request.c
head/sys/dev/isci/scil/scif_sas_smp_io_request.h
head/sys/dev/isci/scil/scif_sas_smp_phy.c
head/sys/dev/isci/scil/scif_sas_smp_phy.h
head/sys/dev/isci/scil/scif_sas_smp_remote_device.c
head/sys/dev/isci/scil/scif_sas_smp_remote_device.h
head/sys/dev/isci/scil/scif_sas_stp_io_request.c
head/sys/dev/isci/scil/scif_sas_stp_io_request.h
head/sys/dev/isci/scil/scif_sas_stp_remote_device.c
head/sys/dev/isci/scil/scif_sas_stp_remote_device.h
head/sys/dev/isci/scil/scif_sas_stp_task_request.c
head/sys/dev/isci/scil/scif_sas_stp_task_request.h
head/sys/dev/isci/scil/scif_sas_task_request.c
head/sys/dev/isci/scil/scif_sas_task_request.h
head/sys/dev/isci/scil/scif_sas_task_request_state_handlers.c
head/sys/dev/isci/scil/scif_sas_task_request_states.c
head/sys/dev/isci/scil/scif_sas_timer.c
head/sys/dev/isci/scil/scif_task_request.h
head/sys/dev/isci/scil/scif_user_callback.h
head/sys/dev/isci/scil/scu_bios_definitions.h
head/sys/dev/isci/scil/scu_completion_codes.h
head/sys/dev/isci/scil/scu_constants.h
head/sys/dev/isci/scil/scu_event_codes.h
head/sys/dev/isci/scil/scu_registers.h
head/sys/dev/isci/scil/scu_remote_node_context.h
head/sys/dev/isci/scil/scu_task_context.h
head/sys/dev/isci/scil/scu_unsolicited_frame.h
head/sys/dev/isci/scil/scu_viit_data.h
head/sys/dev/isci/types.h
head/sys/dev/iscsi/icl.c
head/sys/dev/iscsi/icl.h
head/sys/dev/iscsi/iscsi.c
head/sys/dev/iscsi/iscsi.h
head/sys/dev/iscsi/iscsi_ioctl.h
head/sys/dev/iscsi/iscsi_proto.h
head/sys/dev/iscsi_initiator/isc_cam.c
head/sys/dev/iscsi_initiator/isc_sm.c
head/sys/dev/iscsi_initiator/isc_soc.c
head/sys/dev/iscsi_initiator/isc_subr.c
head/sys/dev/iscsi_initiator/iscsi.c
head/sys/dev/iscsi_initiator/iscsi.h
head/sys/dev/iscsi_initiator/iscsi_subr.c
head/sys/dev/iscsi_initiator/iscsivar.h
head/sys/dev/isp/isp.c
head/sys/dev/isp/isp_freebsd.c
head/sys/dev/isp/isp_freebsd.h
head/sys/dev/isp/isp_ioctl.h
head/sys/dev/isp/isp_library.c
head/sys/dev/isp/isp_library.h
head/sys/dev/isp/isp_pci.c
head/sys/dev/isp/isp_sbus.c
head/sys/dev/isp/isp_stds.h
head/sys/dev/isp/isp_target.c
head/sys/dev/isp/isp_target.h
head/sys/dev/isp/ispmbox.h
head/sys/dev/isp/ispreg.h
head/sys/dev/isp/ispvar.h
head/sys/dev/ispfw/asm_1000.h
head/sys/dev/ispfw/asm_1040.h
head/sys/dev/ispfw/asm_1080.h
head/sys/dev/ispfw/asm_12160.h
head/sys/dev/ispfw/asm_2100.h
head/sys/dev/ispfw/asm_2200.h
head/sys/dev/ispfw/asm_2300.h
head/sys/dev/ispfw/asm_2322.h
head/sys/dev/ispfw/asm_2400.h
head/sys/dev/ispfw/asm_2500.h
head/sys/dev/ispfw/ispfw.c
head/sys/dev/iwi/if_iwi.c
head/sys/dev/iwi/if_iwireg.h
head/sys/dev/iwi/if_iwivar.h
head/sys/dev/jme/if_jme.c
head/sys/dev/jme/if_jmereg.h
head/sys/dev/jme/if_jmevar.h
head/sys/dev/joy/joy.c
head/sys/dev/joy/joy_isa.c
head/sys/dev/joy/joyvar.h
head/sys/dev/kbd/kbd.c
head/sys/dev/kbd/kbdreg.h
head/sys/dev/kbd/kbdtables.h
head/sys/dev/kbdmux/kbdmux.c
head/sys/dev/ksyms/ksyms.c
head/sys/dev/le/am7990.c
head/sys/dev/le/am79900.c
head/sys/dev/le/am79900reg.h
head/sys/dev/le/am79900var.h
head/sys/dev/le/am7990reg.h
head/sys/dev/le/am7990var.h
head/sys/dev/le/if_le_isa.c
head/sys/dev/le/if_le_lebuffer.c
head/sys/dev/le/if_le_ledma.c
head/sys/dev/le/if_le_pci.c
head/sys/dev/le/lance.c
head/sys/dev/le/lancereg.h
head/sys/dev/le/lancevar.h
head/sys/dev/le/lebuffer_sbus.c
head/sys/dev/lmc/if_lmc.c
head/sys/dev/lmc/if_lmc.h
head/sys/dev/malo/if_malo.c
head/sys/dev/malo/if_malo.h
head/sys/dev/malo/if_malo_pci.c
head/sys/dev/malo/if_malohal.c
head/sys/dev/malo/if_malohal.h
head/sys/dev/malo/if_maloioctl.h
head/sys/dev/mc146818/mc146818.c
head/sys/dev/mc146818/mc146818var.h
head/sys/dev/mem/memdev.c
head/sys/dev/mem/memutil.c
head/sys/dev/mfi/mfi.c
head/sys/dev/mfi/mfi_cam.c
head/sys/dev/mfi/mfi_debug.c
head/sys/dev/mfi/mfi_disk.c
head/sys/dev/mfi/mfi_ioctl.h
head/sys/dev/mfi/mfi_linux.c
head/sys/dev/mfi/mfi_pci.c
head/sys/dev/mfi/mfi_syspd.c
head/sys/dev/mfi/mfi_tbolt.c
head/sys/dev/mfi/mfireg.h
head/sys/dev/mfi/mfivar.h
head/sys/dev/mii/acphy.c
head/sys/dev/mii/acphyreg.h
head/sys/dev/mii/atphy.c
head/sys/dev/mii/atphyreg.h
head/sys/dev/mii/axphy.c
head/sys/dev/mii/bmtphy.c
head/sys/dev/mii/bmtphyreg.h
head/sys/dev/mii/e1000phy.c
head/sys/dev/mii/gentbi.c
head/sys/dev/mii/icsphy.c
head/sys/dev/mii/icsphyreg.h
head/sys/dev/mii/ip1000phy.c
head/sys/dev/mii/ip1000phyreg.h
head/sys/dev/mii/jmphy.c
head/sys/dev/mii/jmphyreg.h
head/sys/dev/mii/lxtphy.c
head/sys/dev/mii/lxtphyreg.h
head/sys/dev/mii/mii.c
head/sys/dev/mii/mii.h
head/sys/dev/mii/mii_bitbang.c
head/sys/dev/mii/mii_bitbang.h
head/sys/dev/mii/mii_physubr.c
head/sys/dev/mii/miivar.h
head/sys/dev/mii/nsgphy.c
head/sys/dev/mii/nsphy.c
head/sys/dev/mii/nsphyreg.h
head/sys/dev/mii/nsphyter.c
head/sys/dev/mii/nsphyterreg.h
head/sys/dev/mii/qsphy.c
head/sys/dev/mii/qsphyreg.h
head/sys/dev/mii/rdcphy.c
head/sys/dev/mii/rdcphyreg.h
head/sys/dev/mii/smcphy.c
head/sys/dev/mii/smscphy.c
head/sys/dev/mii/tdkphy.c
head/sys/dev/mii/tdkphyreg.h
head/sys/dev/mii/tlphy.c
head/sys/dev/mii/tlphyreg.h
head/sys/dev/mii/ukphy.c
head/sys/dev/mii/ukphy_subr.c
head/sys/dev/mk48txx/mk48txx.c
head/sys/dev/mk48txx/mk48txxreg.h
head/sys/dev/mk48txx/mk48txxvar.h
head/sys/dev/mlx/mlx.c
head/sys/dev/mlx/mlx_disk.c
head/sys/dev/mlx/mlx_pci.c
head/sys/dev/mlx/mlxio.h
head/sys/dev/mlx/mlxreg.h
head/sys/dev/mlx/mlxvar.h
head/sys/dev/mly/mly.c
head/sys/dev/mly/mly_tables.h
head/sys/dev/mly/mlyio.h
head/sys/dev/mly/mlyreg.h
head/sys/dev/mly/mlyvar.h
head/sys/dev/mmc/bridge.h
head/sys/dev/mmc/mmc.c
head/sys/dev/mmc/mmcbrvar.h
head/sys/dev/mmc/mmcreg.h
head/sys/dev/mmc/mmcsd.c
head/sys/dev/mmc/mmcvar.h
head/sys/dev/mps/mpi/mpi2.h
head/sys/dev/mps/mpi/mpi2_cnfg.h
head/sys/dev/mps/mpi/mpi2_hbd.h
head/sys/dev/mps/mpi/mpi2_init.h
head/sys/dev/mps/mpi/mpi2_ioc.h
head/sys/dev/mps/mpi/mpi2_ra.h
head/sys/dev/mps/mpi/mpi2_raid.h
head/sys/dev/mps/mpi/mpi2_sas.h
head/sys/dev/mps/mpi/mpi2_targ.h
head/sys/dev/mps/mpi/mpi2_tool.h
head/sys/dev/mps/mpi/mpi2_type.h
head/sys/dev/mps/mps.c
head/sys/dev/mps/mps_config.c
head/sys/dev/mps/mps_mapping.c
head/sys/dev/mps/mps_mapping.h
head/sys/dev/mps/mps_pci.c
head/sys/dev/mps/mps_sas.c
head/sys/dev/mps/mps_sas.h
head/sys/dev/mps/mps_sas_lsi.c
head/sys/dev/mps/mps_table.c
head/sys/dev/mps/mps_table.h
head/sys/dev/mps/mpsvar.h
head/sys/dev/mpt/mpt.c
head/sys/dev/mpt/mpt.h
head/sys/dev/mpt/mpt_cam.c
head/sys/dev/mpt/mpt_cam.h
head/sys/dev/mpt/mpt_debug.c
head/sys/dev/mpt/mpt_pci.c
head/sys/dev/mpt/mpt_raid.c
head/sys/dev/mpt/mpt_raid.h
head/sys/dev/mpt/mpt_reg.h
head/sys/dev/mse/mse.c
head/sys/dev/mse/mse_isa.c
head/sys/dev/mse/msevar.h
head/sys/dev/mvs/mvs.c
head/sys/dev/mvs/mvs.h
head/sys/dev/mvs/mvs_pci.c
head/sys/dev/mvs/mvs_soc.c
head/sys/dev/mwl/if_mwl.c
head/sys/dev/mwl/if_mwl_pci.c
head/sys/dev/mwl/if_mwlioctl.h
head/sys/dev/mwl/if_mwlvar.h
head/sys/dev/mwl/mwldiag.h
head/sys/dev/mwl/mwlhal.c
head/sys/dev/mwl/mwlhal.h
head/sys/dev/mwl/mwlreg.h
head/sys/dev/mxge/eth_z8e.h
head/sys/dev/mxge/ethp_z8e.h
head/sys/dev/mxge/if_mxge.c
head/sys/dev/mxge/if_mxge_var.h
head/sys/dev/mxge/mcp_gen_header.h
head/sys/dev/mxge/mxge_mcp.h
head/sys/dev/mxge/rss_eth_z8e.h
head/sys/dev/mxge/rss_ethp_z8e.h
head/sys/dev/my/if_my.c
head/sys/dev/my/if_myreg.h
head/sys/dev/nand/nand.c
head/sys/dev/nand/nand.h
head/sys/dev/nand/nand_bbt.c
head/sys/dev/nand/nand_cdev.c
head/sys/dev/nand/nand_dev.h
head/sys/dev/nand/nand_ecc_pos.h
head/sys/dev/nand/nand_generic.c
head/sys/dev/nand/nand_geom.c
head/sys/dev/nand/nand_id.c
head/sys/dev/nand/nandbus.c
head/sys/dev/nand/nandbus.h
head/sys/dev/nand/nandsim.c
head/sys/dev/nand/nandsim.h
head/sys/dev/nand/nandsim_chip.c
head/sys/dev/nand/nandsim_chip.h
head/sys/dev/nand/nandsim_ctrl.c
head/sys/dev/nand/nandsim_log.c
head/sys/dev/nand/nandsim_log.h
head/sys/dev/nand/nandsim_swap.c
head/sys/dev/nand/nandsim_swap.h
head/sys/dev/nand/nfc_at91.c
head/sys/dev/nand/nfc_at91.h
head/sys/dev/nand/nfc_fsl.c
head/sys/dev/nand/nfc_fsl.h
head/sys/dev/nand/nfc_mv.c
head/sys/dev/ncv/ncr53c500.c
head/sys/dev/ncv/ncr53c500_pccard.c
head/sys/dev/ncv/ncr53c500hw.h
head/sys/dev/ncv/ncr53c500hwtab.h
head/sys/dev/ncv/ncr53c500reg.h
head/sys/dev/ncv/ncr53c500var.h
head/sys/dev/netmap/if_em_netmap.h
head/sys/dev/netmap/if_igb_netmap.h
head/sys/dev/netmap/if_lem_netmap.h
head/sys/dev/netmap/if_re_netmap.h
head/sys/dev/netmap/ixgbe_netmap.h
head/sys/dev/netmap/netmap.c
head/sys/dev/netmap/netmap_freebsd.c
head/sys/dev/netmap/netmap_generic.c
head/sys/dev/netmap/netmap_kern.h
head/sys/dev/netmap/netmap_mbq.c
head/sys/dev/netmap/netmap_mbq.h
head/sys/dev/netmap/netmap_mem2.c
head/sys/dev/netmap/netmap_mem2.h
head/sys/dev/netmap/netmap_offloadings.c
head/sys/dev/netmap/netmap_pipe.c
head/sys/dev/netmap/netmap_vale.c
head/sys/dev/nsp/nsp.c
head/sys/dev/nsp/nsp_pccard.c
head/sys/dev/nsp/nspreg.h
head/sys/dev/nsp/nspvar.h
head/sys/dev/null/null.c
head/sys/dev/nvd/nvd.c
head/sys/dev/nvme/nvme.c
head/sys/dev/nvme/nvme.h
head/sys/dev/nvme/nvme_ctrlr.c
head/sys/dev/nvme/nvme_ctrlr_cmd.c
head/sys/dev/nvme/nvme_ns.c
head/sys/dev/nvme/nvme_ns_cmd.c
head/sys/dev/nvme/nvme_private.h
head/sys/dev/nvme/nvme_qpair.c
head/sys/dev/nvme/nvme_sysctl.c
head/sys/dev/nvme/nvme_test.c
head/sys/dev/nvme/nvme_util.c
head/sys/dev/nvram/nvram.c
head/sys/dev/nvram2env/nvram2env.c
head/sys/dev/nxge/if_nxge.c
head/sys/dev/nxge/if_nxge.h
head/sys/dev/nxge/include/version.h
head/sys/dev/nxge/include/xge-debug.h
head/sys/dev/nxge/include/xge-defs.h
head/sys/dev/nxge/include/xge-list.h
head/sys/dev/nxge/include/xge-os-pal.h
head/sys/dev/nxge/include/xge-queue.h
head/sys/dev/nxge/include/xgehal-channel.h
head/sys/dev/nxge/include/xgehal-config.h
head/sys/dev/nxge/include/xgehal-device.h
head/sys/dev/nxge/include/xgehal-driver.h
head/sys/dev/nxge/include/xgehal-event.h
head/sys/dev/nxge/include/xgehal-fifo.h
head/sys/dev/nxge/include/xgehal-mgmt.h
head/sys/dev/nxge/include/xgehal-mgmtaux.h
head/sys/dev/nxge/include/xgehal-mm.h
head/sys/dev/nxge/include/xgehal-regs.h
head/sys/dev/nxge/include/xgehal-ring.h
head/sys/dev/nxge/include/xgehal-stats.h
head/sys/dev/nxge/include/xgehal-types.h
head/sys/dev/nxge/include/xgehal.h
head/sys/dev/nxge/xge-osdep.h
head/sys/dev/nxge/xgehal/xge-queue.c
head/sys/dev/nxge/xgehal/xgehal-channel-fp.c
head/sys/dev/nxge/xgehal/xgehal-channel.c
head/sys/dev/nxge/xgehal/xgehal-config.c
head/sys/dev/nxge/xgehal/xgehal-device-fp.c
head/sys/dev/nxge/xgehal/xgehal-device.c
head/sys/dev/nxge/xgehal/xgehal-driver.c
head/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
head/sys/dev/nxge/xgehal/xgehal-fifo.c
head/sys/dev/nxge/xgehal/xgehal-mgmt.c
head/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
head/sys/dev/nxge/xgehal/xgehal-mm.c
head/sys/dev/nxge/xgehal/xgehal-ring-fp.c
head/sys/dev/nxge/xgehal/xgehal-ring.c
head/sys/dev/nxge/xgehal/xgehal-stats.c
head/sys/dev/nxge/xgell-version.h
head/sys/dev/ofw/ofw_bus.h
head/sys/dev/ofw/ofw_bus_subr.c
head/sys/dev/ofw/ofw_bus_subr.h
head/sys/dev/ofw/ofw_console.c
head/sys/dev/ofw/ofw_disk.c
head/sys/dev/ofw/ofw_fdt.c
head/sys/dev/ofw/ofw_pci.h
head/sys/dev/ofw/ofw_standard.c
head/sys/dev/ofw/ofwvar.h
head/sys/dev/ofw/openfirm.c
head/sys/dev/ofw/openfirm.h
head/sys/dev/ofw/openpromio.c
head/sys/dev/ofw/openpromio.h
head/sys/dev/pbio/pbio.c
head/sys/dev/pbio/pbioio.h
head/sys/dev/pccard/pccard.c
head/sys/dev/pccard/pccard_cis.c
head/sys/dev/pccard/pccard_cis.h
head/sys/dev/pccard/pccard_cis_quirks.c
head/sys/dev/pccard/pccard_device.c
head/sys/dev/pccard/pccardreg.h
head/sys/dev/pccard/pccardvar.h
head/sys/dev/pccard/pccardvarp.h
head/sys/dev/pccbb/pccbb.c
head/sys/dev/pccbb/pccbb_isa.c
head/sys/dev/pccbb/pccbb_pci.c
head/sys/dev/pccbb/pccbbdevid.h
head/sys/dev/pccbb/pccbbreg.h
head/sys/dev/pccbb/pccbbvar.h
head/sys/dev/pcf/envctrl.c
head/sys/dev/pcf/pcf.c
head/sys/dev/pcf/pcf_ebus.c
head/sys/dev/pcf/pcf_isa.c
head/sys/dev/pcf/pcfvar.h
head/sys/dev/pci/fixup_pci.c
head/sys/dev/pci/hostb_pci.c
head/sys/dev/pci/ignore_pci.c
head/sys/dev/pci/isa_pci.c
head/sys/dev/pci/pci.c
head/sys/dev/pci/pci_pci.c
head/sys/dev/pci/pci_private.h
head/sys/dev/pci/pci_subr.c
head/sys/dev/pci/pci_user.c
head/sys/dev/pci/pcib_private.h
head/sys/dev/pci/pcireg.h
head/sys/dev/pci/pcivar.h
head/sys/dev/pci/vga_pci.c
head/sys/dev/pdq/if_fpa.c
head/sys/dev/pdq/pdq.c
head/sys/dev/pdq/pdq_freebsd.h
head/sys/dev/pdq/pdq_ifsubr.c
head/sys/dev/pdq/pdqreg.h
head/sys/dev/pdq/pdqvar.h
head/sys/dev/powermac_nvram/powermac_nvram.c
head/sys/dev/powermac_nvram/powermac_nvramvar.h
head/sys/dev/ppbus/if_plip.c
head/sys/dev/ppbus/immio.c
head/sys/dev/ppbus/lpbb.c
head/sys/dev/ppbus/lpt.h
head/sys/dev/ppbus/pcfclock.c
head/sys/dev/ppbus/ppb_1284.c
head/sys/dev/ppbus/ppb_1284.h
head/sys/dev/ppbus/ppb_base.c
head/sys/dev/ppbus/ppb_msq.c
head/sys/dev/ppbus/ppb_msq.h
head/sys/dev/ppbus/ppbconf.c
head/sys/dev/ppbus/ppbconf.h
head/sys/dev/ppbus/ppbio.h
head/sys/dev/ppbus/ppi.c
head/sys/dev/ppbus/ppi.h
head/sys/dev/ppbus/vpo.c
head/sys/dev/ppbus/vpoio.c
head/sys/dev/ppbus/vpoio.h
head/sys/dev/ppc/ppc.c
head/sys/dev/ppc/ppc_acpi.c
head/sys/dev/ppc/ppc_isa.c
head/sys/dev/ppc/ppc_pci.c
head/sys/dev/ppc/ppc_puc.c
head/sys/dev/ppc/ppcreg.h
head/sys/dev/ppc/ppcvar.h
head/sys/dev/pst/pst-iop.c
head/sys/dev/pst/pst-iop.h
head/sys/dev/pst/pst-pci.c
head/sys/dev/pst/pst-raid.c
head/sys/dev/pty/pty.c
head/sys/dev/puc/puc.c
head/sys/dev/puc/puc_bfe.h
head/sys/dev/puc/puc_bus.h
head/sys/dev/puc/puc_cfg.c
head/sys/dev/puc/puc_cfg.h
head/sys/dev/puc/puc_pccard.c
head/sys/dev/puc/puc_pci.c
head/sys/dev/puc/pucdata.c
head/sys/dev/qlxgb/qla_dbg.c
head/sys/dev/qlxgb/qla_dbg.h
head/sys/dev/qlxgb/qla_def.h
head/sys/dev/qlxgb/qla_glbl.h
head/sys/dev/qlxgb/qla_hw.c
head/sys/dev/qlxgb/qla_hw.h
head/sys/dev/qlxgb/qla_inline.h
head/sys/dev/qlxgb/qla_ioctl.c
head/sys/dev/qlxgb/qla_ioctl.h
head/sys/dev/qlxgb/qla_isr.c
head/sys/dev/qlxgb/qla_misc.c
head/sys/dev/qlxgb/qla_os.c
head/sys/dev/qlxgb/qla_os.h
head/sys/dev/qlxgb/qla_reg.h
head/sys/dev/qlxgb/qla_ver.h
head/sys/dev/qlxgbe/ql_dbg.c
head/sys/dev/qlxgbe/ql_dbg.h
head/sys/dev/qlxgbe/ql_def.h
head/sys/dev/qlxgbe/ql_glbl.h
head/sys/dev/qlxgbe/ql_hw.c
head/sys/dev/qlxgbe/ql_hw.h
head/sys/dev/qlxgbe/ql_inline.h
head/sys/dev/qlxgbe/ql_ioctl.c
head/sys/dev/qlxgbe/ql_ioctl.h
head/sys/dev/qlxgbe/ql_isr.c
head/sys/dev/qlxgbe/ql_misc.c
head/sys/dev/qlxgbe/ql_os.c
head/sys/dev/qlxgbe/ql_os.h
head/sys/dev/qlxgbe/ql_reset.c
head/sys/dev/qlxgbe/ql_tmplt.h
head/sys/dev/qlxgbe/ql_ver.h
head/sys/dev/qlxge/qls_dbg.c
head/sys/dev/qlxge/qls_dbg.h
head/sys/dev/qlxge/qls_def.h
head/sys/dev/qlxge/qls_dump.c
head/sys/dev/qlxge/qls_dump.h
head/sys/dev/qlxge/qls_glbl.h
head/sys/dev/qlxge/qls_hw.c
head/sys/dev/qlxge/qls_hw.h
head/sys/dev/qlxge/qls_inline.h
head/sys/dev/qlxge/qls_ioctl.c
head/sys/dev/qlxge/qls_ioctl.h
head/sys/dev/qlxge/qls_isr.c
head/sys/dev/qlxge/qls_os.c
head/sys/dev/qlxge/qls_os.h
head/sys/dev/qlxge/qls_ver.h
head/sys/dev/quicc/quicc_bfe.h
head/sys/dev/quicc/quicc_bfe_fdt.c
head/sys/dev/quicc/quicc_bus.h
head/sys/dev/quicc/quicc_core.c
head/sys/dev/rc/rc.c
head/sys/dev/rc/rcreg.h
head/sys/dev/rndtest/rndtest.c
head/sys/dev/rndtest/rndtest.h
head/sys/dev/rp/rp.c
head/sys/dev/rp/rp_isa.c
head/sys/dev/rp/rp_pci.c
head/sys/dev/rp/rpreg.h
head/sys/dev/rp/rpvar.h
head/sys/dev/rt/if_rt.c
head/sys/dev/rt/if_rtreg.h
head/sys/dev/rt/if_rtvar.h
head/sys/dev/safe/safe.c
head/sys/dev/safe/safereg.h
head/sys/dev/safe/safevar.h
head/sys/dev/scc/scc_bfe.h
head/sys/dev/scc/scc_bfe_ebus.c
head/sys/dev/scc/scc_bfe_macio.c
head/sys/dev/scc/scc_bfe_quicc.c
head/sys/dev/scc/scc_bfe_sbus.c
head/sys/dev/scc/scc_bus.h
head/sys/dev/scc/scc_core.c
head/sys/dev/scc/scc_dev_quicc.c
head/sys/dev/scc/scc_dev_sab82532.c
head/sys/dev/scc/scc_dev_z8530.c
head/sys/dev/sdhci/sdhci.c
head/sys/dev/sdhci/sdhci.h
head/sys/dev/sdhci/sdhci_fdt.c
head/sys/dev/sdhci/sdhci_pci.c
head/sys/dev/sec/sec.c
head/sys/dev/sec/sec.h
head/sys/dev/sfxge/common/efsys.h
head/sys/dev/sfxge/common/efx.h
head/sys/dev/sfxge/common/efx_bootcfg.c
head/sys/dev/sfxge/common/efx_ev.c
head/sys/dev/sfxge/common/efx_filter.c
head/sys/dev/sfxge/common/efx_impl.h
head/sys/dev/sfxge/common/efx_intr.c
head/sys/dev/sfxge/common/efx_mac.c
head/sys/dev/sfxge/common/efx_mcdi.c
head/sys/dev/sfxge/common/efx_mcdi.h
head/sys/dev/sfxge/common/efx_mon.c
head/sys/dev/sfxge/common/efx_nic.c
head/sys/dev/sfxge/common/efx_nvram.c
head/sys/dev/sfxge/common/efx_phy.c
head/sys/dev/sfxge/common/efx_port.c
head/sys/dev/sfxge/common/efx_regs.h
head/sys/dev/sfxge/common/efx_regs_ef10.h
head/sys/dev/sfxge/common/efx_regs_mcdi.h
head/sys/dev/sfxge/common/efx_regs_pci.h
head/sys/dev/sfxge/common/efx_rx.c
head/sys/dev/sfxge/common/efx_sram.c
head/sys/dev/sfxge/common/efx_tx.c
head/sys/dev/sfxge/common/efx_types.h
head/sys/dev/sfxge/common/efx_vpd.c
head/sys/dev/sfxge/common/siena_flash.h
head/sys/dev/sfxge/common/siena_impl.h
head/sys/dev/sfxge/common/siena_mac.c
head/sys/dev/sfxge/common/siena_nic.c
head/sys/dev/sfxge/common/siena_nvram.c
head/sys/dev/sfxge/common/siena_phy.c
head/sys/dev/sfxge/common/siena_sram.c
head/sys/dev/sfxge/common/siena_vpd.c
head/sys/dev/sfxge/sfxge.c
head/sys/dev/sfxge/sfxge.h
head/sys/dev/sfxge/sfxge_dma.c
head/sys/dev/sfxge/sfxge_ev.c
head/sys/dev/sfxge/sfxge_intr.c
head/sys/dev/sfxge/sfxge_mcdi.c
head/sys/dev/sfxge/sfxge_port.c
head/sys/dev/sfxge/sfxge_rx.c
head/sys/dev/sfxge/sfxge_rx.h
head/sys/dev/sfxge/sfxge_tx.c
head/sys/dev/sfxge/sfxge_tx.h
head/sys/dev/siba/siba_bwn.c
head/sys/dev/siba/siba_core.c
head/sys/dev/siba/siba_ids.h
head/sys/dev/siba/sibareg.h
head/sys/dev/siba/sibavar.h
head/sys/dev/siis/siis.c
head/sys/dev/siis/siis.h
head/sys/dev/sio/sio_isa.c
head/sys/dev/sio/sio_pccard.c
head/sys/dev/sio/sio_pci.c
head/sys/dev/sio/sio_puc.c
head/sys/dev/smbus/smb.c
head/sys/dev/smbus/smb.h
head/sys/dev/smbus/smbconf.c
head/sys/dev/smbus/smbconf.h
head/sys/dev/smbus/smbus.c
head/sys/dev/smbus/smbus.h
head/sys/dev/smc/if_smc.c
head/sys/dev/smc/if_smcreg.h
head/sys/dev/smc/if_smcvar.h
head/sys/dev/sn/if_sn.c
head/sys/dev/sn/if_sn_isa.c
head/sys/dev/sn/if_sn_pccard.c
head/sys/dev/sn/if_snreg.h
head/sys/dev/sn/if_snvar.h
head/sys/dev/sn/ositech.h
head/sys/dev/snp/snp.c
head/sys/dev/sound/chip.h
head/sys/dev/sound/clone.c
head/sys/dev/sound/clone.h
head/sys/dev/sound/driver.c
head/sys/dev/sound/isa/ad1816.c
head/sys/dev/sound/isa/ad1816.h
head/sys/dev/sound/isa/ess.c
head/sys/dev/sound/isa/gusc.c
head/sys/dev/sound/isa/mss.c
head/sys/dev/sound/isa/mss.h
head/sys/dev/sound/isa/sb.h
head/sys/dev/sound/isa/sb16.c
head/sys/dev/sound/isa/sb8.c
head/sys/dev/sound/isa/sbc.c
head/sys/dev/sound/isa/sndbuf_dma.c
head/sys/dev/sound/macio/aoa.c
head/sys/dev/sound/macio/aoa.h
head/sys/dev/sound/macio/davbus.c
head/sys/dev/sound/macio/davbusreg.h
head/sys/dev/sound/macio/i2s.c
head/sys/dev/sound/macio/onyx.c
head/sys/dev/sound/macio/snapper.c
head/sys/dev/sound/macio/tumbler.c
head/sys/dev/sound/midi/midi.c
head/sys/dev/sound/midi/midi.h
head/sys/dev/sound/midi/midiq.h
head/sys/dev/sound/midi/mpu401.c
head/sys/dev/sound/midi/mpu401.h
head/sys/dev/sound/midi/sequencer.c
head/sys/dev/sound/midi/sequencer.h
head/sys/dev/sound/pci/allegro_code.h
head/sys/dev/sound/pci/allegro_reg.h
head/sys/dev/sound/pci/als4000.c
head/sys/dev/sound/pci/als4000.h
head/sys/dev/sound/pci/atiixp.c
head/sys/dev/sound/pci/atiixp.h
head/sys/dev/sound/pci/aureal.c
head/sys/dev/sound/pci/aureal.h
head/sys/dev/sound/pci/cmi.c
head/sys/dev/sound/pci/cmireg.h
head/sys/dev/sound/pci/cs4281.c
head/sys/dev/sound/pci/cs4281.h
head/sys/dev/sound/pci/cs461x_dsp.h
head/sys/dev/sound/pci/csa.c
head/sys/dev/sound/pci/csapcm.c
head/sys/dev/sound/pci/csareg.h
head/sys/dev/sound/pci/csavar.h
head/sys/dev/sound/pci/ds1-fw.h
head/sys/dev/sound/pci/ds1.c
head/sys/dev/sound/pci/emu10k1.c
head/sys/dev/sound/pci/emu10kx-midi.c
head/sys/dev/sound/pci/emu10kx-pcm.c
head/sys/dev/sound/pci/emu10kx.c
head/sys/dev/sound/pci/emu10kx.h
head/sys/dev/sound/pci/envy24.c
head/sys/dev/sound/pci/envy24.h
head/sys/dev/sound/pci/envy24ht.c
head/sys/dev/sound/pci/envy24ht.h
head/sys/dev/sound/pci/es137x.c
head/sys/dev/sound/pci/es137x.h
head/sys/dev/sound/pci/fm801.c
head/sys/dev/sound/pci/hda/hda_reg.h
head/sys/dev/sound/pci/hda/hdaa.c
head/sys/dev/sound/pci/hda/hdaa.h
head/sys/dev/sound/pci/hda/hdaa_patches.c
head/sys/dev/sound/pci/hda/hdac.c
head/sys/dev/sound/pci/hda/hdac.h
head/sys/dev/sound/pci/hda/hdac_private.h
head/sys/dev/sound/pci/hda/hdac_reg.h
head/sys/dev/sound/pci/hda/hdacc.c
head/sys/dev/sound/pci/hdspe-pcm.c
head/sys/dev/sound/pci/hdspe.c
head/sys/dev/sound/pci/hdspe.h
head/sys/dev/sound/pci/ich.c
head/sys/dev/sound/pci/ich.h
head/sys/dev/sound/pci/maestro.c
head/sys/dev/sound/pci/maestro3.c
head/sys/dev/sound/pci/maestro_reg.h
head/sys/dev/sound/pci/neomagic-coeff.h
head/sys/dev/sound/pci/neomagic.c
head/sys/dev/sound/pci/neomagic.h
head/sys/dev/sound/pci/solo.c
head/sys/dev/sound/pci/spicds.c
head/sys/dev/sound/pci/spicds.h
head/sys/dev/sound/pci/t4dwave.c
head/sys/dev/sound/pci/t4dwave.h
head/sys/dev/sound/pci/via8233.c
head/sys/dev/sound/pci/via8233.h
head/sys/dev/sound/pci/via82c686.c
head/sys/dev/sound/pci/via82c686.h
head/sys/dev/sound/pci/vibes.c
head/sys/dev/sound/pci/vibes.h
head/sys/dev/sound/pcm/ac97.c
head/sys/dev/sound/pcm/ac97.h
head/sys/dev/sound/pcm/ac97_patch.c
head/sys/dev/sound/pcm/ac97_patch.h
head/sys/dev/sound/pcm/buffer.c
head/sys/dev/sound/pcm/buffer.h
head/sys/dev/sound/pcm/channel.c
head/sys/dev/sound/pcm/channel.h
head/sys/dev/sound/pcm/dsp.c
head/sys/dev/sound/pcm/dsp.h
head/sys/dev/sound/pcm/feeder.c
head/sys/dev/sound/pcm/feeder.h
head/sys/dev/sound/pcm/feeder_chain.c
head/sys/dev/sound/pcm/feeder_eq.c
head/sys/dev/sound/pcm/feeder_format.c
head/sys/dev/sound/pcm/feeder_matrix.c
head/sys/dev/sound/pcm/feeder_mixer.c
head/sys/dev/sound/pcm/feeder_rate.c
head/sys/dev/sound/pcm/feeder_volume.c
head/sys/dev/sound/pcm/g711.h
head/sys/dev/sound/pcm/intpcm.h
head/sys/dev/sound/pcm/matrix.h
head/sys/dev/sound/pcm/matrix_map.h
head/sys/dev/sound/pcm/mixer.c
head/sys/dev/sound/pcm/mixer.h
head/sys/dev/sound/pcm/pcm.h
head/sys/dev/sound/pcm/sndstat.c
head/sys/dev/sound/pcm/sndstat.h
head/sys/dev/sound/pcm/sound.c
head/sys/dev/sound/pcm/sound.h
head/sys/dev/sound/pcm/vchan.c
head/sys/dev/sound/pcm/vchan.h
head/sys/dev/sound/sbus/apcdmareg.h
head/sys/dev/sound/sbus/cs4231.c
head/sys/dev/sound/sbus/cs4231.h
head/sys/dev/sound/unit.c
head/sys/dev/sound/unit.h
head/sys/dev/sound/usb/uaudio.c
head/sys/dev/sound/usb/uaudio.h
head/sys/dev/sound/usb/uaudio_pcm.c
head/sys/dev/sound/usb/uaudioreg.h
head/sys/dev/sound/version.h
head/sys/dev/spibus/ofw_spibus.c
head/sys/dev/stg/tmc18c30.c
head/sys/dev/stg/tmc18c30_isa.c
head/sys/dev/stg/tmc18c30_pccard.c
head/sys/dev/stg/tmc18c30_pci.c
head/sys/dev/stg/tmc18c30_subr.c
head/sys/dev/stg/tmc18c30reg.h
head/sys/dev/stg/tmc18c30var.h
head/sys/dev/stge/if_stge.c
head/sys/dev/stge/if_stgereg.h
head/sys/dev/sym/sym_conf.h
head/sys/dev/sym/sym_defs.h
head/sys/dev/sym/sym_fw.h
head/sys/dev/sym/sym_fw1.h
head/sys/dev/sym/sym_fw2.h
head/sys/dev/sym/sym_hipd.c
head/sys/dev/syscons/apm/apm_saver.c
head/sys/dev/syscons/blank/blank_saver.c
head/sys/dev/syscons/daemon/daemon_saver.c
head/sys/dev/syscons/dragon/dragon_saver.c
head/sys/dev/syscons/fade/fade_saver.c
head/sys/dev/syscons/fire/fire_saver.c
head/sys/dev/syscons/green/green_saver.c
head/sys/dev/syscons/logo/logo_saver.c
head/sys/dev/syscons/rain/rain_saver.c
head/sys/dev/syscons/scgfbrndr.c
head/sys/dev/syscons/schistory.c
head/sys/dev/syscons/scmouse.c
head/sys/dev/syscons/scterm-teken.c
head/sys/dev/syscons/scterm.c
head/sys/dev/syscons/scvesactl.c
head/sys/dev/syscons/scvgarndr.c
head/sys/dev/syscons/scvidctl.c
head/sys/dev/syscons/scvtb.c
head/sys/dev/syscons/snake/snake_saver.c
head/sys/dev/syscons/star/star_saver.c
head/sys/dev/syscons/syscons.c
head/sys/dev/syscons/syscons.h
head/sys/dev/syscons/sysmouse.c
head/sys/dev/syscons/warp/warp_saver.c
head/sys/dev/tdfx/tdfx_io.h
head/sys/dev/tdfx/tdfx_linux.c
head/sys/dev/tdfx/tdfx_linux.h
head/sys/dev/tdfx/tdfx_pci.c
head/sys/dev/tdfx/tdfx_pci.h
head/sys/dev/tdfx/tdfx_vars.h
head/sys/dev/terasic/de4led/terasic_de4led.c
head/sys/dev/terasic/de4led/terasic_de4led.h
head/sys/dev/terasic/de4led/terasic_de4led_fdt.c
head/sys/dev/terasic/de4led/terasic_de4led_nexus.c
head/sys/dev/terasic/mtl/terasic_mtl.c
head/sys/dev/terasic/mtl/terasic_mtl.h
head/sys/dev/terasic/mtl/terasic_mtl_fdt.c
head/sys/dev/terasic/mtl/terasic_mtl_nexus.c
head/sys/dev/terasic/mtl/terasic_mtl_pixel.c
head/sys/dev/terasic/mtl/terasic_mtl_reg.c
head/sys/dev/terasic/mtl/terasic_mtl_syscons.c
head/sys/dev/terasic/mtl/terasic_mtl_text.c
head/sys/dev/trm/trm.c
head/sys/dev/trm/trm.h
head/sys/dev/tsec/if_tsec.c
head/sys/dev/tsec/if_tsec.h
head/sys/dev/tsec/if_tsec_fdt.c
head/sys/dev/tsec/if_tsecreg.h
head/sys/dev/twa/tw_cl.h
head/sys/dev/twa/tw_cl_externs.h
head/sys/dev/twa/tw_cl_fwif.h
head/sys/dev/twa/tw_cl_init.c
head/sys/dev/twa/tw_cl_intr.c
head/sys/dev/twa/tw_cl_io.c
head/sys/dev/twa/tw_cl_ioctl.h
head/sys/dev/twa/tw_cl_misc.c
head/sys/dev/twa/tw_cl_share.h
head/sys/dev/twa/tw_osl.h
head/sys/dev/twa/tw_osl_cam.c
head/sys/dev/twa/tw_osl_externs.h
head/sys/dev/twa/tw_osl_freebsd.c
head/sys/dev/twa/tw_osl_includes.h
head/sys/dev/twa/tw_osl_inline.h
head/sys/dev/twa/tw_osl_ioctl.h
head/sys/dev/twa/tw_osl_share.h
head/sys/dev/twa/tw_osl_types.h
head/sys/dev/twe/twe.c
head/sys/dev/twe/twe_compat.h
head/sys/dev/twe/twe_freebsd.c
head/sys/dev/twe/twe_tables.h
head/sys/dev/twe/tweio.h
head/sys/dev/twe/twereg.h
head/sys/dev/twe/twevar.h
head/sys/dev/tws/tws_cam.c
head/sys/dev/tx/if_tx.c
head/sys/dev/tx/if_txreg.h
head/sys/dev/tx/if_txvar.h
head/sys/dev/txp/3c990img.h
head/sys/dev/txp/if_txpreg.h
head/sys/dev/uart/uart.h
head/sys/dev/uart/uart_bus.h
head/sys/dev/uart/uart_bus_acpi.c
head/sys/dev/uart/uart_bus_ebus.c
head/sys/dev/uart/uart_bus_fdt.c
head/sys/dev/uart/uart_bus_isa.c
head/sys/dev/uart/uart_bus_pccard.c
head/sys/dev/uart/uart_bus_pci.c
head/sys/dev/uart/uart_bus_puc.c
head/sys/dev/uart/uart_bus_scc.c
head/sys/dev/uart/uart_core.c
head/sys/dev/uart/uart_cpu.h
head/sys/dev/uart/uart_cpu_fdt.c
head/sys/dev/uart/uart_cpu_powerpc.c
head/sys/dev/uart/uart_cpu_sparc64.c
head/sys/dev/uart/uart_cpu_x86.c
head/sys/dev/uart/uart_dbg.c
head/sys/dev/uart/uart_dev_imx.c
head/sys/dev/uart/uart_dev_lpc.c
head/sys/dev/uart/uart_dev_ns8250.c
head/sys/dev/uart/uart_dev_ns8250.h
head/sys/dev/uart/uart_dev_pl011.c
head/sys/dev/uart/uart_dev_quicc.c
head/sys/dev/uart/uart_dev_sab82532.c
head/sys/dev/uart/uart_dev_ti8250.c
head/sys/dev/uart/uart_dev_z8530.c
head/sys/dev/uart/uart_kbd_sun.c
head/sys/dev/uart/uart_kbd_sun.h
head/sys/dev/uart/uart_subr.c
head/sys/dev/uart/uart_tty.c
head/sys/dev/ubsec/ubsec.c
head/sys/dev/ubsec/ubsecreg.h
head/sys/dev/ubsec/ubsecvar.h
head/sys/dev/usb/controller/at91dci.c
head/sys/dev/usb/controller/at91dci.h
head/sys/dev/usb/controller/at91dci_atmelarm.c
head/sys/dev/usb/controller/at91dci_fdt.c
head/sys/dev/usb/controller/atmegadci.c
head/sys/dev/usb/controller/atmegadci.h
head/sys/dev/usb/controller/atmegadci_atmelarm.c
head/sys/dev/usb/controller/avr32dci.c
head/sys/dev/usb/controller/avr32dci.h
head/sys/dev/usb/controller/dwc_otg.c
head/sys/dev/usb/controller/dwc_otg.h
head/sys/dev/usb/controller/dwc_otg_fdt.c
head/sys/dev/usb/controller/dwc_otgreg.h
head/sys/dev/usb/controller/ehci.c
head/sys/dev/usb/controller/ehci.h
head/sys/dev/usb/controller/ehci_fsl.c
head/sys/dev/usb/controller/ehci_imx.c
head/sys/dev/usb/controller/ehci_ixp4xx.c
head/sys/dev/usb/controller/ehci_pci.c
head/sys/dev/usb/controller/ehcireg.h
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/musb_otg.h
head/sys/dev/usb/controller/musb_otg_atmelarm.c
head/sys/dev/usb/controller/ohci.c
head/sys/dev/usb/controller/ohci.h
head/sys/dev/usb/controller/ohci_pci.c
head/sys/dev/usb/controller/ohci_s3c24x0.c
head/sys/dev/usb/controller/ohcireg.h
head/sys/dev/usb/controller/uhci.c
head/sys/dev/usb/controller/uhci.h
head/sys/dev/usb/controller/uhci_pci.c
head/sys/dev/usb/controller/uhcireg.h
head/sys/dev/usb/controller/usb_controller.c
head/sys/dev/usb/controller/uss820dci.c
head/sys/dev/usb/controller/uss820dci.h
head/sys/dev/usb/controller/uss820dci_atmelarm.c
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/controller/xhci.h
head/sys/dev/usb/controller/xhci_pci.c
head/sys/dev/usb/controller/xhcireg.h
head/sys/dev/usb/gadget/g_audio.c
head/sys/dev/usb/gadget/g_audio.h
head/sys/dev/usb/gadget/g_keyboard.c
head/sys/dev/usb/gadget/g_keyboard.h
head/sys/dev/usb/gadget/g_modem.c
head/sys/dev/usb/gadget/g_modem.h
head/sys/dev/usb/gadget/g_mouse.c
head/sys/dev/usb/gadget/g_mouse.h
head/sys/dev/usb/input/atp.c
head/sys/dev/usb/input/uep.c
head/sys/dev/usb/input/uhid.c
head/sys/dev/usb/input/ukbd.c
head/sys/dev/usb/input/ums.c
head/sys/dev/usb/input/usb_rdesc.h
head/sys/dev/usb/input/wsp.c
head/sys/dev/usb/misc/ufm.c
head/sys/dev/usb/net/if_axge.c
head/sys/dev/usb/net/if_axgereg.h
head/sys/dev/usb/net/if_ipheth.c
head/sys/dev/usb/net/if_iphethvar.h
head/sys/dev/usb/net/if_mos.c
head/sys/dev/usb/net/if_ruereg.h
head/sys/dev/usb/net/if_smsc.c
head/sys/dev/usb/net/if_smscreg.h
head/sys/dev/usb/net/if_usie.c
head/sys/dev/usb/net/if_usievar.h
head/sys/dev/usb/net/ruephy.c
head/sys/dev/usb/net/ruephyreg.h
head/sys/dev/usb/net/uhso.c
head/sys/dev/usb/net/usb_ethernet.c
head/sys/dev/usb/net/usb_ethernet.h
head/sys/dev/usb/quirk/usb_quirk.c
head/sys/dev/usb/quirk/usb_quirk.h
head/sys/dev/usb/serial/ubsa.c
head/sys/dev/usb/serial/ubser.c
head/sys/dev/usb/serial/uchcom.c
head/sys/dev/usb/serial/ucycom.c
head/sys/dev/usb/serial/ufoma.c
head/sys/dev/usb/serial/uftdi.c
head/sys/dev/usb/serial/ugensa.c
head/sys/dev/usb/serial/uipaq.c
head/sys/dev/usb/serial/ulpt.c
head/sys/dev/usb/serial/umcs.c
head/sys/dev/usb/serial/umcs.h
head/sys/dev/usb/serial/umct.c
head/sys/dev/usb/serial/umodem.c
head/sys/dev/usb/serial/uplcom.c
head/sys/dev/usb/serial/usb_serial.c
head/sys/dev/usb/serial/usb_serial.h
head/sys/dev/usb/serial/uvisor.c
head/sys/dev/usb/serial/uvscom.c
head/sys/dev/usb/storage/umass.c
head/sys/dev/usb/storage/urio.c
head/sys/dev/usb/storage/ustorage_fs.c
head/sys/dev/usb/template/usb_template.c
head/sys/dev/usb/template/usb_template.h
head/sys/dev/usb/template/usb_template_audio.c
head/sys/dev/usb/template/usb_template_cdce.c
head/sys/dev/usb/template/usb_template_kbd.c
head/sys/dev/usb/template/usb_template_modem.c
head/sys/dev/usb/template/usb_template_mouse.c
head/sys/dev/usb/template/usb_template_msc.c
head/sys/dev/usb/template/usb_template_mtp.c
head/sys/dev/usb/ufm_ioctl.h
head/sys/dev/usb/usb.h
head/sys/dev/usb/usb_bus.h
head/sys/dev/usb/usb_busdma.c
head/sys/dev/usb/usb_busdma.h
head/sys/dev/usb/usb_cdc.h
head/sys/dev/usb/usb_controller.h
head/sys/dev/usb/usb_core.c
head/sys/dev/usb/usb_core.h
head/sys/dev/usb/usb_debug.c
head/sys/dev/usb/usb_debug.h
head/sys/dev/usb/usb_dev.c
head/sys/dev/usb/usb_dev.h
head/sys/dev/usb/usb_device.c
head/sys/dev/usb/usb_device.h
head/sys/dev/usb/usb_dynamic.c
head/sys/dev/usb/usb_dynamic.h
head/sys/dev/usb/usb_endian.h
head/sys/dev/usb/usb_error.c
head/sys/dev/usb/usb_freebsd.h
head/sys/dev/usb/usb_freebsd_loader.h
head/sys/dev/usb/usb_generic.c
head/sys/dev/usb/usb_generic.h
head/sys/dev/usb/usb_handle_request.c
head/sys/dev/usb/usb_hid.c
head/sys/dev/usb/usb_hub.c
head/sys/dev/usb/usb_hub.h
head/sys/dev/usb/usb_ioctl.h
head/sys/dev/usb/usb_lookup.c
head/sys/dev/usb/usb_mbuf.c
head/sys/dev/usb/usb_mbuf.h
head/sys/dev/usb/usb_msctest.c
head/sys/dev/usb/usb_msctest.h
head/sys/dev/usb/usb_parse.c
head/sys/dev/usb/usb_pci.h
head/sys/dev/usb/usb_process.c
head/sys/dev/usb/usb_process.h
head/sys/dev/usb/usb_request.c
head/sys/dev/usb/usb_request.h
head/sys/dev/usb/usb_transfer.c
head/sys/dev/usb/usb_transfer.h
head/sys/dev/usb/usb_util.c
head/sys/dev/usb/usb_util.h
head/sys/dev/usb/usbdi.h
head/sys/dev/usb/usbdi_util.h
head/sys/dev/usb/usbhid.h
head/sys/dev/usb/wlan/if_uath.c
head/sys/dev/usb/wlan/if_zydfw.h
head/sys/dev/viawd/viawd.c
head/sys/dev/viawd/viawd.h
head/sys/dev/virtio/balloon/virtio_balloon.c
head/sys/dev/virtio/block/virtio_blk.c
head/sys/dev/virtio/network/if_vtnet.c
head/sys/dev/virtio/network/if_vtnetvar.h
head/sys/dev/virtio/pci/virtio_pci.c
head/sys/dev/virtio/random/virtio_random.c
head/sys/dev/virtio/scsi/virtio_scsi.c
head/sys/dev/virtio/scsi/virtio_scsi.h
head/sys/dev/virtio/scsi/virtio_scsivar.h
head/sys/dev/virtio/virtio.c
head/sys/dev/virtio/virtqueue.c
head/sys/dev/virtio/virtqueue.h
head/sys/dev/vkbd/vkbd.c
head/sys/dev/vkbd/vkbd_var.h
head/sys/dev/vt/colors/vt_termcolors.c
head/sys/dev/vt/colors/vt_termcolors.h
head/sys/dev/vt/font/vt_font_default.c
head/sys/dev/vt/font/vt_mouse_cursor.c
head/sys/dev/vt/hw/efifb/efifb.c
head/sys/dev/vt/hw/fb/vt_early_fb.c
head/sys/dev/vt/hw/fb/vt_fb.c
head/sys/dev/vt/hw/fb/vt_fb.h
head/sys/dev/vt/hw/ofwfb/ofwfb.c
head/sys/dev/vt/logo/logo_freebsd.c
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_buf.c
head/sys/dev/vt/vt_consolectl.c
head/sys/dev/vt/vt_core.c
head/sys/dev/vt/vt_font.c
head/sys/dev/vt/vt_sysmouse.c
head/sys/dev/vte/if_vte.c
head/sys/dev/vte/if_vtereg.h
head/sys/dev/vte/if_vtevar.h
head/sys/dev/vx/if_vx.c
head/sys/dev/vx/if_vxreg.h
head/sys/dev/vx/if_vxvar.h
head/sys/dev/watchdog/watchdog.c
head/sys/dev/wbwd/wbwd.c
head/sys/dev/wtap/if_medium.c
head/sys/dev/wtap/if_medium.h
head/sys/dev/wtap/if_wtap.c
head/sys/dev/wtap/if_wtap_module.c
head/sys/dev/wtap/if_wtapioctl.h
head/sys/dev/wtap/if_wtapvar.h
head/sys/dev/wtap/plugins/visibility.c
head/sys/dev/wtap/plugins/visibility.h
head/sys/dev/wtap/plugins/visibility_ioctl.h
head/sys/dev/wtap/plugins/wtap_plugin.h
head/sys/dev/wtap/wtap_hal/hal.c
head/sys/dev/wtap/wtap_hal/hal.h
head/sys/dev/wtap/wtap_hal/handler.h
head/sys/dev/xe/if_xe.c
head/sys/dev/xe/if_xe_pccard.c
head/sys/dev/xe/if_xereg.h
head/sys/dev/xe/if_xevar.h
head/sys/dev/xen/blkback/blkback.c
head/sys/dev/xen/control/control.c
head/sys/dev/xen/netback/netback.c
head/sys/dev/xen/netback/netback_unit_tests.c
head/sys/dev/xen/netfront/netfront.c
head/sys/dev/xen/timer/timer.c
head/sys/dev/xen/timer/timer.h
head/sys/dev/xen/xenpci/xenpci.c
head/sys/dev/xen/xenpci/xenpcivar.h
head/sys/dev/xl/xlphy.c
Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aac.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aac/aac_cam.c
==============================================================================
--- head/sys/dev/aac/aac_cam.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aac_cam.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Adaptec, Inc.
* All rights reserved.
*
Modified: head/sys/dev/aac/aac_debug.c
==============================================================================
--- head/sys/dev/aac/aac_debug.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aac_debug.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aac/aac_disk.c
==============================================================================
--- head/sys/dev/aac/aac_disk.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aac_disk.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aac/aac_linux.c
==============================================================================
--- head/sys/dev/aac/aac_linux.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aac_linux.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Scott Long
* All rights reserved.
*
Modified: head/sys/dev/aac/aac_pci.c
==============================================================================
--- head/sys/dev/aac/aac_pci.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aac_pci.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aac/aac_tables.h
==============================================================================
--- head/sys/dev/aac/aac_tables.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aac_tables.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
Modified: head/sys/dev/aac/aacreg.h
==============================================================================
--- head/sys/dev/aac/aacreg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aacreg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000-2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aac/aacvar.h
==============================================================================
--- head/sys/dev/aac/aacvar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aac/aacvar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aacraid/aacraid.c
==============================================================================
--- head/sys/dev/aacraid/aacraid.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aacraid/aacraid_cam.c
==============================================================================
--- head/sys/dev/aacraid/aacraid_cam.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid_cam.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
* All rights reserved.
Modified: head/sys/dev/aacraid/aacraid_debug.c
==============================================================================
--- head/sys/dev/aacraid/aacraid_debug.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid_debug.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,5 +1,6 @@
-
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
* All rights reserved.
Modified: head/sys/dev/aacraid/aacraid_debug.h
==============================================================================
--- head/sys/dev/aacraid/aacraid_debug.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid_debug.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
* All rights reserved.
Modified: head/sys/dev/aacraid/aacraid_linux.c
==============================================================================
--- head/sys/dev/aacraid/aacraid_linux.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid_linux.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Scott Long
* Copyright (c) 2002-2010 Adaptec, Inc.
* Copyright (c) 2010-2012 PMC-Sierra, Inc.
Modified: head/sys/dev/aacraid/aacraid_pci.c
==============================================================================
--- head/sys/dev/aacraid/aacraid_pci.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid_pci.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aacraid/aacraid_reg.h
==============================================================================
--- head/sys/dev/aacraid/aacraid_reg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid_reg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000-2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/aacraid/aacraid_var.h
==============================================================================
--- head/sys/dev/aacraid/aacraid_var.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aacraid/aacraid_var.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2001 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/dev/adb/adb.h
==============================================================================
--- head/sys/dev/adb/adb.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/adb/adb.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/dev/adb/adb_bus.c
==============================================================================
--- head/sys/dev/adb/adb_bus.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/adb/adb_bus.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/dev/adb/adb_buttons.c
==============================================================================
--- head/sys/dev/adb/adb_buttons.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/adb/adb_buttons.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2011, Justin Hibbits.
* Copyright (c) 2002, Miodrag Vallat.
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
Modified: head/sys/dev/adb/adb_kbd.c
==============================================================================
--- head/sys/dev/adb/adb_kbd.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/adb/adb_kbd.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/dev/adb/adb_mouse.c
==============================================================================
--- head/sys/dev/adb/adb_mouse.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/adb/adb_mouse.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/dev/adb/adbvar.h
==============================================================================
--- head/sys/dev/adb/adbvar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/adb/adbvar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/dev/adlink/adlink.c
==============================================================================
--- head/sys/dev/adlink/adlink.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/adlink/adlink.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003-2004 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/dev/advansys/adv_isa.c
==============================================================================
--- head/sys/dev/advansys/adv_isa.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/adv_isa.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -20,6 +20,8 @@
* ** This board has been sold by SIIG as the i540 SpeedMaster.
* *** This board has been sold by SIIG as the i542 SpeedMaster.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/adv_pci.c
==============================================================================
--- head/sys/dev/advansys/adv_pci.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/adv_pci.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -33,6 +33,8 @@
* * This board has been sold by SIIG as the Fast SCSI Pro PCI.
* ** This board has been sold by Iomega as a Jaz Jet PCI adapter.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/advansys.c
==============================================================================
--- head/sys/dev/advansys/advansys.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/advansys.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -7,6 +7,8 @@
* ABP940UA, ABP950, ABP960, ABP960U, ABP960UA,
* ABP970, ABP970U
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996-2000 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/advansys.h
==============================================================================
--- head/sys/dev/advansys/advansys.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/advansys.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Generic driver definitions and exported functions for the Advanced
* Systems Inc. SCSI controllers
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996-1997 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/advlib.c
==============================================================================
--- head/sys/dev/advansys/advlib.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/advlib.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996-1997, 1999-2000 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/advlib.h
==============================================================================
--- head/sys/dev/advansys/advlib.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/advlib.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Definitions for low level routines and data structures
* for the Advanced Systems Inc. SCSI controllers chips.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996-1997, 1999-2000 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/adw_pci.c
==============================================================================
--- head/sys/dev/advansys/adw_pci.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/adw_pci.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -8,6 +8,8 @@
* ABP3940U2W - Bus-Master PCI LVD/Ultra2-Wide (253 CDB)
* ABP3950U2W - Bus-Master PCI LVD/Ultra2-Wide (253 CDB)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/adwcam.c
==============================================================================
--- head/sys/dev/advansys/adwcam.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/adwcam.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -6,6 +6,8 @@
*
* adw_pci.c ABP[3]940UW, ABP950UW, ABP3940U2W
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/adwlib.c
==============================================================================
--- head/sys/dev/advansys/adwlib.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/adwlib.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Low level routines for Second Generation
* Advanced Systems Inc. SCSI controllers chips
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/adwlib.h
==============================================================================
--- head/sys/dev/advansys/adwlib.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/adwlib.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Definitions for low level routines and data structures
* for the Advanced Systems Inc. SCSI controllers chips.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998, 1999, 2000 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/advansys/adwvar.h
==============================================================================
--- head/sys/dev/advansys/adwvar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/advansys/adwvar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Generic driver definitions and exported functions for the Advanced
* Systems Inc. Second Generation SCSI controllers
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998, 1999, 2000 Justin Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/ae/if_ae.c
==============================================================================
--- head/sys/dev/ae/if_ae.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ae/if_ae.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/dev/ae/if_aereg.h
==============================================================================
--- head/sys/dev/ae/if_aereg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ae/if_aereg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/dev/ae/if_aevar.h
==============================================================================
--- head/sys/dev/ae/if_aevar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ae/if_aevar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/dev/age/if_age.c
==============================================================================
--- head/sys/dev/age/if_age.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/age/if_age.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/age/if_agereg.h
==============================================================================
--- head/sys/dev/age/if_agereg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/age/if_agereg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/age/if_agevar.h
==============================================================================
--- head/sys/dev/age/if_agevar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/age/if_agevar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/agp/agp.c
==============================================================================
--- head/sys/dev/agp/agp.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_ali.c
==============================================================================
--- head/sys/dev/agp/agp_ali.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_ali.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_amd.c
==============================================================================
--- head/sys/dev/agp/agp_amd.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_amd.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_amd64.c
==============================================================================
--- head/sys/dev/agp/agp_amd64.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_amd64.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004, 2005 Jung-uk Kim <jkim@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_apple.c
==============================================================================
--- head/sys/dev/agp/agp_apple.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_apple.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_ati.c
==============================================================================
--- head/sys/dev/agp/agp_ati.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_ati.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Eric Anholt
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_i810.c
==============================================================================
--- head/sys/dev/agp/agp_i810.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_i810.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* Copyright (c) 2000 Ruslan Ermilov
* Copyright (c) 2011 The FreeBSD Foundation
Modified: head/sys/dev/agp/agp_i810.h
==============================================================================
--- head/sys/dev/agp/agp_i810.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_i810.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_intel.c
==============================================================================
--- head/sys/dev/agp/agp_intel.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_intel.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_nvidia.c
==============================================================================
--- head/sys/dev/agp/agp_nvidia.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_nvidia.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_sis.c
==============================================================================
--- head/sys/dev/agp/agp_sis.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_sis.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agp_via.c
==============================================================================
--- head/sys/dev/agp/agp_via.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agp_via.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agppriv.h
==============================================================================
--- head/sys/dev/agp/agppriv.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agppriv.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agpreg.h
==============================================================================
--- head/sys/dev/agp/agpreg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agpreg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/agp/agpvar.h
==============================================================================
--- head/sys/dev/agp/agpvar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/agp/agpvar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/dev/aha/aha.c
==============================================================================
--- head/sys/dev/aha/aha.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aha/aha.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,10 +1,12 @@
-/*
+/*-
* Generic register and struct definitions for the Adaptech 154x
* SCSI host adapters. Product specific probe and attach routines can
* be found in:
* aha 1542A/1542B/1542C/1542CF/1542CP aha_isa.c
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 M. Warner Losh.
* All Rights Reserved.
*
Modified: head/sys/dev/aha/aha_isa.c
==============================================================================
--- head/sys/dev/aha/aha_isa.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aha/aha_isa.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -3,6 +3,8 @@
* Adaptec 154x.
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2003 M. Warner Losh
* All rights reserved.
*
Modified: head/sys/dev/aha/ahareg.h
==============================================================================
--- head/sys/dev/aha/ahareg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aha/ahareg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Generic register and struct definitions for the Adaptech 1540, 1542,
* SCSI host adapters. Product specific probe and attach
* routines can be found in:
Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ahci/ahci.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/ahci/ahci.h
==============================================================================
--- head/sys/dev/ahci/ahci.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ahci/ahci.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 - 2008 Søren Schmidt <sos@FreeBSD.org>
* Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/dev/ahci/ahciem.c
==============================================================================
--- head/sys/dev/ahci/ahciem.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ahci/ahciem.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/aic/aic.c
==============================================================================
--- head/sys/dev/aic/aic.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic/aic.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
Modified: head/sys/dev/aic/aic6360reg.h
==============================================================================
--- head/sys/dev/aic/aic6360reg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic/aic6360reg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Charles Hannum.
* Copyright (c) 1994 Jarle Greipsland.
* All rights reserved.
Modified: head/sys/dev/aic/aic_isa.c
==============================================================================
--- head/sys/dev/aic/aic_isa.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic/aic_isa.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
Modified: head/sys/dev/aic/aic_pccard.c
==============================================================================
--- head/sys/dev/aic/aic_pccard.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic/aic_pccard.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
Modified: head/sys/dev/aic/aicvar.h
==============================================================================
--- head/sys/dev/aic/aicvar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic/aicvar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Luoqi Chen.
* All rights reserved.
*
Modified: head/sys/dev/aic7xxx/ahc_isa.c
==============================================================================
--- head/sys/dev/aic7xxx/ahc_isa.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/ahc_isa.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* FreeBSD, VLB/ISA product support functions
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2004 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/aic7xxx/aic7770.c
==============================================================================
--- head/sys/dev/aic7xxx/aic7770.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic7770.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Product specific probe and attach routines for:
* 27/284X and aic7770 motherboard SCSI controllers
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1998, 2000, 2001 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/aic7xxx/aic79xx.c
==============================================================================
--- head/sys/dev/aic7xxx/aic79xx.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic79xx.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Core routines and tables shareable across OS platforms.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2002, 2004 Justin T. Gibbs.
* Copyright (c) 2000-2003 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aic79xx.h
==============================================================================
--- head/sys/dev/aic7xxx/aic79xx.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic79xx.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Core definitions and data structures shareable across OS platforms.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2002 Justin T. Gibbs.
* Copyright (c) 2000-2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aic79xx_inline.h
==============================================================================
--- head/sys/dev/aic7xxx/aic79xx_inline.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic79xx_inline.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Inline routines shareable across OS platforms.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2003 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aic79xx_pci.c
==============================================================================
--- head/sys/dev/aic7xxx/aic79xx_pci.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic79xx_pci.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Product specific probe and attach routines for:
* aic7901 and aic7902 SCSI controllers
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aic7xxx.c
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic7xxx.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Core routines and tables shareable across OS platforms.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2002 Justin T. Gibbs.
* Copyright (c) 2000-2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aic7xxx.h
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic7xxx.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Core definitions and data structures shareable across OS platforms.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2001 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aic7xxx_93cx6.h
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx_93cx6.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic7xxx_93cx6.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -3,6 +3,8 @@
* settings for the aic7xxx based adaptec SCSI controllers. It can
* also be used for 93C26 and 93C06 serial EEPROMS.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994, 1995, 2000 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/aic7xxx/aic7xxx_inline.h
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx_inline.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic7xxx_inline.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Inline routines shareable across OS platforms.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2001 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aic7xxx_pci.c
==============================================================================
--- head/sys/dev/aic7xxx/aic7xxx_pci.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aic7xxx_pci.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -3,6 +3,8 @@
* 3940, 2940, aic7895, aic7890, aic7880,
* aic7870, aic7860 and aic7850 SCSI controllers
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-2001 Justin T. Gibbs.
* Copyright (c) 2000-2001 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aicasm/aicasm.c
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Aic7xxx SCSI host adapter firmware asssembler
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aicasm/aicasm.h
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Assembler for the sequencer program downloaded to Aic7xxx SCSI host adapters
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aicasm/aicasm_gram.y
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_gram.y Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_gram.y Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
/*-
* Parser for the Aic7xxx SCSI Host adapter sequencer assembler.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aicasm/aicasm_insformat.h
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_insformat.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_insformat.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
* Instruction formats for the sequencer program downloaded to
* Aic7xxx SCSI host adapters
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y Mon Nov 27 14:52:40 2017 (r326255)
@@ -3,6 +3,8 @@
* Sub-parser for macro invocation in the Aic7xxx SCSI
* Host adapter sequencer assembler.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Adaptec Inc.
* All rights reserved.
*
Modified: head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l Mon Nov 27 14:52:40 2017 (r326255)
@@ -3,6 +3,8 @@
* Sub-Lexical Analyzer for macro invokation in
* the Aic7xxx SCSI Host adapter sequencer assembler.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Adaptec Inc.
* All rights reserved.
*
Modified: head/sys/dev/aic7xxx/aicasm/aicasm_scan.l
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_scan.l Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_scan.l Mon Nov 27 14:52:40 2017 (r326255)
@@ -2,6 +2,8 @@
/*-
* Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler.
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Aic7xxx SCSI host adapter firmware asssembler symbol table implementation
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/aic7xxx/aicasm/aicasm_symbol.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,6 +1,8 @@
/*-
* Aic7xxx SCSI host adapter firmware asssembler symbol table definitions
*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 2002 Adaptec Inc.
* All rights reserved.
Modified: head/sys/dev/alc/if_alc.c
==============================================================================
--- head/sys/dev/alc/if_alc.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/alc/if_alc.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/alc/if_alcreg.h
==============================================================================
--- head/sys/dev/alc/if_alcreg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/alc/if_alcreg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/alc/if_alcvar.h
==============================================================================
--- head/sys/dev/alc/if_alcvar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/alc/if_alcvar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/ale/if_ale.c
==============================================================================
--- head/sys/dev/ale/if_ale.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ale/if_ale.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/ale/if_alereg.h
==============================================================================
--- head/sys/dev/ale/if_alereg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ale/if_alereg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/ale/if_alevar.h
==============================================================================
--- head/sys/dev/ale/if_alevar.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/ale/if_alevar.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/dev/altera/atse/a_api.h
==============================================================================
--- head/sys/dev/altera/atse/a_api.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/atse/a_api.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Bjoern A. Zeeb
* All rights reserved.
*
Modified: head/sys/dev/altera/atse/if_atse.c
==============================================================================
--- head/sys/dev/altera/atse/if_atse.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/atse/if_atse.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012, 2013 Bjoern A. Zeeb
* Copyright (c) 2014 Robert N. M. Watson
* All rights reserved.
Modified: head/sys/dev/altera/atse/if_atse_fdt.c
==============================================================================
--- head/sys/dev/altera/atse/if_atse_fdt.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/atse/if_atse_fdt.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Bjoern A. Zeeb
* All rights reserved.
*
Modified: head/sys/dev/altera/atse/if_atse_nexus.c
==============================================================================
--- head/sys/dev/altera/atse/if_atse_nexus.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/atse/if_atse_nexus.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012,2013 Bjoern A. Zeeb
* All rights reserved.
*
Modified: head/sys/dev/altera/atse/if_atsereg.h
==============================================================================
--- head/sys/dev/altera/atse/if_atsereg.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/atse/if_atsereg.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Bjoern A. Zeeb
* All rights reserved.
*
Modified: head/sys/dev/altera/avgen/altera_avgen.c
==============================================================================
--- head/sys/dev/altera/avgen/altera_avgen.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/avgen/altera_avgen.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012-2013, 2016 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/dev/altera/avgen/altera_avgen.h
==============================================================================
--- head/sys/dev/altera/avgen/altera_avgen.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/avgen/altera_avgen.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012, 2016 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/dev/altera/avgen/altera_avgen_fdt.c
==============================================================================
--- head/sys/dev/altera/avgen/altera_avgen_fdt.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/avgen/altera_avgen_fdt.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012-2013, 2016 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/dev/altera/avgen/altera_avgen_nexus.c
==============================================================================
--- head/sys/dev/altera/avgen/altera_avgen_nexus.c Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/avgen/altera_avgen_nexus.c Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012-2013, 2016 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/dev/altera/jtag_uart/altera_jtag_uart.h
==============================================================================
--- head/sys/dev/altera/jtag_uart/altera_jtag_uart.h Mon Nov 27 14:51:47 2017 (r326254)
+++ head/sys/dev/altera/jtag_uart/altera_jtag_uart.h Mon Nov 27 14:52:40 2017 (r326255)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
==============================================================================
--- head/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c Mon Nov 27 14:51:47 2017 (r326254)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:02:12 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34F3CE5393D;
Mon, 27 Nov 2017 15:02:12 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C323B749FB;
Mon, 27 Nov 2017 15:02:11 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARF2A1w095025;
Mon, 27 Nov 2017 15:02:10 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF1xNs094908;
Mon, 27 Nov 2017 15:01:59 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271501.vARF1xNs094908@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:01:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326256 - head/sys/sys
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/sys/sys
X-SVN-Commit-Revision: 326256
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:02:12 -0000
Author: pfg
Date: Mon Nov 27 15:01:59 2017
New Revision: 326256
URL: https://svnweb.freebsd.org/changeset/base/326256
Log:
sys/sys: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/sys/_bitset.h
head/sys/sys/_bus_dma.h
head/sys/sys/_cpuset.h
head/sys/sys/_ffcounter.h
head/sys/sys/_lock.h
head/sys/sys/_lockmgr.h
head/sys/sys/_mutex.h
head/sys/sys/_null.h
head/sys/sys/_pctrie.h
head/sys/sys/_pthreadtypes.h
head/sys/sys/_rwlock.h
head/sys/sys/_semaphore.h
head/sys/sys/_stack.h
head/sys/sys/_stdint.h
head/sys/sys/_sx.h
head/sys/sys/_task.h
head/sys/sys/_timeval.h
head/sys/sys/_types.h
head/sys/sys/_umtx.h
head/sys/sys/_unrhdr.h
head/sys/sys/aac_ioctl.h
head/sys/sys/acl.h
head/sys/sys/agpio.h
head/sys/sys/aio.h
head/sys/sys/alq.h
head/sys/sys/assym.h
head/sys/sys/ata.h
head/sys/sys/bitset.h
head/sys/sys/boot.h
head/sys/sys/buf_ring.h
head/sys/sys/bufobj.h
head/sys/sys/bus.h
head/sys/sys/bus_dma.h
head/sys/sys/busdma_bufalloc.h
head/sys/sys/capability.h
head/sys/sys/caprights.h
head/sys/sys/cdrio.h
head/sys/sys/chio.h
head/sys/sys/clock.h
head/sys/sys/condvar.h
head/sys/sys/consio.h
head/sys/sys/copyright.h
head/sys/sys/counter.h
head/sys/sys/cpu.h
head/sys/sys/cpuctl.h
head/sys/sys/cpuset.h
head/sys/sys/devicestat.h
head/sys/sys/digiio.h
head/sys/sys/dtrace_bsd.h
head/sys/sys/dvdio.h
head/sys/sys/elf.h
head/sys/sys/elf32.h
head/sys/sys/elf64.h
head/sys/sys/elf_common.h
head/sys/sys/elf_generic.h
head/sys/sys/endian.h
head/sys/sys/eui64.h
head/sys/sys/event.h
head/sys/sys/eventhandler.h
head/sys/sys/eventvar.h
head/sys/sys/extattr.h
head/sys/sys/fail.h
head/sys/sys/fdcio.h
head/sys/sys/firmware.h
head/sys/sys/gpio.h
head/sys/sys/gpt.h
head/sys/sys/hash.h
head/sys/sys/hhook.h
head/sys/sys/iconv.h
head/sys/sys/imgact_elf.h
head/sys/sys/interrupt.h
head/sys/sys/ipmi.h
head/sys/sys/jail.h
head/sys/sys/joystick.h
head/sys/sys/kdb.h
head/sys/sys/kenv.h
head/sys/sys/kerneldump.h
head/sys/sys/khelp.h
head/sys/sys/kobj.h
head/sys/sys/ksem.h
head/sys/sys/kthread.h
head/sys/sys/ktr.h
head/sys/sys/ktr_class.h
head/sys/sys/link_aout.h
head/sys/sys/link_elf.h
head/sys/sys/linker.h
head/sys/sys/linker_set.h
head/sys/sys/lock.h
head/sys/sys/lock_profile.h
head/sys/sys/lockmgr.h
head/sys/sys/lockstat.h
head/sys/sys/loginclass.h
head/sys/sys/mac.h
head/sys/sys/mchain.h
head/sys/sys/memdesc.h
head/sys/sys/module.h
head/sys/sys/module_khelp.h
head/sys/sys/mqueue.h
head/sys/sys/msg.h
head/sys/sys/mutex.h
head/sys/sys/osd.h
head/sys/sys/pciio.h
head/sys/sys/pctrie.h
head/sys/sys/pmc.h
head/sys/sys/pmckern.h
head/sys/sys/pmclog.h
head/sys/sys/poll.h
head/sys/sys/power.h
head/sys/sys/priority.h
head/sys/sys/priv.h
head/sys/sys/procctl.h
head/sys/sys/procdesc.h
head/sys/sys/procfs.h
head/sys/sys/ptio.h
head/sys/sys/racct.h
head/sys/sys/random.h
head/sys/sys/rangelock.h
head/sys/sys/rctl.h
head/sys/sys/refcount.h
head/sys/sys/regression.h
head/sys/sys/rtprio.h
head/sys/sys/runq.h
head/sys/sys/rwlock.h
head/sys/sys/sbuf.h
head/sys/sys/sdt.h
head/sys/sys/sema.h
head/sys/sys/serial.h
head/sys/sys/sf_buf.h
head/sys/sys/shm.h
head/sys/sys/sleepqueue.h
head/sys/sys/slicer.h
head/sys/sys/snoop.h
head/sys/sys/stack.h
head/sys/sys/stdatomic.h
head/sys/sys/stddef.h
head/sys/sys/stdint.h
head/sys/sys/sx.h
head/sys/sys/syscallsubr.h
head/sys/sys/taskqueue.h
head/sys/sys/terminal.h
head/sys/sys/thr.h
head/sys/sys/timeet.h
head/sys/sys/timeffc.h
head/sys/sys/timers.h
head/sys/sys/tree.h
head/sys/sys/tty.h
head/sys/sys/ttydevsw.h
head/sys/sys/ttydisc.h
head/sys/sys/ttyhook.h
head/sys/sys/ttyqueue.h
head/sys/sys/turnstile.h
head/sys/sys/ucontext.h
head/sys/sys/umtx.h
head/sys/sys/uuid.h
head/sys/sys/vdso.h
head/sys/sys/vmem.h
head/sys/sys/watchdog.h
Modified: head/sys/sys/_bitset.h
==============================================================================
--- head/sys/sys/_bitset.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_bitset.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/_bus_dma.h
==============================================================================
--- head/sys/sys/_bus_dma.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_bus_dma.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2006 John-Mark Gurney.
* All rights reserved.
*
Modified: head/sys/sys/_cpuset.h
==============================================================================
--- head/sys/sys/_cpuset.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_cpuset.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/_ffcounter.h
==============================================================================
--- head/sys/sys/_ffcounter.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_ffcounter.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
*
Modified: head/sys/sys/_lock.h
==============================================================================
--- head/sys/sys/_lock.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_lock.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/_lockmgr.h
==============================================================================
--- head/sys/sys/_lockmgr.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_lockmgr.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/_mutex.h
==============================================================================
--- head/sys/sys/_mutex.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_mutex.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/_null.h
==============================================================================
--- head/sys/sys/_null.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_null.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sys/_pctrie.h
==============================================================================
--- head/sys/sys/_pctrie.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_pctrie.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
Modified: head/sys/sys/_pthreadtypes.h
==============================================================================
--- head/sys/sys/_pthreadtypes.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_pthreadtypes.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
* Copyright (c) 1995-1998 by John Birrell <jb@cimlogic.com.au>
* All rights reserved.
Modified: head/sys/sys/_rwlock.h
==============================================================================
--- head/sys/sys/_rwlock.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_rwlock.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/_semaphore.h
==============================================================================
--- head/sys/sys/_semaphore.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_semaphore.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/_stack.h
==============================================================================
--- head/sys/sys/_stack.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_stack.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
Modified: head/sys/sys/_stdint.h
==============================================================================
--- head/sys/sys/_stdint.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_stdint.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 David E. O'Brien <obrien@FreeBSD.org>
* Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sys/_sx.h
==============================================================================
--- head/sys/sys/_sx.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_sx.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/_task.h
==============================================================================
--- head/sys/sys/_task.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_task.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/sys/_timeval.h
==============================================================================
--- head/sys/sys/_timeval.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_timeval.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/_types.h
==============================================================================
--- head/sys/sys/_types.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_types.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/_umtx.h
==============================================================================
--- head/sys/sys/_umtx.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_umtx.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010, David Xu <davidxu@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/_unrhdr.h
==============================================================================
--- head/sys/sys/_unrhdr.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/_unrhdr.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/sys/aac_ioctl.h
==============================================================================
--- head/sys/sys/aac_ioctl.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/aac_ioctl.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 Scott Long
* Copyright (c) 2000 BSDi
Modified: head/sys/sys/acl.h
==============================================================================
--- head/sys/sys/acl.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/acl.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2001 Robert N. M. Watson
* Copyright (c) 2008 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sys/agpio.h
==============================================================================
--- head/sys/sys/agpio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/agpio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/sys/aio.h
==============================================================================
--- head/sys/sys/aio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/aio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 John S. Dyson. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/alq.h
==============================================================================
--- head/sys/sys/alq.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/alq.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010, The FreeBSD Foundation
Modified: head/sys/sys/assym.h
==============================================================================
--- head/sys/sys/assym.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/assym.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sys/ata.h
==============================================================================
--- head/sys/sys/ata.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/ata.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/bitset.h
==============================================================================
--- head/sys/sys/bitset.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/bitset.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/boot.h
==============================================================================
--- head/sys/sys/boot.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/boot.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
*
Modified: head/sys/sys/buf_ring.h
==============================================================================
--- head/sys/sys/buf_ring.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/buf_ring.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/bufobj.h
==============================================================================
--- head/sys/sys/bufobj.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/bufobj.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/sys/bus.h
==============================================================================
--- head/sys/sys/bus.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/bus.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997,1998,2003 Doug Rabson
* All rights reserved.
*
Modified: head/sys/sys/bus_dma.h
==============================================================================
--- head/sys/sys/bus_dma.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/bus_dma.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,6 +1,8 @@
/* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sys/busdma_bufalloc.h
==============================================================================
--- head/sys/sys/busdma_bufalloc.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/busdma_bufalloc.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Ian Lepore
* All rights reserved.
*
Modified: head/sys/sys/capability.h
==============================================================================
--- head/sys/sys/capability.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/capability.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/sys/caprights.h
==============================================================================
--- head/sys/sys/caprights.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/caprights.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/sys/cdrio.h
==============================================================================
--- head/sys/sys/cdrio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/cdrio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/chio.h
==============================================================================
--- head/sys/sys/chio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/chio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
* All rights reserved.
*
Modified: head/sys/sys/clock.h
==============================================================================
--- head/sys/sys/clock.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/clock.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sys/condvar.h
==============================================================================
--- head/sys/sys/condvar.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/condvar.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
* All rights reserved.
*
Modified: head/sys/sys/consio.h
==============================================================================
--- head/sys/sys/consio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/consio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1991-1996 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/sys/copyright.h
==============================================================================
--- head/sys/sys/copyright.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/copyright.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1992-2017 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/counter.h
==============================================================================
--- head/sys/sys/counter.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/counter.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/cpu.h
==============================================================================
--- head/sys/sys/cpu.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/cpu.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007 Nate Lawson (SDG)
* All rights reserved.
*
Modified: head/sys/sys/cpuctl.h
==============================================================================
--- head/sys/sys/cpuctl.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/cpuctl.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006-2008 Stanislav Sedov <stas@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/cpuset.h
==============================================================================
--- head/sys/sys/cpuset.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/cpuset.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/devicestat.h
==============================================================================
--- head/sys/sys/devicestat.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/devicestat.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
*
Modified: head/sys/sys/digiio.h
==============================================================================
--- head/sys/sys/digiio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/digiio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
* based on work by Slawa Olhovchenkov
* John Prince <johnp@knight-trosoft.com>
Modified: head/sys/sys/dtrace_bsd.h
==============================================================================
--- head/sys/sys/dtrace_bsd.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/dtrace_bsd.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 John Birrell (jb@freebsd.org)
* All rights reserved.
*
Modified: head/sys/sys/dvdio.h
==============================================================================
--- head/sys/sys/dvdio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/dvdio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999,2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/elf.h
==============================================================================
--- head/sys/sys/elf.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/elf.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 David E. O'Brien.
* All rights reserved.
*
Modified: head/sys/sys/elf32.h
==============================================================================
--- head/sys/sys/elf32.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/elf32.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/sys/elf64.h
==============================================================================
--- head/sys/sys/elf64.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/elf64.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/sys/elf_common.h
==============================================================================
--- head/sys/sys/elf_common.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/elf_common.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2000, 2001, 2008, 2011, David E. O'Brien
* Copyright (c) 1998 John D. Polstra.
Modified: head/sys/sys/elf_generic.h
==============================================================================
--- head/sys/sys/elf_generic.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/elf_generic.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/sys/endian.h
==============================================================================
--- head/sys/sys/endian.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/endian.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Thomas Moestl <tmm@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/eui64.h
==============================================================================
--- head/sys/sys/eui64.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/eui64.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2004 The Aerospace Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/event.h
==============================================================================
--- head/sys/sys/event.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/event.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/eventhandler.h
==============================================================================
--- head/sys/sys/eventhandler.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/eventhandler.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/eventvar.h
==============================================================================
--- head/sys/sys/eventvar.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/eventvar.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999,2000 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/extattr.h
==============================================================================
--- head/sys/sys/extattr.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/extattr.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2001 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/sys/fail.h
==============================================================================
--- head/sys/sys/fail.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/fail.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Isilon Inc http://www.isilon.com/
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/fdcio.h
==============================================================================
--- head/sys/sys/fdcio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/fdcio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
* All rights reserved.
*
Modified: head/sys/sys/firmware.h
==============================================================================
--- head/sys/sys/firmware.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/firmware.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005, Sam Leffler <sam@errno.com>
* All rights reserved.
*
Modified: head/sys/sys/gpio.h
==============================================================================
--- head/sys/sys/gpio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/gpio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,6 +1,8 @@
/* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */
/* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/gpt.h
==============================================================================
--- head/sys/sys/gpt.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/gpt.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sys/hash.h
==============================================================================
--- head/sys/sys/hash.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/hash.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Tobias Weingartner
* All rights reserved.
*
Modified: head/sys/sys/hhook.h
==============================================================================
--- head/sys/sys/hhook.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/hhook.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/sys/iconv.h
==============================================================================
--- head/sys/sys/iconv.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/iconv.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/sys/imgact_elf.h
==============================================================================
--- head/sys/sys/imgact_elf.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/imgact_elf.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995-1996 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/sys/interrupt.h
==============================================================================
--- head/sys/sys/interrupt.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/interrupt.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/ipmi.h
==============================================================================
--- head/sys/sys/ipmi.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/ipmi.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
* All rights reserved.
*
Modified: head/sys/sys/jail.h
==============================================================================
--- head/sys/sys/jail.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/jail.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2009 James Gritton.
* All rights reserved.
Modified: head/sys/sys/joystick.h
==============================================================================
--- head/sys/sys/joystick.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/joystick.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Jean-Marc Zucconi
* All rights reserved.
*
Modified: head/sys/sys/kdb.h
==============================================================================
--- head/sys/sys/kdb.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/kdb.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sys/kenv.h
==============================================================================
--- head/sys/sys/kenv.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/kenv.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/kerneldump.h
==============================================================================
--- head/sys/sys/kerneldump.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/kerneldump.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/sys/khelp.h
==============================================================================
--- head/sys/sys/khelp.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/khelp.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/sys/kobj.h
==============================================================================
--- head/sys/sys/kobj.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/kobj.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000,2003 Doug Rabson
* All rights reserved.
*
Modified: head/sys/sys/ksem.h
==============================================================================
--- head/sys/sys/ksem.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/ksem.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/kthread.h
==============================================================================
--- head/sys/sys/kthread.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/kthread.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/ktr.h
==============================================================================
--- head/sys/sys/ktr.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/ktr.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/ktr_class.h
==============================================================================
--- head/sys/sys/ktr_class.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/ktr_class.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/link_aout.h
==============================================================================
--- head/sys/sys/link_aout.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/link_aout.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
Modified: head/sys/sys/link_elf.h
==============================================================================
--- head/sys/sys/link_elf.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/link_elf.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
Modified: head/sys/sys/linker.h
==============================================================================
--- head/sys/sys/linker.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/linker.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997-2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/sys/linker_set.h
==============================================================================
--- head/sys/sys/linker_set.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/linker_set.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 John D. Polstra
* Copyright (c) 1999,2001 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sys/lock.h
==============================================================================
--- head/sys/sys/lock.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/lock.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/lock_profile.h
==============================================================================
--- head/sys/sys/lock_profile.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/lock_profile.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Kip Macy kmacy@FreeBSD.org
* Copyright (c) 2006 Kris Kennaway kris@FreeBSD.org
* Copyright (c) 2006 Dag-Erling Smorgrav des@des.no
Modified: head/sys/sys/lockmgr.h
==============================================================================
--- head/sys/sys/lockmgr.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/lockmgr.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/lockstat.h
==============================================================================
--- head/sys/sys/lockstat.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/lockstat.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2009 Stacey Son <sson@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/loginclass.h
==============================================================================
--- head/sys/sys/loginclass.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/loginclass.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/sys/mac.h
==============================================================================
--- head/sys/sys/mac.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/mac.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2002 Robert N. M. Watson
* Copyright (c) 2001-2005 Networks Associates Technology, Inc.
* Copyright (c) 2005-2006 SPARTA, Inc.
Modified: head/sys/sys/mchain.h
==============================================================================
--- head/sys/sys/mchain.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/mchain.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000, 2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/sys/memdesc.h
==============================================================================
--- head/sys/sys/memdesc.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/memdesc.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 EMC Corp.
* All rights reserved.
*
Modified: head/sys/sys/module.h
==============================================================================
--- head/sys/sys/module.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/module.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
Modified: head/sys/sys/module_khelp.h
==============================================================================
--- head/sys/sys/module_khelp.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/module_khelp.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/sys/mqueue.h
==============================================================================
--- head/sys/sys/mqueue.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/mqueue.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/msg.h
==============================================================================
--- head/sys/sys/msg.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/msg.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -4,6 +4,8 @@
/*-
* SVID compatible msg.h file
*
+ * SPDX-License-Identifier: MIT
+ *
* Author: Daniel Boulet
*
* Copyright 1993 Daniel Boulet and RTMX Inc.
Modified: head/sys/sys/mutex.h
==============================================================================
--- head/sys/sys/mutex.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/mutex.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sys/osd.h
==============================================================================
--- head/sys/sys/osd.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/osd.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sys/pciio.h
==============================================================================
--- head/sys/sys/pciio.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/pciio.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@FreeBSD.ORG>
* Copyright (c) 1997, 1998, 1999, Kenneth D. Merry <ken@FreeBSD.ORG>
* All rights reserved.
Modified: head/sys/sys/pctrie.h
==============================================================================
--- head/sys/sys/pctrie.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/pctrie.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
Modified: head/sys/sys/pmc.h
==============================================================================
--- head/sys/sys/pmc.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/pmc.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2008, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/sys/pmckern.h
==============================================================================
--- head/sys/sys/pmckern.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/pmckern.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/sys/pmclog.h
==============================================================================
--- head/sys/sys/pmclog.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/pmclog.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2007, Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/sys/poll.h
==============================================================================
--- head/sys/sys/poll.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/poll.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sys/power.h
==============================================================================
--- head/sys/sys/power.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/power.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
Modified: head/sys/sys/priority.h
==============================================================================
--- head/sys/sys/priority.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/priority.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994, Henrik Vestergaard Draboel
* All rights reserved.
*
Modified: head/sys/sys/priv.h
==============================================================================
--- head/sys/sys/priv.h Mon Nov 27 14:52:40 2017 (r326255)
+++ head/sys/sys/priv.h Mon Nov 27 15:01:59 2017 (r326256)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 nCircle Network Security, Inc.
* All rights reserved.
*
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:03:17 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42CBDE53A23;
Mon, 27 Nov 2017 15:03:17 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D416874CE7;
Mon, 27 Nov 2017 15:03:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARF3GWa096072;
Mon, 27 Nov 2017 15:03:16 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF38FE095978;
Mon, 27 Nov 2017 15:03:08 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271503.vARF38FE095978@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:03:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326257 - in head/sys/amd64: acpica amd64 ia32 include
include/pc linux32 pci vmm vmm/amd vmm/intel vmm/io
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/amd64: acpica amd64 ia32 include include/pc
linux32 pci vmm vmm/amd vmm/intel vmm/io
X-SVN-Commit-Revision: 326257
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:03:17 -0000
Author: pfg
Date: Mon Nov 27 15:03:07 2017
New Revision: 326257
URL: https://svnweb.freebsd.org/changeset/base/326257
Log:
sys/amd64: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/amd64/acpica/acpi_machdep.c
head/sys/amd64/amd64/atomic.c
head/sys/amd64/amd64/bios.c
head/sys/amd64/amd64/elf_machdep.c
head/sys/amd64/amd64/gdb_machdep.c
head/sys/amd64/amd64/initcpu.c
head/sys/amd64/amd64/io.c
head/sys/amd64/amd64/minidump_machdep.c
head/sys/amd64/amd64/mp_machdep.c
head/sys/amd64/amd64/prof_machdep.c
head/sys/amd64/amd64/ptrace_machdep.c
head/sys/amd64/amd64/uma_machdep.c
head/sys/amd64/ia32/ia32_misc.c
head/sys/amd64/ia32/ia32_reg.c
head/sys/amd64/include/_bus.h
head/sys/amd64/include/atomic.h
head/sys/amd64/include/bus_dma.h
head/sys/amd64/include/counter.h
head/sys/amd64/include/gdb_machdep.h
head/sys/amd64/include/intr_machdep.h
head/sys/amd64/include/iodev.h
head/sys/amd64/include/kdb.h
head/sys/amd64/include/memdev.h
head/sys/amd64/include/minidump.h
head/sys/amd64/include/mp_watchdog.h
head/sys/amd64/include/pc/bios.h
head/sys/amd64/include/pcpu.h
head/sys/amd64/include/pmc_mdep.h
head/sys/amd64/include/ppireg.h
head/sys/amd64/include/runq.h
head/sys/amd64/include/sf_buf.h
head/sys/amd64/include/timerreg.h
head/sys/amd64/include/vm.h
head/sys/amd64/include/vmm.h
head/sys/amd64/include/vmm_dev.h
head/sys/amd64/include/vmm_instruction_emul.h
head/sys/amd64/linux32/linux.h
head/sys/amd64/linux32/linux32_dummy.c
head/sys/amd64/linux32/linux32_machdep.c
head/sys/amd64/linux32/linux32_sysvec.c
head/sys/amd64/pci/pci_cfgreg.c
head/sys/amd64/vmm/amd/amdv.c
head/sys/amd64/vmm/intel/ept.c
head/sys/amd64/vmm/intel/ept.h
head/sys/amd64/vmm/intel/vmcs.c
head/sys/amd64/vmm/intel/vmcs.h
head/sys/amd64/vmm/intel/vmx.c
head/sys/amd64/vmm/intel/vmx.h
head/sys/amd64/vmm/intel/vmx_controls.h
head/sys/amd64/vmm/intel/vmx_cpufunc.h
head/sys/amd64/vmm/intel/vmx_genassym.c
head/sys/amd64/vmm/intel/vmx_msr.c
head/sys/amd64/vmm/intel/vmx_msr.h
head/sys/amd64/vmm/intel/vtd.c
head/sys/amd64/vmm/io/iommu.c
head/sys/amd64/vmm/io/iommu.h
head/sys/amd64/vmm/io/ppt.c
head/sys/amd64/vmm/io/ppt.h
head/sys/amd64/vmm/io/vhpet.c
head/sys/amd64/vmm/io/vhpet.h
head/sys/amd64/vmm/io/vioapic.c
head/sys/amd64/vmm/io/vioapic.h
head/sys/amd64/vmm/io/vlapic.c
head/sys/amd64/vmm/io/vlapic.h
head/sys/amd64/vmm/io/vlapic_priv.h
head/sys/amd64/vmm/vmm.c
head/sys/amd64/vmm/vmm_dev.c
head/sys/amd64/vmm/vmm_host.c
head/sys/amd64/vmm/vmm_host.h
head/sys/amd64/vmm/vmm_instruction_emul.c
head/sys/amd64/vmm/vmm_ktr.h
head/sys/amd64/vmm/vmm_lapic.c
head/sys/amd64/vmm/vmm_lapic.h
head/sys/amd64/vmm/vmm_mem.c
head/sys/amd64/vmm/vmm_mem.h
head/sys/amd64/vmm/vmm_stat.c
head/sys/amd64/vmm/vmm_util.c
head/sys/amd64/vmm/vmm_util.h
head/sys/amd64/vmm/x86.c
head/sys/amd64/vmm/x86.h
Modified: head/sys/amd64/acpica/acpi_machdep.c
==============================================================================
--- head/sys/amd64/acpica/acpi_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/acpica/acpi_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
Modified: head/sys/amd64/amd64/atomic.c
==============================================================================
--- head/sys/amd64/amd64/atomic.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/atomic.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Peter Jeremy
* All rights reserved.
*
Modified: head/sys/amd64/amd64/bios.c
==============================================================================
--- head/sys/amd64/amd64/bios.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/bios.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
Modified: head/sys/amd64/amd64/elf_machdep.c
==============================================================================
--- head/sys/amd64/amd64/elf_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/elf_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/amd64/amd64/gdb_machdep.c
==============================================================================
--- head/sys/amd64/amd64/gdb_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/gdb_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/amd64/amd64/initcpu.c
==============================================================================
--- head/sys/amd64/amd64/initcpu.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/initcpu.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) KATO Takenori, 1997, 1998.
*
* All rights reserved. Unpublished rights reserved under the copyright
Modified: head/sys/amd64/amd64/io.c
==============================================================================
--- head/sys/amd64/amd64/io.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/io.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- head/sys/amd64/amd64/minidump_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/minidump_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/mp_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, by Steve Passe
* Copyright (c) 2003, by Peter Wemm
* All rights reserved.
Modified: head/sys/amd64/amd64/prof_machdep.c
==============================================================================
--- head/sys/amd64/amd64/prof_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/prof_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 Bruce D. Evans.
* All rights reserved.
*
Modified: head/sys/amd64/amd64/ptrace_machdep.c
==============================================================================
--- head/sys/amd64/amd64/ptrace_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/ptrace_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/amd64/amd64/uma_machdep.c
==============================================================================
--- head/sys/amd64/amd64/uma_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/amd64/uma_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
Modified: head/sys/amd64/ia32/ia32_misc.c
==============================================================================
--- head/sys/amd64/ia32/ia32_misc.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/ia32/ia32_misc.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Konstantin Belousov
* All rights reserved.
*
Modified: head/sys/amd64/ia32/ia32_reg.c
==============================================================================
--- head/sys/amd64/ia32/ia32_reg.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/ia32/ia32_reg.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Peter Wemm
* All rights reserved.
*
Modified: head/sys/amd64/include/_bus.h
==============================================================================
--- head/sys/amd64/include/_bus.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/_bus.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
Modified: head/sys/amd64/include/atomic.h
==============================================================================
--- head/sys/amd64/include/atomic.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/atomic.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
Modified: head/sys/amd64/include/bus_dma.h
==============================================================================
--- head/sys/amd64/include/bus_dma.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/bus_dma.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Scott Long
* All rights reserved.
*
Modified: head/sys/amd64/include/counter.h
==============================================================================
--- head/sys/amd64/include/counter.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/counter.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/amd64/include/gdb_machdep.h
==============================================================================
--- head/sys/amd64/include/gdb_machdep.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/gdb_machdep.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/amd64/include/intr_machdep.h
==============================================================================
--- head/sys/amd64/include/intr_machdep.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/intr_machdep.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/amd64/include/iodev.h
==============================================================================
--- head/sys/amd64/include/iodev.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/iodev.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/amd64/include/kdb.h
==============================================================================
--- head/sys/amd64/include/kdb.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/kdb.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/amd64/include/memdev.h
==============================================================================
--- head/sys/amd64/include/memdev.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/memdev.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/amd64/include/minidump.h
==============================================================================
--- head/sys/amd64/include/minidump.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/minidump.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
Modified: head/sys/amd64/include/mp_watchdog.h
==============================================================================
--- head/sys/amd64/include/mp_watchdog.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/mp_watchdog.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/amd64/include/pc/bios.h
==============================================================================
--- head/sys/amd64/include/pc/bios.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/pc/bios.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
Modified: head/sys/amd64/include/pcpu.h
==============================================================================
--- head/sys/amd64/include/pcpu.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/pcpu.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) Peter Wemm <peter@netplex.com.au>
* All rights reserved.
*
Modified: head/sys/amd64/include/pmc_mdep.h
==============================================================================
--- head/sys/amd64/include/pmc_mdep.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/pmc_mdep.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/amd64/include/ppireg.h
==============================================================================
--- head/sys/amd64/include/ppireg.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/ppireg.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/amd64/include/runq.h
==============================================================================
--- head/sys/amd64/include/runq.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/runq.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/amd64/include/sf_buf.h
==============================================================================
--- head/sys/amd64/include/sf_buf.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/sf_buf.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, 2005 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
Modified: head/sys/amd64/include/timerreg.h
==============================================================================
--- head/sys/amd64/include/timerreg.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/timerreg.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/amd64/include/vm.h
==============================================================================
--- head/sys/amd64/include/vm.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/vm.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
Modified: head/sys/amd64/include/vmm.h
==============================================================================
--- head/sys/amd64/include/vmm.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/vmm.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/include/vmm_dev.h
==============================================================================
--- head/sys/amd64/include/vmm_dev.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/vmm_dev.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/include/vmm_instruction_emul.h
==============================================================================
--- head/sys/amd64/include/vmm_instruction_emul.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/include/vmm_instruction_emul.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/linux32/linux.h
==============================================================================
--- head/sys/amd64/linux32/linux.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/linux32/linux.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2001 Doug Rabson
* Copyright (c) 1994-1996 Søren Schmidt
Modified: head/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- head/sys/amd64/linux32/linux32_dummy.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/linux32/linux32_dummy.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- head/sys/amd64/linux32/linux32_machdep.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/linux32/linux32_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2002 Doug Rabson
* Copyright (c) 2000 Marcel Moolenaar
Modified: head/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysvec.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/linux32/linux32_sysvec.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 2002 Doug Rabson
Modified: head/sys/amd64/pci/pci_cfgreg.c
==============================================================================
--- head/sys/amd64/pci/pci_cfgreg.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/pci/pci_cfgreg.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
Modified: head/sys/amd64/vmm/amd/amdv.c
==============================================================================
--- head/sys/amd64/vmm/amd/amdv.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/amd/amdv.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/ept.c
==============================================================================
--- head/sys/amd64/vmm/intel/ept.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/ept.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/ept.h
==============================================================================
--- head/sys/amd64/vmm/intel/ept.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/ept.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmcs.c
==============================================================================
--- head/sys/amd64/vmm/intel/vmcs.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmcs.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmcs.h
==============================================================================
--- head/sys/amd64/vmm/intel/vmcs.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmcs.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- head/sys/amd64/vmm/intel/vmx.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmx.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmx.h
==============================================================================
--- head/sys/amd64/vmm/intel/vmx.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmx.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmx_controls.h
==============================================================================
--- head/sys/amd64/vmm/intel/vmx_controls.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmx_controls.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmx_cpufunc.h
==============================================================================
--- head/sys/amd64/vmm/intel/vmx_cpufunc.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmx_cpufunc.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmx_genassym.c
==============================================================================
--- head/sys/amd64/vmm/intel/vmx_genassym.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmx_genassym.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmx_msr.c
==============================================================================
--- head/sys/amd64/vmm/intel/vmx_msr.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmx_msr.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vmx_msr.h
==============================================================================
--- head/sys/amd64/vmm/intel/vmx_msr.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vmx_msr.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/intel/vtd.c
==============================================================================
--- head/sys/amd64/vmm/intel/vtd.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/intel/vtd.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/io/iommu.c
==============================================================================
--- head/sys/amd64/vmm/io/iommu.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/iommu.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/io/iommu.h
==============================================================================
--- head/sys/amd64/vmm/io/iommu.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/iommu.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/io/ppt.c
==============================================================================
--- head/sys/amd64/vmm/io/ppt.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/ppt.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/io/ppt.h
==============================================================================
--- head/sys/amd64/vmm/io/ppt.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/ppt.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/io/vhpet.c
==============================================================================
--- head/sys/amd64/vmm/io/vhpet.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/vhpet.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
Modified: head/sys/amd64/vmm/io/vhpet.h
==============================================================================
--- head/sys/amd64/vmm/io/vhpet.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/vhpet.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
Modified: head/sys/amd64/vmm/io/vioapic.c
==============================================================================
--- head/sys/amd64/vmm/io/vioapic.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/vioapic.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
Modified: head/sys/amd64/vmm/io/vioapic.h
==============================================================================
--- head/sys/amd64/vmm/io/vioapic.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/vioapic.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
Modified: head/sys/amd64/vmm/io/vlapic.c
==============================================================================
--- head/sys/amd64/vmm/io/vlapic.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/vlapic.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/io/vlapic.h
==============================================================================
--- head/sys/amd64/vmm/io/vlapic.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/vlapic.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/io/vlapic_priv.h
==============================================================================
--- head/sys/amd64/vmm/io/vlapic_priv.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/io/vlapic_priv.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Neel Natu <neel@freebsd.org>
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm.c
==============================================================================
--- head/sys/amd64/vmm/vmm.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_dev.c
==============================================================================
--- head/sys/amd64/vmm/vmm_dev.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_dev.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_host.c
==============================================================================
--- head/sys/amd64/vmm/vmm_host.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_host.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_host.h
==============================================================================
--- head/sys/amd64/vmm/vmm_host.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_host.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_instruction_emul.c
==============================================================================
--- head/sys/amd64/vmm/vmm_instruction_emul.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_instruction_emul.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Sandvine, Inc.
* Copyright (c) 2012 NetApp, Inc.
* All rights reserved.
Modified: head/sys/amd64/vmm/vmm_ktr.h
==============================================================================
--- head/sys/amd64/vmm/vmm_ktr.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_ktr.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_lapic.c
==============================================================================
--- head/sys/amd64/vmm/vmm_lapic.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_lapic.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_lapic.h
==============================================================================
--- head/sys/amd64/vmm/vmm_lapic.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_lapic.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_mem.c
==============================================================================
--- head/sys/amd64/vmm/vmm_mem.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_mem.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_mem.h
==============================================================================
--- head/sys/amd64/vmm/vmm_mem.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_mem.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_stat.c
==============================================================================
--- head/sys/amd64/vmm/vmm_stat.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_stat.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_util.c
==============================================================================
--- head/sys/amd64/vmm/vmm_util.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_util.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/vmm_util.h
==============================================================================
--- head/sys/amd64/vmm/vmm_util.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/vmm_util.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/x86.c
==============================================================================
--- head/sys/amd64/vmm/x86.c Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/x86.c Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
Modified: head/sys/amd64/vmm/x86.h
==============================================================================
--- head/sys/amd64/vmm/x86.h Mon Nov 27 15:01:59 2017 (r326256)
+++ head/sys/amd64/vmm/x86.h Mon Nov 27 15:03:07 2017 (r326257)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 NetApp, Inc.
* All rights reserved.
*
From owner-svn-src-all@freebsd.org Mon Nov 27 15:04:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E014E53AD5;
Mon, 27 Nov 2017 15:04:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DBDC074E6A;
Mon, 27 Nov 2017 15:04:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARF4MJf096274;
Mon, 27 Nov 2017 15:04:22 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF4Bsg096160;
Mon, 27 Nov 2017 15:04:11 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271504.vARF4Bsg096160@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:04:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326258 - in head/sys/arm: allwinner allwinner/a20 arm
at91 broadcom/bcm2835 conf freescale freescale/imx freescale/vybrid include
lpc mv mv/armadaxp rockchip samsung/exynos ti ti/am335...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/arm: allwinner allwinner/a20 arm at91
broadcom/bcm2835 conf freescale freescale/imx freescale/vybrid include lpc mv
mv/armadaxp rockchip samsung/exynos ti ti/am335x ti/cpsw ti/omap4 ti/oma...
X-SVN-Commit-Revision: 326258
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:04:23 -0000
Author: pfg
Date: Mon Nov 27 15:04:10 2017
New Revision: 326258
URL: https://svnweb.freebsd.org/changeset/base/326258
Log:
sys/arm: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/arm/allwinner/a10_ehci.c
head/sys/arm/allwinner/a10_gpio.c
head/sys/arm/allwinner/a10_sramc.c
head/sys/arm/allwinner/a10_sramc.h
head/sys/arm/allwinner/a20/a20_cpu_cfg.c
head/sys/arm/allwinner/a20/a20_cpu_cfg.h
head/sys/arm/allwinner/if_emac.c
head/sys/arm/allwinner/if_emacreg.h
head/sys/arm/arm/bus_space_generic.c
head/sys/arm/arm/busdma_machdep-v6.c
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/db_disasm.c
head/sys/arm/arm/disassem.c
head/sys/arm/arm/dump_machdep.c
head/sys/arm/arm/elf_machdep.c
head/sys/arm/arm/elf_trampoline.c
head/sys/arm/arm/fiq.c
head/sys/arm/arm/gdb_machdep.c
head/sys/arm/arm/genassym.c
head/sys/arm/arm/generic_timer.c
head/sys/arm/arm/gic.c
head/sys/arm/arm/intr.c
head/sys/arm/arm/machdep.c
head/sys/arm/arm/minidump_machdep.c
head/sys/arm/arm/mp_machdep.c
head/sys/arm/arm/mpcore_timer.c
head/sys/arm/arm/physmem.c
head/sys/arm/arm/pl190.c
head/sys/arm/arm/pl310.c
head/sys/arm/arm/pmap-v6.c
head/sys/arm/arm/sc_machdep.c
head/sys/arm/arm/stack_machdep.c
head/sys/arm/arm/stdatomic.c
head/sys/arm/arm/undefined.c
head/sys/arm/arm/vfp.c
head/sys/arm/at91/at91.c
head/sys/arm/at91/at91_aic.c
head/sys/arm/at91/at91_aicreg.h
head/sys/arm/at91/at91_cfata.c
head/sys/arm/at91/at91_gpio.h
head/sys/arm/at91/at91_machdep.c
head/sys/arm/at91/at91_mci.c
head/sys/arm/at91/at91_mcireg.h
head/sys/arm/at91/at91_pdcreg.h
head/sys/arm/at91/at91_pio.c
head/sys/arm/at91/at91_pio_sam9g45.h
head/sys/arm/at91/at91_pioreg.h
head/sys/arm/at91/at91_piovar.h
head/sys/arm/at91/at91_pit.c
head/sys/arm/at91/at91_pitreg.h
head/sys/arm/at91/at91_pmc.c
head/sys/arm/at91/at91_pmcreg.h
head/sys/arm/at91/at91_pmcvar.h
head/sys/arm/at91/at91_rst.c
head/sys/arm/at91/at91_rstreg.h
head/sys/arm/at91/at91_rtc.c
head/sys/arm/at91/at91_rtcreg.h
head/sys/arm/at91/at91_sdramc.c
head/sys/arm/at91/at91_shdwc.c
head/sys/arm/at91/at91_smc.c
head/sys/arm/at91/at91_smc.h
head/sys/arm/at91/at91_spi.c
head/sys/arm/at91/at91_spireg.h
head/sys/arm/at91/at91_ssc.c
head/sys/arm/at91/at91_sscreg.h
head/sys/arm/at91/at91_st.c
head/sys/arm/at91/at91_streg.h
head/sys/arm/at91/at91_tcb.c
head/sys/arm/at91/at91_twi.c
head/sys/arm/at91/at91_twiio.h
head/sys/arm/at91/at91_twireg.h
head/sys/arm/at91/at91_usartreg.h
head/sys/arm/at91/at91_wdt.c
head/sys/arm/at91/at91_wdtreg.h
head/sys/arm/at91/at91board.h
head/sys/arm/at91/at91reg.h
head/sys/arm/at91/at91rm9200.c
head/sys/arm/at91/at91rm9200_devices.c
head/sys/arm/at91/at91rm9200var.h
head/sys/arm/at91/at91rm92reg.h
head/sys/arm/at91/at91sam9260.c
head/sys/arm/at91/at91sam9260reg.h
head/sys/arm/at91/at91sam9g20.c
head/sys/arm/at91/at91sam9g20reg.h
head/sys/arm/at91/at91sam9g45.c
head/sys/arm/at91/at91sam9g45reg.h
head/sys/arm/at91/at91sam9x5.c
head/sys/arm/at91/at91sam9x5reg.h
head/sys/arm/at91/at91soc.c
head/sys/arm/at91/at91soc.h
head/sys/arm/at91/at91var.h
head/sys/arm/at91/board_bwct.c
head/sys/arm/at91/board_eb9200.c
head/sys/arm/at91/board_ethernut5.c
head/sys/arm/at91/board_hl200.c
head/sys/arm/at91/board_hl201.c
head/sys/arm/at91/board_kb920x.c
head/sys/arm/at91/board_qila9g20.c
head/sys/arm/at91/board_sam9260ek.c
head/sys/arm/at91/board_sam9g20ek.c
head/sys/arm/at91/board_sam9x25ek.c
head/sys/arm/at91/board_sn9g45.c
head/sys/arm/at91/board_tsc4370.c
head/sys/arm/at91/if_ate.c
head/sys/arm/at91/if_atereg.h
head/sys/arm/at91/if_macb.c
head/sys/arm/at91/uart_bus_at91usart.c
head/sys/arm/at91/uart_cpu_at91usart.c
head/sys/arm/at91/uart_dev_at91usart.c
head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
head/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
head/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
head/sys/arm/broadcom/bcm2835/bcm2835_dma.c
head/sys/arm/broadcom/bcm2835/bcm2835_dma.h
head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
head/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
head/sys/arm/broadcom/bcm2835/bcm2835_gpio.h
head/sys/arm/broadcom/bcm2835/bcm2835_intr.c
head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
head/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
head/sys/arm/broadcom/bcm2835/bcm2835_mbox.h
head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
head/sys/arm/broadcom/bcm2835/bcm2835_spi.c
head/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
head/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
head/sys/arm/broadcom/bcm2835/bcm2835_wdog.h
head/sys/arm/conf/genboardid.awk
head/sys/arm/freescale/fsl_ocotp.c
head/sys/arm/freescale/fsl_ocotpreg.h
head/sys/arm/freescale/fsl_ocotpvar.h
head/sys/arm/freescale/imx/imx51_ccm.c
head/sys/arm/freescale/imx/imx51_ccmreg.h
head/sys/arm/freescale/imx/imx51_ccmvar.h
head/sys/arm/freescale/imx/imx51_dpllreg.h
head/sys/arm/freescale/imx/imx51_ipuv3.c
head/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
head/sys/arm/freescale/imx/imx51_ipuv3reg.h
head/sys/arm/freescale/imx/imx51_machdep.c
head/sys/arm/freescale/imx/imx51_sdmareg.h
head/sys/arm/freescale/imx/imx51_ssireg.h
head/sys/arm/freescale/imx/imx51_tzicreg.h
head/sys/arm/freescale/imx/imx53_machdep.c
head/sys/arm/freescale/imx/imx6_anatop.c
head/sys/arm/freescale/imx/imx6_anatopreg.h
head/sys/arm/freescale/imx/imx6_anatopvar.h
head/sys/arm/freescale/imx/imx6_ccm.c
head/sys/arm/freescale/imx/imx6_ccmreg.h
head/sys/arm/freescale/imx/imx6_machdep.c
head/sys/arm/freescale/imx/imx6_mp.c
head/sys/arm/freescale/imx/imx6_pl310.c
head/sys/arm/freescale/imx/imx6_usbphy.c
head/sys/arm/freescale/imx/imx_gpt.c
head/sys/arm/freescale/imx/imx_gptreg.h
head/sys/arm/freescale/imx/imx_machdep.c
head/sys/arm/freescale/imx/imx_machdep.h
head/sys/arm/freescale/imx/imx_nop_usbphy.c
head/sys/arm/freescale/imx/imx_wdog.c
head/sys/arm/freescale/imx/imx_wdogreg.h
head/sys/arm/freescale/imx/tzic.c
head/sys/arm/freescale/vybrid/vf_anadig.c
head/sys/arm/freescale/vybrid/vf_ccm.c
head/sys/arm/freescale/vybrid/vf_common.h
head/sys/arm/freescale/vybrid/vf_dcu4.c
head/sys/arm/freescale/vybrid/vf_dmamux.c
head/sys/arm/freescale/vybrid/vf_dmamux.h
head/sys/arm/freescale/vybrid/vf_edma.c
head/sys/arm/freescale/vybrid/vf_edma.h
head/sys/arm/freescale/vybrid/vf_ehci.c
head/sys/arm/freescale/vybrid/vf_gpio.c
head/sys/arm/freescale/vybrid/vf_i2c.c
head/sys/arm/freescale/vybrid/vf_iomuxc.c
head/sys/arm/freescale/vybrid/vf_iomuxc.h
head/sys/arm/freescale/vybrid/vf_machdep.c
head/sys/arm/freescale/vybrid/vf_mscm.c
head/sys/arm/freescale/vybrid/vf_nfc.c
head/sys/arm/freescale/vybrid/vf_port.c
head/sys/arm/freescale/vybrid/vf_port.h
head/sys/arm/freescale/vybrid/vf_sai.c
head/sys/arm/freescale/vybrid/vf_src.c
head/sys/arm/freescale/vybrid/vf_src.h
head/sys/arm/freescale/vybrid/vf_tcon.c
head/sys/arm/freescale/vybrid/vf_uart.c
head/sys/arm/include/_bus.h
head/sys/arm/include/_inttypes.h
head/sys/arm/include/_stdint.h
head/sys/arm/include/armreg.h
head/sys/arm/include/asmacros.h
head/sys/arm/include/at91_gpio.h
head/sys/arm/include/atags.h
head/sys/arm/include/atomic.h
head/sys/arm/include/blockio.h
head/sys/arm/include/board.h
head/sys/arm/include/bus.h
head/sys/arm/include/bus_dma.h
head/sys/arm/include/clock.h
head/sys/arm/include/counter.h
head/sys/arm/include/cpufunc.h
head/sys/arm/include/disassem.h
head/sys/arm/include/elf.h
head/sys/arm/include/fdt.h
head/sys/arm/include/fiq.h
head/sys/arm/include/frame.h
head/sys/arm/include/gdb_machdep.h
head/sys/arm/include/intr.h
head/sys/arm/include/kdb.h
head/sys/arm/include/memdev.h
head/sys/arm/include/metadata.h
head/sys/arm/include/minidump.h
head/sys/arm/include/ofw_machdep.h
head/sys/arm/include/pcb.h
head/sys/arm/include/pcpu.h
head/sys/arm/include/physmem.h
head/sys/arm/include/pl310.h
head/sys/arm/include/pmc_mdep.h
head/sys/arm/include/psl.h
head/sys/arm/include/runq.h
head/sys/arm/include/sc_machdep.h
head/sys/arm/include/sf_buf.h
head/sys/arm/include/sysarch.h
head/sys/arm/include/ucontext.h
head/sys/arm/include/undefined.h
head/sys/arm/include/utrap.h
head/sys/arm/include/vdso.h
head/sys/arm/include/vfp.h
head/sys/arm/include/vm.h
head/sys/arm/lpc/if_lpe.c
head/sys/arm/lpc/if_lpereg.h
head/sys/arm/lpc/lpc_dmac.c
head/sys/arm/lpc/lpc_fb.c
head/sys/arm/lpc/lpc_gpio.c
head/sys/arm/lpc/lpc_intc.c
head/sys/arm/lpc/lpc_machdep.c
head/sys/arm/lpc/lpc_mmc.c
head/sys/arm/lpc/lpc_ohci.c
head/sys/arm/lpc/lpc_pll.c
head/sys/arm/lpc/lpc_pwr.c
head/sys/arm/lpc/lpc_rtc.c
head/sys/arm/lpc/lpc_spi.c
head/sys/arm/lpc/lpc_timer.c
head/sys/arm/lpc/lpcreg.h
head/sys/arm/lpc/lpcvar.h
head/sys/arm/lpc/ssd1289.c
head/sys/arm/mv/armadaxp/armadaxp.c
head/sys/arm/mv/armadaxp/armadaxp_mp.c
head/sys/arm/mv/gpio.c
head/sys/arm/mv/ic.c
head/sys/arm/mv/mpic.c
head/sys/arm/mv/mv_localbus.c
head/sys/arm/mv/mv_machdep.c
head/sys/arm/mv/mv_ts.c
head/sys/arm/mv/mvvar.h
head/sys/arm/mv/timer.c
head/sys/arm/rockchip/rk30xx_gpio.c
head/sys/arm/rockchip/rk30xx_grf.c
head/sys/arm/rockchip/rk30xx_grf.h
head/sys/arm/rockchip/rk30xx_machdep.c
head/sys/arm/rockchip/rk30xx_pmu.c
head/sys/arm/rockchip/rk30xx_pmu.h
head/sys/arm/rockchip/rk30xx_wdog.c
head/sys/arm/rockchip/rk30xx_wdog.h
head/sys/arm/samsung/exynos/exynos5_machdep.c
head/sys/arm/samsung/exynos/exynos5_mp.c
head/sys/arm/ti/aintc.c
head/sys/arm/ti/am335x/am335x_dmtimer.c
head/sys/arm/ti/am335x/am335x_lcd.c
head/sys/arm/ti/am335x/am335x_lcd.h
head/sys/arm/ti/am335x/am335x_lcd_syscons.c
head/sys/arm/ti/am335x/am335x_pmic.c
head/sys/arm/ti/am335x/am335x_prcm.c
head/sys/arm/ti/am335x/am335x_pwm.h
head/sys/arm/ti/am335x/am335x_reg.h
head/sys/arm/ti/am335x/am335x_scm.h
head/sys/arm/ti/am335x/am335x_scm_padconf.c
head/sys/arm/ti/am335x/am335x_usbss.c
head/sys/arm/ti/cpsw/if_cpsw.c
head/sys/arm/ti/cpsw/if_cpswreg.h
head/sys/arm/ti/cpsw/if_cpswvar.h
head/sys/arm/ti/omap4/omap4_l2cache.c
head/sys/arm/ti/omap4/omap4_mp.c
head/sys/arm/ti/omap4/omap4_prcm_clks.c
head/sys/arm/ti/omap4/omap4_reg.h
head/sys/arm/ti/omap4/omap4_scm_padconf.c
head/sys/arm/ti/omap4/omap4_smc.h
head/sys/arm/ti/omap4/pandaboard/pandaboard.c
head/sys/arm/ti/ti_cpuid.c
head/sys/arm/ti/ti_cpuid.h
head/sys/arm/ti/ti_edma3.h
head/sys/arm/ti/ti_gpio.c
head/sys/arm/ti/ti_i2c.c
head/sys/arm/ti/ti_i2c.h
head/sys/arm/ti/ti_machdep.c
head/sys/arm/ti/ti_mbox.c
head/sys/arm/ti/ti_mbox.h
head/sys/arm/ti/ti_prcm.c
head/sys/arm/ti/ti_prcm.h
head/sys/arm/ti/ti_pruss.c
head/sys/arm/ti/ti_pruss.h
head/sys/arm/ti/ti_scm.c
head/sys/arm/ti/ti_scm.h
head/sys/arm/ti/ti_sdhci.c
head/sys/arm/ti/ti_sdma.c
head/sys/arm/ti/ti_sdma.h
head/sys/arm/ti/ti_sdmareg.h
head/sys/arm/ti/ti_smc.h
head/sys/arm/ti/tivar.h
head/sys/arm/ti/twl/twl.c
head/sys/arm/ti/twl/twl.h
head/sys/arm/ti/twl/twl_clks.c
head/sys/arm/ti/twl/twl_clks.h
head/sys/arm/ti/twl/twl_vreg.c
head/sys/arm/ti/twl/twl_vreg.h
head/sys/arm/ti/usb/omap_ehci.c
head/sys/arm/ti/usb/omap_usb.h
head/sys/arm/versatile/pl050.c
head/sys/arm/versatile/sp804.c
head/sys/arm/versatile/versatile_clcd.c
head/sys/arm/versatile/versatile_machdep.c
head/sys/arm/versatile/versatile_pci.c
head/sys/arm/versatile/versatile_sic.c
head/sys/arm/xilinx/uart_dev_cdnc.c
head/sys/arm/xilinx/zy7_devcfg.c
head/sys/arm/xilinx/zy7_ehci.c
head/sys/arm/xilinx/zy7_gpio.c
head/sys/arm/xilinx/zy7_l2cache.c
head/sys/arm/xilinx/zy7_machdep.c
head/sys/arm/xilinx/zy7_reg.h
head/sys/arm/xilinx/zy7_slcr.c
head/sys/arm/xilinx/zy7_slcr.h
head/sys/arm/xscale/i8134x/crb_machdep.c
head/sys/arm/xscale/i8134x/i81342.c
head/sys/arm/xscale/i8134x/i81342_mcu.c
head/sys/arm/xscale/i8134x/i81342_pci.c
head/sys/arm/xscale/i8134x/i81342_space.c
head/sys/arm/xscale/i8134x/i81342reg.h
head/sys/arm/xscale/i8134x/i81342var.h
head/sys/arm/xscale/i8134x/iq81342_7seg.c
head/sys/arm/xscale/i8134x/iq81342reg.h
head/sys/arm/xscale/i8134x/iq81342var.h
head/sys/arm/xscale/i8134x/obio.c
head/sys/arm/xscale/i8134x/obiovar.h
head/sys/arm/xscale/i8134x/uart_bus_i81342.c
head/sys/arm/xscale/i8134x/uart_cpu_i81342.c
head/sys/arm/xscale/ixp425/avila_ata.c
head/sys/arm/xscale/ixp425/avila_gpio.c
head/sys/arm/xscale/ixp425/avila_led.c
head/sys/arm/xscale/ixp425/avila_machdep.c
head/sys/arm/xscale/ixp425/cambria_exp_space.c
head/sys/arm/xscale/ixp425/cambria_fled.c
head/sys/arm/xscale/ixp425/cambria_gpio.c
head/sys/arm/xscale/ixp425/cambria_led.c
head/sys/arm/xscale/ixp425/if_npe.c
head/sys/arm/xscale/ixp425/ixdp425_pci.c
head/sys/arm/xscale/ixp425/ixdp425reg.h
head/sys/arm/xscale/ixp425/ixp425.c
head/sys/arm/xscale/ixp425/ixp425_a4x_space.c
head/sys/arm/xscale/ixp425/ixp425_iic.c
head/sys/arm/xscale/ixp425/ixp425_intr.h
head/sys/arm/xscale/ixp425/ixp425_mem.c
head/sys/arm/xscale/ixp425/ixp425_npevar.h
head/sys/arm/xscale/ixp425/ixp425_pci.c
head/sys/arm/xscale/ixp425/ixp425_pci_space.c
head/sys/arm/xscale/ixp425/ixp425_space.c
head/sys/arm/xscale/ixp425/ixp425_timer.c
head/sys/arm/xscale/ixp425/ixp425_wdog.c
head/sys/arm/xscale/ixp425/ixp425reg.h
head/sys/arm/xscale/ixp425/ixp425var.h
head/sys/arm/xscale/ixp425/uart_bus_ixp425.c
head/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
head/sys/arm/xscale/pxa/if_smc_smi.c
head/sys/arm/xscale/pxa/pxa_gpio.c
head/sys/arm/xscale/pxa/pxa_icu.c
head/sys/arm/xscale/pxa/pxa_machdep.c
head/sys/arm/xscale/pxa/pxa_obio.c
head/sys/arm/xscale/pxa/pxa_smi.c
head/sys/arm/xscale/pxa/pxa_space.c
head/sys/arm/xscale/pxa/pxa_timer.c
head/sys/arm/xscale/pxa/pxareg.h
head/sys/arm/xscale/pxa/pxavar.h
head/sys/arm/xscale/pxa/uart_bus_pxa.c
head/sys/arm/xscale/pxa/uart_cpu_pxa.c
Modified: head/sys/arm/allwinner/a10_ehci.c
==============================================================================
--- head/sys/arm/allwinner/a10_ehci.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/a10_ehci.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/allwinner/a10_gpio.c
==============================================================================
--- head/sys/arm/allwinner/a10_gpio.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/a10_gpio.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012 Luiz Otavio O Souza.
Modified: head/sys/arm/allwinner/a10_sramc.c
==============================================================================
--- head/sys/arm/allwinner/a10_sramc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/a10_sramc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/allwinner/a10_sramc.h
==============================================================================
--- head/sys/arm/allwinner/a10_sramc.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/a10_sramc.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/allwinner/a20/a20_cpu_cfg.c
==============================================================================
--- head/sys/arm/allwinner/a20/a20_cpu_cfg.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/a20/a20_cpu_cfg.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/allwinner/a20/a20_cpu_cfg.h
==============================================================================
--- head/sys/arm/allwinner/a20/a20_cpu_cfg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/a20/a20_cpu_cfg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/allwinner/if_emac.c
==============================================================================
--- head/sys/arm/allwinner/if_emac.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/if_emac.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/allwinner/if_emacreg.h
==============================================================================
--- head/sys/arm/allwinner/if_emacreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/allwinner/if_emacreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2013 Ganbold Tsagaankhuu <ganbold@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/arm/bus_space_generic.c
==============================================================================
--- head/sys/arm/arm/bus_space_generic.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/bus_space_generic.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: obio_space.c,v 1.6 2003/07/15 00:25:05 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v6.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/busdma_machdep-v6.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012-2015 Ian Lepore
* Copyright (c) 2010 Mark Tinguely
* Copyright (c) 2004 Olivier Houchard
Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/cpufunc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* arm9 support code Copyright (C) 2001 ARM Ltd
* Copyright (c) 1997 Mark Brinicombe.
* Copyright (c) 1997 Causality Limited
Modified: head/sys/arm/arm/db_disasm.c
==============================================================================
--- head/sys/arm/arm/db_disasm.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/db_disasm.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: db_disasm.c,v 1.4 2003/07/15 00:24:38 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 Mark Brinicombe.
* Copyright (c) 1996 Brini.
*
Modified: head/sys/arm/arm/disassem.c
==============================================================================
--- head/sys/arm/arm/disassem.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/disassem.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: disassem.c,v 1.14 2003/03/27 16:58:36 mycroft Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 Mark Brinicombe.
* Copyright (c) 1996 Brini.
*
Modified: head/sys/arm/arm/dump_machdep.c
==============================================================================
--- head/sys/arm/arm/dump_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/dump_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/arm/arm/elf_machdep.c
==============================================================================
--- head/sys/arm/arm/elf_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/elf_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/elf_trampoline.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/arm/fiq.c
==============================================================================
--- head/sys/arm/arm/fiq.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/fiq.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/arm/arm/gdb_machdep.c
==============================================================================
--- head/sys/arm/arm/gdb_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/gdb_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Olivier Houchard
* All rights reserved.
*
Modified: head/sys/arm/arm/genassym.c
==============================================================================
--- head/sys/arm/arm/genassym.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/genassym.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Olivier Houchard
* All rights reserved.
*
Modified: head/sys/arm/arm/generic_timer.c
==============================================================================
--- head/sys/arm/arm/generic_timer.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/generic_timer.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2011 The FreeBSD Foundation
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
Modified: head/sys/arm/arm/gic.c
==============================================================================
--- head/sys/arm/arm/gic.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/gic.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/arm/arm/intr.c
==============================================================================
--- head/sys/arm/arm/intr.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/intr.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: intr.c,v 1.12 2003/07/15 00:24:41 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004 Olivier Houchard.
* Copyright (c) 1994-1998 Mark Brinicombe.
* All rights reserved.
Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: arm32_machdep.c,v 1.44 2004/03/24 15:34:47 atatat Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2004 Olivier Houchard
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
Modified: head/sys/arm/arm/minidump_machdep.c
==============================================================================
--- head/sys/arm/arm/minidump_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/minidump_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Peter Wemm
* Copyright (c) 2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
Modified: head/sys/arm/arm/mp_machdep.c
==============================================================================
--- head/sys/arm/arm/mp_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/mp_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Semihalf.
* All rights reserved.
*
Modified: head/sys/arm/arm/mpcore_timer.c
==============================================================================
--- head/sys/arm/arm/mpcore_timer.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/mpcore_timer.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/arm/arm/physmem.c
==============================================================================
--- head/sys/arm/arm/physmem.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/physmem.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* All rights reserved.
*
Modified: head/sys/arm/arm/pl190.c
==============================================================================
--- head/sys/arm/arm/pl190.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/pl190.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012-2017 Oleksandr Tymoshenko <gonzo@bluezbox.com>
* All rights reserved.
*
Modified: head/sys/arm/arm/pl310.c
==============================================================================
--- head/sys/arm/arm/pl310.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/pl310.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2012 Olivier Houchard <cognet@FreeBSD.org>
* Copyright (c) 2011
* Ben Gray <ben.r.gray@gmail.com>.
Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/pmap-v6.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1991 Regents of the University of California.
* Copyright (c) 1994 John S. Dyson
* Copyright (c) 1994 David Greenman
Modified: head/sys/arm/arm/sc_machdep.c
==============================================================================
--- head/sys/arm/arm/sc_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/sc_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/arm/arm/stack_machdep.c
==============================================================================
--- head/sys/arm/arm/stack_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/stack_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
Modified: head/sys/arm/arm/stdatomic.c
==============================================================================
--- head/sys/arm/arm/stdatomic.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/stdatomic.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/arm/arm/undefined.c
==============================================================================
--- head/sys/arm/arm/undefined.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/undefined.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,6 +1,8 @@
/* $NetBSD: undefined.c,v 1.22 2003/11/29 22:21:29 bjh21 Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001 Ben Harris.
* Copyright (c) 1995 Mark Brinicombe.
* Copyright (c) 1995 Brini.
Modified: head/sys/arm/arm/vfp.c
==============================================================================
--- head/sys/arm/arm/vfp.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/arm/vfp.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
* Copyright (c) 2012 Mark Tinguely
*
Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/at91_aic.c
==============================================================================
--- head/sys/arm/at91/at91_aic.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_aic.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_aicreg.h
==============================================================================
--- head/sys/arm/at91/at91_aicreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_aicreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_cfata.c
==============================================================================
--- head/sys/arm/at91/at91_cfata.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_cfata.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Deglitch Networks, Stanislav Sedov
* All rights reserved.
*
Modified: head/sys/arm/at91/at91_gpio.h
==============================================================================
--- head/sys/arm/at91/at91_gpio.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_gpio.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_machdep.c
==============================================================================
--- head/sys/arm/at91/at91_machdep.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994-1998 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
Modified: head/sys/arm/at91/at91_mci.c
==============================================================================
--- head/sys/arm/at91/at91_mci.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_mci.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Bernd Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
Modified: head/sys/arm/at91/at91_mcireg.h
==============================================================================
--- head/sys/arm/at91/at91_mcireg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_mcireg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Berndt Walter. All rights reserved.
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
Modified: head/sys/arm/at91/at91_pdcreg.h
==============================================================================
--- head/sys/arm/at91/at91_pdcreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pdcreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_pio.c
==============================================================================
--- head/sys/arm/at91/at91_pio.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pio.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (C) 2012 Ian Lepore. All rights reserved.
*
Modified: head/sys/arm/at91/at91_pio_sam9g45.h
==============================================================================
--- head/sys/arm/at91/at91_pio_sam9g45.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pio_sam9g45.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* ----------------------------------------------------------------------------
* ATMEL Microcontroller Software Support - ROUSSET -
* ----------------------------------------------------------------------------
Modified: head/sys/arm/at91/at91_pioreg.h
==============================================================================
--- head/sys/arm/at91/at91_pioreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pioreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_piovar.h
==============================================================================
--- head/sys/arm/at91/at91_piovar.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_piovar.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_pit.c
==============================================================================
--- head/sys/arm/at91/at91_pit.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pit.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Gallon Sylvestre. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/at91_pitreg.h
==============================================================================
--- head/sys/arm/at91/at91_pitreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pitreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_pmc.c
==============================================================================
--- head/sys/arm/at91/at91_pmc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pmc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/at91_pmcreg.h
==============================================================================
--- head/sys/arm/at91/at91_pmcreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pmcreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_pmcvar.h
==============================================================================
--- head/sys/arm/at91/at91_pmcvar.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_pmcvar.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_rst.c
==============================================================================
--- head/sys/arm/at91/at91_rst.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_rst.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_rstreg.h
==============================================================================
--- head/sys/arm/at91/at91_rstreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_rstreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_rtc.c
==============================================================================
--- head/sys/arm/at91/at91_rtc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_rtc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2012 Ian Lepore. All rights reserved.
*
Modified: head/sys/arm/at91/at91_rtcreg.h
==============================================================================
--- head/sys/arm/at91/at91_rtcreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_rtcreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_sdramc.c
==============================================================================
--- head/sys/arm/at91/at91_sdramc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_sdramc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_shdwc.c
==============================================================================
--- head/sys/arm/at91/at91_shdwc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_shdwc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_smc.c
==============================================================================
--- head/sys/arm/at91/at91_smc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_smc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_smc.h
==============================================================================
--- head/sys/arm/at91/at91_smc.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_smc.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_spi.c
==============================================================================
--- head/sys/arm/at91/at91_spi.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_spi.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh.
* Copyright (c) 2011-2012 Ian Lepore.
* All rights reserved.
Modified: head/sys/arm/at91/at91_spireg.h
==============================================================================
--- head/sys/arm/at91/at91_spireg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_spireg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_ssc.c
==============================================================================
--- head/sys/arm/at91/at91_ssc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_ssc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_sscreg.h
==============================================================================
--- head/sys/arm/at91/at91_sscreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_sscreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_st.c
==============================================================================
--- head/sys/arm/at91/at91_st.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_st.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_streg.h
==============================================================================
--- head/sys/arm/at91/at91_streg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_streg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_tcb.c
==============================================================================
--- head/sys/arm/at91/at91_tcb.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_tcb.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_twi.c
==============================================================================
--- head/sys/arm/at91/at91_twi.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_twi.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_twiio.h
==============================================================================
--- head/sys/arm/at91/at91_twiio.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_twiio.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_twireg.h
==============================================================================
--- head/sys/arm/at91/at91_twireg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_twireg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_usartreg.h
==============================================================================
--- head/sys/arm/at91/at91_usartreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_usartreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_wdt.c
==============================================================================
--- head/sys/arm/at91/at91_wdt.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_wdt.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91_wdtreg.h
==============================================================================
--- head/sys/arm/at91/at91_wdtreg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91_wdtreg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Gallon Sylvestre. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91board.h
==============================================================================
--- head/sys/arm/at91/at91board.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91board.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91reg.h
==============================================================================
--- head/sys/arm/at91/at91reg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91reg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Greg Ansley All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91rm9200.c
==============================================================================
--- head/sys/arm/at91/at91rm9200.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91rm9200.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/at91rm9200_devices.c
==============================================================================
--- head/sys/arm/at91/at91rm9200_devices.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91rm9200_devices.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 M. Warner Losh. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91rm9200var.h
==============================================================================
--- head/sys/arm/at91/at91rm9200var.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91rm9200var.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91rm92reg.h
==============================================================================
--- head/sys/arm/at91/at91rm92reg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91rm92reg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91sam9260.c
==============================================================================
--- head/sys/arm/at91/at91sam9260.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9260.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/at91sam9260reg.h
==============================================================================
--- head/sys/arm/at91/at91sam9260reg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9260reg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91sam9g20.c
==============================================================================
--- head/sys/arm/at91/at91sam9g20.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9g20.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/at91sam9g20reg.h
==============================================================================
--- head/sys/arm/at91/at91sam9g20reg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9g20reg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/at91sam9g45.c
==============================================================================
--- head/sys/arm/at91/at91sam9g45.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9g45.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 Andrew Turner. All rights reserved.
Modified: head/sys/arm/at91/at91sam9g45reg.h
==============================================================================
--- head/sys/arm/at91/at91sam9g45reg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9g45reg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 Andrew Turner. All rights reserved.
Modified: head/sys/arm/at91/at91sam9x5.c
==============================================================================
--- head/sys/arm/at91/at91sam9x5.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9x5.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 M. Warner Losh.. All rights reserved.
Modified: head/sys/arm/at91/at91sam9x5reg.h
==============================================================================
--- head/sys/arm/at91/at91sam9x5reg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91sam9x5reg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2010 Greg Ansley. All rights reserved.
* Copyright (c) 2012 M. Warener Losh. All rights reserved.
Modified: head/sys/arm/at91/at91soc.c
==============================================================================
--- head/sys/arm/at91/at91soc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91soc.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91soc.h
==============================================================================
--- head/sys/arm/at91/at91soc.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91soc.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/at91var.h
==============================================================================
--- head/sys/arm/at91/at91var.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/at91var.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/board_bwct.c
==============================================================================
--- head/sys/arm/at91/board_bwct.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_bwct.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
Modified: head/sys/arm/at91/board_eb9200.c
==============================================================================
--- head/sys/arm/at91/board_eb9200.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_eb9200.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
Modified: head/sys/arm/at91/board_ethernut5.c
==============================================================================
--- head/sys/arm/at91/board_ethernut5.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_ethernut5.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/arm/at91/board_hl200.c
==============================================================================
--- head/sys/arm/at91/board_hl200.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_hl200.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
Modified: head/sys/arm/at91/board_hl201.c
==============================================================================
--- head/sys/arm/at91/board_hl201.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_hl201.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2008 Warner Losh. All rights reserved.
*
Modified: head/sys/arm/at91/board_kb920x.c
==============================================================================
--- head/sys/arm/at91/board_kb920x.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_kb920x.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
*
Modified: head/sys/arm/at91/board_qila9g20.c
==============================================================================
--- head/sys/arm/at91/board_qila9g20.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_qila9g20.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/board_sam9260ek.c
==============================================================================
--- head/sys/arm/at91/board_sam9260ek.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_sam9260ek.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/arm/at91/board_sam9g20ek.c
==============================================================================
--- head/sys/arm/at91/board_sam9g20ek.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_sam9g20ek.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/board_sam9x25ek.c
==============================================================================
--- head/sys/arm/at91/board_sam9x25ek.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_sam9x25ek.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/board_sn9g45.c
==============================================================================
--- head/sys/arm/at91/board_sn9g45.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_sn9g45.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/board_tsc4370.c
==============================================================================
--- head/sys/arm/at91/board_tsc4370.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/board_tsc4370.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Olivier Houchard. All rights reserved.
* Copyright (c) 2005-2012 Warner Losh. All rights reserved.
* Copyright (c) 2007-2014 Ian Lepore. All rights reserved.
Modified: head/sys/arm/at91/if_ate.c
==============================================================================
--- head/sys/arm/at91/if_ate.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/if_ate.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
* Copyright (c) 2009 Greg Ansley. All rights reserved.
*
Modified: head/sys/arm/at91/if_atereg.h
==============================================================================
--- head/sys/arm/at91/if_atereg.h Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/if_atereg.h Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/if_macb.c
==============================================================================
--- head/sys/arm/at91/if_macb.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/if_macb.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Yohanes Nugroho <yohanes@gmail.com>
* All rights reserved.
*
Modified: head/sys/arm/at91/uart_bus_at91usart.c
==============================================================================
--- head/sys/arm/at91/uart_bus_at91usart.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/uart_bus_at91usart.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/arm/at91/uart_cpu_at91usart.c
==============================================================================
--- head/sys/arm/at91/uart_cpu_at91usart.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/uart_cpu_at91usart.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Marcel Moolenaar
* Copyright (c) 2006 M. Warner Losh
* All rights reserved.
Modified: head/sys/arm/at91/uart_dev_at91usart.c
==============================================================================
--- head/sys/arm/at91/uart_dev_at91usart.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/at91/uart_dev_at91usart.c Mon Nov 27 15:04:10 2017 (r326258)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh
* Copyright (c) 2005 Olivier Houchard
* Copyright (c) 2012 Ian Lepore
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c Mon Nov 27 15:03:07 2017 (r326257)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c Mon Nov 27 15:04:10 2017 (r326258)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:07:38 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBAC6E53C0D;
Mon, 27 Nov 2017 15:07:38 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 29A7175029;
Mon, 27 Nov 2017 15:07:38 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARF7btJ096536;
Mon, 27 Nov 2017 15:07:37 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF7Qvd096428;
Mon, 27 Nov 2017 15:07:26 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271507.vARF7Qvd096428@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:07:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326259 - in head/sys/mips: adm5120 alchemy atheros beri
cavium cavium/cryptocteon cavium/octe cavium/usb gxemul idt include malta
mips nlm nlm/dev/net nlm/dev/net/ucore nlm/dev/sec nlm...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/mips: adm5120 alchemy atheros beri cavium
cavium/cryptocteon cavium/octe cavium/usb gxemul idt include malta mips nlm
nlm/dev/net nlm/dev/net/ucore nlm/dev/sec nlm/hal rmi rt305x sibyte
X-SVN-Commit-Revision: 326259
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:07:38 -0000
Author: pfg
Date: Mon Nov 27 15:07:26 2017
New Revision: 326259
URL: https://svnweb.freebsd.org/changeset/base/326259
Log:
sys/mips: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/mips/adm5120/adm5120_machdep.c
head/sys/mips/adm5120/adm5120reg.h
head/sys/mips/adm5120/admpci.c
head/sys/mips/adm5120/console.c
head/sys/mips/adm5120/if_admsw.c
head/sys/mips/adm5120/if_admswreg.h
head/sys/mips/adm5120/if_admswvar.h
head/sys/mips/adm5120/obio.c
head/sys/mips/adm5120/obiovar.h
head/sys/mips/adm5120/uart_bus_adm5120.c
head/sys/mips/adm5120/uart_cpu_adm5120.c
head/sys/mips/adm5120/uart_dev_adm5120.c
head/sys/mips/adm5120/uart_dev_adm5120.h
head/sys/mips/alchemy/alchemy_machdep.c
head/sys/mips/alchemy/aureg.h
head/sys/mips/alchemy/obio.c
head/sys/mips/alchemy/uart_bus_alchemy.c
head/sys/mips/alchemy/uart_cpu_alchemy.c
head/sys/mips/atheros/apb.c
head/sys/mips/atheros/apbvar.h
head/sys/mips/atheros/ar71xx_bus_space_reversed.c
head/sys/mips/atheros/ar71xx_bus_space_reversed.h
head/sys/mips/atheros/ar71xx_chip.c
head/sys/mips/atheros/ar71xx_chip.h
head/sys/mips/atheros/ar71xx_cpudef.h
head/sys/mips/atheros/ar71xx_ehci.c
head/sys/mips/atheros/ar71xx_fixup.c
head/sys/mips/atheros/ar71xx_fixup.h
head/sys/mips/atheros/ar71xx_gpio.c
head/sys/mips/atheros/ar71xx_gpiovar.h
head/sys/mips/atheros/ar71xx_machdep.c
head/sys/mips/atheros/ar71xx_ohci.c
head/sys/mips/atheros/ar71xx_pci.c
head/sys/mips/atheros/ar71xx_pci_bus_space.c
head/sys/mips/atheros/ar71xx_pci_bus_space.h
head/sys/mips/atheros/ar71xx_setup.c
head/sys/mips/atheros/ar71xx_setup.h
head/sys/mips/atheros/ar71xx_spi.c
head/sys/mips/atheros/ar71xx_wdog.c
head/sys/mips/atheros/ar71xxreg.h
head/sys/mips/atheros/ar724x_chip.c
head/sys/mips/atheros/ar724x_chip.h
head/sys/mips/atheros/ar724x_pci.c
head/sys/mips/atheros/ar724xreg.h
head/sys/mips/atheros/ar91xx_chip.c
head/sys/mips/atheros/ar91xx_chip.h
head/sys/mips/atheros/ar91xxreg.h
head/sys/mips/atheros/ar933x_chip.c
head/sys/mips/atheros/ar933x_chip.h
head/sys/mips/atheros/ar933x_uart.h
head/sys/mips/atheros/ar933xreg.h
head/sys/mips/atheros/ar934x_chip.c
head/sys/mips/atheros/ar934x_chip.h
head/sys/mips/atheros/ar934xreg.h
head/sys/mips/atheros/if_arge.c
head/sys/mips/atheros/if_argevar.h
head/sys/mips/atheros/pcf2123_rtc.c
head/sys/mips/atheros/pcf2123reg.h
head/sys/mips/atheros/uart_bus_ar71xx.c
head/sys/mips/atheros/uart_bus_ar933x.c
head/sys/mips/atheros/uart_cpu_ar71xx.c
head/sys/mips/atheros/uart_cpu_ar933x.c
head/sys/mips/atheros/uart_dev_ar933x.c
head/sys/mips/atheros/uart_dev_ar933x.h
head/sys/mips/beri/beri_machdep.c
head/sys/mips/beri/beri_pic.c
head/sys/mips/cavium/ciu.c
head/sys/mips/cavium/cryptocteon/cavium_crypto.c
head/sys/mips/cavium/if_octm.c
head/sys/mips/cavium/obio.c
head/sys/mips/cavium/obiovar.h
head/sys/mips/cavium/octe/ethernet-mv88e61xx.c
head/sys/mips/cavium/octe/ethernet-mv88e61xx.h
head/sys/mips/cavium/octe/mv88e61xxphy.c
head/sys/mips/cavium/octe/mv88e61xxphyreg.h
head/sys/mips/cavium/octe/octe.c
head/sys/mips/cavium/octe/octebus.c
head/sys/mips/cavium/octe/octebusvar.h
head/sys/mips/cavium/octeon_cop2.h
head/sys/mips/cavium/octeon_gpio.c
head/sys/mips/cavium/octeon_gpiovar.h
head/sys/mips/cavium/octeon_machdep.c
head/sys/mips/cavium/octeon_mp.c
head/sys/mips/cavium/octeon_pci_console.c
head/sys/mips/cavium/octeon_pmc.c
head/sys/mips/cavium/octeon_rnd.c
head/sys/mips/cavium/octeon_rtc.c
head/sys/mips/cavium/octeon_wdog.c
head/sys/mips/cavium/octopci.c
head/sys/mips/cavium/octopci_bus_space.c
head/sys/mips/cavium/octopcivar.h
head/sys/mips/cavium/uart_bus_octeonusart.c
head/sys/mips/cavium/uart_cpu_octeonusart.c
head/sys/mips/cavium/uart_dev_oct16550.c
head/sys/mips/cavium/usb/octusb.c
head/sys/mips/cavium/usb/octusb.h
head/sys/mips/cavium/usb/octusb_octeon.c
head/sys/mips/gxemul/gxemul_machdep.c
head/sys/mips/gxemul/mpreg.h
head/sys/mips/idt/idt_machdep.c
head/sys/mips/idt/idtpci.c
head/sys/mips/idt/idtreg.h
head/sys/mips/idt/if_kr.c
head/sys/mips/idt/if_krreg.h
head/sys/mips/idt/obio.c
head/sys/mips/idt/obiovar.h
head/sys/mips/idt/uart_bus_rc32434.c
head/sys/mips/idt/uart_cpu_rc32434.c
head/sys/mips/include/_bus.h
head/sys/mips/include/_inttypes.h
head/sys/mips/include/_stdint.h
head/sys/mips/include/atomic.h
head/sys/mips/include/bootinfo.h
head/sys/mips/include/bus.h
head/sys/mips/include/bus_dma.h
head/sys/mips/include/cache.h
head/sys/mips/include/cache_mipsNN.h
head/sys/mips/include/cache_r4k.h
head/sys/mips/include/counter.h
head/sys/mips/include/cpufunc.h
head/sys/mips/include/db_machdep.h
head/sys/mips/include/elf.h
head/sys/mips/include/fdt.h
head/sys/mips/include/frame.h
head/sys/mips/include/gdb_machdep.h
head/sys/mips/include/hwfunc.h
head/sys/mips/include/intr_machdep.h
head/sys/mips/include/kdb.h
head/sys/mips/include/memdev.h
head/sys/mips/include/metadata.h
head/sys/mips/include/minidump.h
head/sys/mips/include/octeon_cop2.h
head/sys/mips/include/ofw_machdep.h
head/sys/mips/include/pcpu.h
head/sys/mips/include/pte.h
head/sys/mips/include/runq.h
head/sys/mips/include/sc_machdep.h
head/sys/mips/include/sf_buf.h
head/sys/mips/include/sigframe.h
head/sys/mips/include/tlb.h
head/sys/mips/include/tls.h
head/sys/mips/include/vdso.h
head/sys/mips/include/vm.h
head/sys/mips/malta/gt.c
head/sys/mips/malta/gt_pci.c
head/sys/mips/malta/gt_pci_bus_space.c
head/sys/mips/malta/gt_pci_bus_space.h
head/sys/mips/malta/gtreg.h
head/sys/mips/malta/gtvar.h
head/sys/mips/malta/malta_machdep.c
head/sys/mips/malta/maltareg.h
head/sys/mips/malta/obio.c
head/sys/mips/malta/obiovar.h
head/sys/mips/malta/uart_bus_maltausart.c
head/sys/mips/malta/uart_cpu_maltausart.c
head/sys/mips/malta/yamon.c
head/sys/mips/malta/yamon.h
head/sys/mips/mips/bus_space_generic.c
head/sys/mips/mips/busdma_machdep.c
head/sys/mips/mips/cache.c
head/sys/mips/mips/cache_mipsNN.c
head/sys/mips/mips/cpu.c
head/sys/mips/mips/db_interface.c
head/sys/mips/mips/db_trace.c
head/sys/mips/mips/dump_machdep.c
head/sys/mips/mips/elf_machdep.c
head/sys/mips/mips/elf_trampoline.c
head/sys/mips/mips/freebsd32_machdep.c
head/sys/mips/mips/gdb_machdep.c
head/sys/mips/mips/intr_machdep.c
head/sys/mips/mips/libkern_machdep.c
head/sys/mips/mips/minidump_machdep.c
head/sys/mips/mips/mp_machdep.c
head/sys/mips/mips/octeon_cop2.c
head/sys/mips/mips/ptrace_machdep.c
head/sys/mips/mips/sc_machdep.c
head/sys/mips/mips/stack_machdep.c
head/sys/mips/mips/stdatomic.c
head/sys/mips/mips/tick.c
head/sys/mips/mips/tlb.c
head/sys/mips/mips/uma_machdep.c
head/sys/mips/nlm/board.c
head/sys/mips/nlm/board.h
head/sys/mips/nlm/board_cpld.c
head/sys/mips/nlm/board_eeprom.c
head/sys/mips/nlm/bus_space_rmi.c
head/sys/mips/nlm/bus_space_rmi_pci.c
head/sys/mips/nlm/clock.h
head/sys/mips/nlm/cms.c
head/sys/mips/nlm/dev/net/mdio.c
head/sys/mips/nlm/dev/net/nae.c
head/sys/mips/nlm/dev/net/sgmii.c
head/sys/mips/nlm/dev/net/ucore/ucore.h
head/sys/mips/nlm/dev/net/ucore/ucore_app.c
head/sys/mips/nlm/dev/net/xaui.c
head/sys/mips/nlm/dev/net/xlpge.c
head/sys/mips/nlm/dev/net/xlpge.h
head/sys/mips/nlm/dev/sec/nlmrsa.c
head/sys/mips/nlm/dev/sec/nlmrsalib.h
head/sys/mips/nlm/dev/sec/nlmsec.c
head/sys/mips/nlm/dev/sec/nlmseclib.c
head/sys/mips/nlm/dev/sec/nlmseclib.h
head/sys/mips/nlm/dev/sec/rsa_ucode.h
head/sys/mips/nlm/hal/bridge.h
head/sys/mips/nlm/hal/cop2.h
head/sys/mips/nlm/hal/cpucontrol.h
head/sys/mips/nlm/hal/fmn.c
head/sys/mips/nlm/hal/fmn.h
head/sys/mips/nlm/hal/gbu.h
head/sys/mips/nlm/hal/haldefs.h
head/sys/mips/nlm/hal/interlaken.h
head/sys/mips/nlm/hal/iomap.h
head/sys/mips/nlm/hal/mdio.h
head/sys/mips/nlm/hal/mips-extns.h
head/sys/mips/nlm/hal/mmu.h
head/sys/mips/nlm/hal/nae.h
head/sys/mips/nlm/hal/nlm_hal.c
head/sys/mips/nlm/hal/nlmsaelib.h
head/sys/mips/nlm/hal/pcibus.h
head/sys/mips/nlm/hal/pic.h
head/sys/mips/nlm/hal/poe.h
head/sys/mips/nlm/hal/sgmii.h
head/sys/mips/nlm/hal/sys.h
head/sys/mips/nlm/hal/uart.h
head/sys/mips/nlm/hal/ucore_loader.h
head/sys/mips/nlm/hal/usb.h
head/sys/mips/nlm/hal/xaui.h
head/sys/mips/nlm/interrupt.h
head/sys/mips/nlm/intr_machdep.c
head/sys/mips/nlm/msgring.h
head/sys/mips/nlm/tick.c
head/sys/mips/nlm/uart_cpu_xlp.c
head/sys/mips/nlm/usb_init.c
head/sys/mips/nlm/xlp.h
head/sys/mips/nlm/xlp_machdep.c
head/sys/mips/nlm/xlp_pci.c
head/sys/mips/rmi/board.c
head/sys/mips/rmi/bus_space_rmi.c
head/sys/mips/rmi/bus_space_rmi_pci.c
head/sys/mips/rmi/intr_machdep.c
head/sys/mips/rmi/pcibus.h
head/sys/mips/rmi/tick.c
head/sys/mips/rmi/uart_bus_xlr_iodi.c
head/sys/mips/rmi/uart_cpu_mips_xlr.c
head/sys/mips/rmi/xlr_machdep.c
head/sys/mips/rmi/xls_ehci.c
head/sys/mips/rt305x/obio.c
head/sys/mips/rt305x/obiovar.h
head/sys/mips/rt305x/rt305x_dotg.c
head/sys/mips/rt305x/rt305x_gpio.c
head/sys/mips/rt305x/rt305x_gpio.h
head/sys/mips/rt305x/rt305x_gpiovar.h
head/sys/mips/rt305x/rt305x_ic.c
head/sys/mips/rt305x/rt305x_icvar.h
head/sys/mips/rt305x/rt305x_machdep.c
head/sys/mips/rt305x/rt305x_sysctl.c
head/sys/mips/rt305x/rt305x_sysctlvar.h
head/sys/mips/rt305x/rt305xreg.h
head/sys/mips/rt305x/rt_swreg.h
head/sys/mips/rt305x/uart_bus_rt305x.c
head/sys/mips/rt305x/uart_cpu_rt305x.c
head/sys/mips/rt305x/uart_dev_rt305x.c
head/sys/mips/rt305x/uart_dev_rt305x.h
head/sys/mips/sibyte/ata_zbbus.c
head/sys/mips/sibyte/sb_bus_space.h
head/sys/mips/sibyte/sb_machdep.c
head/sys/mips/sibyte/sb_scd.c
head/sys/mips/sibyte/sb_scd.h
head/sys/mips/sibyte/sb_zbbus.c
head/sys/mips/sibyte/sb_zbpci.c
Modified: head/sys/mips/adm5120/adm5120_machdep.c
==============================================================================
--- head/sys/mips/adm5120/adm5120_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/adm5120_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/adm5120/adm5120reg.h
==============================================================================
--- head/sys/mips/adm5120/adm5120reg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/adm5120reg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: adm5120reg.h,v 1.1 2007/03/20 08:52:03 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/admpci.c
==============================================================================
--- head/sys/mips/adm5120/admpci.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/admpci.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: admpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 David Young. All rights reserved.
*
* Redistribution and use in source and binary forms, with or
Modified: head/sys/mips/adm5120/console.c
==============================================================================
--- head/sys/mips/adm5120/console.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/console.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/if_admsw.c
==============================================================================
--- head/sys/mips/adm5120/if_admsw.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/if_admsw.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: if_admsw.c,v 1.3 2007/04/22 19:26:25 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/if_admswreg.h
==============================================================================
--- head/sys/mips/adm5120/if_admswreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/if_admswreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: if_admswreg.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/if_admswvar.h
==============================================================================
--- head/sys/mips/adm5120/if_admswvar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/if_admswvar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: if_admswvar.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/obio.c
==============================================================================
--- head/sys/mips/adm5120/obio.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/obio.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/obiovar.h
==============================================================================
--- head/sys/mips/adm5120/obiovar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/obiovar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/uart_bus_adm5120.c
==============================================================================
--- head/sys/mips/adm5120/uart_bus_adm5120.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/uart_bus_adm5120.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
Modified: head/sys/mips/adm5120/uart_cpu_adm5120.c
==============================================================================
--- head/sys/mips/adm5120/uart_cpu_adm5120.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/uart_cpu_adm5120.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/adm5120/uart_dev_adm5120.c
==============================================================================
--- head/sys/mips/adm5120/uart_dev_adm5120.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/uart_dev_adm5120.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* Copyright (c) 2007 Oleksandr Tymoshenko.
* All rights reserved.
Modified: head/sys/mips/adm5120/uart_dev_adm5120.h
==============================================================================
--- head/sys/mips/adm5120/uart_dev_adm5120.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/adm5120/uart_dev_adm5120.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: uart.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
* All rights reserved.
*
Modified: head/sys/mips/alchemy/alchemy_machdep.c
==============================================================================
--- head/sys/mips/alchemy/alchemy_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/alchemy/alchemy_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/alchemy/aureg.h
==============================================================================
--- head/sys/mips/alchemy/aureg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/alchemy/aureg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: aureg.h,v 1.18 2006/10/02 06:44:00 gdamore Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2002 Wasabi Systems, Inc.
* All rights reserved.
*
@@ -33,6 +35,8 @@
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#ifndef _MIPS_ALCHEMY_AUREG_H
Modified: head/sys/mips/alchemy/obio.c
==============================================================================
--- head/sys/mips/alchemy/obio.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/alchemy/obio.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/mips/alchemy/uart_bus_alchemy.c
==============================================================================
--- head/sys/mips/alchemy/uart_bus_alchemy.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/alchemy/uart_bus_alchemy.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Bruce M. Simpson.
* All rights reserved.
*
Modified: head/sys/mips/alchemy/uart_cpu_alchemy.c
==============================================================================
--- head/sys/mips/alchemy/uart_cpu_alchemy.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/alchemy/uart_cpu_alchemy.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/apb.c
==============================================================================
--- head/sys/mips/atheros/apb.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/apb.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/apbvar.h
==============================================================================
--- head/sys/mips/atheros/apbvar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/apbvar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_bus_space_reversed.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_bus_space_reversed.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_bus_space_reversed.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_bus_space_reversed.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_bus_space_reversed.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_bus_space_reversed.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
@@ -23,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#ifndef __AR71XX_BUS_SPACE_REVERSEDH__
Modified: head/sys/mips/atheros/ar71xx_chip.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_chip.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_chip.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_chip.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_chip.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_chip.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_cpudef.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_cpudef.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_cpudef.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_ehci.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_ehci.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_ehci.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Sam Leffler. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/atheros/ar71xx_fixup.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_fixup.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_fixup.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_fixup.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_fixup.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_fixup.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_gpio.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_gpio.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_gpio.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
* All rights reserved.
Modified: head/sys/mips/atheros/ar71xx_gpiovar.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_gpiovar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_gpiovar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2009, Luiz Otavio O Souza.
* All rights reserved.
Modified: head/sys/mips/atheros/ar71xx_machdep.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_ohci.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_ohci.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_ohci.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_pci.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_pci.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_pci_bus_space.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_pci_bus_space.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_pci_bus_space.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_pci_bus_space.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_pci_bus_space.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_pci_bus_space.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
@@ -23,6 +25,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#ifndef __AR71XX_PCI_BUS_SPACEH__
Modified: head/sys/mips/atheros/ar71xx_setup.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_setup.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_setup.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_setup.h
==============================================================================
--- head/sys/mips/atheros/ar71xx_setup.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_setup.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_spi.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_spi.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_spi.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xx_wdog.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_wdog.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xx_wdog.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar71xxreg.h
==============================================================================
--- head/sys/mips/atheros/ar71xxreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar71xxreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar724x_chip.c
==============================================================================
--- head/sys/mips/atheros/ar724x_chip.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar724x_chip.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar724x_chip.h
==============================================================================
--- head/sys/mips/atheros/ar724x_chip.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar724x_chip.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar724x_pci.c
==============================================================================
--- head/sys/mips/atheros/ar724x_pci.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar724x_pci.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2011, Luiz Otavio O Souza.
* All rights reserved.
Modified: head/sys/mips/atheros/ar724xreg.h
==============================================================================
--- head/sys/mips/atheros/ar724xreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar724xreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar91xx_chip.c
==============================================================================
--- head/sys/mips/atheros/ar91xx_chip.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar91xx_chip.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar91xx_chip.h
==============================================================================
--- head/sys/mips/atheros/ar91xx_chip.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar91xx_chip.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar91xxreg.h
==============================================================================
--- head/sys/mips/atheros/ar91xxreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar91xxreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Adrian Chadd
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar933x_chip.c
==============================================================================
--- head/sys/mips/atheros/ar933x_chip.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar933x_chip.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar933x_chip.h
==============================================================================
--- head/sys/mips/atheros/ar933x_chip.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar933x_chip.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar933x_uart.h
==============================================================================
--- head/sys/mips/atheros/ar933x_uart.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar933x_uart.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar933xreg.h
==============================================================================
--- head/sys/mips/atheros/ar933xreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar933xreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar934x_chip.c
==============================================================================
--- head/sys/mips/atheros/ar934x_chip.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar934x_chip.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar934x_chip.h
==============================================================================
--- head/sys/mips/atheros/ar934x_chip.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar934x_chip.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/ar934xreg.h
==============================================================================
--- head/sys/mips/atheros/ar934xreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/ar934xreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/if_arge.c
==============================================================================
--- head/sys/mips/atheros/if_arge.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/if_arge.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko
* All rights reserved.
*
Modified: head/sys/mips/atheros/if_argevar.h
==============================================================================
--- head/sys/mips/atheros/if_argevar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/if_argevar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko
* All rights reserved.
*
Modified: head/sys/mips/atheros/pcf2123_rtc.c
==============================================================================
--- head/sys/mips/atheros/pcf2123_rtc.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/pcf2123_rtc.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/pcf2123reg.h
==============================================================================
--- head/sys/mips/atheros/pcf2123reg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/pcf2123reg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/uart_bus_ar71xx.c
==============================================================================
--- head/sys/mips/atheros/uart_bus_ar71xx.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/uart_bus_ar71xx.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/uart_bus_ar933x.c
==============================================================================
--- head/sys/mips/atheros/uart_bus_ar933x.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/uart_bus_ar933x.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/uart_cpu_ar71xx.c
==============================================================================
--- head/sys/mips/atheros/uart_cpu_ar71xx.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/uart_cpu_ar71xx.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Oleksandr Tymoshenko
* All rights reserved.
*
Modified: head/sys/mips/atheros/uart_cpu_ar933x.c
==============================================================================
--- head/sys/mips/atheros/uart_cpu_ar933x.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/uart_cpu_ar933x.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/uart_dev_ar933x.c
==============================================================================
--- head/sys/mips/atheros/uart_dev_ar933x.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/uart_dev_ar933x.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/atheros/uart_dev_ar933x.h
==============================================================================
--- head/sys/mips/atheros/uart_dev_ar933x.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/atheros/uart_dev_ar933x.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/beri/beri_machdep.c
==============================================================================
--- head/sys/mips/beri/beri_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/beri/beri_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* Copyright (c) 2012-2014 Robert N. M. Watson
* All rights reserved.
Modified: head/sys/mips/beri/beri_pic.c
==============================================================================
--- head/sys/mips/beri/beri_pic.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/beri/beri_pic.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2017 Ruslan Bukin <br@bsdpad.com>
* Copyright (c) 2013 SRI International
* All rights reserved.
Modified: head/sys/mips/cavium/ciu.c
==============================================================================
--- head/sys/mips/cavium/ciu.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/ciu.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/cryptocteon/cavium_crypto.c
==============================================================================
--- head/sys/mips/cavium/cryptocteon/cavium_crypto.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/cryptocteon/cavium_crypto.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,7 +1,9 @@
/*
* vim:sw=4 ts=8
*/
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2009 David McCullough <david.mccullough@securecomputing.com>
*
* Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
Modified: head/sys/mips/cavium/if_octm.c
==============================================================================
--- head/sys/mips/cavium/if_octm.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/if_octm.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/obio.c
==============================================================================
--- head/sys/mips/cavium/obio.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/obio.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/mips/cavium/obiovar.h
==============================================================================
--- head/sys/mips/cavium/obiovar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/obiovar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/mips/cavium/octe/ethernet-mv88e61xx.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-mv88e61xx.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octe/ethernet-mv88e61xx.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octe/ethernet-mv88e61xx.h
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-mv88e61xx.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octe/ethernet-mv88e61xx.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octe/mv88e61xxphy.c
==============================================================================
--- head/sys/mips/cavium/octe/mv88e61xxphy.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octe/mv88e61xxphy.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octe/mv88e61xxphyreg.h
==============================================================================
--- head/sys/mips/cavium/octe/mv88e61xxphyreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octe/mv88e61xxphyreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octe/octe.c
==============================================================================
--- head/sys/mips/cavium/octe/octe.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octe/octe.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octe/octebus.c
==============================================================================
--- head/sys/mips/cavium/octe/octebus.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octe/octebus.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octe/octebusvar.h
==============================================================================
--- head/sys/mips/cavium/octe/octebusvar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octe/octebusvar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_cop2.h
==============================================================================
--- head/sys/mips/cavium/octeon_cop2.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_cop2.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_gpio.c
==============================================================================
--- head/sys/mips/cavium/octeon_gpio.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_gpio.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_gpiovar.h
==============================================================================
--- head/sys/mips/cavium/octeon_gpiovar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_gpiovar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- head/sys/mips/cavium/octeon_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_mp.c
==============================================================================
--- head/sys/mips/cavium/octeon_mp.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_mp.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_pci_console.c
==============================================================================
--- head/sys/mips/cavium/octeon_pci_console.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_pci_console.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_pmc.c
==============================================================================
--- head/sys/mips/cavium/octeon_pmc.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_pmc.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_rnd.c
==============================================================================
--- head/sys/mips/cavium/octeon_rnd.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_rnd.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_rtc.c
==============================================================================
--- head/sys/mips/cavium/octeon_rtc.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_rtc.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octeon_wdog.c
==============================================================================
--- head/sys/mips/cavium/octeon_wdog.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octeon_wdog.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* Copyright (c) 2010-2011, Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
Modified: head/sys/mips/cavium/octopci.c
==============================================================================
--- head/sys/mips/cavium/octopci.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octopci.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/octopci_bus_space.c
==============================================================================
--- head/sys/mips/cavium/octopci_bus_space.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octopci_bus_space.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -2,6 +2,8 @@
/*-
* $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $
*
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
+ *
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/mips/cavium/octopcivar.h
==============================================================================
--- head/sys/mips/cavium/octopcivar.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/octopcivar.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/uart_bus_octeonusart.c
==============================================================================
--- head/sys/mips/cavium/uart_bus_octeonusart.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/uart_bus_octeonusart.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/cavium/uart_cpu_octeonusart.c
==============================================================================
--- head/sys/mips/cavium/uart_cpu_octeonusart.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/uart_cpu_octeonusart.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
Modified: head/sys/mips/cavium/uart_dev_oct16550.c
==============================================================================
--- head/sys/mips/cavium/uart_dev_oct16550.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/uart_dev_oct16550.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ *
* Copyright (c) 2003 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/mips/cavium/usb/octusb.c
==============================================================================
--- head/sys/mips/cavium/usb/octusb.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/usb/octusb.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -2,6 +2,8 @@
__FBSDID("$FreeBSD$");
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/cavium/usb/octusb.h
==============================================================================
--- head/sys/mips/cavium/usb/octusb.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/usb/octusb.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/cavium/usb/octusb_octeon.c
==============================================================================
--- head/sys/mips/cavium/usb/octusb_octeon.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/cavium/usb/octusb_octeon.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -2,6 +2,8 @@
__FBSDID("$FreeBSD$");
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/gxemul/gxemul_machdep.c
==============================================================================
--- head/sys/mips/gxemul/gxemul_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/gxemul/gxemul_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/gxemul/mpreg.h
==============================================================================
--- head/sys/mips/gxemul/mpreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/gxemul/mpreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2012 Juli Mallett <jmallett@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/mips/idt/idt_machdep.c
==============================================================================
--- head/sys/mips/idt/idt_machdep.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/idt/idt_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/idt/idtpci.c
==============================================================================
--- head/sys/mips/idt/idtpci.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/idt/idtpci.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,6 +1,8 @@
/* $NetBSD: idtpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2007 David Young.
* Copyright (c) 2007 Oleskandr Tymoshenko. All rights reserved.
*
Modified: head/sys/mips/idt/idtreg.h
==============================================================================
--- head/sys/mips/idt/idtreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/idt/idtreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/mips/idt/if_kr.c
==============================================================================
--- head/sys/mips/idt/if_kr.c Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/idt/if_kr.c Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2007
* Oleksandr Tymoshenko <gonzo@freebsd.org>. All rights reserved.
*
Modified: head/sys/mips/idt/if_krreg.h
==============================================================================
--- head/sys/mips/idt/if_krreg.h Mon Nov 27 15:04:10 2017 (r326258)
+++ head/sys/mips/idt/if_krreg.h Mon Nov 27 15:07:26 2017 (r326259)
@@ -1,4 +1,6 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:09:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E597E53CD8;
Mon, 27 Nov 2017 15:09:02 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3B94B751E3;
Mon, 27 Nov 2017 15:09:02 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARF91Et096723;
Mon, 27 Nov 2017 15:09:01 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF8qp0096624;
Mon, 27 Nov 2017 15:08:52 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271508.vARF8qp0096624@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:08:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326260 - in head/sys/i386: acpica bios i386 ibcs2
include include/pc isa linux pci
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/i386: acpica bios i386 ibcs2 include
include/pc isa linux pci
X-SVN-Commit-Revision: 326260
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:09:02 -0000
Author: pfg
Date: Mon Nov 27 15:08:52 2017
New Revision: 326260
URL: https://svnweb.freebsd.org/changeset/base/326260
Log:
sys/i386: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/i386/acpica/acpi_machdep.c
head/sys/i386/bios/smapi.c
head/sys/i386/i386/atomic.c
head/sys/i386/i386/bios.c
head/sys/i386/i386/elf_machdep.c
head/sys/i386/i386/gdb_machdep.c
head/sys/i386/i386/geode.c
head/sys/i386/i386/initcpu.c
head/sys/i386/i386/io.c
head/sys/i386/i386/k6_mem.c
head/sys/i386/i386/minidump_machdep.c
head/sys/i386/i386/mp_machdep.c
head/sys/i386/i386/ptrace_machdep.c
head/sys/i386/i386/vm86.c
head/sys/i386/ibcs2/coff.h
head/sys/i386/ibcs2/ibcs2_dirent.h
head/sys/i386/ibcs2/ibcs2_errno.c
head/sys/i386/ibcs2/ibcs2_errno.h
head/sys/i386/ibcs2/ibcs2_fcntl.c
head/sys/i386/ibcs2/ibcs2_fcntl.h
head/sys/i386/ibcs2/ibcs2_ioctl.c
head/sys/i386/ibcs2/ibcs2_ipc.c
head/sys/i386/ibcs2/ibcs2_ipc.h
head/sys/i386/ibcs2/ibcs2_isc.c
head/sys/i386/ibcs2/ibcs2_mount.h
head/sys/i386/ibcs2/ibcs2_msg.c
head/sys/i386/ibcs2/ibcs2_other.c
head/sys/i386/ibcs2/ibcs2_signal.c
head/sys/i386/ibcs2/ibcs2_signal.h
head/sys/i386/ibcs2/ibcs2_socksys.c
head/sys/i386/ibcs2/ibcs2_socksys.h
head/sys/i386/ibcs2/ibcs2_stat.c
head/sys/i386/ibcs2/ibcs2_stat.h
head/sys/i386/ibcs2/ibcs2_statfs.h
head/sys/i386/ibcs2/ibcs2_stropts.h
head/sys/i386/ibcs2/ibcs2_sysi86.c
head/sys/i386/ibcs2/ibcs2_sysvec.c
head/sys/i386/ibcs2/ibcs2_termios.h
head/sys/i386/ibcs2/ibcs2_time.h
head/sys/i386/ibcs2/ibcs2_types.h
head/sys/i386/ibcs2/ibcs2_unistd.h
head/sys/i386/ibcs2/ibcs2_ustat.h
head/sys/i386/ibcs2/ibcs2_util.c
head/sys/i386/ibcs2/ibcs2_util.h
head/sys/i386/ibcs2/ibcs2_utime.h
head/sys/i386/ibcs2/ibcs2_utsname.h
head/sys/i386/ibcs2/ibcs2_xenix.c
head/sys/i386/ibcs2/imgact_coff.c
head/sys/i386/include/_bus.h
head/sys/i386/include/atomic.h
head/sys/i386/include/bootinfo.h
head/sys/i386/include/bus_dma.h
head/sys/i386/include/counter.h
head/sys/i386/include/cputypes.h
head/sys/i386/include/elan_mmcr.h
head/sys/i386/include/gdb_machdep.h
head/sys/i386/include/if_wl_wavelan.h
head/sys/i386/include/intr_machdep.h
head/sys/i386/include/ioctl_bt848.h
head/sys/i386/include/ioctl_meteor.h
head/sys/i386/include/iodev.h
head/sys/i386/include/kdb.h
head/sys/i386/include/memdev.h
head/sys/i386/include/minidump.h
head/sys/i386/include/mp_watchdog.h
head/sys/i386/include/pc/bios.h
head/sys/i386/include/pcaudioio.h
head/sys/i386/include/pcb_ext.h
head/sys/i386/include/pcpu.h
head/sys/i386/include/pmc_mdep.h
head/sys/i386/include/ppireg.h
head/sys/i386/include/runq.h
head/sys/i386/include/sf_buf.h
head/sys/i386/include/sigframe.h
head/sys/i386/include/smapi.h
head/sys/i386/include/timerreg.h
head/sys/i386/include/ucontext.h
head/sys/i386/include/vm.h
head/sys/i386/include/vm86.h
head/sys/i386/isa/ccbque.h
head/sys/i386/isa/elink.c
head/sys/i386/isa/elink.h
head/sys/i386/isa/pmtimer.c
head/sys/i386/isa/prof_machdep.c
head/sys/i386/linux/imgact_linux.c
head/sys/i386/linux/linux.h
head/sys/i386/linux/linux_dummy.c
head/sys/i386/linux/linux_machdep.c
head/sys/i386/linux/linux_ptrace.c
head/sys/i386/linux/linux_sysvec.c
head/sys/i386/pci/pci_cfgreg.c
head/sys/i386/pci/pci_pir.c
Modified: head/sys/i386/acpica/acpi_machdep.c
==============================================================================
--- head/sys/i386/acpica/acpi_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/acpica/acpi_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
Modified: head/sys/i386/bios/smapi.c
==============================================================================
--- head/sys/i386/bios/smapi.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/bios/smapi.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
*
Modified: head/sys/i386/i386/atomic.c
==============================================================================
--- head/sys/i386/i386/atomic.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/atomic.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Peter Jeremy
* All rights reserved.
*
Modified: head/sys/i386/i386/bios.c
==============================================================================
--- head/sys/i386/i386/bios.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/bios.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
Modified: head/sys/i386/i386/elf_machdep.c
==============================================================================
--- head/sys/i386/i386/elf_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/elf_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/i386/i386/gdb_machdep.c
==============================================================================
--- head/sys/i386/i386/gdb_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/gdb_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/i386/i386/geode.c
==============================================================================
--- head/sys/i386/i386/geode.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/geode.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2004 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/i386/i386/initcpu.c
==============================================================================
--- head/sys/i386/i386/initcpu.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/initcpu.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) KATO Takenori, 1997, 1998.
*
* All rights reserved. Unpublished rights reserved under the copyright
Modified: head/sys/i386/i386/io.c
==============================================================================
--- head/sys/i386/i386/io.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/io.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/i386/i386/k6_mem.c
==============================================================================
--- head/sys/i386/i386/k6_mem.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/k6_mem.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Brian Fundakowski Feldman
* All rights reserved.
*
Modified: head/sys/i386/i386/minidump_machdep.c
==============================================================================
--- head/sys/i386/i386/minidump_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/minidump_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
Modified: head/sys/i386/i386/mp_machdep.c
==============================================================================
--- head/sys/i386/i386/mp_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/mp_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
*
Modified: head/sys/i386/i386/ptrace_machdep.c
==============================================================================
--- head/sys/i386/i386/ptrace_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/ptrace_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/sys/i386/i386/vm86.c
==============================================================================
--- head/sys/i386/i386/vm86.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/i386/vm86.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/coff.h
==============================================================================
--- head/sys/i386/ibcs2/coff.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/coff.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1994 Søren Schmidt
* All rights reserved.
Modified: head/sys/i386/ibcs2/ibcs2_dirent.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_dirent.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_dirent.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_errno.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_errno.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_errno.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,5 +1,7 @@
/*-
* ibcs2_errno.c
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_errno.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_errno.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_errno.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,5 +1,7 @@
/*-
* ibcs2_errno.h
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_fcntl.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_fcntl.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_fcntl.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_fcntl.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_fcntl.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_fcntl.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_ioctl.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ioctl.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_ioctl.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,6 +1,8 @@
/* $NetBSD: ibcs2_ioctl.c,v 1.6 1995/03/14 15:12:28 scottb Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 1994, 1995 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_ipc.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ipc.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_ipc.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
Modified: head/sys/i386/ibcs2/ibcs2_ipc.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ipc.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_ipc.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_isc.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_isc.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_isc.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1995 Steven Wallace
Modified: head/sys/i386/ibcs2/ibcs2_mount.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_mount.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_mount.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_msg.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_msg.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_msg.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_other.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_other.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_other.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_signal.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_signal.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_signal.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
Modified: head/sys/i386/ibcs2/ibcs2_signal.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_signal.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_signal.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,6 +1,8 @@
/* $NetBSD: ibcs2_signal.h,v 1.7 1995/08/14 02:26:01 mycroft Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994, 1995 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_socksys.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_socksys.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_socksys.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1994 Arne H Juul
* All rights reserved.
Modified: head/sys/i386/ibcs2/ibcs2_socksys.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_socksys.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_socksys.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994, 1995 Scott Bartram
* Copyright (c) 1994 Arne H Juul
* All rights reserved.
Modified: head/sys/i386/ibcs2/ibcs2_stat.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_stat.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_stat.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Scott Bartram
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
Modified: head/sys/i386/ibcs2/ibcs2_stat.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_stat.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_stat.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_statfs.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_statfs.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_statfs.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_stropts.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_stropts.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_stropts.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,5 +1,7 @@
/*-
* ibcs2_stropts.h
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_sysi86.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_sysi86.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_sysi86.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
Modified: head/sys/i386/ibcs2/ibcs2_sysvec.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_sysvec.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_sysvec.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Steven Wallace
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_termios.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_termios.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_termios.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_time.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_time.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_time.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_types.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_types.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_types.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_unistd.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_unistd.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_unistd.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_ustat.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ustat.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_ustat.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_util.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_util.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_util.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
Modified: head/sys/i386/ibcs2/ibcs2_util.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_util.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_util.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
Modified: head/sys/i386/ibcs2/ibcs2_utime.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_utime.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_utime.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_utsname.h
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_utsname.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_utsname.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Scott Bartram
* All rights reserved.
*
Modified: head/sys/i386/ibcs2/ibcs2_xenix.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_xenix.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/ibcs2_xenix.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1994 Søren Schmidt
* Copyright (c) 1995 Steven Wallace
Modified: head/sys/i386/ibcs2/imgact_coff.c
==============================================================================
--- head/sys/i386/ibcs2/imgact_coff.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/ibcs2/imgact_coff.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Sean Eric Fagan
* Copyright (c) 1994 Søren Schmidt
* All rights reserved.
Modified: head/sys/i386/include/_bus.h
==============================================================================
--- head/sys/i386/include/_bus.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/_bus.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
Modified: head/sys/i386/include/atomic.h
==============================================================================
--- head/sys/i386/include/atomic.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/atomic.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
Modified: head/sys/i386/include/bootinfo.h
==============================================================================
--- head/sys/i386/include/bootinfo.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/bootinfo.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994 by Rodney W. Grimes, Milwaukie, Oregon 97222
* All rights reserved.
*
Modified: head/sys/i386/include/bus_dma.h
==============================================================================
--- head/sys/i386/include/bus_dma.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/bus_dma.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Scott Long
* All rights reserved.
*
Modified: head/sys/i386/include/counter.h
==============================================================================
--- head/sys/i386/include/counter.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/counter.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/i386/include/cputypes.h
==============================================================================
--- head/sys/i386/include/cputypes.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/cputypes.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
*
Modified: head/sys/i386/include/elan_mmcr.h
==============================================================================
--- head/sys/i386/include/elan_mmcr.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/elan_mmcr.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 John Birrell
* All rights reserved.
*
Modified: head/sys/i386/include/gdb_machdep.h
==============================================================================
--- head/sys/i386/include/gdb_machdep.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/gdb_machdep.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/i386/include/if_wl_wavelan.h
==============================================================================
--- head/sys/i386/include/if_wl_wavelan.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/if_wl_wavelan.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,5 +1,7 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
Modified: head/sys/i386/include/intr_machdep.h
==============================================================================
--- head/sys/i386/include/intr_machdep.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/intr_machdep.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/i386/include/ioctl_bt848.h
==============================================================================
--- head/sys/i386/include/ioctl_bt848.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/ioctl_bt848.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 David O'Brien
* All rights reserved.
*
Modified: head/sys/i386/include/ioctl_meteor.h
==============================================================================
--- head/sys/i386/include/ioctl_meteor.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/ioctl_meteor.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 David O'Brien
* All rights reserved.
*
Modified: head/sys/i386/include/iodev.h
==============================================================================
--- head/sys/i386/include/iodev.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/iodev.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/i386/include/kdb.h
==============================================================================
--- head/sys/i386/include/kdb.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/kdb.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/i386/include/memdev.h
==============================================================================
--- head/sys/i386/include/memdev.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/memdev.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/i386/include/minidump.h
==============================================================================
--- head/sys/i386/include/minidump.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/minidump.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Peter Wemm
* All rights reserved.
*
Modified: head/sys/i386/include/mp_watchdog.h
==============================================================================
--- head/sys/i386/include/mp_watchdog.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/mp_watchdog.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/i386/include/pc/bios.h
==============================================================================
--- head/sys/i386/include/pc/bios.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/pc/bios.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Michael Smith
* Copyright (c) 1998 Jonathan Lemon
* All rights reserved.
Modified: head/sys/i386/include/pcaudioio.h
==============================================================================
--- head/sys/i386/include/pcaudioio.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/pcaudioio.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/i386/include/pcb_ext.h
==============================================================================
--- head/sys/i386/include/pcb_ext.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/pcb_ext.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
*
Modified: head/sys/i386/include/pcpu.h
==============================================================================
--- head/sys/i386/include/pcpu.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/pcpu.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) Peter Wemm
* All rights reserved.
*
Modified: head/sys/i386/include/pmc_mdep.h
==============================================================================
--- head/sys/i386/include/pmc_mdep.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/pmc_mdep.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2005,2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/i386/include/ppireg.h
==============================================================================
--- head/sys/i386/include/ppireg.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/ppireg.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/i386/include/runq.h
==============================================================================
--- head/sys/i386/include/runq.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/runq.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/i386/include/sf_buf.h
==============================================================================
--- head/sys/i386/include/sf_buf.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/sf_buf.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/i386/include/sigframe.h
==============================================================================
--- head/sys/i386/include/sigframe.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/sigframe.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/i386/include/smapi.h
==============================================================================
--- head/sys/i386/include/smapi.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/smapi.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Matthew N. Dodd <winter@freebsd.org>
* All rights reserved.
*
Modified: head/sys/i386/include/timerreg.h
==============================================================================
--- head/sys/i386/include/timerreg.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/timerreg.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/i386/include/ucontext.h
==============================================================================
--- head/sys/i386/include/ucontext.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/ucontext.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/i386/include/vm.h
==============================================================================
--- head/sys/i386/include/vm.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/vm.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
Modified: head/sys/i386/include/vm86.h
==============================================================================
--- head/sys/i386/include/vm86.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/include/vm86.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Jonathan Lemon
* All rights reserved.
*
Modified: head/sys/i386/isa/ccbque.h
==============================================================================
--- head/sys/i386/isa/ccbque.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/isa/ccbque.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,5 +1,7 @@
/* $NetBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* [NetBSD for NEC PC98 series]
* Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
* All rights reserved.
Modified: head/sys/i386/isa/elink.c
==============================================================================
--- head/sys/i386/isa/elink.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/isa/elink.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Charles Hannum. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/i386/isa/elink.h
==============================================================================
--- head/sys/i386/isa/elink.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/isa/elink.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Charles Hannum. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/i386/isa/pmtimer.c
==============================================================================
--- head/sys/i386/isa/pmtimer.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/isa/pmtimer.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/i386/isa/prof_machdep.c
==============================================================================
--- head/sys/i386/isa/prof_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/isa/prof_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996 Bruce D. Evans.
* All rights reserved.
*
Modified: head/sys/i386/linux/imgact_linux.c
==============================================================================
--- head/sys/i386/linux/imgact_linux.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/linux/imgact_linux.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/i386/linux/linux.h
==============================================================================
--- head/sys/i386/linux/linux.h Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/linux/linux.h Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/i386/linux/linux_dummy.c
==============================================================================
--- head/sys/i386/linux/linux_dummy.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/linux/linux_dummy.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/i386/linux/linux_machdep.c
==============================================================================
--- head/sys/i386/linux/linux_machdep.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/linux/linux_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/i386/linux/linux_ptrace.c
==============================================================================
--- head/sys/i386/linux/linux_ptrace.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/linux/linux_ptrace.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Alexander Kabaev
* All rights reserved.
*
Modified: head/sys/i386/linux/linux_sysvec.c
==============================================================================
--- head/sys/i386/linux/linux_sysvec.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/linux/linux_sysvec.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1996 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/i386/pci/pci_cfgreg.c
==============================================================================
--- head/sys/i386/pci/pci_cfgreg.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/pci/pci_cfgreg.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
Modified: head/sys/i386/pci/pci_pir.c
==============================================================================
--- head/sys/i386/pci/pci_pir.c Mon Nov 27 15:07:26 2017 (r326259)
+++ head/sys/i386/pci/pci_pir.c Mon Nov 27 15:08:52 2017 (r326260)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
From owner-svn-src-all@freebsd.org Mon Nov 27 15:10:11 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6F7AE53D7A;
Mon, 27 Nov 2017 15:10:11 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 70D987533F;
Mon, 27 Nov 2017 15:10:11 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFAA18096934;
Mon, 27 Nov 2017 15:10:10 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARF9xgW096794;
Mon, 27 Nov 2017 15:09:59 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271509.vARF9xgW096794@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:09:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326261 - in head/sys/powerpc: aim booke cpufreq fpu
include mambo mpc85xx ofw powermac powerpc ps3 pseries psim
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/powerpc: aim booke cpufreq fpu include mambo
mpc85xx ofw powermac powerpc ps3 pseries psim
X-SVN-Commit-Revision: 326261
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:10:12 -0000
Author: pfg
Date: Mon Nov 27 15:09:59 2017
New Revision: 326261
URL: https://svnweb.freebsd.org/changeset/base/326261
Log:
sys/powerpc: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/powerpc/aim/mmu_oea.c
head/sys/powerpc/aim/mmu_oea64.c
head/sys/powerpc/aim/mmu_oea64.h
head/sys/powerpc/aim/moea64_native.c
head/sys/powerpc/aim/mp_cpudep.c
head/sys/powerpc/aim/slb.c
head/sys/powerpc/booke/machdep_e500.c
head/sys/powerpc/booke/machdep_ppc4xx.c
head/sys/powerpc/booke/mp_cpudep.c
head/sys/powerpc/booke/platform_bare.c
head/sys/powerpc/booke/pmap.c
head/sys/powerpc/cpufreq/dfs.c
head/sys/powerpc/cpufreq/pcr.c
head/sys/powerpc/cpufreq/pmufreq.c
head/sys/powerpc/fpu/fpu_extern.h
head/sys/powerpc/include/_bus.h
head/sys/powerpc/include/_inttypes.h
head/sys/powerpc/include/altivec.h
head/sys/powerpc/include/atomic.h
head/sys/powerpc/include/bat.h
head/sys/powerpc/include/bus.h
head/sys/powerpc/include/bus_dma.h
head/sys/powerpc/include/counter.h
head/sys/powerpc/include/cpufunc.h
head/sys/powerpc/include/dbdma.h
head/sys/powerpc/include/elf.h
head/sys/powerpc/include/gdb_machdep.h
head/sys/powerpc/include/intr_machdep.h
head/sys/powerpc/include/kdb.h
head/sys/powerpc/include/machdep.h
head/sys/powerpc/include/md_var.h
head/sys/powerpc/include/memdev.h
head/sys/powerpc/include/metadata.h
head/sys/powerpc/include/mmuvar.h
head/sys/powerpc/include/ofw_machdep.h
head/sys/powerpc/include/openpicreg.h
head/sys/powerpc/include/openpicvar.h
head/sys/powerpc/include/pcpu.h
head/sys/powerpc/include/platformvar.h
head/sys/powerpc/include/pmap.h
head/sys/powerpc/include/rtas.h
head/sys/powerpc/include/runq.h
head/sys/powerpc/include/sc_machdep.h
head/sys/powerpc/include/slb.h
head/sys/powerpc/include/smp.h
head/sys/powerpc/include/spr.h
head/sys/powerpc/include/sr.h
head/sys/powerpc/include/vdso.h
head/sys/powerpc/include/vm.h
head/sys/powerpc/mambo/mambo.c
head/sys/powerpc/mambo/mambo_console.c
head/sys/powerpc/mambo/mambo_disk.c
head/sys/powerpc/mambo/mambocall.h
head/sys/powerpc/mpc85xx/atpic.c
head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
head/sys/powerpc/mpc85xx/ds1553_core.c
head/sys/powerpc/mpc85xx/ds1553_reg.h
head/sys/powerpc/mpc85xx/i2c.c
head/sys/powerpc/mpc85xx/isa.c
head/sys/powerpc/mpc85xx/lbc.c
head/sys/powerpc/mpc85xx/lbc.h
head/sys/powerpc/mpc85xx/mpc85xx.c
head/sys/powerpc/mpc85xx/mpc85xx.h
head/sys/powerpc/mpc85xx/pci_mpc85xx.c
head/sys/powerpc/mpc85xx/platform_mpc85xx.c
head/sys/powerpc/ofw/ofw_machdep.c
head/sys/powerpc/ofw/ofw_pcib_pci.c
head/sys/powerpc/ofw/ofw_pcibus.c
head/sys/powerpc/ofw/ofw_pcibus.h
head/sys/powerpc/ofw/ofw_real.c
head/sys/powerpc/ofw/ofw_syscons.c
head/sys/powerpc/ofw/ofw_syscons.h
head/sys/powerpc/ofw/openpic_ofw.c
head/sys/powerpc/ofw/rtas.c
head/sys/powerpc/powermac/ata_dbdma.c
head/sys/powerpc/powermac/ata_dbdma.h
head/sys/powerpc/powermac/ata_kauai.c
head/sys/powerpc/powermac/ata_macio.c
head/sys/powerpc/powermac/atibl.c
head/sys/powerpc/powermac/cpcht.c
head/sys/powerpc/powermac/cuda.c
head/sys/powerpc/powermac/dbdma.c
head/sys/powerpc/powermac/dbdmavar.h
head/sys/powerpc/powermac/fcu.c
head/sys/powerpc/powermac/grackle.c
head/sys/powerpc/powermac/gracklevar.h
head/sys/powerpc/powermac/hrowpic.c
head/sys/powerpc/powermac/hrowpicvar.h
head/sys/powerpc/powermac/kiic.c
head/sys/powerpc/powermac/macgpio.c
head/sys/powerpc/powermac/macgpiovar.h
head/sys/powerpc/powermac/macio.c
head/sys/powerpc/powermac/maciovar.h
head/sys/powerpc/powermac/nvbl.c
head/sys/powerpc/powermac/platform_powermac.c
head/sys/powerpc/powermac/pmu.c
head/sys/powerpc/powermac/pmuvar.h
head/sys/powerpc/powermac/powermac_thermal.c
head/sys/powerpc/powermac/powermac_thermal.h
head/sys/powerpc/powermac/pswitch.c
head/sys/powerpc/powermac/smu.c
head/sys/powerpc/powermac/smusat.c
head/sys/powerpc/powermac/uninorth.c
head/sys/powerpc/powermac/uninorthpci.c
head/sys/powerpc/powermac/uninorthvar.h
head/sys/powerpc/powermac/vcoregpio.c
head/sys/powerpc/powermac/viareg.h
head/sys/powerpc/powerpc/altivec.c
head/sys/powerpc/powerpc/autoconf.c
head/sys/powerpc/powerpc/bus_machdep.c
head/sys/powerpc/powerpc/busdma_machdep.c
head/sys/powerpc/powerpc/clock.c
head/sys/powerpc/powerpc/copyinout.c
head/sys/powerpc/powerpc/copystr.c
head/sys/powerpc/powerpc/cpu.c
head/sys/powerpc/powerpc/db_hwwatch.c
head/sys/powerpc/powerpc/dump_machdep.c
head/sys/powerpc/powerpc/elf32_machdep.c
head/sys/powerpc/powerpc/elf64_machdep.c
head/sys/powerpc/powerpc/exec_machdep.c
head/sys/powerpc/powerpc/fpu.c
head/sys/powerpc/powerpc/fuswintr.c
head/sys/powerpc/powerpc/gdb_machdep.c
head/sys/powerpc/powerpc/mp_machdep.c
head/sys/powerpc/powerpc/openpic.c
head/sys/powerpc/powerpc/platform.c
head/sys/powerpc/powerpc/pmap_dispatch.c
head/sys/powerpc/powerpc/sc_machdep.c
head/sys/powerpc/powerpc/stack_machdep.c
head/sys/powerpc/powerpc/suswintr.c
head/sys/powerpc/powerpc/syncicache.c
head/sys/powerpc/powerpc/sys_machdep.c
head/sys/powerpc/ps3/ehci_ps3.c
head/sys/powerpc/ps3/if_glc.c
head/sys/powerpc/ps3/if_glcreg.h
head/sys/powerpc/ps3/mmu_ps3.c
head/sys/powerpc/ps3/ohci_ps3.c
head/sys/powerpc/ps3/platform_ps3.c
head/sys/powerpc/ps3/ps3_syscons.c
head/sys/powerpc/ps3/ps3bus.c
head/sys/powerpc/ps3/ps3bus.h
head/sys/powerpc/ps3/ps3cdrom.c
head/sys/powerpc/ps3/ps3disk.c
head/sys/powerpc/ps3/ps3pic.c
head/sys/powerpc/pseries/mmu_phyp.c
head/sys/powerpc/pseries/phyp-hvcall.h
head/sys/powerpc/pseries/phyp_console.c
head/sys/powerpc/pseries/phyp_llan.c
head/sys/powerpc/pseries/phyp_vscsi.c
head/sys/powerpc/pseries/platform_chrp.c
head/sys/powerpc/pseries/plpar_iommu.c
head/sys/powerpc/pseries/plpar_iommu.h
head/sys/powerpc/pseries/plpar_pcibus.c
head/sys/powerpc/pseries/rtas_dev.c
head/sys/powerpc/pseries/rtas_pci.c
head/sys/powerpc/pseries/vdevice.c
head/sys/powerpc/pseries/xics.c
head/sys/powerpc/psim/ata_iobus.c
head/sys/powerpc/psim/iobus.c
head/sys/powerpc/psim/iobusvar.h
head/sys/powerpc/psim/openpic_iobus.c
head/sys/powerpc/psim/uart_iobus.c
Modified: head/sys/powerpc/aim/mmu_oea.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/aim/mmu_oea.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/aim/mmu_oea64.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2015 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/aim/mmu_oea64.h
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/aim/mmu_oea64.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2010 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/aim/moea64_native.c
==============================================================================
--- head/sys/powerpc/aim/moea64_native.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/aim/moea64_native.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND 4-Clause-BSD
+ *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/aim/mp_cpudep.c
==============================================================================
--- head/sys/powerpc/aim/mp_cpudep.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/aim/mp_cpudep.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/powerpc/aim/slb.c
==============================================================================
--- head/sys/powerpc/aim/slb.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/aim/slb.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/booke/machdep_e500.c
==============================================================================
--- head/sys/powerpc/booke/machdep_e500.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/booke/machdep_e500.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/powerpc/booke/machdep_ppc4xx.c
==============================================================================
--- head/sys/powerpc/booke/machdep_ppc4xx.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/booke/machdep_ppc4xx.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/powerpc/booke/mp_cpudep.c
==============================================================================
--- head/sys/powerpc/booke/mp_cpudep.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/booke/mp_cpudep.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2009 Semihalf, Rafal Jaworowski
* All rights reserved.
*
Modified: head/sys/powerpc/booke/platform_bare.c
==============================================================================
--- head/sys/powerpc/booke/platform_bare.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/booke/platform_bare.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/powerpc/booke/pmap.c
==============================================================================
--- head/sys/powerpc/booke/pmap.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/booke/pmap.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2007-2009 Semihalf, Rafal Jaworowski <raj@semihalf.com>
* Copyright (C) 2006 Semihalf, Marian Balakowicz <m8@semihalf.com>
* All rights reserved.
Modified: head/sys/powerpc/cpufreq/dfs.c
==============================================================================
--- head/sys/powerpc/cpufreq/dfs.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/cpufreq/dfs.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/cpufreq/pcr.c
==============================================================================
--- head/sys/powerpc/cpufreq/pcr.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/cpufreq/pcr.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/cpufreq/pmufreq.c
==============================================================================
--- head/sys/powerpc/cpufreq/pmufreq.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/cpufreq/pmufreq.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Justin Hibbits
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
Modified: head/sys/powerpc/fpu/fpu_extern.h
==============================================================================
--- head/sys/powerpc/fpu/fpu_extern.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/fpu/fpu_extern.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1995 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/include/_bus.h
==============================================================================
--- head/sys/powerpc/include/_bus.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/_bus.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
Modified: head/sys/powerpc/include/_inttypes.h
==============================================================================
--- head/sys/powerpc/include/_inttypes.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/_inttypes.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/include/altivec.h
==============================================================================
--- head/sys/powerpc/include/altivec.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/altivec.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
Modified: head/sys/powerpc/include/atomic.h
==============================================================================
--- head/sys/powerpc/include/atomic.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/atomic.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2001 Benno Rice
* Copyright (c) 2001 David E. O'Brien
Modified: head/sys/powerpc/include/bat.h
==============================================================================
--- head/sys/powerpc/include/bat.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/bat.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
+ *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/include/bus.h
==============================================================================
--- head/sys/powerpc/include/bus.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/bus.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,6 +1,8 @@
/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
+ *
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/include/bus_dma.h
==============================================================================
--- head/sys/powerpc/include/bus_dma.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/bus_dma.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Scott Long
* All rights reserved.
*
Modified: head/sys/powerpc/include/counter.h
==============================================================================
--- head/sys/powerpc/include/counter.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/counter.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012, 2013 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/powerpc/include/cpufunc.h
==============================================================================
--- head/sys/powerpc/include/cpufunc.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/cpufunc.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
Modified: head/sys/powerpc/include/dbdma.h
==============================================================================
--- head/sys/powerpc/include/dbdma.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/dbdma.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
Modified: head/sys/powerpc/include/elf.h
==============================================================================
--- head/sys/powerpc/include/elf.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/elf.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1996-1997 John D. Polstra.
* All rights reserved.
Modified: head/sys/powerpc/include/gdb_machdep.h
==============================================================================
--- head/sys/powerpc/include/gdb_machdep.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/gdb_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/powerpc/include/intr_machdep.h
==============================================================================
--- head/sys/powerpc/include/intr_machdep.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/intr_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
Modified: head/sys/powerpc/include/kdb.h
==============================================================================
--- head/sys/powerpc/include/kdb.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/kdb.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/powerpc/include/machdep.h
==============================================================================
--- head/sys/powerpc/include/machdep.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/machdep.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Semihalf
* All rights reserved.
*
Modified: head/sys/powerpc/include/md_var.h
==============================================================================
--- head/sys/powerpc/include/md_var.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/md_var.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
Modified: head/sys/powerpc/include/memdev.h
==============================================================================
--- head/sys/powerpc/include/memdev.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/memdev.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/powerpc/include/metadata.h
==============================================================================
--- head/sys/powerpc/include/metadata.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/metadata.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/powerpc/include/mmuvar.h
==============================================================================
--- head/sys/powerpc/include/mmuvar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/mmuvar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
*
Modified: head/sys/powerpc/include/ofw_machdep.h
==============================================================================
--- head/sys/powerpc/include/ofw_machdep.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/ofw_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/powerpc/include/openpicreg.h
==============================================================================
--- head/sys/powerpc/include/openpicreg.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/openpicreg.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/include/openpicvar.h
==============================================================================
--- head/sys/powerpc/include/openpicvar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/openpicvar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
Modified: head/sys/powerpc/include/pcpu.h
==============================================================================
--- head/sys/powerpc/include/pcpu.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/pcpu.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* Copyright (c) Peter Wemm <peter@netplex.com.au>
* All rights reserved.
Modified: head/sys/powerpc/include/platformvar.h
==============================================================================
--- head/sys/powerpc/include/platformvar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/platformvar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Peter Grehan
* All rights reserved.
*
Modified: head/sys/powerpc/include/pmap.h
==============================================================================
--- head/sys/powerpc/include/pmap.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/pmap.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-4-Clause
*
* Copyright (C) 2006 Semihalf, Marian Balakowicz <m8@semihalf.com>
* All rights reserved.
Modified: head/sys/powerpc/include/rtas.h
==============================================================================
--- head/sys/powerpc/include/rtas.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/rtas.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/include/runq.h
==============================================================================
--- head/sys/powerpc/include/runq.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/runq.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/powerpc/include/sc_machdep.h
==============================================================================
--- head/sys/powerpc/include/sc_machdep.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/sc_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/powerpc/include/slb.h
==============================================================================
--- head/sys/powerpc/include/slb.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/slb.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2009 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/include/smp.h
==============================================================================
--- head/sys/powerpc/include/smp.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/smp.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/powerpc/include/spr.h
==============================================================================
--- head/sys/powerpc/include/spr.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/spr.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/include/sr.h
==============================================================================
--- head/sys/powerpc/include/sr.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/sr.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
Modified: head/sys/powerpc/include/vdso.h
==============================================================================
--- head/sys/powerpc/include/vdso.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/vdso.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
Modified: head/sys/powerpc/include/vm.h
==============================================================================
--- head/sys/powerpc/include/vm.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/include/vm.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
Modified: head/sys/powerpc/mambo/mambo.c
==============================================================================
--- head/sys/powerpc/mambo/mambo.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mambo/mambo.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/mambo/mambo_console.c
==============================================================================
--- head/sys/powerpc/mambo/mambo_console.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mambo/mambo_console.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/mambo/mambo_disk.c
==============================================================================
--- head/sys/powerpc/mambo/mambo_disk.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mambo/mambo_disk.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/mambo/mambocall.h
==============================================================================
--- head/sys/powerpc/mambo/mambocall.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mambo/mambocall.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/mpc85xx/atpic.c
==============================================================================
--- head/sys/powerpc/mpc85xx/atpic.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/atpic.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Marcel Moolenaar
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
==============================================================================
--- head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
*
Modified: head/sys/powerpc/mpc85xx/ds1553_core.c
==============================================================================
--- head/sys/powerpc/mpc85xx/ds1553_core.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/ds1553_core.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
*
Modified: head/sys/powerpc/mpc85xx/ds1553_reg.h
==============================================================================
--- head/sys/powerpc/mpc85xx/ds1553_reg.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/ds1553_reg.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2006-2008 Semihalf, Grzegorz Bernacki
* All rights reserved.
*
Modified: head/sys/powerpc/mpc85xx/i2c.c
==============================================================================
--- head/sys/powerpc/mpc85xx/i2c.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/i2c.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008-2009 Semihalf, Michal Hajduk
* All rights reserved.
*
Modified: head/sys/powerpc/mpc85xx/isa.c
==============================================================================
--- head/sys/powerpc/mpc85xx/isa.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/isa.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Marcel Moolenaar
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/mpc85xx/lbc.c
==============================================================================
--- head/sys/powerpc/mpc85xx/lbc.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/lbc.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2006-2008, Juniper Networks, Inc.
* Copyright (c) 2008 Semihalf, Rafal Czubak
* Copyright (c) 2009 The FreeBSD Foundation
Modified: head/sys/powerpc/mpc85xx/lbc.h
==============================================================================
--- head/sys/powerpc/mpc85xx/lbc.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/lbc.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006-2008, Juniper Networks, Inc.
* All rights reserved.
*
Modified: head/sys/powerpc/mpc85xx/mpc85xx.c
==============================================================================
--- head/sys/powerpc/mpc85xx/mpc85xx.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/mpc85xx.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Semihalf, Rafal Jaworowski
* All rights reserved.
*
Modified: head/sys/powerpc/mpc85xx/mpc85xx.h
==============================================================================
--- head/sys/powerpc/mpc85xx/mpc85xx.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/mpc85xx.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Semihalf, Rafal Jaworowski
* Copyright 2006 by Juniper Networks.
* All rights reserved.
Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx.c
==============================================================================
--- head/sys/powerpc/mpc85xx/pci_mpc85xx.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/pci_mpc85xx.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2006-2007 by Juniper Networks.
* Copyright 2008 Semihalf.
* Copyright 2010 The FreeBSD Foundation
Modified: head/sys/powerpc/mpc85xx/platform_mpc85xx.c
==============================================================================
--- head/sys/powerpc/mpc85xx/platform_mpc85xx.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/mpc85xx/platform_mpc85xx.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/powerpc/ofw/ofw_machdep.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/ofw_machdep.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1996 Wolfgang Solfrank.
* Copyright (C) 1996 TooLs GmbH.
* All rights reserved.
Modified: head/sys/powerpc/ofw/ofw_pcib_pci.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_pcib_pci.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/ofw_pcib_pci.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
Modified: head/sys/powerpc/ofw/ofw_pcibus.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_pcibus.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/ofw_pcibus.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
Modified: head/sys/powerpc/ofw/ofw_pcibus.h
==============================================================================
--- head/sys/powerpc/ofw/ofw_pcibus.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/ofw_pcibus.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/ofw/ofw_real.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_real.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/ofw_real.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,6 +1,8 @@
/* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
/*-
+ * SPDX-License-Identifier:BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
* All rights reserved.
Modified: head/sys/powerpc/ofw/ofw_syscons.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_syscons.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/ofw_syscons.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Peter Grehan
* All rights reserved.
*
Modified: head/sys/powerpc/ofw/ofw_syscons.h
==============================================================================
--- head/sys/powerpc/ofw/ofw_syscons.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/ofw_syscons.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Peter Grehan
* All rights reserved.
*
Modified: head/sys/powerpc/ofw/openpic_ofw.c
==============================================================================
--- head/sys/powerpc/ofw/openpic_ofw.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/openpic_ofw.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/ofw/rtas.c
==============================================================================
--- head/sys/powerpc/ofw/rtas.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/ofw/rtas.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/ata_dbdma.c
==============================================================================
--- head/sys/powerpc/powermac/ata_dbdma.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/ata_dbdma.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/ata_dbdma.h
==============================================================================
--- head/sys/powerpc/powermac/ata_dbdma.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/ata_dbdma.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- head/sys/powerpc/powermac/ata_kauai.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/ata_kauai.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2004 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/ata_macio.c
==============================================================================
--- head/sys/powerpc/powermac/ata_macio.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/ata_macio.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/atibl.c
==============================================================================
--- head/sys/powerpc/powermac/atibl.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/atibl.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Justin Hibbits
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/cpcht.c
==============================================================================
--- head/sys/powerpc/powermac/cpcht.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/cpcht.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008-2010 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/cuda.c
==============================================================================
--- head/sys/powerpc/powermac/cuda.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/cuda.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2006 Michael Lorenz
* Copyright 2008 by Nathan Whitehorn
* All rights reserved.
Modified: head/sys/powerpc/powermac/dbdma.c
==============================================================================
--- head/sys/powerpc/powermac/dbdma.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/dbdma.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
Modified: head/sys/powerpc/powermac/dbdmavar.h
==============================================================================
--- head/sys/powerpc/powermac/dbdmavar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/dbdmavar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved
*
Modified: head/sys/powerpc/powermac/fcu.c
==============================================================================
--- head/sys/powerpc/powermac/fcu.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/fcu.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Andreas Tobler
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/grackle.c
==============================================================================
--- head/sys/powerpc/powermac/grackle.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/grackle.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/gracklevar.h
==============================================================================
--- head/sys/powerpc/powermac/gracklevar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/gracklevar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/hrowpic.c
==============================================================================
--- head/sys/powerpc/powermac/hrowpic.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/hrowpic.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/hrowpicvar.h
==============================================================================
--- head/sys/powerpc/powermac/hrowpicvar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/hrowpicvar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2003 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/kiic.c
==============================================================================
--- head/sys/powerpc/powermac/kiic.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/kiic.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Tsubai Masanari. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/macgpio.c
==============================================================================
--- head/sys/powerpc/powermac/macgpio.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/macgpio.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/macgpiovar.h
==============================================================================
--- head/sys/powerpc/powermac/macgpiovar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/macgpiovar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2008 by Nathan Whitehorn. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/macio.c
==============================================================================
--- head/sys/powerpc/powermac/macio.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/macio.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/maciovar.h
==============================================================================
--- head/sys/powerpc/powermac/maciovar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/maciovar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 2002 by Peter Grehan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/powerpc/powermac/nvbl.c
==============================================================================
--- head/sys/powerpc/powermac/nvbl.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/nvbl.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Justin Hibbits
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/platform_powermac.c
==============================================================================
--- head/sys/powerpc/powermac/platform_powermac.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/platform_powermac.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marcel Moolenaar
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
Modified: head/sys/powerpc/powermac/pmu.c
==============================================================================
--- head/sys/powerpc/powermac/pmu.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/pmu.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Michael Lorenz
* Copyright 2008 by Nathan Whitehorn
* All rights reserved.
Modified: head/sys/powerpc/powermac/pmuvar.h
==============================================================================
--- head/sys/powerpc/powermac/pmuvar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/pmuvar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Michael Lorenz
* Copyright (c) 2008 Nathan Whitehorn
* All rights reserved.
Modified: head/sys/powerpc/powermac/powermac_thermal.c
==============================================================================
--- head/sys/powerpc/powermac/powermac_thermal.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/powermac_thermal.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2011 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/powermac_thermal.h
==============================================================================
--- head/sys/powerpc/powermac/powermac_thermal.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/powermac_thermal.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2011 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/pswitch.c
==============================================================================
--- head/sys/powerpc/powermac/pswitch.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/pswitch.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/smu.c
==============================================================================
--- head/sys/powerpc/powermac/smu.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/smu.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/smusat.c
==============================================================================
--- head/sys/powerpc/powermac/smusat.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/smusat.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/uninorth.c
==============================================================================
--- head/sys/powerpc/powermac/uninorth.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/uninorth.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/uninorthpci.c
==============================================================================
--- head/sys/powerpc/powermac/uninorthpci.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/uninorthpci.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/uninorthvar.h
==============================================================================
--- head/sys/powerpc/powermac/uninorthvar.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/uninorthvar.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2002 Benno Rice.
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/vcoregpio.c
==============================================================================
--- head/sys/powerpc/powermac/vcoregpio.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/vcoregpio.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powermac/viareg.h
==============================================================================
--- head/sys/powerpc/powermac/viareg.h Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powermac/viareg.h Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Nathan Whitehorn
* All rights reserved.
*
Modified: head/sys/powerpc/powerpc/altivec.c
==============================================================================
--- head/sys/powerpc/powerpc/altivec.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powerpc/altivec.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1996 Wolfgang Solfrank.
* Copyright (C) 1996 TooLs GmbH.
* All rights reserved.
Modified: head/sys/powerpc/powerpc/autoconf.c
==============================================================================
--- head/sys/powerpc/powerpc/autoconf.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powerpc/autoconf.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
Modified: head/sys/powerpc/powerpc/bus_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/bus_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powerpc/bus_machdep.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Semihalf, Rafal Jaworowski <raj@semihalf.com>
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
Modified: head/sys/powerpc/powerpc/busdma_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/busdma_machdep.c Mon Nov 27 15:08:52 2017 (r326260)
+++ head/sys/powerpc/powerpc/busdma_machdep.c Mon Nov 27 15:09:59 2017 (r326261)
@@ -1,4 +1,6 @@
/*-
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:10:51 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC05DE53E11;
Mon, 27 Nov 2017 15:10:51 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 365E0754DA;
Mon, 27 Nov 2017 15:10:51 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFAoOS097107;
Mon, 27 Nov 2017 15:10:50 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFAd14096992;
Mon, 27 Nov 2017 15:10:39 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271510.vARFAd14096992@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:10:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326262 - in head/sys/sparc64: central ebus fhc include
isa pci sbus sparc64
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/sparc64: central ebus fhc include isa pci sbus
sparc64
X-SVN-Commit-Revision: 326262
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:10:51 -0000
Author: pfg
Date: Mon Nov 27 15:10:39 2017
New Revision: 326262
URL: https://svnweb.freebsd.org/changeset/base/326262
Log:
sys/sparc64: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/sparc64/central/central.c
head/sys/sparc64/ebus/ebus.c
head/sys/sparc64/ebus/ebusreg.h
head/sys/sparc64/ebus/epic.c
head/sys/sparc64/fhc/clkbrd.c
head/sys/sparc64/fhc/clkbrdreg.h
head/sys/sparc64/fhc/fhc.c
head/sys/sparc64/fhc/fhcreg.h
head/sys/sparc64/include/_align.h
head/sys/sparc64/include/_bus.h
head/sys/sparc64/include/_inttypes.h
head/sys/sparc64/include/_limits.h
head/sys/sparc64/include/_stdint.h
head/sys/sparc64/include/asi.h
head/sys/sparc64/include/asmacros.h
head/sys/sparc64/include/atomic.h
head/sys/sparc64/include/bus.h
head/sys/sparc64/include/bus_dma.h
head/sys/sparc64/include/bus_private.h
head/sys/sparc64/include/ccr.h
head/sys/sparc64/include/cmt.h
head/sys/sparc64/include/counter.h
head/sys/sparc64/include/cpufunc.h
head/sys/sparc64/include/dcr.h
head/sys/sparc64/include/elf.h
head/sys/sparc64/include/exec.h
head/sys/sparc64/include/fireplane.h
head/sys/sparc64/include/fp.h
head/sys/sparc64/include/frame.h
head/sys/sparc64/include/fsr.h
head/sys/sparc64/include/gdb_machdep.h
head/sys/sparc64/include/idprom.h
head/sys/sparc64/include/instr.h
head/sys/sparc64/include/intr_machdep.h
head/sys/sparc64/include/iommuvar.h
head/sys/sparc64/include/jbus.h
head/sys/sparc64/include/kdb.h
head/sys/sparc64/include/kerneldump.h
head/sys/sparc64/include/ktr.h
head/sys/sparc64/include/limits.h
head/sys/sparc64/include/lsu.h
head/sys/sparc64/include/mcntl.h
head/sys/sparc64/include/memdev.h
head/sys/sparc64/include/metadata.h
head/sys/sparc64/include/nexusvar.h
head/sys/sparc64/include/ofw_machdep.h
head/sys/sparc64/include/ofw_mem.h
head/sys/sparc64/include/ofw_nexus.h
head/sys/sparc64/include/param.h
head/sys/sparc64/include/pcb.h
head/sys/sparc64/include/pcpu.h
head/sys/sparc64/include/pstate.h
head/sys/sparc64/include/runq.h
head/sys/sparc64/include/sc_machdep.h
head/sys/sparc64/include/sf_buf.h
head/sys/sparc64/include/sigframe.h
head/sys/sparc64/include/smp.h
head/sys/sparc64/include/stack.h
head/sys/sparc64/include/stdarg.h
head/sys/sparc64/include/tick.h
head/sys/sparc64/include/tlb.h
head/sys/sparc64/include/trap.h
head/sys/sparc64/include/tsb.h
head/sys/sparc64/include/tstate.h
head/sys/sparc64/include/tte.h
head/sys/sparc64/include/ucontext.h
head/sys/sparc64/include/upa.h
head/sys/sparc64/include/utrap.h
head/sys/sparc64/include/vdso.h
head/sys/sparc64/include/ver.h
head/sys/sparc64/include/vm.h
head/sys/sparc64/include/watch.h
head/sys/sparc64/include/wstate.h
head/sys/sparc64/isa/isa.c
head/sys/sparc64/isa/isa_dma.c
head/sys/sparc64/isa/ofw_isa.c
head/sys/sparc64/isa/ofw_isa.h
head/sys/sparc64/pci/apb.c
head/sys/sparc64/pci/fire.c
head/sys/sparc64/pci/firereg.h
head/sys/sparc64/pci/firevar.h
head/sys/sparc64/pci/ofw_pci.h
head/sys/sparc64/pci/ofw_pcib.c
head/sys/sparc64/pci/ofw_pcib_subr.c
head/sys/sparc64/pci/ofw_pcib_subr.h
head/sys/sparc64/pci/ofw_pcibus.c
head/sys/sparc64/pci/psycho.c
head/sys/sparc64/pci/psychoreg.h
head/sys/sparc64/pci/psychovar.h
head/sys/sparc64/pci/sbbc.c
head/sys/sparc64/pci/schizo.c
head/sys/sparc64/pci/schizoreg.h
head/sys/sparc64/pci/schizovar.h
head/sys/sparc64/sbus/dma_sbus.c
head/sys/sparc64/sbus/lsi64854.c
head/sys/sparc64/sbus/lsi64854reg.h
head/sys/sparc64/sbus/lsi64854var.h
head/sys/sparc64/sbus/ofw_sbus.h
head/sys/sparc64/sbus/sbus.c
head/sys/sparc64/sbus/sbusvar.h
head/sys/sparc64/sparc64/ata_machdep.c
head/sys/sparc64/sparc64/autoconf.c
head/sys/sparc64/sparc64/bus_machdep.c
head/sys/sparc64/sparc64/cam_machdep.c
head/sys/sparc64/sparc64/cheetah.c
head/sys/sparc64/sparc64/clock.c
head/sys/sparc64/sparc64/counter.c
head/sys/sparc64/sparc64/db_disasm.c
head/sys/sparc64/sparc64/db_hwwatch.c
head/sys/sparc64/sparc64/db_interface.c
head/sys/sparc64/sparc64/db_trace.c
head/sys/sparc64/sparc64/dump_machdep.c
head/sys/sparc64/sparc64/elf_machdep.c
head/sys/sparc64/sparc64/gdb_machdep.c
head/sys/sparc64/sparc64/genassym.c
head/sys/sparc64/sparc64/iommu.c
head/sys/sparc64/sparc64/jbusppm.c
head/sys/sparc64/sparc64/mp_machdep.c
head/sys/sparc64/sparc64/ofw_machdep.c
head/sys/sparc64/sparc64/prof_machdep.c
head/sys/sparc64/sparc64/rtc.c
head/sys/sparc64/sparc64/rwindow.c
head/sys/sparc64/sparc64/sc_machdep.c
head/sys/sparc64/sparc64/schppm.c
head/sys/sparc64/sparc64/spitfire.c
head/sys/sparc64/sparc64/ssm.c
head/sys/sparc64/sparc64/stack_machdep.c
head/sys/sparc64/sparc64/sys_machdep.c
head/sys/sparc64/sparc64/tick.c
head/sys/sparc64/sparc64/tlb.c
head/sys/sparc64/sparc64/tsb.c
head/sys/sparc64/sparc64/upa.c
head/sys/sparc64/sparc64/zeus.c
Modified: head/sys/sparc64/central/central.c
==============================================================================
--- head/sys/sparc64/central/central.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/central/central.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/ebus/ebus.c
==============================================================================
--- head/sys/sparc64/ebus/ebus.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/ebus/ebus.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* Copyright (c) 2009 by Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/ebus/ebusreg.h
==============================================================================
--- head/sys/sparc64/ebus/ebusreg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/ebus/ebusreg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -3,6 +3,8 @@
/* $NetBSD: ebusreg.h,v 1.8 2008/05/29 14:51:27 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1999 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/ebus/epic.c
==============================================================================
--- head/sys/sparc64/ebus/epic.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/ebus/epic.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/fhc/clkbrd.c
==============================================================================
--- head/sys/sparc64/fhc/clkbrd.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/fhc/clkbrd.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2004 Jason L. Wright (jason@thought.net)
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/fhc/clkbrdreg.h
==============================================================================
--- head/sys/sparc64/fhc/clkbrdreg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/fhc/clkbrdreg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2004 Jason L. Wright (jason@thought.net)
* Copyright (c) 2006 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/fhc/fhc.c
==============================================================================
--- head/sys/sparc64/fhc/fhc.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/fhc/fhc.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/fhc/fhcreg.h
==============================================================================
--- head/sys/sparc64/fhc/fhcreg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/fhc/fhcreg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
+ *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/_align.h
==============================================================================
--- head/sys/sparc64/include/_align.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/_align.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
Modified: head/sys/sparc64/include/_bus.h
==============================================================================
--- head/sys/sparc64/include/_bus.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/_bus.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 M. Warner Losh.
* All rights reserved.
*
Modified: head/sys/sparc64/include/_inttypes.h
==============================================================================
--- head/sys/sparc64/include/_inttypes.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/_inttypes.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/include/_limits.h
==============================================================================
--- head/sys/sparc64/include/_limits.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/_limits.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
Modified: head/sys/sparc64/include/_stdint.h
==============================================================================
--- head/sys/sparc64/include/_stdint.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/_stdint.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
Modified: head/sys/sparc64/include/asi.h
==============================================================================
--- head/sys/sparc64/include/asi.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/asi.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/asmacros.h
==============================================================================
--- head/sys/sparc64/include/asmacros.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/asmacros.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* Copyright (c) 2011 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/include/atomic.h
==============================================================================
--- head/sys/sparc64/include/atomic.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/atomic.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson.
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
Modified: head/sys/sparc64/include/bus.h
==============================================================================
--- head/sys/sparc64/include/bus.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/bus.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
+ *
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/include/bus_dma.h
==============================================================================
--- head/sys/sparc64/include/bus_dma.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/bus_dma.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
+ *
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/include/bus_private.h
==============================================================================
--- head/sys/sparc64/include/bus_private.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/bus_private.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* Copyright (c) 2002 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
Modified: head/sys/sparc64/include/ccr.h
==============================================================================
--- head/sys/sparc64/include/ccr.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/ccr.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/cmt.h
==============================================================================
--- head/sys/sparc64/include/cmt.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/cmt.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/counter.h
==============================================================================
--- head/sys/sparc64/include/counter.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/counter.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/cpufunc.h
==============================================================================
--- head/sys/sparc64/include/cpufunc.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/cpufunc.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/dcr.h
==============================================================================
--- head/sys/sparc64/include/dcr.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/dcr.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/elf.h
==============================================================================
--- head/sys/sparc64/include/elf.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/elf.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996-1997 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/sparc64/include/exec.h
==============================================================================
--- head/sys/sparc64/include/exec.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/exec.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/fireplane.h
==============================================================================
--- head/sys/sparc64/include/fireplane.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/fireplane.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/fp.h
==============================================================================
--- head/sys/sparc64/include/fp.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/fp.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/frame.h
==============================================================================
--- head/sys/sparc64/include/frame.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/frame.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/fsr.h
==============================================================================
--- head/sys/sparc64/include/fsr.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/fsr.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/gdb_machdep.h
==============================================================================
--- head/sys/sparc64/include/gdb_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/gdb_machdep.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sparc64/include/idprom.h
==============================================================================
--- head/sys/sparc64/include/idprom.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/idprom.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Adam Glass
* All rights reserved.
*
Modified: head/sys/sparc64/include/instr.h
==============================================================================
--- head/sys/sparc64/include/instr.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/instr.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 David S. Miller, davem@nadzieja.rutgers.edu
* Copyright (c) 1995 Paul Kranenburg
* Copyright (c) 2001 Thomas Moestl <tmm@FreeBSD.org>
Modified: head/sys/sparc64/include/intr_machdep.h
==============================================================================
--- head/sys/sparc64/include/intr_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/intr_machdep.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/iommuvar.h
==============================================================================
--- head/sys/sparc64/include/iommuvar.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/iommuvar.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/include/jbus.h
==============================================================================
--- head/sys/sparc64/include/jbus.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/jbus.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/kdb.h
==============================================================================
--- head/sys/sparc64/include/kdb.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/kdb.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sparc64/include/kerneldump.h
==============================================================================
--- head/sys/sparc64/include/kerneldump.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/kerneldump.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/sparc64/include/ktr.h
==============================================================================
--- head/sys/sparc64/include/ktr.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/ktr.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/limits.h
==============================================================================
--- head/sys/sparc64/include/limits.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/limits.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
Modified: head/sys/sparc64/include/lsu.h
==============================================================================
--- head/sys/sparc64/include/lsu.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/lsu.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/mcntl.h
==============================================================================
--- head/sys/sparc64/include/mcntl.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/mcntl.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/memdev.h
==============================================================================
--- head/sys/sparc64/include/memdev.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/memdev.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Mark R V Murray
* All rights reserved.
*
Modified: head/sys/sparc64/include/metadata.h
==============================================================================
--- head/sys/sparc64/include/metadata.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/metadata.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/nexusvar.h
==============================================================================
--- head/sys/sparc64/include/nexusvar.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/nexusvar.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/ofw_machdep.h
==============================================================================
--- head/sys/sparc64/include/ofw_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/ofw_machdep.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/sparc64/include/ofw_mem.h
==============================================================================
--- head/sys/sparc64/include/ofw_mem.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/ofw_mem.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/ofw_nexus.h
==============================================================================
--- head/sys/sparc64/include/ofw_nexus.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/ofw_nexus.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/include/param.h
==============================================================================
--- head/sys/sparc64/include/param.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/param.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
Modified: head/sys/sparc64/include/pcb.h
==============================================================================
--- head/sys/sparc64/include/pcb.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/pcb.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/pcpu.h
==============================================================================
--- head/sys/sparc64/include/pcpu.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/pcpu.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/pstate.h
==============================================================================
--- head/sys/sparc64/include/pstate.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/pstate.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/runq.h
==============================================================================
--- head/sys/sparc64/include/runq.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/runq.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/sc_machdep.h
==============================================================================
--- head/sys/sparc64/include/sc_machdep.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/sc_machdep.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/sf_buf.h
==============================================================================
--- head/sys/sparc64/include/sf_buf.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/sf_buf.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/include/sigframe.h
==============================================================================
--- head/sys/sparc64/include/sigframe.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/sigframe.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sparc64/include/smp.h
==============================================================================
--- head/sys/sparc64/include/smp.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/smp.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* Copyright (c) 2007 - 2011 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/include/stack.h
==============================================================================
--- head/sys/sparc64/include/stack.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/stack.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/stdarg.h
==============================================================================
--- head/sys/sparc64/include/stdarg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/stdarg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 David E. O'Brien. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
Modified: head/sys/sparc64/include/tick.h
==============================================================================
--- head/sys/sparc64/include/tick.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/tick.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/tlb.h
==============================================================================
--- head/sys/sparc64/include/tlb.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/tlb.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* Copyright (c) 2008, 2010 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/include/trap.h
==============================================================================
--- head/sys/sparc64/include/trap.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/trap.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/tsb.h
==============================================================================
--- head/sys/sparc64/include/tsb.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/tsb.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/tstate.h
==============================================================================
--- head/sys/sparc64/include/tstate.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/tstate.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/tte.h
==============================================================================
--- head/sys/sparc64/include/tte.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/tte.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/ucontext.h
==============================================================================
--- head/sys/sparc64/include/ucontext.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/ucontext.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/sparc64/include/upa.h
==============================================================================
--- head/sys/sparc64/include/upa.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/upa.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/sparc64/include/utrap.h
==============================================================================
--- head/sys/sparc64/include/utrap.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/utrap.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/vdso.h
==============================================================================
--- head/sys/sparc64/include/vdso.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/vdso.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
Modified: head/sys/sparc64/include/ver.h
==============================================================================
--- head/sys/sparc64/include/ver.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/ver.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/include/vm.h
==============================================================================
--- head/sys/sparc64/include/vm.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/vm.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
* All rights reserved.
*
Modified: head/sys/sparc64/include/watch.h
==============================================================================
--- head/sys/sparc64/include/watch.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/watch.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/include/wstate.h
==============================================================================
--- head/sys/sparc64/include/wstate.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/include/wstate.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/sparc64/isa/isa.c
==============================================================================
--- head/sys/sparc64/isa/isa.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/isa/isa.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* Copyright (c) 2001 Thomas Moestl <tmm@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/isa/isa_dma.c
==============================================================================
--- head/sys/sparc64/isa/isa_dma.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/isa/isa_dma.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pyun YongHyeon.
* All rights reserved.
*
Modified: head/sys/sparc64/isa/ofw_isa.c
==============================================================================
--- head/sys/sparc64/isa/ofw_isa.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/isa/ofw_isa.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/isa/ofw_isa.h
==============================================================================
--- head/sys/sparc64/isa/ofw_isa.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/isa/ofw_isa.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/pci/apb.c
==============================================================================
--- head/sys/sparc64/pci/apb.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/apb.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
Modified: head/sys/sparc64/pci/fire.c
==============================================================================
--- head/sys/sparc64/pci/fire.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/fire.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* Copyright (c) 2001 - 2003 by Thomas Moestl <tmm@FreeBSD.org>
* Copyright (c) 2009 by Marius Strobl <marius@FreeBSD.org>
Modified: head/sys/sparc64/pci/firereg.h
==============================================================================
--- head/sys/sparc64/pci/firereg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/firereg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/pci/firevar.h
==============================================================================
--- head/sys/sparc64/pci/firevar.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/firevar.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 by Marius Strobl <marius@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/sparc64/pci/ofw_pci.h
==============================================================================
--- head/sys/sparc64/pci/ofw_pci.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/ofw_pci.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/pci/ofw_pcib.c
==============================================================================
--- head/sys/sparc64/pci/ofw_pcib.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/ofw_pcib.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
* Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000 BSDi
Modified: head/sys/sparc64/pci/ofw_pcib_subr.c
==============================================================================
--- head/sys/sparc64/pci/ofw_pcib_subr.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/ofw_pcib_subr.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 by Thomas Moestl <tmm@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/pci/ofw_pcib_subr.h
==============================================================================
--- head/sys/sparc64/pci/ofw_pcib_subr.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/ofw_pcib_subr.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 by Thomas Moestl <tmm@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/pci/ofw_pcibus.c
==============================================================================
--- head/sys/sparc64/pci/ofw_pcibus.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/ofw_pcibus.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* Copyright (c) 2000, Michael Smith <msmith@freebsd.org>
* Copyright (c) 2000, BSDi
Modified: head/sys/sparc64/pci/psycho.c
==============================================================================
--- head/sys/sparc64/pci/psycho.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/psycho.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* Copyright (c) 2001 - 2003 by Thomas Moestl <tmm@FreeBSD.org>
* Copyright (c) 2005 - 2006 Marius Strobl <marius@FreeBSD.org>
Modified: head/sys/sparc64/pci/psychoreg.h
==============================================================================
--- head/sys/sparc64/pci/psychoreg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/psychoreg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/pci/psychovar.h
==============================================================================
--- head/sys/sparc64/pci/psychovar.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/psychovar.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/sparc64/pci/sbbc.c
==============================================================================
--- head/sys/sparc64/pci/sbbc.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/sbbc.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,5 +1,7 @@
/* $OpenBSD: sbbc.c,v 1.7 2009/11/09 17:53:39 nicm Exp $ */
/*-
+ * SPDX-License-Identifier: MIT AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Mark Kettenis
*
* Permission to use, copy, modify, and distribute this software for any
Modified: head/sys/sparc64/pci/schizo.c
==============================================================================
--- head/sys/sparc64/pci/schizo.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/schizo.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999, 2000 Matthew R. Green
* Copyright (c) 2001 - 2003 by Thomas Moestl <tmm@FreeBSD.org>
* Copyright (c) 2005 - 2011 by Marius Strobl <marius@FreeBSD.org>
Modified: head/sys/sparc64/pci/schizoreg.h
==============================================================================
--- head/sys/sparc64/pci/schizoreg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/schizoreg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
* Copyright (c) 2005 by Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/pci/schizovar.h
==============================================================================
--- head/sys/sparc64/pci/schizovar.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/pci/schizovar.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 by Marius Strobl <marius@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/sparc64/sbus/dma_sbus.c
==============================================================================
--- head/sys/sparc64/sbus/dma_sbus.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sbus/dma_sbus.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -2,6 +2,8 @@
/* $NetBSD: dma_sbus.c,v 1.32 2008/04/28 20:23:57 martin Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/sbus/lsi64854.c
==============================================================================
--- head/sys/sparc64/sbus/lsi64854.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sbus/lsi64854.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2004 Scott Long
* All rights reserved.
*
Modified: head/sys/sparc64/sbus/lsi64854reg.h
==============================================================================
--- head/sys/sparc64/sbus/lsi64854reg.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sbus/lsi64854reg.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,6 +1,8 @@
/* $NetBSD: lsi64854reg.h,v 1.6 2008/04/28 20:23:50 martin Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/sbus/lsi64854var.h
==============================================================================
--- head/sys/sparc64/sbus/lsi64854var.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sbus/lsi64854var.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,6 +1,8 @@
/* $NetBSD: lsi64854var.h,v 1.12 2008/04/28 20:23:50 martin Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/sbus/ofw_sbus.h
==============================================================================
--- head/sys/sparc64/sbus/ofw_sbus.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sbus/ofw_sbus.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/sbus/sbus.c
==============================================================================
--- head/sys/sparc64/sbus/sbus.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sbus/sbus.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999-2002 Eduardo Horvath
* All rights reserved.
*
Modified: head/sys/sparc64/sbus/sbusvar.h
==============================================================================
--- head/sys/sparc64/sbus/sbusvar.h Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sbus/sbusvar.h Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/ata_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/ata_machdep.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/ata_machdep.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/autoconf.c
==============================================================================
--- head/sys/sparc64/sparc64/autoconf.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/autoconf.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/bus_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/bus_machdep.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/bus_machdep.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-3-Clause
+ *
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/cam_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/cam_machdep.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/cam_machdep.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/cheetah.c
==============================================================================
--- head/sys/sparc64/sparc64/cheetah.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/cheetah.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder.
* Copyright (c) 2005 - 2011 Marius Strobl <marius@FreeBSD.org>
* All rights reserved.
Modified: head/sys/sparc64/sparc64/clock.c
==============================================================================
--- head/sys/sparc64/sparc64/clock.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/clock.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/counter.c
==============================================================================
--- head/sys/sparc64/sparc64/counter.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/counter.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 by Thomas Moestl <tmm@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/db_disasm.c
==============================================================================
--- head/sys/sparc64/sparc64/db_disasm.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/db_disasm.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 David S. Miller, davem@nadzieja.rutgers.edu
* Copyright (c) 1995 Paul Kranenburg
* All rights reserved.
Modified: head/sys/sparc64/sparc64/db_hwwatch.c
==============================================================================
--- head/sys/sparc64/sparc64/db_hwwatch.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/db_hwwatch.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
* Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
Modified: head/sys/sparc64/sparc64/db_interface.c
==============================================================================
--- head/sys/sparc64/sparc64/db_interface.c Mon Nov 27 15:09:59 2017 (r326261)
+++ head/sys/sparc64/sparc64/db_interface.c Mon Nov 27 15:10:39 2017 (r326262)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder.
* All rights reserved.
*
Modified: head/sys/sparc64/sparc64/db_trace.c
==============================================================================
--- head/sys/sparc64/sparc64/db_trace.c Mon Nov 27 15:09:59 2017 (r326261)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:11:54 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3564E54005;
Mon, 27 Nov 2017 15:11:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 89DD475809;
Mon, 27 Nov 2017 15:11:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFBrcT098929;
Mon, 27 Nov 2017 15:11:53 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFBl92098865;
Mon, 27 Nov 2017 15:11:47 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271511.vARFBl92098865@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:11:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326263 - in head/sys/x86: acpica bios cpufreq include
iommu isa pci x86 xen
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/x86: acpica bios cpufreq include iommu isa pci
x86 xen
X-SVN-Commit-Revision: 326263
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:11:55 -0000
Author: pfg
Date: Mon Nov 27 15:11:47 2017
New Revision: 326263
URL: https://svnweb.freebsd.org/changeset/base/326263
Log:
sys/x86: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/x86/acpica/OsdEnvironment.c
head/sys/x86/acpica/acpi_apm.c
head/sys/x86/acpica/acpi_wakeup.c
head/sys/x86/acpica/madt.c
head/sys/x86/acpica/srat.c
head/sys/x86/bios/smbios.c
head/sys/x86/bios/vpd.c
head/sys/x86/cpufreq/est.c
head/sys/x86/cpufreq/hwpstate.c
head/sys/x86/cpufreq/p4tcc.c
head/sys/x86/cpufreq/powernow.c
head/sys/x86/cpufreq/smist.c
head/sys/x86/include/_inttypes.h
head/sys/x86/include/_stdint.h
head/sys/x86/include/acpica_machdep.h
head/sys/x86/include/apicreg.h
head/sys/x86/include/apicvar.h
head/sys/x86/include/bus.h
head/sys/x86/include/busdma_impl.h
head/sys/x86/include/elf.h
head/sys/x86/include/fdt.h
head/sys/x86/include/init.h
head/sys/x86/include/legacyvar.h
head/sys/x86/include/mca.h
head/sys/x86/include/mptable.h
head/sys/x86/include/ofw_machdep.h
head/sys/x86/include/pci_cfgreg.h
head/sys/x86/include/sigframe.h
head/sys/x86/include/ucontext.h
head/sys/x86/include/vdso.h
head/sys/x86/iommu/busdma_dmar.c
head/sys/x86/iommu/busdma_dmar.h
head/sys/x86/iommu/intel_ctx.c
head/sys/x86/iommu/intel_dmar.h
head/sys/x86/iommu/intel_drv.c
head/sys/x86/iommu/intel_fault.c
head/sys/x86/iommu/intel_gas.c
head/sys/x86/iommu/intel_idpgtbl.c
head/sys/x86/iommu/intel_qi.c
head/sys/x86/iommu/intel_quirks.c
head/sys/x86/iommu/intel_reg.h
head/sys/x86/iommu/intel_utils.c
head/sys/x86/isa/atpic.c
head/sys/x86/isa/atrtc.c
head/sys/x86/isa/elcr.c
head/sys/x86/isa/isa.c
head/sys/x86/isa/orm.c
head/sys/x86/pci/pci_bus.c
head/sys/x86/pci/qpi.c
head/sys/x86/x86/busdma_bounce.c
head/sys/x86/x86/busdma_machdep.c
head/sys/x86/x86/dump_machdep.c
head/sys/x86/x86/fdt_machdep.c
head/sys/x86/x86/intr_machdep.c
head/sys/x86/x86/io_apic.c
head/sys/x86/x86/local_apic.c
head/sys/x86/x86/mca.c
head/sys/x86/x86/mptable.c
head/sys/x86/x86/mptable_pci.c
head/sys/x86/x86/tsc.c
head/sys/x86/xen/hvm.c
head/sys/x86/xen/pv.c
head/sys/x86/xen/pvcpu_enum.c
Modified: head/sys/x86/acpica/OsdEnvironment.c
==============================================================================
--- head/sys/x86/acpica/OsdEnvironment.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/acpica/OsdEnvironment.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000,2001 Michael Smith
* Copyright (c) 2000 BSDi
* All rights reserved.
Modified: head/sys/x86/acpica/acpi_apm.c
==============================================================================
--- head/sys/x86/acpica/acpi_apm.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/acpica/acpi_apm.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
Modified: head/sys/x86/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/x86/acpica/acpi_wakeup.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/acpica/acpi_wakeup.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
* Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
* Copyright (c) 2003 Peter Wemm
Modified: head/sys/x86/acpica/madt.c
==============================================================================
--- head/sys/x86/acpica/madt.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/acpica/madt.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/acpica/srat.c
==============================================================================
--- head/sys/x86/acpica/srat.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/acpica/srat.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
Modified: head/sys/x86/bios/smbios.c
==============================================================================
--- head/sys/x86/bios/smbios.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/bios/smbios.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
*
Modified: head/sys/x86/bios/vpd.c
==============================================================================
--- head/sys/x86/bios/vpd.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/bios/vpd.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
* All rights reserved.
*
Modified: head/sys/x86/cpufreq/est.c
==============================================================================
--- head/sys/x86/cpufreq/est.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/cpufreq/est.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Colin Percival
* Copyright (c) 2005 Nate Lawson
* All rights reserved.
Modified: head/sys/x86/cpufreq/hwpstate.c
==============================================================================
--- head/sys/x86/cpufreq/hwpstate.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/cpufreq/hwpstate.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Nate Lawson
* Copyright (c) 2004 Colin Percival
* Copyright (c) 2004-2005 Bruno Durcot
Modified: head/sys/x86/cpufreq/p4tcc.c
==============================================================================
--- head/sys/x86/cpufreq/p4tcc.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/cpufreq/p4tcc.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Nate Lawson
* All rights reserved.
*
Modified: head/sys/x86/cpufreq/powernow.c
==============================================================================
--- head/sys/x86/cpufreq/powernow.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/cpufreq/powernow.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Bruno Ducrot
* Copyright (c) 2004 FUKUDA Nobuhiko <nfukuda@spa.is.uec.ac.jp>
*
Modified: head/sys/x86/cpufreq/smist.c
==============================================================================
--- head/sys/x86/cpufreq/smist.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/cpufreq/smist.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Bruno Ducrot
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/x86/include/_inttypes.h
==============================================================================
--- head/sys/x86/include/_inttypes.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/_inttypes.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/x86/include/_stdint.h
==============================================================================
--- head/sys/x86/include/_stdint.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/_stdint.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
Modified: head/sys/x86/include/acpica_machdep.h
==============================================================================
--- head/sys/x86/include/acpica_machdep.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/acpica_machdep.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Mitsuru IWASAKI
* All rights reserved.
*
Modified: head/sys/x86/include/apicreg.h
==============================================================================
--- head/sys/x86/include/apicreg.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/apicreg.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, by Peter Wemm and Steve Passe
* All rights reserved.
*
Modified: head/sys/x86/include/apicvar.h
==============================================================================
--- head/sys/x86/include/apicvar.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/apicvar.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/include/bus.h
==============================================================================
--- head/sys/x86/include/bus.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/bus.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-NetBSDE
+ *
* Copyright (c) KATO Takenori, 1999.
*
* All rights reserved. Unpublished rights reserved under the copyright
Modified: head/sys/x86/include/busdma_impl.h
==============================================================================
--- head/sys/x86/include/busdma_impl.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/busdma_impl.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/include/elf.h
==============================================================================
--- head/sys/x86/include/elf.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/elf.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996-1997 John D. Polstra.
* All rights reserved.
*
Modified: head/sys/x86/include/fdt.h
==============================================================================
--- head/sys/x86/include/fdt.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/fdt.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Juniper Networks, Inc.
* All rights reserved.
*
Modified: head/sys/x86/include/init.h
==============================================================================
--- head/sys/x86/include/init.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/init.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
*
Modified: head/sys/x86/include/legacyvar.h
==============================================================================
--- head/sys/x86/include/legacyvar.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/legacyvar.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/include/mca.h
==============================================================================
--- head/sys/x86/include/mca.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/mca.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
Modified: head/sys/x86/include/mptable.h
==============================================================================
--- head/sys/x86/include/mptable.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/mptable.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
*
Modified: head/sys/x86/include/ofw_machdep.h
==============================================================================
--- head/sys/x86/include/ofw_machdep.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/ofw_machdep.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Juniper Networks, Inc.
* All rights reserved.
*
Modified: head/sys/x86/include/pci_cfgreg.h
==============================================================================
--- head/sys/x86/include/pci_cfgreg.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/pci_cfgreg.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
Modified: head/sys/x86/include/sigframe.h
==============================================================================
--- head/sys/x86/include/sigframe.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/sigframe.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/x86/include/ucontext.h
==============================================================================
--- head/sys/x86/include/ucontext.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/ucontext.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Peter Wemm
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
Modified: head/sys/x86/include/vdso.h
==============================================================================
--- head/sys/x86/include/vdso.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/include/vdso.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* Copyright 2016 The FreeBSD Foundation.
* All rights reserved.
Modified: head/sys/x86/iommu/busdma_dmar.c
==============================================================================
--- head/sys/x86/iommu/busdma_dmar.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/busdma_dmar.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/busdma_dmar.h
==============================================================================
--- head/sys/x86/iommu/busdma_dmar.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/busdma_dmar.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_ctx.c
==============================================================================
--- head/sys/x86/iommu/intel_ctx.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_ctx.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_dmar.h
==============================================================================
--- head/sys/x86/iommu/intel_dmar.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_dmar.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013-2015 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_drv.c
==============================================================================
--- head/sys/x86/iommu/intel_drv.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_drv.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013-2015 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_fault.c
==============================================================================
--- head/sys/x86/iommu/intel_fault.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_fault.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_gas.c
==============================================================================
--- head/sys/x86/iommu/intel_gas.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_gas.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_idpgtbl.c
==============================================================================
--- head/sys/x86/iommu/intel_idpgtbl.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_idpgtbl.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_qi.c
==============================================================================
--- head/sys/x86/iommu/intel_qi.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_qi.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_quirks.c
==============================================================================
--- head/sys/x86/iommu/intel_quirks.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_quirks.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013, 2015 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_reg.h
==============================================================================
--- head/sys/x86/iommu/intel_reg.h Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_reg.h Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013-2015 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/iommu/intel_utils.c
==============================================================================
--- head/sys/x86/iommu/intel_utils.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/iommu/intel_utils.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/x86/isa/atpic.c
==============================================================================
--- head/sys/x86/isa/atpic.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/isa/atpic.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/isa/atrtc.c
==============================================================================
--- head/sys/x86/isa/atrtc.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/isa/atrtc.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Poul-Henning Kamp
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/x86/isa/elcr.c
==============================================================================
--- head/sys/x86/isa/elcr.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/isa/elcr.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/isa/isa.c
==============================================================================
--- head/sys/x86/isa/isa.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/isa/isa.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT
+ *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
Modified: head/sys/x86/isa/orm.c
==============================================================================
--- head/sys/x86/isa/orm.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/isa/orm.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Nikolai Saoukh
* All rights reserved.
*
Modified: head/sys/x86/pci/pci_bus.c
==============================================================================
--- head/sys/x86/pci/pci_bus.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/pci/pci_bus.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
Modified: head/sys/x86/pci/qpi.c
==============================================================================
--- head/sys/x86/pci/qpi.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/pci/qpi.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
Modified: head/sys/x86/x86/busdma_bounce.c
==============================================================================
--- head/sys/x86/x86/busdma_bounce.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/busdma_bounce.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/x86/x86/busdma_machdep.c
==============================================================================
--- head/sys/x86/x86/busdma_machdep.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/busdma_machdep.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/x86/x86/dump_machdep.c
==============================================================================
--- head/sys/x86/x86/dump_machdep.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/dump_machdep.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/x86/x86/fdt_machdep.c
==============================================================================
--- head/sys/x86/x86/fdt_machdep.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/fdt_machdep.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Juniper Networks, Inc.
* All rights reserved.
*
Modified: head/sys/x86/x86/intr_machdep.c
==============================================================================
--- head/sys/x86/x86/intr_machdep.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/intr_machdep.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/x86/io_apic.c
==============================================================================
--- head/sys/x86/x86/io_apic.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/io_apic.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/local_apic.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
Modified: head/sys/x86/x86/mca.c
==============================================================================
--- head/sys/x86/x86/mca.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/mca.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Hudson River Trading LLC
* Written by: John H. Baldwin <jhb@FreeBSD.org>
* All rights reserved.
Modified: head/sys/x86/x86/mptable.c
==============================================================================
--- head/sys/x86/x86/mptable.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/mptable.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* Copyright (c) 1996, by Steve Passe
* All rights reserved.
Modified: head/sys/x86/x86/mptable_pci.c
==============================================================================
--- head/sys/x86/x86/mptable_pci.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/mptable_pci.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/x86/x86/tsc.c
==============================================================================
--- head/sys/x86/x86/tsc.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/x86/tsc.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998-2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/x86/xen/hvm.c
==============================================================================
--- head/sys/x86/xen/hvm.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/xen/hvm.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, 2013 Citrix Systems, Inc.
* Copyright (c) 2012 Spectra Logic Corporation
* All rights reserved.
Modified: head/sys/x86/xen/pv.c
==============================================================================
--- head/sys/x86/xen/pv.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/xen/pv.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2004 Christian Limpach.
* Copyright (c) 2004-2006,2008 Kip Macy
* Copyright (c) 2008 The NetBSD Foundation, Inc.
Modified: head/sys/x86/xen/pvcpu_enum.c
==============================================================================
--- head/sys/x86/xen/pvcpu_enum.c Mon Nov 27 15:10:39 2017 (r326262)
+++ head/sys/x86/xen/pvcpu_enum.c Mon Nov 27 15:11:47 2017 (r326263)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
* Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
* All rights reserved.
From owner-svn-src-all@freebsd.org Mon Nov 27 15:12:15 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F19A6E54063;
Mon, 27 Nov 2017 15:12:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id BB4A975982;
Mon, 27 Nov 2017 15:12:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFCEDZ098992;
Mon, 27 Nov 2017 15:12:14 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFCEw6098988;
Mon, 27 Nov 2017 15:12:14 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711271512.vARFCEw6098988@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:12:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326264 - in stable: 10/release/tools 11/release/tools
X-SVN-Group: stable-10
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in stable: 10/release/tools 11/release/tools
X-SVN-Commit-Revision: 326264
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:12:16 -0000
Author: gjb
Date: Mon Nov 27 15:12:14 2017
New Revision: 326264
URL: https://svnweb.freebsd.org/changeset/base/326264
Log:
MFC r326068:
Remove /etc/resolv.conf from virtual machine images, which is
copied from the build host. It is renamed to /etc/resolv.conf.bak
on boot, so never used anyway.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/tools/ec2.conf
stable/10/release/tools/gce.conf
stable/10/release/tools/vagrant-virtualbox.conf
stable/10/release/tools/vagrant-vmware.conf
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/release/tools/ec2.conf
stable/11/release/tools/gce.conf
stable/11/release/tools/vagrant-virtualbox.conf
stable/11/release/tools/vagrant-vmware.conf
Directory Properties:
stable/11/ (props changed)
Modified: stable/10/release/tools/ec2.conf
==============================================================================
--- stable/10/release/tools/ec2.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/10/release/tools/ec2.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -82,5 +82,7 @@ vm_extra_pre_umount() {
# * firstboot_pkgs (install packages)
touch ${DESTDIR}/firstboot
+ rm -f ${DESTDIR}/etc/resolv.conf
+
return 0
}
Modified: stable/10/release/tools/gce.conf
==============================================================================
--- stable/10/release/tools/gce.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/10/release/tools/gce.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -89,5 +89,7 @@ EOF
touch ${DESTDIR}/firstboot
+ rm -f ${DESTDIR}/etc/resolv.conf
+
return 0
}
Modified: stable/10/release/tools/vagrant-virtualbox.conf
==============================================================================
--- stable/10/release/tools/vagrant-virtualbox.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/10/release/tools/vagrant-virtualbox.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -15,4 +15,5 @@ vm_extra_pre_umount () {
# Setup the Vagrant common items
vagrant_common
+ rm -f ${DESTDIR}/etc/resolv.conf
}
Modified: stable/10/release/tools/vagrant-vmware.conf
==============================================================================
--- stable/10/release/tools/vagrant-vmware.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/10/release/tools/vagrant-vmware.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -19,4 +19,5 @@ vm_extra_pre_umount () {
# Setup the Vagrant common items
vagrant_common
+ rm -f ${DESTDIR}/etc/resolv.conf
}
From owner-svn-src-all@freebsd.org Mon Nov 27 15:12:16 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80B31E5406A;
Mon, 27 Nov 2017 15:12:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 48CA475984;
Mon, 27 Nov 2017 15:12:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFCFB4099491;
Mon, 27 Nov 2017 15:12:15 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFCFqT098997;
Mon, 27 Nov 2017 15:12:15 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711271512.vARFCFqT098997@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:12:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326264 - in stable: 10/release/tools 11/release/tools
X-SVN-Group: stable-11
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in stable: 10/release/tools 11/release/tools
X-SVN-Commit-Revision: 326264
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:12:16 -0000
Author: gjb
Date: Mon Nov 27 15:12:14 2017
New Revision: 326264
URL: https://svnweb.freebsd.org/changeset/base/326264
Log:
MFC r326068:
Remove /etc/resolv.conf from virtual machine images, which is
copied from the build host. It is renamed to /etc/resolv.conf.bak
on boot, so never used anyway.
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/release/tools/ec2.conf
stable/11/release/tools/gce.conf
stable/11/release/tools/vagrant-virtualbox.conf
stable/11/release/tools/vagrant-vmware.conf
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/release/tools/ec2.conf
stable/10/release/tools/gce.conf
stable/10/release/tools/vagrant-virtualbox.conf
stable/10/release/tools/vagrant-vmware.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/11/release/tools/ec2.conf
==============================================================================
--- stable/11/release/tools/ec2.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/11/release/tools/ec2.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -90,5 +90,7 @@ vm_extra_pre_umount() {
# * firstboot_pkgs (install packages)
touch ${DESTDIR}/firstboot
+ rm -f ${DESTDIR}/etc/resolv.conf
+
return 0
}
Modified: stable/11/release/tools/gce.conf
==============================================================================
--- stable/11/release/tools/gce.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/11/release/tools/gce.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -89,5 +89,7 @@ EOF
touch ${DESTDIR}/firstboot
+ rm -f ${DESTDIR}/etc/resolv.conf
+
return 0
}
Modified: stable/11/release/tools/vagrant-virtualbox.conf
==============================================================================
--- stable/11/release/tools/vagrant-virtualbox.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/11/release/tools/vagrant-virtualbox.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -15,4 +15,5 @@ vm_extra_pre_umount () {
# Setup the Vagrant common items
vagrant_common
+ rm -f ${DESTDIR}/etc/resolv.conf
}
Modified: stable/11/release/tools/vagrant-vmware.conf
==============================================================================
--- stable/11/release/tools/vagrant-vmware.conf Mon Nov 27 15:11:47 2017 (r326263)
+++ stable/11/release/tools/vagrant-vmware.conf Mon Nov 27 15:12:14 2017 (r326264)
@@ -19,4 +19,5 @@ vm_extra_pre_umount () {
# Setup the Vagrant common items
vagrant_common
+ rm -f ${DESTDIR}/etc/resolv.conf
}
From owner-svn-src-all@freebsd.org Mon Nov 27 15:12:52 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83450E5414F;
Mon, 27 Nov 2017 15:12:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 208D975C15;
Mon, 27 Nov 2017 15:12:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFCpsU001413;
Mon, 27 Nov 2017 15:12:51 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFChWA001338;
Mon, 27 Nov 2017 15:12:43 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271512.vARFChWA001338@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:12:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326265 - in head/sys/cam: . ata ctl scsi
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/cam: . ata ctl scsi
X-SVN-Commit-Revision: 326265
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:12:52 -0000
Author: pfg
Date: Mon Nov 27 15:12:43 2017
New Revision: 326265
URL: https://svnweb.freebsd.org/changeset/base/326265
Log:
sys/cam: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
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_pmp.c
head/sys/cam/ata/ata_xpt.c
head/sys/cam/cam.c
head/sys/cam/cam.h
head/sys/cam/cam_ccb.h
head/sys/cam/cam_compat.c
head/sys/cam/cam_compat.h
head/sys/cam/cam_debug.h
head/sys/cam/cam_periph.c
head/sys/cam/cam_periph.h
head/sys/cam/cam_queue.c
head/sys/cam/cam_queue.h
head/sys/cam/cam_sim.c
head/sys/cam/cam_sim.h
head/sys/cam/cam_xpt.c
head/sys/cam/cam_xpt.h
head/sys/cam/cam_xpt_internal.h
head/sys/cam/cam_xpt_periph.h
head/sys/cam/cam_xpt_sim.h
head/sys/cam/ctl/ctl.c
head/sys/cam/ctl/ctl.h
head/sys/cam/ctl/ctl_backend.c
head/sys/cam/ctl/ctl_backend.h
head/sys/cam/ctl/ctl_backend_block.c
head/sys/cam/ctl/ctl_backend_ramdisk.c
head/sys/cam/ctl/ctl_cmd_table.c
head/sys/cam/ctl/ctl_debug.h
head/sys/cam/ctl/ctl_error.c
head/sys/cam/ctl/ctl_error.h
head/sys/cam/ctl/ctl_frontend.c
head/sys/cam/ctl/ctl_frontend.h
head/sys/cam/ctl/ctl_frontend_cam_sim.c
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/cam/ctl/ctl_frontend_iscsi.h
head/sys/cam/ctl/ctl_ha.h
head/sys/cam/ctl/ctl_io.h
head/sys/cam/ctl/ctl_ioctl.h
head/sys/cam/ctl/ctl_private.h
head/sys/cam/ctl/ctl_scsi_all.c
head/sys/cam/ctl/ctl_scsi_all.h
head/sys/cam/ctl/ctl_ser_table.c
head/sys/cam/ctl/ctl_util.c
head/sys/cam/ctl/ctl_util.h
head/sys/cam/ctl/scsi_ctl.c
head/sys/cam/scsi/scsi_all.c
head/sys/cam/scsi/scsi_cd.c
head/sys/cam/scsi/scsi_cd.h
head/sys/cam/scsi/scsi_ch.c
head/sys/cam/scsi/scsi_ch.h
head/sys/cam/scsi/scsi_da.c
head/sys/cam/scsi/scsi_dvcfg.h
head/sys/cam/scsi/scsi_enc.c
head/sys/cam/scsi/scsi_enc_internal.h
head/sys/cam/scsi/scsi_enc_safte.c
head/sys/cam/scsi/scsi_enc_ses.c
head/sys/cam/scsi/scsi_low.c
head/sys/cam/scsi/scsi_low.h
head/sys/cam/scsi/scsi_pass.c
head/sys/cam/scsi/scsi_pass.h
head/sys/cam/scsi/scsi_pt.c
head/sys/cam/scsi/scsi_pt.h
head/sys/cam/scsi/scsi_sa.c
head/sys/cam/scsi/scsi_sa.h
head/sys/cam/scsi/scsi_sg.c
head/sys/cam/scsi/scsi_targ_bh.c
head/sys/cam/scsi/scsi_target.c
head/sys/cam/scsi/scsi_targetio.h
head/sys/cam/scsi/scsi_xpt.c
head/sys/cam/scsi/smp_all.c
head/sys/cam/scsi/smp_all.h
Modified: head/sys/cam/ata/ata_all.c
==============================================================================
--- head/sys/cam/ata/ata_all.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ata/ata_all.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/cam/ata/ata_all.h
==============================================================================
--- head/sys/cam/ata/ata_all.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ata/ata_all.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ata/ata_da.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/cam/ata/ata_pmp.c
==============================================================================
--- head/sys/cam/ata/ata_pmp.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ata/ata_pmp.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ata/ata_xpt.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/cam/cam.c
==============================================================================
--- head/sys/cam/cam.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Generic utility routines for the Common Access Method layer.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam.h
==============================================================================
--- head/sys/cam/cam.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Data structures and definitions for the CAM system.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_ccb.h
==============================================================================
--- head/sys/cam/cam_ccb.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_ccb.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Data structures and definitions for CAM Control Blocks (CCBs).
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_compat.c
==============================================================================
--- head/sys/cam/cam_compat.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_compat.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* CAM ioctl compatibility shims
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Scott Long
* All rights reserved.
*
Modified: head/sys/cam/cam_compat.h
==============================================================================
--- head/sys/cam/cam_compat.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_compat.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* CAM ioctl compatibility shims
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Scott Long
* All rights reserved.
*
Modified: head/sys/cam/cam_debug.h
==============================================================================
--- head/sys/cam/cam_debug.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_debug.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Macros for tracing/loging information in the CAM layer
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_periph.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Common functions for CAM "type" (peripheral) drivers.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999, 2000 Kenneth D. Merry.
* All rights reserved.
Modified: head/sys/cam/cam_periph.h
==============================================================================
--- head/sys/cam/cam_periph.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_periph.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Data structures and definitions for CAM peripheral ("type") drivers.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_queue.c
==============================================================================
--- head/sys/cam/cam_queue.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_queue.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* CAM request queue management functions.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_queue.h
==============================================================================
--- head/sys/cam/cam_queue.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_queue.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* CAM request queue management definitions.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_sim.c
==============================================================================
--- head/sys/cam/cam_sim.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_sim.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Common functions for SCSI Interface Modules (SIMs).
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_sim.h
==============================================================================
--- head/sys/cam/cam_sim.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_sim.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Data structures and definitions for SCSI Interface Modules (SIMs).
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_xpt.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Implementation of the Common Access Method Transport (XPT) layer.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
Modified: head/sys/cam/cam_xpt.h
==============================================================================
--- head/sys/cam/cam_xpt.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_xpt.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -2,6 +2,8 @@
* Data structures and definitions for dealing with the
* Common Access Method Transport (xpt) layer.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_xpt_internal.h
==============================================================================
--- head/sys/cam/cam_xpt_internal.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_xpt_internal.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2009 Scott Long
* All rights reserved.
*
Modified: head/sys/cam/cam_xpt_periph.h
==============================================================================
--- head/sys/cam/cam_xpt_periph.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_xpt_periph.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -3,6 +3,8 @@
* Common Access Method Transport (xpt) layer from peripheral
* drivers.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/cam_xpt_sim.h
==============================================================================
--- head/sys/cam/cam_xpt_sim.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/cam_xpt_sim.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -2,6 +2,8 @@
* Data structures and definitions for dealing with the
* Common Access Method Transport (xpt) layer.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2012 The FreeBSD Foundation
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
Modified: head/sys/cam/ctl/ctl.h
==============================================================================
--- head/sys/cam/ctl/ctl.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_backend.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_backend.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_backend.h
==============================================================================
--- head/sys/cam/ctl/ctl_backend.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_backend.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_block.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_backend_block.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2009-2011 Spectra Logic Corporation
* Copyright (c) 2012 The FreeBSD Foundation
Modified: head/sys/cam/ctl/ctl_backend_ramdisk.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_ramdisk.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_backend_ramdisk.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, 2008 Silicon Graphics International Corp.
* Copyright (c) 2012 The FreeBSD Foundation
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
Modified: head/sys/cam/ctl/ctl_cmd_table.c
==============================================================================
--- head/sys/cam/ctl/ctl_cmd_table.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_cmd_table.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, 2004, 2005, 2009 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_debug.h
==============================================================================
--- head/sys/cam/ctl/ctl_debug.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_debug.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_error.c
==============================================================================
--- head/sys/cam/ctl/ctl_error.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_error.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2011 Spectra Logic Corporation
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
Modified: head/sys/cam/ctl/ctl_error.h
==============================================================================
--- head/sys/cam/ctl/ctl_error.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_error.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_frontend.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_frontend.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_frontend.h
==============================================================================
--- head/sys/cam/ctl/ctl_frontend.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_frontend.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_frontend_cam_sim.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_cam_sim.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_frontend_cam_sim.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Silicon Graphics International Corp.
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_frontend_iscsi.h
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_ha.h
==============================================================================
--- head/sys/cam/ctl/ctl_ha.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_ha.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2009 Silicon Graphics International Corp.
* Copyright (c) 2011 Spectra Logic Corporation
* Copyright (c) 2015 Alexander Motin <mav@FreeBSD.org>
Modified: head/sys/cam/ctl/ctl_io.h
==============================================================================
--- head/sys/cam/ctl/ctl_io.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_io.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_ioctl.h
==============================================================================
--- head/sys/cam/ctl/ctl_ioctl.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_ioctl.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* Copyright (c) 2011 Spectra Logic Corporation
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
Modified: head/sys/cam/ctl/ctl_private.h
==============================================================================
--- head/sys/cam/ctl/ctl_private.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_private.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, 2004, 2005, 2008 Silicon Graphics International Corp.
* Copyright (c) 2014-2017 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_scsi_all.c
==============================================================================
--- head/sys/cam/ctl/ctl_scsi_all.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_scsi_all.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Implementation of Utility functions for all SCSI device types.
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
Modified: head/sys/cam/ctl/ctl_scsi_all.h
==============================================================================
--- head/sys/cam/ctl/ctl_scsi_all.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_scsi_all.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 2003 Kenneth D. Merry.
* All rights reserved.
Modified: head/sys/cam/ctl/ctl_ser_table.c
==============================================================================
--- head/sys/cam/ctl/ctl_ser_table.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_ser_table.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_util.c
==============================================================================
--- head/sys/cam/ctl/ctl_util.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_util.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
*
Modified: head/sys/cam/ctl/ctl_util.h
==============================================================================
--- head/sys/cam/ctl/ctl_util.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/ctl_util.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Silicon Graphics International Corp.
* All rights reserved.
*
Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/ctl/scsi_ctl.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, 2009 Silicon Graphics International Corp.
* Copyright (c) 2014-2015 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_all.c
==============================================================================
--- head/sys/cam/scsi/scsi_all.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_all.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Implementation of Utility functions for all SCSI device types.
*
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_cd.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry.
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_cd.h
==============================================================================
--- head/sys/cam/scsi/scsi_cd.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_cd.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000, 2002 Kenneth D. Merry
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_ch.c
==============================================================================
--- head/sys/cam/scsi/scsi_ch.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_ch.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_ch.h
==============================================================================
--- head/sys/cam/scsi/scsi_ch.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_ch.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -2,6 +2,8 @@
/* $NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_da.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Implementation of SCSI Direct Access Peripheral driver for CAM.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_dvcfg.h
==============================================================================
--- head/sys/cam/scsi/scsi_dvcfg.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_dvcfg.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -3,6 +3,8 @@
/* $NetBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1994, 1995, 1996, 1997, 1998
* NetBSD/pc98 porting staff. All rights reserved.
Modified: head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_enc.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_enc_internal.h
==============================================================================
--- head/sys/cam/scsi/scsi_enc_internal.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_enc_internal.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_enc_safte.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_safte.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_enc_safte.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Matthew Jacob
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_ses.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_enc_ses.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Matthew Jacob
* Copyright (c) 2010 Spectra Logic Corporation
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_low.c
==============================================================================
--- head/sys/cam/scsi/scsi_low.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_low.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -17,6 +17,8 @@ __FBSDID("$FreeBSD$");
#define SCSI_LOW_FLAGS_QUIRKS_OK
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
Modified: head/sys/cam/scsi/scsi_low.h
==============================================================================
--- head/sys/cam/scsi/scsi_low.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_low.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -6,6 +6,8 @@
#define SCSI_LOW_ALT_QTAG_ALLOCATE
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
* NetBSD/pc98 porting staff. All rights reserved.
Modified: head/sys/cam/scsi/scsi_pass.c
==============================================================================
--- head/sys/cam/scsi/scsi_pass.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_pass.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998, 2000 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_pass.h
==============================================================================
--- head/sys/cam/scsi/scsi_pass.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_pass.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1999 Kenneth D. Merry.
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_pt.c
==============================================================================
--- head/sys/cam/scsi/scsi_pt.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_pt.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Implementation of SCSI Processor Target Peripheral driver for CAM.
*
* Copyright (c) 1998 Justin T. Gibbs.
Modified: head/sys/cam/scsi/scsi_pt.h
==============================================================================
--- head/sys/cam/scsi/scsi_pt.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_pt.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Structure and function declarations for Processor type devices.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Justin T. Gibbs
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_sa.c
==============================================================================
--- head/sys/cam/scsi/scsi_sa.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_sa.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Implementation of SCSI Sequential Access Peripheral driver for CAM.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 Matthew Jacob
* Copyright (c) 2013, 2014, 2015 Spectra Logic Corporation
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_sa.h
==============================================================================
--- head/sys/cam/scsi/scsi_sa.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_sa.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -2,6 +2,8 @@
* Structure and function declarations for the
* SCSI Sequential Access Peripheral driver for CAM.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 Matthew Jacob
* Copyright (c) 2013, 2014, 2015 Spectra Logic Corporation
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_sg.c
==============================================================================
--- head/sys/cam/scsi/scsi_sg.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_sg.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Scott Long
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_targ_bh.c
==============================================================================
--- head/sys/cam/scsi/scsi_targ_bh.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_targ_bh.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Implementation of the Target Mode 'Black Hole device' for CAM.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Justin T. Gibbs.
* All rights reserved.
*
Modified: head/sys/cam/scsi/scsi_target.c
==============================================================================
--- head/sys/cam/scsi/scsi_target.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_target.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Generic SCSI Target Kernel Mode Driver
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Nate Lawson.
* Copyright (c) 1998, 1999, 2001, 2002 Justin T. Gibbs.
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_targetio.h
==============================================================================
--- head/sys/cam/scsi/scsi_targetio.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_targetio.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Ioctl definitions for the SCSI Target Driver
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Nate Lawson.
* Copyright (c) 1998 Justin T. Gibbs.
* All rights reserved.
Modified: head/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- head/sys/cam/scsi/scsi_xpt.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/scsi_xpt.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,6 +1,8 @@
/*-
* Implementation of the SCSI Transport
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs.
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
Modified: head/sys/cam/scsi/smp_all.c
==============================================================================
--- head/sys/cam/scsi/smp_all.c Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/smp_all.c Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Spectra Logic Corporation
* All rights reserved.
*
Modified: head/sys/cam/scsi/smp_all.h
==============================================================================
--- head/sys/cam/scsi/smp_all.h Mon Nov 27 15:12:14 2017 (r326264)
+++ head/sys/cam/scsi/smp_all.h Mon Nov 27 15:12:43 2017 (r326265)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Spectra Logic Corporation
* All rights reserved.
*
From owner-svn-src-all@freebsd.org Mon Nov 27 15:13:28 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D07CE541DC;
Mon, 27 Nov 2017 15:13:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 613AE75D86;
Mon, 27 Nov 2017 15:13:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFDRV8001528;
Mon, 27 Nov 2017 15:13:27 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFDNPR001478;
Mon, 27 Nov 2017 15:13:23 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271513.vARFDNPR001478@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:13:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326266 - in head/sys/compat: freebsd32 ia32 linsysfs
linux netbsd
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/compat: freebsd32 ia32 linsysfs linux netbsd
X-SVN-Commit-Revision: 326266
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:13:28 -0000
Author: pfg
Date: Mon Nov 27 15:13:23 2017
New Revision: 326266
URL: https://svnweb.freebsd.org/changeset/base/326266
Log:
sys/compat: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/compat/freebsd32/freebsd32.h
head/sys/compat/freebsd32/freebsd32_capability.c
head/sys/compat/freebsd32/freebsd32_ipc.h
head/sys/compat/freebsd32/freebsd32_misc.c
head/sys/compat/freebsd32/freebsd32_misc.h
head/sys/compat/freebsd32/freebsd32_signal.h
head/sys/compat/freebsd32/freebsd32_util.h
head/sys/compat/ia32/ia32_signal.h
head/sys/compat/ia32/ia32_sysvec.c
head/sys/compat/ia32/ia32_util.h
head/sys/compat/linsysfs/linsysfs.c
head/sys/compat/linux/linux_dtrace.h
head/sys/compat/linux/linux_emul.c
head/sys/compat/linux/linux_emul.h
head/sys/compat/linux/linux_file.c
head/sys/compat/linux/linux_file.h
head/sys/compat/linux/linux_fork.c
head/sys/compat/linux/linux_futex.c
head/sys/compat/linux/linux_futex.h
head/sys/compat/linux/linux_getcwd.c
head/sys/compat/linux/linux_ioctl.c
head/sys/compat/linux/linux_ioctl.h
head/sys/compat/linux/linux_ipc.c
head/sys/compat/linux/linux_ipc.h
head/sys/compat/linux/linux_mib.c
head/sys/compat/linux/linux_mib.h
head/sys/compat/linux/linux_misc.c
head/sys/compat/linux/linux_misc.h
head/sys/compat/linux/linux_signal.c
head/sys/compat/linux/linux_signal.h
head/sys/compat/linux/linux_socket.c
head/sys/compat/linux/linux_socket.h
head/sys/compat/linux/linux_stats.c
head/sys/compat/linux/linux_sysctl.c
head/sys/compat/linux/linux_sysproto.h
head/sys/compat/linux/linux_time.c
head/sys/compat/linux/linux_uid16.c
head/sys/compat/linux/linux_util.c
head/sys/compat/linux/linux_util.h
head/sys/compat/netbsd/dvcfg.h
Modified: head/sys/compat/freebsd32/freebsd32.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/freebsd32/freebsd32.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Doug Rabson
* All rights reserved.
*
Modified: head/sys/compat/freebsd32/freebsd32_capability.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_capability.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/freebsd32/freebsd32_capability.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/compat/freebsd32/freebsd32_ipc.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_ipc.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/freebsd32/freebsd32_ipc.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
*
Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/freebsd32/freebsd32_misc.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
*
Modified: head/sys/compat/freebsd32/freebsd32_misc.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/freebsd32/freebsd32_misc.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/compat/freebsd32/freebsd32_signal.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_signal.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/freebsd32/freebsd32_signal.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 David Xu <davidxu@freebsd.org>
* All rights reserved.
*
Modified: head/sys/compat/freebsd32/freebsd32_util.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_util.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/freebsd32/freebsd32_util.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-1999 Andrew Gallatin
* All rights reserved.
*
Modified: head/sys/compat/ia32/ia32_signal.h
==============================================================================
--- head/sys/compat/ia32/ia32_signal.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/ia32/ia32_signal.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* Copyright (c) 2003 Peter Wemm
* All rights reserved.
Modified: head/sys/compat/ia32/ia32_sysvec.c
==============================================================================
--- head/sys/compat/ia32/ia32_sysvec.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/ia32/ia32_sysvec.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Doug Rabson
* Copyright (c) 2003 Peter Wemm
* All rights reserved.
Modified: head/sys/compat/ia32/ia32_util.h
==============================================================================
--- head/sys/compat/ia32/ia32_util.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/ia32/ia32_util.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998-1999 Andrew Gallatin
* All rights reserved.
*
Modified: head/sys/compat/linsysfs/linsysfs.c
==============================================================================
--- head/sys/compat/linsysfs/linsysfs.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linsysfs/linsysfs.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 IronPort Systems
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_dtrace.h
==============================================================================
--- head/sys/compat/linux/linux_dtrace.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_dtrace.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2012 Alexander Leidinger <netchild@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_emul.c
==============================================================================
--- head/sys/compat/linux/linux_emul.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_emul.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2006 Roman Divacky
* Copyright (c) 2013 Dmitry Chagin
* All rights reserved.
Modified: head/sys/compat/linux/linux_emul.h
==============================================================================
--- head/sys/compat/linux/linux_emul.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_emul.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2006 Roman Divacky
* Copyright (c) 2013 Dmitry Chagin
* All rights reserved.
Modified: head/sys/compat/linux/linux_file.c
==============================================================================
--- head/sys/compat/linux/linux_file.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_file.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_file.h
==============================================================================
--- head/sys/compat/linux/linux_file.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_file.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Roman Divacky
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_fork.c
==============================================================================
--- head/sys/compat/linux/linux_fork.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_fork.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Tim J. Robbins
* Copyright (c) 2002 Doug Rabson
* Copyright (c) 2000 Marcel Moolenaar
Modified: head/sys/compat/linux/linux_futex.c
==============================================================================
--- head/sys/compat/linux/linux_futex.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_futex.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,6 +1,8 @@
/* $NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2009-2016 Dmitry Chagin
* Copyright (c) 2005 Emmanuel Dreyfus
* All rights reserved.
Modified: head/sys/compat/linux/linux_futex.h
==============================================================================
--- head/sys/compat/linux/linux_futex.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_futex.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,6 +1,8 @@
/* $NetBSD: linux_futex.h,v 1.2 2005/12/11 12:20:19 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/compat/linux/linux_getcwd.c
==============================================================================
--- head/sys/compat/linux/linux_getcwd.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_getcwd.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,6 +1,8 @@
/* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */
/* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* Copyright (c) 2015 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_ioctl.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_ioctl.h
==============================================================================
--- head/sys/compat/linux/linux_ioctl.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_ioctl.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_ipc.c
==============================================================================
--- head/sys/compat/linux/linux_ipc.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_ipc.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_ipc.h
==============================================================================
--- head/sys/compat/linux/linux_ipc.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_ipc.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_mib.c
==============================================================================
--- head/sys/compat/linux/linux_mib.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_mib.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_mib.h
==============================================================================
--- head/sys/compat/linux/linux_mib.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_mib.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1999 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_misc.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Doug Rabson
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
Modified: head/sys/compat/linux/linux_misc.h
==============================================================================
--- head/sys/compat/linux/linux_misc.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_misc.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2006 Roman Divacky
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_signal.c
==============================================================================
--- head/sys/compat/linux/linux_signal.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_signal.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_signal.h
==============================================================================
--- head/sys/compat/linux/linux_signal.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_signal.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_socket.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_socket.h
==============================================================================
--- head/sys/compat/linux/linux_socket.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_socket.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2000 Assar Westerlund
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_stats.c
==============================================================================
--- head/sys/compat/linux/linux_stats.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_stats.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994-1995 Søren Schmidt
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_sysctl.c
==============================================================================
--- head/sys/compat/linux/linux_sysctl.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_sysctl.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_sysproto.h
==============================================================================
--- head/sys/compat/linux/linux_sysproto.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_sysproto.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2005 Travis Poppe
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_time.c
==============================================================================
--- head/sys/compat/linux/linux_time.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_time.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,6 +1,8 @@
/* $NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_uid16.c
==============================================================================
--- head/sys/compat/linux/linux_uid16.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_uid16.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 The FreeBSD Project
* All rights reserved.
*
Modified: head/sys/compat/linux/linux_util.c
==============================================================================
--- head/sys/compat/linux/linux_util.c Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_util.c Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
Modified: head/sys/compat/linux/linux_util.h
==============================================================================
--- head/sys/compat/linux/linux_util.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/linux/linux_util.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1994 Christos Zoulas
* Copyright (c) 1995 Frank van der Linden
* Copyright (c) 1995 Scott Bartram
Modified: head/sys/compat/netbsd/dvcfg.h
==============================================================================
--- head/sys/compat/netbsd/dvcfg.h Mon Nov 27 15:12:43 2017 (r326265)
+++ head/sys/compat/netbsd/dvcfg.h Mon Nov 27 15:13:23 2017 (r326266)
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/* $NetBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* [NetBSD for NEC PC98 series]
* Copyright (c) 1996 NetBSD/pc98 porting staff.
* All rights reserved.
From owner-svn-src-all@freebsd.org Mon Nov 27 15:14:48 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93E73E54301;
Mon, 27 Nov 2017 15:14:48 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5EA3175F0D;
Mon, 27 Nov 2017 15:14:48 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFElkE001618;
Mon, 27 Nov 2017 15:14:47 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFElcn001614;
Mon, 27 Nov 2017 15:14:47 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271514.vARFElcn001614@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:14:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326267 - head/sys/ddb
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/sys/ddb
X-SVN-Commit-Revision: 326267
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:14:48 -0000
Author: pfg
Date: Mon Nov 27 15:14:46 2017
New Revision: 326267
URL: https://svnweb.freebsd.org/changeset/base/326267
Log:
sys/ddb: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/ddb/db_capture.c
head/sys/ddb/db_script.c
head/sys/ddb/db_textdump.c
head/sys/ddb/db_thread.c
Modified: head/sys/ddb/db_capture.c
==============================================================================
--- head/sys/ddb/db_capture.c Mon Nov 27 15:13:23 2017 (r326266)
+++ head/sys/ddb/db_capture.c Mon Nov 27 15:14:46 2017 (r326267)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/ddb/db_script.c
==============================================================================
--- head/sys/ddb/db_script.c Mon Nov 27 15:13:23 2017 (r326266)
+++ head/sys/ddb/db_script.c Mon Nov 27 15:14:46 2017 (r326267)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/ddb/db_textdump.c
==============================================================================
--- head/sys/ddb/db_textdump.c Mon Nov 27 15:13:23 2017 (r326266)
+++ head/sys/ddb/db_textdump.c Mon Nov 27 15:14:46 2017 (r326267)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/ddb/db_thread.c
==============================================================================
--- head/sys/ddb/db_thread.c Mon Nov 27 15:13:23 2017 (r326266)
+++ head/sys/ddb/db_thread.c Mon Nov 27 15:14:46 2017 (r326267)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
From owner-svn-src-all@freebsd.org Mon Nov 27 15:15:47 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9825AE54386;
Mon, 27 Nov 2017 15:15:47 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 48EBB76070;
Mon, 27 Nov 2017 15:15:47 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFFk1d001813;
Mon, 27 Nov 2017 15:15:46 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFFb4C001703;
Mon, 27 Nov 2017 15:15:37 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271515.vARFFb4C001703@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:15:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326268 - in head/sys/fs: cd9660 devfs ext2fs msdosfs
nandfs nfs nfsclient nfsserver procfs pseudofs smbfs tmpfs udf
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/fs: cd9660 devfs ext2fs msdosfs nandfs nfs
nfsclient nfsserver procfs pseudofs smbfs tmpfs udf
X-SVN-Commit-Revision: 326268
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:15:47 -0000
Author: pfg
Date: Mon Nov 27 15:15:37 2017
New Revision: 326268
URL: https://svnweb.freebsd.org/changeset/base/326268
Log:
sys/fs: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/fs/cd9660/cd9660_iconv.c
head/sys/fs/devfs/devfs.h
head/sys/fs/devfs/devfs_devs.c
head/sys/fs/devfs/devfs_dir.c
head/sys/fs/devfs/devfs_int.h
head/sys/fs/devfs/devfs_rule.c
head/sys/fs/devfs/devfs_vfsops.c
head/sys/fs/devfs/devfs_vnops.c
head/sys/fs/ext2fs/ext2_dinode.h
head/sys/fs/ext2fs/ext2_dir.h
head/sys/fs/ext2fs/ext2_extents.c
head/sys/fs/ext2fs/ext2_extents.h
head/sys/fs/ext2fs/ext2_hash.c
head/sys/fs/ext2fs/ext2_htree.c
head/sys/fs/ext2fs/ext2fs.h
head/sys/fs/ext2fs/htree.h
head/sys/fs/msdosfs/denode.h
head/sys/fs/msdosfs/direntry.h
head/sys/fs/msdosfs/fat.h
head/sys/fs/msdosfs/msdosfs_conv.c
head/sys/fs/msdosfs/msdosfs_denode.c
head/sys/fs/msdosfs/msdosfs_fat.c
head/sys/fs/msdosfs/msdosfs_iconv.c
head/sys/fs/msdosfs/msdosfs_lookup.c
head/sys/fs/msdosfs/msdosfs_vfsops.c
head/sys/fs/msdosfs/msdosfs_vnops.c
head/sys/fs/msdosfs/msdosfsmount.h
head/sys/fs/nandfs/bmap.c
head/sys/fs/nandfs/bmap.h
head/sys/fs/nandfs/nandfs.h
head/sys/fs/nandfs/nandfs_alloc.c
head/sys/fs/nandfs/nandfs_bmap.c
head/sys/fs/nandfs/nandfs_buffer.c
head/sys/fs/nandfs/nandfs_cleaner.c
head/sys/fs/nandfs/nandfs_cpfile.c
head/sys/fs/nandfs/nandfs_dat.c
head/sys/fs/nandfs/nandfs_dir.c
head/sys/fs/nandfs/nandfs_fs.h
head/sys/fs/nandfs/nandfs_ifile.c
head/sys/fs/nandfs/nandfs_mount.h
head/sys/fs/nandfs/nandfs_segment.c
head/sys/fs/nandfs/nandfs_subr.c
head/sys/fs/nandfs/nandfs_subr.h
head/sys/fs/nandfs/nandfs_sufile.c
head/sys/fs/nandfs/nandfs_vfsops.c
head/sys/fs/nandfs/nandfs_vnops.c
head/sys/fs/nfs/nfs_commonacl.c
head/sys/fs/nfs/nfscl.h
head/sys/fs/nfs/nfsclstate.h
head/sys/fs/nfs/nfsdport.h
head/sys/fs/nfs/nfskpiport.h
head/sys/fs/nfs/nfsrvstate.h
head/sys/fs/nfs/nfsv4_errstr.h
head/sys/fs/nfsclient/nfs_clkdtrace.c
head/sys/fs/nfsclient/nfs_clstate.c
head/sys/fs/nfsclient/nfs_kdtrace.h
head/sys/fs/nfsclient/nlminfo.h
head/sys/fs/nfsserver/nfs_fha_new.c
head/sys/fs/nfsserver/nfs_fha_new.h
head/sys/fs/nfsserver/nfs_nfsdstate.c
head/sys/fs/procfs/procfs_ioctl.c
head/sys/fs/pseudofs/pseudofs.c
head/sys/fs/pseudofs/pseudofs.h
head/sys/fs/pseudofs/pseudofs_fileno.c
head/sys/fs/pseudofs/pseudofs_internal.h
head/sys/fs/pseudofs/pseudofs_vncache.c
head/sys/fs/pseudofs/pseudofs_vnops.c
head/sys/fs/smbfs/smbfs.h
head/sys/fs/smbfs/smbfs_io.c
head/sys/fs/smbfs/smbfs_node.c
head/sys/fs/smbfs/smbfs_node.h
head/sys/fs/smbfs/smbfs_smb.c
head/sys/fs/smbfs/smbfs_subr.c
head/sys/fs/smbfs/smbfs_subr.h
head/sys/fs/smbfs/smbfs_vfsops.c
head/sys/fs/smbfs/smbfs_vnops.c
head/sys/fs/tmpfs/tmpfs.h
head/sys/fs/tmpfs/tmpfs_fifoops.c
head/sys/fs/tmpfs/tmpfs_fifoops.h
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/tmpfs/tmpfs_vfsops.c
head/sys/fs/tmpfs/tmpfs_vnops.c
head/sys/fs/tmpfs/tmpfs_vnops.h
head/sys/fs/udf/ecma167-udf.h
head/sys/fs/udf/udf.h
head/sys/fs/udf/udf_iconv.c
head/sys/fs/udf/udf_mount.h
head/sys/fs/udf/udf_vfsops.c
head/sys/fs/udf/udf_vnops.c
Modified: head/sys/fs/cd9660/cd9660_iconv.c
==============================================================================
--- head/sys/fs/cd9660/cd9660_iconv.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/cd9660/cd9660_iconv.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
*
Modified: head/sys/fs/devfs/devfs.h
==============================================================================
--- head/sys/fs/devfs/devfs.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/devfs/devfs.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2000
Modified: head/sys/fs/devfs/devfs_devs.c
==============================================================================
--- head/sys/fs/devfs/devfs_devs.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/devfs/devfs_devs.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000,2004
* Poul-Henning Kamp. All rights reserved.
*
Modified: head/sys/fs/devfs/devfs_dir.c
==============================================================================
--- head/sys/fs/devfs/devfs_dir.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/devfs/devfs_dir.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Jaakko Heinonen <jh@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/fs/devfs/devfs_int.h
==============================================================================
--- head/sys/fs/devfs/devfs_int.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/devfs/devfs_int.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Poul-Henning Kamp. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/fs/devfs/devfs_rule.c
==============================================================================
--- head/sys/fs/devfs/devfs_rule.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/devfs/devfs_rule.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
*
Modified: head/sys/fs/devfs/devfs_vfsops.c
==============================================================================
--- head/sys/fs/devfs/devfs_vfsops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/devfs/devfs_vfsops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992, 1993, 1995
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2000
Modified: head/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- head/sys/fs/devfs/devfs_vnops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/devfs/devfs_vnops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2004
* Poul-Henning Kamp. All rights reserved.
* Copyright (c) 1989, 1992-1993, 1995
Modified: head/sys/fs/ext2fs/ext2_dinode.h
==============================================================================
--- head/sys/fs/ext2fs/ext2_dinode.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/ext2_dinode.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Aditya Sarawgi
* All rights reserved.
*
Modified: head/sys/fs/ext2fs/ext2_dir.h
==============================================================================
--- head/sys/fs/ext2fs/ext2_dir.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/ext2_dir.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Aditya Sarawgi
* All rights reserved.
*
Modified: head/sys/fs/ext2fs/ext2_extents.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_extents.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/ext2_extents.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Zheng Liu <lz@freebsd.org>
* All rights reserved.
*
Modified: head/sys/fs/ext2fs/ext2_extents.h
==============================================================================
--- head/sys/fs/ext2fs/ext2_extents.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/ext2_extents.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012, 2010 Zheng Liu <lz@freebsd.org>
* All rights reserved.
*
Modified: head/sys/fs/ext2fs/ext2_hash.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_hash.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/ext2_hash.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010, 2013 Zheng Liu <lz@freebsd.org>
* Copyright (c) 2012, Vyacheslav Matyushin
* All rights reserved.
Modified: head/sys/fs/ext2fs/ext2_htree.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_htree.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/ext2_htree.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010, 2012 Zheng Liu <lz@freebsd.org>
* Copyright (c) 2012, Vyacheslav Matyushin
* All rights reserved.
Modified: head/sys/fs/ext2fs/ext2fs.h
==============================================================================
--- head/sys/fs/ext2fs/ext2fs.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/ext2fs.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -7,6 +7,8 @@
* $FreeBSD$
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Aditya Sarawgi
* All rights reserved.
*
Modified: head/sys/fs/ext2fs/htree.h
==============================================================================
--- head/sys/fs/ext2fs/htree.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/ext2fs/htree.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010, 2012 Zheng Liu <lz@freebsd.org>
* Copyright (c) 2012, Vyacheslav Matyushin
* All rights reserved.
Modified: head/sys/fs/msdosfs/denode.h
==============================================================================
--- head/sys/fs/msdosfs/denode.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/denode.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/direntry.h
==============================================================================
--- head/sys/fs/msdosfs/direntry.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/direntry.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/fat.h
==============================================================================
--- head/sys/fs/msdosfs/fat.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/fat.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/msdosfs_conv.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_conv.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfs_conv.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/msdosfs_denode.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_denode.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfs_denode.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/msdosfs_fat.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_fat.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfs_fat.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/msdosfs_iconv.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_iconv.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfs_iconv.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
*
Modified: head/sys/fs/msdosfs/msdosfs_lookup.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_lookup.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfs_lookup.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/msdosfs_vfsops.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_vfsops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfs_vfsops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/msdosfs_vnops.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_vnops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfs_vnops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/msdosfs/msdosfsmount.h
==============================================================================
--- head/sys/fs/msdosfs/msdosfsmount.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/msdosfs/msdosfsmount.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -2,6 +2,8 @@
/* $NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
* Copyright (C) 1994, 1995, 1997 TooLs GmbH.
* All rights reserved.
Modified: head/sys/fs/nandfs/bmap.c
==============================================================================
--- head/sys/fs/nandfs/bmap.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/bmap.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Semihalf
* All rights reserved.
*
Modified: head/sys/fs/nandfs/bmap.h
==============================================================================
--- head/sys/fs/nandfs/bmap.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/bmap.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Semihalf
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs.h
==============================================================================
--- head/sys/fs/nandfs/nandfs.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nandfs/nandfs_alloc.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_alloc.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_alloc.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_bmap.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_bmap.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_bmap.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nandfs/nandfs_buffer.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_buffer.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_buffer.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_cleaner.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_cleaner.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_cleaner.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_cpfile.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_cpfile.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_cpfile.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_dat.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_dat.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_dat.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_dir.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_dir.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_dir.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nandfs/nandfs_fs.h
==============================================================================
--- head/sys/fs/nandfs/nandfs_fs.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_fs.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nandfs/nandfs_ifile.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_ifile.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_ifile.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_mount.h
==============================================================================
--- head/sys/fs/nandfs/nandfs_mount.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_mount.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_segment.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_segment.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_segment.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_subr.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_subr.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_subr.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nandfs/nandfs_subr.h
==============================================================================
--- head/sys/fs/nandfs/nandfs_subr.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_subr.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nandfs/nandfs_sufile.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_sufile.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_sufile.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf.
* All rights reserved.
*
Modified: head/sys/fs/nandfs/nandfs_vfsops.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_vfsops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_vfsops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nandfs/nandfs_vnops.c
==============================================================================
--- head/sys/fs/nandfs/nandfs_vnops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nandfs/nandfs_vnops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2012 Semihalf
* Copyright (c) 2008, 2009 Reinoud Zandijk
* All rights reserved.
Modified: head/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonacl.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfs/nfs_commonacl.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfs/nfscl.h
==============================================================================
--- head/sys/fs/nfs/nfscl.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfs/nfscl.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfs/nfsclstate.h
==============================================================================
--- head/sys/fs/nfs/nfsclstate.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfs/nfsclstate.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfs/nfsdport.h
==============================================================================
--- head/sys/fs/nfs/nfsdport.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfs/nfsdport.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfs/nfskpiport.h
==============================================================================
--- head/sys/fs/nfs/nfskpiport.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfs/nfskpiport.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfs/nfsrvstate.h
==============================================================================
--- head/sys/fs/nfs/nfsrvstate.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfs/nfsrvstate.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfs/nfsv4_errstr.h
==============================================================================
--- head/sys/fs/nfs/nfsv4_errstr.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfs/nfsv4_errstr.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfsclient/nfs_clkdtrace.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clkdtrace.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfsclient/nfs_clkdtrace.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clstate.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfsclient/nfs_clstate.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/nfsclient/nfs_kdtrace.h
==============================================================================
--- head/sys/fs/nfsclient/nfs_kdtrace.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfsclient/nfs_kdtrace.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/fs/nfsclient/nlminfo.h
==============================================================================
--- head/sys/fs/nfsclient/nlminfo.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfsclient/nlminfo.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: head/sys/fs/nfsserver/nfs_fha_new.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_fha_new.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfsserver/nfs_fha_new.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Copyright (c) 2013 Spectra Logic Corporation
*
Modified: head/sys/fs/nfsserver/nfs_fha_new.h
==============================================================================
--- head/sys/fs/nfsserver/nfs_fha_new.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfsserver/nfs_fha_new.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Copyright (c) 2013 Spectra Logic Corporation
*
Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Rick Macklem, University of Guelph
* All rights reserved.
*
Modified: head/sys/fs/procfs/procfs_ioctl.c
==============================================================================
--- head/sys/fs/procfs/procfs_ioctl.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/procfs/procfs_ioctl.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
Modified: head/sys/fs/pseudofs/pseudofs.c
==============================================================================
--- head/sys/fs/pseudofs/pseudofs.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/pseudofs/pseudofs.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
Modified: head/sys/fs/pseudofs/pseudofs.h
==============================================================================
--- head/sys/fs/pseudofs/pseudofs.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/pseudofs/pseudofs.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
Modified: head/sys/fs/pseudofs/pseudofs_fileno.c
==============================================================================
--- head/sys/fs/pseudofs/pseudofs_fileno.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/pseudofs/pseudofs_fileno.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
Modified: head/sys/fs/pseudofs/pseudofs_internal.h
==============================================================================
--- head/sys/fs/pseudofs/pseudofs_internal.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/pseudofs/pseudofs_internal.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
Modified: head/sys/fs/pseudofs/pseudofs_vncache.c
==============================================================================
--- head/sys/fs/pseudofs/pseudofs_vncache.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/pseudofs/pseudofs_vncache.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
Modified: head/sys/fs/pseudofs/pseudofs_vnops.c
==============================================================================
--- head/sys/fs/pseudofs/pseudofs_vnops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/pseudofs/pseudofs_vnops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs.h
==============================================================================
--- head/sys/fs/smbfs/smbfs.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_io.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_io.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_io.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_node.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_node.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_node.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_node.h
==============================================================================
--- head/sys/fs/smbfs/smbfs_node.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_node.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_smb.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_smb.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_smb.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_subr.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_subr.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_subr.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_subr.h
==============================================================================
--- head/sys/fs/smbfs/smbfs_subr.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_subr.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_vfsops.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_vfsops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_vfsops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/smbfs/smbfs_vnops.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_vnops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/smbfs/smbfs_vnops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2001 Boris Popov
* All rights reserved.
*
Modified: head/sys/fs/tmpfs/tmpfs.h
==============================================================================
--- head/sys/fs/tmpfs/tmpfs.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/tmpfs/tmpfs.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,6 +1,8 @@
/* $NetBSD: tmpfs.h,v 1.26 2007/02/22 06:37:00 thorpej Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/fs/tmpfs/tmpfs_fifoops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_fifoops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/tmpfs/tmpfs_fifoops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,6 +1,8 @@
/* $NetBSD: tmpfs_fifoops.c,v 1.5 2005/12/11 12:24:29 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/fs/tmpfs/tmpfs_fifoops.h
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_fifoops.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/tmpfs/tmpfs_fifoops.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,6 +1,8 @@
/* $NetBSD: tmpfs_fifoops.h,v 1.4 2005/12/03 17:34:44 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/tmpfs/tmpfs_subr.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,6 +1,8 @@
/* $NetBSD: tmpfs_subr.c,v 1.35 2007/07/09 21:10:50 ad Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vfsops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/tmpfs/tmpfs_vfsops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,6 +1,8 @@
/* $NetBSD: tmpfs_vfsops.c,v 1.10 2005/12/11 12:24:29 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vnops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,6 +1,8 @@
/* $NetBSD: tmpfs_vnops.c,v 1.39 2007/07/23 15:41:01 jmmv Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/fs/tmpfs/tmpfs_vnops.h
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vnops.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/tmpfs/tmpfs_vnops.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,6 +1,8 @@
/* $NetBSD: tmpfs_vnops.h,v 1.7 2005/12/03 17:34:44 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sys/fs/udf/ecma167-udf.h
==============================================================================
--- head/sys/fs/udf/ecma167-udf.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/udf/ecma167-udf.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
*
Modified: head/sys/fs/udf/udf.h
==============================================================================
--- head/sys/fs/udf/udf.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/udf/udf.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
*
Modified: head/sys/fs/udf/udf_iconv.c
==============================================================================
--- head/sys/fs/udf/udf_iconv.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/udf/udf_iconv.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
*
Modified: head/sys/fs/udf/udf_mount.h
==============================================================================
--- head/sys/fs/udf/udf_mount.h Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/udf/udf_mount.h Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Ryuichiro Imura
* All rights reserved.
*
Modified: head/sys/fs/udf/udf_vfsops.c
==============================================================================
--- head/sys/fs/udf/udf_vfsops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/udf/udf_vfsops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
*
Modified: head/sys/fs/udf/udf_vnops.c
==============================================================================
--- head/sys/fs/udf/udf_vnops.c Mon Nov 27 15:14:46 2017 (r326267)
+++ head/sys/fs/udf/udf_vnops.c Mon Nov 27 15:15:37 2017 (r326268)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
* All rights reserved.
*
From owner-svn-src-all@freebsd.org Mon Nov 27 15:17:01 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D874E5447D;
Mon, 27 Nov 2017 15:17:01 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id EC80E76229;
Mon, 27 Nov 2017 15:17:00 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFGx5q001895;
Mon, 27 Nov 2017 15:16:59 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFGx7h001890;
Mon, 27 Nov 2017 15:16:59 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271516.vARFGx7h001890@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:16:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326269 - head/sys/gdb
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/sys/gdb
X-SVN-Commit-Revision: 326269
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:17:01 -0000
Author: pfg
Date: Mon Nov 27 15:16:59 2017
New Revision: 326269
URL: https://svnweb.freebsd.org/changeset/base/326269
Log:
sys/gdb: further adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/gdb/gdb.h
head/sys/gdb/gdb_cons.c
head/sys/gdb/gdb_int.h
head/sys/gdb/gdb_main.c
head/sys/gdb/gdb_packet.c
Modified: head/sys/gdb/gdb.h
==============================================================================
--- head/sys/gdb/gdb.h Mon Nov 27 15:15:37 2017 (r326268)
+++ head/sys/gdb/gdb.h Mon Nov 27 15:16:59 2017 (r326269)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/gdb/gdb_cons.c
==============================================================================
--- head/sys/gdb/gdb_cons.c Mon Nov 27 15:15:37 2017 (r326268)
+++ head/sys/gdb/gdb_cons.c Mon Nov 27 15:16:59 2017 (r326269)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Sam Leffler
* All rights reserved.
*
Modified: head/sys/gdb/gdb_int.h
==============================================================================
--- head/sys/gdb/gdb_int.h Mon Nov 27 15:15:37 2017 (r326268)
+++ head/sys/gdb/gdb_int.h Mon Nov 27 15:16:59 2017 (r326269)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/gdb/gdb_main.c
==============================================================================
--- head/sys/gdb/gdb_main.c Mon Nov 27 15:15:37 2017 (r326268)
+++ head/sys/gdb/gdb_main.c Mon Nov 27 15:16:59 2017 (r326269)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/gdb/gdb_packet.c
==============================================================================
--- head/sys/gdb/gdb_packet.c Mon Nov 27 15:15:37 2017 (r326268)
+++ head/sys/gdb/gdb_packet.c Mon Nov 27 15:16:59 2017 (r326269)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
*
From owner-svn-src-all@freebsd.org Mon Nov 27 15:17:50 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B97AE5457D;
Mon, 27 Nov 2017 15:17:50 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9CCEA763B9;
Mon, 27 Nov 2017 15:17:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFHmXF002084;
Mon, 27 Nov 2017 15:17:48 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFHb0e001962;
Mon, 27 Nov 2017 15:17:37 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271517.vARFHb0e001962@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:17:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326270 - in head/sys/geom: . bde cache concat eli gate
journal label linux_lvm mirror mountver multipath nop part raid raid3 sched
shsec stripe uzip vinum virstor zero
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/geom: . bde cache concat eli gate journal
label linux_lvm mirror mountver multipath nop part raid raid3 sched shsec
stripe uzip vinum virstor zero
X-SVN-Commit-Revision: 326270
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:17:50 -0000
Author: pfg
Date: Mon Nov 27 15:17:37 2017
New Revision: 326270
URL: https://svnweb.freebsd.org/changeset/base/326270
Log:
sys/geom: adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/geom/bde/g_bde.c
head/sys/geom/bde/g_bde.h
head/sys/geom/bde/g_bde_crypt.c
head/sys/geom/bde/g_bde_lock.c
head/sys/geom/bde/g_bde_work.c
head/sys/geom/cache/g_cache.c
head/sys/geom/cache/g_cache.h
head/sys/geom/concat/g_concat.c
head/sys/geom/concat/g_concat.h
head/sys/geom/eli/g_eli.c
head/sys/geom/eli/g_eli.h
head/sys/geom/eli/g_eli_crypto.c
head/sys/geom/eli/g_eli_ctl.c
head/sys/geom/eli/g_eli_integrity.c
head/sys/geom/eli/g_eli_key.c
head/sys/geom/eli/g_eli_key_cache.c
head/sys/geom/eli/g_eli_privacy.c
head/sys/geom/eli/pkcs5v2.c
head/sys/geom/eli/pkcs5v2.h
head/sys/geom/gate/g_gate.c
head/sys/geom/gate/g_gate.h
head/sys/geom/geom.h
head/sys/geom/geom_aes.c
head/sys/geom/geom_bsd.c
head/sys/geom/geom_bsd_enc.c
head/sys/geom/geom_ccd.c
head/sys/geom/geom_ctl.c
head/sys/geom/geom_ctl.h
head/sys/geom/geom_dev.c
head/sys/geom/geom_disk.c
head/sys/geom/geom_disk.h
head/sys/geom/geom_dump.c
head/sys/geom/geom_event.c
head/sys/geom/geom_flashmap.c
head/sys/geom/geom_fox.c
head/sys/geom/geom_int.h
head/sys/geom/geom_io.c
head/sys/geom/geom_kern.c
head/sys/geom/geom_map.c
head/sys/geom/geom_mbr.c
head/sys/geom/geom_mbr_enc.c
head/sys/geom/geom_redboot.c
head/sys/geom/geom_slice.c
head/sys/geom/geom_slice.h
head/sys/geom/geom_subr.c
head/sys/geom/geom_sunlabel.c
head/sys/geom/geom_sunlabel_enc.c
head/sys/geom/geom_vfs.c
head/sys/geom/geom_vfs.h
head/sys/geom/geom_vol_ffs.c
head/sys/geom/journal/g_journal.c
head/sys/geom/journal/g_journal.h
head/sys/geom/journal/g_journal_ufs.c
head/sys/geom/label/g_label.c
head/sys/geom/label/g_label.h
head/sys/geom/label/g_label_disk_ident.c
head/sys/geom/label/g_label_ext2fs.c
head/sys/geom/label/g_label_gpt.c
head/sys/geom/label/g_label_iso9660.c
head/sys/geom/label/g_label_msdosfs.c
head/sys/geom/label/g_label_msdosfs.h
head/sys/geom/label/g_label_ntfs.c
head/sys/geom/label/g_label_reiserfs.c
head/sys/geom/label/g_label_ufs.c
head/sys/geom/linux_lvm/g_linux_lvm.c
head/sys/geom/linux_lvm/g_linux_lvm.h
head/sys/geom/mirror/g_mirror.c
head/sys/geom/mirror/g_mirror.h
head/sys/geom/mirror/g_mirror_ctl.c
head/sys/geom/mountver/g_mountver.c
head/sys/geom/mountver/g_mountver.h
head/sys/geom/multipath/g_multipath.c
head/sys/geom/multipath/g_multipath.h
head/sys/geom/nop/g_nop.c
head/sys/geom/nop/g_nop.h
head/sys/geom/part/g_part.c
head/sys/geom/part/g_part.h
head/sys/geom/part/g_part_apm.c
head/sys/geom/part/g_part_bsd.c
head/sys/geom/part/g_part_ebr.c
head/sys/geom/part/g_part_gpt.c
head/sys/geom/part/g_part_ldm.c
head/sys/geom/part/g_part_mbr.c
head/sys/geom/part/g_part_vtoc8.c
head/sys/geom/raid/g_raid.c
head/sys/geom/raid/g_raid.h
head/sys/geom/raid/g_raid_ctl.c
head/sys/geom/raid/md_ddf.c
head/sys/geom/raid/md_ddf.h
head/sys/geom/raid/md_intel.c
head/sys/geom/raid/md_jmicron.c
head/sys/geom/raid/md_nvidia.c
head/sys/geom/raid/md_promise.c
head/sys/geom/raid/md_sii.c
head/sys/geom/raid/tr_concat.c
head/sys/geom/raid/tr_raid0.c
head/sys/geom/raid/tr_raid1.c
head/sys/geom/raid/tr_raid1e.c
head/sys/geom/raid/tr_raid5.c
head/sys/geom/raid3/g_raid3.c
head/sys/geom/raid3/g_raid3.h
head/sys/geom/raid3/g_raid3_ctl.c
head/sys/geom/sched/g_sched.c
head/sys/geom/sched/g_sched.h
head/sys/geom/sched/gs_rr.c
head/sys/geom/sched/gs_scheduler.h
head/sys/geom/shsec/g_shsec.c
head/sys/geom/shsec/g_shsec.h
head/sys/geom/stripe/g_stripe.c
head/sys/geom/stripe/g_stripe.h
head/sys/geom/uzip/g_uzip.c
head/sys/geom/vinum/geom_vinum.c
head/sys/geom/vinum/geom_vinum.h
head/sys/geom/vinum/geom_vinum_create.c
head/sys/geom/vinum/geom_vinum_drive.c
head/sys/geom/vinum/geom_vinum_events.c
head/sys/geom/vinum/geom_vinum_init.c
head/sys/geom/vinum/geom_vinum_list.c
head/sys/geom/vinum/geom_vinum_move.c
head/sys/geom/vinum/geom_vinum_plex.c
head/sys/geom/vinum/geom_vinum_raid5.c
head/sys/geom/vinum/geom_vinum_raid5.h
head/sys/geom/vinum/geom_vinum_rename.c
head/sys/geom/vinum/geom_vinum_rm.c
head/sys/geom/vinum/geom_vinum_share.h
head/sys/geom/vinum/geom_vinum_state.c
head/sys/geom/vinum/geom_vinum_volume.c
head/sys/geom/virstor/binstream.c
head/sys/geom/virstor/binstream.h
head/sys/geom/virstor/g_virstor.c
head/sys/geom/virstor/g_virstor.h
head/sys/geom/virstor/g_virstor_md.c
head/sys/geom/virstor/g_virstor_md.h
head/sys/geom/zero/g_zero.c
Modified: head/sys/geom/bde/g_bde.c
==============================================================================
--- head/sys/geom/bde/g_bde.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/bde/g_bde.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/bde/g_bde.h
==============================================================================
--- head/sys/geom/bde/g_bde.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/bde/g_bde.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/bde/g_bde_crypt.c
==============================================================================
--- head/sys/geom/bde/g_bde_crypt.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/bde/g_bde_crypt.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/bde/g_bde_lock.c
==============================================================================
--- head/sys/geom/bde/g_bde_lock.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/bde/g_bde_lock.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/bde/g_bde_work.c
==============================================================================
--- head/sys/geom/bde/g_bde_work.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/bde/g_bde_work.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/cache/g_cache.c
==============================================================================
--- head/sys/geom/cache/g_cache.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/cache/g_cache.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/cache/g_cache.h
==============================================================================
--- head/sys/geom/cache/g_cache.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/cache/g_cache.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/concat/g_concat.c
==============================================================================
--- head/sys/geom/concat/g_concat.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/concat/g_concat.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/concat/g_concat.h
==============================================================================
--- head/sys/geom/concat/g_concat.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/concat/g_concat.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli.c
==============================================================================
--- head/sys/geom/eli/g_eli.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli.h
==============================================================================
--- head/sys/geom/eli/g_eli.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli_crypto.c
==============================================================================
--- head/sys/geom/eli/g_eli_crypto.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli_crypto.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli_ctl.c
==============================================================================
--- head/sys/geom/eli/g_eli_ctl.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli_ctl.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli_integrity.c
==============================================================================
--- head/sys/geom/eli/g_eli_integrity.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli_integrity.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli_key.c
==============================================================================
--- head/sys/geom/eli/g_eli_key.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli_key.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli_key_cache.c
==============================================================================
--- head/sys/geom/eli/g_eli_key_cache.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli_key_cache.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sys/geom/eli/g_eli_privacy.c
==============================================================================
--- head/sys/geom/eli/g_eli_privacy.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/g_eli_privacy.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sys/geom/eli/pkcs5v2.c
==============================================================================
--- head/sys/geom/eli/pkcs5v2.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/pkcs5v2.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/eli/pkcs5v2.h
==============================================================================
--- head/sys/geom/eli/pkcs5v2.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/eli/pkcs5v2.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/gate/g_gate.c
==============================================================================
--- head/sys/geom/gate/g_gate.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/gate/g_gate.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/geom/gate/g_gate.h
==============================================================================
--- head/sys/geom/gate/g_gate.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/gate/g_gate.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/geom.h
==============================================================================
--- head/sys/geom/geom.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_aes.c
==============================================================================
--- head/sys/geom/geom_aes.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_aes.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_bsd.c
==============================================================================
--- head/sys/geom/geom_bsd.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_bsd.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_bsd_enc.c
==============================================================================
--- head/sys/geom/geom_bsd_enc.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_bsd_enc.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_ccd.c
==============================================================================
--- head/sys/geom/geom_ccd.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_ccd.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp.
* Copyright (c) 1995 Jason R. Thorpe.
* Copyright (c) 1990, 1993
Modified: head/sys/geom/geom_ctl.c
==============================================================================
--- head/sys/geom/geom_ctl.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_ctl.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_ctl.h
==============================================================================
--- head/sys/geom/geom_ctl.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_ctl.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/geom/geom_dev.c
==============================================================================
--- head/sys/geom/geom_dev.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_dev.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_disk.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_disk.h
==============================================================================
--- head/sys/geom/geom_disk.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_disk.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/geom/geom_dump.c
==============================================================================
--- head/sys/geom/geom_dump.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_dump.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_event.c
==============================================================================
--- head/sys/geom/geom_event.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_event.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_flashmap.c
==============================================================================
--- head/sys/geom/geom_flashmap.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_flashmap.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Semihalf
* Copyright (c) 2009 Jakub Klama <jakub.klama@uj.edu.pl>
* All rights reserved.
Modified: head/sys/geom/geom_fox.c
==============================================================================
--- head/sys/geom/geom_fox.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_fox.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/geom/geom_int.h
==============================================================================
--- head/sys/geom/geom_int.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_int.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_io.c
==============================================================================
--- head/sys/geom/geom_io.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_io.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* Copyright (c) 2013 The FreeBSD Foundation
Modified: head/sys/geom/geom_kern.c
==============================================================================
--- head/sys/geom/geom_kern.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_kern.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_map.c
==============================================================================
--- head/sys/geom/geom_map.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_map.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2011 Aleksandr Rybalko <ray@dlink.ua>
* based on geom_redboot.c
* Copyright (c) 2009 Sam Leffler, Errno Consulting
Modified: head/sys/geom/geom_mbr.c
==============================================================================
--- head/sys/geom/geom_mbr.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_mbr.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_mbr_enc.c
==============================================================================
--- head/sys/geom/geom_mbr_enc.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_mbr_enc.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/geom/geom_redboot.c
==============================================================================
--- head/sys/geom/geom_redboot.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_redboot.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/geom/geom_slice.c
==============================================================================
--- head/sys/geom/geom_slice.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_slice.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_slice.h
==============================================================================
--- head/sys/geom/geom_slice.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_slice.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_subr.c
==============================================================================
--- head/sys/geom/geom_subr.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_subr.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_sunlabel.c
==============================================================================
--- head/sys/geom/geom_sunlabel.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_sunlabel.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sys/geom/geom_sunlabel_enc.c
==============================================================================
--- head/sys/geom/geom_sunlabel_enc.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_sunlabel_enc.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Jake Burkholder
* Copyright (c) 2003 Poul-Henning Kamp
* Copyright (c) 2004,2005 Joerg Wunsch
Modified: head/sys/geom/geom_vfs.c
==============================================================================
--- head/sys/geom/geom_vfs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_vfs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/geom/geom_vfs.h
==============================================================================
--- head/sys/geom/geom_vfs.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_vfs.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/geom/geom_vol_ffs.c
==============================================================================
--- head/sys/geom/geom_vol_ffs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/geom_vol_ffs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2003 Gordon Tetlow
* All rights reserved.
*
Modified: head/sys/geom/journal/g_journal.c
==============================================================================
--- head/sys/geom/journal/g_journal.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/journal/g_journal.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/journal/g_journal.h
==============================================================================
--- head/sys/geom/journal/g_journal.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/journal/g_journal.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/journal/g_journal_ufs.c
==============================================================================
--- head/sys/geom/journal/g_journal_ufs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/journal/g_journal_ufs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/label/g_label.c
==============================================================================
--- head/sys/geom/label/g_label.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/label/g_label.h
==============================================================================
--- head/sys/geom/label/g_label.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_disk_ident.c
==============================================================================
--- head/sys/geom/label/g_label_disk_ident.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_disk_ident.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Ivan Voras <ivoras@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_ext2fs.c
==============================================================================
--- head/sys/geom/label/g_label_ext2fs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_ext2fs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Stanislav Sedov
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_gpt.c
==============================================================================
--- head/sys/geom/label/g_label_gpt.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_gpt.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marius Nuennerich
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_iso9660.c
==============================================================================
--- head/sys/geom/label/g_label_iso9660.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_iso9660.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_msdosfs.c
==============================================================================
--- head/sys/geom/label/g_label_msdosfs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_msdosfs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* Copyright (c) 2006 Tobias Reifenberger
* All rights reserved.
Modified: head/sys/geom/label/g_label_msdosfs.h
==============================================================================
--- head/sys/geom/label/g_label_msdosfs.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_msdosfs.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Tobias Reifenberger
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_ntfs.c
==============================================================================
--- head/sys/geom/label/g_label_ntfs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_ntfs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Takanori Watanabe
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_reiserfs.c
==============================================================================
--- head/sys/geom/label/g_label_reiserfs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_reiserfs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Stanislav Sedov
* All rights reserved.
*
Modified: head/sys/geom/label/g_label_ufs.c
==============================================================================
--- head/sys/geom/label/g_label_ufs.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/label/g_label_ufs.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2003 Gordon Tetlow
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/linux_lvm/g_linux_lvm.c
==============================================================================
--- head/sys/geom/linux_lvm/g_linux_lvm.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/linux_lvm/g_linux_lvm.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Andrew Thompson <thompsa@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/linux_lvm/g_linux_lvm.h
==============================================================================
--- head/sys/geom/linux_lvm/g_linux_lvm.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/linux_lvm/g_linux_lvm.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Andrew Thompson <thompsa@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/mirror/g_mirror.c
==============================================================================
--- head/sys/geom/mirror/g_mirror.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/mirror/g_mirror.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/mirror/g_mirror.h
==============================================================================
--- head/sys/geom/mirror/g_mirror.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/mirror/g_mirror.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/mirror/g_mirror_ctl.c
==============================================================================
--- head/sys/geom/mirror/g_mirror_ctl.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/mirror/g_mirror_ctl.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/mountver/g_mountver.c
==============================================================================
--- head/sys/geom/mountver/g_mountver.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/mountver/g_mountver.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/mountver/g_mountver.h
==============================================================================
--- head/sys/geom/mountver/g_mountver.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/mountver/g_mountver.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/multipath/g_multipath.c
==============================================================================
--- head/sys/geom/multipath/g_multipath.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/multipath/g_multipath.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2013 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2006-2007 Matthew Jacob <mjacob@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/multipath/g_multipath.h
==============================================================================
--- head/sys/geom/multipath/g_multipath.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/multipath/g_multipath.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006-2007 Matthew Jacob <mjacob@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/nop/g_nop.c
==============================================================================
--- head/sys/geom/nop/g_nop.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/nop/g_nop.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/nop/g_nop.h
==============================================================================
--- head/sys/geom/nop/g_nop.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/nop/g_nop.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/part/g_part.c
==============================================================================
--- head/sys/geom/part/g_part.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2005-2009 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/part/g_part.h
==============================================================================
--- head/sys/geom/part/g_part.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006-2008 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/part/g_part_apm.c
==============================================================================
--- head/sys/geom/part/g_part_apm.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part_apm.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006-2008 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/part/g_part_bsd.c
==============================================================================
--- head/sys/geom/part/g_part_bsd.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part_bsd.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part_ebr.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/part/g_part_gpt.c
==============================================================================
--- head/sys/geom/part/g_part_gpt.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part_gpt.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, 2005-2007, 2011 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/part/g_part_ldm.c
==============================================================================
--- head/sys/geom/part/g_part_ldm.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part_ldm.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Andrey V. Elsukov <ae@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/part/g_part_mbr.c
==============================================================================
--- head/sys/geom/part/g_part_mbr.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part_mbr.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2008 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/part/g_part_vtoc8.c
==============================================================================
--- head/sys/geom/part/g_part_vtoc8.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/part/g_part_vtoc8.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/geom/raid/g_raid.c
==============================================================================
--- head/sys/geom/raid/g_raid.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/g_raid.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/g_raid.h
==============================================================================
--- head/sys/geom/raid/g_raid.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/g_raid.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/g_raid_ctl.c
==============================================================================
--- head/sys/geom/raid/g_raid_ctl.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/g_raid_ctl.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/md_ddf.c
==============================================================================
--- head/sys/geom/raid/md_ddf.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/md_ddf.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/md_ddf.h
==============================================================================
--- head/sys/geom/raid/md_ddf.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/md_ddf.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2008 Scott Long
* All rights reserved.
Modified: head/sys/geom/raid/md_intel.c
==============================================================================
--- head/sys/geom/raid/md_intel.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/md_intel.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/raid/md_jmicron.c
==============================================================================
--- head/sys/geom/raid/md_jmicron.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/md_jmicron.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/raid/md_nvidia.c
==============================================================================
--- head/sys/geom/raid/md_nvidia.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/md_nvidia.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/raid/md_promise.c
==============================================================================
--- head/sys/geom/raid/md_promise.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/md_promise.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/raid/md_sii.c
==============================================================================
--- head/sys/geom/raid/md_sii.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/md_sii.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
* Copyright (c) 2000 - 2008 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
Modified: head/sys/geom/raid/tr_concat.c
==============================================================================
--- head/sys/geom/raid/tr_concat.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/tr_concat.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/tr_raid0.c
==============================================================================
--- head/sys/geom/raid/tr_raid0.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/tr_raid0.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/tr_raid1.c
==============================================================================
--- head/sys/geom/raid/tr_raid1.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/tr_raid1.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/tr_raid1e.c
==============================================================================
--- head/sys/geom/raid/tr_raid1e.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/tr_raid1e.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid/tr_raid5.c
==============================================================================
--- head/sys/geom/raid/tr_raid5.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid/tr_raid5.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid3/g_raid3.c
==============================================================================
--- head/sys/geom/raid3/g_raid3.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid3/g_raid3.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid3/g_raid3.h
==============================================================================
--- head/sys/geom/raid3/g_raid3.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid3/g_raid3.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/raid3/g_raid3_ctl.c
==============================================================================
--- head/sys/geom/raid3/g_raid3_ctl.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/raid3/g_raid3_ctl.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/sched/g_sched.c
==============================================================================
--- head/sys/geom/sched/g_sched.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/sched/g_sched.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 Fabio Checconi
* Copyright (c) 2009-2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
Modified: head/sys/geom/sched/g_sched.h
==============================================================================
--- head/sys/geom/sched/g_sched.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/sched/g_sched.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 Fabio Checconi
* Copyright (c) 2009-2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
Modified: head/sys/geom/sched/gs_rr.c
==============================================================================
--- head/sys/geom/sched/gs_rr.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/sched/gs_rr.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 Fabio Checconi
* Copyright (c) 2009-2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
Modified: head/sys/geom/sched/gs_scheduler.h
==============================================================================
--- head/sys/geom/sched/gs_scheduler.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/sched/gs_scheduler.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 Fabio Checconi
* Copyright (c) 2009-2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
Modified: head/sys/geom/shsec/g_shsec.c
==============================================================================
--- head/sys/geom/shsec/g_shsec.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/shsec/g_shsec.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/shsec/g_shsec.h
==============================================================================
--- head/sys/geom/shsec/g_shsec.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/shsec/g_shsec.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/stripe/g_stripe.c
==============================================================================
--- head/sys/geom/stripe/g_stripe.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/stripe/g_stripe.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/stripe/g_stripe.h
==============================================================================
--- head/sys/geom/stripe/g_stripe.h Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/stripe/g_stripe.h Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/geom/uzip/g_uzip.c
==============================================================================
--- head/sys/geom/uzip/g_uzip.c Mon Nov 27 15:16:59 2017 (r326269)
+++ head/sys/geom/uzip/g_uzip.c Mon Nov 27 15:17:37 2017 (r326270)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Max Khon
* Copyright (c) 2014 Juniper Networks, Inc.
* Copyright (c) 2006-2016 Maxim Sobolev <sobomax@FreeBSD.org>
Modified: head/sys/geom/vinum/geom_vinum.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum.c Mon Nov 27 15:16:59 2017 (r326269)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:20:25 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 969EFE546F2;
Mon, 27 Nov 2017 15:20:25 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 330F5765B0;
Mon, 27 Nov 2017 15:20:25 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFKOsq002351;
Mon, 27 Nov 2017 15:20:24 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFKD0Q002236;
Mon, 27 Nov 2017 15:20:13 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271520.vARFKD0Q002236@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:20:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326271 - in head/sys: kern libkern libkern/arm
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys: kern libkern libkern/arm
X-SVN-Commit-Revision: 326271
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:20:25 -0000
Author: pfg
Date: Mon Nov 27 15:20:12 2017
New Revision: 326271
URL: https://svnweb.freebsd.org/changeset/base/326271
Log:
sys/kern: adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Modified:
head/sys/kern/imgact_aout.c
head/sys/kern/imgact_elf.c
head/sys/kern/imgact_elf32.c
head/sys/kern/imgact_elf64.c
head/sys/kern/imgact_shell.c
head/sys/kern/kern_alq.c
head/sys/kern/kern_clocksource.c
head/sys/kern/kern_condvar.c
head/sys/kern/kern_conf.c
head/sys/kern/kern_context.c
head/sys/kern/kern_cpu.c
head/sys/kern/kern_cpuset.c
head/sys/kern/kern_ctf.c
head/sys/kern/kern_dtrace.c
head/sys/kern/kern_environment.c
head/sys/kern/kern_et.c
head/sys/kern/kern_event.c
head/sys/kern/kern_exec.c
head/sys/kern/kern_fail.c
head/sys/kern/kern_ffclock.c
head/sys/kern/kern_hhook.c
head/sys/kern/kern_idle.c
head/sys/kern/kern_intr.c
head/sys/kern/kern_jail.c
head/sys/kern/kern_khelp.c
head/sys/kern/kern_kthread.c
head/sys/kern/kern_ktr.c
head/sys/kern/kern_linker.c
head/sys/kern/kern_lock.c
head/sys/kern/kern_lockstat.c
head/sys/kern/kern_loginclass.c
head/sys/kern/kern_mbuf.c
head/sys/kern/kern_module.c
head/sys/kern/kern_mtxpool.c
head/sys/kern/kern_mutex.c
head/sys/kern/kern_osd.c
head/sys/kern/kern_physio.c
head/sys/kern/kern_pmc.c
head/sys/kern/kern_poll.c
head/sys/kern/kern_priv.c
head/sys/kern/kern_racct.c
head/sys/kern/kern_rangelock.c
head/sys/kern/kern_rctl.c
head/sys/kern/kern_rwlock.c
head/sys/kern/kern_sdt.c
head/sys/kern/kern_sema.c
head/sys/kern/kern_sharedpage.c
head/sys/kern/kern_switch.c
head/sys/kern/kern_sx.c
head/sys/kern/kern_syscalls.c
head/sys/kern/kern_thr.c
head/sys/kern/kern_thread.c
head/sys/kern/kern_umtx.c
head/sys/kern/kern_uuid.c
head/sys/kern/link_elf.c
head/sys/kern/link_elf_obj.c
head/sys/kern/sched_ule.c
head/sys/kern/subr_acl_nfs4.c
head/sys/kern/subr_acl_posix1e.c
head/sys/kern/subr_bufring.c
head/sys/kern/subr_bus.c
head/sys/kern/subr_bus_dma.c
head/sys/kern/subr_busdma_bufalloc.c
head/sys/kern/subr_capability.c
head/sys/kern/subr_counter.c
head/sys/kern/subr_devstat.c
head/sys/kern/subr_dummy_vdso_tc.c
head/sys/kern/subr_eventhandler.c
head/sys/kern/subr_fattime.c
head/sys/kern/subr_firmware.c
head/sys/kern/subr_hints.c
head/sys/kern/subr_kdb.c
head/sys/kern/subr_kobj.c
head/sys/kern/subr_lock.c
head/sys/kern/subr_module.c
head/sys/kern/subr_msgbuf.c
head/sys/kern/subr_pctrie.c
head/sys/kern/subr_power.c
head/sys/kern/subr_sbuf.c
head/sys/kern/subr_sleepqueue.c
head/sys/kern/subr_smp.c
head/sys/kern/subr_stack.c
head/sys/kern/subr_taskqueue.c
head/sys/kern/subr_terminal.c
head/sys/kern/subr_turnstile.c
head/sys/kern/subr_unit.c
head/sys/kern/subr_vmem.c
head/sys/kern/subr_witness.c
head/sys/kern/sys_capability.c
head/sys/kern/sys_pipe.c
head/sys/kern/sys_procdesc.c
head/sys/kern/sys_process.c
head/sys/kern/sysv_ipc.c
head/sys/kern/sysv_msg.c
head/sys/kern/sysv_sem.c
head/sys/kern/sysv_shm.c
head/sys/kern/tty.c
head/sys/kern/tty_inq.c
head/sys/kern/tty_outq.c
head/sys/kern/tty_pts.c
head/sys/kern/tty_tty.c
head/sys/kern/tty_ttydisc.c
head/sys/kern/uipc_accf.c
head/sys/kern/uipc_debug.c
head/sys/kern/uipc_mqueue.c
head/sys/kern/uipc_sem.c
head/sys/kern/uipc_shm.c
head/sys/kern/vfs_acl.c
head/sys/kern/vfs_aio.c
head/sys/kern/vfs_bio.c
head/sys/kern/vfs_extattr.c
head/sys/kern/vfs_hash.c
head/sys/libkern/arm/aeabi_unwind.c
head/sys/libkern/arm/ldivmod_helper.c
head/sys/libkern/iconv.c
head/sys/libkern/iconv_ucs.c
head/sys/libkern/iconv_xlat.c
head/sys/libkern/iconv_xlat16.c
head/sys/libkern/inet_aton.c
head/sys/libkern/memcchr.c
head/sys/libkern/memmove.c
head/sys/libkern/memset.c
head/sys/libkern/strcspn.c
head/sys/libkern/strdup.c
head/sys/libkern/strlcat.c
head/sys/libkern/strlen.c
head/sys/libkern/strnlen.c
head/sys/libkern/strspn.c
head/sys/libkern/strvalid.c
Modified: head/sys/kern/imgact_aout.c
==============================================================================
--- head/sys/kern/imgact_aout.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/imgact_aout.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1993, David Greenman
* All rights reserved.
*
Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/imgact_elf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2017 Dell EMC
* Copyright (c) 2000 David O'Brien
* Copyright (c) 1995-1996 Søren Schmidt
Modified: head/sys/kern/imgact_elf32.c
==============================================================================
--- head/sys/kern/imgact_elf32.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/imgact_elf32.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/imgact_elf64.c
==============================================================================
--- head/sys/kern/imgact_elf64.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/imgact_elf64.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/imgact_shell.c
==============================================================================
--- head/sys/kern/imgact_shell.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/imgact_shell.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1993, David Greenman
* All rights reserved.
*
Modified: head/sys/kern/kern_alq.c
==============================================================================
--- head/sys/kern/kern_alq.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_alq.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2009-2010, The FreeBSD Foundation
Modified: head/sys/kern/kern_clocksource.c
==============================================================================
--- head/sys/kern/kern_clocksource.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_clocksource.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_condvar.c
==============================================================================
--- head/sys/kern/kern_condvar.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_condvar.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Jake Burkholder <jake@freebsd.org>.
* All rights reserved.
*
Modified: head/sys/kern/kern_conf.c
==============================================================================
--- head/sys/kern/kern_conf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_conf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2002 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/kern/kern_context.c
==============================================================================
--- head/sys/kern/kern_context.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_context.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Daniel M. Eischen <deischen@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_cpu.c
==============================================================================
--- head/sys/kern/kern_cpu.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_cpu.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2007 Nate Lawson (SDG)
* All rights reserved.
*
Modified: head/sys/kern/kern_cpuset.c
==============================================================================
--- head/sys/kern/kern_cpuset.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_cpuset.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_ctf.c
==============================================================================
--- head/sys/kern/kern_ctf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_ctf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 John Birrell <jb@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_dtrace.c
==============================================================================
--- head/sys/kern/kern_dtrace.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_dtrace.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 John Birrell <jb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_environment.c
==============================================================================
--- head/sys/kern/kern_environment.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_environment.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Michael Smith
* All rights reserved.
*
Modified: head/sys/kern/kern_et.c
==============================================================================
--- head/sys/kern/kern_et.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_et.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2013 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_event.c
==============================================================================
--- head/sys/kern/kern_event.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_event.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
* Copyright 2004 John-Mark Gurney <jmg@FreeBSD.org>
* Copyright (c) 2009 Apple, Inc.
Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_exec.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1993, David Greenman
* All rights reserved.
*
Modified: head/sys/kern/kern_fail.c
==============================================================================
--- head/sys/kern/kern_fail.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_fail.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Isilon Inc http://www.isilon.com/
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/kern_ffclock.c
==============================================================================
--- head/sys/kern/kern_ffclock.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_ffclock.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 The University of Melbourne
* All rights reserved.
*
Modified: head/sys/kern/kern_hhook.c
==============================================================================
--- head/sys/kern/kern_hhook.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_hhook.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/kern/kern_idle.c
==============================================================================
--- head/sys/kern/kern_idle.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_idle.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2000-2004 The FreeBSD Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/kern_intr.c
==============================================================================
--- head/sys/kern/kern_intr.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_intr.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997, Stefan Esser <se@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_jail.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Poul-Henning Kamp.
* Copyright (c) 2008 Bjoern A. Zeeb.
* Copyright (c) 2009 James Gritton.
Modified: head/sys/kern/kern_khelp.c
==============================================================================
--- head/sys/kern/kern_khelp.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_khelp.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/kern/kern_kthread.c
==============================================================================
--- head/sys/kern/kern_kthread.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_kthread.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_ktr.c
==============================================================================
--- head/sys/kern/kern_ktr.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_ktr.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_linker.c
==============================================================================
--- head/sys/kern/kern_linker.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_linker.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997-2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_lock.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_lockstat.c
==============================================================================
--- head/sys/kern/kern_lockstat.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_lockstat.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2008-2009 Stacey Son <sson@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/kern_loginclass.c
==============================================================================
--- head/sys/kern/kern_loginclass.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_loginclass.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/kern/kern_mbuf.c
==============================================================================
--- head/sys/kern/kern_mbuf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_mbuf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004, 2005,
* Bosko Milekic <bmilekic@FreeBSD.org>. All rights reserved.
*
Modified: head/sys/kern/kern_module.c
==============================================================================
--- head/sys/kern/kern_module.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_module.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/kern_mtxpool.c
==============================================================================
--- head/sys/kern/kern_mtxpool.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_mtxpool.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Matthew Dillon. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/kern_mutex.c
==============================================================================
--- head/sys/kern/kern_mutex.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_mutex.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/kern_osd.c
==============================================================================
--- head/sys/kern/kern_osd.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_osd.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_physio.c
==============================================================================
--- head/sys/kern/kern_physio.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_physio.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 John S. Dyson
* All rights reserved.
*
Modified: head/sys/kern/kern_pmc.c
==============================================================================
--- head/sys/kern/kern_pmc.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_pmc.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/kern/kern_poll.c
==============================================================================
--- head/sys/kern/kern_poll.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_poll.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001-2002 Luigi Rizzo
*
* Supported by: the Xorp Project (www.xorp.org)
Modified: head/sys/kern/kern_priv.c
==============================================================================
--- head/sys/kern/kern_priv.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_priv.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 nCircle Network Security, Inc.
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_racct.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/kern/kern_rangelock.c
==============================================================================
--- head/sys/kern/kern_rangelock.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_rangelock.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_rctl.c
==============================================================================
--- head/sys/kern/kern_rctl.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_rctl.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/kern/kern_rwlock.c
==============================================================================
--- head/sys/kern/kern_rwlock.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_rwlock.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_sdt.c
==============================================================================
--- head/sys/kern/kern_sdt.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_sdt.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/kern_sema.c
==============================================================================
--- head/sys/kern/kern_sema.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_sema.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2001 Jason Evans <jasone@freebsd.org>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/kern_sharedpage.c
==============================================================================
--- head/sys/kern/kern_sharedpage.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_sharedpage.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010, 2012 Konstantin Belousov <kib@FreeBSD.org>
* Copyright (c) 2015 The FreeBSD Foundation
* All rights reserved.
Modified: head/sys/kern/kern_switch.c
==============================================================================
--- head/sys/kern/kern_switch.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_switch.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_sx.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
* Copyright (c) 2001 Jason Evans <jasone@freebsd.org>
* All rights reserved.
Modified: head/sys/kern/kern_syscalls.c
==============================================================================
--- head/sys/kern/kern_syscalls.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_syscalls.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Assar Westerlund
* All rights reserved.
*
Modified: head/sys/kern/kern_thr.c
==============================================================================
--- head/sys/kern/kern_thr.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_thr.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/kern_thread.c
==============================================================================
--- head/sys/kern/kern_thread.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_thread.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2001 Julian Elischer <julian@freebsd.org>.
* All rights reserved.
*
Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_umtx.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2015, 2016 The FreeBSD Foundation
* Copyright (c) 2004, David Xu <davidxu@freebsd.org>
* Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
Modified: head/sys/kern/kern_uuid.c
==============================================================================
--- head/sys/kern/kern_uuid.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/kern_uuid.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sys/kern/link_elf.c
==============================================================================
--- head/sys/kern/link_elf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/link_elf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998-2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/link_elf_obj.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998-2000 Doug Rabson
* Copyright (c) 2004 Peter Wemm
* All rights reserved.
Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sched_ule.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2007, Jeffrey Roberson <jeff@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_acl_nfs4.c
==============================================================================
--- head/sys/kern/subr_acl_nfs4.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_acl_nfs4.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2010 Edward Tomasz Napierała <trasz@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_acl_posix1e.c
==============================================================================
--- head/sys/kern/subr_acl_posix1e.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_acl_posix1e.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2006 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/kern/subr_bufring.c
==============================================================================
--- head/sys/kern/subr_bufring.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_bufring.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2008 Kip Macy <kmacy@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_bus.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997,1998,2003 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/subr_bus_dma.c
==============================================================================
--- head/sys/kern/subr_bus_dma.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_bus_dma.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 EMC Corp.
* All rights reserved.
*
Modified: head/sys/kern/subr_busdma_bufalloc.c
==============================================================================
--- head/sys/kern/subr_busdma_bufalloc.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_busdma_bufalloc.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Ian Lepore
* All rights reserved.
*
Modified: head/sys/kern/subr_capability.c
==============================================================================
--- head/sys/kern/subr_capability.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_capability.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/kern/subr_counter.c
==============================================================================
--- head/sys/kern/subr_counter.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_counter.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_devstat.c
==============================================================================
--- head/sys/kern/subr_devstat.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_devstat.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
* All rights reserved.
*
Modified: head/sys/kern/subr_dummy_vdso_tc.c
==============================================================================
--- head/sys/kern/subr_dummy_vdso_tc.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_dummy_vdso_tc.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
* All rights reserved.
*
Modified: head/sys/kern/subr_eventhandler.c
==============================================================================
--- head/sys/kern/subr_eventhandler.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_eventhandler.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_fattime.c
==============================================================================
--- head/sys/kern/subr_fattime.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_fattime.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/kern/subr_firmware.c
==============================================================================
--- head/sys/kern/subr_firmware.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_firmware.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008, Sam Leffler <sam@errno.com>
* All rights reserved.
*
Modified: head/sys/kern/subr_hints.c
==============================================================================
--- head/sys/kern/subr_hints.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_hints.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000,2001 Peter Wemm <peter@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_kdb.c
==============================================================================
--- head/sys/kern/subr_kdb.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_kdb.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 The FreeBSD Project
* All rights reserved.
*
Modified: head/sys/kern/subr_kobj.c
==============================================================================
--- head/sys/kern/subr_kobj.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_kobj.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000,2003 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/subr_lock.c
==============================================================================
--- head/sys/kern/subr_lock.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_lock.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_module.c
==============================================================================
--- head/sys/kern/subr_module.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_module.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Michael Smith
* All rights reserved.
*
Modified: head/sys/kern/subr_msgbuf.c
==============================================================================
--- head/sys/kern/subr_msgbuf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_msgbuf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Ian Dowse. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/subr_pctrie.c
==============================================================================
--- head/sys/kern/subr_pctrie.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_pctrie.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 EMC Corp.
* Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
Modified: head/sys/kern/subr_power.c
==============================================================================
--- head/sys/kern/subr_power.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_power.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Mitsuru IWASAKI
* All rights reserved.
*
Modified: head/sys/kern/subr_sbuf.c
==============================================================================
--- head/sys/kern/subr_sbuf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_sbuf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2008 Poul-Henning Kamp
* Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
* All rights reserved.
Modified: head/sys/kern/subr_sleepqueue.c
==============================================================================
--- head/sys/kern/subr_sleepqueue.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_sleepqueue.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 John Baldwin <jhb@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/subr_smp.c
==============================================================================
--- head/sys/kern/subr_smp.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_smp.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, John Baldwin <jhb@FreeBSD.org>.
* All rights reserved.
*
Modified: head/sys/kern/subr_stack.c
==============================================================================
--- head/sys/kern/subr_stack.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_stack.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Antoine Brodin
* All rights reserved.
*
Modified: head/sys/kern/subr_taskqueue.c
==============================================================================
--- head/sys/kern/subr_taskqueue.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_taskqueue.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kern/subr_terminal.c
==============================================================================
--- head/sys/kern/subr_terminal.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_terminal.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/kern/subr_turnstile.c
==============================================================================
--- head/sys/kern/subr_turnstile.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_turnstile.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/subr_unit.c
==============================================================================
--- head/sys/kern/subr_unit.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_unit.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Poul-Henning Kamp
* All rights reserved.
*
Modified: head/sys/kern/subr_vmem.c
==============================================================================
--- head/sys/kern/subr_vmem.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_vmem.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
* Copyright (c) 2013 EMC Corp.
* All rights reserved.
Modified: head/sys/kern/subr_witness.c
==============================================================================
--- head/sys/kern/subr_witness.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/subr_witness.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2008 Isilon Systems, Inc.
* Copyright (c) 2008 Ilya Maykov <ivmaykov@gmail.com>
* Copyright (c) 1998 Berkeley Software Design, Inc.
Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sys_capability.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008-2011 Robert N. M. Watson
* Copyright (c) 2010-2011 Jonathan Anderson
* Copyright (c) 2012 FreeBSD Foundation
Modified: head/sys/kern/sys_pipe.c
==============================================================================
--- head/sys/kern/sys_pipe.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sys_pipe.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1996 John S. Dyson
* Copyright (c) 2012 Giovanni Trematerra
* All rights reserved.
Modified: head/sys/kern/sys_procdesc.c
==============================================================================
--- head/sys/kern/sys_procdesc.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sys_procdesc.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009, 2016 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/kern/sys_process.c
==============================================================================
--- head/sys/kern/sys_process.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sys_process.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994, Sean Eric Fagan
* All rights reserved.
*
Modified: head/sys/kern/sysv_ipc.c
==============================================================================
--- head/sys/kern/sysv_ipc.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sysv_ipc.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,5 +1,7 @@
/* $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
* Copyright (c) 2006 nCircle Network Security, Inc.
* All rights reserved.
Modified: head/sys/kern/sysv_msg.c
==============================================================================
--- head/sys/kern/sysv_msg.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sysv_msg.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -17,6 +17,8 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2005 McAfee, Inc.
* Copyright (c) 2016-2017 Robert N. M. Watson
* All rights reserved.
Modified: head/sys/kern/sysv_sem.c
==============================================================================
--- head/sys/kern/sysv_sem.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sysv_sem.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -6,6 +6,8 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2005 McAfee, Inc.
* Copyright (c) 2016-2017 Robert N. M. Watson
* All rights reserved.
Modified: head/sys/kern/sysv_shm.c
==============================================================================
--- head/sys/kern/sysv_shm.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/sysv_shm.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,5 +1,7 @@
/* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1994 Adam Glass and Charles Hannum. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/tty.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/tty_inq.c
==============================================================================
--- head/sys/kern/tty_inq.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/tty_inq.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/tty_outq.c
==============================================================================
--- head/sys/kern/tty_outq.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/tty_outq.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/tty_pts.c
==============================================================================
--- head/sys/kern/tty_pts.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/tty_pts.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/tty_tty.c
==============================================================================
--- head/sys/kern/tty_tty.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/tty_tty.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003 Poul-Henning Kamp. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/tty_ttydisc.c
==============================================================================
--- head/sys/kern/tty_ttydisc.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/tty_ttydisc.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/kern/uipc_accf.c
==============================================================================
--- head/sys/kern/uipc_accf.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/uipc_accf.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Paycounter, Inc.
* Copyright (c) 2005 Robert N. M. Watson
* Author: Alfred Perlstein <alfred@paycounter.com>, <alfred@FreeBSD.org>
Modified: head/sys/kern/uipc_debug.c
==============================================================================
--- head/sys/kern/uipc_debug.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/uipc_debug.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/kern/uipc_mqueue.c
==============================================================================
--- head/sys/kern/uipc_mqueue.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/uipc_mqueue.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 David Xu <davidxu@freebsd.org>
* Copyright (c) 2016-2017 Robert N. M. Watson
* All rights reserved.
Modified: head/sys/kern/uipc_sem.c
==============================================================================
--- head/sys/kern/uipc_sem.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/uipc_sem.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org>
* Copyright (c) 2003-2005 SPARTA, Inc.
* Copyright (c) 2005, 2016-2017 Robert N. M. Watson
Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/uipc_shm.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006, 2011, 2016-2017 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/kern/vfs_acl.c
==============================================================================
--- head/sys/kern/vfs_acl.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/vfs_acl.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2006, 2016-2017 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/kern/vfs_aio.c
==============================================================================
--- head/sys/kern/vfs_aio.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/vfs_aio.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 John S. Dyson. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/vfs_bio.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Poul-Henning Kamp
* Copyright (c) 1994,1997 John S. Dyson
* Copyright (c) 2013 The FreeBSD Foundation
Modified: head/sys/kern/vfs_extattr.c
==============================================================================
--- head/sys/kern/vfs_extattr.c Mon Nov 27 15:17:37 2017 (r326270)
+++ head/sys/kern/vfs_extattr.c Mon Nov 27 15:20:12 2017 (r326271)
@@ -1,4 +1,6 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:23:30 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2120EE54AA0;
Mon, 27 Nov 2017 15:23:30 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8B93076C63;
Mon, 27 Nov 2017 15:23:29 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFNSsh006454;
Mon, 27 Nov 2017 15:23:28 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFNIt1006341;
Mon, 27 Nov 2017 15:23:18 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271523.vARFNIt1006341@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:23:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326272 - in head/sys: isa modules/dtrace/dtraceall net
net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu
netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/commo...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys: isa modules/dtrace/dtraceall net net80211
netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu
netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common
netgraph/bluetooth/driv...
X-SVN-Commit-Revision: 326272
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:23:30 -0000
Author: pfg
Date: Mon Nov 27 15:23:17 2017
New Revision: 326272
URL: https://svnweb.freebsd.org/changeset/base/326272
Log:
sys: general adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
No functional change intended.
Modified:
head/sys/isa/isa_common.c
head/sys/isa/isa_common.h
head/sys/isa/isa_dmareg.h
head/sys/isa/isahint.c
head/sys/isa/isavar.h
head/sys/isa/pnp.c
head/sys/isa/pnpparse.c
head/sys/isa/pnpvar.h
head/sys/isa/syscons_isa.c
head/sys/isa/vga_isa.c
head/sys/modules/dtrace/dtraceall/dtraceall.c
head/sys/net/bpf_buffer.h
head/sys/net/bpf_zerocopy.c
head/sys/net/bpf_zerocopy.h
head/sys/net/bridgestp.c
head/sys/net/bridgestp.h
head/sys/net/firewire.h
head/sys/net/ieee8023ad_lacp.c
head/sys/net/ieee8023ad_lacp.h
head/sys/net/ieee_oui.h
head/sys/net/if_bridge.c
head/sys/net/if_bridgevar.h
head/sys/net/if_dead.c
head/sys/net/if_debug.c
head/sys/net/if_enc.c
head/sys/net/if_enc.h
head/sys/net/if_epair.c
head/sys/net/if_gre.c
head/sys/net/if_gre.h
head/sys/net/if_iso88025subr.c
head/sys/net/if_llatbl.c
head/sys/net/if_llatbl.h
head/sys/net/if_media.c
head/sys/net/if_media.h
head/sys/net/if_pflog.h
head/sys/net/if_pfsync.h
head/sys/net/if_tap.c
head/sys/net/if_tap.h
head/sys/net/if_tapvar.h
head/sys/net/iso88025.h
head/sys/net/netisr.c
head/sys/net/netisr.h
head/sys/net/netisr_internal.h
head/sys/net/netmap.h
head/sys/net/netmap_user.h
head/sys/net/pfil.c
head/sys/net/pfil.h
head/sys/net/pfvar.h
head/sys/net/sff8472.h
head/sys/net/vnet.c
head/sys/net/vnet.h
head/sys/net80211/_ieee80211.h
head/sys/net80211/ieee80211.c
head/sys/net80211/ieee80211.h
head/sys/net80211/ieee80211_acl.c
head/sys/net80211/ieee80211_action.c
head/sys/net80211/ieee80211_action.h
head/sys/net80211/ieee80211_adhoc.c
head/sys/net80211/ieee80211_adhoc.h
head/sys/net80211/ieee80211_ageq.c
head/sys/net80211/ieee80211_ageq.h
head/sys/net80211/ieee80211_alq.c
head/sys/net80211/ieee80211_alq.h
head/sys/net80211/ieee80211_crypto.c
head/sys/net80211/ieee80211_crypto.h
head/sys/net80211/ieee80211_crypto_ccmp.c
head/sys/net80211/ieee80211_crypto_none.c
head/sys/net80211/ieee80211_crypto_tkip.c
head/sys/net80211/ieee80211_crypto_wep.c
head/sys/net80211/ieee80211_ddb.c
head/sys/net80211/ieee80211_dfs.c
head/sys/net80211/ieee80211_dfs.h
head/sys/net80211/ieee80211_freebsd.c
head/sys/net80211/ieee80211_freebsd.h
head/sys/net80211/ieee80211_hostap.c
head/sys/net80211/ieee80211_hostap.h
head/sys/net80211/ieee80211_ht.c
head/sys/net80211/ieee80211_ht.h
head/sys/net80211/ieee80211_hwmp.c
head/sys/net80211/ieee80211_input.c
head/sys/net80211/ieee80211_input.h
head/sys/net80211/ieee80211_ioctl.c
head/sys/net80211/ieee80211_ioctl.h
head/sys/net80211/ieee80211_mesh.c
head/sys/net80211/ieee80211_mesh.h
head/sys/net80211/ieee80211_monitor.c
head/sys/net80211/ieee80211_monitor.h
head/sys/net80211/ieee80211_node.c
head/sys/net80211/ieee80211_node.h
head/sys/net80211/ieee80211_output.c
head/sys/net80211/ieee80211_phy.c
head/sys/net80211/ieee80211_phy.h
head/sys/net80211/ieee80211_power.c
head/sys/net80211/ieee80211_power.h
head/sys/net80211/ieee80211_proto.c
head/sys/net80211/ieee80211_proto.h
head/sys/net80211/ieee80211_radiotap.c
head/sys/net80211/ieee80211_radiotap.h
head/sys/net80211/ieee80211_ratectl.c
head/sys/net80211/ieee80211_ratectl.h
head/sys/net80211/ieee80211_ratectl_none.c
head/sys/net80211/ieee80211_regdomain.c
head/sys/net80211/ieee80211_regdomain.h
head/sys/net80211/ieee80211_rssadapt.c
head/sys/net80211/ieee80211_rssadapt.h
head/sys/net80211/ieee80211_scan.c
head/sys/net80211/ieee80211_scan.h
head/sys/net80211/ieee80211_scan_sta.c
head/sys/net80211/ieee80211_sta.c
head/sys/net80211/ieee80211_sta.h
head/sys/net80211/ieee80211_superg.c
head/sys/net80211/ieee80211_superg.h
head/sys/net80211/ieee80211_tdma.c
head/sys/net80211/ieee80211_tdma.h
head/sys/net80211/ieee80211_var.h
head/sys/net80211/ieee80211_wds.c
head/sys/net80211/ieee80211_wds.h
head/sys/net80211/ieee80211_xauth.c
head/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
head/sys/netgraph/atm/ng_sscfu.h
head/sys/netgraph/atm/ng_sscop.h
head/sys/netgraph/atm/ng_uni.h
head/sys/netgraph/atm/ngatmbase.c
head/sys/netgraph/atm/sscfu/ng_sscfu.c
head/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
head/sys/netgraph/atm/sscop/ng_sscop_cust.h
head/sys/netgraph/atm/uni/ng_uni.c
head/sys/netgraph/atm/uni/ng_uni_cust.h
head/sys/netgraph/bluetooth/common/ng_bluetooth.c
head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
head/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h
head/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h
head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
head/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
head/sys/netgraph/bluetooth/hci/ng_hci_cmds.h
head/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
head/sys/netgraph/bluetooth/hci/ng_hci_evnt.h
head/sys/netgraph/bluetooth/hci/ng_hci_main.c
head/sys/netgraph/bluetooth/hci/ng_hci_misc.c
head/sys/netgraph/bluetooth/hci/ng_hci_misc.h
head/sys/netgraph/bluetooth/hci/ng_hci_prse.h
head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h
head/sys/netgraph/bluetooth/hci/ng_hci_var.h
head/sys/netgraph/bluetooth/include/ng_bluetooth.h
head/sys/netgraph/bluetooth/include/ng_bt3c.h
head/sys/netgraph/bluetooth/include/ng_btsocket.h
head/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
head/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
head/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
head/sys/netgraph/bluetooth/include/ng_btsocket_sco.h
head/sys/netgraph/bluetooth/include/ng_h4.h
head/sys/netgraph/bluetooth/include/ng_hci.h
head/sys/netgraph/bluetooth/include/ng_l2cap.h
head/sys/netgraph/bluetooth/include/ng_ubt.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
head/sys/netgraph/bluetooth/socket/ng_btsocket.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
head/sys/netgraph/netflow/netflow.c
head/sys/netgraph/netflow/netflow.h
head/sys/netgraph/netflow/netflow_v9.c
head/sys/netgraph/netflow/netflow_v9.h
head/sys/netgraph/netflow/ng_netflow.c
head/sys/netgraph/netflow/ng_netflow.h
head/sys/netgraph/ng_atmllc.c
head/sys/netgraph/ng_atmllc.h
head/sys/netgraph/ng_car.c
head/sys/netgraph/ng_car.h
head/sys/netgraph/ng_deflate.c
head/sys/netgraph/ng_deflate.h
head/sys/netgraph/ng_device.c
head/sys/netgraph/ng_device.h
head/sys/netgraph/ng_eiface.c
head/sys/netgraph/ng_eiface.h
head/sys/netgraph/ng_etf.c
head/sys/netgraph/ng_etf.h
head/sys/netgraph/ng_gif.c
head/sys/netgraph/ng_gif.h
head/sys/netgraph/ng_gif_demux.c
head/sys/netgraph/ng_gif_demux.h
head/sys/netgraph/ng_hub.c
head/sys/netgraph/ng_hub.h
head/sys/netgraph/ng_ip_input.c
head/sys/netgraph/ng_ip_input.h
head/sys/netgraph/ng_ipfw.c
head/sys/netgraph/ng_ipfw.h
head/sys/netgraph/ng_nat.c
head/sys/netgraph/ng_nat.h
head/sys/netgraph/ng_patch.c
head/sys/netgraph/ng_patch.h
head/sys/netgraph/ng_pipe.c
head/sys/netgraph/ng_pipe.h
head/sys/netgraph/ng_ppp.c
head/sys/netgraph/ng_pred1.c
head/sys/netgraph/ng_pred1.h
head/sys/netgraph/ng_split.c
head/sys/netgraph/ng_split.h
head/sys/netgraph/ng_tag.c
head/sys/netgraph/ng_tag.h
head/sys/netgraph/ng_tcpmss.c
head/sys/netgraph/ng_tcpmss.h
head/sys/netgraph/ng_vlan.c
head/sys/netgraph/ng_vlan.h
head/sys/netinet/accf_data.c
head/sys/netinet/accf_dns.c
head/sys/netinet/accf_http.c
head/sys/netinet/cc/cc.c
head/sys/netinet/cc/cc_cdg.c
head/sys/netinet/cc/cc_chd.c
head/sys/netinet/cc/cc_cubic.c
head/sys/netinet/cc/cc_cubic.h
head/sys/netinet/cc/cc_hd.c
head/sys/netinet/cc/cc_htcp.c
head/sys/netinet/cc/cc_module.h
head/sys/netinet/cc/cc_newreno.c
head/sys/netinet/cc/cc_vegas.c
head/sys/netinet/in_debug.c
head/sys/netinet/in_kdtrace.c
head/sys/netinet/in_kdtrace.h
head/sys/netinet/in_mcast.c
head/sys/netinet/in_pcbgroup.c
head/sys/netinet/ip_carp.c
head/sys/netinet/ip_carp.h
head/sys/netinet/ip_divert.h
head/sys/netinet/ip_dummynet.h
head/sys/netinet/ip_fastfwd.c
head/sys/netinet/ip_fw.h
head/sys/netinet/ip_gre.c
head/sys/netinet/ip_id.c
head/sys/netinet/khelp/h_ertt.c
head/sys/netinet/khelp/h_ertt.h
head/sys/netinet/libalias/alias.c
head/sys/netinet/libalias/alias.h
head/sys/netinet/libalias/alias_cuseeme.c
head/sys/netinet/libalias/alias_db.c
head/sys/netinet/libalias/alias_dummy.c
head/sys/netinet/libalias/alias_ftp.c
head/sys/netinet/libalias/alias_irc.c
head/sys/netinet/libalias/alias_local.h
head/sys/netinet/libalias/alias_mod.c
head/sys/netinet/libalias/alias_mod.h
head/sys/netinet/libalias/alias_nbt.c
head/sys/netinet/libalias/alias_proxy.c
head/sys/netinet/libalias/alias_sctp.c
head/sys/netinet/libalias/alias_sctp.h
head/sys/netinet/libalias/alias_skinny.c
head/sys/netinet/libalias/alias_smedia.c
head/sys/netinet/libalias/alias_util.c
head/sys/netinet/siftr.c
head/sys/netinet/tcp_hostcache.c
head/sys/netinet/tcp_hostcache.h
head/sys/netinet/tcp_lro.c
head/sys/netinet/tcp_lro.h
head/sys/netinet/tcp_offload.c
head/sys/netinet/tcp_offload.h
head/sys/netinet/tcp_syncache.c
head/sys/netinet/toecore.c
head/sys/netinet/toecore.h
head/sys/netinet6/in6_mcast.c
head/sys/netinet6/in6_pcbgroup.c
head/sys/netinet6/mld6.h
head/sys/netinet6/mld6_var.h
head/sys/netinet6/send.c
head/sys/netinet6/send.h
head/sys/netipsec/ipsec_mbuf.c
head/sys/netipsec/ipsec_output.c
head/sys/netipsec/xform_ipcomp.c
head/sys/netipsec/xform_tcp.c
head/sys/netpfil/ipfw/dn_heap.c
head/sys/netpfil/ipfw/dn_heap.h
head/sys/netpfil/ipfw/dn_sched.h
head/sys/netpfil/ipfw/dn_sched_fifo.c
head/sys/netpfil/ipfw/dn_sched_prio.c
head/sys/netpfil/ipfw/dn_sched_qfq.c
head/sys/netpfil/ipfw/dn_sched_rr.c
head/sys/netpfil/ipfw/dn_sched_wf2q.c
head/sys/netpfil/ipfw/ip_dn_glue.c
head/sys/netpfil/ipfw/ip_dn_io.c
head/sys/netpfil/ipfw/ip_dn_private.h
head/sys/netpfil/ipfw/ip_dummynet.c
head/sys/netpfil/ipfw/ip_fw2.c
head/sys/netpfil/ipfw/ip_fw_dynamic.c
head/sys/netpfil/ipfw/ip_fw_log.c
head/sys/netpfil/ipfw/ip_fw_nat.c
head/sys/netpfil/ipfw/ip_fw_pfil.c
head/sys/netpfil/ipfw/ip_fw_private.h
head/sys/netpfil/ipfw/ip_fw_sockopt.c
head/sys/netpfil/ipfw/ip_fw_table.c
head/sys/netpfil/ipfw/test/test_dn_heap.c
head/sys/netpfil/pf/if_pfsync.c
head/sys/netpfil/pf/pf.c
head/sys/netpfil/pf/pf.h
head/sys/netpfil/pf/pf_altq.h
head/sys/netpfil/pf/pf_if.c
head/sys/netpfil/pf/pf_ioctl.c
head/sys/netpfil/pf/pf_lb.c
head/sys/netpfil/pf/pf_mtag.h
head/sys/netpfil/pf/pf_norm.c
head/sys/netpfil/pf/pf_ruleset.c
head/sys/netpfil/pf/pf_table.c
head/sys/netsmb/netbios.h
head/sys/netsmb/smb.h
head/sys/netsmb/smb_conn.c
head/sys/netsmb/smb_conn.h
head/sys/netsmb/smb_dev.c
head/sys/netsmb/smb_dev.h
head/sys/netsmb/smb_iod.c
head/sys/netsmb/smb_rq.c
head/sys/netsmb/smb_rq.h
head/sys/netsmb/smb_smb.c
head/sys/netsmb/smb_subr.c
head/sys/netsmb/smb_subr.h
head/sys/netsmb/smb_tran.h
head/sys/netsmb/smb_trantcp.c
head/sys/netsmb/smb_trantcp.h
head/sys/netsmb/smb_usr.c
head/sys/nfs/nfs_fha.c
head/sys/nfs/nfs_fha.h
head/sys/nfs/nfs_kdtrace.h
head/sys/nfs/nfs_lock.c
head/sys/nfs/nfs_lock.h
head/sys/nfs/nfs_mountcommon.h
head/sys/nfsclient/nlminfo.h
head/sys/nfsserver/nfs_fha_old.h
head/sys/nlm/nlm.h
head/sys/nlm/nlm_advlock.c
head/sys/nlm/nlm_prot_impl.c
head/sys/nlm/nlm_prot_server.c
head/sys/nlm/nlm_prot_svc.c
head/sys/ofed/drivers/infiniband/core/agent.h
head/sys/ofed/drivers/infiniband/core/core_priv.h
head/sys/ofed/drivers/infiniband/core/iwcm.h
head/sys/ofed/drivers/infiniband/core/mad_priv.h
head/sys/ofed/drivers/infiniband/core/mad_rmpp.h
head/sys/ofed/drivers/infiniband/core/sa.h
head/sys/ofed/drivers/infiniband/core/smi.h
head/sys/ofed/drivers/infiniband/core/uverbs.h
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_proc.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_zcopy.c
head/sys/ofed/drivers/infiniband/util/madeye.c
head/sys/ofed/include/rdma/ib_addr.h
head/sys/ofed/include/rdma/ib_cache.h
head/sys/ofed/include/rdma/ib_cm.h
head/sys/ofed/include/rdma/ib_fmr_pool.h
head/sys/ofed/include/rdma/ib_mad.h
head/sys/ofed/include/rdma/ib_marshall.h
head/sys/ofed/include/rdma/ib_pack.h
head/sys/ofed/include/rdma/ib_pma.h
head/sys/ofed/include/rdma/ib_sa.h
head/sys/ofed/include/rdma/ib_smi.h
head/sys/ofed/include/rdma/ib_umem.h
head/sys/ofed/include/rdma/ib_verbs.h
head/sys/ofed/include/rdma/iw_cm.h
head/sys/ofed/include/rdma/rdma_cm.h
head/sys/ofed/include/rdma/rdma_cm_ib.h
head/sys/rpc/clnt_rc.c
head/sys/rpc/getnetconfig.c
head/sys/rpc/replay.c
head/sys/rpc/replay.h
head/sys/rpc/rpcsec_gss.h
head/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c
head/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c
head/sys/teken/demo/teken_demo.c
head/sys/teken/stress/teken_stress.c
head/sys/teken/teken.c
head/sys/teken/teken.h
head/sys/teken/teken_scs.h
head/sys/teken/teken_subr.h
head/sys/teken/teken_subr_compat.h
head/sys/tools/acpi_quirks2h.awk
head/sys/tools/bus_macro.sh
head/sys/tools/embed_mfs.sh
head/sys/tools/fdt/embed_dtb.sh
head/sys/tools/fw_stub.awk
head/sys/tools/miidevs2h.awk
head/sys/tools/pccarddevs2h.awk
head/sys/tools/sound/feeder_eq_mkfilter.awk
head/sys/tools/sound/feeder_rate_mkfilter.awk
head/sys/tools/sound/snd_fxdiv_gen.awk
head/sys/tools/usbdevs2h.awk
head/sys/ufs/ffs/ffs_rawread.c
head/sys/ufs/ffs/ffs_snapshot.c
head/sys/ufs/ffs/ffs_softdep.c
head/sys/ufs/ffs/ffs_suspend.c
head/sys/ufs/ffs/softdep.h
head/sys/ufs/ufs/acl.h
head/sys/ufs/ufs/dinode.h
head/sys/ufs/ufs/dirhash.h
head/sys/ufs/ufs/extattr.h
head/sys/ufs/ufs/gjournal.h
head/sys/ufs/ufs/ufs_acl.c
head/sys/ufs/ufs/ufs_dirhash.c
head/sys/ufs/ufs/ufs_extattr.c
head/sys/ufs/ufs/ufs_gjournal.c
head/sys/vm/_vm_radix.h
head/sys/vm/default_pager.c
head/sys/vm/memguard.c
head/sys/vm/memguard.h
head/sys/vm/phys_pager.c
head/sys/vm/redzone.c
head/sys/vm/redzone.h
head/sys/vm/sg_pager.c
head/sys/vm/uma.h
head/sys/vm/uma_core.c
head/sys/vm/uma_dbg.c
head/sys/vm/uma_dbg.h
head/sys/vm/uma_int.h
head/sys/vm/vm_phys.c
head/sys/vm/vm_phys.h
head/sys/vm/vm_radix.c
head/sys/vm/vm_radix.h
head/sys/vm/vm_reserv.c
head/sys/vm/vm_reserv.h
head/sys/xdr/xdr_mbuf.c
head/sys/xen/xenbus/xenbusb.h
head/sys/xen/xenstore/xenstore_internal.h
Modified: head/sys/isa/isa_common.c
==============================================================================
--- head/sys/isa/isa_common.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/isa_common.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND MIT
+ *
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
*
Modified: head/sys/isa/isa_common.h
==============================================================================
--- head/sys/isa/isa_common.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/isa_common.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
*
Modified: head/sys/isa/isa_dmareg.h
==============================================================================
--- head/sys/isa/isa_dmareg.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/isa_dmareg.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/isa/isahint.c
==============================================================================
--- head/sys/isa/isahint.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/isahint.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
*
Modified: head/sys/isa/isavar.h
==============================================================================
--- head/sys/isa/isavar.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/isavar.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 Doug Rabson
* All rights reserved.
*
Modified: head/sys/isa/pnp.c
==============================================================================
--- head/sys/isa/pnp.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/pnp.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1996, Sujal M. Patel
* All rights reserved.
*
Modified: head/sys/isa/pnpparse.c
==============================================================================
--- head/sys/isa/pnpparse.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/pnpparse.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
*
Modified: head/sys/isa/pnpvar.h
==============================================================================
--- head/sys/isa/pnpvar.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/pnpvar.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Doug Rabson
* All rights reserved.
*
Modified: head/sys/isa/syscons_isa.c
==============================================================================
--- head/sys/isa/syscons_isa.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/syscons_isa.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
Modified: head/sys/isa/vga_isa.c
==============================================================================
--- head/sys/isa/vga_isa.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/isa/vga_isa.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
* All rights reserved.
*
Modified: head/sys/modules/dtrace/dtraceall/dtraceall.c
==============================================================================
--- head/sys/modules/dtrace/dtraceall/dtraceall.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/modules/dtrace/dtraceall/dtraceall.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 John Birrell <jb@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/net/bpf_buffer.h
==============================================================================
--- head/sys/net/bpf_buffer.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/bpf_buffer.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
*
Modified: head/sys/net/bpf_zerocopy.c
==============================================================================
--- head/sys/net/bpf_zerocopy.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/bpf_zerocopy.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
*
Modified: head/sys/net/bpf_zerocopy.h
==============================================================================
--- head/sys/net/bpf_zerocopy.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/bpf_zerocopy.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Seccuris Inc.
* All rights reserved.
*
Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/bridgestp.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $NetBSD: bridgestp.c,v 1.5 2003/11/28 08:56:48 keihan Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
* Copyright (c) 2006 Andrew Thompson (thompsa@FreeBSD.org)
* All rights reserved.
Modified: head/sys/net/bridgestp.h
==============================================================================
--- head/sys/net/bridgestp.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/bridgestp.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
@@ -35,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+/*-
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
* All rights reserved.
*
Modified: head/sys/net/firewire.h
==============================================================================
--- head/sys/net/firewire.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/firewire.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
Modified: head/sys/net/ieee8023ad_lacp.c
==============================================================================
--- head/sys/net/ieee8023ad_lacp.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/ieee8023ad_lacp.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c)2005 YAMAMOTO Takashi,
* Copyright (c)2008 Andrew Thompson <thompsa@FreeBSD.org>
* All rights reserved.
Modified: head/sys/net/ieee8023ad_lacp.h
==============================================================================
--- head/sys/net/ieee8023ad_lacp.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/ieee8023ad_lacp.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $NetBSD: ieee8023ad_impl.h,v 1.2 2005/12/10 23:21:39 elad Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c)2005 YAMAMOTO Takashi,
* All rights reserved.
*
Modified: head/sys/net/ieee_oui.h
==============================================================================
--- head/sys/net/ieee_oui.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/ieee_oui.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
-/*
+/* -
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_bridge.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/net/if_bridgevar.h
==============================================================================
--- head/sys/net/if_bridgevar.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_bridgevar.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
/*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright 2001 Wasabi Systems, Inc.
* All rights reserved.
*
Modified: head/sys/net/if_dead.c
==============================================================================
--- head/sys/net/if_dead.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_dead.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sys/net/if_debug.c
==============================================================================
--- head/sys/net/if_debug.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_debug.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/net/if_enc.c
==============================================================================
--- head/sys/net/if_enc.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_enc.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 The FreeBSD Project.
* Copyright (c) 2015 Andrey V. Elsukov <ae@FreeBSD.org>
* All rights reserved.
Modified: head/sys/net/if_enc.h
==============================================================================
--- head/sys/net/if_enc.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_enc.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 The FreeBSD Project.
* All rights reserved.
*
Modified: head/sys/net/if_epair.c
==============================================================================
--- head/sys/net/if_epair.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_epair.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 The FreeBSD Foundation
* Copyright (c) 2009-2010 Bjoern A. Zeeb <bz@FreeBSD.org>
* All rights reserved.
Modified: head/sys/net/if_gre.c
==============================================================================
--- head/sys/net/if_gre.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_gre.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
* All rights reserved.
Modified: head/sys/net/if_gre.h
==============================================================================
--- head/sys/net/if_gre.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_gre.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
* All rights reserved
Modified: head/sys/net/if_iso88025subr.c
==============================================================================
--- head/sys/net/if_iso88025subr.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_iso88025subr.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998, Larry Lile
* All rights reserved.
*
Modified: head/sys/net/if_llatbl.c
==============================================================================
--- head/sys/net/if_llatbl.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_llatbl.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
* Copyright (c) 2008 Kip Macy. All rights reserved.
Modified: head/sys/net/if_llatbl.h
==============================================================================
--- head/sys/net/if_llatbl.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_llatbl.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
* Copyright (c) 2008 Kip Macy. All rights reserved.
Modified: head/sys/net/if_media.c
==============================================================================
--- head/sys/net/if_media.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_media.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997
* Jonathan Stone and Jason R. Thorpe. All rights reserved.
*
Modified: head/sys/net/if_media.h
==============================================================================
--- head/sys/net/if_media.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_media.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -2,6 +2,8 @@
/* $FreeBSD$ */
/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1997
* Jonathan Stone and Jason R. Thorpe. All rights reserved.
*
Modified: head/sys/net/if_pflog.h
==============================================================================
--- head/sys/net/if_pflog.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_pflog.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,5 +1,7 @@
/* $OpenBSD: if_pflog.h,v 1.13 2006/10/23 12:46:09 henning Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
*
@@ -22,6 +24,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#ifndef _NET_IF_PFLOG_H_
Modified: head/sys/net/if_pfsync.h
==============================================================================
--- head/sys/net/if_pfsync.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_pfsync.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Michael Shalayeff
* All rights reserved.
*
Modified: head/sys/net/if_tap.c
==============================================================================
--- head/sys/net/if_tap.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_tap.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
Modified: head/sys/net/if_tap.h
==============================================================================
--- head/sys/net/if_tap.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_tap.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
Modified: head/sys/net/if_tapvar.h
==============================================================================
--- head/sys/net/if_tapvar.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/if_tapvar.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
* All rights reserved.
*
Modified: head/sys/net/iso88025.h
==============================================================================
--- head/sys/net/iso88025.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/iso88025.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1998, Larry Lile
* All rights reserved.
*
Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/netisr.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
Modified: head/sys/net/netisr.h
==============================================================================
--- head/sys/net/netisr.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/netisr.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
Modified: head/sys/net/netisr_internal.h
==============================================================================
--- head/sys/net/netisr_internal.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/netisr_internal.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
* All rights reserved.
Modified: head/sys/net/netmap.h
==============================================================================
--- head/sys/net/netmap.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/netmap.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/net/netmap_user.h
==============================================================================
--- head/sys/net/netmap_user.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/netmap_user.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2011-2016 Universita` di Pisa
* All rights reserved.
*
Modified: head/sys/net/pfil.c
==============================================================================
--- head/sys/net/pfil.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/pfil.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -2,6 +2,8 @@
/* $NetBSD: pfil.c,v 1.20 2001/11/12 23:49:46 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/net/pfil.h
==============================================================================
--- head/sys/net/pfil.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/pfil.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -2,6 +2,8 @@
/* $NetBSD: pfil.h,v 1.22 2003/06/23 12:57:08 martin Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1996 Matthew R. Green
* All rights reserved.
*
Modified: head/sys/net/pfvar.h
==============================================================================
--- head/sys/net/pfvar.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/pfvar.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 2001 Daniel Hartmeier
* All rights reserved.
*
Modified: head/sys/net/sff8472.h
==============================================================================
--- head/sys/net/sff8472.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/sff8472.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 George V. Neville-Neil
* All rights reserved.
*
Modified: head/sys/net/vnet.c
==============================================================================
--- head/sys/net/vnet.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/vnet.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 University of Zagreb
* Copyright (c) 2006-2009 FreeBSD Foundation
* All rights reserved.
Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net/vnet.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006-2009 University of Zagreb
* Copyright (c) 2006-2009 FreeBSD Foundation
* All rights reserved.
Modified: head/sys/net80211/_ieee80211.h
==============================================================================
--- head/sys/net80211/_ieee80211.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/_ieee80211.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211.h
==============================================================================
--- head/sys/net80211/ieee80211.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_acl.c
==============================================================================
--- head/sys/net80211/ieee80211_acl.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_acl.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_action.c
==============================================================================
--- head/sys/net80211/ieee80211_action.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_action.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_action.h
==============================================================================
--- head/sys/net80211/ieee80211_action.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_action.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_adhoc.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_adhoc.h
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_adhoc.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ageq.c
==============================================================================
--- head/sys/net80211/ieee80211_ageq.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ageq.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ageq.h
==============================================================================
--- head/sys/net80211/ieee80211_ageq.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ageq.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_alq.c
==============================================================================
--- head/sys/net80211/ieee80211_alq.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_alq.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Adrian Chadd, Xenion Lty Ltd
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_alq.h
==============================================================================
--- head/sys/net80211/ieee80211_alq.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_alq.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Adrian Chadd, Xenion Lty Ltd
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_crypto.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_crypto.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_crypto.h
==============================================================================
--- head/sys/net80211/ieee80211_crypto.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_crypto.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_crypto_ccmp.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto_ccmp.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_crypto_ccmp.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_crypto_none.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto_none.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_crypto_none.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_crypto_tkip.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto_tkip.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_crypto_tkip.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_crypto_wep.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto_wep.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_crypto_wep.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ddb.c
==============================================================================
--- head/sys/net80211/ieee80211_ddb.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ddb.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_dfs.c
==============================================================================
--- head/sys/net80211/ieee80211_dfs.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_dfs.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_dfs.h
==============================================================================
--- head/sys/net80211/ieee80211_dfs.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_dfs.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_freebsd.c
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_freebsd.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_freebsd.h
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_freebsd.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2003-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_hostap.c
==============================================================================
--- head/sys/net80211/ieee80211_hostap.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_hostap.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_hostap.h
==============================================================================
--- head/sys/net80211/ieee80211_hostap.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_hostap.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ht.c
==============================================================================
--- head/sys/net80211/ieee80211_ht.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ht.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ht.h
==============================================================================
--- head/sys/net80211/ieee80211_ht.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ht.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- head/sys/net80211/ieee80211_hwmp.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_hwmp.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_input.c
==============================================================================
--- head/sys/net80211/ieee80211_input.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_input.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_input.h
==============================================================================
--- head/sys/net80211/ieee80211_input.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_input.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ioctl.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ioctl.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- head/sys/net80211/ieee80211_mesh.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_mesh.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_mesh.h
==============================================================================
--- head/sys/net80211/ieee80211_mesh.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_mesh.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_monitor.c
==============================================================================
--- head/sys/net80211/ieee80211_monitor.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_monitor.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_monitor.h
==============================================================================
--- head/sys/net80211/ieee80211_monitor.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_monitor.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_node.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_node.h
==============================================================================
--- head/sys/net80211/ieee80211_node.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_node.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_output.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_phy.c
==============================================================================
--- head/sys/net80211/ieee80211_phy.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_phy.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_phy.h
==============================================================================
--- head/sys/net80211/ieee80211_phy.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_phy.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_power.c
==============================================================================
--- head/sys/net80211/ieee80211_power.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_power.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_power.h
==============================================================================
--- head/sys/net80211/ieee80211_power.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_power.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_proto.c
==============================================================================
--- head/sys/net80211/ieee80211_proto.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_proto.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* Copyright (c) 2012 IEEE
Modified: head/sys/net80211/ieee80211_proto.h
==============================================================================
--- head/sys/net80211/ieee80211_proto.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_proto.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
Modified: head/sys/net80211/ieee80211_radiotap.c
==============================================================================
--- head/sys/net80211/ieee80211_radiotap.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_radiotap.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_radiotap.h
==============================================================================
--- head/sys/net80211/ieee80211_radiotap.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_radiotap.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -2,6 +2,8 @@
/* $NetBSD: ieee80211_radiotap.h,v 1.16 2007/01/06 05:51:15 dyoung Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, 2004 David Young. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sys/net80211/ieee80211_ratectl.c
==============================================================================
--- head/sys/net80211/ieee80211_ratectl.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ratectl.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ratectl.h
==============================================================================
--- head/sys/net80211/ieee80211_ratectl.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ratectl.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Rui Paulo <rpaulo@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_ratectl_none.c
==============================================================================
--- head/sys/net80211/ieee80211_ratectl_none.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_ratectl_none.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Bernhard Schmidt <bschmidt@FreeBSD.org>
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_regdomain.c
==============================================================================
--- head/sys/net80211/ieee80211_regdomain.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_regdomain.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_regdomain.h
==============================================================================
--- head/sys/net80211/ieee80211_regdomain.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_regdomain.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
Modified: head/sys/net80211/ieee80211_rssadapt.c
==============================================================================
--- head/sys/net80211/ieee80211_rssadapt.c Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_rssadapt.c Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/* $NetBSD: ieee80211_rssadapt.c,v 1.9 2005/02/26 22:45:09 perry Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2010 Rui Paulo <rpaulo@FreeBSD.org>
* Copyright (c) 2003, 2004 David Young. All rights reserved.
*
Modified: head/sys/net80211/ieee80211_rssadapt.h
==============================================================================
--- head/sys/net80211/ieee80211_rssadapt.h Mon Nov 27 15:20:12 2017 (r326271)
+++ head/sys/net80211/ieee80211_rssadapt.h Mon Nov 27 15:23:17 2017 (r326272)
@@ -1,6 +1,8 @@
/* $FreeBSD$ */
/* $NetBSD: ieee80211_rssadapt.h,v 1.4 2005/02/26 22:45:09 perry Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 2003, 2004 David Young. All rights reserved.
*
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:24:15 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1070DE54B46;
Mon, 27 Nov 2017 15:24:15 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DBCA076DD8;
Mon, 27 Nov 2017 15:24:14 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFODXb006542;
Mon, 27 Nov 2017 15:24:13 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFODsM006541;
Mon, 27 Nov 2017 15:24:13 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201711271524.vARFODsM006541@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:24:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326273 - head/usr.bin/ctlstat
X-SVN-Group: head
X-SVN-Commit-Author: mav
X-SVN-Commit-Paths: head/usr.bin/ctlstat
X-SVN-Commit-Revision: 326273
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:24:15 -0000
Author: mav
Date: Mon Nov 27 15:24:13 2017
New Revision: 326273
URL: https://svnweb.freebsd.org/changeset/base/326273
Log:
Make ctlstat -n option work reasonably for sparse LUN list.
MFC after: 2 weeks
Sponsored by: iXsystems, Inc.
Modified:
head/usr.bin/ctlstat/ctlstat.c
Modified: head/usr.bin/ctlstat/ctlstat.c
==============================================================================
--- head/usr.bin/ctlstat/ctlstat.c Mon Nov 27 15:23:17 2017 (r326272)
+++ head/usr.bin/ctlstat/ctlstat.c Mon Nov 27 15:24:13 2017 (r326273)
@@ -320,11 +320,12 @@ static const char *iotypes[] = {"NO IO", "READ", "WRIT
static void
ctlstat_dump(struct ctlstat_context *ctx)
{
- int iotype, i;
+ int iotype, i, n;
struct ctl_io_stats *stats = ctx->cur_stats;
- for (i = 0; i < ctx->cur_items;i++) {
- if (F_MASK(ctx) && bit_test(ctx->item_mask, i) == 0)
+ for (i = n = 0; i < ctx->cur_items;i++) {
+ if (F_MASK(ctx) && bit_test(ctx->item_mask,
+ (int)stats[i].item) == 0)
continue;
printf("%s %d\n", F_PORTS(ctx) ? "port" : "lun", stats[i].item);
for (iotype = 0; iotype < CTL_STATS_NUM_TYPES; iotype++) {
@@ -341,17 +342,20 @@ ctlstat_dump(struct ctlstat_context *ctx)
PRINT_BINTIME(stats[i].dma_time[iotype]);
printf("\n");
}
+ if (++n >= ctx->numdevs)
+ break;
}
}
static void
ctlstat_json(struct ctlstat_context *ctx) {
- int iotype, i;
+ int iotype, i, n;
struct ctl_io_stats *stats = ctx->cur_stats;
printf("{\"%s\":[", F_PORTS(ctx) ? "ports" : "luns");
- for (i = 0; i < ctx->cur_items; i++) {
- if (F_MASK(ctx) && bit_test(ctx->item_mask, i) == 0)
+ for (i = n = 0; i < ctx->cur_items; i++) {
+ if (F_MASK(ctx) && bit_test(ctx->item_mask,
+ (int)stats[i].item) == 0)
continue;
printf("{\"num\":%d,\"io\":[",
stats[i].item);
@@ -372,6 +376,8 @@ ctlstat_json(struct ctlstat_context *ctx) {
printf(","); /* continue io array */
}
printf("]}");
+ if (++n >= ctx->numdevs)
+ break;
if (i < (ctx->cur_items - 1))
printf(","); /* continue lun array */
}
@@ -383,7 +389,7 @@ ctlstat_standard(struct ctlstat_context *ctx) {
long double etime;
uint64_t delta_jiffies, delta_idle;
long double cpu_percentage;
- int i, j;
+ int i, j, n;
cpu_percentage = 0;
@@ -413,10 +419,6 @@ ctlstat_standard(struct ctlstat_context *ctx) {
if (F_HDR(ctx)) {
ctx->header_interval--;
if (ctx->header_interval <= 0) {
- int hdr_devs;
-
- hdr_devs = 0;
-
if (F_CPU(ctx))
fprintf(stdout, " CPU");
if (F_TOTALS(ctx)) {
@@ -425,9 +427,9 @@ ctlstat_standard(struct ctlstat_context *ctx) {
(F_TIMEVAL(ctx) != 0) ? " " : "",
(F_TIMEVAL(ctx) != 0) ? " " : "",
(F_TIMEVAL(ctx) != 0) ? " " : "");
- hdr_devs = 3;
+ n = 3;
} else {
- for (i = 0; i < min(CTL_STAT_BITS,
+ for (i = n = 0; i < min(CTL_STAT_BITS,
ctx->cur_items); i++) {
int item;
@@ -444,13 +446,14 @@ ctlstat_standard(struct ctlstat_context *ctx) {
fprintf(stdout, "%15.6s%d %s",
F_PORTS(ctx) ? "port" : "lun", item,
(F_TIMEVAL(ctx) != 0) ? " " : "");
- hdr_devs++;
+ if (++n >= ctx->numdevs)
+ break;
}
fprintf(stdout, "\n");
}
if (F_CPU(ctx))
fprintf(stdout, " ");
- for (i = 0; i < hdr_devs; i++)
+ for (i = 0; i < n; i++)
fprintf(stdout, "%s KB/t %s MB/s",
(F_TIMEVAL(ctx) != 0) ? " ms" : "",
(F_DMA(ctx) == 0) ? "tps" : "dps");
@@ -534,7 +537,7 @@ ctlstat_standard(struct ctlstat_context *ctx) {
dmas_per_sec[i], mbsec[i]);
}
} else {
- for (i = 0; i < min(CTL_STAT_BITS, ctx->cur_items); i++) {
+ for (i = n = 0; i < min(CTL_STAT_BITS, ctx->cur_items); i++) {
long double mbsec, kb_per_transfer;
long double transfers_per_sec;
long double ms_per_transfer;
@@ -565,6 +568,8 @@ ctlstat_standard(struct ctlstat_context *ctx) {
fprintf(stdout, " %4.0Lf %5.0Lf %4.0Lf",
kb_per_transfer, (F_DMA(ctx) == 0) ?
transfers_per_sec : dmas_per_sec, mbsec);
+ if (++n >= ctx->numdevs)
+ break;
}
}
}
@@ -668,18 +673,6 @@ main(int argc, char **argv)
ctx.flags |= CTLSTAT_FLAG_PORTS;
else
ctx.flags |= CTLSTAT_FLAG_LUNS;
- }
-
- if (!F_TOTALS(&ctx) && !F_MASK(&ctx)) {
- /*
- * Note that this just selects the first N LUNs to display,
- * but at this point we have no knoweledge of which LUN
- * numbers actually exist. So we may select LUNs that
- * aren't there.
- */
- bit_nset(ctx.item_mask, 0, min(ctx.numdevs - 1,
- CTL_STAT_BITS - 1));
- ctx.flags |= CTLSTAT_FLAG_MASK;
}
if ((fd = open(CTL_DEFAULT_DEV, O_RDWR)) == -1)
From owner-svn-src-all@freebsd.org Mon Nov 27 15:25:08 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90FADE54BFE;
Mon, 27 Nov 2017 15:25:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 548B276F4C;
Mon, 27 Nov 2017 15:25:08 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFP7JE006672;
Mon, 27 Nov 2017 15:25:07 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFP2Pf006621;
Mon, 27 Nov 2017 15:25:02 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271525.vARFP2Pf006621@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:25:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326274 - in head/libexec: atrun bootpd/tools/bootptest
pppoed rpc.rwalld rpc.sprayd rtld-aout rtld-elf rtld-elf/amd64 rtld-elf/arm
rtld-elf/i386 rtld-elf/mips rtld-elf/powerpc rtld-elf...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/libexec: atrun bootpd/tools/bootptest pppoed
rpc.rwalld rpc.sprayd rtld-aout rtld-elf rtld-elf/amd64 rtld-elf/arm
rtld-elf/i386 rtld-elf/mips rtld-elf/powerpc rtld-elf/powerpc64
rtld-elf/sparc...
X-SVN-Commit-Revision: 326274
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:25:08 -0000
Author: pfg
Date: Mon Nov 27 15:25:02 2017
New Revision: 326274
URL: https://svnweb.freebsd.org/changeset/base/326274
Log:
libexec: adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
No functional change intended.
Modified:
head/libexec/atrun/atrun.c
head/libexec/atrun/gloadavg.c
head/libexec/atrun/gloadavg.h
head/libexec/bootpd/tools/bootptest/print-bootp.c
head/libexec/pppoed/pppoed.c
head/libexec/rpc.rwalld/rwalld.c
head/libexec/rpc.sprayd/sprayd.c
head/libexec/rtld-aout/shlib.c
head/libexec/rtld-aout/shlib.h
head/libexec/rtld-aout/support.c
head/libexec/rtld-aout/support.h
head/libexec/rtld-elf/amd64/reloc.c
head/libexec/rtld-elf/amd64/rtld_machdep.h
head/libexec/rtld-elf/arm/rtld_machdep.h
head/libexec/rtld-elf/debug.c
head/libexec/rtld-elf/debug.h
head/libexec/rtld-elf/i386/reloc.c
head/libexec/rtld-elf/i386/rtld_machdep.h
head/libexec/rtld-elf/map_object.c
head/libexec/rtld-elf/mips/reloc.c
head/libexec/rtld-elf/mips/rtld_machdep.h
head/libexec/rtld-elf/powerpc/reloc.c
head/libexec/rtld-elf/powerpc/rtld_machdep.h
head/libexec/rtld-elf/powerpc64/reloc.c
head/libexec/rtld-elf/powerpc64/rtld_machdep.h
head/libexec/rtld-elf/rtld.c
head/libexec/rtld-elf/rtld.h
head/libexec/rtld-elf/rtld_lock.c
head/libexec/rtld-elf/rtld_lock.h
head/libexec/rtld-elf/rtld_printf.h
head/libexec/rtld-elf/rtld_tls.h
head/libexec/rtld-elf/sparc64/reloc.c
head/libexec/rtld-elf/sparc64/rtld_machdep.h
head/libexec/rtld-elf/xmalloc.c
head/libexec/save-entropy/save-entropy.sh
head/libexec/talkd/extern.h
head/libexec/tftpd/tftp-file.c
head/libexec/tftpd/tftp-file.h
head/libexec/tftpd/tftp-io.c
head/libexec/tftpd/tftp-io.h
head/libexec/tftpd/tftp-options.c
head/libexec/tftpd/tftp-options.h
head/libexec/tftpd/tftp-transfer.c
head/libexec/tftpd/tftp-transfer.h
head/libexec/tftpd/tftp-utils.c
head/libexec/tftpd/tftp-utils.h
head/libexec/ulog-helper/ulog-helper.c
Modified: head/libexec/atrun/atrun.c
==============================================================================
--- head/libexec/atrun/atrun.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/atrun/atrun.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,5 +1,8 @@
-/*
+/*-
* atrun.c - run jobs queued by at; run with root privileges.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (C) 1993, 1994 Thomas Koenig
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/atrun/gloadavg.c
==============================================================================
--- head/libexec/atrun/gloadavg.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/atrun/gloadavg.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,6 +1,8 @@
-/*
+/*-
* gloadavg.c - get load average for Linux
* Copyright (C) 1993 Thomas Koenig
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: head/libexec/atrun/gloadavg.h
==============================================================================
--- head/libexec/atrun/gloadavg.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/atrun/gloadavg.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,6 +1,8 @@
-/*
+/*-
* gloadavg.h - header for atrun(8)
* Copyright (C) 1993 Thomas Koenig
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: head/libexec/bootpd/tools/bootptest/print-bootp.c
==============================================================================
--- head/libexec/bootpd/tools/bootptest/print-bootp.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/bootpd/tools/bootptest/print-bootp.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1988-1990
* The Regents of the University of California. All rights reserved.
*
Modified: head/libexec/pppoed/pppoed.c
==============================================================================
--- head/libexec/pppoed/pppoed.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/pppoed/pppoed.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999-2001 Brian Somers <brian@Awfulhak.org>
* All rights reserved.
*
Modified: head/libexec/rpc.rwalld/rwalld.c
==============================================================================
--- head/libexec/rpc.rwalld/rwalld.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rpc.rwalld/rwalld.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
*
Modified: head/libexec/rpc.sprayd/sprayd.c
==============================================================================
--- head/libexec/rpc.sprayd/sprayd.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rpc.sprayd/sprayd.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
*
Modified: head/libexec/rtld-aout/shlib.c
==============================================================================
--- head/libexec/rtld-aout/shlib.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-aout/shlib.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
*
Modified: head/libexec/rtld-aout/shlib.h
==============================================================================
--- head/libexec/rtld-aout/shlib.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-aout/shlib.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -2,6 +2,8 @@
* Copyright (C) 1996
* Peter Wemm. All rights reserved.
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
Modified: head/libexec/rtld-aout/support.c
==============================================================================
--- head/libexec/rtld-aout/support.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-aout/support.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,9 +1,11 @@
-/*
+/*-
* Generic "support" routines to replace those obtained from libiberty for ld.
*
* I've collected these from random bits of (published) code I've written
* over the years, not that they are a big deal. peter@freebsd.org
- *-
+ *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* Peter Wemm. All rights reserved.
*
Modified: head/libexec/rtld-aout/support.h
==============================================================================
--- head/libexec/rtld-aout/support.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-aout/support.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1996
* Peter Wemm. All rights reserved.
*
Modified: head/libexec/rtld-elf/amd64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/amd64/reloc.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/amd64/reloc.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996, 1997, 1998, 1999 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/amd64/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/amd64/rtld_machdep.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/amd64/rtld_machdep.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/arm/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/arm/rtld_machdep.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/arm/rtld_machdep.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/debug.c
==============================================================================
--- head/libexec/rtld-elf/debug.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/debug.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/debug.h
==============================================================================
--- head/libexec/rtld-elf/debug.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/debug.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/i386/reloc.c
==============================================================================
--- head/libexec/rtld-elf/i386/reloc.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/i386/reloc.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996, 1997, 1998, 1999 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/i386/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/i386/rtld_machdep.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/i386/rtld_machdep.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/map_object.c
==============================================================================
--- head/libexec/rtld-elf/map_object.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/map_object.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/mips/reloc.c
==============================================================================
--- head/libexec/rtld-elf/mips/reloc.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/mips/reloc.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,6 +1,8 @@
/* $NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright 1997 Michael L. Hitch <mhitch@montana.edu>
* Portions copyright 2002 Charles M. Hannum <root@ihack.net>
* All rights reserved.
Modified: head/libexec/rtld-elf/mips/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/mips/rtld_machdep.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/mips/rtld_machdep.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/powerpc/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc/reloc.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/powerpc/reloc.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,6 +1,8 @@
/* $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (C) 1998 Tsubai Masanari
* All rights reserved.
*
Modified: head/libexec/rtld-elf/powerpc/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/powerpc/rtld_machdep.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/powerpc/rtld_machdep.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/powerpc64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/powerpc64/reloc.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/powerpc64/reloc.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,6 +1,8 @@
/* $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (C) 1998 Tsubai Masanari
* All rights reserved.
*
Modified: head/libexec/rtld-elf/powerpc64/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/powerpc64/rtld_machdep.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/powerpc64/rtld_machdep.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/rtld.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
* Copyright 2003 Alexander Kabaev <kan@FreeBSD.ORG>.
* Copyright 2009-2013 Konstantin Belousov <kib@FreeBSD.ORG>.
Modified: head/libexec/rtld-elf/rtld.h
==============================================================================
--- head/libexec/rtld-elf/rtld.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/rtld.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/rtld_lock.c
==============================================================================
--- head/libexec/rtld-elf/rtld_lock.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/rtld_lock.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/rtld_lock.h
==============================================================================
--- head/libexec/rtld-elf/rtld_lock.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/rtld_lock.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2003 Alexander Kabaev.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/rtld_printf.h
==============================================================================
--- head/libexec/rtld-elf/rtld_printf.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/rtld_printf.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2011 Konstantin Belousov <kib@FreeBSD.org>.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/rtld_tls.h
==============================================================================
--- head/libexec/rtld-elf/rtld_tls.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/rtld_tls.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Doug Rabson
* All rights reserved.
*
Modified: head/libexec/rtld-elf/sparc64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/sparc64/reloc.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/sparc64/reloc.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,6 +1,8 @@
/* $NetBSD: mdreloc.c,v 1.42 2008/04/28 20:23:04 martin Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2000 Eduardo Horvath.
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
Modified: head/libexec/rtld-elf/sparc64/rtld_machdep.h
==============================================================================
--- head/libexec/rtld-elf/sparc64/rtld_machdep.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/sparc64/rtld_machdep.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999, 2000 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/rtld-elf/xmalloc.c
==============================================================================
--- head/libexec/rtld-elf/xmalloc.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/rtld-elf/xmalloc.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 1996-1998 John D. Polstra.
* All rights reserved.
*
Modified: head/libexec/save-entropy/save-entropy.sh
==============================================================================
--- head/libexec/save-entropy/save-entropy.sh Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/save-entropy/save-entropy.sh Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2001-2006,2012 Douglas Barton, dougb@FreeBSD.org
# All rights reserved.
#
Modified: head/libexec/talkd/extern.h
==============================================================================
--- head/libexec/talkd/extern.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/talkd/extern.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-file.c
==============================================================================
--- head/libexec/tftpd/tftp-file.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-file.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-file.h
==============================================================================
--- head/libexec/tftpd/tftp-file.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-file.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-io.c
==============================================================================
--- head/libexec/tftpd/tftp-io.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-io.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-io.h
==============================================================================
--- head/libexec/tftpd/tftp-io.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-io.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-options.c
==============================================================================
--- head/libexec/tftpd/tftp-options.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-options.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-options.h
==============================================================================
--- head/libexec/tftpd/tftp-options.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-options.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-transfer.c
==============================================================================
--- head/libexec/tftpd/tftp-transfer.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-transfer.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-transfer.h
==============================================================================
--- head/libexec/tftpd/tftp-transfer.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-transfer.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-utils.c
==============================================================================
--- head/libexec/tftpd/tftp-utils.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-utils.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/tftpd/tftp-utils.h
==============================================================================
--- head/libexec/tftpd/tftp-utils.h Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/tftpd/tftp-utils.h Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 2008 Edwin Groothuis. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/libexec/ulog-helper/ulog-helper.c
==============================================================================
--- head/libexec/ulog-helper/ulog-helper.c Mon Nov 27 15:24:13 2017 (r326273)
+++ head/libexec/ulog-helper/ulog-helper.c Mon Nov 27 15:25:02 2017 (r326274)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Ed Schouten <ed@FreeBSD.org>
* All rights reserved.
*
From owner-svn-src-all@freebsd.org Mon Nov 27 15:28:34 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8EBF6E54DE8;
Mon, 27 Nov 2017 15:28:34 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 28AB177430;
Mon, 27 Nov 2017 15:28:34 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFSXsc007321;
Mon, 27 Nov 2017 15:28:33 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFSQCi007248;
Mon, 27 Nov 2017 15:28:26 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271528.vARFSQCi007248@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:28:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326275 - in head: share/examples/bhyve
share/examples/hast share/examples/ipfw share/examples/kld/cdev/module
share/examples/kld/cdev/test share/examples/kld/dyn_sysctl share/examples/...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head: share/examples/bhyve share/examples/hast
share/examples/ipfw share/examples/kld/cdev/module
share/examples/kld/cdev/test share/examples/kld/dyn_sysctl
share/examples/kld/firmware/fwconsumer s...
X-SVN-Commit-Revision: 326275
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:28:34 -0000
Author: pfg
Date: Mon Nov 27 15:28:26 2017
New Revision: 326275
URL: https://svnweb.freebsd.org/changeset/base/326275
Log:
share and pc-sysinstall: adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
Commit these apart because compile testing doesn't guarantee I didn't made
some nasty mistake. No functional change intended.
Modified:
head/share/examples/bhyve/vmrun.sh
head/share/examples/hast/ucarp.sh
head/share/examples/hast/ucarp_down.sh
head/share/examples/hast/ucarp_up.sh
head/share/examples/ipfw/change_rules.sh
head/share/examples/kld/cdev/module/cdev.c
head/share/examples/kld/cdev/module/cdev.h
head/share/examples/kld/cdev/module/cdevmod.c
head/share/examples/kld/cdev/test/testcdev.c
head/share/examples/kld/dyn_sysctl/dyn_sysctl.c
head/share/examples/kld/firmware/fwconsumer/fw_consumer.c
head/share/examples/kld/khelp/h_example.c
head/share/examples/kld/random_adaptor/random_adaptor_example.c
head/share/examples/kld/syscall/module/syscall.c
head/share/examples/kld/syscall/test/call.c
head/share/examples/libvgl/demo.c
head/share/examples/scsi_target/scsi_cmds.c
head/share/examples/scsi_target/scsi_target.c
head/share/examples/scsi_target/scsi_target.h
head/share/mk/version_gen.awk
head/share/syscons/scrnmaps/mkscrfil.c
head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh
head/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh
head/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh
head/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh
head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh
head/usr.sbin/pc-sysinstall/backend-query/enable-net.sh
head/usr.sbin/pc-sysinstall/backend-query/get-packages.sh
head/usr.sbin/pc-sysinstall/backend-query/list-components.sh
head/usr.sbin/pc-sysinstall/backend-query/list-config.sh
head/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh
head/usr.sbin/pc-sysinstall/backend-query/list-packages.sh
head/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh
head/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh
head/usr.sbin/pc-sysinstall/backend-query/query-langs.sh
head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh
head/usr.sbin/pc-sysinstall/backend-query/set-mirror.sh
head/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh
head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh
head/usr.sbin/pc-sysinstall/backend-query/test-live.sh
head/usr.sbin/pc-sysinstall/backend-query/test-netup.sh
head/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh
head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh
head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh
head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh
head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
head/usr.sbin/pc-sysinstall/backend/functions-ftp.sh
head/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh
head/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh
head/usr.sbin/pc-sysinstall/backend/functions-localize.sh
head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
head/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh
head/usr.sbin/pc-sysinstall/backend/functions-networking.sh
head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
head/usr.sbin/pc-sysinstall/backend/functions-packages.sh
head/usr.sbin/pc-sysinstall/backend/functions-parse.sh
head/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh
head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh
head/usr.sbin/pc-sysinstall/backend/functions-users.sh
head/usr.sbin/pc-sysinstall/backend/functions.sh
head/usr.sbin/pc-sysinstall/backend/installimage.sh
head/usr.sbin/pc-sysinstall/backend/parseconfig.sh
head/usr.sbin/pc-sysinstall/backend/startautoinstall.sh
head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh
Modified: head/share/examples/bhyve/vmrun.sh
==============================================================================
--- head/share/examples/bhyve/vmrun.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/bhyve/vmrun.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2013 NetApp, Inc.
# All rights reserved.
#
Modified: head/share/examples/hast/ucarp.sh
==============================================================================
--- head/share/examples/hast/ucarp.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/hast/ucarp.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 The FreeBSD Foundation
# All rights reserved.
#
Modified: head/share/examples/hast/ucarp_down.sh
==============================================================================
--- head/share/examples/hast/ucarp_down.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/hast/ucarp_down.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 The FreeBSD Foundation
# All rights reserved.
#
Modified: head/share/examples/hast/ucarp_up.sh
==============================================================================
--- head/share/examples/hast/ucarp_up.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/hast/ucarp_up.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 The FreeBSD Foundation
# All rights reserved.
#
Modified: head/share/examples/ipfw/change_rules.sh
==============================================================================
--- head/share/examples/ipfw/change_rules.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/ipfw/change_rules.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2000 Alexandre Peixoto
# All rights reserved.
#
Modified: head/share/examples/kld/cdev/module/cdev.c
==============================================================================
--- head/share/examples/kld/cdev/module/cdev.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/cdev/module/cdev.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,8 +1,10 @@
/* 08 Nov 1998*/
-/*
+/*-
* cdev.c
*
* 08 Nov 1998 Rajesh Vaidheeswarran
+ *
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1998 Rajesh Vaidheeswarran
* All rights reserved.
Modified: head/share/examples/kld/cdev/module/cdev.h
==============================================================================
--- head/share/examples/kld/cdev/module/cdev.h Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/cdev/module/cdev.h Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,9 +1,11 @@
/* 08 Nov 1998*/
-/*
+/*-
* cdev.h - header for sample kld module implementing a character device
* driver.
*
* 08 Nov 1998 Rajesh Vaidheeswarran
+ *
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1998 Rajesh Vaidheeswarran
* All rights reserved.
Modified: head/share/examples/kld/cdev/module/cdevmod.c
==============================================================================
--- head/share/examples/kld/cdev/module/cdevmod.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/cdev/module/cdevmod.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,8 +1,10 @@
/* 08 Nov 1998*/
-/*
+/*-
* cdevmod.c - a sample kld module implementing a character device driver.
*
* 08 Nov 1998 Rajesh Vaidheeswarran
+ *
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1998 Rajesh Vaidheeswarran
* All rights reserved.
Modified: head/share/examples/kld/cdev/test/testcdev.c
==============================================================================
--- head/share/examples/kld/cdev/test/testcdev.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/cdev/test/testcdev.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,11 +1,13 @@
/* 08 Nov 1998*/
-/*
+/*-
* testmisc.c
*
* Test program to call the sample loaded kld device driver.
*
* 05 Jun 93 Rajesh Vaidheeswarran Original
*
+ *
+ * SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1993 Rajesh Vaidheeswarran.
* All rights reserved.
Modified: head/share/examples/kld/dyn_sysctl/dyn_sysctl.c
==============================================================================
--- head/share/examples/kld/dyn_sysctl/dyn_sysctl.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/dyn_sysctl/dyn_sysctl.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2000 Andrzej Bialecki <abial@freebsd.org>
* All rights reserved.
*
Modified: head/share/examples/kld/firmware/fwconsumer/fw_consumer.c
==============================================================================
--- head/share/examples/kld/firmware/fwconsumer/fw_consumer.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/firmware/fwconsumer/fw_consumer.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2006, Max Laier <mlaier@FreeBSD.org>
* All rights reserved.
*
Modified: head/share/examples/kld/khelp/h_example.c
==============================================================================
--- head/share/examples/kld/khelp/h_example.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/khelp/h_example.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010-2011 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/share/examples/kld/random_adaptor/random_adaptor_example.c
==============================================================================
--- head/share/examples/kld/random_adaptor/random_adaptor_example.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/random_adaptor/random_adaptor_example.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2013 Arthur Mesh <arthurmesh@gmail.com>
* All rights reserved.
*
Modified: head/share/examples/kld/syscall/module/syscall.c
==============================================================================
--- head/share/examples/kld/syscall/module/syscall.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/syscall/module/syscall.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Assar Westerlund
* All rights reserved.
*
Modified: head/share/examples/kld/syscall/test/call.c
==============================================================================
--- head/share/examples/kld/syscall/test/call.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/kld/syscall/test/call.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 Assar Westerlund
* All rights reserved.
*
Modified: head/share/examples/libvgl/demo.c
==============================================================================
--- head/share/examples/libvgl/demo.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/libvgl/demo.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1991-1997 Søren Schmidt
* All rights reserved.
*
Modified: head/share/examples/scsi_target/scsi_cmds.c
==============================================================================
--- head/share/examples/scsi_target/scsi_cmds.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/scsi_target/scsi_cmds.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* SCSI Disk Emulator
*
* Copyright (c) 2002 Nate Lawson.
Modified: head/share/examples/scsi_target/scsi_target.c
==============================================================================
--- head/share/examples/scsi_target/scsi_target.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/scsi_target/scsi_target.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* SCSI Disk Emulator
*
* Copyright (c) 2002 Nate Lawson.
Modified: head/share/examples/scsi_target/scsi_target.h
==============================================================================
--- head/share/examples/scsi_target/scsi_target.h Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/examples/scsi_target/scsi_target.h Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* SCSI Target Emulator
*
* Copyright (c) 2002 Nate Lawson.
Modified: head/share/mk/version_gen.awk
==============================================================================
--- head/share/mk/version_gen.awk Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/mk/version_gen.awk Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
#
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (C) 2006 Daniel M. Eischen. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/share/syscons/scrnmaps/mkscrfil.c
==============================================================================
--- head/share/syscons/scrnmaps/mkscrfil.c Mon Nov 27 15:25:02 2017 (r326274)
+++ head/share/syscons/scrnmaps/mkscrfil.c Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1994 by Andrew A. Chernov, Moscow, Russia.
* All rights reserved.
*
Modified: head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-part.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/enable-net.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/enable-net.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/enable-net.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
# Copyright (c) 2011 The FreeBSD Foundation
# All rights reserved.
Modified: head/usr.sbin/pc-sysinstall/backend-query/get-packages.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/get-packages.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/get-packages.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/list-components.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/list-components.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/list-components.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/list-config.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/list-config.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/list-config.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/list-packages.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/list-packages.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/list-packages.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/query-langs.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/query-langs.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/query-langs.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/send-logs.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/set-mirror.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/set-mirror.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/set-mirror.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXSystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/test-live.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/test-live.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/test-live.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/test-netup.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/test-netup.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/test-netup.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
# Copyright (c) 2011 The FreeBSD Foundation
# All rights reserved.
Modified: head/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-disk.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-ftp.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-ftp.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-ftp.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-installpackages.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-localize.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-localize.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-localize.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-networking.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-networking.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-networking.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
# Copyright (c) 2011 The FreeBSD Foundation
# All rights reserved.
Modified: head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-packages.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-packages.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-packages.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-parse.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-parse.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-parse.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions-users.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-users.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions-users.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/functions.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/functions.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/installimage.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/installimage.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/installimage.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/parseconfig.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/parseconfig.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/parseconfig.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/backend/startautoinstall.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/startautoinstall.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/backend/startautoinstall.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -1,5 +1,7 @@
#!/bin/sh
#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh Mon Nov 27 15:25:02 2017 (r326274)
+++ head/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh Mon Nov 27 15:28:26 2017 (r326275)
@@ -6,6 +6,8 @@
# system installations, as well as calls which a front-end can use
# to retrive information about the system
#####################################################################
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
# Copyright 2010 iXsystems
# All rights reserved
#
From owner-svn-src-all@freebsd.org Mon Nov 27 15:37:29 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54AF7E55266;
Mon, 27 Nov 2017 15:37:29 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 979E677AD1;
Mon, 27 Nov 2017 15:37:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFbRZO011583;
Mon, 27 Nov 2017 15:37:27 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFbH9O011466;
Mon, 27 Nov 2017 15:37:17 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271537.vARFbH9O011466@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:37:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326276 - in head: bin/pkill etc/pam.d
kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_ntlm
kerberos5/lib/libgssapi_spnego sbin/adjkerntz sbin/camcontrol sbin/ccdconfig
sbin/comcon...
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head: bin/pkill etc/pam.d kerberos5/lib/libgssapi_krb5
kerberos5/lib/libgssapi_ntlm kerberos5/lib/libgssapi_spnego sbin/adjkerntz
sbin/camcontrol sbin/ccdconfig sbin/comcontrol sbin/conscontrol sbi...
X-SVN-Commit-Revision: 326276
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:37:29 -0000
Author: pfg
Date: Mon Nov 27 15:37:16 2017
New Revision: 326276
URL: https://svnweb.freebsd.org/changeset/base/326276
Log:
various: general adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
No functional change intended.
Modified:
head/bin/pkill/pkill.c
head/etc/pam.d/convert.pl
head/kerberos5/lib/libgssapi_krb5/gss_krb5.c
head/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
head/kerberos5/lib/libgssapi_krb5/prefix.c
head/kerberos5/lib/libgssapi_ntlm/prefix.c
head/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
head/sbin/adjkerntz/adjkerntz.c
head/sbin/adjkerntz/pathnames.h
head/sbin/camcontrol/camcontrol.h
head/sbin/camcontrol/fwdownload.c
head/sbin/camcontrol/modeedit.c
head/sbin/camcontrol/progress.c
head/sbin/camcontrol/progress.h
head/sbin/camcontrol/util.c
head/sbin/ccdconfig/ccdconfig.c
head/sbin/ccdconfig/pathnames.h
head/sbin/comcontrol/comcontrol.c
head/sbin/conscontrol/conscontrol.c
head/sbin/ddb/ddb.c
head/sbin/ddb/ddb.h
head/sbin/ddb/ddb_capture.c
head/sbin/ddb/ddb_script.c
head/sbin/devd/devd.h
head/sbin/devd/devd.hh
head/sbin/devd/parse.y
head/sbin/devd/token.l
head/sbin/devfs/devfs.c
head/sbin/devfs/extern.h
head/sbin/devfs/rule.c
head/sbin/etherswitchcfg/etherswitchcfg.c
head/sbin/fsck/fsutil.h
head/sbin/fsck_ffs/ea.c
head/sbin/fsck_ffs/suj.c
head/sbin/fsck_msdosfs/boot.c
head/sbin/fsck_msdosfs/check.c
head/sbin/fsck_msdosfs/dir.c
head/sbin/fsck_msdosfs/dosfs.h
head/sbin/fsck_msdosfs/ext.h
head/sbin/fsck_msdosfs/fat.c
head/sbin/fsck_msdosfs/main.c
head/sbin/fsdb/fsdb.c
head/sbin/fsdb/fsdb.h
head/sbin/fsdb/fsdbutil.c
head/sbin/fsirand/fsirand.c
head/sbin/gbde/gbde.c
head/sbin/geom/class/cache/geom_cache.c
head/sbin/geom/class/concat/geom_concat.c
head/sbin/geom/class/eli/geom_eli.c
head/sbin/geom/class/journal/geom_journal.c
head/sbin/geom/class/journal/geom_journal.h
head/sbin/geom/class/journal/geom_journal_ufs.c
head/sbin/geom/class/label/geom_label.c
head/sbin/geom/class/mirror/geom_mirror.c
head/sbin/geom/class/mountver/geom_mountver.c
head/sbin/geom/class/multipath/geom_multipath.c
head/sbin/geom/class/nop/geom_nop.c
head/sbin/geom/class/part/geom_part.c
head/sbin/geom/class/raid/geom_raid.c
head/sbin/geom/class/raid3/geom_raid3.c
head/sbin/geom/class/sched/geom_sched.c
head/sbin/geom/class/shsec/geom_shsec.c
head/sbin/geom/class/stripe/geom_stripe.c
head/sbin/geom/class/virstor/geom_virstor.c
head/sbin/geom/core/geom.c
head/sbin/geom/core/geom.h
head/sbin/geom/misc/subr.c
head/sbin/geom/misc/subr.h
head/sbin/ggate/ggatec/ggatec.c
head/sbin/ggate/ggated/ggated.c
head/sbin/ggate/ggatel/ggatel.c
head/sbin/ggate/shared/ggate.c
head/sbin/ggate/shared/ggate.h
head/sbin/gvinum/gvinum.c
head/sbin/hastctl/hastctl.c
head/sbin/hastd/activemap.c
head/sbin/hastd/activemap.h
head/sbin/hastd/control.c
head/sbin/hastd/control.h
head/sbin/hastd/ebuf.c
head/sbin/hastd/ebuf.h
head/sbin/hastd/event.c
head/sbin/hastd/event.h
head/sbin/hastd/hast.h
head/sbin/hastd/hast_checksum.c
head/sbin/hastd/hast_checksum.h
head/sbin/hastd/hast_compression.c
head/sbin/hastd/hast_compression.h
head/sbin/hastd/hast_proto.c
head/sbin/hastd/hast_proto.h
head/sbin/hastd/hastd.c
head/sbin/hastd/hastd.h
head/sbin/hastd/hooks.c
head/sbin/hastd/hooks.h
head/sbin/hastd/lzf.c
head/sbin/hastd/lzf.h
head/sbin/hastd/metadata.c
head/sbin/hastd/metadata.h
head/sbin/hastd/nv.c
head/sbin/hastd/nv.h
head/sbin/hastd/parse.y
head/sbin/hastd/pjdlog.c
head/sbin/hastd/pjdlog.h
head/sbin/hastd/primary.c
head/sbin/hastd/proto.c
head/sbin/hastd/proto.h
head/sbin/hastd/proto_common.c
head/sbin/hastd/proto_impl.h
head/sbin/hastd/proto_socketpair.c
head/sbin/hastd/proto_tcp.c
head/sbin/hastd/proto_uds.c
head/sbin/hastd/rangelock.c
head/sbin/hastd/rangelock.h
head/sbin/hastd/refcnt.h
head/sbin/hastd/secondary.c
head/sbin/hastd/subr.c
head/sbin/hastd/subr.h
head/sbin/hastd/synch.h
head/sbin/hastd/token.l
head/sbin/ifconfig/af_nd6.c
head/sbin/ifconfig/carp.c
head/sbin/ifconfig/ifbridge.c
head/sbin/ifconfig/ifconfig.h
head/sbin/ifconfig/iffib.c
head/sbin/ifconfig/ifgif.c
head/sbin/ifconfig/ifgre.c
head/sbin/ifconfig/ifgroup.c
head/sbin/ifconfig/ifieee80211.c
head/sbin/ifconfig/ifmac.c
head/sbin/ifconfig/ifpfsync.c
head/sbin/iscontrol/auth_subr.c
head/sbin/iscontrol/config.c
head/sbin/iscontrol/fsm.c
head/sbin/iscontrol/iscontrol.c
head/sbin/iscontrol/iscontrol.h
head/sbin/iscontrol/login.c
head/sbin/iscontrol/misc.c
head/sbin/iscontrol/pdu.c
head/sbin/kldconfig/kldconfig.c
head/sbin/kldload/kldload.c
head/sbin/kldstat/kldstat.c
head/sbin/kldunload/kldunload.c
head/sbin/ldconfig/elfhints.c
head/sbin/ldconfig/ldconfig.c
head/sbin/ldconfig/ldconfig.h
head/sbin/mdconfig/mdconfig.c
head/sbin/mdmfs/mdmfs.c
head/sbin/mksnap_ffs/mksnap_ffs.c
head/sbin/mount/extern.h
head/sbin/mount_fusefs/mount_fusefs.c
head/sbin/mount_msdosfs/mount_msdosfs.c
head/sbin/nandfs/lssnap.c
head/sbin/nandfs/mksnap.c
head/sbin/nandfs/nandfs.c
head/sbin/nandfs/nandfs.h
head/sbin/nandfs/rmsnap.c
head/sbin/newfs_msdos/newfs_msdos.c
head/sbin/newfs_nandfs/newfs_nandfs.c
head/sbin/nos-tun/nos-tun.c
head/sbin/nvmecontrol/devlist.c
head/sbin/nvmecontrol/firmware.c
head/sbin/nvmecontrol/identify.c
head/sbin/nvmecontrol/logpage.c
head/sbin/nvmecontrol/nvmecontrol.c
head/sbin/nvmecontrol/nvmecontrol.h
head/sbin/nvmecontrol/perftest.c
head/sbin/nvmecontrol/reset.c
head/sbin/pfctl/parse.y
head/sbin/pfctl/pf_print_state.c
head/sbin/pfctl/pfctl.c
head/sbin/pfctl/pfctl.h
head/sbin/pfctl/pfctl_parser.c
head/sbin/pfctl/pfctl_parser.h
head/sbin/pfctl/pfctl_radix.c
head/sbin/pfctl/pfctl_table.c
head/sbin/rcorder/rcorder.c
head/sbin/reboot/nextboot.sh
head/sbin/spppcontrol/spppcontrol.c
head/usr.bin/ar/acplex.l
head/usr.bin/ar/acpyacc.y
head/usr.bin/ar/ar.h
head/usr.bin/ar/read.c
head/usr.bin/ar/util.c
head/usr.bin/ar/write.c
head/usr.bin/asa/asa.c
head/usr.bin/at/at.c
head/usr.bin/at/at.h
head/usr.bin/at/panic.c
head/usr.bin/at/panic.h
head/usr.bin/at/parsetime.c
head/usr.bin/at/parsetime.h
head/usr.bin/at/perm.c
head/usr.bin/at/perm.h
head/usr.bin/at/privs.h
head/usr.bin/bluetooth/bthost/bthost.c
head/usr.bin/bluetooth/btsockstat/btsockstat.c
head/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
head/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
head/usr.bin/brandelf/brandelf.c
head/usr.bin/bsdiff/bsdiff/bsdiff.c
head/usr.bin/bsdiff/bspatch/bspatch.c
head/usr.bin/c89/c89.c
head/usr.bin/c99/c99.c
head/usr.bin/calendar/dates.c
head/usr.bin/calendar/events.c
head/usr.bin/calendar/ostern.c
head/usr.bin/calendar/parsedata.c
head/usr.bin/calendar/paskha.c
head/usr.bin/calendar/sunpos.c
head/usr.bin/cmp/link.c
head/usr.bin/colldef/parse.y
head/usr.bin/colldef/scan.l
head/usr.bin/compress/zopen.h
head/usr.bin/cpuset/cpuset.c
head/usr.bin/csplit/csplit.c
head/usr.bin/ctlstat/ctlstat.c
head/usr.bin/dtc/checking.cc
head/usr.bin/dtc/checking.hh
head/usr.bin/dtc/dtb.cc
head/usr.bin/dtc/dtb.hh
head/usr.bin/dtc/dtc.cc
head/usr.bin/dtc/fdt.cc
head/usr.bin/dtc/fdt.hh
head/usr.bin/dtc/input_buffer.cc
head/usr.bin/dtc/input_buffer.hh
head/usr.bin/dtc/string.cc
head/usr.bin/dtc/util.hh
head/usr.bin/elf2aout/elf2aout.c
head/usr.bin/elfdump/elfdump.c
head/usr.bin/env/envopts.c
head/usr.bin/env/envopts.h
head/usr.bin/fetch/fetch.c
head/usr.bin/finger/pathnames.h
head/usr.bin/fstat/functions.h
head/usr.bin/fstat/fuser.c
head/usr.bin/fstat/main.c
head/usr.bin/fsync/fsync.c
head/usr.bin/gcore/elfcore.c
head/usr.bin/gencat/gencat.c
head/usr.bin/getent/getent.c
head/usr.bin/grep/file.c
head/usr.bin/grep/grep.c
head/usr.bin/grep/grep.h
head/usr.bin/grep/queue.c
head/usr.bin/grep/regex/fastmatch.c
head/usr.bin/grep/regex/hashtable.c
head/usr.bin/grep/regex/tre-fastmatch.c
head/usr.bin/grep/util.c
head/usr.bin/gzip/gzip.c
head/usr.bin/gzip/unbzip2.c
head/usr.bin/gzip/unpack.c
head/usr.bin/gzip/unxz.c
head/usr.bin/iconv/iconv.c
head/usr.bin/indent/indent.h
head/usr.bin/ipcrm/ipcrm.c
head/usr.bin/ipcs/ipc.c
head/usr.bin/ipcs/ipc.h
head/usr.bin/ipcs/ipcs.c
head/usr.bin/iscsictl/iscsictl.c
head/usr.bin/iscsictl/iscsictl.h
head/usr.bin/iscsictl/parse.y
head/usr.bin/iscsictl/periphs.c
head/usr.bin/iscsictl/token.l
head/usr.bin/killall/killall.c
head/usr.bin/ktrdump/ktrdump.c
head/usr.bin/lastcomm/readrec.c
head/usr.bin/ldd/extern.h
head/usr.bin/ldd/ldd.c
head/usr.bin/ldd/sods.c
head/usr.bin/locale/locale.c
head/usr.bin/locate/locate/concatdb.sh
head/usr.bin/locate/locate/mklocatedb.sh
head/usr.bin/locate/locate/updatedb.sh
head/usr.bin/lockf/lockf.c
head/usr.bin/login/login.h
head/usr.bin/logins/logins.c
head/usr.bin/m4/gnum4.c
head/usr.bin/m4/trace.c
head/usr.bin/man/man.sh
head/usr.bin/mkcsmapper/ldef.h
head/usr.bin/mkcsmapper/lex.l
head/usr.bin/mkcsmapper/yacc.y
head/usr.bin/mkesdb/ldef.h
head/usr.bin/mkesdb/lex.l
head/usr.bin/mkesdb/yacc.y
head/usr.bin/mktemp/mktemp.c
head/usr.bin/mkuzip/mkuzip.c
head/usr.bin/ncal/ncal.c
head/usr.bin/netstat/bpf.c
head/usr.bin/netstat/netisr.c
head/usr.bin/newgrp/newgrp.c
head/usr.bin/nl/nl.c
head/usr.bin/passwd/passwd.c
head/usr.bin/pathchk/pathchk.c
head/usr.bin/perror/perror.c
head/usr.bin/procstat/procstat.c
head/usr.bin/procstat/procstat.h
head/usr.bin/procstat/procstat_args.c
head/usr.bin/procstat/procstat_auxv.c
head/usr.bin/procstat/procstat_basic.c
head/usr.bin/procstat/procstat_bin.c
head/usr.bin/procstat/procstat_cred.c
head/usr.bin/procstat/procstat_files.c
head/usr.bin/procstat/procstat_kstack.c
head/usr.bin/procstat/procstat_rlimit.c
head/usr.bin/procstat/procstat_sigs.c
head/usr.bin/procstat/procstat_threads.c
head/usr.bin/procstat/procstat_vm.c
head/usr.bin/protect/protect.c
head/usr.bin/rctl/rctl.c
head/usr.bin/revoke/revoke.c
head/usr.bin/seq/seq.c
head/usr.bin/setchannel/setchannel.c
head/usr.bin/sockstat/sockstat.c
head/usr.bin/sort/bwstring.c
head/usr.bin/sort/bwstring.h
head/usr.bin/sort/coll.c
head/usr.bin/sort/coll.h
head/usr.bin/sort/file.c
head/usr.bin/sort/file.h
head/usr.bin/sort/mem.c
head/usr.bin/sort/mem.h
head/usr.bin/sort/radixsort.c
head/usr.bin/sort/radixsort.h
head/usr.bin/sort/sort.c
head/usr.bin/sort/sort.h
head/usr.bin/sort/vsort.c
head/usr.bin/sort/vsort.h
head/usr.bin/ssh-copy-id/ssh-copy-id.sh
head/usr.bin/stat/stat.c
head/usr.bin/stdbuf/stdbuf.c
head/usr.bin/systat/convtbl.c
head/usr.bin/systat/convtbl.h
head/usr.bin/systat/devs.h
head/usr.bin/systat/ifcmds.c
head/usr.bin/systat/ifstat.c
head/usr.bin/tabs/tabs.c
head/usr.bin/tr/cmap.c
head/usr.bin/tr/cmap.h
head/usr.bin/tr/cset.c
head/usr.bin/tr/cset.h
head/usr.bin/truncate/truncate.c
head/usr.bin/truss/truss.h
head/usr.bin/unifdef/unifdef.c
head/usr.bin/unifdef/unifdef.h
head/usr.bin/unifdef/unifdefall.sh
head/usr.bin/units/units.c
head/usr.bin/unzip/unzip.c
head/usr.bin/usbhidaction/usbhidaction.c
head/usr.bin/usbhidctl/usbhid.c
head/usr.bin/whereis/pathnames.h
head/usr.bin/whereis/whereis.c
head/usr.bin/which/which.c
head/usr.bin/who/who.c
head/usr.bin/ypcat/ypcat.c
head/usr.bin/ypmatch/ypmatch.c
head/usr.bin/ypwhich/ypwhich.c
head/usr.sbin/ac/ac.c
head/usr.sbin/acpi/acpiconf/acpiconf.c
head/usr.sbin/acpi/acpidb/acpidb.c
head/usr.sbin/acpi/acpidump/acpi.c
head/usr.sbin/acpi/acpidump/acpi_user.c
head/usr.sbin/acpi/acpidump/acpidump.c
head/usr.sbin/acpi/acpidump/acpidump.h
head/usr.sbin/adduser/adduser.sh
head/usr.sbin/adduser/rmuser.sh
head/usr.sbin/apmd/apmd.c
head/usr.sbin/apmd/apmd.h
head/usr.sbin/apmd/apmdlex.l
head/usr.sbin/apmd/apmdparse.y
head/usr.sbin/asf/asf.c
head/usr.sbin/asf/asf.h
head/usr.sbin/asf/asf_kld.c
head/usr.sbin/asf/asf_kvm.c
head/usr.sbin/asf/asf_prog.c
head/usr.sbin/bhyve/acpi.c
head/usr.sbin/bhyve/acpi.h
head/usr.sbin/bhyve/ahci.h
head/usr.sbin/bhyve/bhyverun.c
head/usr.sbin/bhyve/bhyverun.h
head/usr.sbin/bhyve/block_if.c
head/usr.sbin/bhyve/block_if.h
head/usr.sbin/bhyve/consport.c
head/usr.sbin/bhyve/dbgport.c
head/usr.sbin/bhyve/dbgport.h
head/usr.sbin/bhyve/inout.c
head/usr.sbin/bhyve/inout.h
head/usr.sbin/bhyve/ioapic.c
head/usr.sbin/bhyve/ioapic.h
head/usr.sbin/bhyve/mem.c
head/usr.sbin/bhyve/mem.h
head/usr.sbin/bhyve/mevent.c
head/usr.sbin/bhyve/mevent.h
head/usr.sbin/bhyve/mevent_test.c
head/usr.sbin/bhyve/mptbl.c
head/usr.sbin/bhyve/mptbl.h
head/usr.sbin/bhyve/pci_ahci.c
head/usr.sbin/bhyve/pci_emul.c
head/usr.sbin/bhyve/pci_emul.h
head/usr.sbin/bhyve/pci_hostbridge.c
head/usr.sbin/bhyve/pci_lpc.c
head/usr.sbin/bhyve/pci_lpc.h
head/usr.sbin/bhyve/pci_passthru.c
head/usr.sbin/bhyve/pci_uart.c
head/usr.sbin/bhyve/pci_virtio_block.c
head/usr.sbin/bhyve/pci_virtio_net.c
head/usr.sbin/bhyve/pm.c
head/usr.sbin/bhyve/post.c
head/usr.sbin/bhyve/rtc.c
head/usr.sbin/bhyve/rtc.h
head/usr.sbin/bhyve/smbiostbl.c
head/usr.sbin/bhyve/smbiostbl.h
head/usr.sbin/bhyve/spinup_ap.c
head/usr.sbin/bhyve/spinup_ap.h
head/usr.sbin/bhyve/uart_emul.c
head/usr.sbin/bhyve/uart_emul.h
head/usr.sbin/bhyve/virtio.c
head/usr.sbin/bhyve/virtio.h
head/usr.sbin/bhyve/xmsr.c
head/usr.sbin/bhyve/xmsr.h
head/usr.sbin/bhyvectl/bhyvectl.c
head/usr.sbin/bhyveload/bhyveload.c
head/usr.sbin/bluetooth/bcmfw/bcmfw.c
head/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
head/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
head/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h
head/usr.sbin/bluetooth/bthidcontrol/hid.c
head/usr.sbin/bluetooth/bthidcontrol/sdp.c
head/usr.sbin/bluetooth/bthidd/bthid_config.h
head/usr.sbin/bluetooth/bthidd/bthidd.c
head/usr.sbin/bluetooth/bthidd/bthidd.h
head/usr.sbin/bluetooth/bthidd/client.c
head/usr.sbin/bluetooth/bthidd/hid.c
head/usr.sbin/bluetooth/bthidd/kbd.c
head/usr.sbin/bluetooth/bthidd/kbd.h
head/usr.sbin/bluetooth/bthidd/lexer.l
head/usr.sbin/bluetooth/bthidd/parser.y
head/usr.sbin/bluetooth/bthidd/server.c
head/usr.sbin/bluetooth/bthidd/session.c
head/usr.sbin/bluetooth/btpand/bnep.c
head/usr.sbin/bluetooth/btpand/bnep.h
head/usr.sbin/bluetooth/btpand/btpand.c
head/usr.sbin/bluetooth/btpand/btpand.h
head/usr.sbin/bluetooth/btpand/channel.c
head/usr.sbin/bluetooth/btpand/client.c
head/usr.sbin/bluetooth/btpand/event.c
head/usr.sbin/bluetooth/btpand/event.h
head/usr.sbin/bluetooth/btpand/packet.c
head/usr.sbin/bluetooth/btpand/sdp.c
head/usr.sbin/bluetooth/btpand/sdp.h
head/usr.sbin/bluetooth/btpand/server.c
head/usr.sbin/bluetooth/btpand/tap.c
head/usr.sbin/bluetooth/hccontrol/hccontrol.c
head/usr.sbin/bluetooth/hccontrol/hccontrol.h
head/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
head/usr.sbin/bluetooth/hccontrol/info.c
head/usr.sbin/bluetooth/hccontrol/link_control.c
head/usr.sbin/bluetooth/hccontrol/link_policy.c
head/usr.sbin/bluetooth/hccontrol/node.c
head/usr.sbin/bluetooth/hccontrol/send_recv.c
head/usr.sbin/bluetooth/hccontrol/status.c
head/usr.sbin/bluetooth/hccontrol/util.c
head/usr.sbin/bluetooth/hcsecd/hcsecd.c
head/usr.sbin/bluetooth/hcsecd/hcsecd.h
head/usr.sbin/bluetooth/hcsecd/lexer.l
head/usr.sbin/bluetooth/hcsecd/parser.y
head/usr.sbin/bluetooth/hcseriald/hcseriald.c
head/usr.sbin/bluetooth/l2control/l2cap.c
head/usr.sbin/bluetooth/l2control/l2control.c
head/usr.sbin/bluetooth/l2control/l2control.h
head/usr.sbin/bluetooth/l2ping/l2ping.c
head/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
head/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
head/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h
head/usr.sbin/bluetooth/sdpcontrol/search.c
head/usr.sbin/bluetooth/sdpd/bgd.c
head/usr.sbin/bluetooth/sdpd/dun.c
head/usr.sbin/bluetooth/sdpd/ftrn.c
head/usr.sbin/bluetooth/sdpd/gn.c
head/usr.sbin/bluetooth/sdpd/irmc.c
head/usr.sbin/bluetooth/sdpd/irmc_command.c
head/usr.sbin/bluetooth/sdpd/lan.c
head/usr.sbin/bluetooth/sdpd/log.c
head/usr.sbin/bluetooth/sdpd/log.h
head/usr.sbin/bluetooth/sdpd/main.c
head/usr.sbin/bluetooth/sdpd/nap.c
head/usr.sbin/bluetooth/sdpd/opush.c
head/usr.sbin/bluetooth/sdpd/panu.c
head/usr.sbin/bluetooth/sdpd/profile.c
head/usr.sbin/bluetooth/sdpd/profile.h
head/usr.sbin/bluetooth/sdpd/provider.c
head/usr.sbin/bluetooth/sdpd/provider.h
head/usr.sbin/bluetooth/sdpd/sar.c
head/usr.sbin/bluetooth/sdpd/scr.c
head/usr.sbin/bluetooth/sdpd/sd.c
head/usr.sbin/bluetooth/sdpd/server.c
head/usr.sbin/bluetooth/sdpd/server.h
head/usr.sbin/bluetooth/sdpd/sp.c
head/usr.sbin/bluetooth/sdpd/srr.c
head/usr.sbin/bluetooth/sdpd/ssar.c
head/usr.sbin/bluetooth/sdpd/ssr.c
head/usr.sbin/bluetooth/sdpd/sur.c
head/usr.sbin/bluetooth/sdpd/uuid-private.h
head/usr.sbin/bluetooth/sdpd/uuid.c
head/usr.sbin/boot0cfg/boot0cfg.c
head/usr.sbin/bsdinstall/distextract/distextract.c
head/usr.sbin/bsdinstall/distfetch/distfetch.c
head/usr.sbin/bsdinstall/partedit/diskeditor.c
head/usr.sbin/bsdinstall/partedit/diskeditor.h
head/usr.sbin/bsdinstall/partedit/gpart_ops.c
head/usr.sbin/bsdinstall/partedit/part_wizard.c
head/usr.sbin/bsdinstall/partedit/partedit.c
head/usr.sbin/bsdinstall/partedit/partedit.h
head/usr.sbin/bsdinstall/partedit/partedit_generic.c
head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
head/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
head/usr.sbin/bsdinstall/partedit/partedit_x86.c
head/usr.sbin/bsdinstall/partedit/scripted.c
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
head/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c
head/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
head/usr.sbin/btxld/btx.h
head/usr.sbin/btxld/btxld.c
head/usr.sbin/btxld/elfh.c
head/usr.sbin/btxld/elfh.h
head/usr.sbin/chkgrp/chkgrp.c
head/usr.sbin/ckdist/ckdist.c
head/usr.sbin/clear_locks/clear_locks.c
head/usr.sbin/cpucontrol/amd.c
head/usr.sbin/cpucontrol/amd.h
head/usr.sbin/cpucontrol/cpucontrol.c
head/usr.sbin/cpucontrol/cpucontrol.h
head/usr.sbin/cpucontrol/intel.c
head/usr.sbin/cpucontrol/intel.h
head/usr.sbin/cpucontrol/via.c
head/usr.sbin/cpucontrol/via.h
head/usr.sbin/crunch/crunchide/exec_elf32.c
head/usr.sbin/crunch/crunchide/exec_elf64.c
head/usr.sbin/crunch/crunchide/extern.h
head/usr.sbin/ctladm/ctladm.h
head/usr.sbin/ctladm/util.c
head/usr.sbin/ctld/ctld.c
head/usr.sbin/ctld/ctld.h
head/usr.sbin/ctld/discovery.c
head/usr.sbin/ctld/kernel.c
head/usr.sbin/ctld/keys.c
head/usr.sbin/ctld/log.c
head/usr.sbin/ctld/login.c
head/usr.sbin/ctld/parse.y
head/usr.sbin/ctld/pdu.c
head/usr.sbin/ctld/token.l
head/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
head/usr.sbin/daemon/daemon.c
head/usr.sbin/devinfo/devinfo.c
head/usr.sbin/digictl/digictl.c
head/usr.sbin/diskinfo/diskinfo.c
head/usr.sbin/dumpcis/cardinfo.h
head/usr.sbin/dumpcis/cis.h
head/usr.sbin/dumpcis/main.c
head/usr.sbin/dumpcis/printcis.c
head/usr.sbin/dumpcis/readcis.c
head/usr.sbin/dumpcis/readcis.h
head/usr.sbin/eeprom/eeprom.c
head/usr.sbin/eeprom/ofw_options.c
head/usr.sbin/eeprom/ofw_options.h
head/usr.sbin/etcupdate/etcupdate.sh
head/usr.sbin/extattr/rmextattr.c
head/usr.sbin/extattrctl/extattrctl.c
head/usr.sbin/fdcontrol/fdcontrol.c
head/usr.sbin/fdformat/fdformat.c
head/usr.sbin/fdread/fdread.c
head/usr.sbin/fdread/fdutil.c
head/usr.sbin/fdread/fdutil.h
head/usr.sbin/fifolog/fifolog_create/fifolog_create.c
head/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c
head/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c
head/usr.sbin/fifolog/lib/fifolog.h
head/usr.sbin/fifolog/lib/fifolog_create.c
head/usr.sbin/fifolog/lib/fifolog_int.c
head/usr.sbin/fifolog/lib/fifolog_reader.c
head/usr.sbin/fifolog/lib/fifolog_write.h
head/usr.sbin/fifolog/lib/fifolog_write_poll.c
head/usr.sbin/fifolog/lib/libfifolog.h
head/usr.sbin/fifolog/lib/libfifolog_int.h
head/usr.sbin/fifolog/lib/miniobj.h
head/usr.sbin/flowctl/flowctl.c
head/usr.sbin/freebsd-update/freebsd-update.sh
head/usr.sbin/getfmac/getfmac.c
head/usr.sbin/getpmac/getpmac.c
head/usr.sbin/gpioctl/gpioctl.c
head/usr.sbin/gssd/gssd.c
head/usr.sbin/gstat/gstat.c
head/usr.sbin/i2c/i2c.c
head/usr.sbin/inetd/builtins.c
head/usr.sbin/iscsid/discovery.c
head/usr.sbin/iscsid/iscsid.c
head/usr.sbin/iscsid/iscsid.h
head/usr.sbin/iscsid/keys.c
head/usr.sbin/iscsid/log.c
head/usr.sbin/iscsid/login.c
head/usr.sbin/iscsid/pdu.c
head/usr.sbin/jail/command.c
head/usr.sbin/jail/config.c
head/usr.sbin/jail/jail.c
head/usr.sbin/jail/jaillex.l
head/usr.sbin/jail/jailp.h
head/usr.sbin/jail/jailparse.y
head/usr.sbin/jail/state.c
head/usr.sbin/jexec/jexec.c
head/usr.sbin/jls/jls.c
head/usr.sbin/kbdcontrol/kbdcontrol.c
head/usr.sbin/kbdcontrol/lex.h
head/usr.sbin/kbdcontrol/lex.l
head/usr.sbin/kbdmap/kbdmap.c
head/usr.sbin/kbdmap/kbdmap.h
head/usr.sbin/kgzip/aouthdr.c
head/usr.sbin/kgzip/aouthdr.h
head/usr.sbin/kgzip/elfhdr.c
head/usr.sbin/kgzip/elfhdr.h
head/usr.sbin/kgzip/kgz.h
head/usr.sbin/kgzip/kgzcmp.c
head/usr.sbin/kgzip/kgzip.c
head/usr.sbin/kgzip/kgzip.h
head/usr.sbin/kgzip/kgzld.c
head/usr.sbin/kgzip/xio.c
head/usr.sbin/kldxref/ef_amd64.c
head/usr.sbin/kldxref/ef_i386.c
head/usr.sbin/kldxref/ef_nop.c
head/usr.sbin/kldxref/ef_powerpc.c
head/usr.sbin/kldxref/ef_sparc64.c
head/usr.sbin/lastlogin/lastlogin.c
head/usr.sbin/lpr/chkprintcap/skimprintcap.c
head/usr.sbin/lpr/chkprintcap/skimprintcap.h
head/usr.sbin/lpr/common_source/ctlinfo.c
head/usr.sbin/lpr/common_source/ctlinfo.h
head/usr.sbin/lpr/common_source/lp.cdefs.h
head/usr.sbin/lpr/common_source/matchjobs.c
head/usr.sbin/lpr/common_source/matchjobs.h
head/usr.sbin/lpr/filters.ru/koi2855/koi2855.c
head/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c
head/usr.sbin/lpr/lp/lp.sh
head/usr.sbin/lpr/lpc/movejobs.c
head/usr.sbin/lptcontrol/lptcontrol.c
head/usr.sbin/mailwrapper/mailwrapper.c
head/usr.sbin/mailwrapper/pathnames.h
head/usr.sbin/makefs/cd9660.c
head/usr.sbin/makefs/cd9660.h
head/usr.sbin/makefs/cd9660/cd9660_archimedes.c
head/usr.sbin/makefs/cd9660/cd9660_archimedes.h
head/usr.sbin/makefs/cd9660/cd9660_conversion.c
head/usr.sbin/makefs/cd9660/cd9660_debug.c
head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
head/usr.sbin/makefs/cd9660/cd9660_eltorito.h
head/usr.sbin/makefs/cd9660/cd9660_strings.c
head/usr.sbin/makefs/cd9660/cd9660_write.c
head/usr.sbin/makefs/cd9660/iso9660_rrip.c
head/usr.sbin/makefs/cd9660/iso9660_rrip.h
head/usr.sbin/makefs/ffs.h
head/usr.sbin/makefs/ffs/buf.c
head/usr.sbin/makefs/ffs/buf.h
head/usr.sbin/makefs/ffs/ffs_bswap.c
head/usr.sbin/makefs/ffs/newfs_extern.h
head/usr.sbin/makefs/ffs/ufs_bswap.h
head/usr.sbin/makefs/makefs.c
head/usr.sbin/makefs/makefs.h
head/usr.sbin/makefs/mtree.c
head/usr.sbin/makefs/walk.c
head/usr.sbin/memcontrol/memcontrol.c
head/usr.sbin/mfiutil/mfi_bbu.c
head/usr.sbin/mfiutil/mfi_cmd.c
head/usr.sbin/mfiutil/mfi_config.c
head/usr.sbin/mfiutil/mfi_drive.c
head/usr.sbin/mfiutil/mfi_evt.c
head/usr.sbin/mfiutil/mfi_flash.c
head/usr.sbin/mfiutil/mfi_foreign.c
head/usr.sbin/mfiutil/mfi_patrol.c
head/usr.sbin/mfiutil/mfi_properties.c
head/usr.sbin/mfiutil/mfi_show.c
head/usr.sbin/mfiutil/mfi_volume.c
head/usr.sbin/mfiutil/mfiutil.c
head/usr.sbin/mfiutil/mfiutil.h
head/usr.sbin/mlxcontrol/command.c
head/usr.sbin/mlxcontrol/config.c
head/usr.sbin/mlxcontrol/interface.c
head/usr.sbin/mlxcontrol/mlxcontrol.h
head/usr.sbin/mlxcontrol/util.c
head/usr.sbin/moused/moused.c
head/usr.sbin/mptable/mptable.c
head/usr.sbin/mtest/mtest.c
head/usr.sbin/nandsim/nandsim.c
head/usr.sbin/nandsim/nandsim_cfgparse.c
head/usr.sbin/nandsim/nandsim_cfgparse.h
head/usr.sbin/nandtool/nand_erase.c
head/usr.sbin/nandtool/nand_info.c
head/usr.sbin/nandtool/nand_read.c
head/usr.sbin/nandtool/nand_readoob.c
head/usr.sbin/nandtool/nand_write.c
head/usr.sbin/nandtool/nand_writeoob.c
head/usr.sbin/nandtool/nandtool.c
head/usr.sbin/nandtool/nandtool.h
head/usr.sbin/nandtool/usage.h
head/usr.sbin/newsyslog/extern.h
head/usr.sbin/pciconf/err.c
head/usr.sbin/pkg/config.c
head/usr.sbin/pkg/config.h
head/usr.sbin/pkg/dns_utils.c
head/usr.sbin/pkg/dns_utils.h
head/usr.sbin/pkg/pkg.c
head/usr.sbin/pmcannotate/pmcannotate.c
head/usr.sbin/pmccontrol/pmccontrol.c
head/usr.sbin/pmcstat/pmcpl_annotate.c
head/usr.sbin/pmcstat/pmcpl_annotate.h
head/usr.sbin/pmcstat/pmcpl_annotate_cg.c
head/usr.sbin/pmcstat/pmcpl_annotate_cg.h
head/usr.sbin/pmcstat/pmcpl_callgraph.c
head/usr.sbin/pmcstat/pmcpl_callgraph.h
head/usr.sbin/pmcstat/pmcpl_calltree.c
head/usr.sbin/pmcstat/pmcpl_calltree.h
head/usr.sbin/pmcstat/pmcpl_gprof.c
head/usr.sbin/pmcstat/pmcpl_gprof.h
head/usr.sbin/pmcstat/pmcstat.c
head/usr.sbin/pmcstat/pmcstat.h
head/usr.sbin/pmcstat/pmcstat_log.c
head/usr.sbin/pmcstat/pmcstat_log.h
head/usr.sbin/pmcstat/pmcstat_top.h
head/usr.sbin/portsnap/make_index/make_index.c
head/usr.sbin/portsnap/phttpget/phttpget.c
head/usr.sbin/portsnap/portsnap/portsnap.sh
head/usr.sbin/powerd/powerd.c
head/usr.sbin/ppp/acf.c
head/usr.sbin/ppp/acf.h
head/usr.sbin/ppp/arp.c
head/usr.sbin/ppp/arp.h
head/usr.sbin/ppp/async.c
head/usr.sbin/ppp/async.h
head/usr.sbin/ppp/auth.c
head/usr.sbin/ppp/auth.h
head/usr.sbin/ppp/bundle.c
head/usr.sbin/ppp/bundle.h
head/usr.sbin/ppp/cbcp.c
head/usr.sbin/ppp/cbcp.h
head/usr.sbin/ppp/ccp.c
head/usr.sbin/ppp/ccp.h
head/usr.sbin/ppp/chap.c
head/usr.sbin/ppp/chap.h
head/usr.sbin/ppp/chap_ms.c
head/usr.sbin/ppp/chap_ms.h
head/usr.sbin/ppp/chat.c
head/usr.sbin/ppp/chat.h
head/usr.sbin/ppp/command.c
head/usr.sbin/ppp/command.h
head/usr.sbin/ppp/datalink.c
head/usr.sbin/ppp/datalink.h
head/usr.sbin/ppp/deflate.c
head/usr.sbin/ppp/deflate.h
head/usr.sbin/ppp/defs.c
head/usr.sbin/ppp/defs.h
head/usr.sbin/ppp/descriptor.h
head/usr.sbin/ppp/ether.c
head/usr.sbin/ppp/ether.h
head/usr.sbin/ppp/exec.c
head/usr.sbin/ppp/exec.h
head/usr.sbin/ppp/filter.c
head/usr.sbin/ppp/filter.h
head/usr.sbin/ppp/fsm.c
head/usr.sbin/ppp/fsm.h
head/usr.sbin/ppp/hdlc.c
head/usr.sbin/ppp/hdlc.h
head/usr.sbin/ppp/i4b.h
head/usr.sbin/ppp/id.c
head/usr.sbin/ppp/id.h
head/usr.sbin/ppp/iface.c
head/usr.sbin/ppp/iface.h
head/usr.sbin/ppp/ip.c
head/usr.sbin/ppp/ip.h
head/usr.sbin/ppp/ipcp.c
head/usr.sbin/ppp/ipcp.h
head/usr.sbin/ppp/iplist.c
head/usr.sbin/ppp/iplist.h
head/usr.sbin/ppp/ipv6cp.c
head/usr.sbin/ppp/ipv6cp.h
head/usr.sbin/ppp/layer.h
head/usr.sbin/ppp/lcp.c
head/usr.sbin/ppp/lcp.h
head/usr.sbin/ppp/link.c
head/usr.sbin/ppp/link.h
head/usr.sbin/ppp/log.c
head/usr.sbin/ppp/log.h
head/usr.sbin/ppp/lqr.c
head/usr.sbin/ppp/lqr.h
head/usr.sbin/ppp/main.c
head/usr.sbin/ppp/main.h
head/usr.sbin/ppp/mbuf.c
head/usr.sbin/ppp/mbuf.h
head/usr.sbin/ppp/mp.c
head/usr.sbin/ppp/mp.h
head/usr.sbin/ppp/mppe.c
head/usr.sbin/ppp/mppe.h
head/usr.sbin/ppp/nat_cmd.c
head/usr.sbin/ppp/nat_cmd.h
head/usr.sbin/ppp/ncp.c
head/usr.sbin/ppp/ncp.h
head/usr.sbin/ppp/ncpaddr.c
head/usr.sbin/ppp/ncpaddr.h
head/usr.sbin/ppp/netgraph.c
head/usr.sbin/ppp/netgraph.h
head/usr.sbin/ppp/pap.c
head/usr.sbin/ppp/pap.h
head/usr.sbin/ppp/pred.c
head/usr.sbin/ppp/pred.h
head/usr.sbin/ppp/probe.c
head/usr.sbin/ppp/probe.h
head/usr.sbin/ppp/prompt.c
head/usr.sbin/ppp/prompt.h
head/usr.sbin/ppp/proto.c
head/usr.sbin/ppp/proto.h
head/usr.sbin/ppp/radius.c
head/usr.sbin/ppp/radius.h
head/usr.sbin/ppp/route.c
head/usr.sbin/ppp/route.h
head/usr.sbin/ppp/server.c
head/usr.sbin/ppp/server.h
head/usr.sbin/ppp/sig.c
head/usr.sbin/ppp/sig.h
head/usr.sbin/ppp/sync.c
head/usr.sbin/ppp/sync.h
head/usr.sbin/ppp/systems.c
head/usr.sbin/ppp/systems.h
head/usr.sbin/ppp/tcp.c
head/usr.sbin/ppp/tcp.h
head/usr.sbin/ppp/tcpmss.c
head/usr.sbin/ppp/tcpmss.h
head/usr.sbin/ppp/throughput.c
head/usr.sbin/ppp/throughput.h
head/usr.sbin/ppp/timer.c
head/usr.sbin/ppp/timer.h
head/usr.sbin/ppp/tty.c
head/usr.sbin/ppp/tty.h
head/usr.sbin/ppp/tun.c
head/usr.sbin/ppp/tun.h
head/usr.sbin/ppp/ua.h
head/usr.sbin/ppp/udp.c
head/usr.sbin/ppp/udp.h
head/usr.sbin/ppp/vjcomp.c
head/usr.sbin/ppp/vjcomp.h
head/usr.sbin/pppctl/pppctl.c
head/usr.sbin/pw/bitmap.c
head/usr.sbin/pw/bitmap.h
head/usr.sbin/pw/cpdir.c
head/usr.sbin/pw/grupd.c
head/usr.sbin/pw/psdate.c
head/usr.sbin/pw/psdate.h
head/usr.sbin/pw/pw.c
head/usr.sbin/pw/pw.h
head/usr.sbin/pw/pw_conf.c
head/usr.sbin/pw/pw_group.c
head/usr.sbin/pw/pw_log.c
head/usr.sbin/pw/pw_nis.c
head/usr.sbin/pw/pw_user.c
head/usr.sbin/pw/pw_vpw.c
head/usr.sbin/pw/pwupd.c
head/usr.sbin/pw/pwupd.h
head/usr.sbin/pw/rm_r.c
head/usr.sbin/quot/quot.c
head/usr.sbin/rarpd/rarpd.c
head/usr.sbin/rpc.lockd/kern.c
head/usr.sbin/rpc.umntall/mounttab.c
head/usr.sbin/rpc.umntall/mounttab.h
head/usr.sbin/rpc.umntall/rpc.umntall.c
head/usr.sbin/rpcbind/util.c
head/usr.sbin/rtadvctl/rtadvctl.c
head/usr.sbin/rtadvd/advcap.h
head/usr.sbin/rtadvd/control.c
head/usr.sbin/rtadvd/control.h
head/usr.sbin/rtadvd/control_client.c
head/usr.sbin/rtadvd/control_client.h
head/usr.sbin/rtadvd/control_server.c
head/usr.sbin/rtadvd/control_server.h
head/usr.sbin/rtprio/rtprio.c
head/usr.sbin/sa/db.c
head/usr.sbin/sa/extern.h
head/usr.sbin/sa/main.c
head/usr.sbin/sa/pathnames.h
head/usr.sbin/sa/pdb.c
head/usr.sbin/sa/usrdb.c
head/usr.sbin/service/service.sh
head/usr.sbin/services_mkdb/extern.h
head/usr.sbin/services_mkdb/services_mkdb.c
head/usr.sbin/services_mkdb/uniq.c
head/usr.sbin/setfmac/setfmac.c
head/usr.sbin/setpmac/setpmac.c
head/usr.sbin/smbmsg/pathnames.h
head/usr.sbin/smbmsg/smbmsg.c
head/usr.sbin/snapinfo/snapinfo.c
head/usr.sbin/spkrtest/spkrtest.sh
head/usr.sbin/spray/spray.c
head/usr.sbin/traceroute/findsaddr-udp.c
head/usr.sbin/uathload/uathload.c
head/usr.sbin/ugidfw/ugidfw.c
head/usr.sbin/uhsoctl/uhsoctl.c
head/usr.sbin/unbound/local-setup/local-unbound-setup.sh
head/usr.sbin/usbconfig/dump.c
head/usr.sbin/usbconfig/dump.h
head/usr.sbin/usbconfig/usbconfig.c
head/usr.sbin/usbdump/usbdump.c
head/usr.sbin/utx/utx.c
head/usr.sbin/vidcontrol/decode.c
head/usr.sbin/vidcontrol/vidcontrol.c
head/usr.sbin/wake/wake.c
head/usr.sbin/watch/watch.c
head/usr.sbin/watchdogd/watchdogd.c
head/usr.sbin/wlandebug/wlandebug.c
head/usr.sbin/ypbind/ypbind.c
head/usr.sbin/yppoll/yppoll.c
head/usr.sbin/ypset/ypset.c
Modified: head/bin/pkill/pkill.c
==============================================================================
--- head/bin/pkill/pkill.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/bin/pkill/pkill.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: pkill.c,v 1.16 2005/10/10 22:13:20 kleink Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 2002 The NetBSD Foundation, Inc.
* Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/etc/pam.d/convert.pl
==============================================================================
--- head/etc/pam.d/convert.pl Mon Nov 27 15:28:26 2017 (r326275)
+++ head/etc/pam.d/convert.pl Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,5 +1,7 @@
#!/usr/bin/perl -w
#-
+# SPDX-License-Identifier: BSD-3-Clause
+#
# Copyright (c) 2001,2002 Networks Associates Technologies, Inc.
# All rights reserved.
#
Modified: head/kerberos5/lib/libgssapi_krb5/gss_krb5.c
==============================================================================
--- head/kerberos5/lib/libgssapi_krb5/gss_krb5.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/kerberos5/lib/libgssapi_krb5/gss_krb5.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
==============================================================================
--- head/kerberos5/lib/libgssapi_krb5/pname_to_uid.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/kerberos5/lib/libgssapi_krb5/pname_to_uid.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/kerberos5/lib/libgssapi_krb5/prefix.c
==============================================================================
--- head/kerberos5/lib/libgssapi_krb5/prefix.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/kerberos5/lib/libgssapi_krb5/prefix.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
Modified: head/kerberos5/lib/libgssapi_ntlm/prefix.c
==============================================================================
--- head/kerberos5/lib/libgssapi_ntlm/prefix.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/kerberos5/lib/libgssapi_ntlm/prefix.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
Modified: head/kerberos5/lib/libgssapi_spnego/freebsd_compat.c
==============================================================================
--- head/kerberos5/lib/libgssapi_spnego/freebsd_compat.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/kerberos5/lib/libgssapi_spnego/freebsd_compat.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Doug Rabson
* All rights reserved.
*
Modified: head/sbin/adjkerntz/adjkerntz.c
==============================================================================
--- head/sbin/adjkerntz/adjkerntz.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/adjkerntz/adjkerntz.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993-1998 by Andrey A. Chernov, Moscow, Russia.
* All rights reserved.
*
Modified: head/sbin/adjkerntz/pathnames.h
==============================================================================
--- head/sbin/adjkerntz/pathnames.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/adjkerntz/pathnames.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1993 by Andrew A. Chernov, Moscow, Russia.
* All rights reserved.
*
@@ -22,6 +24,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#include <paths.h>
Modified: head/sbin/camcontrol/camcontrol.h
==============================================================================
--- head/sbin/camcontrol/camcontrol.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/camcontrol/camcontrol.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1998 Kenneth D. Merry.
* All rights reserved.
*
Modified: head/sbin/camcontrol/fwdownload.c
==============================================================================
--- head/sbin/camcontrol/fwdownload.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/camcontrol/fwdownload.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Sandvine Incorporated. All rights reserved.
* Copyright (c) 2002-2011 Andre Albsmeier <andre@albsmeier.net>
* All rights reserved.
Modified: head/sbin/camcontrol/modeedit.c
==============================================================================
--- head/sbin/camcontrol/modeedit.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/camcontrol/modeedit.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000 Kelly Yancey <kbyanc@posi.net>
* Derived from work done by Julian Elischer <julian@tfs.com,
* julian@dialix.oz.au>, 1993, and Peter Dufault <dufault@hda.com>, 1994.
Modified: head/sbin/camcontrol/progress.c
==============================================================================
--- head/sbin/camcontrol/progress.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/camcontrol/progress.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sbin/camcontrol/progress.h
==============================================================================
--- head/sbin/camcontrol/progress.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/camcontrol/progress.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
* Copyright (c) 1997-2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
Modified: head/sbin/camcontrol/util.c
==============================================================================
--- head/sbin/camcontrol/util.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/camcontrol/util.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Written By Julian ELischer
* Copyright julian Elischer 1993.
* Permission is granted to use or redistribute this file in any way as long
Modified: head/sbin/ccdconfig/ccdconfig.c
==============================================================================
--- head/sbin/ccdconfig/ccdconfig.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ccdconfig/ccdconfig.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 2003 Poul-Henning Kamp
* Copyright (c) 1995 Jason R. Thorpe.
* All rights reserved.
Modified: head/sbin/ccdconfig/pathnames.h
==============================================================================
--- head/sbin/ccdconfig/pathnames.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ccdconfig/pathnames.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: pathnames.h,v 1.1 1995/08/17 16:37:20 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
* Copyright (c) 1995 Jason R. Thorpe.
* All rights reserved.
*
Modified: head/sbin/comcontrol/comcontrol.c
==============================================================================
--- head/sbin/comcontrol/comcontrol.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/comcontrol/comcontrol.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1992 Christopher G. Demetriou
* All rights reserved.
*
Modified: head/sbin/conscontrol/conscontrol.c
==============================================================================
--- head/sbin/conscontrol/conscontrol.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/conscontrol/conscontrol.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001 Jonathan Lemon <jlemon@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/ddb/ddb.c
==============================================================================
--- head/sbin/ddb/ddb.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ddb/ddb.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sbin/ddb/ddb.h
==============================================================================
--- head/sbin/ddb/ddb.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ddb/ddb.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sbin/ddb/ddb_capture.c
==============================================================================
--- head/sbin/ddb/ddb_capture.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ddb/ddb_capture.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sbin/ddb/ddb_script.c
==============================================================================
--- head/sbin/ddb/ddb_script.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ddb/ddb_script.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007 Robert N. M. Watson
* All rights reserved.
*
Modified: head/sbin/devd/devd.h
==============================================================================
--- head/sbin/devd/devd.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/devd/devd.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
Modified: head/sbin/devd/devd.hh
==============================================================================
--- head/sbin/devd/devd.hh Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/devd/devd.hh Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002-2003 M. Warner Losh.
* All rights reserved.
*
Modified: head/sbin/devd/parse.y
==============================================================================
--- head/sbin/devd/parse.y Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/devd/parse.y Mon Nov 27 15:37:16 2017 (r326276)
@@ -2,6 +2,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
Modified: head/sbin/devd/token.l
==============================================================================
--- head/sbin/devd/token.l Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/devd/token.l Mon Nov 27 15:37:16 2017 (r326276)
@@ -2,6 +2,8 @@
/*-
* DEVD (Device action daemon)
*
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
* All rights reserved.
*
Modified: head/sbin/devfs/devfs.c
==============================================================================
--- head/sbin/devfs/devfs.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/devfs/devfs.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2001, 2002 Dima Dorfman.
* All rights reserved.
*
Modified: head/sbin/devfs/extern.h
==============================================================================
--- head/sbin/devfs/extern.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/devfs/extern.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
*
Modified: head/sbin/devfs/rule.c
==============================================================================
--- head/sbin/devfs/rule.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/devfs/rule.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Dima Dorfman.
* All rights reserved.
*
Modified: head/sbin/etherswitchcfg/etherswitchcfg.c
==============================================================================
--- head/sbin/etherswitchcfg/etherswitchcfg.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/etherswitchcfg/etherswitchcfg.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011-2012 Stefan Bethke.
* All rights reserved.
*
Modified: head/sbin/fsck/fsutil.h
==============================================================================
--- head/sbin/fsck/fsutil.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck/fsutil.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: fsutil.h,v 1.114 2009/10/21 01:07:46 snj Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sbin/fsck_ffs/ea.c
==============================================================================
--- head/sbin/fsck_ffs/ea.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_ffs/ea.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_ffs/suj.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright 2009, 2010 Jeffrey W. Roberson <jeff@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/fsck_msdosfs/boot.c
==============================================================================
--- head/sbin/fsck_msdosfs/boot.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_msdosfs/boot.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
Modified: head/sbin/fsck_msdosfs/check.c
==============================================================================
--- head/sbin/fsck_msdosfs/check.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_msdosfs/check.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
Modified: head/sbin/fsck_msdosfs/dir.c
==============================================================================
--- head/sbin/fsck_msdosfs/dir.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_msdosfs/dir.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
* Some structure declaration borrowed from Paul Popelka
Modified: head/sbin/fsck_msdosfs/dosfs.h
==============================================================================
--- head/sbin/fsck_msdosfs/dosfs.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_msdosfs/dosfs.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
* Some structure declaration borrowed from Paul Popelka
Modified: head/sbin/fsck_msdosfs/ext.h
==============================================================================
--- head/sbin/fsck_msdosfs/ext.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_msdosfs/ext.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
Modified: head/sbin/fsck_msdosfs/fat.c
==============================================================================
--- head/sbin/fsck_msdosfs/fat.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_msdosfs/fat.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
Modified: head/sbin/fsck_msdosfs/main.c
==============================================================================
--- head/sbin/fsck_msdosfs/main.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsck_msdosfs/main.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
* Copyright (C) 1995 Wolfgang Solfrank
* Copyright (c) 1995 Martin Husemann
*
Modified: head/sbin/fsdb/fsdb.c
==============================================================================
--- head/sbin/fsdb/fsdb.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsdb/fsdb.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: fsdb.c,v 1.2 1995/10/08 23:18:10 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
Modified: head/sbin/fsdb/fsdb.h
==============================================================================
--- head/sbin/fsdb/fsdb.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsdb/fsdb.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: fsdb.h,v 1.2 1995/10/08 23:18:11 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
Modified: head/sbin/fsdb/fsdbutil.c
==============================================================================
--- head/sbin/fsdb/fsdbutil.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsdb/fsdbutil.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
* Copyright (c) 1995 John T. Kohl
* All rights reserved.
*
Modified: head/sbin/fsirand/fsirand.c
==============================================================================
--- head/sbin/fsirand/fsirand.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/fsirand/fsirand.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,6 +1,8 @@
/* $OpenBSD: fsirand.c,v 1.9 1997/02/28 00:46:33 millert Exp $ */
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
* All rights reserved.
*
Modified: head/sbin/gbde/gbde.c
==============================================================================
--- head/sbin/gbde/gbde.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/gbde/gbde.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
Modified: head/sbin/geom/class/cache/geom_cache.c
==============================================================================
--- head/sbin/geom/class/cache/geom_cache.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/cache/geom_cache.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Ruslan Ermilov <ru@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/concat/geom_concat.c
==============================================================================
--- head/sbin/geom/class/concat/geom_concat.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/concat/geom_concat.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/eli/geom_eli.c
==============================================================================
--- head/sbin/geom/class/eli/geom_eli.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/eli/geom_eli.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/journal/geom_journal.c
==============================================================================
--- head/sbin/geom/class/journal/geom_journal.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/journal/geom_journal.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/journal/geom_journal.h
==============================================================================
--- head/sbin/geom/class/journal/geom_journal.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/journal/geom_journal.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/journal/geom_journal_ufs.c
==============================================================================
--- head/sbin/geom/class/journal/geom_journal_ufs.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/journal/geom_journal_ufs.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/label/geom_label.c
==============================================================================
--- head/sbin/geom/class/label/geom_label.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/label/geom_label.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/mirror/geom_mirror.c
==============================================================================
--- head/sbin/geom/class/mirror/geom_mirror.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/mirror/geom_mirror.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/mountver/geom_mountver.c
==============================================================================
--- head/sbin/geom/class/mountver/geom_mountver.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/mountver/geom_mountver.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/multipath/geom_multipath.c
==============================================================================
--- head/sbin/geom/class/multipath/geom_multipath.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/multipath/geom_multipath.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2006 Mathew Jacob <mjacob@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/nop/geom_nop.c
==============================================================================
--- head/sbin/geom/class/nop/geom_nop.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/nop/geom_nop.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/part/geom_part.c
==============================================================================
--- head/sbin/geom/class/part/geom_part.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/part/geom_part.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2007, 2008 Marcel Moolenaar
* All rights reserved.
*
Modified: head/sbin/geom/class/raid/geom_raid.c
==============================================================================
--- head/sbin/geom/class/raid/geom_raid.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/raid/geom_raid.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/raid3/geom_raid3.c
==============================================================================
--- head/sbin/geom/class/raid3/geom_raid3.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/raid3/geom_raid3.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/sched/geom_sched.c
==============================================================================
--- head/sbin/geom/class/sched/geom_sched.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/sched/geom_sched.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 Fabio Checconi
* Copyright (c) 2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
Modified: head/sbin/geom/class/shsec/geom_shsec.c
==============================================================================
--- head/sbin/geom/class/shsec/geom_shsec.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/shsec/geom_shsec.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/stripe/geom_stripe.c
==============================================================================
--- head/sbin/geom/class/stripe/geom_stripe.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/stripe/geom_stripe.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/class/virstor/geom_virstor.c
==============================================================================
--- head/sbin/geom/class/virstor/geom_virstor.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/class/virstor/geom_virstor.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Ivan Voras <ivoras@freebsd.org>
*
* Redistribution and use in source and binary forms, with or without
Modified: head/sbin/geom/core/geom.c
==============================================================================
--- head/sbin/geom/core/geom.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/core/geom.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/core/geom.h
==============================================================================
--- head/sbin/geom/core/geom.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/core/geom.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/misc/subr.c
==============================================================================
--- head/sbin/geom/misc/subr.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/misc/subr.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/geom/misc/subr.h
==============================================================================
--- head/sbin/geom/misc/subr.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/geom/misc/subr.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/ggate/ggatec/ggatec.c
==============================================================================
--- head/sbin/ggate/ggatec/ggatec.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ggate/ggatec/ggatec.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/ggate/ggated/ggated.c
==============================================================================
--- head/sbin/ggate/ggated/ggated.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ggate/ggated/ggated.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/ggate/ggatel/ggatel.c
==============================================================================
--- head/sbin/ggate/ggatel/ggatel.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ggate/ggatel/ggatel.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/ggate/shared/ggate.c
==============================================================================
--- head/sbin/ggate/shared/ggate.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ggate/shared/ggate.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/ggate/shared/ggate.h
==============================================================================
--- head/sbin/ggate/shared/ggate.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/ggate/shared/ggate.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/gvinum/gvinum.c
==============================================================================
--- head/sbin/gvinum/gvinum.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/gvinum/gvinum.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2004 Lukas Ertl
* Copyright (c) 2005 Chris Jones
* Copyright (c) 2007 Ulf Lilleengen
Modified: head/sbin/hastctl/hastctl.c
==============================================================================
--- head/sbin/hastctl/hastctl.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastctl/hastctl.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/activemap.c
==============================================================================
--- head/sbin/hastd/activemap.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/activemap.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/activemap.h
==============================================================================
--- head/sbin/hastd/activemap.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/activemap.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/control.c
==============================================================================
--- head/sbin/hastd/control.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/control.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/control.h
==============================================================================
--- head/sbin/hastd/control.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/control.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/ebuf.c
==============================================================================
--- head/sbin/hastd/ebuf.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/ebuf.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/ebuf.h
==============================================================================
--- head/sbin/hastd/ebuf.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/ebuf.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/event.c
==============================================================================
--- head/sbin/hastd/event.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/event.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/hastd/event.h
==============================================================================
--- head/sbin/hastd/event.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/event.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
Modified: head/sbin/hastd/hast.h
==============================================================================
--- head/sbin/hastd/hast.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hast.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
Modified: head/sbin/hastd/hast_checksum.c
==============================================================================
--- head/sbin/hastd/hast_checksum.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hast_checksum.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sbin/hastd/hast_checksum.h
==============================================================================
--- head/sbin/hastd/hast_checksum.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hast_checksum.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sbin/hastd/hast_compression.c
==============================================================================
--- head/sbin/hastd/hast_compression.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hast_compression.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sbin/hastd/hast_compression.h
==============================================================================
--- head/sbin/hastd/hast_compression.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hast_compression.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
*
Modified: head/sbin/hastd/hast_proto.c
==============================================================================
--- head/sbin/hastd/hast_proto.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hast_proto.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
Modified: head/sbin/hastd/hast_proto.h
==============================================================================
--- head/sbin/hastd/hast_proto.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hast_proto.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/hastd.c
==============================================================================
--- head/sbin/hastd/hastd.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hastd.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
Modified: head/sbin/hastd/hastd.h
==============================================================================
--- head/sbin/hastd/hastd.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hastd.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/hooks.c
==============================================================================
--- head/sbin/hastd/hooks.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hooks.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/sbin/hastd/hooks.h
==============================================================================
--- head/sbin/hastd/hooks.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/hooks.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/sbin/hastd/lzf.c
==============================================================================
--- head/sbin/hastd/lzf.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/lzf.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
Modified: head/sbin/hastd/lzf.h
==============================================================================
--- head/sbin/hastd/lzf.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/lzf.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
Modified: head/sbin/hastd/metadata.c
==============================================================================
--- head/sbin/hastd/metadata.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/metadata.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/metadata.h
==============================================================================
--- head/sbin/hastd/metadata.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/metadata.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/nv.c
==============================================================================
--- head/sbin/hastd/nv.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/nv.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/nv.h
==============================================================================
--- head/sbin/hastd/nv.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/nv.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* All rights reserved.
*
Modified: head/sbin/hastd/parse.y
==============================================================================
--- head/sbin/hastd/parse.y Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/parse.y Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,5 +1,7 @@
%{
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
Modified: head/sbin/hastd/pjdlog.c
==============================================================================
--- head/sbin/hastd/pjdlog.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/pjdlog.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/sbin/hastd/pjdlog.h
==============================================================================
--- head/sbin/hastd/pjdlog.h Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/pjdlog.h Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
Modified: head/sbin/hastd/primary.c
==============================================================================
--- head/sbin/hastd/primary.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/primary.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009 The FreeBSD Foundation
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved.
Modified: head/sbin/hastd/proto.c
==============================================================================
--- head/sbin/hastd/proto.c Mon Nov 27 15:28:26 2017 (r326275)
+++ head/sbin/hastd/proto.c Mon Nov 27 15:37:16 2017 (r326276)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2009-2010 The FreeBSD Foundation
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 15:38:41 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF33BE553E1;
Mon, 27 Nov 2017 15:38:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9290777DAA;
Mon, 27 Nov 2017 15:38:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFcejY011684;
Mon, 27 Nov 2017 15:38:40 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFcena011683;
Mon, 27 Nov 2017 15:38:40 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271538.vARFcena011683@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:38:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-svnadmin@freebsd.org
Subject: svn commit: r326277 - svnadmin/conf
X-SVN-Group: svnadmin
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: svnadmin/conf
X-SVN-Commit-Revision: 326277
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:38:41 -0000
Author: pfg
Date: Mon Nov 27 15:38:40 2017
New Revision: 326277
URL: https://svnweb.freebsd.org/changeset/base/326277
Log:
Remove myself from sizelimits.
I am finally done with the big changes.
Modified:
svnadmin/conf/sizelimit.conf
Modified: svnadmin/conf/sizelimit.conf
==============================================================================
--- svnadmin/conf/sizelimit.conf Mon Nov 27 15:37:16 2017 (r326276)
+++ svnadmin/conf/sizelimit.conf Mon Nov 27 15:38:40 2017 (r326277)
@@ -27,5 +27,4 @@ mm
np
obrien
peter
-pfg
rwatson
From owner-svn-src-all@freebsd.org Mon Nov 27 15:39:12 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AED9BE5547E;
Mon, 27 Nov 2017 15:39:12 +0000 (UTC)
(envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 797907809B;
Mon, 27 Nov 2017 15:39:12 +0000 (UTC)
(envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFdBQi011753;
Mon, 27 Nov 2017 15:39:11 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFdB47011752;
Mon, 27 Nov 2017 15:39:11 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201711271539.vARFdB47011752@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:39:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326278 - head/etc/rc.d
X-SVN-Group: head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/etc/rc.d
X-SVN-Commit-Revision: 326278
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:39:12 -0000
Author: manu
Date: Mon Nov 27 15:39:11 2017
New Revision: 326278
URL: https://svnweb.freebsd.org/changeset/base/326278
Log:
growfs: Commit the changes after expanding the partition
This fix the problem in arm snapshot present since at least 6 months where
growfs was failing at firstboot and dropped you in a single user shell.
Modified:
head/etc/rc.d/growfs
Modified: head/etc/rc.d/growfs
==============================================================================
--- head/etc/rc.d/growfs Mon Nov 27 15:38:40 2017 (r326277)
+++ head/etc/rc.d/growfs Mon Nov 27 15:39:11 2017 (r326278)
@@ -90,6 +90,7 @@ growfs_start ()
exit 0
}
}' dev="$rawdev"
+ gpart commit "$rootdev"
growfs -y /dev/"$rootdev"
}
From owner-svn-src-all@freebsd.org Mon Nov 27 15:49:05 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63375E557F1;
Mon, 27 Nov 2017 15:49:05 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 273D278644;
Mon, 27 Nov 2017 15:49:05 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARFn4Qj016079;
Mon, 27 Nov 2017 15:49:04 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARFn1pY016043;
Mon, 27 Nov 2017 15:49:01 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271549.vARFn1pY016043@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 15:49:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326279 - in head/sys/kgssapi: . krb5
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: in head/sys/kgssapi: . krb5
X-SVN-Commit-Revision: 326279
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 15:49:05 -0000
Author: pfg
Date: Mon Nov 27 15:49:00 2017
New Revision: 326279
URL: https://svnweb.freebsd.org/changeset/base/326279
Log:
sys/kgssapi: general adoption of SPDX licensing ID tags.
Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.
The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.
No functional change intended.
Modified:
head/sys/kgssapi/gss_accept_sec_context.c
head/sys/kgssapi/gss_acquire_cred.c
head/sys/kgssapi/gss_add_oid_set_member.c
head/sys/kgssapi/gss_canonicalize_name.c
head/sys/kgssapi/gss_create_empty_oid_set.c
head/sys/kgssapi/gss_delete_sec_context.c
head/sys/kgssapi/gss_display_status.c
head/sys/kgssapi/gss_export_name.c
head/sys/kgssapi/gss_get_mic.c
head/sys/kgssapi/gss_impl.c
head/sys/kgssapi/gss_import_name.c
head/sys/kgssapi/gss_init_sec_context.c
head/sys/kgssapi/gss_names.c
head/sys/kgssapi/gss_pname_to_uid.c
head/sys/kgssapi/gss_release_buffer.c
head/sys/kgssapi/gss_release_cred.c
head/sys/kgssapi/gss_release_name.c
head/sys/kgssapi/gss_release_oid_set.c
head/sys/kgssapi/gss_set_cred_option.c
head/sys/kgssapi/gss_test_oid_set_member.c
head/sys/kgssapi/gss_unwrap.c
head/sys/kgssapi/gss_verify_mic.c
head/sys/kgssapi/gss_wrap.c
head/sys/kgssapi/gss_wrap_size_limit.c
head/sys/kgssapi/gssapi_impl.h
head/sys/kgssapi/gssd_prot.c
head/sys/kgssapi/gsstest.c
head/sys/kgssapi/krb5/kcrypto.c
head/sys/kgssapi/krb5/kcrypto.h
head/sys/kgssapi/krb5/kcrypto_aes.c
head/sys/kgssapi/krb5/kcrypto_arcfour.c
head/sys/kgssapi/krb5/kcrypto_des.c
head/sys/kgssapi/krb5/kcrypto_des3.c
head/sys/kgssapi/krb5/krb5_mech.c
Modified: head/sys/kgssapi/gss_accept_sec_context.c
==============================================================================
--- head/sys/kgssapi/gss_accept_sec_context.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_accept_sec_context.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_acquire_cred.c
==============================================================================
--- head/sys/kgssapi/gss_acquire_cred.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_acquire_cred.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_add_oid_set_member.c
==============================================================================
--- head/sys/kgssapi/gss_add_oid_set_member.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_add_oid_set_member.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_canonicalize_name.c
==============================================================================
--- head/sys/kgssapi/gss_canonicalize_name.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_canonicalize_name.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_create_empty_oid_set.c
==============================================================================
--- head/sys/kgssapi/gss_create_empty_oid_set.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_create_empty_oid_set.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_delete_sec_context.c
==============================================================================
--- head/sys/kgssapi/gss_delete_sec_context.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_delete_sec_context.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_display_status.c
==============================================================================
--- head/sys/kgssapi/gss_display_status.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_display_status.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_export_name.c
==============================================================================
--- head/sys/kgssapi/gss_export_name.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_export_name.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_get_mic.c
==============================================================================
--- head/sys/kgssapi/gss_get_mic.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_get_mic.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_impl.c
==============================================================================
--- head/sys/kgssapi/gss_impl.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_impl.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_import_name.c
==============================================================================
--- head/sys/kgssapi/gss_import_name.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_import_name.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_init_sec_context.c
==============================================================================
--- head/sys/kgssapi/gss_init_sec_context.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_init_sec_context.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_names.c
==============================================================================
--- head/sys/kgssapi/gss_names.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_names.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
*
Modified: head/sys/kgssapi/gss_pname_to_uid.c
==============================================================================
--- head/sys/kgssapi/gss_pname_to_uid.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_pname_to_uid.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_release_buffer.c
==============================================================================
--- head/sys/kgssapi/gss_release_buffer.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_release_buffer.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_release_cred.c
==============================================================================
--- head/sys/kgssapi/gss_release_cred.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_release_cred.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_release_name.c
==============================================================================
--- head/sys/kgssapi/gss_release_name.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_release_name.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_release_oid_set.c
==============================================================================
--- head/sys/kgssapi/gss_release_oid_set.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_release_oid_set.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_set_cred_option.c
==============================================================================
--- head/sys/kgssapi/gss_set_cred_option.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_set_cred_option.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_test_oid_set_member.c
==============================================================================
--- head/sys/kgssapi/gss_test_oid_set_member.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_test_oid_set_member.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_unwrap.c
==============================================================================
--- head/sys/kgssapi/gss_unwrap.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_unwrap.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_verify_mic.c
==============================================================================
--- head/sys/kgssapi/gss_verify_mic.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_verify_mic.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_wrap.c
==============================================================================
--- head/sys/kgssapi/gss_wrap.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_wrap.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gss_wrap_size_limit.c
==============================================================================
--- head/sys/kgssapi/gss_wrap_size_limit.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gss_wrap_size_limit.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gssapi_impl.h
==============================================================================
--- head/sys/kgssapi/gssapi_impl.h Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gssapi_impl.h Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gssd_prot.c
==============================================================================
--- head/sys/kgssapi/gssd_prot.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gssd_prot.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/gsstest.c
==============================================================================
--- head/sys/kgssapi/gsstest.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/gsstest.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/krb5/kcrypto.c
==============================================================================
--- head/sys/kgssapi/krb5/kcrypto.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/krb5/kcrypto.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/krb5/kcrypto.h
==============================================================================
--- head/sys/kgssapi/krb5/kcrypto.h Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/krb5/kcrypto.h Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/krb5/kcrypto_aes.c
==============================================================================
--- head/sys/kgssapi/krb5/kcrypto_aes.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/krb5/kcrypto_aes.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/krb5/kcrypto_arcfour.c
==============================================================================
--- head/sys/kgssapi/krb5/kcrypto_arcfour.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/krb5/kcrypto_arcfour.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/krb5/kcrypto_des.c
==============================================================================
--- head/sys/kgssapi/krb5/kcrypto_des.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/krb5/kcrypto_des.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/krb5/kcrypto_des3.c
==============================================================================
--- head/sys/kgssapi/krb5/kcrypto_des3.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/krb5/kcrypto_des3.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
Modified: head/sys/kgssapi/krb5/krb5_mech.c
==============================================================================
--- head/sys/kgssapi/krb5/krb5_mech.c Mon Nov 27 15:39:11 2017 (r326278)
+++ head/sys/kgssapi/krb5/krb5_mech.c Mon Nov 27 15:49:00 2017 (r326279)
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr@rabson.org>
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
From owner-svn-src-all@freebsd.org Mon Nov 27 16:19:01 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9F38DB867B;
Mon, 27 Nov 2017 16:19:01 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 839D1796EE;
Mon, 27 Nov 2017 16:19:01 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARGJ0a3028702;
Mon, 27 Nov 2017 16:19:00 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARGJ0Qe028701;
Mon, 27 Nov 2017 16:19:00 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201711271619.vARGJ0Qe028701@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 27 Nov 2017 16:19:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326280 - head/sys/arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: head/sys/arm64/arm64
X-SVN-Commit-Revision: 326280
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 16:19:01 -0000
Author: andrew
Date: Mon Nov 27 16:19:00 2017
New Revision: 326280
URL: https://svnweb.freebsd.org/changeset/base/326280
Log:
Set the kernel file name so the kern.bootfile sysctl is set. This allows
for the creation of kernel.old when running installkernel.
MFC after: 1 week
Sponsored by: DARPA, AFRL
Modified:
head/sys/arm64/arm64/machdep.c
Modified: head/sys/arm64/arm64/machdep.c
==============================================================================
--- head/sys/arm64/arm64/machdep.c Mon Nov 27 15:49:00 2017 (r326279)
+++ head/sys/arm64/arm64/machdep.c Mon Nov 27 16:19:00 2017 (r326280)
@@ -1017,6 +1017,7 @@ initarm(struct arm64_bootparams *abp)
{
struct efi_map_header *efihdr;
struct pcpu *pcpup;
+ char *env;
#ifdef FDT
struct mem_region mem_regions[FDT_MEM_REGIONS];
int mem_regions_sz;
@@ -1116,6 +1117,10 @@ initarm(struct arm64_bootparams *abp)
dbg_init();
kdb_init();
pan_enable();
+
+ env = kern_getenv("kernelname");
+ if (env != NULL)
+ strlcpy(kernelname, env, sizeof(kernelname));
early_boot = 0;
}
From owner-svn-src-all@freebsd.org Mon Nov 27 16:28:29 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53854DB8935;
Mon, 27 Nov 2017 16:28:29 +0000 (UTC)
(envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2D78779C29;
Mon, 27 Nov 2017 16:28:29 +0000 (UTC)
(envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARGSSKa033091;
Mon, 27 Nov 2017 16:28:28 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARGSSee033090;
Mon, 27 Nov 2017 16:28:28 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201711271628.vARGSSee033090@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 27 Nov 2017 16:28:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326281 - head/share/man/man4
X-SVN-Group: head
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: head/share/man/man4
X-SVN-Commit-Revision: 326281
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 16:28:29 -0000
Author: sbruno
Date: Mon Nov 27 16:28:28 2017
New Revision: 326281
URL: https://svnweb.freebsd.org/changeset/base/326281
Log:
Add vmm(4) man page
PR: 205705 184046
Submitted by: Matt Macy <matt@mattmacy.io>
Reviewed by: grehan
Differential Revision: https://reviews.freebsd.org/D13062
Added:
head/share/man/man4/vmm.4 (contents, props changed)
Added: head/share/man/man4/vmm.4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/man/man4/vmm.4 Mon Nov 27 16:28:28 2017 (r326281)
@@ -0,0 +1,105 @@
+.\" Copyright (c) 2013 Peter Grehan
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd December 19, 2013
+.Dt VMM 4
+.Os
+.Sh NAME
+.Nm vmm.ko
+.Nd "bhyve virtual machine monitor"
+.Sh SYNOPSIS
+.Pp
+To load the driver as a module at boot, add this line to
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+.Cd vmm_load="YES"
+.Ed
+.Pp
+The module can also be loaded manually with
+.Xr kldload 8 :
+.Bd -literal -offset indent
+kldload vmm
+.Ed
+.Sh DESCRIPTION
+.Nm
+provides the kernel portion of the
+.Xr bhyve 4
+hypervisor.
+.Pp
+An Intel CPU with VT-x/EPT or AMD CPU with SVM support is required.
+.Pp
+PCI device passthrough to a virtual machine requires
+hardware with VT-d support.
+.Sh PCI PASSTHROUGH
+When the hardware supports VT-d, and
+.Nm
+has been loaded at boot time,
+PCI devices can be reserved for use by the hypervisor.
+Entries consisting of the PCI
+.Ar bus Ns / Ns Ar slot Ns / Ns Ar function
+are added to the
+.Va pptdevs
+.Xr loader.conf 5
+variable.
+Additional entries are separated by spaces.
+Host PCI devices that match an entry will be assigned to the hypervisor
+and will not be probed by
+.Fx
+device drivers.
+See the
+.Sx EXAMPLES
+section below for sample usage.
+.Pp
+A large number of PCI device entries may require a string longer than the
+128-character limit of
+.Xr loader.conf 5
+variables.
+The
+.Va pptdevs2
+and
+.Va pptdevs3
+variables can be used for additional entries.
+.Sh EXAMPLES
+Reserve three PCI devices for use by the hypervisor: bus 10 slot 0 function 0,
+bus 6 slot 5 function 0, and bus 6 slot 5 function 1.
+.Bd -literal -offset indent
+pptdevs="10/0/0 6/5/0 6/5/1"
+.Ed
+.Sh SEE ALSO
+.Xr bhyve 4 ,
+.Xr loader.conf 5 ,
+.Xr bhyve 8 ,
+.Xr bhyveload 8 ,
+.Xr kldload 8
+.Sh HISTORY
+.Nm vmm.ko
+first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An Neel Natu Aq neel@freebsd.org
+.An Peter Grehan Aq grehan@freebsd.org
+
+
From owner-svn-src-all@freebsd.org Mon Nov 27 17:03:12 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2B0DDB9BB7;
Mon, 27 Nov 2017 17:03:12 +0000 (UTC) (envelope-from fsu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7EE787B447;
Mon, 27 Nov 2017 17:03:12 +0000 (UTC) (envelope-from fsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARH3BJ9049485;
Mon, 27 Nov 2017 17:03:11 GMT (envelope-from fsu@FreeBSD.org)
Received: (from fsu@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARH3B5c049482;
Mon, 27 Nov 2017 17:03:11 GMT (envelope-from fsu@FreeBSD.org)
Message-Id: <201711271703.vARH3B5c049482@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: fsu set sender to fsu@FreeBSD.org
using -f
From: Fedor Uporov <fsu@FreeBSD.org>
Date: Mon, 27 Nov 2017 17:03:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326282 - in head/sys: amd64/linux amd64/linux32
i386/linux
X-SVN-Group: head
X-SVN-Commit-Author: fsu
X-SVN-Commit-Paths: in head/sys: amd64/linux amd64/linux32 i386/linux
X-SVN-Commit-Revision: 326282
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 17:03:12 -0000
Author: fsu
Date: Mon Nov 27 17:03:11 2017
New Revision: 326282
URL: https://svnweb.freebsd.org/changeset/base/326282
Log:
Remap ENOATTR to ENODATA in the linuxulator.
In the linux ENOADATA is frequently #defined as ENOATTR.
The change is required for an xattrs support implementation.
MFC after: 1 week
Discussed with: netchild
Approved by: pfg
Differential Revision: https://reviews.freebsd.org/D13221
Modified:
head/sys/amd64/linux/linux_sysvec.c
head/sys/amd64/linux32/linux32_sysvec.c
head/sys/i386/linux/linux_sysvec.c
Modified: head/sys/amd64/linux/linux_sysvec.c
==============================================================================
--- head/sys/amd64/linux/linux_sysvec.c Mon Nov 27 16:28:28 2017 (r326281)
+++ head/sys/amd64/linux/linux_sysvec.c Mon Nov 27 17:03:11 2017 (r326282)
@@ -147,7 +147,7 @@ static int bsd_to_linux_errno[ELAST + 1] = {
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
- -6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
+ -6, -6, -43, -42, -75,-125, -84, -61, -16, -74,
-72, -67, -71
};
Modified: head/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysvec.c Mon Nov 27 16:28:28 2017 (r326281)
+++ head/sys/amd64/linux32/linux32_sysvec.c Mon Nov 27 17:03:11 2017 (r326282)
@@ -148,7 +148,7 @@ static int bsd_to_linux_errno[ELAST + 1] = {
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
- -6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
+ -6, -6, -43, -42, -75,-125, -84, -61, -16, -74,
-72, -67, -71
};
Modified: head/sys/i386/linux/linux_sysvec.c
==============================================================================
--- head/sys/i386/linux/linux_sysvec.c Mon Nov 27 16:28:28 2017 (r326281)
+++ head/sys/i386/linux/linux_sysvec.c Mon Nov 27 17:03:11 2017 (r326282)
@@ -147,7 +147,7 @@ static int bsd_to_linux_errno[ELAST + 1] = {
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
- -6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
+ -6, -6, -43, -42, -75,-125, -84, -61, -16, -74,
-72, -67, -71
};
From owner-svn-src-all@freebsd.org Mon Nov 27 17:18:33 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D4CDDB9F97;
Mon, 27 Nov 2017 17:18:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2DBD37BBD4;
Mon, 27 Nov 2017 17:18:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARHIWZJ055442;
Mon, 27 Nov 2017 17:18:32 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARHIWFU055441;
Mon, 27 Nov 2017 17:18:32 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201711271718.vARHIWFU055441@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 27 Nov 2017 17:18:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326283 - head/include
X-SVN-Group: head
X-SVN-Commit-Author: pfg
X-SVN-Commit-Paths: head/include
X-SVN-Commit-Revision: 326283
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 17:18:33 -0000
Author: pfg
Date: Mon Nov 27 17:18:31 2017
New Revision: 326283
URL: https://svnweb.freebsd.org/changeset/base/326283
Log:
netconfig.h: sync with upstream.
Bring some comments and the license.
Add SPDX License ID tag while here.
Obtained from: NetBSD (CVS rev 1.2, 1.5, 1.6)
Modified:
head/include/netconfig.h
Modified: head/include/netconfig.h
==============================================================================
--- head/include/netconfig.h Mon Nov 27 17:03:11 2017 (r326282)
+++ head/include/netconfig.h Mon Nov 27 17:18:31 2017 (r326283)
@@ -1,6 +1,36 @@
-/* $NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $ */
+/* $NetBSD: netconfig.h,v 1.6 2008/04/28 20:22:54 martin Exp $ */
/* $FreeBSD$ */
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
+ * Copyright (c) 2004 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Frank van der Linden.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
#ifndef _NETCONFIG_H_
#define _NETCONFIG_H_
@@ -30,10 +60,10 @@ typedef struct {
/*
* nc_semantics values
*/
-#define NC_TPI_CLTS 1
-#define NC_TPI_COTS 2
-#define NC_TPI_COTS_ORD 3
-#define NC_TPI_RAW 4
+#define NC_TPI_CLTS 1 /* Connectionless transport */
+#define NC_TPI_COTS 2 /* Connection oriented transport */
+#define NC_TPI_COTS_ORD 3 /* Connection oriented, ordered transport */
+#define NC_TPI_RAW 4 /* Raw connection */
/*
* nc_flag values
From owner-svn-src-all@freebsd.org Mon Nov 27 17:27:01 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5B0ADBA322;
Mon, 27 Nov 2017 17:27:01 +0000 (UTC)
(envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 86D597C30E;
Mon, 27 Nov 2017 17:27:01 +0000 (UTC)
(envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1])
by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id vARHR0vm010646;
Mon, 27 Nov 2017 09:27:00 -0800 (PST)
(envelope-from freebsd@pdx.rh.CN85.dnsmgr.net)
Received: (from freebsd@localhost)
by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id vARHR0oQ010645;
Mon, 27 Nov 2017 09:27:00 -0800 (PST) (envelope-from freebsd)
From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net>
Message-Id: <201711271727.vARHR0oQ010645@pdx.rh.CN85.dnsmgr.net>
Subject: Re: svn commit: r326283 - head/include
In-Reply-To: <201711271718.vARHIWFU055441@repo.freebsd.org>
To: "Pedro F. Giffuni" <pfg@freebsd.org>
Date: Mon, 27 Nov 2017 09:27:00 -0800 (PST)
CC: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Reply-To: rgrimes@freebsd.org
X-Mailer: ELM [version 2.4ME+ PL121h (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 17:27:01 -0000
[ Charset UTF-8 unsupported, converting... ]
> Author: pfg
> Date: Mon Nov 27 17:18:31 2017
> New Revision: 326283
> URL: https://svnweb.freebsd.org/changeset/base/326283
>
> Log:
> netconfig.h: sync with upstream.
>
> Bring some comments and the license.
> Add SPDX License ID tag while here.
Please please please do not mix these with any other type of commit.
> Obtained from: NetBSD (CVS rev 1.2, 1.5, 1.6)
>
> Modified:
> head/include/netconfig.h
>
> Modified: head/include/netconfig.h
> ==============================================================================
> --- head/include/netconfig.h Mon Nov 27 17:03:11 2017 (r326282)
> +++ head/include/netconfig.h Mon Nov 27 17:18:31 2017 (r326283)
> @@ -1,6 +1,36 @@
> -/* $NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $ */
> +/* $NetBSD: netconfig.h,v 1.6 2008/04/28 20:22:54 martin Exp $ */
> /* $FreeBSD$ */
>
> +/*-
> + * SPDX-License-Identifier: BSD-2-Clause-NetBSD
> + *
> + * Copyright (c) 2004 The NetBSD Foundation, Inc.
> + * All rights reserved.
> + *
> + * This code is derived from software contributed to The NetBSD Foundation
> + * by Frank van der Linden.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
> + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
> + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
> + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
> + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
>
> #ifndef _NETCONFIG_H_
> #define _NETCONFIG_H_
> @@ -30,10 +60,10 @@ typedef struct {
> /*
> * nc_semantics values
> */
> -#define NC_TPI_CLTS 1
> -#define NC_TPI_COTS 2
> -#define NC_TPI_COTS_ORD 3
> -#define NC_TPI_RAW 4
> +#define NC_TPI_CLTS 1 /* Connectionless transport */
> +#define NC_TPI_COTS 2 /* Connection oriented transport */
> +#define NC_TPI_COTS_ORD 3 /* Connection oriented, ordered transport */
> +#define NC_TPI_RAW 4 /* Raw connection */
>
> /*
> * nc_flag values
>
>
--
Rod Grimes rgrimes@freebsd.org
From owner-svn-src-all@freebsd.org Mon Nov 27 17:46:39 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD09FDBAB1C;
Mon, 27 Nov 2017 17:46:39 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A06587D1F5;
Mon, 27 Nov 2017 17:46:39 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARHkcSP073208;
Mon, 27 Nov 2017 17:46:38 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARHkcJQ073204;
Mon, 27 Nov 2017 17:46:38 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711271746.vARHkcJQ073204@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 27 Nov 2017 17:46:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326284 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 326284
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 17:46:39 -0000
Author: markj
Date: Mon Nov 27 17:46:38 2017
New Revision: 326284
URL: https://svnweb.freebsd.org/changeset/base/326284
Log:
Avoid unnecessary lookups when initializing the vm_page array.
This gives a marginal improvement in the vm_page_array initialization
time. Also garbage-collect the now-unused vm_phys_paddr_to_segind().
Reviewed by: alc, kib
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D13270
Modified:
head/sys/vm/vm_page.c
head/sys/vm/vm_phys.c
head/sys/vm/vm_phys.h
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Mon Nov 27 17:18:31 2017 (r326283)
+++ head/sys/vm/vm_page.c Mon Nov 27 17:46:38 2017 (r326284)
@@ -427,11 +427,9 @@ vm_page_domain_init(struct vm_domain *vmd)
* lists.
*/
static void
-vm_page_init_page(vm_paddr_t pa)
+vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind)
{
- vm_page_t m;
- m = vm_phys_paddr_to_vm_page(pa);
m->object = NULL;
m->wire_count = 0;
m->busy_lock = VPB_UNBUSIED;
@@ -440,7 +438,7 @@ vm_page_init_page(vm_paddr_t pa)
m->phys_addr = pa;
m->queue = PQ_NONE;
m->psind = 0;
- m->segind = vm_phys_paddr_to_segind(pa);
+ m->segind = segind;
m->order = VM_NFREEORDER;
m->pool = VM_FREEPOOL_DEFAULT;
m->valid = m->dirty = 0;
@@ -694,8 +692,9 @@ vm_page_startup(vm_offset_t vaddr)
vm_cnt.v_free_count = 0;
for (segind = 0; segind < vm_phys_nsegs; segind++) {
seg = &vm_phys_segs[segind];
- for (pa = seg->start; pa < seg->end; pa += PAGE_SIZE)
- vm_page_init_page(pa);
+ for (m = seg->first_page, pa = seg->start; pa < seg->end;
+ m++, pa += PAGE_SIZE)
+ vm_page_init_page(m, pa, segind);
/*
* Add the segment to the free lists only if it is covered by
Modified: head/sys/vm/vm_phys.c
==============================================================================
--- head/sys/vm/vm_phys.c Mon Nov 27 17:18:31 2017 (r326283)
+++ head/sys/vm/vm_phys.c Mon Nov 27 17:46:38 2017 (r326284)
@@ -1038,24 +1038,6 @@ vm_phys_fictitious_unreg_range(vm_paddr_t start, vm_pa
}
/*
- * Find the segment containing the given physical address.
- */
-int
-vm_phys_paddr_to_segind(vm_paddr_t pa)
-{
- struct vm_phys_seg *seg;
- int segind;
-
- for (segind = 0; segind < vm_phys_nsegs; segind++) {
- seg = &vm_phys_segs[segind];
- if (pa >= seg->start && pa < seg->end)
- return (segind);
- }
- panic("vm_phys_paddr_to_segind: paddr %#jx is not in any segment" ,
- (uintmax_t)pa);
-}
-
-/*
* Free a contiguous, power of two-sized set of physical pages.
*
* The free page queues must be locked.
Modified: head/sys/vm/vm_phys.h
==============================================================================
--- head/sys/vm/vm_phys.h Mon Nov 27 17:18:31 2017 (r326283)
+++ head/sys/vm/vm_phys.h Mon Nov 27 17:46:38 2017 (r326284)
@@ -84,7 +84,6 @@ vm_page_t vm_phys_fictitious_to_vm_page(vm_paddr_t pa)
void vm_phys_free_contig(vm_page_t m, u_long npages);
void vm_phys_free_pages(vm_page_t m, int order);
void vm_phys_init(void);
-int vm_phys_paddr_to_segind(vm_paddr_t pa);
vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa);
vm_page_t vm_phys_scan_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
u_long alignment, vm_paddr_t boundary, int options);
From owner-svn-src-all@freebsd.org Mon Nov 27 17:54:19 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75108DBAE56;
Mon, 27 Nov 2017 17:54:19 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4EB1E7D900;
Mon, 27 Nov 2017 17:54:19 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARHsIZn078724;
Mon, 27 Nov 2017 17:54:18 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARHsIuf078719;
Mon, 27 Nov 2017 17:54:18 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711271754.vARHsIuf078719@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 27 Nov 2017 17:54:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326285 - in head/cddl:
contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
usr.sbin/dtrace/tests/common/probes usr.sbin/dtrace/tests/common/speculation
usr.sbin/dtrace/tests/common/uct...
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: in head/cddl:
contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
usr.sbin/dtrace/tests/common/probes usr.sbin/dtrace/tests/common/speculation
usr.sbin/dtrace/tests/common/uctf usr.sbin/dtrace/tests/t...
X-SVN-Commit-Revision: 326285
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 17:54:19 -0000
Author: markj
Date: Mon Nov 27 17:54:17 2017
New Revision: 326285
URL: https://svnweb.freebsd.org/changeset/base/326285
Log:
Revert r326181 for now.
We can't link an executable using -m32 until the lib32 phase of a
buildworld, though the build works fine when executing make from
cddl/usr.sbin/dtrace/tests. Some other solution will need to be found.
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Mon Nov 27 17:46:38 2017 (r326284)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Mon Nov 27 17:54:17 2017 (r326285)
@@ -38,7 +38,7 @@ fi
./$exe &
pid=$!
-$dtrace -32 -qs /dev/stdin <<EOF
+$dtrace -qs /dev/stdin <<EOF
typedef struct info {
char *zi_gamename;
int zi_ndungeons;
Modified: head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Mon Nov 27 17:46:38 2017 (r326284)
+++ head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Mon Nov 27 17:54:17 2017 (r326285)
@@ -35,4 +35,5 @@ CFILES= \
tst.probestar.c \
+
.include "../../dtrace.test.mk"
Modified: head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Mon Nov 27 17:46:38 2017 (r326284)
+++ head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Mon Nov 27 17:54:17 2017 (r326285)
@@ -70,6 +70,7 @@ ${PACKAGE}FILES= \
TESTEXES= \
tst.NoSpecBuffer.exe \
+
CFILES= \
Modified: head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Mon Nov 27 17:46:38 2017 (r326284)
+++ head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Mon Nov 27 17:54:17 2017 (r326285)
@@ -40,6 +40,4 @@ CFILES= \
WITH_CTF=YES
-CFLAGS.tst.chasestrings.exe+= -m32
-
.include "../../dtrace.test.mk"
Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Mon Nov 27 17:46:38 2017 (r326284)
+++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Mon Nov 27 17:54:17 2017 (r326285)
@@ -53,8 +53,6 @@ TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\
uctf)
special="
WITH_CTF=YES
-
-CFLAGS.tst.chasestrings.exe+= -m32
"
;;
esac
From owner-svn-src-all@freebsd.org Mon Nov 27 18:06:49 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C8E3DBB222;
Mon, 27 Nov 2017 18:06:49 +0000 (UTC)
(envelope-from andrew@fubar.geek.nz)
Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16])
by mx1.freebsd.org (Postfix) with ESMTP id CAF537E0A6;
Mon, 27 Nov 2017 18:06:48 +0000 (UTC)
(envelope-from andrew@fubar.geek.nz)
Received: from dhcp-10-248-127-139.eduroam.wireless.private.cam.ac.uk
(global-5-144.nat-2.net.cam.ac.uk [131.111.5.144])
by fry.fubar.geek.nz (Postfix) with ESMTPSA id 00B9F4E6DC;
Mon, 27 Nov 2017 18:06:11 +0000 (UTC)
Content-Type: text/plain; charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: svn commit: r326218 - head/sys/kern
From: Andrew Turner <andrew@fubar.geek.nz>
In-Reply-To: <62864c22-e458-2f13-2b33-9dc075ed2ef2@freebsd.org>
Date: Mon, 27 Nov 2017 18:06:11 +0000
Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <F4676F95-5AA5-4838-92D2-0A164F7EB79C@fubar.geek.nz>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<59383A7D-FC99-4748-9561-53D968C4B150@fubar.geek.nz>
<62864c22-e458-2f13-2b33-9dc075ed2ef2@freebsd.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
X-Mailer: Apple Mail (2.3273)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 18:06:49 -0000
> On 26 Nov 2017, at 17:07, Nathan Whitehorn <nwhitehorn@freebsd.org> =
wrote:
>=20
>=20
>=20
> On 11/26/17 01:46, Andrew Turner wrote:
>> On 25 Nov 2017, at 23:41, Nathan Whitehorn <nwhitehorn@freebsd.org> =
wrote:
>>> Author: nwhitehorn
>>> Date: Sat Nov 25 23:41:05 2017
>>> New Revision: 326218
>>> URL: https://svnweb.freebsd.org/changeset/base/326218
>>>=20
>>> Log:
>>> Remove some, but not all, assumptions that the BSP is CPU 0 and =
that CPUs
>>> are numbered densely from there to n_cpus.
>>>=20
>>> MFC after: 1 month
>>>=20
>>> Modified:
>>> head/sys/kern/kern_clock.c
>>> head/sys/kern/kern_clocksource.c
>>> head/sys/kern/kern_shutdown.c
>>> head/sys/kern/kern_timeout.c
>>> head/sys/kern/sched_ule.c
>>> head/sys/kern/subr_pcpu.c
>>>=20
>> ...
>>> Modified: head/sys/kern/subr_pcpu.c
>>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>>> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 =
(r326217)
>>> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 =
(r326218)
>>> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
>>> struct pcpu *
>>> pcpu_find(u_int cpuid)
>>> {
>>> + KASSERT(cpuid_to_pcpu[cpuid] !=3D NULL,
>>> + ("Getting uninitialized PCPU %d", cpuid));
>>>=20
>>> return (cpuid_to_pcpu[cpuid]);
>>> }
>> This breaks on one arm64 simulator I have where the device tree lists =
8 cpus, but only 2 are enabled in the simulation. The ofw_cpu device =
nodes for these are cpu0 and cpu4 so the call to cpu_find in =
ofw_cpu_attach will hit this KASSERT when the CPU has not been enabled.
>>=20
>> Andrew
>>=20
>> cpu0: <Open Firmware CPU> on cpulist0
>> cpu1: <Open Firmware CPU> on cpulist0
>> panic: Getting uninitialized PCPU 1
>> cpuid =3D 0
>> time =3D 1
>> KDB: stack backtrace:
>> db_trace_self() at db_trace_self_wrapper+0x28
>> pc =3D 0xffff0000005f03e8 lr =3D 0xffff000000087048
>> sp =3D 0xffff0000000105a0 fp =3D 0xffff0000000107b0
>=20
> That's unfortunate. Removing the new KASSERT is probably not the right =
option, since all it is doing is indicating a pre-existing bug. =
Specifically, it is preventing ofw_cpu from using a NULL pointer for CPU =
4, which I suppose it was previously happily doing (it would only get =
dereferenced if you had cpufreq support, hence no previous panic).
I would expect cpu4 to have a non-NULL value as its cpu pointer will =
have been set. It=E2=80=99s cpu1 that is the issue as it=E2=80=99s in =
the device tree, but doesn=E2=80=99t exist in =E2=80=9Chardware=E2=80=9D. =
Because of this it fails when we try to enable it so free it=E2=80=99s =
pcpu data clear the pointer.
>=20
> A super quick-and-dirty fix would be to be fail attach on =
CPU_ABSENT(device_get_unit(dev)), which restores the previous buggy =
behavior but without the panic. If you do not actually use ofw_cpu for =
anything, we could also just disable it temporarily on your platform =
(it's off for some PPC systems, you will note, for similar reasons).
We used to use it to find CPUs to start, however this is no longer the =
case.
>=20
> A real fix is somewhat complex, since the driver relies on being able =
to get a mapping from platform-specific numbers in the device tree to an =
entry in pcpu, which intrinsically relies on reverse-engineering the =
platform's mapping between some kind of hardware CPU ID and the kernel =
CPU numbering. I can't think of a way to do that internally. We could =
make some kind of platform macro, but the whole concept is even somewhat =
dubious at the moment since a number of IBM systems with SMT don't even =
have a 1:1 relationship between CPUs as FreeBSD defines them and device =
tree nodes, so it's possible we need a serious rearchitecture of the =
driver.
On arm64 we use the ID from the device tree to assign the cpuid so there =
is a 1:1 mapping between the two. In most cases both are identical, the =
only case that=E2=80=99s not correct is when we boot from a non-zero =
CPU, and I know of only one SoC where this is true.
Andrew
From owner-svn-src-all@freebsd.org Mon Nov 27 18:42:24 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FF2CDE26AD;
Mon, 27 Nov 2017 18:42:24 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4A31A7FE6F;
Mon, 27 Nov 2017 18:42:24 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARIgNR7007370;
Mon, 27 Nov 2017 18:42:23 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARIgNCk007369;
Mon, 27 Nov 2017 18:42:23 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711271842.vARIgNCk007369@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 27 Nov 2017 18:42:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326286 - head/sys/cddl/dev/dtrace
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/cddl/dev/dtrace
X-SVN-Commit-Revision: 326286
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 18:42:24 -0000
Author: markj
Date: Mon Nov 27 18:42:23 2017
New Revision: 326286
URL: https://svnweb.freebsd.org/changeset/base/326286
Log:
Don't use pcpu_find() to determine if a CPU ID is valid.
This addresses assertion failures after r326218.
MFC after: 1 week
Modified:
head/sys/cddl/dev/dtrace/dtrace_ioctl.c
Modified: head/sys/cddl/dev/dtrace/dtrace_ioctl.c
==============================================================================
--- head/sys/cddl/dev/dtrace/dtrace_ioctl.c Mon Nov 27 17:54:17 2017 (r326285)
+++ head/sys/cddl/dev/dtrace/dtrace_ioctl.c Mon Nov 27 18:42:23 2017 (r326286)
@@ -231,10 +231,8 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t add
"DTRACEIOC_AGGSNAP":"DTRACEIOC_BUFSNAP",
curcpu, desc.dtbd_cpu);
- if (desc.dtbd_cpu >= NCPU)
+ if (desc.dtbd_cpu >= MAXCPU || CPU_ABSENT(desc.dtbd_cpu))
return (ENOENT);
- if (pcpu_find(desc.dtbd_cpu) == NULL)
- return (ENOENT);
mutex_enter(&dtrace_lock);
@@ -797,11 +795,7 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t add
nerrs = state->dts_errors;
dstate = &state->dts_vstate.dtvs_dynvars;
- for (i = 0; i < NCPU; i++) {
-#ifndef illumos
- if (pcpu_find(i) == NULL)
- continue;
-#endif
+ CPU_FOREACH(i) {
dtrace_dstate_percpu_t *dcpu = &dstate->dtds_percpu[i];
stat->dtst_dyndrops += dcpu->dtdsc_drops;
From owner-svn-src-all@freebsd.org Mon Nov 27 18:45:44 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9645DDE29A7;
Mon, 27 Nov 2017 18:45:44 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 80A098017C;
Mon, 27 Nov 2017 18:45:44 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from comporellon.tachypleus.net (cpe-75-82-218-62.socal.res.rr.com
[75.82.218.62]) (authenticated bits=0)
by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id vARIjdtO025181
(version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
Mon, 27 Nov 2017 10:45:40 -0800
Subject: Re: svn commit: r326218 - head/sys/kern
To: Andrew Turner <andrew@fubar.geek.nz>
Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<59383A7D-FC99-4748-9561-53D968C4B150@fubar.geek.nz>
<62864c22-e458-2f13-2b33-9dc075ed2ef2@freebsd.org>
<F4676F95-5AA5-4838-92D2-0A164F7EB79C@fubar.geek.nz>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <3deeb9e5-4f6b-0f7f-3303-c4c8ad7ad624@freebsd.org>
Date: Mon, 27 Nov 2017 10:45:39 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <F4676F95-5AA5-4838-92D2-0A164F7EB79C@fubar.geek.nz>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
X-Sonic-CAuth: UmFuZG9tSVYSQETC/g2k7gdj4695qbqquEZFoU2a/lz2Wl3PI+8/r8lWn2V8jyvA1wCjExOYCtDMDjWghZ/pILb+MahaEbjDma9o/43iWu0=
X-Sonic-ID: C;EtUuKqPT5xGHLusnWtmBlw== M;vs61KqPT5xGHLusnWtmBlw==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 18:45:44 -0000
On 11/27/17 10:06, Andrew Turner wrote:
>> On 26 Nov 2017, at 17:07, Nathan Whitehorn <nwhitehorn@freebsd.org> wrote:
>>
>>
>>
>> On 11/26/17 01:46, Andrew Turner wrote:
>>> On 25 Nov 2017, at 23:41, Nathan Whitehorn <nwhitehorn@freebsd.org> wrote:
>>>> Author: nwhitehorn
>>>> Date: Sat Nov 25 23:41:05 2017
>>>> New Revision: 326218
>>>> URL: https://svnweb.freebsd.org/changeset/base/326218
>>>>
>>>> Log:
>>>> Remove some, but not all, assumptions that the BSP is CPU 0 and that CPUs
>>>> are numbered densely from there to n_cpus.
>>>>
>>>> MFC after: 1 month
>>>>
>>>> Modified:
>>>> head/sys/kern/kern_clock.c
>>>> head/sys/kern/kern_clocksource.c
>>>> head/sys/kern/kern_shutdown.c
>>>> head/sys/kern/kern_timeout.c
>>>> head/sys/kern/sched_ule.c
>>>> head/sys/kern/subr_pcpu.c
>>>>
>>> ...
>>>> Modified: head/sys/kern/subr_pcpu.c
>>>> ==============================================================================
>>>> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 (r326217)
>>>> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 (r326218)
>>>> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
>>>> struct pcpu *
>>>> pcpu_find(u_int cpuid)
>>>> {
>>>> + KASSERT(cpuid_to_pcpu[cpuid] != NULL,
>>>> + ("Getting uninitialized PCPU %d", cpuid));
>>>>
>>>> return (cpuid_to_pcpu[cpuid]);
>>>> }
>>> This breaks on one arm64 simulator I have where the device tree lists 8 cpus, but only 2 are enabled in the simulation. The ofw_cpu device nodes for these are cpu0 and cpu4 so the call to cpu_find in ofw_cpu_attach will hit this KASSERT when the CPU has not been enabled.
>>>
>>> Andrew
>>>
>>> cpu0: <Open Firmware CPU> on cpulist0
>>> cpu1: <Open Firmware CPU> on cpulist0
>>> panic: Getting uninitialized PCPU 1
>>> cpuid = 0
>>> time = 1
>>> KDB: stack backtrace:
>>> db_trace_self() at db_trace_self_wrapper+0x28
>>> pc = 0xffff0000005f03e8 lr = 0xffff000000087048
>>> sp = 0xffff0000000105a0 fp = 0xffff0000000107b0
>> That's unfortunate. Removing the new KASSERT is probably not the right option, since all it is doing is indicating a pre-existing bug. Specifically, it is preventing ofw_cpu from using a NULL pointer for CPU 4, which I suppose it was previously happily doing (it would only get dereferenced if you had cpufreq support, hence no previous panic).
> I would expect cpu4 to have a non-NULL value as its cpu pointer will have been set. It’s cpu1 that is the issue as it’s in the device tree, but doesn’t exist in “hardwareâ€. Because of this it fails when we try to enable it so free it’s pcpu data clear the pointer.
Yes, I phrased that badly. As you say, the CPU ID that ofw_cpu has is
"1", which doesn't exist. To fix this, we need to change the CPU ID that
ofw_cpu has to match what the kernel thinks it is using.
>
>> A super quick-and-dirty fix would be to be fail attach on CPU_ABSENT(device_get_unit(dev)), which restores the previous buggy behavior but without the panic. If you do not actually use ofw_cpu for anything, we could also just disable it temporarily on your platform (it's off for some PPC systems, you will note, for similar reasons).
> We used to use it to find CPUs to start, however this is no longer the case.
OK, so disabling it works fine for now.
>
>> A real fix is somewhat complex, since the driver relies on being able to get a mapping from platform-specific numbers in the device tree to an entry in pcpu, which intrinsically relies on reverse-engineering the platform's mapping between some kind of hardware CPU ID and the kernel CPU numbering. I can't think of a way to do that internally. We could make some kind of platform macro, but the whole concept is even somewhat dubious at the moment since a number of IBM systems with SMT don't even have a 1:1 relationship between CPUs as FreeBSD defines them and device tree nodes, so it's possible we need a serious rearchitecture of the driver.
> On arm64 we use the ID from the device tree to assign the cpuid so there is a 1:1 mapping between the two. In most cases both are identical, the only case that’s not correct is when we boot from a non-zero CPU, and I know of only one SoC where this is true.
The "ID from the device tree" being the value of "reg"? Or something
else? I see a lot of variation in the encoding in sys/dts and there does
not seem to be an obvious single answer. This is making me think that
the only workable solution is something like a new ofw_machdep function
that gets the phandle for a given CPU ID.
-Nathan
>
> Andrew
>
>
From owner-svn-src-all@freebsd.org Mon Nov 27 19:35:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 304B0DE3C54;
Mon, 27 Nov 2017 19:35:23 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E40171BEB;
Mon, 27 Nov 2017 19:35:22 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARJZMQG031562;
Mon, 27 Nov 2017 19:35:22 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARJZM4O031561;
Mon, 27 Nov 2017 19:35:22 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711271935.vARJZM4O031561@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 27 Nov 2017 19:35:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326287 - head/usr.sbin/efivar
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/usr.sbin/efivar
X-SVN-Commit-Revision: 326287
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 19:35:23 -0000
Author: emaste
Date: Mon Nov 27 19:35:21 2017
New Revision: 326287
URL: https://svnweb.freebsd.org/changeset/base/326287
Log:
efivar: add missing getopt 'u' option
Modified:
head/usr.sbin/efivar/efivar.c
Modified: head/usr.sbin/efivar/efivar.c
==============================================================================
--- head/usr.sbin/efivar/efivar.c Mon Nov 27 18:42:23 2017 (r326286)
+++ head/usr.sbin/efivar/efivar.c Mon Nov 27 19:35:21 2017 (r326287)
@@ -255,7 +255,7 @@ parse_args(int argc, char **argv)
{
int ch, i;
- while ((ch = getopt_long(argc, argv, "aAbdDf:gHlLNn:OpRt:w",
+ while ((ch = getopt_long(argc, argv, "aAbdDf:gHlLNn:OpRt:uw",
longopts, NULL)) != -1) {
switch (ch) {
case 'a':
From owner-svn-src-all@freebsd.org Mon Nov 27 20:01:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03901DE64CF;
Mon, 27 Nov 2017 20:01:45 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C2A192BCA;
Mon, 27 Nov 2017 20:01:44 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARK1hKE043664;
Mon, 27 Nov 2017 20:01:43 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARK1hCe043663;
Mon, 27 Nov 2017 20:01:43 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201711272001.vARK1hCe043663@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 27 Nov 2017 20:01:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326288 - head/usr.sbin/diskinfo
X-SVN-Group: head
X-SVN-Commit-Author: mav
X-SVN-Commit-Paths: head/usr.sbin/diskinfo
X-SVN-Commit-Revision: 326288
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 20:01:45 -0000
Author: mav
Date: Mon Nov 27 20:01:43 2017
New Revision: 326288
URL: https://svnweb.freebsd.org/changeset/base/326288
Log:
Fix integer overflow in SLOG test.
MFC after: 1 week
Modified:
head/usr.sbin/diskinfo/diskinfo.c
Modified: head/usr.sbin/diskinfo/diskinfo.c
==============================================================================
--- head/usr.sbin/diskinfo/diskinfo.c Mon Nov 27 19:35:21 2017 (r326287)
+++ head/usr.sbin/diskinfo/diskinfo.c Mon Nov 27 20:01:43 2017 (r326288)
@@ -398,7 +398,7 @@ TS(u_int size, int count)
dt = delta_t();
printf("%8.1f usec/IO = %8.1f Mbytes/s\n",
- dt * 1000000.0 / count, size * count / dt / (1024 * 1024));
+ dt * 1000000.0 / count, (double)size * count / dt / (1024 * 1024));
}
static void
From owner-svn-src-all@freebsd.org Mon Nov 27 20:02:01 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 215A7DE66C1;
Mon, 27 Nov 2017 20:02:01 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D99A02D42;
Mon, 27 Nov 2017 20:02:00 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARK202T043727;
Mon, 27 Nov 2017 20:02:00 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARK1xmS043716;
Mon, 27 Nov 2017 20:01:59 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711272001.vARK1xmS043716@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Mon, 27 Nov 2017 20:01:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326289 - in head: cddl/usr.bin/ctfconvert
cddl/usr.bin/ctfconvert/tests etc/mtree usr.bin/fold usr.bin/fold/tests
usr.bin/rs usr.bin/rs/tests
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in head: cddl/usr.bin/ctfconvert
cddl/usr.bin/ctfconvert/tests etc/mtree usr.bin/fold usr.bin/fold/tests
usr.bin/rs usr.bin/rs/tests
X-SVN-Commit-Revision: 326289
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 20:02:01 -0000
Author: asomers
Date: Mon Nov 27 20:01:58 2017
New Revision: 326289
URL: https://svnweb.freebsd.org/changeset/base/326289
Log:
Add basic tests for ctfconvert(1), fold(1) and rs(1)
Add basic command line parsing test coverage for these utilities. The tests
were automatically generated based on their man pages. These tests can be
expanded by hand for more thorough coverage. The aim is to generate very
basic amount of test coverage for all the utilities in the base system.
Tests generated via: https://github.com/shivansh/smoketestsuite/
Submitted by: shivansh
Reviewed by: asomers
MFC after: 3 weeks
Differential Revision: https://reviews.freebsd.org/D12424
Added:
head/cddl/usr.bin/ctfconvert/tests/
head/cddl/usr.bin/ctfconvert/tests/Makefile (contents, props changed)
head/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh (contents, props changed)
head/usr.bin/fold/tests/
head/usr.bin/fold/tests/Makefile (contents, props changed)
head/usr.bin/fold/tests/fold_test.sh (contents, props changed)
head/usr.bin/rs/tests/
head/usr.bin/rs/tests/Makefile (contents, props changed)
head/usr.bin/rs/tests/rs_test.sh (contents, props changed)
Modified:
head/cddl/usr.bin/ctfconvert/Makefile
head/etc/mtree/BSD.tests.dist
head/usr.bin/fold/Makefile
head/usr.bin/rs/Makefile
Modified: head/cddl/usr.bin/ctfconvert/Makefile
==============================================================================
--- head/cddl/usr.bin/ctfconvert/Makefile Mon Nov 27 20:01:43 2017 (r326288)
+++ head/cddl/usr.bin/ctfconvert/Makefile Mon Nov 27 20:01:58 2017 (r326289)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
@@ -35,5 +37,8 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
LIBADD= dwarf elf z pthread
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Added: head/cddl/usr.bin/ctfconvert/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/usr.bin/ctfconvert/tests/Makefile Mon Nov 27 20:01:58 2017 (r326289)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+ATF_TESTS_SH+= ctfconvert_test
+
+.include <bsd.test.mk>
Added: head/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh Mon Nov 27 20:01:58 2017 (r326289)
@@ -0,0 +1,62 @@
+#
+# Copyright 2017 Shivansh
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+usage_output='Usage: ctfconvert'
+
+atf_test_case invalid_usage
+invalid_usage_head()
+{
+ atf_set "descr" "Verify that an invalid usage with a supported option produces a valid error message"
+}
+
+invalid_usage_body()
+{
+ atf_check -s not-exit:0 -e match:"$usage_output" ctfconvert -l
+ atf_check -s not-exit:0 -e match:"$usage_output" ctfconvert -L
+ atf_check -s not-exit:0 -e match:"$usage_output" ctfconvert -g
+ atf_check -s not-exit:0 -e match:"$usage_output" ctfconvert -i
+ atf_check -s not-exit:0 -e match:"$usage_output" ctfconvert -s
+ atf_check -s not-exit:0 -e match:"$usage_output" ctfconvert -o
+}
+
+atf_test_case no_arguments
+no_arguments_head()
+{
+ atf_set "descr" "Verify that ctfconvert(1) fails and generates a valid usage message when no arguments are supplied"
+}
+
+no_arguments_body()
+{
+ atf_check -s not-exit:0 -e match:"$usage_output" ctfconvert
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case invalid_usage
+ atf_add_test_case no_arguments
+}
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Mon Nov 27 20:01:43 2017 (r326288)
+++ head/etc/mtree/BSD.tests.dist Mon Nov 27 20:01:58 2017 (r326289)
@@ -65,6 +65,8 @@
sbin
..
usr.bin
+ ctfconvert
+ ..
..
usr.sbin
dtrace
@@ -654,6 +656,8 @@
..
file2c
..
+ fold
+ ..
getconf
..
grep
@@ -689,6 +693,8 @@
printf
..
procstat
+ ..
+ rs
..
sdiff
..
Modified: head/usr.bin/fold/Makefile
==============================================================================
--- head/usr.bin/fold/Makefile Mon Nov 27 20:01:43 2017 (r326288)
+++ head/usr.bin/fold/Makefile Mon Nov 27 20:01:58 2017 (r326289)
@@ -1,6 +1,11 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= fold
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Added: head/usr.bin/fold/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/fold/tests/Makefile Mon Nov 27 20:01:58 2017 (r326289)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+ATF_TESTS_SH+= fold_test
+
+.include <bsd.test.mk>
Added: head/usr.bin/fold/tests/fold_test.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/fold/tests/fold_test.sh Mon Nov 27 20:01:58 2017 (r326289)
@@ -0,0 +1,81 @@
+#
+# Copyright 2017 Shivansh
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+atf_test_case b_flag
+b_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'b'"
+}
+
+b_flag_body()
+{
+ atf_check -s exit:0 -o empty fold -b < /dev/null
+}
+
+atf_test_case s_flag
+s_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 's'"
+}
+
+s_flag_body()
+{
+ atf_check -s exit:0 -o empty fold -s < /dev/null
+}
+
+atf_test_case invalid_usage
+invalid_usage_head()
+{
+ atf_set "descr" "Verify that an invalid usage with a supported option produces a valid error message"
+}
+
+invalid_usage_body()
+{
+ atf_check -s not-exit:0 -e inline:"fold: option requires an argument -- w
+usage: fold [-bs] [-w width] [file ...]
+" fold -w
+}
+
+atf_test_case no_arguments
+no_arguments_head()
+{
+ atf_set "descr" "Verify that fold(1) executes successfully and silently when invoked without any arguments"
+}
+
+no_arguments_body()
+{
+ atf_check -s exit:0 -o empty fold < /dev/null
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case b_flag
+ atf_add_test_case s_flag
+ atf_add_test_case invalid_usage
+ atf_add_test_case no_arguments
+}
Modified: head/usr.bin/rs/Makefile
==============================================================================
--- head/usr.bin/rs/Makefile Mon Nov 27 20:01:43 2017 (r326288)
+++ head/usr.bin/rs/Makefile Mon Nov 27 20:01:58 2017 (r326289)
@@ -1,5 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
+.include <src.opts.mk>
+
PROG= rs
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Added: head/usr.bin/rs/tests/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/rs/tests/Makefile Mon Nov 27 20:01:58 2017 (r326289)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+ATF_TESTS_SH+= rs_test
+
+.include <bsd.test.mk>
Added: head/usr.bin/rs/tests/rs_test.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/rs/tests/rs_test.sh Mon Nov 27 20:01:58 2017 (r326289)
@@ -0,0 +1,278 @@
+#
+# Copyright 2017 Shivansh
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+atf_test_case c_flag
+c_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'c'"
+}
+
+c_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -c < /dev/null
+}
+
+atf_test_case s_flag
+s_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 's'"
+}
+
+s_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -s < /dev/null
+}
+
+atf_test_case C_flag
+C_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'C'"
+}
+
+C_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -C < /dev/null
+}
+
+atf_test_case S_flag
+S_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'S'"
+}
+
+S_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -S < /dev/null
+}
+
+atf_test_case t_flag
+t_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 't'"
+}
+
+t_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -t < /dev/null
+}
+
+atf_test_case T_flag
+T_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'T'"
+}
+
+T_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -T < /dev/null
+}
+
+atf_test_case k_flag
+k_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'k'"
+}
+
+k_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -k < /dev/null
+}
+
+atf_test_case K_flag
+K_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'K'"
+}
+
+K_flag_body()
+{
+ atf_check -s exit:0 -o inline:"
+" rs -K < /dev/null
+}
+
+atf_test_case g_flag
+g_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'g'"
+}
+
+g_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -g < /dev/null
+}
+
+atf_test_case G_flag
+G_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'G'"
+}
+
+G_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -G < /dev/null
+}
+
+atf_test_case e_flag
+e_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'e'"
+}
+
+e_flag_body()
+{
+ atf_check -s exit:0 -o inline:"
+" rs -e < /dev/null
+}
+
+atf_test_case n_flag
+n_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'n'"
+}
+
+n_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -n < /dev/null
+}
+
+atf_test_case y_flag
+y_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'y'"
+}
+
+y_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -y < /dev/null
+}
+
+atf_test_case h_flag
+h_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'h'"
+}
+
+h_flag_body()
+{
+ atf_check -s exit:0 -o inline:"1 0
+" rs -h < /dev/null
+}
+
+atf_test_case H_flag
+H_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'H'"
+}
+
+H_flag_body()
+{
+ atf_check -s exit:0 -o inline:" 0 line 1
+1 0
+" rs -H < /dev/null
+}
+
+atf_test_case j_flag
+j_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'j'"
+}
+
+j_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -j < /dev/null
+}
+
+atf_test_case m_flag
+m_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'm'"
+}
+
+m_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -m < /dev/null
+}
+
+atf_test_case z_flag
+z_flag_head()
+{
+ atf_set "descr" "Verify the usage of option 'z'"
+}
+
+z_flag_body()
+{
+ atf_check -s exit:0 -o empty rs -z < /dev/null
+}
+
+atf_test_case invalid_usage
+invalid_usage_head()
+{
+ atf_set "descr" "Verify that an invalid usage with a supported option produces a valid error message"
+}
+
+invalid_usage_body()
+{
+ atf_check -s not-exit:0 -e inline:"rs: width must be a positive integer
+" rs -w
+}
+
+atf_test_case no_arguments
+no_arguments_head()
+{
+ atf_set "descr" "Verify that rs(1) executes successfully and produces a valid output when invoked without any arguments"
+}
+
+no_arguments_body()
+{
+ atf_check -s exit:0 -o inline:"
+" rs < /dev/null
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case c_flag
+ atf_add_test_case s_flag
+ atf_add_test_case C_flag
+ atf_add_test_case S_flag
+ atf_add_test_case t_flag
+ atf_add_test_case T_flag
+ atf_add_test_case k_flag
+ atf_add_test_case K_flag
+ atf_add_test_case g_flag
+ atf_add_test_case G_flag
+ atf_add_test_case e_flag
+ atf_add_test_case n_flag
+ atf_add_test_case y_flag
+ atf_add_test_case h_flag
+ atf_add_test_case H_flag
+ atf_add_test_case j_flag
+ atf_add_test_case m_flag
+ atf_add_test_case z_flag
+ atf_add_test_case invalid_usage
+ atf_add_test_case no_arguments
+}
From owner-svn-src-all@freebsd.org Mon Nov 27 20:43:42 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16469DE7AA4;
Mon, 27 Nov 2017 20:43:42 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DD91763850;
Mon, 27 Nov 2017 20:43:41 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
[73.231.226.104])
by mail.baldwin.cx (Postfix) with ESMTPSA id E940610A8BA;
Mon, 27 Nov 2017 15:43:40 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326218 - head/sys/kern
Date: Mon, 27 Nov 2017 11:31:46 -0800
Message-ID: <14322447.103fKFTi3y@ralph.baldwin.cx>
User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; )
In-Reply-To: <abfdf2b1-bb2f-4eb1-a448-bfee68158577@freebsd.org>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<3170692.kvv90QqB0X@ralph.baldwin.cx>
<abfdf2b1-bb2f-4eb1-a448-bfee68158577@freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3
(mail.baldwin.cx); Mon, 27 Nov 2017 15:43:41 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx
X-Virus-Status: Clean
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 20:43:42 -0000
On Sunday, November 26, 2017 10:06:56 PM Nathan Whitehorn wrote:
>
> On 11/26/17 20:50, John Baldwin wrote:
> > On Saturday, November 25, 2017 11:41:05 PM Nathan Whitehorn wrote:
> >> Author: nwhitehorn
> >> Date: Sat Nov 25 23:41:05 2017
> >> New Revision: 326218
> >> URL: https://svnweb.freebsd.org/changeset/base/326218
> >>
> >> Log:
> >> Remove some, but not all, assumptions that the BSP is CPU 0 and that CPUs
> >> are numbered densely from there to n_cpus.
> >>
> >> MFC after: 1 month
> >>
> >> Modified:
> >> head/sys/kern/kern_clock.c
> >> head/sys/kern/kern_clocksource.c
> >> head/sys/kern/kern_shutdown.c
> >> head/sys/kern/kern_timeout.c
> >> head/sys/kern/sched_ule.c
> >> head/sys/kern/subr_pcpu.c
> >>
> >> Modified: head/sys/kern/kern_clock.c
> >> ==============================================================================
> >> --- head/sys/kern/kern_clock.c Sat Nov 25 23:23:24 2017 (r326217)
> >> +++ head/sys/kern/kern_clock.c Sat Nov 25 23:41:05 2017 (r326218)
> >> @@ -573,7 +573,9 @@ hardclock_cnt(int cnt, int usermode)
> >> void
> >> hardclock_sync(int cpu)
> >> {
> >> - int *t = DPCPU_ID_PTR(cpu, pcputicks);
> >> + int *t;
> >> + KASSERT(!CPU_ABSENT(cpu), ("Absent CPU %d", cpu));
> > Blank line before the KASSERT() perhaps?
> >
> >> + t = DPCPU_ID_PTR(cpu, pcputicks);
> >>
> >> *t = ticks;
> > Probably don't need this blank line though?
>
> Those are both good ideas.
>
> >
> >> }
> >>
> >> Modified: head/sys/kern/sched_ule.c
> >> ==============================================================================
> >> --- head/sys/kern/sched_ule.c Sat Nov 25 23:23:24 2017 (r326217)
> >> +++ head/sys/kern/sched_ule.c Sat Nov 25 23:41:05 2017 (r326218)
> >> @@ -2444,6 +2451,7 @@ sched_add(struct thread *td, int flags)
> >> * Pick the destination cpu and if it isn't ours transfer to the
> >> * target cpu.
> >> */
> >> + td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
> >> cpu = sched_pickcpu(td, flags);
> > It is not obvious why every sched_add() needs this once you've fixed thread0.
> > Shouldn't new threads just inherit from thread0's already-fixed value? If not,
> > perhaps fix thread0's value sooner?
>
> That's a fair point. I don't remember the rationale for this now; the
> changes are over a year old from the powernv branch. I do remember
> setting thread0's CPU early not working, but have forgotten why. I will
> try to remember...
>
> >> tdq = sched_setcpu(td, cpu, flags);
> >> tdq_add(tdq, td, flags);
> >>
> >> Modified: head/sys/kern/subr_pcpu.c
> >> ==============================================================================
> >> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 (r326217)
> >> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 (r326218)
> >> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
> >> struct pcpu *
> >> pcpu_find(u_int cpuid)
> >> {
> >> + KASSERT(cpuid_to_pcpu[cpuid] != NULL,
> >> + ("Getting uninitialized PCPU %d", cpuid));
> > This KASSERT seems unnecessary? If the caller uses an invalid one, it will
> > just fault anyway.
>
> It won't necessarily fault. For example, on PowerPC, NULL is a valid
> address that does not trigger faults. It's unfortunately quite
> complicated to fix this in a general way. Even if it did fault, this
> makes the fault more informative (and has found at least one bug on
> arm64 already).
Given the large number of bugs caused by NULL pointers, having NULL pointers
"work" doesn't seem like a long-term tenable solution. You'd have to go add
explicit KASSERT()'s to every pointer indirection in the kernel which seems
unworkable. Also, adding the KASSERT() here has broken other places that were
depending on the existing behavior of pcpu_find() (see markj@'s commit to dtrace
today).
--
John Baldwin
From owner-svn-src-all@freebsd.org Mon Nov 27 20:43:41 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18DA7DE7A66;
Mon, 27 Nov 2017 20:43:41 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E760663848;
Mon, 27 Nov 2017 20:43:40 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
[73.231.226.104])
by mail.baldwin.cx (Postfix) with ESMTPSA id 6FAF510AF3A;
Mon, 27 Nov 2017 15:43:39 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Mark Johnston <markj@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326285 - in head/cddl:
contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
usr.sbin/dtrace/tests/common/probes usr.sbin/dtrace/tests/common/speculation
usr.sbin/dtrace/tests/common/uct...
Date: Mon, 27 Nov 2017 11:40:30 -0800
Message-ID: <4113193.T1NcBVhuux@ralph.baldwin.cx>
User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; )
In-Reply-To: <201711271754.vARHsIuf078719@repo.freebsd.org>
References: <201711271754.vARHsIuf078719@repo.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3
(mail.baldwin.cx); Mon, 27 Nov 2017 15:43:39 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx
X-Virus-Status: Clean
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 20:43:41 -0000
On Monday, November 27, 2017 05:54:18 PM Mark Johnston wrote:
> Author: markj
> Date: Mon Nov 27 17:54:17 2017
> New Revision: 326285
> URL: https://svnweb.freebsd.org/changeset/base/326285
>
> Log:
> Revert r326181 for now.
>
> We can't link an executable using -m32 until the lib32 phase of a
> buildworld, though the build works fine when executing make from
> cddl/usr.sbin/dtrace/tests. Some other solution will need to be found.
I think we should move lib32 earlier ala libraries. Eventually if we
grow x32 support, we might choose to install some binaries as x32
instead of amd64 for example (or n32 instead of n64 for MIPS) because
they don't need the large address space and are more efficient when
using smaller pointers. (This is similar to Solaris shipping 32-bit
binaries for some system binaries on sparc64.) We might also need
to install lib32 (and other alternate ABI libraries) into WORLDTMP
for this to fully work.
--
John Baldwin
From owner-svn-src-all@freebsd.org Mon Nov 27 20:43:44 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B608CDE7AFC;
Mon, 27 Nov 2017 20:43:44 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 936B663879;
Mon, 27 Nov 2017 20:43:44 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
[73.231.226.104])
by mail.baldwin.cx (Postfix) with ESMTPSA id 966A310AF2A;
Mon, 27 Nov 2017 15:43:43 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Fedor Uporov <fsu@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326282 - in head/sys: amd64/linux amd64/linux32
i386/linux
Date: Mon, 27 Nov 2017 11:27:35 -0800
Message-ID: <2015849.BP9pEIm6Xk@ralph.baldwin.cx>
User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; )
In-Reply-To: <201711271703.vARH3B5c049482@repo.freebsd.org>
References: <201711271703.vARH3B5c049482@repo.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3
(mail.baldwin.cx); Mon, 27 Nov 2017 15:43:43 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx
X-Virus-Status: Clean
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 20:43:44 -0000
On Monday, November 27, 2017 05:03:11 PM Fedor Uporov wrote:
> Author: fsu
> Date: Mon Nov 27 17:03:11 2017
> New Revision: 326282
> URL: https://svnweb.freebsd.org/changeset/base/326282
>
> Log:
> Remap ENOATTR to ENODATA in the linuxulator.
> In the linux ENOADATA is frequently #defined as ENOATTR.
> The change is required for an xattrs support implementation.
>
> MFC after: 1 week
> Discussed with: netchild
> Approved by: pfg
Please also update the table in lib/libsysdecode/errno.c
(bsd_to_linux_errno[]).
It is kind of crummy to have 4 identical copies of this table. We
should probably move it into some shared header file (libsysdecode
already depends on files from sys/, so the header could live in
sys/, maybe sys/x86/linux/errno.h or some such, or if it is MI
sys/compat/linux/linux_errno.h)
--
John Baldwin
From owner-svn-src-all@freebsd.org Mon Nov 27 20:43:44 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5EC20DE7AED;
Mon, 27 Nov 2017 20:43:44 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3464C63873;
Mon, 27 Nov 2017 20:43:43 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
[73.231.226.104])
by mail.baldwin.cx (Postfix) with ESMTPSA id 5185B10A8BC;
Mon, 27 Nov 2017 15:43:42 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Mark Johnston <markj@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326286 - head/sys/cddl/dev/dtrace
Date: Mon, 27 Nov 2017 11:28:07 -0800
Message-ID: <2717040.9stBD4iAp4@ralph.baldwin.cx>
User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; )
In-Reply-To: <201711271842.vARIgNCk007369@repo.freebsd.org>
References: <201711271842.vARIgNCk007369@repo.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3
(mail.baldwin.cx); Mon, 27 Nov 2017 15:43:42 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx
X-Virus-Status: Clean
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 20:43:44 -0000
On Monday, November 27, 2017 06:42:23 PM Mark Johnston wrote:
> Author: markj
> Date: Mon Nov 27 18:42:23 2017
> New Revision: 326286
> URL: https://svnweb.freebsd.org/changeset/base/326286
>
> Log:
> Don't use pcpu_find() to determine if a CPU ID is valid.
>
> This addresses assertion failures after r326218.
I'd perhaps rather revert the assertion as per my other mail?
--
John Baldwin
From owner-svn-src-all@freebsd.org Mon Nov 27 20:49:20 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EEE4DE8251
for <svn-src-all@mailman.ysv.freebsd.org>;
Mon, 27 Nov 2017 20:49:20 +0000 (UTC)
(envelope-from wlosh@bsdimp.com)
Received: from mail-io0-x233.google.com (mail-io0-x233.google.com
[IPv6:2607:f8b0:4001:c06::233])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id C97C063FFC
for <svn-src-all@freebsd.org>; Mon, 27 Nov 2017 20:49:19 +0000 (UTC)
(envelope-from wlosh@bsdimp.com)
Received: by mail-io0-x233.google.com with SMTP id q101so37790883ioi.1
for <svn-src-all@freebsd.org>; Mon, 27 Nov 2017 12:49:19 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=bsdimp-com.20150623.gappssmtp.com; s=20150623;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc;
bh=XZatES4zmuMjJT249jXzTOc4U80qiqWo01qyq/hTvmE=;
b=NnK7CFlA+jRvYP/mujt0ykc9Oljv8WD0oFnLNCru6wHs3M4QJyyyHokzzDAquneMky
4HyG4LVyFPL/NcsgyIBF+Q3V4/TSETtBrqd4lw8iGAsJFtCmz0q/HTr4uAU1qluifRdb
a7G2PiyiVjj1FUxtWA76eTKqNe/b21eBE5AYQJ45xgGGMr8DqzjVLcyfSDQvOdCgFUHn
Q9ypbWabkZkfT6H4zUN66xalzRW4i9uq5FFC0DCE5AX+rtzeZX1Zxw78y2sRNl765Teo
CdYc4IN6aThISYyGKHyqwINRfrVCueJDdQh/v1C/d6lJGqztALnpZBQLgmQgUrY0MqDR
Usgg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
:date:message-id:subject:to:cc;
bh=XZatES4zmuMjJT249jXzTOc4U80qiqWo01qyq/hTvmE=;
b=nnmo0+48Xi35+xUihE13TjSPsIGDV1vKJcF1FNVmS5tqR1hoCRqTcXL0vWaEUJL1Cu
m3G5rNltScEdOuc6TxFoDAyqq7B4dqJU8Lo8XTjhRTpZ0ubVkevj+sIWhkdrluUuCcPx
fBFFa0kvfnHteNSGYPvGLMNh3lpfc+Qgo7UajppeAlufUfJri7txf43W8ATczbaaboew
329hNsr6c6WkOP9YL07GGX7QfGdiP6vYIxXUyXUOgUBvEXtt1I/ZBETvGBn7ktti393S
rq5SbnecLOzGrKm1RUauRPvMPT+WIx03fv7hbcRSjRrlkE6kEIYF4uQBTYKcSJs1mO7w
Ox+w==
X-Gm-Message-State: AJaThX4mU2L+WTc4trr8Qsh6oPt56UoU0HkqGI6ZCG6sHstKkHA87M8m
/1/eBogzhOmHTd9YuSntHwzmVZ/KcUHxze0agW/PIQ==
X-Google-Smtp-Source: AGs4zMYDkkjQPNZzhEaC2pGLVANafO+L6bchHGLnWqDqloFIHzFd6cQUBeNejE59gdRD2Elz1UnVhHm4sCYSNuBtnok=
X-Received: by 10.107.104.18 with SMTP id d18mr95968ioc.136.1511815759064;
Mon, 27 Nov 2017 12:49:19 -0800 (PST)
MIME-Version: 1.0
Sender: wlosh@bsdimp.com
Received: by 10.79.108.204 with HTTP; Mon, 27 Nov 2017 12:49:18 -0800 (PST)
X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d]
In-Reply-To: <4113193.T1NcBVhuux@ralph.baldwin.cx>
References: <201711271754.vARHsIuf078719@repo.freebsd.org>
<4113193.T1NcBVhuux@ralph.baldwin.cx>
From: Warner Losh <imp@bsdimp.com>
Date: Mon, 27 Nov 2017 13:49:18 -0700
X-Google-Sender-Auth: VcM404JgWYgSA_5CeYQUx4tzXbw
Message-ID: <CANCZdfpxS0AWfKvWSBotChpBqgOgrZi621djpgd8ENdgrfKOrQ@mail.gmail.com>
Subject: Re: svn commit: r326285 - in head/cddl:
contrib/opensolaris/cmd/dtrace/test/tst/common/uctf
usr.sbin/dtrace/tests/common/probes usr.sbin/dtrace/tests/common/speculation
usr.sbin/dtrace/tests/common/uct...
To: John Baldwin <jhb@freebsd.org>
Cc: Mark Johnston <markj@freebsd.org>,
src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.25
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 20:49:20 -0000
On Mon, Nov 27, 2017 at 12:40 PM, John Baldwin <jhb@freebsd.org> wrote:
> On Monday, November 27, 2017 05:54:18 PM Mark Johnston wrote:
> > Author: markj
> > Date: Mon Nov 27 17:54:17 2017
> > New Revision: 326285
> > URL: https://svnweb.freebsd.org/changeset/base/326285
> >
> > Log:
> > Revert r326181 for now.
> >
> > We can't link an executable using -m32 until the lib32 phase of a
> > buildworld, though the build works fine when executing make from
> > cddl/usr.sbin/dtrace/tests. Some other solution will need to be found.
>
> I think we should move lib32 earlier ala libraries. Eventually if we
> grow x32 support, we might choose to install some binaries as x32
> instead of amd64 for example (or n32 instead of n64 for MIPS) because
> they don't need the large address space and are more efficient when
> using smaller pointers. (This is similar to Solaris shipping 32-bit
> binaries for some system binaries on sparc64.) We might also need
> to install lib32 (and other alternate ABI libraries) into WORLDTMP
> for this to fully work.
>
Since lib32 is optional part of the build, that would need to be taken into
account as well for any binaries we build / run.
But the whole libcompat stuff is bolted on at the end as an afterthought,
and I totally agree that should change if we ever want it to be more than
just an after thought.
Warner
From owner-svn-src-all@freebsd.org Mon Nov 27 21:10:51 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8776DE88C5;
Mon, 27 Nov 2017 21:10:51 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7970B64B50;
Mon, 27 Nov 2017 21:10:51 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARLAoI1070022;
Mon, 27 Nov 2017 21:10:50 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARLAo0F070021;
Mon, 27 Nov 2017 21:10:50 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711272110.vARLAo0F070021@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Mon, 27 Nov 2017 21:10:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326290 - head/usr.sbin/diskinfo
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/usr.sbin/diskinfo
X-SVN-Commit-Revision: 326290
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 21:10:51 -0000
Author: asomers
Date: Mon Nov 27 21:10:50 2017
New Revision: 326290
URL: https://svnweb.freebsd.org/changeset/base/326290
Log:
diskinfo(8): Delete dead code in slog test
Reported by: Coverity
CID: 1377556
Reviewed by: mav
MFC after: 3 weeks
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D13275
Modified:
head/usr.sbin/diskinfo/diskinfo.c
Modified: head/usr.sbin/diskinfo/diskinfo.c
==============================================================================
--- head/usr.sbin/diskinfo/diskinfo.c Mon Nov 27 20:01:58 2017 (r326289)
+++ head/usr.sbin/diskinfo/diskinfo.c Mon Nov 27 21:10:50 2017 (r326290)
@@ -646,22 +646,22 @@ parwrite(int fd, size_t size, off_t off)
{
struct aiocb aios[MAXIOS];
off_t o;
- size_t s;
int n, error;
struct aiocb *aiop;
- for (n = 0, o = 0; size > MAXIO; n++, size -= s, o += s) {
- s = (size >= MAXIO) ? MAXIO : size;
+ // if size > MAXIO, use AIO to write n - 1 pieces in parallel
+ for (n = 0, o = 0; size > MAXIO; n++, size -= MAXIO, o += MAXIO) {
aiop = &aios[n];
bzero(aiop, sizeof(*aiop));
aiop->aio_buf = &buf[o];
aiop->aio_fildes = fd;
aiop->aio_offset = off + o;
- aiop->aio_nbytes = s;
+ aiop->aio_nbytes = MAXIO;
error = aio_write(aiop);
if (error != 0)
err(EX_IOERR, "AIO write submit error");
}
+ // Use synchronous writes for the runt of size <= MAXIO
error = pwrite(fd, &buf[o], size, off + o);
if (error < 0)
err(EX_IOERR, "Sync write error");
From owner-svn-src-all@freebsd.org Mon Nov 27 21:30:52 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 424BADE8E3E;
Mon, 27 Nov 2017 21:30:52 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E054B6549A;
Mon, 27 Nov 2017 21:30:51 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARLUp06080001;
Mon, 27 Nov 2017 21:30:51 GMT (envelope-from landonf@FreeBSD.org)
Received: (from landonf@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARLUoqm078232;
Mon, 27 Nov 2017 21:30:50 GMT (envelope-from landonf@FreeBSD.org)
Message-Id: <201711272130.vARLUoqm078232@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: landonf set sender to
landonf@FreeBSD.org using -f
From: "Landon J. Fuller" <landonf@FreeBSD.org>
Date: Mon, 27 Nov 2017 21:30:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326291 - in head: share/man/man4 share/man/man9
sys/dev/bhnd sys/dev/bhnd/nvram
X-SVN-Group: head
X-SVN-Commit-Author: landonf
X-SVN-Commit-Paths: in head: share/man/man4 share/man/man9 sys/dev/bhnd
sys/dev/bhnd/nvram
X-SVN-Commit-Revision: 326291
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 21:30:52 -0000
Author: landonf
Date: Mon Nov 27 21:30:49 2017
New Revision: 326291
URL: https://svnweb.freebsd.org/changeset/base/326291
Log:
bhnd(4) update inline documentation comments and man pages.
This includes a number of copyedits for the inline code documentation
comments, updates to the existing bhnd(4), bhndb(4), bcma(4), and siba(4)
man pages, and new man pages for bhnd_chipc(4), bhnd_pmu(4), bhndb_pci(4),
bhnd(9), and bhnd_erom(9).
Approved by: adrian (mentor)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D13021
Added:
head/share/man/man4/bhnd_chipc.4 (contents, props changed)
head/share/man/man4/bhnd_pmu.4 (contents, props changed)
head/share/man/man4/bhndb_pci.4 (contents, props changed)
head/share/man/man9/bhnd.9 (contents, props changed)
head/share/man/man9/bhnd_erom.9 (contents, props changed)
Modified:
head/share/man/man4/Makefile
head/share/man/man4/bcma.4
head/share/man/man4/bhnd.4
head/share/man/man4/bhndb.4
head/share/man/man4/siba.4
head/share/man/man9/Makefile
head/sys/dev/bhnd/bhnd.h
head/sys/dev/bhnd/bhnd_bus_if.m
head/sys/dev/bhnd/bhnd_erom.c
head/sys/dev/bhnd/bhnd_subr.c
head/sys/dev/bhnd/nvram/bhnd_nvram_subr.c
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Mon Nov 27 21:10:50 2017 (r326290)
+++ head/share/man/man4/Makefile Mon Nov 27 21:30:49 2017 (r326291)
@@ -78,7 +78,10 @@ MAN= aac.4 \
bge.4 \
${_bhyve.4} \
bhnd.4 \
+ bhnd_chipc.4 \
+ bhnd_pmu.4 \
bhndb.4 \
+ bhndb_pci.4 \
bktr.4 \
blackhole.4 \
bnxt.4 \
Modified: head/share/man/man4/bcma.4
==============================================================================
--- head/share/man/man4/bcma.4 Mon Nov 27 21:10:50 2017 (r326290)
+++ head/share/man/man4/bcma.4 Mon Nov 27 21:30:49 2017 (r326291)
@@ -32,15 +32,14 @@
.Nm bcma
.Nd Broadcom AMBA Backplane driver
.Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following lines in your kernel configuration file:
+To compile this driver into the kernel, add the following lines to the
+kernel configuration file:
.Bd -ragged -offset indent
.Cd "device bhnd"
.Cd "device bcma"
.Ed
.Pp
-Alternatively, to load the driver as a module at boot time,
-place the following line in
+To load the driver as a module at boot, add this line to
.Xr loader.conf 5 :
.Bd -literal -offset indent
bcma_load="YES"
@@ -51,8 +50,8 @@ The
driver provides
.Xr bhnd 4
support for devices using the ARM AMBA-based backplane architecture found
-in later Broadcom Home Networking Division's (HND) wireless chipsets and
-embedded systems.
+in later Broadcom Home Networking Division's network chipsets and embedded
+systems.
.Pp
A common interconnect connects all of the backplane's functional
blocks.
@@ -64,7 +63,9 @@ The IP cores used in
devices were adapted by Broadcom for compatibility with the new
interconnect.
.Sh SEE ALSO
-.Xr bhnd 4
+.Xr bhnd 4 ,
+.Xr intro 4 ,
+.Xr siba 4
.Sh HISTORY
The
.Nm
Modified: head/share/man/man4/bhnd.4
==============================================================================
--- head/share/man/man4/bhnd.4 Mon Nov 27 21:10:50 2017 (r326290)
+++ head/share/man/man4/bhnd.4 Mon Nov 27 21:30:49 2017 (r326291)
@@ -31,14 +31,13 @@
.Nm bhnd
.Nd Broadcom Home Networking Division interconnect bus
.Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following lines in your kernel configuration file:
+To compile this driver into the kernel, add the following lines to the
+kernel configuration file:
.Bd -ragged -offset indent
.Cd "device bhnd"
.Ed
.Pp
-Alternatively, to load the driver as a module at boot time,
-place the following line in
+To load the driver as a module at boot, add this line to
.Xr loader.conf 5 :
.Bd -literal -offset indent
bhnd_load="YES"
@@ -69,6 +68,7 @@ BHND driver.
.Sh SEE ALSO
.Xr bcma 4 ,
.Xr bhndb 4 ,
+.Xr intro 4 ,
.Xr siba 4
.Sh HISTORY
The
Added: head/share/man/man4/bhnd_chipc.4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/man/man4/bhnd_chipc.4 Mon Nov 27 21:30:49 2017 (r326291)
@@ -0,0 +1,81 @@
+.\" Copyright (c) 2017 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Landon Fuller under sponsorship from
+.\" the FreeBSD Foundation.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 16, 2017
+.Dt BHND_CHIPC 4
+.Os
+.Sh NAME
+.Nm bhnd_chipc
+.Nd Broadcom Home Networking Division ChipCommon Driver
+.Sh SYNOPSIS
+To compile this driver into the kernel, add this line to the
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device bhnd"
+.Ed
+.Pp
+To compile driver support for all additional devices found in embedded systems,
+add the following additional lines to the kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device cfi"
+.Cd "device gpio"
+.Cd "device spibus"
+.Cd "device uart"
+.Ed
+.Pp
+To load the driver as a module at boot, add this line to
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+bhnd_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the ChipCommon core found in Broadcom Home Networking
+Division network chipsets and embedded systems.
+.Pp
+The ChipCommon core provides an interface to common hardware facilities,
+including device identification, UARTs, CFI and SPI flash, One-time Programmable
+(OTP) Memory, and GPIO.
+.Sh SEE ALSO
+.Xr bhnd 4 ,
+.Xr intro 4
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Landon Fuller Aq Mt landonf@FreeBSD.org ,
+and
+.An Michael Zhilin Aq Mt mizhka@FreeBSD.org .
Added: head/share/man/man4/bhnd_pmu.4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/man/man4/bhnd_pmu.4 Mon Nov 27 21:30:49 2017 (r326291)
@@ -0,0 +1,74 @@
+.\" Copyright (c) 2017 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Landon Fuller under sponsorship from
+.\" the FreeBSD Foundation.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 16, 2017
+.Dt BHND_PMU 4
+.Os
+.Sh NAME
+.Nm bhnd_pmu
+.Nd Broadcom Home Networking Division PMU Driver
+.Sh SYNOPSIS
+To compile this driver into the kernel, add this line to the
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device bhnd"
+.Ed
+.Pp
+To load the driver as a module at boot, add this line to
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+bhnd_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the Power Management Unit (PMU) found in Broadcom Home
+Networking Division network chipsets and embedded systems.
+.Pp
+The PMU provides a hardware interface for managing the device's clock and power
+topology.
+.Sh SEE ALSO
+.Xr bhnd 4 ,
+.Xr intro 4
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 12.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was derived from Broadcom's ISC-licensed Linux PMU drivers, and was
+ported to
+.Fx
+and
+.Xr bhnd 4
+by
+.An Landon Fuller Aq Mt landonf@FreeBSD.org .
Modified: head/share/man/man4/bhndb.4
==============================================================================
--- head/share/man/man4/bhndb.4 Mon Nov 27 21:10:50 2017 (r326290)
+++ head/share/man/man4/bhndb.4 Mon Nov 27 21:30:49 2017 (r326291)
@@ -1,6 +1,10 @@
-.\" Copyright (c) 2015 Landon Fuller
+.\" Copyright (c) 2015 Landon Fuller <landonf@FreeBSD.org>
+.\" Copyright (c) 2017 The FreeBSD Foundation
.\" All rights reserved.
.\"
+.\" Portions of this documentation were written by Landon Fuller
+.\" under sponsorship from the FreeBSD Foundation.
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -24,37 +28,41 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 3, 2016
+.Dd October 16th, 2017
.Dt BHNDB 4
.Os
.Sh NAME
.Nm bhndb
.Nd Broadcom Home Networking Division interconnect bridge driver
.Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following lines in your kernel configuration file:
+To compile this driver into the kernel, add the following lines to the
+kernel configuration file:
.Bd -ragged -offset indent
.Cd "device bhnd"
.Cd "device bhndb"
.Ed
.Pp
-Alternatively, to load the driver as a module at boot time,
-place the following line in
+To load the driver as a module at boot, add this line to
.Xr loader.conf 5 :
.Bd -literal -offset indent
bhndb_load="YES"
-bhndb_pci_load="YES"
.Ed
.Sh DESCRIPTION
The
.Nm
-driver supports
+driver provides
.Xr bhnd 4
-host bridge cores such as those used by Broadcom HND PCI,
-PCMCIA, and SDIO network adapters.
+host bridge support for Broadcom Home Networking Division's wireless chipsets
+and network adapters.
+.Pp
+To enable use for PCI/PCIe systems, see the
+.Xr bhndb_pci 4
+driver.
.Sh SEE ALSO
.Xr bhnd 4 ,
-.Xr bwn 4
+.Xr bhndb_pci 4 ,
+.Xr bwn 4 ,
+.Xr intro 4
.Sh HISTORY
The
.Nm
Added: head/share/man/man4/bhndb_pci.4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/man/man4/bhndb_pci.4 Mon Nov 27 21:30:49 2017 (r326291)
@@ -0,0 +1,75 @@
+.\" Copyright (c) 2015 Landon Fuller <landonf@FreeBSD.org>
+.\" Copyright (c) 2017 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" Portions of this documentation were written by Landon Fuller
+.\" under sponsorship from the FreeBSD Foundation.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 16, 2017
+.Dt BHNDB_PCI 4
+.Os
+.Sh NAME
+.Nm bhndb_pci
+.Nd Broadcom Home Networking Division PCI host bridge driver
+.Sh SYNOPSIS
+To compile this driver into the kernel, add the following lines to the
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device bhnd"
+.Cd "device bhndb"
+.Cd "device bhndb_pci"
+.Cd "device pci"
+.Ed
+.Pp
+To load the driver as a module at boot, add this line to
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+bhndb_pci_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides
+.Xr bhndb 4
+support for the PCI and PCIe host bridge cores found in Broadcom Home Networking
+Division's wireless chipsets and network adapters.
+.Sh SEE ALSO
+.Xr bhnd 4 ,
+.Xr bhndb 4 ,
+.Xr bwn 4 ,
+.Xr intro 4 ,
+.Xr pci 4
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Landon Fuller Aq Mt landonf@FreeBSD.org .
Modified: head/share/man/man4/siba.4
==============================================================================
--- head/share/man/man4/siba.4 Mon Nov 27 21:10:50 2017 (r326290)
+++ head/share/man/man4/siba.4 Mon Nov 27 21:30:49 2017 (r326291)
@@ -31,15 +31,14 @@
.Nm siba
.Nd Sonic Inc. Silicon Backplane driver
.Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following lines in your kernel configuration file:
+To compile this driver into the kernel, add the following lines to the
+kernel configuration file:
.Bd -ragged -offset indent
.Cd "device bhnd"
.Cd "device siba"
.Ed
.Pp
-Alternatively, to load the driver as a module at boot time,
-place the following line in
+To load the driver as a module at boot, add this line to
.Xr loader.conf 5 :
.Bd -literal -offset indent
siba_load="YES"
@@ -68,7 +67,8 @@ host interfaces (PCI, PCMCIA), embedded processors (MI
or DMA processors associated with communications cores.
.Sh SEE ALSO
.Xr bcma 4 ,
-.Xr bhnd 4
+.Xr bhnd 4 ,
+.Xr intro 4
.Sh HISTORY
The
.Nm
Modified: head/share/man/man9/Makefile
==============================================================================
--- head/share/man/man9/Makefile Mon Nov 27 21:10:50 2017 (r326290)
+++ head/share/man/man9/Makefile Mon Nov 27 21:30:49 2017 (r326291)
@@ -12,6 +12,8 @@ MAN= accept_filter.9 \
alq.9 \
altq.9 \
atomic.9 \
+ bhnd.9 \
+ bhnd_erom.9 \
bios.9 \
bitset.9 \
boot.9 \
@@ -444,6 +446,124 @@ MLINKS+=atomic.9 atomic_add.9 \
atomic.9 atomic_subtract.9 \
atomic.9 atomic_swap.9 \
atomic.9 atomic_testandset.9
+MLINKS+=bhnd.9 BHND_MATCH_BOARD_TYPE.9 \
+ bhnd.9 BHND_MATCH_BOARD_VENDOR.9 \
+ bhnd.9 BHND_MATCH_CHIP_ID.9 \
+ bhnd.9 BHND_MATCH_CHIP_PKG.9 \
+ bhnd.9 BHND_MATCH_CHIP_REV.9 \
+ bhnd.9 BHND_MATCH_CORE_ID.9 \
+ bhnd.9 BHND_MATCH_CORE_VENDOR.9 \
+ bhnd.9 bhnd_activate_resource.9 \
+ bhnd.9 bhnd_alloc_pmu.9 \
+ bhnd.9 bhnd_alloc_resource.9 \
+ bhnd.9 bhnd_alloc_resource_any.9 \
+ bhnd.9 bhnd_alloc_resources.9 \
+ bhnd.9 bhnd_board_matches.9 \
+ bhnd.9 bhnd_bus_match_child.9 \
+ bhnd.9 bhnd_bus_read_1.9 \
+ bhnd.9 bhnd_bus_read_2.9 \
+ bhnd.9 bhnd_bus_read_4.9 \
+ bhnd.9 bhnd_bus_read_stream_1.9 \
+ bhnd.9 bhnd_bus_read_stream_2.9 \
+ bhnd.9 bhnd_bus_read_stream_4.9 \
+ bhnd.9 bhnd_bus_write_1.9 \
+ bhnd.9 bhnd_bus_write_2.9 \
+ bhnd.9 bhnd_bus_write_4.9 \
+ bhnd.9 bhnd_bus_write_stream_1.9 \
+ bhnd.9 bhnd_bus_write_stream_2.9 \
+ bhnd.9 bhnd_bus_write_stream_4.9 \
+ bhnd.9 bhnd_chip_matches.9 \
+ bhnd.9 bhnd_core_class.9 \
+ bhnd.9 bhnd_core_get_match_desc.9 \
+ bhnd.9 bhnd_core_matches.9 \
+ bhnd.9 bhnd_core_name.9 \
+ bhnd.9 bhnd_cores_equal.9 \
+ bhnd.9 bhnd_deactivate_resource.9 \
+ bhnd.9 bhnd_decode_port_rid.9 \
+ bhnd.9 bhnd_deregister_provider.9 \
+ bhnd.9 bhnd_device_lookup.9 \
+ bhnd.9 bhnd_device_matches.9 \
+ bhnd.9 bhnd_device_quirks.9 \
+ bhnd.9 bhnd_driver_get_erom_class.9 \
+ bhnd.9 bhnd_enable_clocks.9 \
+ bhnd.9 bhnd_find_core_class.9 \
+ bhnd.9 bhnd_find_core_name.9 \
+ bhnd.9 bhnd_format_chip_id.9 \
+ bhnd.9 bhnd_get_attach_type.9 \
+ bhnd.9 bhnd_get_chipid.9 \
+ bhnd.9 bhnd_get_class.9 \
+ bhnd.9 bhnd_get_clock_freq.9 \
+ bhnd.9 bhnd_get_clock_latency.9 \
+ bhnd.9 bhnd_get_core_index.9 \
+ bhnd.9 bhnd_get_core_info.9 \
+ bhnd.9 bhnd_get_core_unit.9 \
+ bhnd.9 bhnd_get_device.9 \
+ bhnd.9 bhnd_get_device_name.9 \
+ bhnd.9 bhnd_get_dma_translation.9 \
+ bhnd.9 bhnd_get_hwrev.9 \
+ bhnd.9 bhnd_get_intr_count.9 \
+ bhnd.9 bhnd_get_intr_ivec.9 \
+ bhnd.9 bhnd_get_port_count.9 \
+ bhnd.9 bhnd_get_port_rid.9 \
+ bhnd.9 bhnd_get_region_addr.9 \
+ bhnd.9 bhnd_get_region_count.9 \
+ bhnd.9 bhnd_get_vendor.9 \
+ bhnd.9 bhnd_get_vendor_name.9 \
+ bhnd.9 bhnd_hwrev_matches.9 \
+ bhnd.9 bhnd_is_hw_suspended.9 \
+ bhnd.9 bhnd_is_region_valid.9 \
+ bhnd.9 bhnd_map_intr.9 \
+ bhnd.9 bhnd_match_core.9 \
+ bhnd.9 bhnd_nvram_getvar.9 \
+ bhnd.9 bhnd_nvram_getvar_array.9 \
+ bhnd.9 bhnd_nvram_getvar_int.9 \
+ bhnd.9 bhnd_nvram_getvar_int16.9 \
+ bhnd.9 bhnd_nvram_getvar_int32.9 \
+ bhnd.9 bhnd_nvram_getvar_int8.9 \
+ bhnd.9 bhnd_nvram_getvar_str.9 \
+ bhnd.9 bhnd_nvram_getvar_uint.9 \
+ bhnd.9 bhnd_nvram_getvar_uint16.9 \
+ bhnd.9 bhnd_nvram_getvar_uint32.9 \
+ bhnd.9 bhnd_nvram_getvar_uint8.9 \
+ bhnd.9 bhnd_nvram_string_array_next.9 \
+ bhnd.9 bhnd_read_board_info.9 \
+ bhnd.9 bhnd_read_config.9 \
+ bhnd.9 bhnd_read_ioctl.9 \
+ bhnd.9 bhnd_read_iost.9 \
+ bhnd.9 bhnd_register_provider.9 \
+ bhnd.9 bhnd_release_ext_rsrc.9 \
+ bhnd.9 bhnd_release_pmu.9 \
+ bhnd.9 bhnd_release_provider.9 \
+ bhnd.9 bhnd_release_resource.9 \
+ bhnd.9 bhnd_release_resources.9 \
+ bhnd.9 bhnd_request_clock.9 \
+ bhnd.9 bhnd_request_ext_rsrc.9 \
+ bhnd.9 bhnd_reset_hw.9 \
+ bhnd.9 bhnd_retain_provider.9 \
+ bhnd.9 bhnd_set_custom_core_desc.9 \
+ bhnd.9 bhnd_set_default_core_desc.9 \
+ bhnd.9 bhnd_suspend_hw.9 \
+ bhnd.9 bhnd_unmap_intr.9 \
+ bhnd.9 bhnd_vendor_name.9 \
+ bhnd.9 bhnd_write_config.9 \
+ bhnd.9 bhnd_write_ioctl.9
+MLINKS+=bhnd_erom.9 bhnd_erom_alloc.9 \
+ bhnd_erom.9 bhnd_erom_dump.9 \
+ bhnd_erom.9 bhnd_erom_fini_static.9 \
+ bhnd_erom.9 bhnd_erom_free.9 \
+ bhnd_erom.9 bhnd_erom_free_core_table.9 \
+ bhnd_erom.9 bhnd_erom_get_core_table.9 \
+ bhnd_erom.9 bhnd_erom_init_static.9 \
+ bhnd_erom.9 bhnd_erom_io.9 \
+ bhnd_erom.9 bhnd_erom_io_fini.9 \
+ bhnd_erom.9 bhnd_erom_io_map.9 \
+ bhnd_erom.9 bhnd_erom_io_read.9 \
+ bhnd_erom.9 bhnd_erom_iobus_init.9 \
+ bhnd_erom.9 bhnd_erom_iores_new.9 \
+ bhnd_erom.9 bhnd_erom_lookup_core.9 \
+ bhnd_erom.9 bhnd_erom_lookup_core_addr.9 \
+ bhnd_erom.9 bhnd_erom_probe.9 \
+ bhnd_erom.9 bhnd_erom_probe_driver_classes.9
MLINKS+=bitset.9 BITSET_DEFINE.9 \
bitset.9 BITSET_T_INITIALIZER.9 \
bitset.9 BITSET_FSET.9 \
Added: head/share/man/man9/bhnd.9
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/man/man9/bhnd.9 Mon Nov 27 21:30:49 2017 (r326291)
@@ -0,0 +1,2644 @@
+.\" Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
+.\" Copyright (c) 2017 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" Portions of this documentation were written by Landon Fuller
+.\" under sponsorship from the FreeBSD Foundation.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd November 9, 2017
+.Dt BHND 9
+.Os
+.Sh NAME
+.Nm bhnd
+.Nd BHND driver programming interface
+.Sh SYNOPSIS
+.In dev/bhnd/bhnd.h
+.\"
+.Ss Bus Resource Functions
+.Ft int
+.Fo bhnd_activate_resource
+.Fa "device_t dev" "int type" "int rid" "struct bhnd_resource *r"
+.Fc
+.Ft "struct bhnd_resource *"
+.Fo bhnd_alloc_resource
+.Fa "device_t dev" "int type" "int *rid" "rman_res_t start" "rman_res_t end"
+.Fa "rman_res_t count" "u_int flags"
+.Fc
+.Ft "struct bhnd_resource *"
+.Fo bhnd_alloc_resource_any
+.Fa "device_t dev" "int type" "int *rid" "u_int flags"
+.Fc
+.Ft int
+.Fo bhnd_alloc_resources
+.Fa "device_t dev" "struct resource_spec *rs" "struct bhnd_resource **res"
+.Fc
+.Ft int
+.Fo bhnd_deactivate_resource
+.Fa "device_t dev" "int type" "int rid" "struct bhnd_resource *r"
+.Fc
+.Ft int
+.Fo bhnd_release_resource
+.Fa "device_t dev" "int type" "int rid" "struct bhnd_resource *r"
+.Fc
+.Ft void
+.Fo bhnd_release_resources
+.Fa "device_t dev" "const struct resource_spec *rs"
+.Fa "struct bhnd_resource **res"
+.Fc
+.\"
+.Ss "Bus Space Functions"
+.Ft void
+.Fo bhnd_bus_barrier
+.Fa "struct bhnd_resource *r" "bus_size_t offset"
+.Fa "bus_size_t length" "int flags"
+.Fc
+.Ft uint8_t
+.Fn bhnd_bus_read_1 "struct bhnd_resource *r" "bus_size_t offset"
+.Ft uint16_t
+.Fn bhnd_bus_read_2 "struct bhnd_resource *r" "bus_size_t offset"
+.Ft uint32_t
+.Fn bhnd_bus_read_4 "struct bhnd_resource *r" "bus_size_t offset"
+.Ft void
+.Fo bhnd_bus_read_multi_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_multi_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_multi_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_multi_stream_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_multi_stream_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_multi_stream_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_region_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_region_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_region_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_region_stream_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_region_stream_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_read_region_stream_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fn bhnd_bus_read_stream_1 "struct bhnd_resource *r" "bus_size_t offset"
+.Ft void
+.Fn bhnd_bus_read_stream_2 "struct bhnd_resource *r" "bus_size_t offset"
+.Ft uint32_t
+.Fn bhnd_bus_read_stream_4 "struct bhnd_resource *r" "bus_size_t offset"
+.Ft void
+.Fo bhnd_bus_set_multi_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t value"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_set_multi_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t value"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_set_multi_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t value"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_set_region_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t value"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_set_region_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t value"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_set_region_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t value"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fn bhnd_bus_write_1 "struct bhnd_resource *r" "uint8_t value"
+.Ft void
+.Fn bhnd_bus_write_2 "struct bhnd_resource *r" "uint16_t value"
+.Ft void
+.Fn bhnd_bus_write_4 "struct bhnd_resource *r" "uint32_t value"
+.Ft void
+.Fo bhnd_bus_write_multi_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_multi_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_multi_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_multi_stream_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_multi_stream_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_multi_stream_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_region_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_region_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_region_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_region_stream_1
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint8_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_region_stream_2
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint16_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fo bhnd_bus_write_region_stream_4
+.Fa "struct bhnd_resource *r" "bus_size_t offset" "uint32_t *datap"
+.Fa "bus_size_t count"
+.Fc
+.Ft void
+.Fn bhnd_bus_write_stream_1 "struct bhnd_resource *r" "uint8_t value"
+.Ft void
+.Fn bhnd_bus_write_stream_2 "struct bhnd_resource *r" "uint16_t value"
+.Ft void
+.Fn bhnd_bus_write_stream_4 "struct bhnd_resource *r" "uint32_t value"
+.\"
+.Ss "Device Configuration Functions"
+.Ft int
+.Fn bhnd_read_ioctl "device_t dev" "uint16_t *ioctl"
+.Ft int
+.Fn bhnd_write_ioctl "device_t dev" "uint16_t value" "uint16_t mask"
+.Ft int
+.Fn bhnd_read_iost "device_t dev" "uint16_t *iost"
+.Ft uint32_t
+.Fo bhnd_read_config
+.Fa "device_t dev" "bus_size_t offset" "void *value" "u_int width"
+.Fc
+.Ft int
+.Fo bhnd_write_config
+.Fa "device_t dev" "bus_size_t offset" "const void *value" "u_int width"
+.Fc
+.Ft int
+.Fn bhnd_reset_hw "device_t dev" "uint16_t ioctl"
+.Ft int
+.Fn bhnd_suspend_hw "device_t dev"
+.Ft bool
+.Fn bhnd_is_hw_suspended "device_t dev"
+.\"
+.Ss "Device Information Functions"
+.Ft bhnd_attach_type
+.Fo bhnd_get_attach_type
+.Fa "device_t dev"
+.Fc
+.Ft "const struct bhnd_chipid *"
+.Fo bhnd_get_chipid
+.Fa "device_t dev"
+.Fc
+.Ft bhnd_devclass_t
+.Fo bhnd_get_class
+.Fa "device_t dev"
+.Fc
+.Ft u_int
+.Fo bhnd_get_core_index
+.Fa "device_t dev"
+.Fc
+.Ft "struct bhnd_core_info"
+.Fo bhnd_get_core_info
+.Fa "device_t dev"
+.Fc
+.Ft int
+.Fo bhnd_get_core_unit
+.Fa "device_t dev"
+.Fc
+.Ft uint16_t
+.Fo bhnd_get_device
+.Fa "device_t dev"
+.Fc
+.Ft const char *
+.Fo bhnd_get_device_name
+.Fa "device_t dev"
+.Fc
+.Ft uint8_t
+.Fo bhnd_get_hwrev
+.Fa "device_t dev"
+.Fc
+.Ft uint16_t
+.Fo bhnd_get_vendor
+.Fa "device_t dev"
+.Fc
+.Ft const char *
+.Fo bhnd_get_vendor_name
+.Fa "device_t dev"
+.Fc
+.Ft int
+.Fo bhnd_read_board_info
+.Fa "device_t dev" "struct bhnd_board_info *info"
+.Fc
+.\"
+.Ss "Device Matching Functions"
+.Ft bool
+.Fo bhnd_board_matches
+.Fa "const struct bhnd_board_info *board" "const struct bhnd_board_match *desc"
+.Fc
+.Ft device_t
+.Fo bhnd_bus_match_child
+.Fa "device_t bus" "const struct bhnd_core_match *desc"
+.Fc
+.Ft bool
+.Fo bhnd_chip_matches
+.Fa "const struct bhnd_chipid *chip" "const struct bhnd_chip_match *desc"
+.Fc
+.Ft "struct bhnd_core_match"
+.Fo bhnd_core_get_match_desc
+.Fa "const struct bhnd_core_info *core"
+.Fc
+.Ft bool
+.Fo bhnd_core_matches
+.Fa "const struct bhnd_core_info *core" "const struct bhnd_core_match *desc"
+.Fc
+.Ft bool
+.Fo bhnd_cores_equal
+.Fa "const struct bhnd_core_info *lhs" "const struct bhnd_core_info *rhs"
+.Fc
+.Ft bool
+.Fo bhnd_hwrev_matches
+.Fa "uint16_t hwrev" "const struct bhnd_hwrev_match *desc"
+.Fc
+.Ft "const struct bhnd_core_info *"
+.Fo bhnd_match_core
+.Fa "const struct bhnd_core_info *cores" "u_int num_cores"
+.Fa "const struct bhnd_core_match *desc"
+.Fc
+.\"
+.Ss "Device Table Functions"
+.Ft "const struct bhnd_device *"
+.Fo bhnd_device_lookup
+.Fa "device_t dev" "const struct bhnd_device *table" "size_t entry_size"
+.Fc
+.Ft bool
+.Fo bhnd_device_matches
+.Fa "device_t dev" "const struct bhnd_device_match *desc"
+.Fc
+.Ft uint32_t
+.Fo bhnd_device_quirks
+.Fa "device_t dev" "const struct bhnd_device *table" "size_t entry_size"
+.Fc
+.Fo BHND_BOARD_QUIRK
+.Fa "board" "flags"
+.Fc
+.Fo BHND_CHIP_QUIRK
+.Fa "chip" "hwrev" "flags"
+.Fc
+.Fo BHND_CORE_QUIRK
+.Fa "hwrev" "flags"
+.Fc
+.Fo BHND_DEVICE
+.Fa "vendor" "device" "desc" "quirks" "..."
+.Fc
+.Fo BHND_DEVICE_IS_END
+.Fa "struct bhnd_device *d"
+.Fc
+.Fo BHND_DEVICE_QUIRK_IS_END
+.Fa "struct bhnd_device_quirk *q"
+.Fc
+.Fo BHND_PKG_QUIRK
+.Fa "chip" "pkg" "flags"
+.Fc
+.Bd -literal
+struct bhnd_device_quirk {
+ struct bhnd_device_match desc;
+ uint32_t quirks;
+};
+.Ed
+.Bd -literal
+struct bhnd_device {
+ const struct bhnd_device_match core;
+ const char *desc;
+ const struct bhnd_device_quirk *quirks_table;
+ uint32_t device_flags;
+};
+.Ed
+.Bd -literal
+enum {
+ BHND_DF_ANY = 0,
+ BHND_DF_HOSTB = (1 << 0),
+ BHND_DF_SOC = (1 << 1),
+ BHND_DF_ADAPTER = (1 << 2)
+};
+.Ed
+.Bd -literal
+#define BHND_DEVICE_END { { BHND_MATCH_ANY }, NULL, NULL, 0 }
+.Ed
+.Bd -literal
+#define BHND_DEVICE_QUIRK_END { { BHND_MATCH_ANY }, 0 }
+.Ed
+.\"
+.Ss "DMA Address Translation Functions"
+.Ft int
+.Fo bhnd_get_dma_translation
+.Fa "device_t dev" "u_int width" "uint32_t flags" "bus_dma_tag_t *dmat"
+.Fa "struct bhnd_dma_translation *translation"
+.Fc
+.Bd -literal
+struct bhnd_dma_translation {
+ bhnd_addr_t base_addr;
+ bhnd_addr_t addr_mask;
+ bhnd_addr_t addrext_mask;
+ uint32_t flags;
+};
+.Ed
+.Bd -literal
+typedef enum {
+ BHND_DMA_ADDR_30BIT = 30,
+ BHND_DMA_ADDR_32BIT = 32,
+ BHND_DMA_ADDR_64BIT = 64
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Mon Nov 27 21:41:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BCD3DEA468;
Mon, 27 Nov 2017 21:41:45 +0000 (UTC)
(envelope-from markjdb@gmail.com)
Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com
[IPv6:2607:f8b0:400d:c09::244])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 223B965E4F;
Mon, 27 Nov 2017 21:41:45 +0000 (UTC)
(envelope-from markjdb@gmail.com)
Received: by mail-qk0-x244.google.com with SMTP id d125so34472002qkc.12;
Mon, 27 Nov 2017 13:41:45 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=sender:date:from:to:cc:subject:message-id:references:mime-version
:content-disposition:in-reply-to:user-agent;
bh=jwQN6L2YBx+q5tlF8a7AEIs5wpCi06TS6WxV0PcVTng=;
b=GyZdvKdEcma9D21M29yq29nt+MSX7Or/hbIl5YdxCT/rM/6d9L2Dm/L5CvRSzIPW+N
rAZRx2oMSQDzp/5IQ0pEAC1jnriZIQlc5qI99acwxRAqrDMhHhbLl7MylpWgLI4PWmA+
V+p59F+8Z2FeVBsF0OroyRdRNziRQXA8H/ys+7xFIs6Ts/OtzxcmVfwt3ezlzIoK/tJ8
FLb/jBvOYrR5V6froXPPQw9Ny27wQ3YAB21/R2FuR5NDQxIC5VA+5bbwtReneqevTU6d
d4LPjeGxcYzPR94umlLbnLBr5r4ophezCS+8j7WMxSsMw5gL/QGHvx9IC+pUZ0vfCicR
S/gQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:sender:date:from:to:cc:subject:message-id
:references:mime-version:content-disposition:in-reply-to:user-agent;
bh=jwQN6L2YBx+q5tlF8a7AEIs5wpCi06TS6WxV0PcVTng=;
b=GkeYFhUmYq7tIyy9TwnmUIjXs5SS2aV8o2CZSUtJwcIVAf71jTO2XuvsPTkBSRqdrm
3yDNqPWK3D6WTOzXTPjqyiugn7o/bpQXa84TLuR8z8PvxXOv6hEZoKjWN4BWntziuvX/
ugw9T4n8bZsN51zpHVzvmXlH/S52Hbv2kfSmTSfxUU26Osx8TUZ2StsWZ7YWsJjIhlxB
mMMponZUbl0X/nyKpQ2TeV/ZpgPSdlVnaEFOjH+SuxAjBKxSIcgK03ceVo8ujw/fDKfT
h3JP4naL6YlucbhlBE7H+UJdgRCBVsmKkc95KZy0iQh53HNvMjU9Oz4qeutC7a3nB/v4
wtfw==
X-Gm-Message-State: AJaThX7nD31rrju38MRK5l8eYbIWs9SNfiw9QGTrs3KfZbtMsbX21i5m
BVdm5q5onDJkKQRVsqRjr9Z2tA==
X-Google-Smtp-Source: AGs4zMbTAOITcsyj+pEo8d8fCD+0pWcZ0MiWSYVVz5MIVwWAMtcF9Ztg+oiCfMhDjiVnC24XXgoEjg==
X-Received: by 10.55.65.70 with SMTP id o67mr25048525qka.48.1511818903917;
Mon, 27 Nov 2017 13:41:43 -0800 (PST)
Received: from raichu (toroon0560w-lp140-01-69-159-38-22.dsl.bell.ca.
[69.159.38.22])
by smtp.gmail.com with ESMTPSA id q12sm21036542qtk.32.2017.11.27.13.41.42
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 27 Nov 2017 13:41:42 -0800 (PST)
Sender: Mark Johnston <markjdb@gmail.com>
Date: Mon, 27 Nov 2017 16:41:40 -0500
From: Mark Johnston <markj@freebsd.org>
To: John Baldwin <jhb@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326286 - head/sys/cddl/dev/dtrace
Message-ID: <20171127214140.GB75832@raichu>
References: <201711271842.vARIgNCk007369@repo.freebsd.org>
<2717040.9stBD4iAp4@ralph.baldwin.cx>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <2717040.9stBD4iAp4@ralph.baldwin.cx>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 21:41:45 -0000
On Mon, Nov 27, 2017 at 11:28:07AM -0800, John Baldwin wrote:
> On Monday, November 27, 2017 06:42:23 PM Mark Johnston wrote:
> > Author: markj
> > Date: Mon Nov 27 18:42:23 2017
> > New Revision: 326286
> > URL: https://svnweb.freebsd.org/changeset/base/326286
> >
> > Log:
> > Don't use pcpu_find() to determine if a CPU ID is valid.
> >
> > This addresses assertion failures after r326218.
>
> I'd perhaps rather revert the assertion as per my other mail?
I considered waiting for a resolution of that thread, but it seems to me
that using CPU_FOREACH()/CPU_ABSENT() is more idiomatic anyway? We
already use CPU_FOREACH() in a few places in dtrace.c, and
dtrace_ioctl.c is meant to be a fork of the ioctl handler from illumos,
i.e., we shouldn't make much effort to avoid diverging from upstream.
From owner-svn-src-all@freebsd.org Mon Nov 27 22:05:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8808CDEAFF5;
Mon, 27 Nov 2017 22:05:02 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 73C8566D56;
Mon, 27 Nov 2017 22:05:02 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from helicon.physics.ucla.edu (helicon.physics.ucla.edu
[169.232.156.253]) (authenticated bits=0)
by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id vARM4xHf031729
(version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
Mon, 27 Nov 2017 14:04:59 -0800
Subject: Re: svn commit: r326218 - head/sys/kern
To: John Baldwin <jhb@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<3170692.kvv90QqB0X@ralph.baldwin.cx>
<abfdf2b1-bb2f-4eb1-a448-bfee68158577@freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
Date: Mon, 27 Nov 2017 14:04:59 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <14322447.103fKFTi3y@ralph.baldwin.cx>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Sonic-CAuth: UmFuZG9tSVaRTVsGyDOCIfE+C4+QIqB8TDd+Xzoer05KfGZMTwcXdwaya5nVJ1z8eWFEsbqD7WVT9yJaO9OfxInVEh1lMolSfIOKBVI18Mo=
X-Sonic-ID: C;5izDAr/T5xGUSesnWtmBlw== M;RgfyAr/T5xGUSesnWtmBlw==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 22:05:02 -0000
On 11/27/17 11:31, John Baldwin wrote:
> On Sunday, November 26, 2017 10:06:56 PM Nathan Whitehorn wrote:
>> On 11/26/17 20:50, John Baldwin wrote:
>>> On Saturday, November 25, 2017 11:41:05 PM Nathan Whitehorn wrote:
>>>> Author: nwhitehorn
>>>> Date: Sat Nov 25 23:41:05 2017
>>>> New Revision: 326218
>>>> URL: https://svnweb.freebsd.org/changeset/base/326218
>>>>
>>>> Log:
>>>> Remove some, but not all, assumptions that the BSP is CPU 0 and that CPUs
>>>> are numbered densely from there to n_cpus.
>>>>
>>>> MFC after: 1 month
>>>>
>>>> Modified:
>>>> head/sys/kern/kern_clock.c
>>>> head/sys/kern/kern_clocksource.c
>>>> head/sys/kern/kern_shutdown.c
>>>> head/sys/kern/kern_timeout.c
>>>> head/sys/kern/sched_ule.c
>>>> head/sys/kern/subr_pcpu.c
>>>>
>>>> Modified: head/sys/kern/kern_clock.c
>>>> ==============================================================================
>>>> --- head/sys/kern/kern_clock.c Sat Nov 25 23:23:24 2017 (r326217)
>>>> +++ head/sys/kern/kern_clock.c Sat Nov 25 23:41:05 2017 (r326218)
>>>> @@ -573,7 +573,9 @@ hardclock_cnt(int cnt, int usermode)
>>>> void
>>>> hardclock_sync(int cpu)
>>>> {
>>>> - int *t = DPCPU_ID_PTR(cpu, pcputicks);
>>>> + int *t;
>>>> + KASSERT(!CPU_ABSENT(cpu), ("Absent CPU %d", cpu));
>>> Blank line before the KASSERT() perhaps?
>>>
>>>> + t = DPCPU_ID_PTR(cpu, pcputicks);
>>>>
>>>> *t = ticks;
>>> Probably don't need this blank line though?
>> Those are both good ideas.
>>
>>>> }
>>>>
>>>> Modified: head/sys/kern/sched_ule.c
>>>> ==============================================================================
>>>> --- head/sys/kern/sched_ule.c Sat Nov 25 23:23:24 2017 (r326217)
>>>> +++ head/sys/kern/sched_ule.c Sat Nov 25 23:41:05 2017 (r326218)
>>>> @@ -2444,6 +2451,7 @@ sched_add(struct thread *td, int flags)
>>>> * Pick the destination cpu and if it isn't ours transfer to the
>>>> * target cpu.
>>>> */
>>>> + td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
>>>> cpu = sched_pickcpu(td, flags);
>>> It is not obvious why every sched_add() needs this once you've fixed thread0.
>>> Shouldn't new threads just inherit from thread0's already-fixed value? If not,
>>> perhaps fix thread0's value sooner?
>> That's a fair point. I don't remember the rationale for this now; the
>> changes are over a year old from the powernv branch. I do remember
>> setting thread0's CPU early not working, but have forgotten why. I will
>> try to remember...
>>
>>>> tdq = sched_setcpu(td, cpu, flags);
>>>> tdq_add(tdq, td, flags);
>>>>
>>>> Modified: head/sys/kern/subr_pcpu.c
>>>> ==============================================================================
>>>> --- head/sys/kern/subr_pcpu.c Sat Nov 25 23:23:24 2017 (r326217)
>>>> +++ head/sys/kern/subr_pcpu.c Sat Nov 25 23:41:05 2017 (r326218)
>>>> @@ -279,6 +279,8 @@ pcpu_destroy(struct pcpu *pcpu)
>>>> struct pcpu *
>>>> pcpu_find(u_int cpuid)
>>>> {
>>>> + KASSERT(cpuid_to_pcpu[cpuid] != NULL,
>>>> + ("Getting uninitialized PCPU %d", cpuid));
>>> This KASSERT seems unnecessary? If the caller uses an invalid one, it will
>>> just fault anyway.
>> It won't necessarily fault. For example, on PowerPC, NULL is a valid
>> address that does not trigger faults. It's unfortunately quite
>> complicated to fix this in a general way. Even if it did fault, this
>> makes the fault more informative (and has found at least one bug on
>> arm64 already).
> Given the large number of bugs caused by NULL pointers, having NULL pointers
> "work" doesn't seem like a long-term tenable solution. You'd have to go add
> explicit KASSERT()'s to every pointer indirection in the kernel which seems
> unworkable. Also, adding the KASSERT() here has broken other places that were
> depending on the existing behavior of pcpu_find() (see markj@'s commit to dtrace
> today).
>
Unfortunately, it's unfixable on ppc64. Apologies for breaking dtrace!
Would you like me to remove the KASSERT() here? I'm happy to do that in
a few hours (unless you beat me to it first) -- although I do think that
explicitly checking for CPU_ABSENT is a much better behavior in client
code than checking the return value of pcpu_find().
-Nathan
From owner-svn-src-all@freebsd.org Mon Nov 27 22:13:32 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BFD06DEB25F;
Mon, 27 Nov 2017 22:13:32 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 874B36723E;
Mon, 27 Nov 2017 22:13:32 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARMDVdR099242;
Mon, 27 Nov 2017 22:13:31 GMT (envelope-from landonf@FreeBSD.org)
Received: (from landonf@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARMDVit099232;
Mon, 27 Nov 2017 22:13:31 GMT (envelope-from landonf@FreeBSD.org)
Message-Id: <201711272213.vARMDVit099232@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: landonf set sender to
landonf@FreeBSD.org using -f
From: "Landon J. Fuller" <landonf@FreeBSD.org>
Date: Mon, 27 Nov 2017 22:13:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326292 - in head: share/man/man9 sys/dev/bhnd
sys/dev/bhnd/bcma sys/dev/bhnd/cores/usb sys/dev/bhnd/siba
X-SVN-Group: head
X-SVN-Commit-Author: landonf
X-SVN-Commit-Paths: in head: share/man/man9 sys/dev/bhnd sys/dev/bhnd/bcma
sys/dev/bhnd/cores/usb sys/dev/bhnd/siba
X-SVN-Commit-Revision: 326292
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 22:13:32 -0000
Author: landonf
Date: Mon Nov 27 22:13:30 2017
New Revision: 326292
URL: https://svnweb.freebsd.org/changeset/base/326292
Log:
bhnd(4): Fix bcma/siba core reset behavior
Add missing support for specifying I/O control flags during core reset,
and resolve a number of siba(4)-specific reset issues:
- Add missing check for target reject flags in siba_is_hw_suspended().
- Remove incorrect wait on SIBA_TMH_BUSY when modifying any target state
register; this should only be done when waiting for initiated
transactions to clear.
- Add missing wait on SIBA_IM_BY when asserting SIBA_IM_RJ.
- Overwrite any previously set SIBA_TML_REJ flag when bringing the core
out of reset. This fixes a lockup that occured when we brought up a core
(after reboot) that had previously been placed into RESET by siba_bwn(4).
Approved by: adrian (mentor, implicit)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D13039
Modified:
head/share/man/man9/bhnd.9
head/sys/dev/bhnd/bcma/bcma.c
head/sys/dev/bhnd/bcma/bcma_subr.c
head/sys/dev/bhnd/bhnd.h
head/sys/dev/bhnd/bhnd_bus_if.m
head/sys/dev/bhnd/cores/usb/bhnd_usb.c
head/sys/dev/bhnd/siba/siba.c
head/sys/dev/bhnd/siba/siba_subr.c
head/sys/dev/bhnd/siba/sibavar.h
Modified: head/share/man/man9/bhnd.9
==============================================================================
--- head/share/man/man9/bhnd.9 Mon Nov 27 21:30:49 2017 (r326291)
+++ head/share/man/man9/bhnd.9 Mon Nov 27 22:13:30 2017 (r326292)
@@ -266,9 +266,9 @@
.Fa "device_t dev" "bus_size_t offset" "const void *value" "u_int width"
.Fc
.Ft int
-.Fn bhnd_reset_hw "device_t dev" "uint16_t ioctl"
+.Fn bhnd_reset_hw "device_t dev" "uint16_t ioctl" "uint16_t reset_ioctl"
.Ft int
-.Fn bhnd_suspend_hw "device_t dev"
+.Fn bhnd_suspend_hw "device_t dev" "uint16_t ioctl"
.Ft bool
.Fn bhnd_is_hw_suspended "device_t dev"
.\"
@@ -1054,7 +1054,10 @@ function transitions the device
.Fa dev
to a low power
.Dq RESET
-state.
+state, writing
+.Fa ioctl
+to the I/O control flags of
+.Fa dev .
The hardware may be brought out of this state using
.Fn bhnd_reset_hw .
.Pp
@@ -1062,10 +1065,14 @@ The
.Fn bhnd_reset_hw
function first transitions the device
.Fa dev
-to a low power RESET state, and then brings the device out of RESET, writing
+to a low power RESET state, writing
+.Fa ioctl_reset
+to the I/O control flags
+of
+.Fa dev ,
+and then brings the device out of RESET, writing
.Fa ioctl
-to the I/O control flags of
-.Fa dev .
+to the device's I/O control flags.
.Pp
The
.Fn bhnd_is_hw_suspended
Modified: head/sys/dev/bhnd/bcma/bcma.c
==============================================================================
--- head/sys/dev/bhnd/bcma/bcma.c Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/bcma/bcma.c Mon Nov 27 22:13:30 2017 (r326292)
@@ -296,22 +296,22 @@ bcma_is_hw_suspended(device_t dev, device_t child)
}
static int
-bcma_reset_hw(device_t dev, device_t child, uint16_t ioctl)
+bcma_reset_hw(device_t dev, device_t child, uint16_t ioctl,
+ uint16_t reset_ioctl)
{
- struct bcma_devinfo *dinfo;
- struct bhnd_core_pmu_info *pm;
- struct bhnd_resource *r;
- int error;
+ struct bcma_devinfo *dinfo;
+ struct bhnd_resource *r;
+ uint16_t clkflags;
+ int error;
if (device_get_parent(child) != dev)
return (EINVAL);
dinfo = device_get_ivars(child);
- pm = dinfo->pmu_info;
- /* We require exclusive control over BHND_IOCTL_CLK_EN and
- * BHND_IOCTL_CLK_FORCE. */
- if (ioctl & (BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE))
+ /* We require exclusive control over BHND_IOCTL_CLK_(EN|FORCE) */
+ clkflags = BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE;
+ if (ioctl & clkflags)
return (EINVAL);
/* Can't suspend the core without access to the agent registers */
@@ -319,7 +319,7 @@ bcma_reset_hw(device_t dev, device_t child, uint16_t i
return (ENODEV);
/* Place core into known RESET state */
- if ((error = BHND_BUS_SUSPEND_HW(dev, child)))
+ if ((error = bhnd_suspend_hw(child, reset_ioctl)))
return (error);
/*
@@ -329,9 +329,7 @@ bcma_reset_hw(device_t dev, device_t child, uint16_t i
* - Force clock distribution to ensure propagation throughout the
* core.
*/
- error = bhnd_write_ioctl(child,
- ioctl | BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE, UINT16_MAX);
- if (error)
+ if ((error = bhnd_write_ioctl(child, ioctl | clkflags, UINT16_MAX)))
return (error);
/* Bring the core out of reset */
@@ -347,11 +345,11 @@ bcma_reset_hw(device_t dev, device_t child, uint16_t i
}
static int
-bcma_suspend_hw(device_t dev, device_t child)
+bcma_suspend_hw(device_t dev, device_t child, uint16_t ioctl)
{
struct bcma_devinfo *dinfo;
struct bhnd_resource *r;
- uint32_t rst;
+ uint16_t clkflags;
int error;
if (device_get_parent(child) != dev)
@@ -359,6 +357,11 @@ bcma_suspend_hw(device_t dev, device_t child)
dinfo = device_get_ivars(child);
+ /* We require exclusive control over BHND_IOCTL_CLK_(EN|FORCE) */
+ clkflags = BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE;
+ if (ioctl & clkflags)
+ return (EINVAL);
+
/* Can't suspend the core without access to the agent registers */
if ((r = dinfo->res_agent) == NULL)
return (ENODEV);
@@ -367,17 +370,12 @@ bcma_suspend_hw(device_t dev, device_t child)
if ((error = bcma_dmp_wait_reset(child, dinfo)))
return (error);
- /* Already in reset? */
- rst = bhnd_bus_read_4(r, BCMA_DMP_RESETCTRL);
- if (rst & BCMA_DMP_RC_RESET)
- return (0);
-
- /* Put core into reset */
+ /* Put core into reset (if not already in reset) */
if ((error = bcma_dmp_write_reset(child, dinfo, BCMA_DMP_RC_RESET)))
return (error);
- /* Clear core flags */
- if ((error = bhnd_write_ioctl(child, 0x0, UINT16_MAX)))
+ /* Write core flags (and clear CLK_EN/CLK_FORCE) */
+ if ((error = bhnd_write_ioctl(child, ioctl, ~clkflags)))
return (error);
return (0);
Modified: head/sys/dev/bhnd/bcma/bcma_subr.c
==============================================================================
--- head/sys/dev/bhnd/bcma/bcma_subr.c Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/bcma/bcma_subr.c Mon Nov 27 22:13:30 2017 (r326292)
@@ -594,8 +594,15 @@ bcma_dmp_wait_reset(device_t child, struct bcma_devinf
int
bcma_dmp_write_reset(device_t child, struct bcma_devinfo *dinfo, uint32_t value)
{
+ uint32_t rst;
+
if (dinfo->res_agent == NULL)
return (ENODEV);
+
+ /* Already in requested reset state? */
+ rst = bhnd_bus_read_4(dinfo->res_agent, BCMA_DMP_RESETCTRL);
+ if (rst == value)
+ return (0);
bhnd_bus_write_4(dinfo->res_agent, BCMA_DMP_RESETCTRL, value);
bhnd_bus_read_4(dinfo->res_agent, BCMA_DMP_RESETCTRL); /* read-back */
Modified: head/sys/dev/bhnd/bhnd.h
==============================================================================
--- head/sys/dev/bhnd/bhnd.h Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/bhnd.h Mon Nov 27 22:13:30 2017 (r326292)
@@ -818,23 +818,27 @@ bhnd_is_hw_suspended(device_t dev)
}
/**
- * Place the bhnd(4) device's hardware into a reset state, and then bring the
- * hardware out of reset with BHND_IOCTL_CLK_EN and @p ioctl flags set.
+ * Place the bhnd(4) device's hardware into a low-power RESET state with
+ * the @p reset_ioctl I/O control flags set, and then bring the hardware out of
+ * RESET with the @p ioctl I/O control flags set.
*
- * Any clock or resource PMU requests previously made by @p dev will be
+ * Any clock or resource PMU requests previously made by @p child will be
* invalidated.
*
* @param dev The device to be reset.
- * @param ioctl Device-specific core ioctl flags to be supplied on reset
- * (see BHND_IOCTL_*).
+ * @param ioctl Device-specific I/O control flags to be set when bringing
+ * the core out of its RESET state (see BHND_IOCTL_*).
+ * @param reset_ioctl Device-specific I/O control flags to be set when placing
+ * the core into its RESET state.
*
* @retval 0 success
* @retval non-zero error
*/
static inline int
-bhnd_reset_hw(device_t dev, uint16_t ioctl)
+bhnd_reset_hw(device_t dev, uint16_t ioctl, uint16_t reset_ioctl)
{
- return (BHND_BUS_RESET_HW(device_get_parent(dev), dev, ioctl));
+ return (BHND_BUS_RESET_HW(device_get_parent(dev), dev, ioctl,
+ reset_ioctl));
}
/**
@@ -851,9 +855,9 @@ bhnd_reset_hw(device_t dev, uint16_t ioctl)
* @retval non-zero error
*/
static inline int
-bhnd_suspend_hw(device_t dev)
+bhnd_suspend_hw(device_t dev, uint16_t ioctl)
{
- return (BHND_BUS_SUSPEND_HW(device_get_parent(dev), dev));
+ return (BHND_BUS_SUSPEND_HW(device_get_parent(dev), dev, ioctl));
}
/**
Modified: head/sys/dev/bhnd/bhnd_bus_if.m
==============================================================================
--- head/sys/dev/bhnd/bhnd_bus_if.m Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/bhnd_bus_if.m Mon Nov 27 22:13:30 2017 (r326292)
@@ -96,7 +96,8 @@ CODE {
}
static int
- bhnd_bus_null_reset_hw(device_t dev, device_t child, uint16_t ioctl)
+ bhnd_bus_null_reset_hw(device_t dev, device_t child, uint16_t ioctl,
+ uint16_t reset_ioctl)
{
panic("bhnd_bus_reset_hw unimplemented");
}
@@ -624,16 +625,19 @@ METHOD bool is_hw_suspended {
} DEFAULT bhnd_bus_null_is_hw_suspended;
/**
- * Place the bhnd(4) device's hardware into a reset state, and then bring the
- * hardware out of reset with BHND_IOCTL_CLK_EN and @p ioctl flags set.
+ * Place the bhnd(4) device's hardware into a low-power RESET state with
+ * the @p reset_ioctl I/O control flags set, and then bring the hardware out of
+ * RESET with the @p ioctl I/O control flags set.
*
* Any clock or resource PMU requests previously made by @p child will be
* invalidated.
*
* @param dev The bhnd bus parent of @p child.
* @param child The device to be reset.
- * @param ioctl Device-specific core ioctl flags to be supplied on reset
- * (see BHND_IOCTL_*).
+ * @param ioctl Device-specific I/O control flags to be set when bringing
+ * the core out of its RESET state (see BHND_IOCTL_*).
+ * @param reset_ioctl Device-specific I/O control flags to be set when placing
+ * the core into its RESET state.
*
* @retval 0 success
* @retval non-zero error
@@ -642,18 +646,21 @@ METHOD int reset_hw {
device_t dev;
device_t child;
uint16_t ioctl;
+ uint16_t reset_ioctl;
} DEFAULT bhnd_bus_null_reset_hw;
/**
- * Suspend @p child's hardware in a low-power reset state.
+ * Suspend @p child's hardware in a low-power RESET state.
*
* Any clock or resource PMU requests previously made by @p dev will be
* invalidated.
*
- * The hardware may be brought out of reset via bhnd_reset_hw().
+ * The hardware may be brought out of RESET via bhnd_reset_hw().
*
* @param dev The bhnd bus parent of @p child.
* @param dev The device to be suspended.
+ * @param ioctl Device-specific I/O control flags to be set when placing
+ * the core into its RESET state (see BHND_IOCTL_*).
*
* @retval 0 success
* @retval non-zero error
@@ -661,6 +668,7 @@ METHOD int reset_hw {
METHOD int suspend_hw {
device_t dev;
device_t child;
+ uint16_t ioctl;
} DEFAULT bhnd_bus_null_suspend_hw;
/**
Modified: head/sys/dev/bhnd/cores/usb/bhnd_usb.c
==============================================================================
--- head/sys/dev/bhnd/cores/usb/bhnd_usb.c Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/cores/usb/bhnd_usb.c Mon Nov 27 22:13:30 2017 (r326292)
@@ -98,7 +98,7 @@ bhnd_usb_attach(device_t dev)
sc = device_get_softc(dev);
- bhnd_reset_hw(dev, 0);
+ bhnd_reset_hw(dev, 0, 0);
/*
* Allocate the resources which the parent bus has already
Modified: head/sys/dev/bhnd/siba/siba.c
==============================================================================
--- head/sys/dev/bhnd/siba/siba.c Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/siba/siba.c Mon Nov 27 22:13:30 2017 (r326292)
@@ -603,8 +603,9 @@ siba_write_ioctl(device_t dev, device_t child, uint16_
ts_mask = (mask << SIBA_TML_SICF_SHIFT) & SIBA_TML_SICF_MASK;
ts_low = (value << SIBA_TML_SICF_SHIFT) & ts_mask;
- return (siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
- ts_low, ts_mask));
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
+ ts_low, ts_mask);
+ return (0);
}
static bool
@@ -626,6 +627,10 @@ siba_is_hw_suspended(device_t dev, device_t child)
if (ts_low & SIBA_TML_RESET)
return (true);
+ /* Is target reject enabled? */
+ if (ts_low & SIBA_TML_REJ_MASK)
+ return (true);
+
/* Is core clocked? */
ioctl = SIBA_REG_GET(ts_low, TML_SICF);
if (!(ioctl & BHND_IOCTL_CLK_EN))
@@ -635,11 +640,13 @@ siba_is_hw_suspended(device_t dev, device_t child)
}
static int
-siba_reset_hw(device_t dev, device_t child, uint16_t ioctl)
+siba_reset_hw(device_t dev, device_t child, uint16_t ioctl,
+ uint16_t reset_ioctl)
{
struct siba_devinfo *dinfo;
struct bhnd_resource *r;
uint32_t ts_low, imstate;
+ uint16_t clkflags;
int error;
if (device_get_parent(child) != dev)
@@ -651,66 +658,60 @@ siba_reset_hw(device_t dev, device_t child, uint16_t i
if ((r = dinfo->cfg_res[0]) == NULL)
return (ENODEV);
- /* We require exclusive control over BHND_IOCTL_CLK_EN and
- * BHND_IOCTL_CLK_FORCE. */
- if (ioctl & (BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE))
+ /* We require exclusive control over BHND_IOCTL_CLK_(EN|FORCE) */
+ clkflags = BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE;
+ if (ioctl & clkflags)
return (EINVAL);
/* Place core into known RESET state */
- if ((error = BHND_BUS_SUSPEND_HW(dev, child)))
+ if ((error = bhnd_suspend_hw(child, reset_ioctl)))
return (error);
- /* Leaving the core in reset, set the caller's IOCTL flags and
- * enable the core's clocks. */
- ts_low = (ioctl | BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE) <<
- SIBA_TML_SICF_SHIFT;
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
- ts_low, SIBA_TML_SICF_MASK);
- if (error)
- return (error);
+ /* Set RESET, clear REJ, set the caller's IOCTL flags, and
+ * force clocks to ensure the signal propagates throughout the
+ * core. */
+ ts_low = SIBA_TML_RESET |
+ (ioctl << SIBA_TML_SICF_SHIFT) |
+ (BHND_IOCTL_CLK_EN << SIBA_TML_SICF_SHIFT) |
+ (BHND_IOCTL_CLK_FORCE << SIBA_TML_SICF_SHIFT);
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
+ ts_low, UINT32_MAX);
+
/* Clear any target errors */
if (bhnd_bus_read_4(r, SIBA_CFG0_TMSTATEHIGH) & SIBA_TMH_SERR) {
- error = siba_write_target_state(child, dinfo,
- SIBA_CFG0_TMSTATEHIGH, 0, SIBA_TMH_SERR);
- if (error)
- return (error);
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATEHIGH,
+ 0x0, SIBA_TMH_SERR);
}
/* Clear any initiator errors */
imstate = bhnd_bus_read_4(r, SIBA_CFG0_IMSTATE);
if (imstate & (SIBA_IM_IBE|SIBA_IM_TO)) {
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_IMSTATE,
- 0, SIBA_IM_IBE|SIBA_IM_TO);
- if (error)
- return (error);
+ siba_write_target_state(child, dinfo, SIBA_CFG0_IMSTATE, 0x0,
+ SIBA_IM_IBE|SIBA_IM_TO);
}
/* Release from RESET while leaving clocks forced, ensuring the
* signal propagates throughout the core */
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
- 0x0, SIBA_TML_RESET);
- if (error)
- return (error);
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW, 0x0,
+ SIBA_TML_RESET);
/* The core should now be active; we can clear the BHND_IOCTL_CLK_FORCE
* bit and allow the core to manage clock gating. */
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
- 0x0, (BHND_IOCTL_CLK_FORCE << SIBA_TML_SICF_SHIFT));
- if (error)
- return (error);
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW, 0x0,
+ (BHND_IOCTL_CLK_FORCE << SIBA_TML_SICF_SHIFT));
return (0);
}
static int
-siba_suspend_hw(device_t dev, device_t child)
+siba_suspend_hw(device_t dev, device_t child, uint16_t ioctl)
{
struct siba_softc *sc;
struct siba_devinfo *dinfo;
struct bhnd_resource *r;
- uint32_t idl, ts_low;
- uint16_t ioctl;
+ uint32_t idl, ts_low, ts_mask;
+ uint16_t cflags, clkflags;
int error;
if (device_get_parent(child) != dev)
@@ -723,30 +724,37 @@ siba_suspend_hw(device_t dev, device_t child)
if ((r = dinfo->cfg_res[0]) == NULL)
return (ENODEV);
+ /* We require exclusive control over BHND_IOCTL_CLK_(EN|FORCE) */
+ clkflags = BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE;
+ if (ioctl & clkflags)
+ return (EINVAL);
+
/* Already in RESET? */
ts_low = bhnd_bus_read_4(r, SIBA_CFG0_TMSTATELOW);
- if (ts_low & SIBA_TML_RESET) {
- /* Clear IOCTL flags, ensuring the clock is disabled */
- return (siba_write_target_state(child, dinfo,
- SIBA_CFG0_TMSTATELOW, 0x0, SIBA_TML_SICF_MASK));
+ if (ts_low & SIBA_TML_RESET)
+ return (0);
+ /* If clocks are already disabled, we can place the core directly
+ * into RESET|REJ while setting the caller's IOCTL flags. */
+ cflags = SIBA_REG_GET(ts_low, TML_SICF);
+ if (!(cflags & BHND_IOCTL_CLK_EN)) {
+ ts_low = SIBA_TML_RESET | SIBA_TML_REJ |
+ (ioctl << SIBA_TML_SICF_SHIFT);
+ ts_mask = SIBA_TML_RESET | SIBA_TML_REJ | SIBA_TML_SICF_MASK;
+
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
+ ts_low, ts_mask);
return (0);
}
- /* If clocks are already disabled, we can put the core directly
- * into RESET */
- ioctl = SIBA_REG_GET(ts_low, TML_SICF);
- if (!(ioctl & BHND_IOCTL_CLK_EN)) {
- /* Set RESET and clear IOCTL flags */
- return (siba_write_target_state(child, dinfo,
- SIBA_CFG0_TMSTATELOW,
- SIBA_TML_RESET,
- SIBA_TML_RESET | SIBA_TML_SICF_MASK));
- }
-
- /* Reject any further target backplane transactions */
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
+ /* Reject further transactions reaching this core */
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
SIBA_TML_REJ, SIBA_TML_REJ);
+
+ /* Wait for transaction busy flag to clear for all transactions
+ * initiated by this core */
+ error = siba_wait_target_state(child, dinfo, SIBA_CFG0_TMSTATEHIGH,
+ 0x0, SIBA_TMH_BUSY, 100000);
if (error)
return (error);
@@ -754,44 +762,47 @@ siba_suspend_hw(device_t dev, device_t child)
* transactions too. */
idl = bhnd_bus_read_4(r, SIBA_CFG0_IDLOW);
if (idl & SIBA_IDL_INIT) {
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_IMSTATE,
+ /* Reject further initiator transactions */
+ siba_write_target_state(child, dinfo, SIBA_CFG0_IMSTATE,
SIBA_IM_RJ, SIBA_IM_RJ);
+
+ /* Wait for initiator busy flag to clear */
+ error = siba_wait_target_state(child, dinfo, SIBA_CFG0_IMSTATE,
+ 0x0, SIBA_IM_BY, 100000);
if (error)
return (error);
}
- /* Put the core into RESET|REJECT, forcing clocks to ensure the RESET
- * signal propagates throughout the core, leaving REJECT asserted. */
- ts_low = SIBA_TML_RESET;
- ts_low |= (BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE) <<
- SIBA_TML_SICF_SHIFT;
+ /* Put the core into RESET, set the caller's IOCTL flags, and
+ * force clocks to ensure the RESET signal propagates throughout the
+ * core. */
+ ts_low = SIBA_TML_RESET |
+ (ioctl << SIBA_TML_SICF_SHIFT) |
+ (BHND_IOCTL_CLK_EN << SIBA_TML_SICF_SHIFT) |
+ (BHND_IOCTL_CLK_FORCE << SIBA_TML_SICF_SHIFT);
+ ts_mask = SIBA_TML_RESET |
+ SIBA_TML_SICF_MASK;
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
- ts_low, ts_low);
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW, ts_low,
+ ts_mask);
if (error)
return (error);
/* Give RESET ample time */
DELAY(10);
- /* Leaving core in reset, disable all clocks, clear REJ flags and
- * IOCTL state */
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW,
- SIBA_TML_RESET,
- SIBA_TML_RESET | SIBA_TML_REJ | SIBA_TML_SICF_MASK);
- if (error)
- return (error);
-
/* Clear previously asserted initiator reject */
if (idl & SIBA_IDL_INIT) {
- error = siba_write_target_state(child, dinfo, SIBA_CFG0_IMSTATE,
- 0, SIBA_IM_RJ);
- if (error)
- return (error);
+ siba_write_target_state(child, dinfo, SIBA_CFG0_IMSTATE, 0x0,
+ SIBA_IM_RJ);
}
+ /* Disable all clocks, leaving RESET and REJ asserted */
+ siba_write_target_state(child, dinfo, SIBA_CFG0_TMSTATELOW, 0x0,
+ (BHND_IOCTL_CLK_EN | BHND_IOCTL_CLK_FORCE) << SIBA_TML_SICF_SHIFT);
+
/*
- * Core is now in RESET, with clocks disabled and REJ not asserted.
+ * Core is now in RESET.
*
* If the core holds any PWRCTL clock reservations, we need to release
* those now. This emulates the standard bhnd(4) PMU behavior of RESET
Modified: head/sys/dev/bhnd/siba/siba_subr.c
==============================================================================
--- head/sys/dev/bhnd/siba/siba_subr.c Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/siba/siba_subr.c Mon Nov 27 22:13:30 2017 (r326292)
@@ -624,83 +624,73 @@ siba_parse_admatch(uint32_t am, uint32_t *addr, uint32
}
/**
- * Write @p value to @p dev's CFG0 target/initiator state register and
- * wait for completion.
+ * Write @p value to @p dev's CFG0 target/initiator state register, performing
+ * required read-back and waiting for completion.
*
* @param dev The siba(4) child device.
- * @param reg The state register to write (e.g. SIBA_CFG0_TMSTATELOW,
- * SIBA_CFG0_IMSTATE)
+ * @param reg The CFG0 state register to write (e.g. SIBA_CFG0_TMSTATELOW,
+ * SIBA_CFG0_IMSTATE)
* @param value The value to write to @p reg.
* @param mask The mask of bits to be included from @p value.
- *
- * @retval 0 success.
- * @retval ENODEV if SIBA_CFG0 is not mapped by @p dinfo.
- * @retval ETIMEDOUT if a timeout occurs prior to SIBA_TMH_BUSY clearing.
*/
-int
+void
siba_write_target_state(device_t dev, struct siba_devinfo *dinfo,
bus_size_t reg, uint32_t value, uint32_t mask)
{
struct bhnd_resource *r;
uint32_t rval;
- /* Must have a CFG0 block */
- if ((r = dinfo->cfg_res[0]) == NULL)
- return (ENODEV);
+ r = dinfo->cfg_res[0];
- /* Verify the register offset falls within CFG register block */
- if (reg > SIBA_CFG_SIZE-4)
- return (EFAULT);
+ KASSERT(r != NULL, ("%s missing CFG0 mapping",
+ device_get_nameunit(dev)));
+ KASSERT(reg <= SIBA_CFG_SIZE-4, ("%s invalid CFG0 register offset %#jx",
+ device_get_nameunit(dev), (uintmax_t)reg));
- for (int i = 0; i < 300; i += 10) {
- rval = bhnd_bus_read_4(r, reg);
- rval &= ~mask;
- rval |= (value & mask);
+ rval = bhnd_bus_read_4(r, reg);
+ rval &= ~mask;
+ rval |= (value & mask);
- bhnd_bus_write_4(r, reg, rval);
- bhnd_bus_read_4(r, reg); /* read-back */
- DELAY(1);
-
- /* If the write has completed, wait for target busy state
- * to clear */
- rval = bhnd_bus_read_4(r, reg);
- if ((rval & mask) == (value & mask))
- return (siba_wait_target_busy(dev, dinfo, 100000));
-
- DELAY(10);
- }
-
- return (ETIMEDOUT);
+ bhnd_bus_write_4(r, reg, rval);
+ bhnd_bus_read_4(r, reg); /* read-back */
+ DELAY(1);
}
/**
- * Spin for up to @p usec waiting for SIBA_TMH_BUSY to clear in
- * @p dev's SIBA_CFG0_TMSTATEHIGH register.
+ * Spin for up to @p usec waiting for @p dev's CFG0 target/initiator state
+ * register value to be equal to @p value after applying @p mask bits to both
+ * values.
*
* @param dev The siba(4) child device to wait on.
* @param dinfo The @p dev's device info
+ * @param reg The state register to read (e.g. SIBA_CFG0_TMSTATEHIGH,
+ * SIBA_CFG0_IMSTATE)
+ * @param value The value against which @p reg will be compared.
+ * @param mask The mask to be applied when comparing @p value with @p reg.
+ * @param usec The maximum number of microseconds to wait for completion.
*
* @retval 0 if SIBA_TMH_BUSY is cleared prior to the @p usec timeout.
* @retval ENODEV if SIBA_CFG0 is not mapped by @p dinfo.
- * @retval ETIMEDOUT if a timeout occurs prior to SIBA_TMH_BUSY clearing.
+ * @retval ETIMEDOUT if a timeout occurs.
*/
int
-siba_wait_target_busy(device_t dev, struct siba_devinfo *dinfo, int usec)
+siba_wait_target_state(device_t dev, struct siba_devinfo *dinfo, bus_size_t reg,
+ uint32_t value, uint32_t mask, u_int usec)
{
struct bhnd_resource *r;
- uint32_t ts_high;
+ uint32_t rval;
if ((r = dinfo->cfg_res[0]) == NULL)
return (ENODEV);
+ value &= mask;
for (int i = 0; i < usec; i += 10) {
- ts_high = bhnd_bus_read_4(r, SIBA_CFG0_TMSTATEHIGH);
- if (!(ts_high & SIBA_TMH_BUSY))
+ rval = bhnd_bus_read_4(r, reg);
+ if ((rval & mask) == value)
return (0);
DELAY(10);
}
- device_printf(dev, "SIBA_TMH_BUSY wait timeout\n");
return (ETIMEDOUT);
}
Modified: head/sys/dev/bhnd/siba/sibavar.h
==============================================================================
--- head/sys/dev/bhnd/siba/sibavar.h Mon Nov 27 21:30:49 2017 (r326291)
+++ head/sys/dev/bhnd/siba/sibavar.h Mon Nov 27 22:13:30 2017 (r326292)
@@ -117,11 +117,12 @@ u_int siba_admatch_offset(uint8_t addrspace);
int siba_parse_admatch(uint32_t am, uint32_t *addr,
uint32_t *size);
-int siba_write_target_state(device_t dev,
+void siba_write_target_state(device_t dev,
struct siba_devinfo *dinfo, bus_size_t reg,
uint32_t value, uint32_t mask);
-int siba_wait_target_busy(device_t child,
- struct siba_devinfo *dinfo, int usec);
+int siba_wait_target_state(device_t dev,
+ struct siba_devinfo *dinfo, bus_size_t reg,
+ uint32_t value, uint32_t mask, u_int usec);
/* Sonics configuration register blocks */
From owner-svn-src-all@freebsd.org Mon Nov 27 22:29:37 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26020DEB6B9;
Mon, 27 Nov 2017 22:29:37 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DA2CD67B46;
Mon, 27 Nov 2017 22:29:36 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARMTajX003891;
Mon, 27 Nov 2017 22:29:36 GMT (envelope-from landonf@FreeBSD.org)
Received: (from landonf@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARMTavO003890;
Mon, 27 Nov 2017 22:29:36 GMT (envelope-from landonf@FreeBSD.org)
Message-Id: <201711272229.vARMTavO003890@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: landonf set sender to
landonf@FreeBSD.org using -f
From: "Landon J. Fuller" <landonf@FreeBSD.org>
Date: Mon, 27 Nov 2017 22:29:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326293 - head/sys/dev/bhnd
X-SVN-Group: head
X-SVN-Commit-Author: landonf
X-SVN-Commit-Paths: head/sys/dev/bhnd
X-SVN-Commit-Revision: 326293
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 22:29:37 -0000
Author: landonf
Date: Mon Nov 27 22:29:35 2017
New Revision: 326293
URL: https://svnweb.freebsd.org/changeset/base/326293
Log:
bhnd(4): Print the core's hardware revision in bhnd(4)'s
BUS_PROBE_NOMATCH().
Approved by: adrian (mentor, implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/bhnd/bhnd.c
Modified: head/sys/dev/bhnd/bhnd.c
==============================================================================
--- head/sys/dev/bhnd/bhnd.c Mon Nov 27 22:13:30 2017 (r326292)
+++ head/sys/dev/bhnd/bhnd.c Mon Nov 27 22:29:35 2017 (r326293)
@@ -892,8 +892,8 @@ bhnd_generic_probe_nomatch(device_t dev, device_t chil
return;
/* Print the non-matched device info */
- device_printf(dev, "<%s %s>", bhnd_get_vendor_name(child),
- bhnd_get_device_name(child));
+ device_printf(dev, "<%s %s, rev %hhu>", bhnd_get_vendor_name(child),
+ bhnd_get_device_name(child), bhnd_get_hwrev(child));
rl = BUS_GET_RESOURCE_LIST(dev, child);
if (rl != NULL) {
From owner-svn-src-all@freebsd.org Mon Nov 27 22:38:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38737DEBB55;
Mon, 27 Nov 2017 22:38:46 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id F28A26826C;
Mon, 27 Nov 2017 22:38:45 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARMciaP007875;
Mon, 27 Nov 2017 22:38:44 GMT (envelope-from landonf@FreeBSD.org)
Received: (from landonf@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARMcigA007874;
Mon, 27 Nov 2017 22:38:44 GMT (envelope-from landonf@FreeBSD.org)
Message-Id: <201711272238.vARMcigA007874@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: landonf set sender to
landonf@FreeBSD.org using -f
From: "Landon J. Fuller" <landonf@FreeBSD.org>
Date: Mon, 27 Nov 2017 22:38:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326294 - head/sys/dev/bhnd/siba
X-SVN-Group: head
X-SVN-Commit-Author: landonf
X-SVN-Commit-Paths: head/sys/dev/bhnd/siba
X-SVN-Commit-Revision: 326294
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 22:38:46 -0000
Author: landonf
Date: Mon Nov 27 22:38:44 2017
New Revision: 326294
URL: https://svnweb.freebsd.org/changeset/base/326294
Log:
siba(4): fix workaround for BCM4312 D11 core backplane timeouts
The SIBA_QUIRK_PCIE_D11_SB_TIMEOUT quirk should match on all BCM4312
revisions, and backplane service timeouts must also be disabled.
Approved by: adrian (mentor, implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/bhnd/siba/siba_bhndb.c
Modified: head/sys/dev/bhnd/siba/siba_bhndb.c
==============================================================================
--- head/sys/dev/bhnd/siba/siba_bhndb.c Mon Nov 27 22:29:35 2017 (r326293)
+++ head/sys/dev/bhnd/siba/siba_bhndb.c Mon Nov 27 22:38:44 2017 (r326294)
@@ -77,7 +77,7 @@ static struct bhnd_device_quirk pci_bridge_quirks[] =
/* Bus-level quirks when bridged via a PCIe host bridge core */
static struct bhnd_device_quirk pcie_bridge_quirks[] = {
BHND_CHIP_QUIRK (4311, HWREV_EQ(2), SIBA_QUIRK_PCIE_D11_SB_TIMEOUT),
- BHND_CHIP_QUIRK (4312, HWREV_EQ(0), SIBA_QUIRK_PCIE_D11_SB_TIMEOUT),
+ BHND_CHIP_QUIRK (4312, HWREV_ANY, SIBA_QUIRK_PCIE_D11_SB_TIMEOUT),
BHND_DEVICE_QUIRK_END
};
@@ -250,7 +250,7 @@ siba_bhndb_wars_pcie_clear_d11_timeout(struct siba_bhn
KASSERT(dinfo->cfg_res[0] != NULL, ("missing core config mapping"));
imcfg = bhnd_bus_read_4(dinfo->cfg_res[0], SIBA_CFG0_IMCONFIGLOW);
- imcfg &= ~SIBA_IMCL_RTO_MASK;
+ imcfg &= ~(SIBA_IMCL_RTO_MASK|SIBA_IMCL_STO_MASK);
bhnd_bus_write_4(dinfo->cfg_res[0], SIBA_CFG0_IMCONFIGLOW, imcfg);
From owner-svn-src-all@freebsd.org Mon Nov 27 23:47:59 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77C2CDED04A;
Mon, 27 Nov 2017 23:47:59 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4F4476A4D4;
Mon, 27 Nov 2017 23:47:59 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARNlwcD037734;
Mon, 27 Nov 2017 23:47:58 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARNlwWj037730;
Mon, 27 Nov 2017 23:47:58 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201711272347.vARNlwWj037730@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 27 Nov 2017 23:47:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326295 - vendor/NetBSD/libc-vis/dist
X-SVN-Group: vendor
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: vendor/NetBSD/libc-vis/dist
X-SVN-Commit-Revision: 326295
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 23:47:59 -0000
Author: brooks
Date: Mon Nov 27 23:47:57 2017
New Revision: 326295
URL: https://svnweb.freebsd.org/changeset/base/326295
Log:
Vendor import of NetBSD's (un)vis(3) at 2017-11-27
Modified:
vendor/NetBSD/libc-vis/dist/unvis.3
vendor/NetBSD/libc-vis/dist/vis.3
vendor/NetBSD/libc-vis/dist/vis.c
vendor/NetBSD/libc-vis/dist/vis.h
Modified: vendor/NetBSD/libc-vis/dist/unvis.3
==============================================================================
--- vendor/NetBSD/libc-vis/dist/unvis.3 Mon Nov 27 22:38:44 2017 (r326294)
+++ vendor/NetBSD/libc-vis/dist/unvis.3 Mon Nov 27 23:47:57 2017 (r326295)
@@ -1,4 +1,4 @@
-.\" $NetBSD: unvis.3,v 1.27 2012/12/15 07:34:36 wiz Exp $
+.\" $NetBSD: unvis.3,v 1.29 2017/10/24 19:14:55 abhinav Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -34,7 +34,10 @@
.Os
.Sh NAME
.Nm unvis ,
-.Nm strunvis
+.Nm strunvis ,
+.Nm strnunvis ,
+.Nm strunvisx ,
+.Nm strnunvisx
.Nd decode a visual representation of characters
.Sh LIBRARY
.Lb libc
@@ -183,7 +186,7 @@ char out;
while ((ch = getchar()) != EOF) {
again:
- switch(unvis(\*[Am]out, ch, \*[Am]state, 0)) {
+ switch(unvis(&out, ch, &state, 0)) {
case 0:
case UNVIS_NOCHAR:
break;
@@ -197,7 +200,7 @@ again:
errx(EXIT_FAILURE, "Bad character sequence!");
}
}
-if (unvis(\*[Am]out, '\e0', \*[Am]state, UNVIS_END) == UNVIS_VALID)
+if (unvis(&out, '\e0', &state, UNVIS_END) == UNVIS_VALID)
(void)putchar(out);
.Ed
.Sh ERRORS
Modified: vendor/NetBSD/libc-vis/dist/vis.3
==============================================================================
--- vendor/NetBSD/libc-vis/dist/vis.3 Mon Nov 27 22:38:44 2017 (r326294)
+++ vendor/NetBSD/libc-vis/dist/vis.3 Mon Nov 27 23:47:57 2017 (r326295)
@@ -1,4 +1,4 @@
-.\" $NetBSD: vis.3,v 1.45 2016/06/08 15:00:04 wiz Exp $
+.\" $NetBSD: vis.3,v 1.49 2017/08/05 20:22:29 wiz Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)vis.3 8.1 (Berkeley) 6/9/93
.\"
-.Dd January 14, 2015
+.Dd April 22, 2017
.Dt VIS 3
.Os
.Sh NAME
@@ -242,6 +242,8 @@ except space, tab, and newline are encoded (see
The following flags
alter this:
.Bl -tag -width VIS_WHITEX
+.It Dv VIS_DQ
+Also encode double quotes
.It Dv VIS_GLOB
Also encode the magic characters
.Ql ( * ,
@@ -309,7 +311,7 @@ warning on the use of the
.Dv VIS_NOSLASH
flag below).
.Pp
-There are four forms of encoding.
+There are six forms of encoding.
All forms use the backslash character
.Ql \e
to introduce a special
@@ -372,7 +374,6 @@ space.
.It Dv \e240
Represents Meta-space.
.El
-.Pp
.It Dv VIS_CSTYLE
Use C-style backslash sequences to represent standard non-printable
characters.
@@ -401,6 +402,9 @@ If
.Fa nextc
is an octal digit, the latter representation is used to
avoid ambiguity.
+.Pp
+Non-printable characters without C-style
+backslash sequences use the default representation.
.It Dv VIS_OCTAL
Use a three digit octal sequence.
The form is
@@ -408,6 +412,11 @@ The form is
where
.Em d
represents an octal digit.
+.It Dv VIS_CSTYLE \&| Dv VIS_OCTAL
+Same as
+.Dv VIS_CSTYLE
+except that non-printable characters without C-style
+backslash sequences use a three digit octal sequence.
.It Dv VIS_HTTPSTYLE
Use URI encoding as described in RFC 1738.
The form is
Modified: vendor/NetBSD/libc-vis/dist/vis.c
==============================================================================
--- vendor/NetBSD/libc-vis/dist/vis.c Mon Nov 27 22:38:44 2017 (r326294)
+++ vendor/NetBSD/libc-vis/dist/vis.c Mon Nov 27 23:47:57 2017 (r326295)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $ */
+/* $NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef __FBSDID
__FBSDID("$FreeBSD$");
@@ -377,6 +377,7 @@ makeextralist(int flags, const char *src)
if (flags & VIS_SP) *d++ = L' ';
if (flags & VIS_TAB) *d++ = L'\t';
if (flags & VIS_NL) *d++ = L'\n';
+ if (flags & VIS_DQ) *d++ = L'"';
if ((flags & VIS_NOSLASH) == 0) *d++ = L'\\';
*d = L'\0';
@@ -405,7 +406,15 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
_DIAGASSERT(mbsrc != NULL || mblength == 0);
_DIAGASSERT(mbextra != NULL);
+ mbslength = (ssize_t)mblength;
/*
+ * When inputing a single character, must also read in the
+ * next character for nextc, the look-ahead character.
+ */
+ if (mbslength == 1)
+ mbslength++;
+
+ /*
* Input (mbsrc) is a char string considered to be multibyte
* characters. The input loop will read this string pulling
* one character, possibly multiple bytes, from mbsrc and
@@ -421,12 +430,12 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
/* Allocate space for the wide char strings */
psrc = pdst = extra = NULL;
mdst = NULL;
- if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
+ if ((psrc = calloc(mbslength + 1, sizeof(*psrc))) == NULL)
return -1;
- if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
+ if ((pdst = calloc((16 * mbslength) + 1, sizeof(*pdst))) == NULL)
goto out;
if (*mbdstp == NULL) {
- if ((mdst = calloc((4 * mblength) + 1, sizeof(*mdst))) == NULL)
+ if ((mdst = calloc((16 * mbslength) + 1, sizeof(*mdst))) == NULL)
goto out;
*mbdstp = mdst;
}
@@ -449,13 +458,6 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
* stop at NULs because we may be processing a block of data
* that includes NULs.
*/
- mbslength = (ssize_t)mblength;
- /*
- * When inputing a single character, must also read in the
- * next character for nextc, the look-ahead character.
- */
- if (mbslength == 1)
- mbslength++;
while (mbslength > 0) {
/* Convert one multibyte character to wchar_t. */
if (!cerr)
@@ -466,12 +468,13 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
clen = 1;
cerr = 1;
}
- if (clen == 0)
+ if (clen == 0) {
/*
* NUL in input gives 0 return value. process
* as single NUL byte and keep going.
*/
clen = 1;
+ }
/* Advance buffer character pointer. */
src++;
/* Advance input pointer by number of bytes read. */
@@ -481,6 +484,7 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
}
len = src - psrc;
src = psrc;
+
/*
* In the single character input case, we will have actually
* processed two characters, c and nextc. Reset len back to
Modified: vendor/NetBSD/libc-vis/dist/vis.h
==============================================================================
--- vendor/NetBSD/libc-vis/dist/vis.h Mon Nov 27 22:38:44 2017 (r326294)
+++ vendor/NetBSD/libc-vis/dist/vis.h Mon Nov 27 23:47:57 2017 (r326295)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.h,v 1.24 2016/01/14 20:42:14 christos Exp $ */
+/* $NetBSD: vis.h,v 1.25 2017/04/23 01:57:36 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -51,6 +51,7 @@
#define VIS_NL 0x0010 /* also encode newline */
#define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL)
#define VIS_SAFE 0x0020 /* only encode "unsafe" characters */
+#define VIS_DQ 0x8000 /* also encode double quotes */
/*
* other
From owner-svn-src-all@freebsd.org Mon Nov 27 23:48:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0930FDED0AD;
Mon, 27 Nov 2017 23:48:23 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C7FA76A5FB;
Mon, 27 Nov 2017 23:48:22 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARNmLxc037795;
Mon, 27 Nov 2017 23:48:21 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARNmLDd037794;
Mon, 27 Nov 2017 23:48:21 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201711272348.vARNmLDd037794@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 27 Nov 2017 23:48:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326296 - vendor/NetBSD/libc-vis/20171127
X-SVN-Group: vendor
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: vendor/NetBSD/libc-vis/20171127
X-SVN-Commit-Revision: 326296
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Nov 2017 23:48:23 -0000
Author: brooks
Date: Mon Nov 27 23:48:21 2017
New Revision: 326296
URL: https://svnweb.freebsd.org/changeset/base/326296
Log:
Tag 2017-11-27 import of NetBSD's (un)vis(3)
Added:
vendor/NetBSD/libc-vis/20171127/
- copied from r326295, vendor/NetBSD/libc-vis/dist/
From owner-svn-src-all@freebsd.org Tue Nov 28 00:12:16 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52DA7DEDE6F;
Tue, 28 Nov 2017 00:12:16 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 03AF66B66A;
Tue, 28 Nov 2017 00:12:15 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS0CFOW051259;
Tue, 28 Nov 2017 00:12:15 GMT (envelope-from landonf@FreeBSD.org)
Received: (from landonf@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS0CEjO051249;
Tue, 28 Nov 2017 00:12:14 GMT (envelope-from landonf@FreeBSD.org)
Message-Id: <201711280012.vAS0CEjO051249@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: landonf set sender to
landonf@FreeBSD.org using -f
From: "Landon J. Fuller" <landonf@FreeBSD.org>
Date: Tue, 28 Nov 2017 00:12:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326297 - head/sys/dev/bhnd/bhndb
X-SVN-Group: head
X-SVN-Commit-Author: landonf
X-SVN-Commit-Paths: head/sys/dev/bhnd/bhndb
X-SVN-Commit-Revision: 326297
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 00:12:16 -0000
Author: landonf
Date: Tue Nov 28 00:12:14 2017
New Revision: 326297
URL: https://svnweb.freebsd.org/changeset/base/326297
Log:
bhndb(4): Implement bridge support for the BCM4312 and other PCI_V0 chipsets.
Very early (PCI_V0) Broadcom PCI Wi-Fi chipsets have a few quirks when
compared to later PCI(e) core revisions:
- The standard static BAR0 mapping of the PCI core registers is discontiguous,
with siba's cfg0 register block mapped distinctly from the other core
registers.
- No dedicated ChipCommon register mapping is provided; instead, the
single configurable register window must be used to access both
ChipCommon and D11 core registers. The D11 core's operational semantics
guarantee the safety of -- after disabling interrupts -- borrowing
the single dynamic register window to perform the few ChipCommon
operations required by a driver.
To support these early PCI devices:
- Allow defining multiple discontiguous BHNDB_REGWIN_T_CORE register
windows that map a single port/region, and producing bridged resource
allocations backed by those discontiguous windows.
- Support stealing existing register window allocations to fulfill indirect
bhnd(4) bus I/O requests within address ranges tagged with
BHNDB_ALLOC_FULFILL_ON_OVERCOMMIT.
- Fix an inverted test of bhndb_is_pcie_attached() that disabled
PCI-only clock bring-up required by these devices.
Approved by: adrian (mentor, implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/bhnd/bhndb/bhndb.c
head/sys/dev/bhnd/bhndb/bhndb.h
head/sys/dev/bhnd/bhndb/bhndb_hwdata.c
head/sys/dev/bhnd/bhndb/bhndb_pci.c
head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c
head/sys/dev/bhnd/bhndb/bhndb_pcireg.h
head/sys/dev/bhnd/bhndb/bhndb_private.h
head/sys/dev/bhnd/bhndb/bhndb_subr.c
head/sys/dev/bhnd/bhndb/bhndbvar.h
Modified: head/sys/dev/bhnd/bhndb/bhndb.c
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb.c Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb.c Tue Nov 28 00:12:14 2017 (r326297)
@@ -115,9 +115,9 @@ static int bhndb_try_activate_resource(
static inline struct bhndb_dw_alloc *bhndb_io_resource(struct bhndb_softc *sc,
bus_addr_t addr, bus_size_t size,
- bus_size_t *offset);
+ bus_size_t *offset, bool *stolen,
+ bus_addr_t *restore);
-
/**
* Default bhndb(4) implementation of DEVICE_PROBE().
*
@@ -270,6 +270,9 @@ bhndb_init_region_cfg(struct bhndb_softc *sc, bhnd_ero
for (regw = br->cfg->register_windows;
regw->win_type != BHNDB_REGWIN_T_INVALID; regw++)
{
+ const struct bhndb_port_priority *pp;
+ uint32_t alloc_flags;
+
/* Only core windows are supported */
if (regw->win_type != BHNDB_REGWIN_T_CORE)
continue;
@@ -295,6 +298,18 @@ bhndb_init_region_cfg(struct bhndb_softc *sc, bhnd_ero
}
/*
+ * Apply the register window's region offset, if any.
+ */
+ if (regw->d.core.offset > size) {
+ device_printf(sc->dev, "invalid register "
+ "window offset %#jx for region %#jx+%#jx\n",
+ regw->d.core.offset, addr, size);
+ return (EINVAL);
+ }
+
+ addr += regw->d.core.offset;
+
+ /*
* Always defer to the register window's size.
*
* If the port size is smaller than the window size,
@@ -307,14 +322,25 @@ bhndb_init_region_cfg(struct bhndb_softc *sc, bhnd_ero
*/
size = regw->win_size;
+ /* Fetch allocation flags from the corresponding port
+ * priority entry, if any */
+ pp = bhndb_hw_priorty_find_port(table, core,
+ regw->d.core.port_type, regw->d.core.port,
+ regw->d.core.region);
+ if (pp != NULL) {
+ alloc_flags = pp->alloc_flags;
+ } else {
+ alloc_flags = 0;
+ }
+
/*
* Add to the bus region list.
*
- * The window priority for a statically mapped
- * region is always HIGH.
+ * The window priority for a statically mapped region is
+ * always HIGH.
*/
error = bhndb_add_resource_region(br, addr, size,
- BHNDB_PRIORITY_HIGH, regw);
+ BHNDB_PRIORITY_HIGH, 0, regw);
if (error)
return (error);
}
@@ -325,7 +351,6 @@ bhndb_init_region_cfg(struct bhndb_softc *sc, bhnd_ero
* ports defined in the priority table
*/
for (u_int i = 0; i < ncores; i++) {
- struct bhndb_region *region;
struct bhnd_core_info *core;
struct bhnd_core_match md;
@@ -369,13 +394,12 @@ bhndb_init_region_cfg(struct bhndb_softc *sc, bhnd_ero
}
/* Skip ports with an existing static mapping */
- region = bhndb_find_resource_region(br, addr, size);
- if (region != NULL && region->static_regwin != NULL)
+ if (bhndb_has_static_region_mapping(br, addr, size))
continue;
/* Define a dynamic region for this port */
error = bhndb_add_resource_region(br, addr, size,
- pp->priority, NULL);
+ pp->priority, pp->alloc_flags, NULL);
if (error)
return (error);
@@ -416,22 +440,29 @@ bhndb_init_region_cfg(struct bhndb_softc *sc, bhnd_ero
struct bhndb_region *region;
const char *direct_msg, *type_msg;
bhndb_priority_t prio, prio_min;
+ uint32_t flags;
prio_min = br->min_prio;
device_printf(sc->dev, "min_prio: %d\n", prio_min);
STAILQ_FOREACH(region, &br->bus_regions, link) {
prio = region->priority;
+ flags = region->alloc_flags;
direct_msg = prio >= prio_min ? "direct" : "indirect";
type_msg = region->static_regwin ? "static" : "dynamic";
device_printf(sc->dev, "region 0x%llx+0x%llx priority "
- "%u %s/%s\n",
+ "%u %s/%s",
(unsigned long long) region->addr,
(unsigned long long) region->size,
region->priority,
direct_msg, type_msg);
+
+ if (flags & BHNDB_ALLOC_FULFILL_ON_OVERCOMMIT)
+ printf(" [overcommit]\n");
+ else
+ printf("\n");
}
}
@@ -1605,11 +1636,12 @@ bhndb_deactivate_bhnd_resource(device_t dev, device_t
* in-use region; the first matching region is returned.
*/
static struct bhndb_dw_alloc *
-bhndb_io_resource_slow(struct bhndb_softc *sc, bus_addr_t addr,
- bus_size_t size, bus_size_t *offset)
+bhndb_io_resource_slow(struct bhndb_softc *sc, bus_addr_t addr, bus_size_t size,
+ bus_size_t *offset, bool *stolen, bus_addr_t *restore)
{
struct bhndb_resources *br;
struct bhndb_dw_alloc *dwa;
+ struct bhndb_region *region;
BHNDB_LOCK_ASSERT(sc, MA_OWNED);
@@ -1638,10 +1670,25 @@ bhndb_io_resource_slow(struct bhndb_softc *sc, bus_add
*offset = dwa->win->win_offset;
*offset += addr - dwa->target;
+ *stolen = false;
return (dwa);
}
- /* not found */
+ /* No existing dynamic mapping found. We'll need to check for a defined
+ * region to determine whether we can fulfill this request by
+ * stealing from an existing allocated register window */
+ region = bhndb_find_resource_region(br, addr, size);
+ if (region == NULL)
+ return (NULL);
+
+ if ((region->alloc_flags & BHNDB_ALLOC_FULFILL_ON_OVERCOMMIT) == 0)
+ return (NULL);
+
+ if ((dwa = bhndb_dw_steal(br, restore)) != NULL) {
+ *stolen = true;
+ return (dwa);
+ }
+
return (NULL);
}
@@ -1649,9 +1696,8 @@ bhndb_io_resource_slow(struct bhndb_softc *sc, bus_add
* Return a borrowed reference to a bridge resource allocation record capable
* of handling bus I/O requests of @p size at @p addr.
*
- * This will either return a reference to an existing allocation
- * record mapping the requested space, or will configure and return a free
- * allocation record.
+ * This will either return a reference to an existing allocation record mapping
+ * the requested space, or will configure and return a free allocation record.
*
* Will panic if a usable record cannot be found.
*
@@ -1660,10 +1706,16 @@ bhndb_io_resource_slow(struct bhndb_softc *sc, bus_add
* @param size The size of the I/O operation to be performed at @p addr.
* @param[out] offset The offset within the returned resource at which
* to perform the I/O request.
+ * @param[out] stolen Set to true if the allocation record was stolen to fulfill
+ * this request. If a stolen allocation record is returned,
+ * bhndb_io_resource_restore() must be called upon completion of the bus I/O
+ * request.
+ * @param[out] restore If the allocation record was stolen, this will be set
+ * to the target that must be restored.
*/
static inline struct bhndb_dw_alloc *
bhndb_io_resource(struct bhndb_softc *sc, bus_addr_t addr, bus_size_t size,
- bus_size_t *offset)
+ bus_size_t *offset, bool *stolen, bus_addr_t *restore)
{
struct bhndb_resources *br;
struct bhndb_dw_alloc *dwa;
@@ -1691,7 +1743,8 @@ bhndb_io_resource(struct bhndb_softc *sc, bus_addr_t a
* current operation.
*/
if (dwa == NULL) {
- dwa = bhndb_io_resource_slow(sc, addr, size, offset);
+ dwa = bhndb_io_resource_slow(sc, addr, size, offset, stolen,
+ restore);
if (dwa == NULL) {
panic("register windows exhausted attempting to map "
"0x%llx-0x%llx\n",
@@ -1720,6 +1773,7 @@ bhndb_io_resource(struct bhndb_softc *sc, bus_addr_t a
/* Calculate the offset and return */
*offset = (addr - dwa->target) + dwa->win->win_offset;
+ *stolen = false;
return (dwa);
}
@@ -1733,12 +1787,14 @@ bhndb_io_resource(struct bhndb_softc *sc, bus_addr_t a
struct bhndb_dw_alloc *dwa; \
struct resource *io_res; \
bus_size_t io_offset; \
+ bus_addr_t restore; \
+ bool stolen; \
\
sc = device_get_softc(dev); \
\
BHNDB_LOCK(sc); \
dwa = bhndb_io_resource(sc, rman_get_start(r->res) + \
- offset, _io_size, &io_offset); \
+ offset, _io_size, &io_offset, &stolen, &restore); \
io_res = dwa->parent_res; \
\
KASSERT(!r->direct, \
@@ -1748,6 +1804,10 @@ bhndb_io_resource(struct bhndb_softc *sc, bus_addr_t a
("i/o resource is not active"));
#define BHNDB_IO_COMMON_TEARDOWN() \
+ if (stolen) { \
+ bhndb_dw_return_stolen(sc->dev, sc->bus_res, \
+ dwa, restore); \
+ } \
BHNDB_UNLOCK(sc);
/* Defines a bhndb_bus_read_* method implementation */
Modified: head/sys/dev/bhnd/bhndb/bhndb.h
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb.h Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb.h Tue Nov 28 00:12:14 2017 (r326297)
@@ -90,6 +90,7 @@ struct bhndb_regwin {
bhnd_port_type port_type; /**< mapped port type */
u_int port; /**< mapped port number */
u_int region; /**< mapped region number */
+ bhnd_size_t offset; /**< mapped offset within the region */
} core;
/** SPROM register window (BHNDB_REGWIN_T_SPROM). */
@@ -150,6 +151,26 @@ typedef enum {
} bhndb_priority_t;
/**
+ * bhndb resource allocation flags.
+ */
+enum bhndb_alloc_flags {
+ /**
+ * If resource overcommit prevents fulfilling a request for this
+ * resource, an in-use resource should be be borrowed to fulfill the
+ * request.
+ *
+ * The only known use case is to support accessing the ChipCommon core
+ * during Wi-Fi driver operation on early PCI Wi-Fi devices
+ * (PCI_V0, SSB) that do not provide a dedicated ChipCommon register
+ * window mapping; on such devices, device and firmware semantics
+ * guarantee the safety of -- after disabling interrupts -- borrowing
+ * the single dynamic register window that's been assigned to the D11
+ * core to perform the few ChipCommon operations required by the driver.
+ */
+ BHNDB_ALLOC_FULFILL_ON_OVERCOMMIT = (1<<0),
+};
+
+/**
* Port resource priority descriptor.
*/
struct bhndb_port_priority {
@@ -157,6 +178,7 @@ struct bhndb_port_priority {
u_int port; /**< port */
u_int region; /**< region */
bhndb_priority_t priority; /**< port priority */
+ uint32_t alloc_flags; /**< port allocation flags (@see bhndb_alloc_flags) */
};
/**
Modified: head/sys/dev/bhnd/bhndb/bhndb_hwdata.c
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb_hwdata.c Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb_hwdata.c Tue Nov 28 00:12:14 2017 (r326297)
@@ -76,19 +76,24 @@ __FBSDID("$FreeBSD$");
BHNDB_PORTS(__VA_ARGS__) \
}
-/* Define a port priority record for the type/port/region
- * triplet. */
-#define BHNDB_PORT_PRIO(_type, _port, _region, _priority) { \
+/* Define a port priority record for the type/port/region triplet, optionally
+ * specifying port allocation flags as the final argument */
+#define BHNDB_PORT_PRIO(_type, _port, _region, _priority, ...) \
+ _BHNDB_PORT_PRIO(_type, _port, _region, _priority, ## __VA_ARGS__, 0)
+
+#define _BHNDB_PORT_PRIO(_type, _port, _region, _priority, _flags, ...) \
+{ \
.type = (BHND_PORT_ ## _type), \
.port = _port, \
.region = _region, \
- .priority = (BHNDB_PRIORITY_ ## _priority) \
+ .priority = (BHNDB_PRIORITY_ ## _priority), \
+ .alloc_flags = (_flags) \
}
/* Define a port priority record for the default (_type, 0, 0) type/port/region
* triplet. */
-#define BHNDB_PORT0_PRIO(_type, _priority) \
- BHNDB_PORT_PRIO(_type, 0, 0, _priority)
+#define BHNDB_PORT0_PRIO(_type, _priority, ...) \
+ BHNDB_PORT_PRIO(_type, 0, 0, _priority, ## __VA_ARGS__, 0)
/**
* Generic resource priority configuration usable with all currently supported
@@ -170,10 +175,14 @@ const struct bhndb_hw_priority bhndb_siba_priority_tab
* Agent ports are marked as 'NONE' on siba(4) devices, as they
* will be fully mappable via register windows shared with the
* device0.0 port.
+ *
+ * To support early PCI_V0 devices, we enable FULFILL_ON_OVERCOMMIT for
+ * ChipCommon.
*/
BHNDB_CLASS_PRIO(CC, LOW,
/* Device Block */
- BHNDB_PORT_PRIO(DEVICE, 0, 0, LOW)
+ BHNDB_PORT_PRIO(DEVICE, 0, 0, LOW,
+ BHNDB_ALLOC_FULFILL_ON_OVERCOMMIT)
),
BHNDB_CLASS_PRIO(PMU, LOW,
@@ -193,4 +202,4 @@ const struct bhndb_hw_priority bhndb_siba_priority_tab
),
BHNDB_HW_PRIORITY_TABLE_END
-};
\ No newline at end of file
+};
Modified: head/sys/dev/bhnd/bhndb/bhndb_pci.c
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb_pci.c Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb_pci.c Tue Nov 28 00:12:14 2017 (r326297)
@@ -707,26 +707,28 @@ bhndb_pci_sprom_size(struct bhndb_pci_softc *sc)
* Return the host resource providing a static mapping of the PCI core's
* registers.
*
- * @param sc bhndb PCI driver state.
- * @param[out] res On success, the host resource containing our PCI
- * core's register window.
- * @param[out] offset On success, the offset of the PCI core registers within
- * @p res.
+ * @param sc bhndb PCI driver state.
+ * @param offset The required readable offset within the PCI core
+ * register block.
+ * @param size The required readable size at @p offset.
+ * @param[out] res On success, the host resource containing our PCI
+ * core's register window.
+ * @param[out] res_offset On success, the @p offset relative to @p res.
*
* @retval 0 success
* @retval ENXIO if a valid static register window mapping the PCI core
* registers is not available.
*/
static int
-bhndb_pci_get_core_regs(struct bhndb_pci_softc *sc, struct resource **res,
- bus_size_t *offset)
+bhndb_pci_get_core_regs(struct bhndb_pci_softc *sc, bus_size_t offset,
+ bus_size_t size, struct resource **res, bus_size_t *res_offset)
{
const struct bhndb_regwin *win;
struct resource *r;
- /* Locate the static register window mapping the PCI core */
+ /* Locate the static register window mapping the requested offset */
win = bhndb_regwin_find_core(sc->bhndb.bus_res->cfg->register_windows,
- sc->pci_devclass, 0, BHND_PORT_DEVICE, 0, 0);
+ sc->pci_devclass, 0, BHND_PORT_DEVICE, 0, 0, offset, size);
if (win == NULL) {
device_printf(sc->dev, "missing PCI core register window\n");
return (ENXIO);
@@ -739,8 +741,11 @@ bhndb_pci_get_core_regs(struct bhndb_pci_softc *sc, st
return (ENXIO);
}
+ KASSERT(offset >= win->d.core.offset, ("offset %#jx outside of "
+ "register window", (uintmax_t)offset));
+
*res = r;
- *offset = win->win_offset;
+ *res_offset = win->win_offset + (offset - win->d.core.offset);
return (0);
}
@@ -761,18 +766,21 @@ bhndb_pci_write_core(struct bhndb_pci_softc *sc, bus_s
bus_size_t r_offset;
int error;
- if ((error = bhndb_pci_get_core_regs(sc, &r, &r_offset)))
- panic("no PCI core registers: %d", error);
+ error = bhndb_pci_get_core_regs(sc, offset, width, &r, &r_offset);
+ if (error) {
+ panic("no PCI register window mapping %#jx+%#x: %d",
+ (uintmax_t)offset, width, error);
+ }
switch (width) {
case 1:
- bus_write_1(r, r_offset + offset, value);
+ bus_write_1(r, r_offset, value);
break;
case 2:
- bus_write_2(r, r_offset + offset, value);
+ bus_write_2(r, r_offset, value);
break;
case 4:
- bus_write_4(r, r_offset + offset, value);
+ bus_write_4(r, r_offset, value);
break;
default:
panic("invalid width: %u", width);
@@ -794,16 +802,19 @@ bhndb_pci_read_core(struct bhndb_pci_softc *sc, bus_si
bus_size_t r_offset;
int error;
- if ((error = bhndb_pci_get_core_regs(sc, &r, &r_offset)))
- panic("no PCI core registers: %d", error);
+ error = bhndb_pci_get_core_regs(sc, offset, width, &r, &r_offset);
+ if (error) {
+ panic("no PCI register window mapping %#jx+%#x: %d",
+ (uintmax_t)offset, width, error);
+ }
switch (width) {
case 1:
- return (bus_read_1(r, r_offset + offset));
+ return (bus_read_1(r, r_offset));
case 2:
- return (bus_read_2(r, r_offset + offset));
+ return (bus_read_2(r, r_offset));
case 4:
- return (bus_read_4(r, r_offset + offset));
+ return (bus_read_4(r, r_offset));
default:
panic("invalid width: %u", width);
}
@@ -1057,7 +1068,7 @@ bhndb_enable_pci_clocks(device_t dev)
pci_dev = device_get_parent(dev);
/* Only supported and required on PCI devices */
- if (!bhndb_is_pcie_attached(dev))
+ if (bhndb_is_pcie_attached(dev))
return (0);
/* Read state of XTAL pin */
Modified: head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c Tue Nov 28 00:12:14 2017 (r326297)
@@ -312,7 +312,13 @@ static const struct bhndb_hwcfg bhndb_pci_hwcfg_v0 = {
.res = { SYS_RES_MEMORY, PCIR_BAR(0) }
},
- /* bar0+0x1800: pci core registers */
+ /*
+ * bar0+0x1800: pci core registers.
+ *
+ * Does not include the SSB CFG registers found at the end of
+ * the 4K core register block; these are mapped non-contigiously
+ * by the next entry.
+ */
{
.win_type = BHNDB_REGWIN_T_CORE,
.win_offset = BHNDB_PCI_V0_BAR0_PCIREG_OFFSET,
@@ -322,10 +328,27 @@ static const struct bhndb_hwcfg bhndb_pci_hwcfg_v0 = {
.unit = 0,
.port = 0,
.region = 0,
+ .port_type = BHND_PORT_DEVICE,
+ },
+ .res = { SYS_RES_MEMORY, PCIR_BAR(0) }
+ },
+
+ /* bar0+0x1E00: pci core (SSB CFG registers) */
+ {
+ .win_type = BHNDB_REGWIN_T_CORE,
+ .win_offset = BHNDB_PCI_V0_BAR0_PCISB_OFFSET ,
+ .win_size = BHNDB_PCI_V0_BAR0_PCISB_SIZE,
+ .d.core = {
+ .class = BHND_DEVCLASS_PCI,
+ .unit = 0,
+ .port = 0,
+ .region = 0,
+ .offset = BHNDB_PCI_V0_BAR0_PCISB_COREOFF,
.port_type = BHND_PORT_DEVICE
},
.res = { SYS_RES_MEMORY, PCIR_BAR(0) }
},
+
BHNDB_REGWIN_TABLE_END
},
Modified: head/sys/dev/bhnd/bhndb/bhndb_pcireg.h
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb_pcireg.h Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb_pcireg.h Tue Nov 28 00:12:14 2017 (r326297)
@@ -40,7 +40,8 @@
* [offset+ size] type description
* [0x0000+0x1000] dynamic mapped backplane address space (window 0).
* [0x1000+0x0800] fixed SPROM shadow
- * [0x1800+0x0800] fixed pci core registers
+ * [0x1800+0x0E00] fixed pci core device registers
+ * [0x1E00+0x0200] fixed pci core siba config registers
*
* == PCI_V1 ==
* Applies to:
@@ -133,8 +134,11 @@
#define BHNDB_PCI_V0_BAR0_WIN0_SIZE 0x1000
#define BHNDB_PCI_V0_BAR0_SPROM_OFFSET 0x1000 /* bar0 + 4K accesses sprom shadow (in pci core) */
#define BHNDB_PCI_V0_BAR0_SPROM_SIZE 0x0800
-#define BHNDB_PCI_V0_BAR0_PCIREG_OFFSET 0x1800 /* bar0 + 6K accesses pci core registers */
-#define BHNDB_PCI_V0_BAR0_PCIREG_SIZE 0x0800
+#define BHNDB_PCI_V0_BAR0_PCIREG_OFFSET 0x1800 /* bar0 + 6K accesses pci core registers (not including SSB CFG registers) */
+#define BHNDB_PCI_V0_BAR0_PCIREG_SIZE 0x0E00
+#define BHNDB_PCI_V0_BAR0_PCISB_OFFSET 0x1E00 /* bar0 + 7.5K accesses pci core's SSB CFG register blocks */
+#define BHNDB_PCI_V0_BAR0_PCISB_SIZE 0x0200
+#define BHNDB_PCI_V0_BAR0_PCISB_COREOFF 0xE00 /* mapped offset relative to the core base address */
/* PCI_V1 */
#define BHNDB_PCI_V1_BAR0_WIN0_CONTROL 0x80 /* backplane address space accessed by BAR0/WIN0 */
Modified: head/sys/dev/bhnd/bhndb/bhndb_private.h
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb_private.h Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb_private.h Tue Nov 28 00:12:14 2017 (r326297)
@@ -70,6 +70,7 @@ int bhndb_add_resource_region(
struct bhndb_resources *br,
bhnd_addr_t addr, bhnd_size_t size,
bhndb_priority_t priority,
+ uint32_t alloc_flags,
const struct bhndb_regwin *static_regwin);
int bhndb_find_resource_limits(
@@ -93,6 +94,10 @@ struct bhndb_intr_handler *bhndb_find_intr_handler(
struct bhndb_resources *br,
void *cookiep);
+bool bhndb_has_static_region_mapping(
+ struct bhndb_resources *br,
+ bhnd_addr_t addr, bhnd_size_t size);
+
struct bhndb_region *bhndb_find_resource_region(
struct bhndb_resources *br,
bhnd_addr_t addr, bhnd_size_t size);
@@ -120,11 +125,25 @@ int bhndb_dw_set_addr(device_t dev,
struct bhndb_dw_alloc *dwa,
bus_addr_t addr, bus_size_t size);
+struct bhndb_dw_alloc *bhndb_dw_steal(struct bhndb_resources *br,
+ bus_addr_t *saved);
+
+void bhndb_dw_return_stolen(device_t dev,
+ struct bhndb_resources *br,
+ struct bhndb_dw_alloc *dwa,
+ bus_addr_t saved);
+
const struct bhndb_hw_priority *bhndb_hw_priority_find_core(
const struct bhndb_hw_priority *table,
struct bhnd_core_info *core);
+const struct bhndb_port_priority *bhndb_hw_priorty_find_port(
+ const struct bhndb_hw_priority *table,
+ struct bhnd_core_info *core,
+ bhnd_port_type port_type, u_int port,
+ u_int region);
+
/**
* Dynamic register window allocation reference.
*/
@@ -152,6 +171,7 @@ struct bhndb_region {
bhnd_addr_t addr; /**< start of mapped range */
bhnd_size_t size; /**< size of mapped range */
bhndb_priority_t priority; /**< direct resource allocation priority */
+ uint32_t alloc_flags; /**< resource allocation flags (@see bhndb_alloc_flags) */
const struct bhndb_regwin *static_regwin; /**< fixed mapping regwin, if any */
STAILQ_ENTRY(bhndb_region) link;
@@ -185,6 +205,7 @@ struct bhndb_resources {
STAILQ_HEAD(, bhndb_region) bus_regions; /**< bus region descriptors */
+ struct mtx dw_steal_mtx; /**< spinlock must be held when stealing a dynamic window allocation */
struct bhndb_dw_alloc *dw_alloc; /**< dynamic window allocation records */
size_t dwa_count; /**< number of dynamic windows available. */
bitstr_t *dwa_freelist; /**< dynamic window free list */
Modified: head/sys/dev/bhnd/bhndb/bhndb_subr.c
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndb_subr.c Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndb_subr.c Tue Nov 28 00:12:14 2017 (r326297)
@@ -291,7 +291,10 @@ bhndb_alloc_resources(device_t dev, device_t parent_de
r->min_prio = BHNDB_PRIORITY_NONE;
STAILQ_INIT(&r->bus_regions);
STAILQ_INIT(&r->bus_intrs);
-
+
+ mtx_init(&r->dw_steal_mtx, device_get_nameunit(dev),
+ "bhndb dwa_steal lock", MTX_SPIN);
+
/* Initialize host address space resource manager. */
r->ht_mem_rman.rm_start = 0;
r->ht_mem_rman.rm_end = ~0;
@@ -492,6 +495,8 @@ failed:
if (r->res != NULL)
bhndb_release_host_resources(r->res);
+ mtx_destroy(&r->dw_steal_mtx);
+
free(r, M_BHND);
return (NULL);
@@ -626,6 +631,10 @@ bhndb_free_resources(struct bhndb_resources *br)
free(br->dw_alloc, M_BHND);
free(br->dwa_freelist, M_BHND);
+
+ mtx_destroy(&br->dw_steal_mtx);
+
+ free(br, M_BHND);
}
/**
@@ -1054,6 +1063,7 @@ bhndb_find_resource_limits(struct bhndb_resources *br,
* @param size The size of this region.
* @param priority The resource priority to be assigned to allocations
* made within this bus region.
+ * @param alloc_flags resource allocation flags (@see bhndb_alloc_flags)
* @param static_regwin If available, a static register window mapping this
* bus region entry. If not available, NULL.
*
@@ -1062,7 +1072,7 @@ bhndb_find_resource_limits(struct bhndb_resources *br,
*/
int
bhndb_add_resource_region(struct bhndb_resources *br, bhnd_addr_t addr,
- bhnd_size_t size, bhndb_priority_t priority,
+ bhnd_size_t size, bhndb_priority_t priority, uint32_t alloc_flags,
const struct bhndb_regwin *static_regwin)
{
struct bhndb_region *reg;
@@ -1076,6 +1086,7 @@ bhndb_add_resource_region(struct bhndb_resources *br,
.addr = addr,
.size = size,
.priority = priority,
+ .alloc_flags = alloc_flags,
.static_regwin = static_regwin
};
@@ -1084,7 +1095,40 @@ bhndb_add_resource_region(struct bhndb_resources *br,
return (0);
}
+/**
+ * Return true if a mapping of @p size bytes at @p addr is provided by either
+ * one contiguous bus region, or by multiple discontiguous regions.
+ *
+ * @param br The resource state to query.
+ * @param addr The requested starting address.
+ * @param size The requested size.
+ */
+bool
+bhndb_has_static_region_mapping(struct bhndb_resources *br,
+ bhnd_addr_t addr, bhnd_size_t size)
+{
+ struct bhndb_region *region;
+ bhnd_addr_t r_addr;
+ r_addr = addr;
+ while ((region = bhndb_find_resource_region(br, r_addr, 1)) != NULL) {
+ /* Must be backed by a static register window */
+ if (region->static_regwin == NULL)
+ return (false);
+
+ /* Adjust the search offset */
+ r_addr += region->size;
+
+ /* Have we traversed a complete (if discontiguous) mapping? */
+ if (r_addr == addr + size)
+ return (true);
+
+ }
+
+ /* No complete mapping found */
+ return (false);
+}
+
/**
* Find the bus region that maps @p size bytes at @p addr.
*
@@ -1302,7 +1346,7 @@ bhndb_dw_set_addr(device_t dev, struct bhndb_resources
rw = dwa->win;
- KASSERT(bhndb_dw_is_free(br, dwa),
+ KASSERT(bhndb_dw_is_free(br, dwa) || mtx_owned(&br->dw_steal_mtx),
("attempting to set the target address on an in-use window"));
/* Page-align the target address */
@@ -1324,6 +1368,74 @@ bhndb_dw_set_addr(device_t dev, struct bhndb_resources
}
/**
+ * Steal an in-use allocation record from @p br, returning the record's current
+ * target in @p saved on success.
+ *
+ * This function acquires a mutex and disables interrupts; callers should
+ * avoid holding a stolen window longer than required to issue an I/O
+ * request.
+ *
+ * A successful call to bhndb_dw_steal() must be balanced with a call to
+ * bhndb_dw_return_stolen().
+ *
+ * @param br The resource state from which a window should be stolen.
+ * @param saved The stolen window's saved target address.
+ *
+ * @retval non-NULL success
+ * @retval NULL no dynamic window regions are defined.
+ */
+struct bhndb_dw_alloc *
+bhndb_dw_steal(struct bhndb_resources *br, bus_addr_t *saved)
+{
+ struct bhndb_dw_alloc *dw_stolen;
+
+ KASSERT(bhndb_dw_next_free(br) == NULL,
+ ("attempting to steal an in-use window while free windows remain"));
+
+ /* Nothing to steal from? */
+ if (br->dwa_count == 0)
+ return (NULL);
+
+ /*
+ * Acquire our steal spinlock; this will be released in
+ * bhndb_dw_return_stolen().
+ *
+ * Acquiring also disables interrupts, which is required when one is
+ * stealing an in-use existing register window.
+ */
+ mtx_lock_spin(&br->dw_steal_mtx);
+
+ dw_stolen = &br->dw_alloc[0];
+ *saved = dw_stolen->target;
+ return (dw_stolen);
+}
+
+/**
+ * Return an allocation record previously stolen using bhndb_dw_steal().
+ *
+ * @param dev The device on which to issue a BHNDB_SET_WINDOW_ADDR() request.
+ * @param br The resource state owning @p dwa.
+ * @param dwa The allocation record to be returned.
+ * @param saved The original target address provided by bhndb_dw_steal().
+ */
+void
+bhndb_dw_return_stolen(device_t dev, struct bhndb_resources *br,
+ struct bhndb_dw_alloc *dwa, bus_addr_t saved)
+{
+ int error;
+
+ mtx_assert(&br->dw_steal_mtx, MA_OWNED);
+
+ error = bhndb_dw_set_addr(dev, br, dwa, saved, 0);
+ if (error) {
+ panic("failed to restore register window target %#jx: %d\n",
+ (uintmax_t)saved, error);
+ }
+
+ mtx_unlock_spin(&br->dw_steal_mtx);
+}
+
+/**
* Return the count of @p type register windows in @p table.
*
* @param table The table to search.
@@ -1380,18 +1492,24 @@ bhndb_regwin_find_type(const struct bhndb_regwin *tabl
* @param port_type The required port type.
* @param port The required port.
* @param region The required region.
+ * @param offset The required readable core register block offset.
+ * @param min_size The required minimum readable size at @p offset.
*
* @retval bhndb_regwin The first matching window.
* @retval NULL If no matching window was found.
*/
const struct bhndb_regwin *
bhndb_regwin_find_core(const struct bhndb_regwin *table, bhnd_devclass_t class,
- int unit, bhnd_port_type port_type, u_int port, u_int region)
+ int unit, bhnd_port_type port_type, u_int port, u_int region,
+ bus_size_t offset, bus_size_t min_size)
{
const struct bhndb_regwin *rw;
-
+
for (rw = table; rw->win_type != BHNDB_REGWIN_T_INVALID; rw++)
{
+ bus_size_t rw_offset;
+
+ /* Match on core, port, and region attributes */
if (rw->win_type != BHNDB_REGWIN_T_CORE)
continue;
@@ -1410,6 +1528,19 @@ bhndb_regwin_find_core(const struct bhndb_regwin *tabl
if (rw->d.core.region != region)
continue;
+ /* Verify that the requested range is mapped within
+ * this register window */
+ if (rw->d.core.offset > offset)
+ continue;
+
+ rw_offset = offset - rw->d.core.offset;
+
+ if (rw->win_size < rw_offset)
+ continue;
+
+ if (rw->win_size - rw_offset < min_size)
+ continue;
+
return (rw);
}
@@ -1429,7 +1560,8 @@ bhndb_regwin_find_core(const struct bhndb_regwin *tabl
* @param port_type The required port type.
* @param port The required port.
* @param region The required region.
- * @param min_size The minimum window size.
+ * @param offset The required readable core register block offset.
+ * @param min_size The required minimum readable size at @p offset.
*
* @retval bhndb_regwin The first matching window.
* @retval NULL If no matching window was found.
@@ -1437,13 +1569,13 @@ bhndb_regwin_find_core(const struct bhndb_regwin *tabl
const struct bhndb_regwin *
bhndb_regwin_find_best(const struct bhndb_regwin *table,
bhnd_devclass_t class, int unit, bhnd_port_type port_type, u_int port,
- u_int region, bus_size_t min_size)
+ u_int region, bus_size_t offset, bus_size_t min_size)
{
const struct bhndb_regwin *rw;
/* Prefer a fixed core mapping */
rw = bhndb_regwin_find_core(table, class, unit, port_type,
- port, region);
+ port, region, offset, min_size);
if (rw != NULL)
return (rw);
@@ -1494,6 +1626,45 @@ bhndb_hw_priority_find_core(const struct bhndb_hw_prio
for (hp = table; hp->ports != NULL; hp++) {
if (bhnd_core_matches(core, &hp->match))
return (hp);
+ }
+
+ /* not found */
+ return (NULL);
+}
+
+
+/**
+ * Search for a port resource priority descriptor in @p table.
+ *
+ * @param table The table to search.
+ * @param core The core to match against @p table.
+ * @param port_type The required port type.
+ * @param port The required port.
+ * @param region The required region.
+ */
+const struct bhndb_port_priority *
+bhndb_hw_priorty_find_port(const struct bhndb_hw_priority *table,
+ struct bhnd_core_info *core, bhnd_port_type port_type, u_int port,
+ u_int region)
+{
+ const struct bhndb_hw_priority *hp;
+
+ if ((hp = bhndb_hw_priority_find_core(table, core)) == NULL)
+ return (NULL);
+
+ for (u_int i = 0; i < hp->num_ports; i++) {
+ const struct bhndb_port_priority *pp = &hp->ports[i];
+
+ if (pp->type != port_type)
+ continue;
+
+ if (pp->port != port)
+ continue;
+
+ if (pp->region != region)
+ continue;
+
+ return (pp);
}
/* not found */
Modified: head/sys/dev/bhnd/bhndb/bhndbvar.h
==============================================================================
--- head/sys/dev/bhnd/bhndb/bhndbvar.h Mon Nov 27 23:48:21 2017 (r326296)
+++ head/sys/dev/bhnd/bhndb/bhndbvar.h Tue Nov 28 00:12:14 2017 (r326297)
@@ -118,13 +118,15 @@ const struct bhndb_regwin *bhndb_regwin_find_core(
const struct bhndb_regwin *table,
bhnd_devclass_t class, int unit,
bhnd_port_type port_type, u_int port,
- u_int region);
+ u_int region, bus_size_t offset,
+ bus_size_t min_size);
const struct bhndb_regwin *bhndb_regwin_find_best(
const struct bhndb_regwin *table,
bhnd_devclass_t class, int unit,
bhnd_port_type port_type, u_int port,
- u_int region, bus_size_t min_size);
+ u_int region, bus_size_t offset,
+ bus_size_t min_size);
bool bhndb_regwin_match_core(
const struct bhndb_regwin *regw,
From owner-svn-src-all@freebsd.org Tue Nov 28 00:19:06 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 382BFDEE193;
Tue, 28 Nov 2017 00:19:06 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 0ECE16BAB9;
Tue, 28 Nov 2017 00:19:05 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS0J5BW051838;
Tue, 28 Nov 2017 00:19:05 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS0J4CC051834;
Tue, 28 Nov 2017 00:19:04 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711280019.vAS0J4CC051834@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 00:19:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326298 - in stable/11/cddl:
contrib/opensolaris/lib/libzfs/common usr.sbin/zfsd
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in stable/11/cddl: contrib/opensolaris/lib/libzfs/common
usr.sbin/zfsd
X-SVN-Commit-Revision: 326298
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 00:19:06 -0000
Author: asomers
Date: Tue Nov 28 00:19:04 2017
New Revision: 326298
URL: https://svnweb.freebsd.org/changeset/base/326298
Log:
MFC r322854, r323995, r324568, r324991
r322854:
zfsd(8): Close a race condition when onlining a disk paritition
When inserting a partitioned disk, devfs and geom will announce the whole
disk before they announce the partition. If the partition containing ZFS
extends to one of the disk's extents, then zfsd will see a ZFS label on the
whole disk and attempt to online it. ZFS is smart enough to activate the
partition instead of the whole disk, but only if GEOM has already created
the partition's provider.
cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Add a zpool_read_all_labels method. It's similar to
zpool_read_label, but it will return the number of labels found.
cddl/usr.sbin/zfsd/zfsd_event.cc
When processing a DevFS CREATE event, only online a VDEV if we can
read all four ZFS labels.
Reviewed by: mav
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D11920
r323995:
Close a memory leak when using zpool_read_all_labels
X-MFC-With: 322854
Sponsored by: Spectra Logic Corp
r324568:
Optimize zpool_read_all_labels with AIO
Read all labels in parallel instead of sequentially
X-MFC-With: 322854
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12495
r324991:
Fix zpool_read_all_labels when vfs.aio.enable_unsafe=0
Previously, zpool_read_all_labels was trying to do 256KB reads, which are
greater than the default MAXPHYS and therefore must go through the slow,
unsafe AIO path. Shrink these reads to 112KB so they can use the safe, fast
AIO path instead.
X-MFC-With: 324568
Sponsored by: Spectra Logic Corp
Modified:
stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
stable/11/cddl/usr.sbin/zfsd/zfsd_event.cc
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Nov 28 00:12:14 2017 (r326297)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Nov 28 00:19:04 2017 (r326298)
@@ -774,6 +774,7 @@ extern int zpool_in_use(libzfs_handle_t *, int, pool_s
* Label manipulation.
*/
extern int zpool_read_label(int, nvlist_t **);
+extern int zpool_read_all_labels(int, nvlist_t **);
extern int zpool_clear_label(int);
/* is this zvol valid for use as a dump device? */
Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Tue Nov 28 00:12:14 2017 (r326297)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Tue Nov 28 00:19:04 2017 (r326298)
@@ -42,6 +42,7 @@
* using our derived config, and record the results.
*/
+#include <aio.h>
#include <ctype.h>
#include <devid.h>
#include <dirent.h>
@@ -913,6 +914,90 @@ zpool_read_label(int fd, nvlist_t **config)
free(label);
*config = NULL;
return (-1);
+}
+
+/*
+ * Given a file descriptor, read the label information and return an nvlist
+ * describing the configuration, if there is one.
+ * returns the number of valid labels found
+ * If a label is found, returns it via config. The caller is responsible for
+ * freeing it.
+ */
+int
+zpool_read_all_labels(int fd, nvlist_t **config)
+{
+ struct stat64 statbuf;
+ struct aiocb aiocbs[VDEV_LABELS];
+ struct aiocb *aiocbps[VDEV_LABELS];
+ int l;
+ vdev_phys_t *labels;
+ uint64_t state, txg, size;
+ int nlabels = 0;
+
+ *config = NULL;
+
+ if (fstat64(fd, &statbuf) == -1)
+ return (0);
+ size = P2ALIGN_TYPED(statbuf.st_size, sizeof (vdev_label_t), uint64_t);
+
+ if ((labels = calloc(VDEV_LABELS, sizeof (vdev_phys_t))) == NULL)
+ return (0);
+
+ memset(aiocbs, 0, sizeof(aiocbs));
+ for (l = 0; l < VDEV_LABELS; l++) {
+ aiocbs[l].aio_fildes = fd;
+ aiocbs[l].aio_offset = label_offset(size, l) + VDEV_SKIP_SIZE;
+ aiocbs[l].aio_buf = &labels[l];
+ aiocbs[l].aio_nbytes = sizeof(vdev_phys_t);
+ aiocbs[l].aio_lio_opcode = LIO_READ;
+ aiocbps[l] = &aiocbs[l];
+ }
+
+ if (lio_listio(LIO_WAIT, aiocbps, VDEV_LABELS, NULL) != 0) {
+ if (errno == EAGAIN || errno == EINTR || errno == EIO) {
+ for (l = 0; l < VDEV_LABELS; l++) {
+ errno = 0;
+ int r = aio_error(&aiocbs[l]);
+ if (r != EINVAL)
+ (void)aio_return(&aiocbs[l]);
+ }
+ }
+ free(labels);
+ return (0);
+ }
+
+ for (l = 0; l < VDEV_LABELS; l++) {
+ nvlist_t *temp = NULL;
+
+ if (aio_return(&aiocbs[l]) != sizeof(vdev_phys_t))
+ continue;
+
+ if (nvlist_unpack(labels[l].vp_nvlist,
+ sizeof (labels[l].vp_nvlist), &temp, 0) != 0)
+ continue;
+
+ if (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_STATE,
+ &state) != 0 || state > POOL_STATE_L2CACHE) {
+ nvlist_free(temp);
+ temp = NULL;
+ continue;
+ }
+
+ if (state != POOL_STATE_SPARE && state != POOL_STATE_L2CACHE &&
+ (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_TXG,
+ &txg) != 0 || txg == 0)) {
+ nvlist_free(temp);
+ temp = NULL;
+ continue;
+ }
+ if (temp)
+ *config = temp;
+
+ nlabels++;
+ }
+
+ free(labels);
+ return (nlabels);
}
typedef struct rdsk_node {
Modified: stable/11/cddl/usr.sbin/zfsd/zfsd_event.cc
==============================================================================
--- stable/11/cddl/usr.sbin/zfsd/zfsd_event.cc Tue Nov 28 00:12:14 2017 (r326297)
+++ stable/11/cddl/usr.sbin/zfsd/zfsd_event.cc Tue Nov 28 00:19:04 2017 (r326298)
@@ -36,6 +36,7 @@
#include <sys/cdefs.h>
#include <sys/time.h>
#include <sys/fs/zfs.h>
+#include <sys/vdev_impl.h>
#include <syslog.h>
@@ -93,21 +94,32 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de
pool_state_t poolState;
char *poolName;
boolean_t b_inuse;
+ int nlabels;
inUse = false;
degraded = false;
poolName = NULL;
if (zpool_in_use(g_zfsHandle, devFd, &poolState,
&poolName, &b_inuse) == 0) {
- nvlist_t *devLabel;
+ nvlist_t *devLabel = NULL;
inUse = b_inuse == B_TRUE;
if (poolName != NULL)
free(poolName);
- if (zpool_read_label(devFd, &devLabel) != 0
- || devLabel == NULL)
+ nlabels = zpool_read_all_labels(devFd, &devLabel);
+ /*
+ * If we find a disk with fewer than the maximum number of
+ * labels, it might be the whole disk of a partitioned disk
+ * where ZFS resides on a partition. In that case, we should do
+ * nothing and wait for the partition to appear. Or, the disk
+ * might be damaged. In that case, zfsd should do nothing and
+ * wait for the sysadmin to decide.
+ */
+ if (nlabels != VDEV_LABELS || devLabel == NULL) {
+ nvlist_free(devLabel);
return (NULL);
+ }
try {
Vdev vdev(devLabel);
@@ -121,6 +133,7 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de
exp.GetString().insert(0, context);
exp.Log();
+ nvlist_free(devLabel);
}
}
return (NULL);
From owner-svn-src-all@freebsd.org Tue Nov 28 00:40:00 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 811DEDEE927;
Tue, 28 Nov 2017 00:40:00 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 519BE6C58F;
Tue, 28 Nov 2017 00:40:00 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS0dxOw060527;
Tue, 28 Nov 2017 00:39:59 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS0dx7X060521;
Tue, 28 Nov 2017 00:39:59 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711280039.vAS0dx7X060521@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 00:39:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326299 - in stable/11: bin/chflags bin/chflags/tests
bin/mkdir bin/mkdir/tests bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests
etc/mtree
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in stable/11: bin/chflags bin/chflags/tests bin/mkdir
bin/mkdir/tests bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests etc/mtree
X-SVN-Commit-Revision: 326299
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 00:40:00 -0000
Author: asomers
Date: Tue Nov 28 00:39:58 2017
New Revision: 326299
URL: https://svnweb.freebsd.org/changeset/base/326299
Log:
MFC r323275, r324112
r323275:
Add basic tests for chflags, mkdir, rcp, and rmdir
Add basic command line parsing test coverage for these utilities. The tests
were automatically generated based on their man pages. These tests can be
expanded by hand for more thorough coverage. The aim is to generate very
basic amount of test coverage for all the utilities in the base system.
Submitted by: shivansh
Reviewed by: asomers, brooks
Sponsored by: Google, Inc (GSoC 2017)
Differential Revision: https://reviews.freebsd.org/D12036
r324112:
Fix Makefile entries from r323275
Reported by: Vladimir Zakharov <zakharov.vv@gmail.com>
Reviewed by: ngie
X-MFC-With: 323275
Added:
stable/11/bin/chflags/tests/
- copied from r323275, head/bin/chflags/tests/
stable/11/bin/mkdir/tests/
- copied from r323275, head/bin/mkdir/tests/
stable/11/bin/rcp/tests/
- copied from r323275, head/bin/rcp/tests/
stable/11/bin/rmdir/tests/
- copied from r323275, head/bin/rmdir/tests/
Modified:
stable/11/bin/chflags/Makefile
stable/11/bin/mkdir/Makefile
stable/11/bin/rcp/Makefile
stable/11/bin/rmdir/Makefile
stable/11/etc/mtree/BSD.tests.dist
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/bin/chflags/Makefile
==============================================================================
--- stable/11/bin/chflags/Makefile Tue Nov 28 00:19:04 2017 (r326298)
+++ stable/11/bin/chflags/Makefile Tue Nov 28 00:39:58 2017 (r326299)
@@ -1,7 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <src.opts.mk>
+
PACKAGE=runtime
PROG= chflags
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/11/bin/mkdir/Makefile
==============================================================================
--- stable/11/bin/mkdir/Makefile Tue Nov 28 00:19:04 2017 (r326298)
+++ stable/11/bin/mkdir/Makefile Tue Nov 28 00:39:58 2017 (r326299)
@@ -1,7 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <src.opts.mk>
+
PACKAGE=runtime
PROG= mkdir
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/11/bin/rcp/Makefile
==============================================================================
--- stable/11/bin/rcp/Makefile Tue Nov 28 00:19:04 2017 (r326298)
+++ stable/11/bin/rcp/Makefile Tue Nov 28 00:39:58 2017 (r326299)
@@ -1,6 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
+.include <src.opts.mk>
+
PACKAGE=rcmds
PROG= rcp
SRCS= rcp.c util.c
@@ -10,5 +12,8 @@ PACKAGE=rcmds
BINOWN= root
BINMODE=4555
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/11/bin/rmdir/Makefile
==============================================================================
--- stable/11/bin/rmdir/Makefile Tue Nov 28 00:19:04 2017 (r326298)
+++ stable/11/bin/rmdir/Makefile Tue Nov 28 00:39:58 2017 (r326299)
@@ -1,7 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <src.opts.mk>
+
PACKAGE=runtime
PROG= rmdir
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/11/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/11/etc/mtree/BSD.tests.dist Tue Nov 28 00:19:04 2017 (r326298)
+++ stable/11/etc/mtree/BSD.tests.dist Tue Nov 28 00:39:58 2017 (r326299)
@@ -8,6 +8,8 @@
bin
cat
..
+ chflags
+ ..
chmod
..
date
@@ -22,6 +24,8 @@
..
ls
..
+ mkdir
+ ..
mv
..
pax
@@ -29,6 +33,10 @@
pkill
..
pwait
+ ..
+ rcp
+ ..
+ rmdir
..
sh
builtins
From owner-svn-src-all@freebsd.org Tue Nov 28 00:41:18 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6985DEEB29;
Tue, 28 Nov 2017 00:41:18 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B033E6C76E;
Tue, 28 Nov 2017 00:41:18 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS0fH9F063724;
Tue, 28 Nov 2017 00:41:17 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS0fHDh063723;
Tue, 28 Nov 2017 00:41:17 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711280041.vAS0fHDh063723@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 00:41:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326300 - stable/11/share/man/man4
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/11/share/man/man4
X-SVN-Commit-Revision: 326300
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 00:41:19 -0000
Author: asomers
Date: Tue Nov 28 00:41:17 2017
New Revision: 326300
URL: https://svnweb.freebsd.org/changeset/base/326300
Log:
MFC r324805:
Fix the mps(4) HISTORY section.
Looks like a copy/paste error from r302673.
Sponsored by: Spectra Logic Corp
Modified:
stable/11/share/man/man4/mps.4
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man4/mps.4
==============================================================================
--- stable/11/share/man/man4/mps.4 Tue Nov 28 00:39:58 2017 (r326299)
+++ stable/11/share/man/man4/mps.4 Tue Nov 28 00:41:17 2017 (r326300)
@@ -356,7 +356,8 @@ These bits have the described effects:
.Sh HISTORY
The
.Nm
-driver first appeared in FreeBSD 9.3.
+driver first appeared in
+.Fx 9.0 .
.Sh AUTHORS
The
.Nm
From owner-svn-src-all@freebsd.org Tue Nov 28 00:42:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6A87DEEBA3;
Tue, 28 Nov 2017 00:42:45 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id BDD596CA9B;
Tue, 28 Nov 2017 00:42:45 +0000 (UTC)
(envelope-from landonf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS0giUe064689;
Tue, 28 Nov 2017 00:42:44 GMT (envelope-from landonf@FreeBSD.org)
Received: (from landonf@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS0gidB064686;
Tue, 28 Nov 2017 00:42:44 GMT (envelope-from landonf@FreeBSD.org)
Message-Id: <201711280042.vAS0gidB064686@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: landonf set sender to
landonf@FreeBSD.org using -f
From: "Landon J. Fuller" <landonf@FreeBSD.org>
Date: Tue, 28 Nov 2017 00:42:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326301 - in head/sys: dev/bhnd/siba modules/bhnd/siba
X-SVN-Group: head
X-SVN-Commit-Author: landonf
X-SVN-Commit-Paths: in head/sys: dev/bhnd/siba modules/bhnd/siba
X-SVN-Commit-Revision: 326301
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 00:42:46 -0000
Author: landonf
Date: Tue Nov 28 00:42:44 2017
New Revision: 326301
URL: https://svnweb.freebsd.org/changeset/base/326301
Log:
siba(4): Add support for devices have neither PMU nor PWRCTL support.
Very early BHND Wi-Fi devices (e.g. BCM4318) do not support any form of
dynamic clock control; on these devices, any PMU requests that cannot be
met by the device's fixed clock state will return an appropriate error
code.
Approved by: adrian (mentor, implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/bhnd/siba/siba.c
head/sys/dev/bhnd/siba/sibavar.h
head/sys/modules/bhnd/siba/Makefile
Modified: head/sys/dev/bhnd/siba/siba.c
==============================================================================
--- head/sys/dev/bhnd/siba/siba.c Tue Nov 28 00:41:17 2017 (r326300)
+++ head/sys/dev/bhnd/siba/siba.c Tue Nov 28 00:42:44 2017 (r326301)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
+#include <dev/bhnd/cores/chipc/chipc.h>
#include <dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.h>
#include "sibareg.h"
@@ -168,8 +169,9 @@ siba_read_ivar(device_t dev, device_t child, int index
return (0);
case SIBA_PMU_PWRCTL:
- panic("bhnd_get_pmu_info() called with "
- "SIBA_PMU_PWRCTL");
+ case SIBA_PMU_FIXED:
+ panic("bhnd_get_pmu_info() called with siba PMU state "
+ "%d", dinfo->pmu_state);
return (ENXIO);
}
@@ -211,8 +213,9 @@ siba_write_ivar(device_t dev, device_t child, int inde
return (0);
case SIBA_PMU_PWRCTL:
- panic("bhnd_set_pmu_info() called with "
- "SIBA_PMU_PWRCTL");
+ case SIBA_PMU_FIXED:
+ panic("bhnd_set_pmu_info() called with siba PMU state "
+ "%d", dinfo->pmu_state);
return (ENXIO);
}
@@ -237,7 +240,10 @@ siba_alloc_pmu(device_t dev, device_t child)
{
struct siba_softc *sc;
struct siba_devinfo *dinfo;
+ device_t chipc;
device_t pwrctl;
+ struct chipc_caps ccaps;
+ siba_pmu_state pmu_state;
int error;
if (device_get_parent(child) != dev)
@@ -245,11 +251,20 @@ siba_alloc_pmu(device_t dev, device_t child)
sc = device_get_softc(dev);
dinfo = device_get_ivars(child);
- pwrctl = bhnd_retain_provider(child, BHND_SERVICE_PWRCTL);
+ pwrctl = NULL;
- /* Unless this is a legacy PWRCTL chipset, defer to bhnd(4)'s PMU
- * implementation */
- if (pwrctl == NULL) {
+ /* Fetch ChipCommon capability flags */
+ chipc = bhnd_retain_provider(child, BHND_SERVICE_CHIPC);
+ if (chipc != NULL) {
+ ccaps = *BHND_CHIPC_GET_CAPS(chipc);
+ bhnd_release_provider(child, chipc, BHND_SERVICE_CHIPC);
+ } else {
+ memset(&ccaps, 0, sizeof(ccaps));
+ }
+
+ /* Defer to bhnd(4)'s PMU implementation if ChipCommon exists and
+ * advertises PMU support */
+ if (ccaps.pmu) {
if ((error = bhnd_generic_alloc_pmu(dev, child)))
return (error);
@@ -259,8 +274,24 @@ siba_alloc_pmu(device_t dev, device_t child)
return (0);
}
- /* This is a legacy PWRCTL chipset; we need to map all bhnd(4) bus PMU
- * to PWRCTL operations ourselves.*/
+ /*
+ * This is either a legacy PWRCTL chipset, or the device does not
+ * support dynamic clock control.
+ *
+ * We need to map all bhnd(4) bus PMU to PWRCTL or no-op operations.
+ */
+ if (ccaps.pwr_ctrl) {
+ pmu_state = SIBA_PMU_PWRCTL;
+ pwrctl = bhnd_retain_provider(child, BHND_SERVICE_PWRCTL);
+ if (pwrctl == NULL) {
+ device_printf(dev, "PWRCTL not found\n");
+ return (ENODEV);
+ }
+ } else {
+ pmu_state = SIBA_PMU_FIXED;
+ pwrctl = NULL;
+ }
+
SIBA_LOCK(sc);
/* Per-core PMU state already allocated? */
@@ -270,8 +301,8 @@ siba_alloc_pmu(device_t dev, device_t child)
}
/* Update the child's PMU allocation state, and transfer ownership of
- * the PWRCTL provider reference */
- dinfo->pmu_state = SIBA_PMU_PWRCTL;
+ * the PWRCTL provider reference (if any) */
+ dinfo->pmu_state = pmu_state;
dinfo->pmu.pwrctl = pwrctl;
SIBA_UNLOCK(sc);
@@ -324,6 +355,15 @@ siba_release_pmu(device_t dev, device_t child)
/* Release the provider reference */
bhnd_release_provider(child, pwrctl, BHND_SERVICE_PWRCTL);
return (0);
+
+ case SIBA_PMU_FIXED:
+ /* Clean up the child's PMU state */
+ KASSERT(dinfo->pmu.pwrctl == NULL,
+ ("PWRCTL reference with FIXED state"));
+
+ dinfo->pmu_state = SIBA_PMU_NONE;
+ dinfo->pmu.pwrctl = NULL;
+ SIBA_UNLOCK(sc);
}
panic("invalid PMU state: %d", dinfo->pmu_state);
@@ -363,6 +403,22 @@ siba_get_clock_latency(device_t dev, device_t child, b
SIBA_UNLOCK(sc);
return (error);
+
+ case SIBA_PMU_FIXED:
+ SIBA_UNLOCK(sc);
+
+ /* HT clock is always available, and incurs no transition
+ * delay. */
+ switch (clock) {
+ case BHND_CLOCK_HT:
+ *latency = 0;
+ return (0);
+
+ default:
+ return (ENODEV);
+ }
+
+ return (ENODEV);
}
panic("invalid PMU state: %d", dinfo->pmu_state);
@@ -401,6 +457,11 @@ siba_get_clock_freq(device_t dev, device_t child, bhnd
SIBA_UNLOCK(sc);
return (error);
+
+ case SIBA_PMU_FIXED:
+ SIBA_UNLOCK(sc);
+
+ return (ENODEV);
}
panic("invalid PMU state: %d", dinfo->pmu_state);
@@ -432,6 +493,7 @@ siba_request_ext_rsrc(device_t dev, device_t child, u_
return (bhnd_generic_request_ext_rsrc(dev, child, rsrc));
case SIBA_PMU_PWRCTL:
+ case SIBA_PMU_FIXED:
/* HW does not support per-core external resources */
SIBA_UNLOCK(sc);
return (ENODEV);
@@ -466,6 +528,7 @@ siba_release_ext_rsrc(device_t dev, device_t child, u_
return (bhnd_generic_release_ext_rsrc(dev, child, rsrc));
case SIBA_PMU_PWRCTL:
+ case SIBA_PMU_FIXED:
/* HW does not support per-core external resources */
SIBA_UNLOCK(sc);
return (ENODEV);
@@ -506,6 +569,22 @@ siba_request_clock(device_t dev, device_t child, bhnd_
SIBA_UNLOCK(sc);
return (error);
+
+ case SIBA_PMU_FIXED:
+ SIBA_UNLOCK(sc);
+
+ /* HT clock is always available, and fulfills any of the
+ * following clock requests */
+ switch (clock) {
+ case BHND_CLOCK_DYN:
+ case BHND_CLOCK_ILP:
+ case BHND_CLOCK_ALP:
+ case BHND_CLOCK_HT:
+ return (0);
+
+ default:
+ return (ENODEV);
+ }
}
panic("invalid PMU state: %d", dinfo->pmu_state);
@@ -537,6 +616,7 @@ siba_enable_clocks(device_t dev, device_t child, uint3
return (bhnd_generic_enable_clocks(dev, child, clocks));
case SIBA_PMU_PWRCTL:
+ case SIBA_PMU_FIXED:
SIBA_UNLOCK(sc);
/* All (supported) clocks are already enabled by default */
Modified: head/sys/dev/bhnd/siba/sibavar.h
==============================================================================
--- head/sys/dev/bhnd/siba/sibavar.h Tue Nov 28 00:41:17 2017 (r326300)
+++ head/sys/dev/bhnd/siba/sibavar.h Tue Nov 28 00:42:44 2017 (r326301)
@@ -194,6 +194,7 @@ typedef enum {
SIBA_PMU_NONE, /**< If the core has not yet allocated PMU state */
SIBA_PMU_BHND, /**< If standard bhnd(4) PMU support should be used */
SIBA_PMU_PWRCTL, /**< If legacy PWRCTL PMU support should be used */
+ SIBA_PMU_FIXED, /**< If legacy fixed (no-op) PMU support should be used */
} siba_pmu_state;
/**
Modified: head/sys/modules/bhnd/siba/Makefile
==============================================================================
--- head/sys/modules/bhnd/siba/Makefile Tue Nov 28 00:41:17 2017 (r326300)
+++ head/sys/modules/bhnd/siba/Makefile Tue Nov 28 00:42:44 2017 (r326301)
@@ -7,7 +7,8 @@ SRCS= siba.c siba_subr.c \
siba_erom.c
SRCS+= device_if.h bus_if.h
-SRCS+= bhnd_bus_if.h bhnd_erom_if.h \
- bhnd_pmu_if.h bhnd_pwrctl_if.h
+SRCS+= bhnd_bus_if.h bhnd_chipc_if.h \
+ bhnd_erom_if.h bhnd_pmu_if.h \
+ bhnd_pwrctl_if.h
.include <bsd.kmod.mk>
From owner-svn-src-all@freebsd.org Tue Nov 28 00:55:31 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E230BDEF02B;
Tue, 28 Nov 2017 00:55:31 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B95F36D292;
Tue, 28 Nov 2017 00:55:31 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS0tUon069290;
Tue, 28 Nov 2017 00:55:30 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS0tUZ0069288;
Tue, 28 Nov 2017 00:55:30 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711280055.vAS0tUZ0069288@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 28 Nov 2017 00:55:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326302 -
stable/11/cddl/contrib/opensolaris/lib/libdtrace/common
X-SVN-Group: stable-11
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common
X-SVN-Commit-Revision: 326302
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 00:55:32 -0000
Author: emaste
Date: Tue Nov 28 00:55:30 2017
New Revision: 326302
URL: https://svnweb.freebsd.org/changeset/base/326302
Log:
MFC r325042: libdtrace: replace "DOODAD" with more descriptive string
Previously some unimplemented libdtrace routines printed the function,
file and line number, followed by "DOODAD." That is not particularly
informative, so replace it with a message reporting the actual issue.
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Nov 28 00:42:44 2017 (r326301)
+++ stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Nov 28 00:55:30 2017 (r326302)
@@ -229,10 +229,12 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof,
for (j = 0; j < nrel; j++) {
#if defined(__aarch64__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): aarch64 not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__arm__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): arm not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__i386) || defined(__amd64)
rel->r_offset = s->dofs_offset +
dofr[j].dofr_offset;
@@ -240,7 +242,8 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__L
R_386_32);
#elif defined(__mips__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): MIPS not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__powerpc__)
/*
* Add 4 bytes to hit the low half of this 64-bit
@@ -252,7 +255,8 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__L
R_PPC_REL32);
#elif defined(__riscv__)
/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): RISC-V not implemented\n",
+ __FUNCTION__, __FILE__, __LINE__);
#elif defined(__sparc)
/*
* Add 4 bytes to hit the low half of this 64-bit
@@ -838,7 +842,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): aarch64 not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
return (0);
}
#elif defined(__arm__)
@@ -847,7 +852,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): arm not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
return (0);
}
#elif defined(__mips__)
@@ -856,7 +862,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): MIPS not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
return (0);
}
#elif defined(__powerpc__)
@@ -946,7 +953,8 @@ static int
dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
uint32_t *off)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): RISC-V implementation required\n", __FUNCTION__,
+ __FILE__, __LINE__);
return (0);
}
#elif defined(__sparc)
Modified: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c Tue Nov 28 00:42:44 2017 (r326301)
+++ stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c Tue Nov 28 00:55:30 2017 (r326302)
@@ -426,7 +426,8 @@ dt_proc_attach(dt_proc_t *dpr, int exec)
static void
dt_proc_waitrun(dt_proc_t *dpr)
{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+ printf("%s:%s(%d): not implemented\n", __FUNCTION__, __FILE__,
+ __LINE__);
#ifdef DOODAD
struct ps_prochandle *P = dpr->dpr_proc;
const lwpstatus_t *psp = &Pstatus(P)->pr_lwp;
From owner-svn-src-all@freebsd.org Tue Nov 28 00:56:21 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7690DEF0F6;
Tue, 28 Nov 2017 00:56:21 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B0C266D3D8;
Tue, 28 Nov 2017 00:56:21 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS0uKZp069379;
Tue, 28 Nov 2017 00:56:20 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS0uKvU069378;
Tue, 28 Nov 2017 00:56:20 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711280056.vAS0uKvU069378@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 28 Nov 2017 00:56:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326303 -
stable/11/cddl/contrib/opensolaris/lib/libdtrace/common
X-SVN-Group: stable-11
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common
X-SVN-Commit-Revision: 326303
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 00:56:22 -0000
Author: emaste
Date: Tue Nov 28 00:56:20 2017
New Revision: 326303
URL: https://svnweb.freebsd.org/changeset/base/326303
Log:
MFC r326046: dt_modtext: return error on archs lacking an implementation
Reported by: mmel
Reviewed by: markj
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Nov 28 00:55:30 2017 (r326302)
+++ stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Nov 28 00:56:20 2017 (r326303)
@@ -844,7 +844,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled,
{
printf("%s:%s(%d): aarch64 not implemented\n", __FUNCTION__, __FILE__,
__LINE__);
- return (0);
+ return (-1);
}
#elif defined(__arm__)
/* XXX */
@@ -854,7 +854,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled,
{
printf("%s:%s(%d): arm not implemented\n", __FUNCTION__, __FILE__,
__LINE__);
- return (0);
+ return (-1);
}
#elif defined(__mips__)
/* XXX */
@@ -864,7 +864,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled,
{
printf("%s:%s(%d): MIPS not implemented\n", __FUNCTION__, __FILE__,
__LINE__);
- return (0);
+ return (-1);
}
#elif defined(__powerpc__)
/* The sentinel is 'xor r3,r3,r3'. */
@@ -955,7 +955,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled,
{
printf("%s:%s(%d): RISC-V implementation required\n", __FUNCTION__,
__FILE__, __LINE__);
- return (0);
+ return (-1);
}
#elif defined(__sparc)
From owner-svn-src-all@freebsd.org Tue Nov 28 01:15:12 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D8EDDEF9D1;
Tue, 28 Nov 2017 01:15:12 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id CB3C06DE7B;
Tue, 28 Nov 2017 01:15:11 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS1FAjW078022;
Tue, 28 Nov 2017 01:15:10 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS1FAVD078021;
Tue, 28 Nov 2017 01:15:10 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711280115.vAS1FAVD078021@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 28 Nov 2017 01:15:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326304 - stable/11/sys/vm
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/11/sys/vm
X-SVN-Commit-Revision: 326304
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 01:15:12 -0000
Author: markj
Date: Tue Nov 28 01:15:10 2017
New Revision: 326304
URL: https://svnweb.freebsd.org/changeset/base/326304
Log:
MFC r326055:
Allow for fictitious physical pages in vm_page_scan_contig().
Modified:
stable/11/sys/vm/vm_page.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/vm/vm_page.c
==============================================================================
--- stable/11/sys/vm/vm_page.c Tue Nov 28 00:56:20 2017 (r326303)
+++ stable/11/sys/vm/vm_page.c Tue Nov 28 01:15:10 2017 (r326304)
@@ -2036,8 +2036,10 @@ vm_page_scan_contig(u_long npages, vm_page_t m_start,
run_len = 0;
m_mtx = NULL;
for (m = m_start; m < m_end && run_len < npages; m += m_inc) {
- KASSERT((m->flags & (PG_FICTITIOUS | PG_MARKER)) == 0,
- ("page %p is PG_FICTITIOUS or PG_MARKER", m));
+ KASSERT((m->flags & PG_MARKER) == 0,
+ ("page %p is PG_MARKER", m));
+ KASSERT((m->flags & PG_FICTITIOUS) == 0 || m->wire_count == 1,
+ ("fictitious page %p has invalid wire count", m));
/*
* If the current page would be the start of a run, check its
From owner-svn-src-all@freebsd.org Tue Nov 28 01:15:55 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3ADDDEFAAB;
Tue, 28 Nov 2017 01:15:55 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7B29B6DFDA;
Tue, 28 Nov 2017 01:15:55 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS1FsMT078110;
Tue, 28 Nov 2017 01:15:54 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS1Fr1e078101;
Tue, 28 Nov 2017 01:15:53 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711280115.vAS1Fr1e078101@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 28 Nov 2017 01:15:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326305 - in stable/11: share/man/man9 sys/kern sys/sys
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: in stable/11: share/man/man9 sys/kern sys/sys
X-SVN-Commit-Revision: 326305
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 01:15:55 -0000
Author: markj
Date: Tue Nov 28 01:15:53 2017
New Revision: 326305
URL: https://svnweb.freebsd.org/changeset/base/326305
Log:
MFC r326060:
Clean up the SYSINIT_FLAGS definitions for rwlock(9) and rmlock(9).
Modified:
stable/11/share/man/man9/Makefile
stable/11/share/man/man9/rmlock.9
stable/11/share/man/man9/rwlock.9
stable/11/share/man/man9/sx.9
stable/11/sys/kern/kern_rmlock.c
stable/11/sys/kern/kern_rwlock.c
stable/11/sys/sys/rmlock.h
stable/11/sys/sys/rwlock.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man9/Makefile
==============================================================================
--- stable/11/share/man/man9/Makefile Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/share/man/man9/Makefile Tue Nov 28 01:15:53 2017 (r326305)
@@ -1446,6 +1446,7 @@ MLINKS+=rmlock.9 rm_assert.9 \
rmlock.9 rm_runlock.9 \
rmlock.9 rm_sleep.9 \
rmlock.9 RM_SYSINIT.9 \
+ rmlock.9 RM_SYSINIT_FLAGS.9 \
rmlock.9 rm_try_rlock.9 \
rmlock.9 rm_wlock.9 \
rmlock.9 rm_wowned.9 \
@@ -1478,6 +1479,7 @@ MLINKS+=rwlock.9 rw_assert.9 \
rwlock.9 rw_unlock.9 \
rwlock.9 rw_sleep.9 \
rwlock.9 RW_SYSINIT.9 \
+ rwlock.9 RW_SYSINIT_FLAGS.9 \
rwlock.9 rw_try_rlock.9 \
rwlock.9 rw_try_upgrade.9 \
rwlock.9 rw_try_wlock.9 \
@@ -1685,6 +1687,7 @@ MLINKS+=sx.9 sx_assert.9 \
sx.9 sx_slock_sig.9 \
sx.9 sx_sunlock.9 \
sx.9 SX_SYSINIT.9 \
+ sx.9 SX_SYSINIT_FLAGS.9 \
sx.9 sx_try_slock.9 \
sx.9 sx_try_upgrade.9 \
sx.9 sx_try_xlock.9 \
Modified: stable/11/share/man/man9/rmlock.9
==============================================================================
--- stable/11/share/man/man9/rmlock.9 Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/share/man/man9/rmlock.9 Tue Nov 28 01:15:53 2017 (r326305)
@@ -26,7 +26,7 @@
.\" $FreeBSD$
.\"
.\" Based on rwlock.9 man page
-.Dd December 13, 2014
+.Dd November 11, 2017
.Dt RMLOCK 9
.Os
.Sh NAME
@@ -42,7 +42,8 @@
.Nm rm_wowned ,
.Nm rm_sleep ,
.Nm rm_assert ,
-.Nm RM_SYSINIT
+.Nm RM_SYSINIT ,
+.Nm RM_SYSINIT_FLAGS
.Nd kernel reader/writer lock optimized for read-mostly access patterns
.Sh SYNOPSIS
.In sys/param.h
@@ -74,7 +75,8 @@
.Ft void
.Fn rm_assert "struct rmlock *rm" "int what"
.In sys/kernel.h
-.Fn RM_SYSINIT "name" "struct rmlock *rm" "const char *desc" "int opts"
+.Fn RM_SYSINIT "name" "struct rmlock *rm" "const char *desc"
+.Fn RM_SYSINIT_FLAGS "name" "struct rmlock *rm" "const char *desc" "int flags"
.Sh DESCRIPTION
Read-mostly locks allow shared access to protected data by multiple threads,
or exclusive access by a single thread.
Modified: stable/11/share/man/man9/rwlock.9
==============================================================================
--- stable/11/share/man/man9/rwlock.9 Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/share/man/man9/rwlock.9 Tue Nov 28 01:15:53 2017 (r326305)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 28, 2016
+.Dd November 11, 2017
.Dt RWLOCK 9
.Os
.Sh NAME
@@ -45,7 +45,8 @@
.Nm rw_initialized ,
.Nm rw_wowned ,
.Nm rw_assert ,
-.Nm RW_SYSINIT
+.Nm RW_SYSINIT ,
+.Nm RW_SYSINIT_FLAGS
.Nd kernel reader/writer lock
.Sh SYNOPSIS
.In sys/param.h
@@ -88,6 +89,7 @@
.Fn rw_assert "const struct rwlock *rw" "int what"
.In sys/kernel.h
.Fn RW_SYSINIT "name" "struct rwlock *rw" "const char *desc"
+.Fn RW_SYSINIT_FLAGS "name" "struct rwlock *rw" "const char *desc" "int flags"
.Sh DESCRIPTION
Reader/writer locks allow shared access to protected data by multiple threads,
or exclusive access by a single thread.
Modified: stable/11/share/man/man9/sx.9
==============================================================================
--- stable/11/share/man/man9/sx.9 Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/share/man/man9/sx.9 Tue Nov 28 01:15:53 2017 (r326305)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 28, 2016
+.Dd November 11, 2017
.Dt SX 9
.Os
.Sh NAME
@@ -49,7 +49,8 @@
.Nm sx_xholder ,
.Nm sx_xlocked ,
.Nm sx_assert ,
-.Nm SX_SYSINIT
+.Nm SX_SYSINIT ,
+.Nm SX_SYSINIT_FLAGS
.Nd kernel shared/exclusive lock
.Sh SYNOPSIS
.In sys/param.h
@@ -95,7 +96,8 @@
.Ft void
.Fn sx_assert "const struct sx *sx" "int what"
.In sys/kernel.h
-.Fn SX_SYSINIT "name" "struct sx *sx" "const char *description"
+.Fn SX_SYSINIT "name" "struct sx *sx" "const char *desc"
+.Fn SX_SYSINIT_FLAGS "name" "struct sx *sx" "const char *desc" "int flags"
.Sh DESCRIPTION
Shared/exclusive locks are used to protect data that are read far more often
than they are written.
@@ -295,6 +297,12 @@ but with an additional argument,
.Fa name ,
that is used in generating unique variable names for the related
structures associated with the lock and the sysinit routine.
+The
+.Fn SX_SYSINIT_FLAGS
+macro can similarly be used to initialize a given
+.Fa sx
+lock using
+.Fn sx_init_flags .
.Pp
A thread may not hold both a shared lock and an exclusive lock on the same
lock simultaneously;
Modified: stable/11/sys/kern/kern_rmlock.c
==============================================================================
--- stable/11/sys/kern/kern_rmlock.c Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/sys/kern/kern_rmlock.c Tue Nov 28 01:15:53 2017 (r326305)
@@ -336,17 +336,10 @@ rm_wowned(const struct rmlock *rm)
void
rm_sysinit(void *arg)
{
- struct rm_args *args = arg;
+ struct rm_args *args;
- rm_init(args->ra_rm, args->ra_desc);
-}
-
-void
-rm_sysinit_flags(void *arg)
-{
- struct rm_args_flags *args = arg;
-
- rm_init_flags(args->ra_rm, args->ra_desc, args->ra_opts);
+ args = arg;
+ rm_init_flags(args->ra_rm, args->ra_desc, args->ra_flags);
}
static int
Modified: stable/11/sys/kern/kern_rwlock.c
==============================================================================
--- stable/11/sys/kern/kern_rwlock.c Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/sys/kern/kern_rwlock.c Tue Nov 28 01:15:53 2017 (r326305)
@@ -240,16 +240,9 @@ _rw_destroy(volatile uintptr_t *c)
void
rw_sysinit(void *arg)
{
- struct rw_args *args = arg;
+ struct rw_args *args;
- rw_init((struct rwlock *)args->ra_rw, args->ra_desc);
-}
-
-void
-rw_sysinit_flags(void *arg)
-{
- struct rw_args_flags *args = arg;
-
+ args = arg;
rw_init_flags((struct rwlock *)args->ra_rw, args->ra_desc,
args->ra_flags);
}
Modified: stable/11/sys/sys/rmlock.h
==============================================================================
--- stable/11/sys/sys/rmlock.h Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/sys/sys/rmlock.h Tue Nov 28 01:15:53 2017 (r326305)
@@ -101,35 +101,21 @@ void _rm_assert(const struct rmlock *rm, int what, con
struct rm_args {
struct rmlock *ra_rm;
const char *ra_desc;
+ int ra_flags;
};
-struct rm_args_flags {
- struct rmlock *ra_rm;
- const char *ra_desc;
- int ra_opts;
-};
-
-#define RM_SYSINIT(name, rm, desc) \
+#define RM_SYSINIT_FLAGS(name, rm, desc, flags) \
static struct rm_args name##_args = { \
(rm), \
(desc), \
+ (flags), \
}; \
SYSINIT(name##_rm_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
rm_sysinit, &name##_args); \
SYSUNINIT(name##_rm_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
rm_destroy, (rm))
-
-#define RM_SYSINIT_FLAGS(name, rm, desc, opts) \
- static struct rm_args name##_args = { \
- (rm), \
- (desc), \
- (opts), \
- }; \
- SYSINIT(name##_rm_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
- rm_sysinit_flags, &name##_args); \
- SYSUNINIT(name##_rm_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
- rm_destroy, (rm))
+#define RM_SYSINIT(name, rm, desc) RM_SYSINIT_FLAGS(name, rm, desc, 0)
#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
#define RA_LOCKED LA_LOCKED
Modified: stable/11/sys/sys/rwlock.h
==============================================================================
--- stable/11/sys/sys/rwlock.h Tue Nov 28 01:15:10 2017 (r326304)
+++ stable/11/sys/sys/rwlock.h Tue Nov 28 01:15:53 2017 (r326305)
@@ -220,35 +220,21 @@ void __rw_assert(const volatile uintptr_t *c, int what
struct rw_args {
void *ra_rw;
const char *ra_desc;
-};
-
-struct rw_args_flags {
- void *ra_rw;
- const char *ra_desc;
int ra_flags;
};
-#define RW_SYSINIT(name, rw, desc) \
+#define RW_SYSINIT_FLAGS(name, rw, desc, flags) \
static struct rw_args name##_args = { \
(rw), \
(desc), \
+ (flags), \
}; \
SYSINIT(name##_rw_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
rw_sysinit, &name##_args); \
SYSUNINIT(name##_rw_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
_rw_destroy, __DEVOLATILE(void *, &(rw)->rw_lock))
-
-#define RW_SYSINIT_FLAGS(name, rw, desc, flags) \
- static struct rw_args_flags name##_args = { \
- (rw), \
- (desc), \
- (flags), \
- }; \
- SYSINIT(name##_rw_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
- rw_sysinit_flags, &name##_args); \
- SYSUNINIT(name##_rw_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \
- _rw_destroy, __DEVOLATILE(void *, &(rw)->rw_lock))
+#define RW_SYSINIT(name, rw, desc) RW_SYSINIT_FLAGS(name, rw, desc, 0)
/*
* Options passed to rw_init_flags().
From owner-svn-src-all@freebsd.org Tue Nov 28 01:16:43 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AEDDDEFC28;
Tue, 28 Nov 2017 01:16:43 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 234C06E17C;
Tue, 28 Nov 2017 01:16:43 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS1Gg6x078207;
Tue, 28 Nov 2017 01:16:42 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS1GgDi078204;
Tue, 28 Nov 2017 01:16:42 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711280116.vAS1GgDi078204@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 28 Nov 2017 01:16:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326306 - in stable/11/cddl:
contrib/opensolaris/cmd/dtrace/test/tst/common/pid
usr.sbin/dtrace/tests/tools
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: in stable/11/cddl:
contrib/opensolaris/cmd/dtrace/test/tst/common/pid
usr.sbin/dtrace/tests/tools
X-SVN-Commit-Revision: 326306
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 01:16:43 -0000
Author: markj
Date: Tue Nov 28 01:16:41 2017
New Revision: 326306
URL: https://svnweb.freebsd.org/changeset/base/326306
Log:
MFC r326061, r326063:
DTrace test fixups.
Modified:
stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d
stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d Tue Nov 28 01:15:53 2017 (r326305)
+++ stable/11/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d Tue Nov 28 01:16:41 2017 (r326306)
@@ -33,6 +33,6 @@
*
*/
-pid$1:a.out:main:beginning
+pid$1:a.out::beginning
{
}
Modified: stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
==============================================================================
--- stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Tue Nov 28 01:15:53 2017 (r326305)
+++ stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Tue Nov 28 01:16:41 2017 (r326306)
@@ -183,6 +183,9 @@ exclude EXFAIL common/usdt/tst.badguess.ksh
exclude EXFAIL common/usdt/tst.guess32.ksh
exclude EXFAIL common/usdt/tst.guess64.ksh
+# Depends on non-standard static linker behaviour.
+exclude EXFAIL common/usdt/tst.eliminate.ksh
+
# Generated headers include <sys/sdt.h>, so _DTRACE_VERSION is always defined.
exclude EXFAIL common/usdt/tst.nodtrace.ksh
From owner-svn-src-all@freebsd.org Tue Nov 28 01:35:30 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DE03DF0CC5;
Tue, 28 Nov 2017 01:35:30 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D9D1A6EE9E;
Tue, 28 Nov 2017 01:35:29 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS1ZSW3086385;
Tue, 28 Nov 2017 01:35:28 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS1ZSgA086381;
Tue, 28 Nov 2017 01:35:28 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201711280135.vAS1ZSgA086381@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 28 Nov 2017 01:35:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326307 - head/contrib/libc-vis
X-SVN-Group: head
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: head/contrib/libc-vis
X-SVN-Commit-Revision: 326307
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 01:35:30 -0000
Author: brooks
Date: Tue Nov 28 01:35:28 2017
New Revision: 326307
URL: https://svnweb.freebsd.org/changeset/base/326307
Log:
Update vis(3) the latest from NetBSD.
This adds VIS_DQ for compatiblity with OpenBSD.
Correct by an off-by-one error and a read buffer overflow detected using
asan.
MFC after: 1 day
Modified:
head/contrib/libc-vis/unvis.3
head/contrib/libc-vis/vis.3
head/contrib/libc-vis/vis.c
head/contrib/libc-vis/vis.h
Directory Properties:
head/contrib/libc-vis/ (props changed)
Modified: head/contrib/libc-vis/unvis.3
==============================================================================
--- head/contrib/libc-vis/unvis.3 Tue Nov 28 01:16:41 2017 (r326306)
+++ head/contrib/libc-vis/unvis.3 Tue Nov 28 01:35:28 2017 (r326307)
@@ -1,4 +1,4 @@
-.\" $NetBSD: unvis.3,v 1.27 2012/12/15 07:34:36 wiz Exp $
+.\" $NetBSD: unvis.3,v 1.29 2017/10/24 19:14:55 abhinav Exp $
.\" $FreeBSD$
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -35,7 +35,10 @@
.Os
.Sh NAME
.Nm unvis ,
-.Nm strunvis
+.Nm strunvis ,
+.Nm strnunvis ,
+.Nm strunvisx ,
+.Nm strnunvisx
.Nd decode a visual representation of characters
.Sh LIBRARY
.Lb libc
@@ -184,7 +187,7 @@ char out;
while ((ch = getchar()) != EOF) {
again:
- switch(unvis(\*[Am]out, ch, \*[Am]state, 0)) {
+ switch(unvis(&out, ch, &state, 0)) {
case 0:
case UNVIS_NOCHAR:
break;
@@ -198,7 +201,7 @@ again:
errx(EXIT_FAILURE, "Bad character sequence!");
}
}
-if (unvis(\*[Am]out, '\e0', \*[Am]state, UNVIS_END) == UNVIS_VALID)
+if (unvis(&out, '\e0', &state, UNVIS_END) == UNVIS_VALID)
(void)putchar(out);
.Ed
.Sh ERRORS
Modified: head/contrib/libc-vis/vis.3
==============================================================================
--- head/contrib/libc-vis/vis.3 Tue Nov 28 01:16:41 2017 (r326306)
+++ head/contrib/libc-vis/vis.3 Tue Nov 28 01:35:28 2017 (r326307)
@@ -1,4 +1,4 @@
-.\" $NetBSD: vis.3,v 1.45 2016/06/08 15:00:04 wiz Exp $
+.\" $NetBSD: vis.3,v 1.49 2017/08/05 20:22:29 wiz Exp $
.\" $FreeBSD$
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)vis.3 8.1 (Berkeley) 6/9/93
.\"
-.Dd January 14, 2015
+.Dd April 22, 2017
.Dt VIS 3
.Os
.Sh NAME
@@ -243,6 +243,8 @@ except space, tab, and newline are encoded (see
The following flags
alter this:
.Bl -tag -width VIS_WHITEX
+.It Dv VIS_DQ
+Also encode double quotes
.It Dv VIS_GLOB
Also encode the magic characters
.Ql ( * ,
@@ -310,7 +312,7 @@ warning on the use of the
.Dv VIS_NOSLASH
flag below).
.Pp
-There are four forms of encoding.
+There are six forms of encoding.
All forms use the backslash character
.Ql \e
to introduce a special
@@ -401,6 +403,9 @@ If
.Fa nextc
is an octal digit, the latter representation is used to
avoid ambiguity.
+.Pp
+Non-printable characters without C-style
+backslash sequences use the default representation.
.It Dv VIS_OCTAL
Use a three digit octal sequence.
The form is
@@ -408,6 +413,11 @@ The form is
where
.Em d
represents an octal digit.
+.It Dv VIS_CSTYLE \&| Dv VIS_OCTAL
+Same as
+.Dv VIS_CSTYLE
+except that non-printable characters without C-style
+backslash sequences use a three digit octal sequence.
.It Dv VIS_HTTPSTYLE
Use URI encoding as described in RFC 1738.
The form is
Modified: head/contrib/libc-vis/vis.c
==============================================================================
--- head/contrib/libc-vis/vis.c Tue Nov 28 01:16:41 2017 (r326306)
+++ head/contrib/libc-vis/vis.c Tue Nov 28 01:35:28 2017 (r326307)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $ */
+/* $NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef __FBSDID
__FBSDID("$FreeBSD$");
@@ -379,6 +379,7 @@ makeextralist(int flags, const char *src)
if (flags & VIS_SP) *d++ = L' ';
if (flags & VIS_TAB) *d++ = L'\t';
if (flags & VIS_NL) *d++ = L'\n';
+ if (flags & VIS_DQ) *d++ = L'"';
if ((flags & VIS_NOSLASH) == 0) *d++ = L'\\';
*d = L'\0';
@@ -408,7 +409,15 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
_DIAGASSERT(mbsrc != NULL || mblength == 0);
_DIAGASSERT(mbextra != NULL);
+ mbslength = (ssize_t)mblength;
/*
+ * When inputing a single character, must also read in the
+ * next character for nextc, the look-ahead character.
+ */
+ if (mbslength == 1)
+ mbslength++;
+
+ /*
* Input (mbsrc) is a char string considered to be multibyte
* characters. The input loop will read this string pulling
* one character, possibly multiple bytes, from mbsrc and
@@ -424,12 +433,12 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
/* Allocate space for the wide char strings */
psrc = pdst = extra = NULL;
mdst = NULL;
- if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
+ if ((psrc = calloc(mbslength + 1, sizeof(*psrc))) == NULL)
return -1;
- if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
+ if ((pdst = calloc((16 * mbslength) + 1, sizeof(*pdst))) == NULL)
goto out;
if (*mbdstp == NULL) {
- if ((mdst = calloc((4 * mblength) + 1, sizeof(*mdst))) == NULL)
+ if ((mdst = calloc((16 * mbslength) + 1, sizeof(*mdst))) == NULL)
goto out;
*mbdstp = mdst;
}
@@ -452,13 +461,6 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
* stop at NULs because we may be processing a block of data
* that includes NULs.
*/
- mbslength = (ssize_t)mblength;
- /*
- * When inputing a single character, must also read in the
- * next character for nextc, the look-ahead character.
- */
- if (mbslength == 1)
- mbslength++;
bzero(&mbstate, sizeof(mbstate));
while (mbslength > 0) {
/* Convert one multibyte character to wchar_t. */
@@ -470,12 +472,13 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
clen = 1;
cerr = 1;
}
- if (clen == 0)
+ if (clen == 0) {
/*
* NUL in input gives 0 return value. process
* as single NUL byte and keep going.
*/
clen = 1;
+ }
/* Advance buffer character pointer. */
src++;
/* Advance input pointer by number of bytes read. */
@@ -485,6 +488,7 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
}
len = src - psrc;
src = psrc;
+
/*
* In the single character input case, we will have actually
* processed two characters, c and nextc. Reset len back to
Modified: head/contrib/libc-vis/vis.h
==============================================================================
--- head/contrib/libc-vis/vis.h Tue Nov 28 01:16:41 2017 (r326306)
+++ head/contrib/libc-vis/vis.h Tue Nov 28 01:35:28 2017 (r326307)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.h,v 1.24 2016/01/14 20:42:14 christos Exp $ */
+/* $NetBSD: vis.h,v 1.25 2017/04/23 01:57:36 christos Exp $ */
/* $FreeBSD$ */
/*-
@@ -52,6 +52,7 @@
#define VIS_NL 0x0010 /* also encode newline */
#define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL)
#define VIS_SAFE 0x0020 /* only encode "unsafe" characters */
+#define VIS_DQ 0x8000 /* also encode double quotes */
/*
* other
From owner-svn-src-all@freebsd.org Tue Nov 28 05:39:49 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7CAADF9E7A;
Tue, 28 Nov 2017 05:39:49 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B1CBF76D21;
Tue, 28 Nov 2017 05:39:49 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS5dm0L087508;
Tue, 28 Nov 2017 05:39:48 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS5dm2a087507;
Tue, 28 Nov 2017 05:39:48 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201711280539.vAS5dm2a087507@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 28 Nov 2017 05:39:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326308 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 326308
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 05:39:50 -0000
Author: nwhitehorn
Date: Tue Nov 28 05:39:48 2017
New Revision: 326308
URL: https://svnweb.freebsd.org/changeset/base/326308
Log:
Remove assertion that a CPU be present before returning a PCPU for it. It
is up to the caller to check for a NULL return value. The assert was meant
to catch buggy code that did not check the return value. Some code, however,
was smart and used the return value to see if a CPU existed, which this
broke.
Requested by: jhb@
Modified:
head/sys/kern/subr_pcpu.c
Modified: head/sys/kern/subr_pcpu.c
==============================================================================
--- head/sys/kern/subr_pcpu.c Tue Nov 28 01:35:28 2017 (r326307)
+++ head/sys/kern/subr_pcpu.c Tue Nov 28 05:39:48 2017 (r326308)
@@ -279,8 +279,6 @@ pcpu_destroy(struct pcpu *pcpu)
struct pcpu *
pcpu_find(u_int cpuid)
{
- KASSERT(cpuid_to_pcpu[cpuid] != NULL,
- ("Getting uninitialized PCPU %d", cpuid));
return (cpuid_to_pcpu[cpuid]);
}
From owner-svn-src-all@freebsd.org Tue Nov 28 06:21:38 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85DD7DFB14E;
Tue, 28 Nov 2017 06:21:38 +0000 (UTC)
(envelope-from bryanv@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4D096780CC;
Tue, 28 Nov 2017 06:21:38 +0000 (UTC)
(envelope-from bryanv@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS6Lbhp004821;
Tue, 28 Nov 2017 06:21:37 GMT (envelope-from bryanv@FreeBSD.org)
Received: (from bryanv@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS6LbrP004820;
Tue, 28 Nov 2017 06:21:37 GMT (envelope-from bryanv@FreeBSD.org)
Message-Id: <201711280621.vAS6LbrP004820@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bryanv set sender to
bryanv@FreeBSD.org using -f
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Tue, 28 Nov 2017 06:21:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326309 - head/sys/dev/vmware/vmxnet3
X-SVN-Group: head
X-SVN-Commit-Author: bryanv
X-SVN-Commit-Paths: head/sys/dev/vmware/vmxnet3
X-SVN-Commit-Revision: 326309
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 06:21:38 -0000
Author: bryanv
Date: Tue Nov 28 06:21:37 2017
New Revision: 326309
URL: https://svnweb.freebsd.org/changeset/base/326309
Log:
Correctly report the vmxnet3 link down media status
Reported by: lew@perftech.com
MFC after: 1 week
Modified:
head/sys/dev/vmware/vmxnet3/if_vmx.c
Modified: head/sys/dev/vmware/vmxnet3/if_vmx.c
==============================================================================
--- head/sys/dev/vmware/vmxnet3/if_vmx.c Tue Nov 28 05:39:48 2017 (r326308)
+++ head/sys/dev/vmware/vmxnet3/if_vmx.c Tue Nov 28 06:21:37 2017 (r326309)
@@ -3485,14 +3485,15 @@ vmxnet3_media_status(struct ifnet *ifp, struct ifmedia
sc = ifp->if_softc;
- ifmr->ifm_active = IFM_ETHER | IFM_AUTO;
ifmr->ifm_status = IFM_AVALID;
+ ifmr->ifm_active = IFM_ETHER;
VMXNET3_CORE_LOCK(sc);
- if (vmxnet3_link_is_up(sc) != 0)
+ if (vmxnet3_link_is_up(sc) != 0) {
ifmr->ifm_status |= IFM_ACTIVE;
- else
- ifmr->ifm_status |= IFM_NONE;
+ ifmr->ifm_active |= IFM_AUTO;
+ } else
+ ifmr->ifm_active |= IFM_NONE;
VMXNET3_CORE_UNLOCK(sc);
}
From owner-svn-src-all@freebsd.org Tue Nov 28 06:31:40 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7766BDFB6A3;
Tue, 28 Nov 2017 06:31:40 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4222C78813;
Tue, 28 Nov 2017 06:31:40 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS6Vdat012328;
Tue, 28 Nov 2017 06:31:39 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS6VdkV012326;
Tue, 28 Nov 2017 06:31:39 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201711280631.vAS6VdkV012326@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 28 Nov 2017 06:31:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326310 - in head/sys: dev/ofw powerpc/ofw
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: in head/sys: dev/ofw powerpc/ofw
X-SVN-Commit-Revision: 326310
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 06:31:40 -0000
Author: nwhitehorn
Date: Tue Nov 28 06:31:39 2017
New Revision: 326310
URL: https://svnweb.freebsd.org/changeset/base/326310
Log:
Back out OF module installation in the event of failure. PS3 firmware gives
some ancient FDT version (2) that fails the init check in OFW_FDT. It is
still possible to make progress, but not while the OF layer is going crazy.
Modified:
head/sys/dev/ofw/openfirm.c
head/sys/powerpc/ofw/ofw_machdep.c
Modified: head/sys/dev/ofw/openfirm.c
==============================================================================
--- head/sys/dev/ofw/openfirm.c Tue Nov 28 06:21:37 2017 (r326309)
+++ head/sys/dev/ofw/openfirm.c Tue Nov 28 06:31:39 2017 (r326310)
@@ -201,6 +201,12 @@ OF_install(char *name, int prio)
ofw_def_t *ofwp, **ofwpp;
static int curr_prio = 0;
+ /* Allow OF layer to be uninstalled */
+ if (name == NULL) {
+ ofw_def_impl = NULL;
+ return (FALSE);
+ }
+
/*
* Try and locate the OFW kobj corresponding to the name.
*/
Modified: head/sys/powerpc/ofw/ofw_machdep.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_machdep.c Tue Nov 28 06:21:37 2017 (r326309)
+++ head/sys/powerpc/ofw/ofw_machdep.c Tue Nov 28 06:31:39 2017 (r326310)
@@ -393,6 +393,7 @@ boolean_t
OF_bootstrap()
{
boolean_t status = FALSE;
+ int err = 0;
#ifdef AIM
if (openfirmware_entry != NULL) {
@@ -409,7 +410,7 @@ OF_bootstrap()
if (status != TRUE)
return status;
- OF_init(openfirmware);
+ err = OF_init(openfirmware);
} else
#endif
if (fdt != NULL) {
@@ -418,9 +419,15 @@ OF_bootstrap()
if (status != TRUE)
return status;
- OF_init(fdt);
- OF_interpret("perform-fixup", 0);
+ err = OF_init(fdt);
+ if (err == 0)
+ OF_interpret("perform-fixup", 0);
}
+
+ if (err != 0) {
+ OF_install(NULL, 0);
+ status = FALSE;
+ }
return (status);
}
From owner-svn-src-all@freebsd.org Tue Nov 28 09:34:44 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F972DFF294;
Tue, 28 Nov 2017 09:34:44 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 754927D6F6;
Tue, 28 Nov 2017 09:34:44 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAS9YhAK087185;
Tue, 28 Nov 2017 09:34:43 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAS9YhY0087183;
Tue, 28 Nov 2017 09:34:43 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201711280934.vAS9YhY0087183@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 28 Nov 2017 09:34:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326311 - in head/sys: amd64/amd64 arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: in head/sys: amd64/amd64 arm64/arm64
X-SVN-Commit-Revision: 326311
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 09:34:44 -0000
Author: kib
Date: Tue Nov 28 09:34:43 2017
New Revision: 326311
URL: https://svnweb.freebsd.org/changeset/base/326311
Log:
Fix index calculation for the page table pages for efirt 1:1 map.
Stop issuing pre-assigned number to enumerate all page table pages,
the assignment is incorrect. Instead automatically calculate the next
unused index. This index in fact does not serve any purpose except to
be unique to satisfy vm_page_grab() interface, we do not look up the
page by the index later.
Reported and tested by: emaste
Reviewed by: andrew
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
PR: 223906
Differential revision: https://reviews.freebsd.org/D13273
Modified:
head/sys/amd64/amd64/efirt_machdep.c
head/sys/arm64/arm64/efirt_machdep.c
Modified: head/sys/amd64/amd64/efirt_machdep.c
==============================================================================
--- head/sys/amd64/amd64/efirt_machdep.c Tue Nov 28 06:31:39 2017 (r326310)
+++ head/sys/amd64/amd64/efirt_machdep.c Tue Nov 28 09:34:43 2017 (r326311)
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
static pml4_entry_t *efi_pml4;
static vm_object_t obj_1t1_pt;
static vm_page_t efi_pml4_page;
+static vm_pindex_t efi_1t1_idx;
void
efi_destroy_1t1_map(void)
@@ -85,10 +86,10 @@ efi_destroy_1t1_map(void)
}
static vm_page_t
-efi_1t1_page(vm_pindex_t idx)
+efi_1t1_page(void)
{
- return (vm_page_grab(obj_1t1_pt, idx, VM_ALLOC_NOBUSY |
+ return (vm_page_grab(obj_1t1_pt, efi_1t1_idx++, VM_ALLOC_NOBUSY |
VM_ALLOC_WIRED | VM_ALLOC_ZERO));
}
@@ -106,7 +107,7 @@ efi_1t1_pte(vm_offset_t va)
pml4_idx = pmap_pml4e_index(va);
pml4e = &efi_pml4[pml4_idx];
if (*pml4e == 0) {
- m = efi_1t1_page(1 + pml4_idx);
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*pml4e = mphys | X86_PG_RW | X86_PG_V;
} else {
@@ -117,7 +118,7 @@ efi_1t1_pte(vm_offset_t va)
pdp_idx = pmap_pdpe_index(va);
pdpe += pdp_idx;
if (*pdpe == 0) {
- m = efi_1t1_page(1 + NPML4EPG + (pml4_idx + 1) * (pdp_idx + 1));
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*pdpe = mphys | X86_PG_RW | X86_PG_V;
} else {
@@ -128,8 +129,7 @@ efi_1t1_pte(vm_offset_t va)
pd_idx = pmap_pde_index(va);
pde += pd_idx;
if (*pde == 0) {
- m = efi_1t1_page(1 + NPML4EPG + NPML4EPG * NPDPEPG +
- (pml4_idx + 1) * (pdp_idx + 1) * (pd_idx + 1));
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*pde = mphys | X86_PG_RW | X86_PG_V;
} else {
@@ -155,8 +155,9 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int
obj_1t1_pt = vm_pager_allocate(OBJT_PHYS, NULL, ptoa(1 +
NPML4EPG + NPML4EPG * NPDPEPG + NPML4EPG * NPDPEPG * NPDEPG),
VM_PROT_ALL, 0, NULL);
+ efi_1t1_idx = 0;
VM_OBJECT_WLOCK(obj_1t1_pt);
- efi_pml4_page = efi_1t1_page(0);
+ efi_pml4_page = efi_1t1_page();
VM_OBJECT_WUNLOCK(obj_1t1_pt);
efi_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(efi_pml4_page));
pmap_pinit_pml4(efi_pml4_page);
Modified: head/sys/arm64/arm64/efirt_machdep.c
==============================================================================
--- head/sys/arm64/arm64/efirt_machdep.c Tue Nov 28 06:31:39 2017 (r326310)
+++ head/sys/arm64/arm64/efirt_machdep.c Tue Nov 28 09:34:43 2017 (r326311)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
static vm_object_t obj_1t1_pt;
static vm_page_t efi_l0_page;
static pd_entry_t *efi_l0;
+static vm_pindex_t efi_1t1_idx;
void
efi_destroy_1t1_map(void)
@@ -86,10 +87,10 @@ efi_destroy_1t1_map(void)
}
static vm_page_t
-efi_1t1_page(vm_pindex_t idx)
+efi_1t1_page(void)
{
- return (vm_page_grab(obj_1t1_pt, idx, VM_ALLOC_NOBUSY |
+ return (vm_page_grab(obj_1t1_pt, efi_1t1_idx++, VM_ALLOC_NOBUSY |
VM_ALLOC_WIRED | VM_ALLOC_ZERO));
}
@@ -105,7 +106,7 @@ efi_1t1_l3(vm_offset_t va)
l0_idx = pmap_l0_index(va);
l0 = &efi_l0[l0_idx];
if (*l0 == 0) {
- m = efi_1t1_page(1 + l0_idx);
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*l0 = mphys | L0_TABLE;
} else {
@@ -116,7 +117,7 @@ efi_1t1_l3(vm_offset_t va)
l1_idx = pmap_l1_index(va);
l1 += l1_idx;
if (*l1 == 0) {
- m = efi_1t1_page(1 + L0_ENTRIES + (l0_idx + 1) * (l1_idx + 1));
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*l1 = mphys | L1_TABLE;
} else {
@@ -127,8 +128,7 @@ efi_1t1_l3(vm_offset_t va)
l2_idx = pmap_l2_index(va);
l2 += l2_idx;
if (*l2 == 0) {
- m = efi_1t1_page(1 + L0_ENTRIES + L0_ENTRIES * Ln_ENTRIES +
- (l0_idx + 1) * (l1_idx + 1) * (l2_idx + 1));
+ m = efi_1t1_page();
mphys = VM_PAGE_TO_PHYS(m);
*l2 = mphys | L2_TABLE;
} else {
@@ -160,7 +160,8 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int
L0_ENTRIES * Ln_ENTRIES * Ln_ENTRIES * Ln_ENTRIES,
VM_PROT_ALL, 0, NULL);
VM_OBJECT_WLOCK(obj_1t1_pt);
- efi_l0_page = efi_1t1_page(0);
+ efi_1t1_idx = 0;
+ efi_l0_page = efi_1t1_page();
VM_OBJECT_WUNLOCK(obj_1t1_pt);
efi_l0 = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(efi_l0_page));
bzero(efi_l0, L0_ENTRIES * sizeof(*efi_l0));
From owner-svn-src-all@freebsd.org Tue Nov 28 11:04:48 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB6B2E5245C;
Tue, 28 Nov 2017 11:04:48 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A86C080421;
Tue, 28 Nov 2017 11:04:48 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASB4lQp024914;
Tue, 28 Nov 2017 11:04:47 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASB4lTu024913;
Tue, 28 Nov 2017 11:04:47 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201711281104.vASB4lTu024913@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 28 Nov 2017 11:04:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326312 - head/sys/arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: head/sys/arm64/arm64
X-SVN-Commit-Revision: 326312
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 11:04:49 -0000
Author: andrew
Date: Tue Nov 28 11:04:47 2017
New Revision: 326312
URL: https://svnweb.freebsd.org/changeset/base/326312
Log:
When we exit the kernel debugger having entered because of a breakpoint
instruction we need to jump over the instruction. Without this we will
execute the same instruction again and enter into the debugger again.
PR: 223917
Reported by: emaste
MFC after: 1 week
Sponsored by: DARPA, AFRL
Modified:
head/sys/arm64/arm64/trap.c
Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c Tue Nov 28 09:34:43 2017 (r326311)
+++ head/sys/arm64/arm64/trap.c Tue Nov 28 11:04:47 2017 (r326312)
@@ -323,7 +323,10 @@ do_el1h_sync(struct thread *td, struct trapframe *fram
break;
}
#endif
- /* FALLTHROUGH */
+ kdb_trap(exception, 0,
+ (td->td_frame != NULL) ? td->td_frame : frame);
+ frame->tf_elr -= 4;
+ break;
case EXCP_WATCHPT_EL1:
case EXCP_SOFTSTP_EL1:
#ifdef KDB
From owner-svn-src-all@freebsd.org Tue Nov 28 11:06:19 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A6E1E5265C;
Tue, 28 Nov 2017 11:06:19 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 35DFE806A9;
Tue, 28 Nov 2017 11:06:19 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASB6I1t025049;
Tue, 28 Nov 2017 11:06:18 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASB6I5F025046;
Tue, 28 Nov 2017 11:06:18 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201711281106.vASB6I5F025046@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 28 Nov 2017 11:06:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326313 - in stable/11/sys: arm/arm arm64/arm64
arm64/include
X-SVN-Group: stable-11
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: in stable/11/sys: arm/arm arm64/arm64 arm64/include
X-SVN-Commit-Revision: 326313
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 11:06:19 -0000
Author: andrew
Date: Tue Nov 28 11:06:17 2017
New Revision: 326313
URL: https://svnweb.freebsd.org/changeset/base/326313
Log:
MFC r326137:
Ensure we check the program state set in the trap frame on arm and arm64.
This value may be set by userspace so we need to check it before using it.
If this is not done correctly on exception return the kernel may continue
in kernel mode with all registers set to a userspace controlled value. Fix
this by moving the check into set_mcontext, and also add the missing
sanitisation from the arm64 set_regs.
Discussed with: security-officer@
Sponsored by: DARPA, AFRL
Modified:
stable/11/sys/arm/arm/machdep.c
stable/11/sys/arm64/arm64/machdep.c
stable/11/sys/arm64/include/armreg.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/machdep.c
==============================================================================
--- stable/11/sys/arm/arm/machdep.c Tue Nov 28 11:04:47 2017 (r326312)
+++ stable/11/sys/arm/arm/machdep.c Tue Nov 28 11:06:17 2017 (r326313)
@@ -507,7 +507,17 @@ set_mcontext(struct thread *td, mcontext_t *mcp)
mcontext_vfp_t mc_vfp, *vfp;
struct trapframe *tf = td->td_frame;
const __greg_t *gr = mcp->__gregs;
+ int spsr;
+ /*
+ * Make sure the processor mode has not been tampered with and
+ * interrupts have not been disabled.
+ */
+ spsr = gr[_REG_CPSR];
+ if ((spsr & PSR_MODE) != PSR_USR32_MODE ||
+ (spsr & (PSR_I | PSR_F)) != 0)
+ return (EINVAL);
+
#ifdef WITNESS
if (mcp->mc_vfp_size != 0 && mcp->mc_vfp_size != sizeof(mc_vfp)) {
printf("%s: %s: Malformed mc_vfp_size: %d (0x%08X)\n",
@@ -666,22 +676,16 @@ sys_sigreturn(td, uap)
} */ *uap;
{
ucontext_t uc;
- int spsr;
+ int error;
if (uap == NULL)
return (EFAULT);
if (copyin(uap->sigcntxp, &uc, sizeof(uc)))
return (EFAULT);
- /*
- * Make sure the processor mode has not been tampered with and
- * interrupts have not been disabled.
- */
- spsr = uc.uc_mcontext.__gregs[_REG_CPSR];
- if ((spsr & PSR_MODE) != PSR_USR32_MODE ||
- (spsr & (PSR_I | PSR_F)) != 0)
- return (EINVAL);
/* Restore register context. */
- set_mcontext(td, &uc.uc_mcontext);
+ error = set_mcontext(td, &uc.uc_mcontext);
+ if (error != 0)
+ return (error);
/* Restore signal mask. */
kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
Modified: stable/11/sys/arm64/arm64/machdep.c
==============================================================================
--- stable/11/sys/arm64/arm64/machdep.c Tue Nov 28 11:04:47 2017 (r326312)
+++ stable/11/sys/arm64/arm64/machdep.c Tue Nov 28 11:06:17 2017 (r326313)
@@ -194,7 +194,8 @@ set_regs(struct thread *td, struct reg *regs)
frame->tf_sp = regs->sp;
frame->tf_lr = regs->lr;
frame->tf_elr = regs->elr;
- frame->tf_spsr = regs->spsr;
+ frame->tf_spsr &= ~PSR_FLAGS;
+ frame->tf_spsr |= regs->spsr & PSR_FLAGS;
memcpy(frame->tf_x, regs->x, sizeof(frame->tf_x));
@@ -332,7 +333,13 @@ int
set_mcontext(struct thread *td, mcontext_t *mcp)
{
struct trapframe *tf = td->td_frame;
+ uint32_t spsr;
+ spsr = mcp->mc_gpregs.gp_spsr;
+ if ((spsr & PSR_M_MASK) != PSR_M_EL0t ||
+ (spsr & (PSR_F | PSR_I | PSR_A | PSR_D)) != 0)
+ return (EINVAL);
+
memcpy(tf->tf_x, mcp->mc_gpregs.gp_x, sizeof(tf->tf_x));
tf->tf_sp = mcp->mc_gpregs.gp_sp;
@@ -502,19 +509,16 @@ int
sys_sigreturn(struct thread *td, struct sigreturn_args *uap)
{
ucontext_t uc;
- uint32_t spsr;
+ int error;
if (uap == NULL)
return (EFAULT);
if (copyin(uap->sigcntxp, &uc, sizeof(uc)))
return (EFAULT);
- spsr = uc.uc_mcontext.mc_gpregs.gp_spsr;
- if ((spsr & PSR_M_MASK) != PSR_M_EL0t ||
- (spsr & (PSR_F | PSR_I | PSR_A | PSR_D)) != 0)
- return (EINVAL);
-
- set_mcontext(td, &uc.uc_mcontext);
+ error = set_mcontext(td, &uc.uc_mcontext);
+ if (error != 0)
+ return (error);
set_fpcontext(td, &uc.uc_mcontext);
/* Restore signal mask. */
Modified: stable/11/sys/arm64/include/armreg.h
==============================================================================
--- stable/11/sys/arm64/include/armreg.h Tue Nov 28 11:04:47 2017 (r326312)
+++ stable/11/sys/arm64/include/armreg.h Tue Nov 28 11:06:17 2017 (r326313)
@@ -439,6 +439,7 @@
#define PSR_C 0x20000000
#define PSR_Z 0x40000000
#define PSR_N 0x80000000
+#define PSR_FLAGS 0xf0000000
/* TCR_EL1 - Translation Control Register */
#define TCR_ASID_16 (1 << 36)
From owner-svn-src-all@freebsd.org Tue Nov 28 12:53:56 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAABBE55B6B;
Tue, 28 Nov 2017 12:53:56 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 977C163A46;
Tue, 28 Nov 2017 12:53:56 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASCrtn2071491;
Tue, 28 Nov 2017 12:53:55 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASCrtlB071488;
Tue, 28 Nov 2017 12:53:55 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201711281253.vASCrtlB071488@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 28 Nov 2017 12:53:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326314 - in head/sys: ddb kern sys
X-SVN-Group: head
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: in head/sys: ddb kern sys
X-SVN-Commit-Revision: 326314
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 12:53:56 -0000
Author: trasz
Date: Tue Nov 28 12:53:55 2017
New Revision: 326314
URL: https://svnweb.freebsd.org/changeset/base/326314
Log:
Make kdb_reenter() silent when explicitly called from db_error().
This removes the useless backtrace on various ddb(4) user errors.
Reviewed by: jhb@
Obtained from: CheriBSD
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D13212
Modified:
head/sys/ddb/db_command.c
head/sys/kern/subr_kdb.c
head/sys/sys/kdb.h
Modified: head/sys/ddb/db_command.c
==============================================================================
--- head/sys/ddb/db_command.c Tue Nov 28 11:06:17 2017 (r326313)
+++ head/sys/ddb/db_command.c Tue Nov 28 12:53:55 2017 (r326314)
@@ -556,7 +556,7 @@ db_error(const char *s)
if (s)
db_printf("%s", s);
db_flush_lex();
- kdb_reenter();
+ kdb_reenter_silent();
}
static void
Modified: head/sys/kern/subr_kdb.c
==============================================================================
--- head/sys/kern/subr_kdb.c Tue Nov 28 11:06:17 2017 (r326313)
+++ head/sys/kern/subr_kdb.c Tue Nov 28 12:53:55 2017 (r326314)
@@ -509,6 +509,17 @@ kdb_reenter(void)
/* NOTREACHED */
}
+void
+kdb_reenter_silent(void)
+{
+
+ if (!kdb_active || kdb_jmpbufp == NULL)
+ return;
+
+ longjmp(kdb_jmpbufp, 1);
+ /* NOTREACHED */
+}
+
/*
* Thread related support functions.
*/
Modified: head/sys/sys/kdb.h
==============================================================================
--- head/sys/sys/kdb.h Tue Nov 28 11:06:17 2017 (r326313)
+++ head/sys/sys/kdb.h Tue Nov 28 12:53:55 2017 (r326314)
@@ -80,6 +80,7 @@ void * kdb_jmpbuf(jmp_buf);
void kdb_panic(const char *);
void kdb_reboot(void);
void kdb_reenter(void);
+void kdb_reenter_silent(void);
struct pcb *kdb_thr_ctx(struct thread *);
struct thread *kdb_thr_first(void);
struct thread *kdb_thr_from_pid(pid_t);
From owner-svn-src-all@freebsd.org Tue Nov 28 15:27:21 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44FF5DB9890;
Tue, 28 Nov 2017 15:27:21 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: from mail-it0-x22b.google.com (mail-it0-x22b.google.com
[IPv6:2607:f8b0:4001:c0b::22b])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 7F94368C77;
Tue, 28 Nov 2017 15:27:16 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: by mail-it0-x22b.google.com with SMTP id r6so119974itr.3;
Tue, 28 Nov 2017 07:27:16 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc;
bh=4MFD7YqzqUwG9H07YP9PbyO+a/jgfw0rKGs0LOr5FF8=;
b=EYRDQzh6nnxfTPRVFj3xVWwI9xORBgaMg+zrgXHGnF5/FKAZqt2CfAmyA1qm1WBF/+
FqRn4+hGU0gIpXzYJX790BSiUmU6iNb6BlsgKF+kjq/bIV1mKEGogqTxgxXur+J8m2ae
JuQ5Kck0UiIX/oZQxsqAEjip/X0XsurbFdh69dX84Tx0OdKpkYyzx/iMtD+oApDfPmX5
FS2QcGcDk264c4xKZSLRzxkmgd5TZ/gdRrRL9OEMC1KRExstfI4S2Ki3F6+xh5T5iXfa
KjErD2R0qlECVxbp1Egq846Vy/P7F23UJLjlliCLiuoEf6h1cv3Tx/FF9yK3CJdD/zB9
FmZw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
:date:message-id:subject:to:cc;
bh=4MFD7YqzqUwG9H07YP9PbyO+a/jgfw0rKGs0LOr5FF8=;
b=t4Zk8cz+LoD0GeLxrZqX5t3bq+Xui2gMYjU2WL5jA9pV3sbEnPYu6DJ07raMgaEbJ0
QnyXA+cYFdy2Bh55BOJ8FpnEQo9OtOlYRQZc2lmhpWbsO9aCBHiSzf0l+0EaNU6chUlC
CT5Vsg29SWzDT1dZsATHCLJLIaca/Y7cy5mdrIiz9POVz5zT//a8fqwQo03YETfiILSG
fgrgz9AsctwpU+7Li8jQtNMOGovtNYL9YfrPQLAv3w5EPRMUw/tzP6LrDJJIa46P4X91
a9MS7KhmGWb7NJm4f7wH3vdCN4H72M4CkuX0vrnUnxuavu/dzTdjTGop/Zmuv1kw4FK7
ZsGg==
X-Gm-Message-State: AJaThX4ZwE962HPd2aEjBtFVlbOgRxhswhPfqe1lZny6Ef+plAs9DWkU
xrR+ehf5HfECIK0bG5i2BIZNcDoE70s5hDcOp2A=
X-Google-Smtp-Source: AGs4zMYNzCugFmlDrfawG9i0sdcOtVELYCinIMv9omyNnPAlwrQ0QxlhcP3CFvsJxCz/DzZ80UI8QD4UNP3BVmjwDSk=
X-Received: by 10.36.67.141 with SMTP id s135mr3028694itb.142.1511882835577;
Tue, 28 Nov 2017 07:27:15 -0800 (PST)
MIME-Version: 1.0
Sender: chmeeedalf@gmail.com
Received: by 10.79.78.207 with HTTP; Tue, 28 Nov 2017 07:27:14 -0800 (PST)
In-Reply-To: <201711252145.vAPLjpV6051703@repo.freebsd.org>
References: <201711252145.vAPLjpV6051703@repo.freebsd.org>
From: Justin Hibbits <jrh29@alumni.cwru.edu>
Date: Tue, 28 Nov 2017 09:27:14 -0600
X-Google-Sender-Auth: iYUzt87C5BtZQ8iUT-p4MVLGWE0
Message-ID: <CAHSQbTA7c9VpZpYcB1+uW62yW+FoscnV8K9AL9txMKO43wcQpg@mail.gmail.com>
Subject: Re: svn commit: r326203 - head/sys/conf
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 15:27:21 -0000
On Sat, Nov 25, 2017 at 3:45 PM, Nathan Whitehorn
<nwhitehorn@freebsd.org> wrote:
> Author: nwhitehorn
> Date: Sat Nov 25 21:45:51 2017
> New Revision: 326203
> URL: https://svnweb.freebsd.org/changeset/base/326203
>
> Log:
> Avoid emitting a PT_INTERP section for powerpc64 kernels and arrange for
> the first instruction to be at the start of the text segment. This allows
> the kernel to be booted correctly by stock kexec-lite.
>
> MFC after: 2 weeks
>
> Modified:
> head/sys/conf/ldscript.powerpc64
>
> Modified: head/sys/conf/ldscript.powerpc64
> ==============================================================================
> --- head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:44:23 2017 (r326202)
> +++ head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:45:51 2017 (r326203)
> @@ -10,7 +10,7 @@ SECTIONS
> {
> /* Read-only sections, merged into text segment: */
>
> - . = kernbase + SIZEOF_HEADERS;
> + . = kernbase;
> PROVIDE (begin = . - SIZEOF_HEADERS);
>
> .text :
> @@ -24,7 +24,10 @@ SECTIONS
> _etext = .;
> PROVIDE (etext = .);
>
> - .interp : { *(.interp) }
> + /* Do not emit PT_INTERP section, which confuses some loaders (kexec-lite) */
> + .interpX : { *(.interp) } : NONE
> + /DISCARD/ : { *(.interp) }
> +
> .hash : { *(.hash) }
> .dynsym : { *(.dynsym) }
> .dynstr : { *(.dynstr) }
>
This broke powerpc64 Book-E kernels. It now puts a 1MB blank space
ahead of the kernel data (ELF header + 1MB - sizeof(header) of 0's),
meaning that now the kernel needs to be loaded by uboot 1MB earlier in
memory, rather than straight on the 64MB boundary as it has been.
- Justin
From owner-svn-src-all@freebsd.org Tue Nov 28 16:00:28 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD795DBAB48;
Tue, 28 Nov 2017 16:00:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 787176A5DE;
Tue, 28 Nov 2017 16:00:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASG0Rbs047860;
Tue, 28 Nov 2017 16:00:27 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASG0RjE047859;
Tue, 28 Nov 2017 16:00:27 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711281600.vASG0RjE047859@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:00:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326315 - head/release
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/release
X-SVN-Commit-Revision: 326315
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:00:28 -0000
Author: gjb
Date: Tue Nov 28 16:00:27 2017
New Revision: 326315
URL: https://svnweb.freebsd.org/changeset/base/326315
Log:
Set DISTDIR and WRKDIRPREFIX when building ports within the
chroot(8) to avoid mtime changes within the ports checkout,
which can cause checksum differences.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.sh
Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh Tue Nov 28 12:53:55 2017 (r326314)
+++ head/release/release.sh Tue Nov 28 16:00:27 2017 (r326315)
@@ -280,6 +280,8 @@ extra_chroot_setup() {
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
+ PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
FORCE_PKG_REGISTER=1 \
From owner-svn-src-all@freebsd.org Tue Nov 28 16:09:03 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4F34DBAFCD;
Tue, 28 Nov 2017 16:09:03 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 826436AE1C;
Tue, 28 Nov 2017 16:09:03 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASG92Vh052429;
Tue, 28 Nov 2017 16:09:02 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASG92pd052427;
Tue, 28 Nov 2017 16:09:02 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281609.vASG92pd052427@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:09:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326316 - in stable/11/sys/dev: pccbb pci
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in stable/11/sys/dev: pccbb pci
X-SVN-Commit-Revision: 326316
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:09:03 -0000
Author: asomers
Date: Tue Nov 28 16:09:02 2017
New Revision: 326316
URL: https://svnweb.freebsd.org/changeset/base/326316
Log:
MFC r324457:
Remove embedded newlines from sysctl variable descriptions
PR: 112556
Submitted by: Willem Jan Withagen <wjw@digiware.nl> (earlier version)
Reported by: Willem Jan Withagen, ighighi@gmail.com
Sponsored by: Spectra Logic Corp
Modified:
stable/11/sys/dev/pccbb/pccbb_isa.c
stable/11/sys/dev/pci/pci.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/pccbb/pccbb_isa.c
==============================================================================
--- stable/11/sys/dev/pccbb/pccbb_isa.c Tue Nov 28 16:00:27 2017 (r326315)
+++ stable/11/sys/dev/pccbb/pccbb_isa.c Tue Nov 28 16:09:02 2017 (r326316)
@@ -75,11 +75,11 @@ static SYSCTL_NODE(_hw, OID_AUTO, pcic, CTLFLAG_RD, 0,
static int isa_intr_mask = EXCA_INT_MASK_ALLOWED;
SYSCTL_INT(_hw_pcic, OID_AUTO, intr_mask, CTLFLAG_RDTUN, &isa_intr_mask, 0,
- "Mask of allowable interrupts for this laptop. The default is generally\n\
-correct, but some laptops do not route all the IRQ pins to the bridge to\n\
-save wires. Sometimes you need a more restrictive mask because some of the\n\
-hardware in your laptop may not have a driver so its IRQ might not be\n\
-allocated.");
+ "Mask of allowable interrupts for this laptop. The default is generally"
+ " correct, but some laptops do not route all the IRQ pins to the bridge to"
+ " save wires. Sometimes you need a more restrictive mask because some of"
+ " the hardware in your laptop may not have a driver so its IRQ might not be"
+ " allocated.");
/*
* CL-PD6722's VSENSE method
@@ -90,13 +90,13 @@ allocated.");
int pcic_pd6722_vsense = 1;
SYSCTL_INT(_hw_pcic, OID_AUTO, pd6722_vsense, CTLFLAG_RDTUN,
&pcic_pd6722_vsense, 1,
- "Select CL-PD6722's VSENSE method. VSENSE is used to determine the\n\
-volatage of inserted cards. The CL-PD6722 has two methods to determine the\n\
-voltage of the card. 0 means assume a 5.0V card and do not check. 1 means\n\
-use the same method that the CL-PD6710 uses (default). 2 means use the\n\
-same method as the CL-PD6729. 2 is documented in the datasheet as being\n\
-the correct way, but 1 seems to give better results on more laptops.");
-
+ "Select CL-PD6722's VSENSE method. VSENSE is used to determine the"
+ " voltage of inserted cards. The CL-PD6722 has two methods to determine"
+ " the voltage of the card. 0 means assume a 5.0V card and do not check. 1"
+ " means use the same method that the CL-PD6710 uses (default). 2 means use"
+ " the same method as the CL-PD6729. 2 is documented in the datasheet as"
+ " being the correct way, but 1 seems to give better results on more"
+ " laptops.");
/*****************************************************************************
* End of configurable parameters.
*****************************************************************************/
Modified: stable/11/sys/dev/pci/pci.c
==============================================================================
--- stable/11/sys/dev/pci/pci.c Tue Nov 28 16:00:27 2017 (r326315)
+++ stable/11/sys/dev/pci/pci.c Tue Nov 28 16:09:02 2017 (r326316)
@@ -321,9 +321,9 @@ SYSCTL_NODE(_hw, OID_AUTO, pci, CTLFLAG_RD, 0, "PCI bu
static int pci_enable_io_modes = 1;
SYSCTL_INT(_hw_pci, OID_AUTO, enable_io_modes, CTLFLAG_RWTUN,
&pci_enable_io_modes, 1,
- "Enable I/O and memory bits in the config register. Some BIOSes do not\n\
-enable these bits correctly. We'd like to do this all the time, but there\n\
-are some peripherals that this causes problems with.");
+ "Enable I/O and memory bits in the config register. Some BIOSes do not"
+ " enable these bits correctly. We'd like to do this all the time, but"
+ " there are some peripherals that this causes problems with.");
static int pci_do_realloc_bars = 0;
SYSCTL_INT(_hw_pci, OID_AUTO, realloc_bars, CTLFLAG_RWTUN,
@@ -334,10 +334,10 @@ SYSCTL_INT(_hw_pci, OID_AUTO, realloc_bars, CTLFLAG_RW
static int pci_do_power_nodriver = 0;
SYSCTL_INT(_hw_pci, OID_AUTO, do_power_nodriver, CTLFLAG_RWTUN,
&pci_do_power_nodriver, 0,
- "Place a function into D3 state when no driver attaches to it. 0 means\n\
-disable. 1 means conservatively place devices into D3 state. 2 means\n\
-aggressively place devices into D3 state. 3 means put absolutely everything\n\
-in D3 state.");
+ "Place a function into D3 state when no driver attaches to it. 0 means"
+ " disable. 1 means conservatively place devices into D3 state. 2 means"
+ " aggressively place devices into D3 state. 3 means put absolutely"
+ " everything in D3 state.");
int pci_do_power_resume = 1;
SYSCTL_INT(_hw_pci, OID_AUTO, do_power_resume, CTLFLAG_RWTUN,
@@ -372,9 +372,10 @@ static int pci_usb_takeover = 1;
static int pci_usb_takeover = 0;
#endif
SYSCTL_INT(_hw_pci, OID_AUTO, usb_early_takeover, CTLFLAG_RDTUN,
- &pci_usb_takeover, 1, "Enable early takeover of USB controllers.\n\
-Disable this if you depend on BIOS emulation of USB devices, that is\n\
-you use USB devices (like keyboard or mouse) but do not load USB drivers");
+ &pci_usb_takeover, 1,
+ "Enable early takeover of USB controllers. Disable this if you depend on"
+ " BIOS emulation of USB devices, that is you use USB devices (like"
+ " keyboard or mouse) but do not load USB drivers");
static int pci_clear_bars;
SYSCTL_INT(_hw_pci, OID_AUTO, clear_bars, CTLFLAG_RDTUN, &pci_clear_bars, 0,
From owner-svn-src-all@freebsd.org Tue Nov 28 16:14:07 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEF98DBB361;
Tue, 28 Nov 2017 16:14:07 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A9B016B6AB;
Tue, 28 Nov 2017 16:14:07 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from comporellon.tachypleus.net (cpe-75-82-218-62.socal.res.rr.com
[75.82.218.62]) (authenticated bits=0)
by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id vASGDrA3032035
(version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
Tue, 28 Nov 2017 08:13:54 -0800
Subject: Re: svn commit: r326203 - head/sys/conf
To: Justin Hibbits <jrh29@alumni.cwru.edu>
Cc: src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
References: <201711252145.vAPLjpV6051703@repo.freebsd.org>
<CAHSQbTA7c9VpZpYcB1+uW62yW+FoscnV8K9AL9txMKO43wcQpg@mail.gmail.com>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <5831ba86-742d-7019-e1c9-4b6563d2cdcc@freebsd.org>
Date: Tue, 28 Nov 2017 08:13:53 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <CAHSQbTA7c9VpZpYcB1+uW62yW+FoscnV8K9AL9txMKO43wcQpg@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Sonic-CAuth: UmFuZG9tSVY4qqSmZ2CPCOsAxma2I0lZzyi+RErQiVfxI6U3T2DXdj6FecRDn2XGmaJl4zBG0VhHFG/Mo6AhkboMduh2GQh1WJRU7MKAg2A=
X-Sonic-ID: C;uODvIFfU5xGXiusnWtmBlw== M;IK82IVfU5xGXiusnWtmBlw==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:14:07 -0000
On 11/28/17 07:27, Justin Hibbits wrote:
> On Sat, Nov 25, 2017 at 3:45 PM, Nathan Whitehorn
> <nwhitehorn@freebsd.org> wrote:
>> Author: nwhitehorn
>> Date: Sat Nov 25 21:45:51 2017
>> New Revision: 326203
>> URL: https://svnweb.freebsd.org/changeset/base/326203
>>
>> Log:
>> Avoid emitting a PT_INTERP section for powerpc64 kernels and arrange for
>> the first instruction to be at the start of the text segment. This allows
>> the kernel to be booted correctly by stock kexec-lite.
>>
>> MFC after: 2 weeks
>>
>> Modified:
>> head/sys/conf/ldscript.powerpc64
>>
>> Modified: head/sys/conf/ldscript.powerpc64
>> ==============================================================================
>> --- head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:44:23 2017 (r326202)
>> +++ head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:45:51 2017 (r326203)
>> @@ -10,7 +10,7 @@ SECTIONS
>> {
>> /* Read-only sections, merged into text segment: */
>>
>> - . = kernbase + SIZEOF_HEADERS;
>> + . = kernbase;
>> PROVIDE (begin = . - SIZEOF_HEADERS);
>>
>> .text :
>> @@ -24,7 +24,10 @@ SECTIONS
>> _etext = .;
>> PROVIDE (etext = .);
>>
>> - .interp : { *(.interp) }
>> + /* Do not emit PT_INTERP section, which confuses some loaders (kexec-lite) */
>> + .interpX : { *(.interp) } : NONE
>> + /DISCARD/ : { *(.interp) }
>> +
>> .hash : { *(.hash) }
>> .dynsym : { *(.dynsym) }
>> .dynstr : { *(.dynstr) }
>>
> This broke powerpc64 Book-E kernels. It now puts a 1MB blank space
> ahead of the kernel data (ELF header + 1MB - sizeof(header) of 0's),
> meaning that now the kernel needs to be loaded by uboot 1MB earlier in
> memory, rather than straight on the 64MB boundary as it has been.
>
> - Justin
>
How on Earth? It doesn't do that on my system. What binutils are you using?
-Nathan
From owner-svn-src-all@freebsd.org Tue Nov 28 16:23:51 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A5C0DBB7DD;
Tue, 28 Nov 2017 16:23:51 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: from mail-io0-x243.google.com (mail-io0-x243.google.com
[IPv6:2607:f8b0:4001:c06::243])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 109F36C0AF;
Tue, 28 Nov 2017 16:23:51 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: by mail-io0-x243.google.com with SMTP id d16so421389iob.4;
Tue, 28 Nov 2017 08:23:51 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc;
bh=BB2R9sHa+pgu+916ErgAJO7amn+snMBztQSoYdpELaY=;
b=VHCdJk/8ghWgJCxTG+J7HIA+WridqguC6owGbTwPdSD1ipVAahcbCJSDIWNXi4donK
qzdwfiMTrR+V+120SBptr8a3T59J5Si2OGq6T5ksk1wSOaVaNcmiTrXNvfbq06wG9xIj
V+ltJYDVw/4VDTdm6VKUlLui+vWQWMrlzz2mla0mrPD8abmxl7z5CBfJUzhHDDHk5qv4
eT6WRH2DbHOeUXesagsmSnWXFDyfx429tBdNDxSP99xmq5V1ZrRPi1j8nr5F4nypXClS
xV9AaUv8FYnUNqN7xN1ebvQ7vRx7ifG7o7gVvrEdaqow33HaI3DoWLfxnnuDAffocduu
lo7g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
:date:message-id:subject:to:cc;
bh=BB2R9sHa+pgu+916ErgAJO7amn+snMBztQSoYdpELaY=;
b=BUV8EV1mC/WsJun11IpJeoCUz4cMdAhf9VffZtJLsm4+439QyeGKlTmsU06Z4WvvNV
2JqIFXelT6DwbKsBelnT6SmgNhhl8gu3tSBlftdrQRGhGzbcK0DGn+DScoNe04fBdEO6
CrfEoqmJBhoTs4s0kcQfillBwSwpU9sccpn5JNDdoPrcHWHnZjslh5bGALeSDT5+YwfA
lntzL6KVt0NDT7VU9y/p3wNtmncZlgDHovsGm2DrNsH1H81QZXYr0e0KT+TTYvBKJN6+
lXeq4ZZ8sNUTFvJuJutpgXPHRqRMU5mRG+zw0YkO0pgeP7liZ99ueKtzLoVJgF7YgM2I
BKqw==
X-Gm-Message-State: AJaThX6ApzD2cEu8uV6GyOZAFjcD1wqSpTqoCGrYmNIbdksfb/7PlDu1
IJrDuFgqypQrRMdLPXwZp4ZySnu6unuKYCzvS2w=
X-Google-Smtp-Source: AGs4zMYvX4JPZhZruyAwWdsd7lB9n3kDlAtdx6FU2mXPN0Xe2D4UbZrA+P60mxAxdwys6Hf/0XtSgE4YIFAhhr61VQU=
X-Received: by 10.107.132.85 with SMTP id g82mr25724811iod.232.1511886230017;
Tue, 28 Nov 2017 08:23:50 -0800 (PST)
MIME-Version: 1.0
Sender: chmeeedalf@gmail.com
Received: by 10.79.78.207 with HTTP; Tue, 28 Nov 2017 08:23:49 -0800 (PST)
In-Reply-To: <5831ba86-742d-7019-e1c9-4b6563d2cdcc@freebsd.org>
References: <201711252145.vAPLjpV6051703@repo.freebsd.org>
<CAHSQbTA7c9VpZpYcB1+uW62yW+FoscnV8K9AL9txMKO43wcQpg@mail.gmail.com>
<5831ba86-742d-7019-e1c9-4b6563d2cdcc@freebsd.org>
From: Justin Hibbits <jrh29@alumni.cwru.edu>
Date: Tue, 28 Nov 2017 10:23:49 -0600
X-Google-Sender-Auth: dVYMRlBs1yIhfFLwo-uJtMJ5ywE
Message-ID: <CAHSQbTBqzUqdWNNhL_DMynWN9ZdY1YtUcyKz0m6uPWDUV0MXtA@mail.gmail.com>
Subject: Re: svn commit: r326203 - head/sys/conf
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:23:51 -0000
On Tue, Nov 28, 2017 at 10:13 AM, Nathan Whitehorn
<nwhitehorn@freebsd.org> wrote:
>
>
> On 11/28/17 07:27, Justin Hibbits wrote:
>>
>> On Sat, Nov 25, 2017 at 3:45 PM, Nathan Whitehorn
>> <nwhitehorn@freebsd.org> wrote:
>>>
>>> Author: nwhitehorn
>>> Date: Sat Nov 25 21:45:51 2017
>>> New Revision: 326203
>>> URL: https://svnweb.freebsd.org/changeset/base/326203
>>>
>>> Log:
>>> Avoid emitting a PT_INTERP section for powerpc64 kernels and arrange
>>> for
>>> the first instruction to be at the start of the text segment. This
>>> allows
>>> the kernel to be booted correctly by stock kexec-lite.
>>>
>>> MFC after: 2 weeks
>>>
>>> Modified:
>>> head/sys/conf/ldscript.powerpc64
>>>
>>> Modified: head/sys/conf/ldscript.powerpc64
>>>
>>> ==============================================================================
>>> --- head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:44:23 2017
>>> (r326202)
>>> +++ head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:45:51 2017
>>> (r326203)
>>> @@ -10,7 +10,7 @@ SECTIONS
>>> {
>>> /* Read-only sections, merged into text segment: */
>>>
>>> - . = kernbase + SIZEOF_HEADERS;
>>> + . = kernbase;
>>> PROVIDE (begin = . - SIZEOF_HEADERS);
>>>
>>> .text :
>>> @@ -24,7 +24,10 @@ SECTIONS
>>> _etext = .;
>>> PROVIDE (etext = .);
>>>
>>> - .interp : { *(.interp) }
>>> + /* Do not emit PT_INTERP section, which confuses some loaders
>>> (kexec-lite) */
>>> + .interpX : { *(.interp) } : NONE
>>> + /DISCARD/ : { *(.interp) }
>>> +
>>> .hash : { *(.hash) }
>>> .dynsym : { *(.dynsym) }
>>> .dynstr : { *(.dynstr) }
>>>
>> This broke powerpc64 Book-E kernels. It now puts a 1MB blank space
>> ahead of the kernel data (ELF header + 1MB - sizeof(header) of 0's),
>> meaning that now the kernel needs to be loaded by uboot 1MB earlier in
>> memory, rather than straight on the 64MB boundary as it has been.
>>
>> - Justin
>>
>
> How on Earth? It doesn't do that on my system. What binutils are you using?
> -Nathan
>
This is using base binutils (2.17.50...) I don't know why it's doing
this, but readelf shows that file offset 0x0000000000100000 maps to
0xc000000000000000, and it goes from there.
- Justin
From owner-svn-src-all@freebsd.org Tue Nov 28 16:25:47 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EDF9DBB8F5;
Tue, 28 Nov 2017 16:25:47 +0000 (UTC) (envelope-from fsu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 39AD16C305;
Tue, 28 Nov 2017 16:25:47 +0000 (UTC) (envelope-from fsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASGPkm4061017;
Tue, 28 Nov 2017 16:25:46 GMT (envelope-from fsu@FreeBSD.org)
Received: (from fsu@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASGPkqw061016;
Tue, 28 Nov 2017 16:25:46 GMT (envelope-from fsu@FreeBSD.org)
Message-Id: <201711281625.vASGPkqw061016@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: fsu set sender to fsu@FreeBSD.org
using -f
From: Fedor Uporov <fsu@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:25:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326317 - head/lib/libsysdecode
X-SVN-Group: head
X-SVN-Commit-Author: fsu
X-SVN-Commit-Paths: head/lib/libsysdecode
X-SVN-Commit-Revision: 326317
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:25:47 -0000
Author: fsu
Date: Tue Nov 28 16:25:46 2017
New Revision: 326317
URL: https://svnweb.freebsd.org/changeset/base/326317
Log:
Sync bsd_to_linux_errno[] table with i386 and amd64 tables in the sys directory.
Additional fix for r326282.
MFC after: 1 week
Approved by: pfg
Modified:
head/lib/libsysdecode/errno.c
Modified: head/lib/libsysdecode/errno.c
==============================================================================
--- head/lib/libsysdecode/errno.c Tue Nov 28 16:09:02 2017 (r326316)
+++ head/lib/libsysdecode/errno.c Tue Nov 28 16:25:46 2017 (r326317)
@@ -53,7 +53,7 @@ static int bsd_to_linux_errno[ELAST + 1] = {
-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-116, -66, -6, -6, -6, -6, -6, -37, -38, -9,
- -6, -6, -43, -42, -75,-125, -84, -95, -16, -74,
+ -6, -6, -43, -42, -75,-125, -84, -61, -16, -74,
-72, -67, -71
};
#endif
From owner-svn-src-all@freebsd.org Tue Nov 28 16:26:07 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BBB4DBB94E;
Tue, 28 Nov 2017 16:26:07 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail110.syd.optusnet.com.au (mail110.syd.optusnet.com.au
[211.29.132.97])
by mx1.freebsd.org (Postfix) with ESMTP id 8144A6C450;
Tue, 28 Nov 2017 16:26:06 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail110.syd.optusnet.com.au (Postfix) with ESMTPS id 87926102316;
Wed, 29 Nov 2017 02:56:03 +1100 (AEDT)
Date: Wed, 29 Nov 2017 02:56:02 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Andrew Turner <andrew@freebsd.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326312 - head/sys/arm64/arm64
In-Reply-To: <201711281104.vASB4lTu024913@repo.freebsd.org>
Message-ID: <20171128234051.L1761@besplex.bde.org>
References: <201711281104.vASB4lTu024913@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=cK6QihWN c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=Jb6GJt-qubM306kzQlUA:9 a=4mpojyaBOmDga0F6:21
a=EBaCygjbx1TqSPLS:21 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:26:07 -0000
On Tue, 28 Nov 2017, Andrew Turner wrote:
> Log:
> When we exit the kernel debugger having entered because of a breakpoint
> instruction we need to jump over the instruction. Without this we will
> execute the same instruction again and enter into the debugger again.
>
> PR: 223917
> Reported by: emaste
> MFC after: 1 week
> Sponsored by: DARPA, AFRL
This belongs in the debugger. ddb has several macros for skipping back and
forth over the breakpoint instruction, and normally returns with it skipped
over. gdb presumably does the same. The macros seem to be correct for arm64.
> Modified: head/sys/arm64/arm64/trap.c
> ==============================================================================
> --- head/sys/arm64/arm64/trap.c Tue Nov 28 09:34:43 2017 (r326311)
> +++ head/sys/arm64/arm64/trap.c Tue Nov 28 11:04:47 2017 (r326312)
> @@ -323,7 +323,10 @@ do_el1h_sync(struct thread *td, struct trapframe *fram
> break;
> }
> #endif
> - /* FALLTHROUGH */
> + kdb_trap(exception, 0,
> + (td->td_frame != NULL) ? td->td_frame : frame);
> + frame->tf_elr -= 4;
This seems to have the wrong sign as well as being fundamentally wrong.
Execution only decrements the pc on exotic arches, and arm64 seems to
be non-exotic, since the BKPT_SKIP() instruction in db_machdep.h for
skipping the pc does frame->tf_elr += BKPT_SIZE.
BKPT_SKIP also does kdb_thrctx->pcb_rip += BKPT_SIZE on amd64, i386 and mips.
This is missing on arm, arm64 and riscv and sparc64.
BKPT_SKIP is missing on powerpc.
On sparc64, BKPT_SKIP also advances a second pc by 2*BKPT_SIZE.
> + break;
> case EXCP_WATCHPT_EL1:
> case EXCP_SOFTSTP_EL1:
> #ifdef KDB
Falling through was almost correct. I don't see anything wrong with
BKPT_SKIP(), so the bug seems to break the usual case where ddb
skips over the breakpoint. Then the above reverse the skip. Perhaps
gdb is broken and advances by 8. Then the above corrects +8 to +4.
Unusual cases are much more complicated and broken. Sometimes the
instruction needs to be restarted or user has set the pc to an unrelated
value -- then only the debugger knows what the pc should be.
Old bugs in the fall-through case:
- non-bug: when KDB is not configured, panic is called. This is correct,
especially for the breakpoint case since the instruction stream might
be corrupt in this case.
- when KDB configured but no backend is attached, kdb_trap() fails and
panic should be called then, as on x86, for the same reasons as when KDB
is not configured.
- it is a style bug to ifdef the call to kdb_trap() with KDB. When KDB is
not configured, kdb_trap() fails and correct code checks for this and
panics, as on x86.
- non-bug: since the hardware doesn't advance the pc on arm64, the
instruction stream is actually never corrupt when kdb_trap() fails
- kdb_trap() can also fail when ddb is attached but the console is
transiently unavailable. Then the instruction stream is corrupt in some
cases, but it is wrong to turn console unavailability into a panic. This
is partly fixed in my version, but fixing up the instruction stream and
returning success from ddb (with the usual complications for continuing
over a breakpoint). Console unavailability remains very broken as
implemented -- it does little except try to give this panic but not give
it in many cases.
New bugs given by not falling through:
- non-bug: it is missing the style bug of the KDB ifdef
- it is missing the panic in the case where KDB is not configured
- non-new-bug: when KDB is not configured it is missing the error check and
panic as before.
One case that is clearly broken now but probably worked before is when
multiple CPUs hit the same breakpoint and the breakpoint is removed on
one of them that is not the last one to enter ddb. Then the correct
behaviour is:
- enter with all pc's advanced or not over the breakpoint instruction
(assume that it is a specialy instruction written into the instruction
stream; this corrupts the stream and must be fixed up)
- in each ddb instance, unadvance the pc if necessary to the breakpoint
instruction
- determine if the pc is for a breakpoint set by us. Until the breakpoint
is unset by one of the ddb instances, find that it was set by us.
Continue normally in this case (put back the original instruction and
single-step over it. This commit seems to completely break this handling,
even for a single ddb instance). Then get a single-step trap and put
back the breakpoint instruction.)
- there is not enough synchronization, so ddb loses control when it returns
to single-step. Other ddb instances hitting the breakpoint see the
original instruction while racing with the previous step. They should
put it back over itself and do much the same.
- eventually 1 of the ddb instances removes the breakpoint. It puts back
the original instruction and continues without single-stepping.
- ddb instances after this enter with a breakpoint trap but no sign of
the breakpoint in the instruction stream. They must restart at where
the breakpoint was. This is very broken on x86 (except in my version).
I think it used to work automatically on arm64, because the hardware
doesn't advance the pc. Now the software breaks it by advancing
unconditionally.
Here is the ddb code for fixing up the pc after a breakpoint, with my fixes
applied:
X bool
X db_stop_at_pc(int type, int code, bool *is_breakpoint, bool *is_watchpoint)
X {
X db_addr_t pc;
X db_breakpoint_t bkpt;
X
X *is_breakpoint = IS_BREAKPOINT_TRAP(type, code);
X *is_watchpoint = IS_WATCHPOINT_TRAP(type, code);
X pc = PC_REGS();
X if (db_pc_is_singlestep(pc))
X *is_breakpoint = false;
ddb watchpoints are mostly broken and cause confusion. x86 doesn't
have any, but maps x86 hardware breakpoints to ddb watchpoints. I
think the latter are supposed to be in software and can be implemented
using software interrupts, but x86 doesn't bother. It is unclear what
they can do that breakpoint software interrupts can't do -- they can
at least give a different class of breakpoints encoded by the software
interrupt number. arm64 has a watchpoint exception number
EXCP_WATCHPOINT_EL1. This maps to is_watchpoint = TRUE in the above.
X
X db_clear_single_step();
X db_clear_breakpoints();
X db_clear_watchpoints();
X
X #ifdef FIXUP_PC_AFTER_BREAK
X if (*is_breakpoint) {
X /*
X * Breakpoint trap. Fix up the PC if the
X * machine requires it.
X */
X FIXUP_PC_AFTER_BREAK
X pc = PC_REGS();
X }
X #endif
FIXUP_PC_AFTER_BREAK must be defined by arches where the hardware doesn't
advance the pc over breakpoint instructions in the instruction stream.
On x86, it unadvances the pc by 1. On arm64, it is not defined, since the
pc is already unadvanced.
X
X /*
X * Now check for a breakpoint at this address.
X */
X bkpt = db_find_breakpoint_here(pc);
X if (bkpt) {
X if (--bkpt->count == 0) {
X bkpt->count = bkpt->init_count;
X *is_breakpoint = true;
X return (true); /* stop here */
X }
X return (false); /* continue the countdown */
X } else if (*is_breakpoint) {
X #ifdef BKPT_SKIP
We unadvanced the pc to look it up in the breakpoint table. Now we
must advance it over the breakpoint instruction to restart from there
since it was not in our table. It should be part of the normal instruction
stream. If another debugger overwrote the instruction stream and gave
control to us, then that is a bug in the other debugger and we will
probably crash soon.
X #ifdef SMP
X /*
X * In the SMP case, 'bkpt' doesn't tell us if this breakpoint
X * was controlled by us when we hit it, since the breakpoint
X * may have been cleared during a ddb entry by another CPU
X * which won the race to enter. Only skip if the breakpoint
X * is still in the instruction stream. Otherwise, turn the
X * breakpoint into an unknown trap except for ignoring it if
X * we are continuing.
X */
X BKPT_INST_TYPE memval, testval;
X
X memval = db_get_value(pc, BKPT_SIZE, FALSE);
X testval = BKPT_SET(&testval);
X if (bcmp(&memval, &testval, BKPT_SIZE) == 0)
X BKPT_SKIP;
X else {
X *is_breakpoint = false;
X if (db_run_mode == STEP_CONTINUE)
X return (false); /* continue */
X }
For the SMP case, the other debugger can be ddb, and this is my fix for it.
X #else
X BKPT_SKIP;
The !SMP case is simpler. BKPT_SKIP usually just advances the pc by
BKPT_SIZE, but does a contitional advance related to the current problem
on mips.
X #endif
X #endif
X }
We already returned with the unadvanced pc if we are contining over a
breakpoint. Advancing in the caller breaks this. Unadvancing breaks it
more.
X
X *is_breakpoint = false; /* might be a breakpoint, but not ours */
Here we continue with the advanced pc. Again it seems to be correct on
arm64, and advancing or unadvancing in the caller breaks it.
Here are my fixes in the above code:
X Index: db_run.c
X ===================================================================
X --- db_run.c (revision 325403)
X +++ db_run.c (working copy)
X @@ -36,6 +36,7 @@
X __FBSDID("$FreeBSD$");
X
X #include <sys/param.h>
X +#include <sys/systm.h>
X #include <sys/kdb.h>
X #include <sys/proc.h>
X
X @@ -129,8 +130,31 @@
X return (false); /* continue the countdown */
X } else if (*is_breakpoint) {
X #ifdef BKPT_SKIP
X +#ifdef SMP
X + /*
X + * In the SMP case, 'bkpt' doesn't tell us if this breakpoint
X + * was controlled by us when we hit it, since the breakpoint
X + * may have been cleared during a ddb entry by another CPU
X + * which won the race to enter. Only skip if the breakpoint
X + * is still in the instruction stream. Otherwise, turn the
X + * breakpoint into an unknown trap except for ignoring it if
X + * we are continuing.
X + */
X + BKPT_INST_TYPE memval, testval;
X +
X + memval = db_get_value(pc, BKPT_SIZE, FALSE);
X + testval = BKPT_SET(&testval);
BKPT_SET() is a misimplemented macro that takes an arg which is always ignored;
it is always implemented as a manifest constant (ddb macros mostly have the
opposite error of looking like manifest constants but being function-like
macros with no args but side effects). It is apparently meant for setting
a breakpoint instruction directly in the instruction stream, but that is
too hard so it is always used as above by setting a local variable and then
copying that to memory using a special ddb access function.
X + if (bcmp(&memval, &testval, BKPT_SIZE) == 0)
X BKPT_SKIP;
kib didn't like the MD'ness of this, but it is no worse than hard-coding
the setting of the instruction using the accesss function because the
BKPT_SET() macro is useless for applying MD settings to the instruction
stream (as used, it might apply them only to a local variable)).
X + else {
X + *is_breakpoint = false;
X + if (db_run_mode == STEP_CONTINUE)
X + return (false); /* continue */
X + }
X +#else
X + BKPT_SKIP;
X #endif
X +#endif
X }
X
X *is_breakpoint = false; /* might be a breakpoint, but not ours */
X
Behaviour of various arches for advancing and unadvancing the pc after
a breakpoint:
- and64, i386: +-1 over 1-byte instruction. 1 is spelled as itself instead
of as BKPT_SIZE in the implementation. Most implentations have bogus
parentheses around literal constants.
- arm: +4 and no unadvance over 4-byte instruction. 4 is spelled BKPT_SIZE
and further obfuscated by spelling BKPT_SIZE as INSN_SIZE in the
implementation. INSN_SIZE is defined in another header, so db_machdep.h
requires more namespace pollution than it should. BKPT_INSTRUCTION is
similarly obfuscated by spelling it as KERNEL_BREAKPOINT which is defined
in yet another header so even more pollution is required.
- arm64: like arm except without the pollution. Minor obfuscation of spelling
4 as BKPT_SIZE in the implementation. The change should use the macro
if it is correct, but spells BKPT_SIZE as -4.
- mips: +4 and no unadvance over 4-byte instruction. 4 is spelled BKPT_SIZE
BKPT_SIZE but BKPT_SIZE is not obfuscated as on arm. BREAKPOINT_INSTRUCTION
doesn't exit and shouldn't be exported as on arm*, but its literal value
is more interesting. mips apparently has many software interrupts which
give the same debugger exception and the instruction has to be decoded
to decide which one. BKPT_SE() returns one for ddb, MIPS_BREAK_DDB, and
pollution is implemented by not defining this in ddb's header file.
BKPT_SKIP() is complicted to read the instruction stream much like my
patch does. Although MIPS_BREAK_DDB is a single instruction, BKPT_SKIP
ignores some bits in the comparision so as to skip for this and some
other instructions. It makes some sense to use different software
interrupts for different debuggers, but I don't see how this can fix
the problem of debuggers possibly corrupting each others' instruction
streams with breapoint instructions. It can help detect the problem.
- powerpc: like arm64
- riscv: like arm
- sparc64: like arm64, except it spells BKPT_SIZE as 4 in the implementation
and has a secondary pc which it advances.
amd64 and i386 are the only arches where the hardware advances over the
breakpoint so that the unadvance is needed.
kdb seems to be most broken for powerpc. powerpc has no advance and no
unadvance. It doesn't even call kdb_reenter().
Bruce
From owner-svn-src-all@freebsd.org Tue Nov 28 16:26:57 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66F68DBBA0F;
Tue, 28 Nov 2017 16:26:57 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 313E96C5E8;
Tue, 28 Nov 2017 16:26:57 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASGQudn061099;
Tue, 28 Nov 2017 16:26:56 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASGQuBu061098;
Tue, 28 Nov 2017 16:26:56 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201711281626.vASGQuBu061098@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:26:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326318 - head/sys/arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: head/sys/arm64/arm64
X-SVN-Commit-Revision: 326318
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:26:57 -0000
Author: andrew
Date: Tue Nov 28 16:26:56 2017
New Revision: 326318
URL: https://svnweb.freebsd.org/changeset/base/326318
Log:
Fix the direction we move the instruction to retuirn to after exiting the
kernel debugger. We should skip the breakpoint instruction, not execute the
instruction before it.
Pointy-hat to: andrew
MFC after: 1 week
Sponsored by: DARPA, AFRL
Modified:
head/sys/arm64/arm64/trap.c
Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c Tue Nov 28 16:25:46 2017 (r326317)
+++ head/sys/arm64/arm64/trap.c Tue Nov 28 16:26:56 2017 (r326318)
@@ -325,7 +325,7 @@ do_el1h_sync(struct thread *td, struct trapframe *fram
#endif
kdb_trap(exception, 0,
(td->td_frame != NULL) ? td->td_frame : frame);
- frame->tf_elr -= 4;
+ frame->tf_elr += 4;
break;
case EXCP_WATCHPT_EL1:
case EXCP_SOFTSTP_EL1:
From owner-svn-src-all@freebsd.org Tue Nov 28 16:30:33 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0ABD0DBBC0C;
Tue, 28 Nov 2017 16:30:33 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E0F896C9DD;
Tue, 28 Nov 2017 16:30:32 +0000 (UTC)
(envelope-from nwhitehorn@freebsd.org)
Received: from comporellon.tachypleus.net (cpe-75-82-218-62.socal.res.rr.com
[75.82.218.62]) (authenticated bits=0)
by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id vASGUMpv018641
(version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
Tue, 28 Nov 2017 08:30:23 -0800
Subject: Re: svn commit: r326203 - head/sys/conf
To: Justin Hibbits <jrh29@alumni.cwru.edu>
Cc: src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
References: <201711252145.vAPLjpV6051703@repo.freebsd.org>
<CAHSQbTA7c9VpZpYcB1+uW62yW+FoscnV8K9AL9txMKO43wcQpg@mail.gmail.com>
<5831ba86-742d-7019-e1c9-4b6563d2cdcc@freebsd.org>
<CAHSQbTBqzUqdWNNhL_DMynWN9ZdY1YtUcyKz0m6uPWDUV0MXtA@mail.gmail.com>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <c628778b-eae9-352a-190e-5e346f35bc55@freebsd.org>
Date: Tue, 28 Nov 2017 08:30:22 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <CAHSQbTBqzUqdWNNhL_DMynWN9ZdY1YtUcyKz0m6uPWDUV0MXtA@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Sonic-CAuth: UmFuZG9tSVY9622+adzc0Wn61OybqCS8N9hsByTD9ZuOAcY65JVMn0hHpkKOSTUfuhLmqt+Y2dFRignM8vW2wDhzVd6L4XBZnCWXWxEtO4s=
X-Sonic-ID: C;zAJgblnU5xGIxOsnWtmBlw== M;3rCublnU5xGIxOsnWtmBlw==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:30:33 -0000
On 11/28/17 08:23, Justin Hibbits wrote:
> On Tue, Nov 28, 2017 at 10:13 AM, Nathan Whitehorn
> <nwhitehorn@freebsd.org> wrote:
>>
>> On 11/28/17 07:27, Justin Hibbits wrote:
>>> On Sat, Nov 25, 2017 at 3:45 PM, Nathan Whitehorn
>>> <nwhitehorn@freebsd.org> wrote:
>>>> Author: nwhitehorn
>>>> Date: Sat Nov 25 21:45:51 2017
>>>> New Revision: 326203
>>>> URL: https://svnweb.freebsd.org/changeset/base/326203
>>>>
>>>> Log:
>>>> Avoid emitting a PT_INTERP section for powerpc64 kernels and arrange
>>>> for
>>>> the first instruction to be at the start of the text segment. This
>>>> allows
>>>> the kernel to be booted correctly by stock kexec-lite.
>>>>
>>>> MFC after: 2 weeks
>>>>
>>>> Modified:
>>>> head/sys/conf/ldscript.powerpc64
>>>>
>>>> Modified: head/sys/conf/ldscript.powerpc64
>>>>
>>>> ==============================================================================
>>>> --- head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:44:23 2017
>>>> (r326202)
>>>> +++ head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:45:51 2017
>>>> (r326203)
>>>> @@ -10,7 +10,7 @@ SECTIONS
>>>> {
>>>> /* Read-only sections, merged into text segment: */
>>>>
>>>> - . = kernbase + SIZEOF_HEADERS;
>>>> + . = kernbase;
>>>> PROVIDE (begin = . - SIZEOF_HEADERS);
>>>>
>>>> .text :
>>>> @@ -24,7 +24,10 @@ SECTIONS
>>>> _etext = .;
>>>> PROVIDE (etext = .);
>>>>
>>>> - .interp : { *(.interp) }
>>>> + /* Do not emit PT_INTERP section, which confuses some loaders
>>>> (kexec-lite) */
>>>> + .interpX : { *(.interp) } : NONE
>>>> + /DISCARD/ : { *(.interp) }
>>>> +
>>>> .hash : { *(.hash) }
>>>> .dynsym : { *(.dynsym) }
>>>> .dynstr : { *(.dynstr) }
>>>>
>>> This broke powerpc64 Book-E kernels. It now puts a 1MB blank space
>>> ahead of the kernel data (ELF header + 1MB - sizeof(header) of 0's),
>>> meaning that now the kernel needs to be loaded by uboot 1MB earlier in
>>> memory, rather than straight on the 64MB boundary as it has been.
>>>
>>> - Justin
>>>
>> How on Earth? It doesn't do that on my system. What binutils are you using?
>> -Nathan
>>
> This is using base binutils (2.17.50...) I don't know why it's doing
> this, but readelf shows that file offset 0x0000000000100000 maps to
> 0xc000000000000000, and it goes from there.
>
> - Justin
>
Bizarre. Why don't you just revert for now (I need to run) and I can
figure out what went wrong later?
-Nathan
From owner-svn-src-all@freebsd.org Tue Nov 28 16:34:33 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C7E5DBBFCD;
Tue, 28 Nov 2017 16:34:33 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: from mail-it0-x243.google.com (mail-it0-x243.google.com
[IPv6:2607:f8b0:4001:c0b::243])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 367DA6CF85;
Tue, 28 Nov 2017 16:34:33 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: by mail-it0-x243.google.com with SMTP id 68so401165ite.4;
Tue, 28 Nov 2017 08:34:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc;
bh=CCKUIXHv1SIsN2wNddZkK9mlWMPhn52ksfL1UEyfZBQ=;
b=vHIgIFqys8KBYnIkGBM/u/bkNt7fUBGj5f3os5OCEr3dGQx1fFHBfhnLIzoV/Oy8ie
HxfepwSRK040eFEShgCfhfqVI1HfYdwN2CYzIfYHpR5bma8FaTx7qfr/T3TEryXNrOSv
+smdgIEdWRiz0Pat7IlvojAwjSYAXBICAcBzxY2rRVOuNxz9s2323P7J0qc65sqN1ABU
IX0RHw1Uc9Z3LLJFceuf9PF4Tq3JBvr3Lsl/+CxkNNvucBnYp9ubyBDGFpcLdhrwytoE
vUP8Xv9rYJyB6CLDBcadDbIfrIrA8jloqU4cbtgyBxWEKEqFqAi3eRpfeWzq+E3d0h79
iFRA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
:date:message-id:subject:to:cc;
bh=CCKUIXHv1SIsN2wNddZkK9mlWMPhn52ksfL1UEyfZBQ=;
b=cAAydjuSxs/uoT0WwQ2a/EtoE/W7PTUgUSKlKJDpYWMrLUwnfJPh5CGErLOKOz5EiK
bUrXaqUyVHIcH4qBWvhiR+aGnWAypIG6r5Zng0CKfHulTOpAvT4Yeo7KB6uL0rY2zDhr
lBm/5Ps5lqmwHAdn5QJBHFU9JJYHn68c6A8RC9gWPqERnsy9Tgkw7TANvx0a02QfKrCx
59b0Yb8JDP+HwsT420bY5z34w/zYXgqYgSBwz+Nyz2Ff1uSdmnhJn1i03gTNGTh5e8Ow
UxaEP26eQCXn0r2+jAJr0o9EFTEpMjTvwg3ooDhDJMw8lWqCMWTot/QiHD60vWfNk9xR
elGQ==
X-Gm-Message-State: AJaThX68TT0CXebfqnyE2EL0ScpxJH6F4RI2O3lP5H8XHDVXQGAQXln+
UdEDJfn9prfLYMFR/Y6oIrx7n6i0dntiKU1N/rk=
X-Google-Smtp-Source: AGs4zMa++GX5Fji+M5+FBhWTkegO8ypZ2tauEU5JEFTqEDiuVZsBFCj7ourY8Sfb86Dv27pVianjudbQ2Tb4Dq/1EPg=
X-Received: by 10.36.83.137 with SMTP id n131mr3529113itb.82.1511886872266;
Tue, 28 Nov 2017 08:34:32 -0800 (PST)
MIME-Version: 1.0
Sender: chmeeedalf@gmail.com
Received: by 10.79.78.207 with HTTP; Tue, 28 Nov 2017 08:34:31 -0800 (PST)
In-Reply-To: <c628778b-eae9-352a-190e-5e346f35bc55@freebsd.org>
References: <201711252145.vAPLjpV6051703@repo.freebsd.org>
<CAHSQbTA7c9VpZpYcB1+uW62yW+FoscnV8K9AL9txMKO43wcQpg@mail.gmail.com>
<5831ba86-742d-7019-e1c9-4b6563d2cdcc@freebsd.org>
<CAHSQbTBqzUqdWNNhL_DMynWN9ZdY1YtUcyKz0m6uPWDUV0MXtA@mail.gmail.com>
<c628778b-eae9-352a-190e-5e346f35bc55@freebsd.org>
From: Justin Hibbits <jrh29@alumni.cwru.edu>
Date: Tue, 28 Nov 2017 10:34:31 -0600
X-Google-Sender-Auth: mPP3kgmNrlJcdqjhdNFob7Q7Qpg
Message-ID: <CAHSQbTC_AB7=D9mrDEiindn_YPdTONwwsOYQ4TO40uGopMZKbQ@mail.gmail.com>
Subject: Re: svn commit: r326203 - head/sys/conf
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:34:33 -0000
On Tue, Nov 28, 2017 at 10:30 AM, Nathan Whitehorn
<nwhitehorn@freebsd.org> wrote:
>
>
> On 11/28/17 08:23, Justin Hibbits wrote:
>>
>> On Tue, Nov 28, 2017 at 10:13 AM, Nathan Whitehorn
>> <nwhitehorn@freebsd.org> wrote:
>>>
>>>
>>> On 11/28/17 07:27, Justin Hibbits wrote:
>>>>
>>>> On Sat, Nov 25, 2017 at 3:45 PM, Nathan Whitehorn
>>>> <nwhitehorn@freebsd.org> wrote:
>>>>>
>>>>> Author: nwhitehorn
>>>>> Date: Sat Nov 25 21:45:51 2017
>>>>> New Revision: 326203
>>>>> URL: https://svnweb.freebsd.org/changeset/base/326203
>>>>>
>>>>> Log:
>>>>> Avoid emitting a PT_INTERP section for powerpc64 kernels and
>>>>> arrange
>>>>> for
>>>>> the first instruction to be at the start of the text segment. This
>>>>> allows
>>>>> the kernel to be booted correctly by stock kexec-lite.
>>>>>
>>>>> MFC after: 2 weeks
>>>>>
>>>>> Modified:
>>>>> head/sys/conf/ldscript.powerpc64
>>>>>
>>>>> Modified: head/sys/conf/ldscript.powerpc64
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> --- head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:44:23 2017
>>>>> (r326202)
>>>>> +++ head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:45:51 2017
>>>>> (r326203)
>>>>> @@ -10,7 +10,7 @@ SECTIONS
>>>>> {
>>>>> /* Read-only sections, merged into text segment: */
>>>>>
>>>>> - . = kernbase + SIZEOF_HEADERS;
>>>>> + . = kernbase;
>>>>> PROVIDE (begin = . - SIZEOF_HEADERS);
>>>>>
>>>>> .text :
>>>>> @@ -24,7 +24,10 @@ SECTIONS
>>>>> _etext = .;
>>>>> PROVIDE (etext = .);
>>>>>
>>>>> - .interp : { *(.interp) }
>>>>> + /* Do not emit PT_INTERP section, which confuses some loaders
>>>>> (kexec-lite) */
>>>>> + .interpX : { *(.interp) } : NONE
>>>>> + /DISCARD/ : { *(.interp) }
>>>>> +
>>>>> .hash : { *(.hash) }
>>>>> .dynsym : { *(.dynsym) }
>>>>> .dynstr : { *(.dynstr) }
>>>>>
>>>> This broke powerpc64 Book-E kernels. It now puts a 1MB blank space
>>>> ahead of the kernel data (ELF header + 1MB - sizeof(header) of 0's),
>>>> meaning that now the kernel needs to be loaded by uboot 1MB earlier in
>>>> memory, rather than straight on the 64MB boundary as it has been.
>>>>
>>>> - Justin
>>>>
>>> How on Earth? It doesn't do that on my system. What binutils are you
>>> using?
>>> -Nathan
>>>
>> This is using base binutils (2.17.50...) I don't know why it's doing
>> this, but readelf shows that file offset 0x0000000000100000 maps to
>> 0xc000000000000000, and it goes from there.
>>
>> - Justin
>>
>
> Bizarre. Why don't you just revert for now (I need to run) and I can figure
> out what went wrong later?
> -Nathan
I reverted privately already. I doubt there are many/any other users
of Book-E powerpc64, so I can wait it out for now.
- Justin
From owner-svn-src-all@freebsd.org Tue Nov 28 16:34:57 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16DB5DE303D;
Tue, 28 Nov 2017 16:34:57 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E51D46D0DD;
Tue, 28 Nov 2017 16:34:56 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASGYt0W065787;
Tue, 28 Nov 2017 16:34:55 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASGYtOG065786;
Tue, 28 Nov 2017 16:34:55 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281634.vASGYtOG065786@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:34:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326319 -
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Commit-Revision: 326319
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:34:57 -0000
Author: asomers
Date: Tue Nov 28 16:34:55 2017
New Revision: 326319
URL: https://svnweb.freebsd.org/changeset/base/326319
Log:
MFC r324940:
Fix the error message when creating a zpool on a too-small device
Don't check for SPA_MINDEVSIZE in vdev_geom_attach when opening by path.
It's redundant with the check in vdev_open, and failing to attach here
results in the wrong error message being printed. However, still check for
it in some other situations:
* When opening by guids, so we don't get bogged down reading from slow
devices like floppy drives.
* In vdev_geom_read_pool_label for the same reason, because we iterate over
all providers.
* If the caller requests that we verify the guid, because then we'll have to
read from the device before vdev_open verifies the size.
PR: 222227
Reported by: Marie Helene Kvello-Aune <marieheleneka@gmail.com>
Reviewed by: avg, mav
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12531
Modified:
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Tue Nov 28 16:26:56 2017 (r326318)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Tue Nov 28 16:34:55 2017 (r326319)
@@ -193,7 +193,7 @@ vdev_geom_orphan(struct g_consumer *cp)
}
static struct g_consumer *
-vdev_geom_attach(struct g_provider *pp, vdev_t *vd)
+vdev_geom_attach(struct g_provider *pp, vdev_t *vd, boolean_t sanity)
{
struct g_geom *gp;
struct g_consumer *cp;
@@ -203,14 +203,18 @@ vdev_geom_attach(struct g_provider *pp, vdev_t *vd)
ZFS_LOG(1, "Attaching to %s.", pp->name);
- if (pp->sectorsize > VDEV_PAD_SIZE || !ISP2(pp->sectorsize)) {
- ZFS_LOG(1, "Failing attach of %s. Incompatible sectorsize %d\n",
- pp->name, pp->sectorsize);
- return (NULL);
- } else if (pp->mediasize < SPA_MINDEVSIZE) {
- ZFS_LOG(1, "Failing attach of %s. Incompatible mediasize %ju\n",
- pp->name, pp->mediasize);
- return (NULL);
+ if (sanity) {
+ if (pp->sectorsize > VDEV_PAD_SIZE || !ISP2(pp->sectorsize)) {
+ ZFS_LOG(1, "Failing attach of %s. "
+ "Incompatible sectorsize %d\n",
+ pp->name, pp->sectorsize);
+ return (NULL);
+ } else if (pp->mediasize < SPA_MINDEVSIZE) {
+ ZFS_LOG(1, "Failing attach of %s. "
+ "Incompatible mediasize %ju\n",
+ pp->name, pp->mediasize);
+ return (NULL);
+ }
}
/* Do we have geom already? No? Create one. */
@@ -587,7 +591,7 @@ vdev_geom_read_pool_label(const char *name,
LIST_FOREACH(pp, &gp->provider, provider) {
if (pp->flags & G_PF_WITHER)
continue;
- zcp = vdev_geom_attach(pp, NULL);
+ zcp = vdev_geom_attach(pp, NULL, B_TRUE);
if (zcp == NULL)
continue;
g_topology_unlock();
@@ -627,7 +631,7 @@ vdev_attach_ok(vdev_t *vd, struct g_provider *pp)
struct g_consumer *cp;
int nlabels;
- cp = vdev_geom_attach(pp, NULL);
+ cp = vdev_geom_attach(pp, NULL, B_TRUE);
if (cp == NULL) {
ZFS_LOG(1, "Unable to attach tasting instance to %s.",
pp->name);
@@ -635,14 +639,12 @@ vdev_attach_ok(vdev_t *vd, struct g_provider *pp)
}
g_topology_unlock();
nlabels = vdev_geom_read_config(cp, &config);
+ g_topology_lock();
+ vdev_geom_detach(cp, B_TRUE);
if (nlabels == 0) {
- g_topology_lock();
- vdev_geom_detach(cp, B_TRUE);
ZFS_LOG(1, "Unable to read config from %s.", pp->name);
return (NO_MATCH);
}
- g_topology_lock();
- vdev_geom_detach(cp, B_TRUE);
pool_guid = 0;
(void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_GUID, &pool_guid);
@@ -714,7 +716,7 @@ vdev_geom_attach_by_guids(vdev_t *vd)
out:
if (best_pp) {
- cp = vdev_geom_attach(best_pp, vd);
+ cp = vdev_geom_attach(best_pp, vd, B_TRUE);
if (cp == NULL) {
printf("ZFS WARNING: Unable to attach to %s.\n",
best_pp->name);
@@ -768,7 +770,7 @@ vdev_geom_open_by_path(vdev_t *vd, int check_guid)
if (pp != NULL) {
ZFS_LOG(1, "Found provider by name %s.", vd->vdev_path);
if (!check_guid || vdev_attach_ok(vd, pp) == FULL_MATCH)
- cp = vdev_geom_attach(pp, vd);
+ cp = vdev_geom_attach(pp, vd, B_FALSE);
}
return (cp);
From owner-svn-src-all@freebsd.org Tue Nov 28 16:49:17 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE57FDE3BE3;
Tue, 28 Nov 2017 16:49:17 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C7B0C6DF4B;
Tue, 28 Nov 2017 16:49:17 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASGnGhB070377;
Tue, 28 Nov 2017 16:49:16 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASGnGDK070373;
Tue, 28 Nov 2017 16:49:16 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201711281649.vASGnGDK070373@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:49:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326320 - stable/11/contrib/libc-vis
X-SVN-Group: stable-11
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: stable/11/contrib/libc-vis
X-SVN-Commit-Revision: 326320
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:49:18 -0000
Author: brooks
Date: Tue Nov 28 16:49:16 2017
New Revision: 326320
URL: https://svnweb.freebsd.org/changeset/base/326320
Log:
MFC r326307:
Update vis(3) the latest from NetBSD.
This adds VIS_DQ for compatiblity with OpenBSD.
Correct by an off-by-one error and a read buffer overflow detected using
asan.
Modified:
stable/11/contrib/libc-vis/unvis.3
stable/11/contrib/libc-vis/vis.3
stable/11/contrib/libc-vis/vis.c
stable/11/contrib/libc-vis/vis.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/libc-vis/unvis.3
==============================================================================
--- stable/11/contrib/libc-vis/unvis.3 Tue Nov 28 16:34:55 2017 (r326319)
+++ stable/11/contrib/libc-vis/unvis.3 Tue Nov 28 16:49:16 2017 (r326320)
@@ -1,4 +1,4 @@
-.\" $NetBSD: unvis.3,v 1.27 2012/12/15 07:34:36 wiz Exp $
+.\" $NetBSD: unvis.3,v 1.29 2017/10/24 19:14:55 abhinav Exp $
.\" $FreeBSD$
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -35,7 +35,10 @@
.Os
.Sh NAME
.Nm unvis ,
-.Nm strunvis
+.Nm strunvis ,
+.Nm strnunvis ,
+.Nm strunvisx ,
+.Nm strnunvisx
.Nd decode a visual representation of characters
.Sh LIBRARY
.Lb libc
@@ -184,7 +187,7 @@ char out;
while ((ch = getchar()) != EOF) {
again:
- switch(unvis(\*[Am]out, ch, \*[Am]state, 0)) {
+ switch(unvis(&out, ch, &state, 0)) {
case 0:
case UNVIS_NOCHAR:
break;
@@ -198,7 +201,7 @@ again:
errx(EXIT_FAILURE, "Bad character sequence!");
}
}
-if (unvis(\*[Am]out, '\e0', \*[Am]state, UNVIS_END) == UNVIS_VALID)
+if (unvis(&out, '\e0', &state, UNVIS_END) == UNVIS_VALID)
(void)putchar(out);
.Ed
.Sh ERRORS
Modified: stable/11/contrib/libc-vis/vis.3
==============================================================================
--- stable/11/contrib/libc-vis/vis.3 Tue Nov 28 16:34:55 2017 (r326319)
+++ stable/11/contrib/libc-vis/vis.3 Tue Nov 28 16:49:16 2017 (r326320)
@@ -1,4 +1,4 @@
-.\" $NetBSD: vis.3,v 1.45 2016/06/08 15:00:04 wiz Exp $
+.\" $NetBSD: vis.3,v 1.49 2017/08/05 20:22:29 wiz Exp $
.\" $FreeBSD$
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)vis.3 8.1 (Berkeley) 6/9/93
.\"
-.Dd January 14, 2015
+.Dd April 22, 2017
.Dt VIS 3
.Os
.Sh NAME
@@ -243,6 +243,8 @@ except space, tab, and newline are encoded (see
The following flags
alter this:
.Bl -tag -width VIS_WHITEX
+.It Dv VIS_DQ
+Also encode double quotes
.It Dv VIS_GLOB
Also encode the magic characters
.Ql ( * ,
@@ -310,7 +312,7 @@ warning on the use of the
.Dv VIS_NOSLASH
flag below).
.Pp
-There are four forms of encoding.
+There are six forms of encoding.
All forms use the backslash character
.Ql \e
to introduce a special
@@ -401,6 +403,9 @@ If
.Fa nextc
is an octal digit, the latter representation is used to
avoid ambiguity.
+.Pp
+Non-printable characters without C-style
+backslash sequences use the default representation.
.It Dv VIS_OCTAL
Use a three digit octal sequence.
The form is
@@ -408,6 +413,11 @@ The form is
where
.Em d
represents an octal digit.
+.It Dv VIS_CSTYLE \&| Dv VIS_OCTAL
+Same as
+.Dv VIS_CSTYLE
+except that non-printable characters without C-style
+backslash sequences use a three digit octal sequence.
.It Dv VIS_HTTPSTYLE
Use URI encoding as described in RFC 1738.
The form is
Modified: stable/11/contrib/libc-vis/vis.c
==============================================================================
--- stable/11/contrib/libc-vis/vis.c Tue Nov 28 16:34:55 2017 (r326319)
+++ stable/11/contrib/libc-vis/vis.c Tue Nov 28 16:49:16 2017 (r326320)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $ */
+/* $NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef __FBSDID
__FBSDID("$FreeBSD$");
@@ -379,6 +379,7 @@ makeextralist(int flags, const char *src)
if (flags & VIS_SP) *d++ = L' ';
if (flags & VIS_TAB) *d++ = L'\t';
if (flags & VIS_NL) *d++ = L'\n';
+ if (flags & VIS_DQ) *d++ = L'"';
if ((flags & VIS_NOSLASH) == 0) *d++ = L'\\';
*d = L'\0';
@@ -408,7 +409,15 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
_DIAGASSERT(mbsrc != NULL || mblength == 0);
_DIAGASSERT(mbextra != NULL);
+ mbslength = (ssize_t)mblength;
/*
+ * When inputing a single character, must also read in the
+ * next character for nextc, the look-ahead character.
+ */
+ if (mbslength == 1)
+ mbslength++;
+
+ /*
* Input (mbsrc) is a char string considered to be multibyte
* characters. The input loop will read this string pulling
* one character, possibly multiple bytes, from mbsrc and
@@ -424,12 +433,12 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
/* Allocate space for the wide char strings */
psrc = pdst = extra = NULL;
mdst = NULL;
- if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
+ if ((psrc = calloc(mbslength + 1, sizeof(*psrc))) == NULL)
return -1;
- if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
+ if ((pdst = calloc((16 * mbslength) + 1, sizeof(*pdst))) == NULL)
goto out;
if (*mbdstp == NULL) {
- if ((mdst = calloc((4 * mblength) + 1, sizeof(*mdst))) == NULL)
+ if ((mdst = calloc((16 * mbslength) + 1, sizeof(*mdst))) == NULL)
goto out;
*mbdstp = mdst;
}
@@ -452,13 +461,6 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
* stop at NULs because we may be processing a block of data
* that includes NULs.
*/
- mbslength = (ssize_t)mblength;
- /*
- * When inputing a single character, must also read in the
- * next character for nextc, the look-ahead character.
- */
- if (mbslength == 1)
- mbslength++;
bzero(&mbstate, sizeof(mbstate));
while (mbslength > 0) {
/* Convert one multibyte character to wchar_t. */
@@ -470,12 +472,13 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
clen = 1;
cerr = 1;
}
- if (clen == 0)
+ if (clen == 0) {
/*
* NUL in input gives 0 return value. process
* as single NUL byte and keep going.
*/
clen = 1;
+ }
/* Advance buffer character pointer. */
src++;
/* Advance input pointer by number of bytes read. */
@@ -485,6 +488,7 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *m
}
len = src - psrc;
src = psrc;
+
/*
* In the single character input case, we will have actually
* processed two characters, c and nextc. Reset len back to
Modified: stable/11/contrib/libc-vis/vis.h
==============================================================================
--- stable/11/contrib/libc-vis/vis.h Tue Nov 28 16:34:55 2017 (r326319)
+++ stable/11/contrib/libc-vis/vis.h Tue Nov 28 16:49:16 2017 (r326320)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.h,v 1.24 2016/01/14 20:42:14 christos Exp $ */
+/* $NetBSD: vis.h,v 1.25 2017/04/23 01:57:36 christos Exp $ */
/* $FreeBSD$ */
/*-
@@ -52,6 +52,7 @@
#define VIS_NL 0x0010 /* also encode newline */
#define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL)
#define VIS_SAFE 0x0020 /* only encode "unsafe" characters */
+#define VIS_DQ 0x8000 /* also encode double quotes */
/*
* other
From owner-svn-src-all@freebsd.org Tue Nov 28 16:52:40 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4962EDE3E99;
Tue, 28 Nov 2017 16:52:40 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2352B6E31B;
Tue, 28 Nov 2017 16:52:40 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASGqdGc074191;
Tue, 28 Nov 2017 16:52:39 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASGqdG7074187;
Tue, 28 Nov 2017 16:52:39 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281652.vASGqdG7074187@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 16:52:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326321 - in stable/11: cddl/usr.sbin/zfsd lib/libdevdctl
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in stable/11: cddl/usr.sbin/zfsd lib/libdevdctl
X-SVN-Commit-Revision: 326321
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 16:52:40 -0000
Author: asomers
Date: Tue Nov 28 16:52:38 2017
New Revision: 326321
URL: https://svnweb.freebsd.org/changeset/base/326321
Log:
MFC r325011, r325016
r325011:
zfsd should be able to online an L2ARC that disappears and returns
Previously, this didn't work because L2ARC devices' labels don't contain
pool GUIDs. Modify zfsd so that the pool GUID won't be required:
lib/libdevdctl/guid.h
Change INVALID_GUID from a uint64_t constant to a function that
returns an invalid Guid object. Remove the void constructor.
Nothing uses it, and it violates RAII.
cddl/usr.sbin/zfsd/case_file.h
cddl/usr.sbin/zfsd/case_file.cc
Allow CaseFile::Find to match a CaseFile based on Vdev GUID alone.
In CaseFile::ReEvaluate, attempt to online devices even if the newly
arrived device has no pool GUID.
cddl/usr.sbin/zfsd/vdev_iterator.cc
Iterate through a pool's cache devices as well as its regular
devices.
Reported by: avg
Reviewed by: avg
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12791
r325016:
Partially revert r325011: restore Guid's default constructor
Reported by: ohartmann
X-MFC-With: 325011
Sponsored by: Spectra Logic Corp
Modified:
stable/11/cddl/usr.sbin/zfsd/case_file.cc
stable/11/cddl/usr.sbin/zfsd/case_file.h
stable/11/cddl/usr.sbin/zfsd/vdev_iterator.cc
stable/11/lib/libdevdctl/guid.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/usr.sbin/zfsd/case_file.cc
==============================================================================
--- stable/11/cddl/usr.sbin/zfsd/case_file.cc Tue Nov 28 16:49:16 2017 (r326320)
+++ stable/11/cddl/usr.sbin/zfsd/case_file.cc Tue Nov 28 16:52:38 2017 (r326321)
@@ -102,7 +102,8 @@ CaseFile::Find(Guid poolGUID, Guid vdevGUID)
for (CaseFileList::iterator curCase = s_activeCases.begin();
curCase != s_activeCases.end(); curCase++) {
- if ((*curCase)->PoolGUID() != poolGUID
+ if (((*curCase)->PoolGUID() != poolGUID
+ && Guid::InvalidGuid() != poolGUID)
|| (*curCase)->VdevGUID() != vdevGUID)
continue;
@@ -268,7 +269,8 @@ CaseFile::ReEvaluate(const string &devPath, const stri
}
if (vdev != NULL
- && vdev->PoolGUID() == m_poolGUID
+ && ( vdev->PoolGUID() == m_poolGUID
+ || vdev->PoolGUID() == Guid::InvalidGuid())
&& vdev->GUID() == m_vdevGUID) {
zpool_vdev_online(pool, vdev->GUIDString().c_str(),
Modified: stable/11/cddl/usr.sbin/zfsd/case_file.h
==============================================================================
--- stable/11/cddl/usr.sbin/zfsd/case_file.h Tue Nov 28 16:49:16 2017 (r326320)
+++ stable/11/cddl/usr.sbin/zfsd/case_file.h Tue Nov 28 16:52:38 2017 (r326321)
@@ -89,6 +89,8 @@ class CaseFile (public)
* \brief Find a CaseFile object by a vdev's pool/vdev GUID tuple.
*
* \param poolGUID Pool GUID for the vdev of the CaseFile to find.
+ * If InvalidGuid, then only match the vdev GUID
+ * instead of both pool and vdev GUIDs.
* \param vdevGUID Vdev GUID for the vdev of the CaseFile to find.
*
* \return If found, a pointer to a valid CaseFile object.
Modified: stable/11/cddl/usr.sbin/zfsd/vdev_iterator.cc
==============================================================================
--- stable/11/cddl/usr.sbin/zfsd/vdev_iterator.cc Tue Nov 28 16:49:16 2017 (r326320)
+++ stable/11/cddl/usr.sbin/zfsd/vdev_iterator.cc Tue Nov 28 16:52:38 2017 (r326321)
@@ -76,7 +76,9 @@ void
VdevIterator::Reset()
{
nvlist_t *rootVdev;
+ nvlist **cache_child;
int result;
+ uint_t cache_children;
result = nvlist_lookup_nvlist(m_poolConfig,
ZPOOL_CONFIG_VDEV_TREE,
@@ -85,6 +87,13 @@ VdevIterator::Reset()
throw ZfsdException(m_poolConfig, "Unable to extract "
"ZPOOL_CONFIG_VDEV_TREE from pool.");
m_vdevQueue.assign(1, rootVdev);
+ result = nvlist_lookup_nvlist_array(rootVdev,
+ ZPOOL_CONFIG_L2CACHE,
+ &cache_child,
+ &cache_children);
+ if (result == 0)
+ for (uint_t c = 0; c < cache_children; c++)
+ m_vdevQueue.push_back(cache_child[c]);
}
nvlist_t *
Modified: stable/11/lib/libdevdctl/guid.h
==============================================================================
--- stable/11/lib/libdevdctl/guid.h Tue Nov 28 16:49:16 2017 (r326320)
+++ stable/11/lib/libdevdctl/guid.h Tue Nov 28 16:52:38 2017 (r326321)
@@ -62,9 +62,13 @@ class Guid
{
public:
/* Constructors */
+ /* Default constructor: an Invalid guid */
Guid();
+ /* Construct a guid from a provided integer */
Guid(uint64_t guid);
+ /* Construct a guid from a string in base 8, 10, or 16 */
Guid(const std::string &guid);
+ static Guid InvalidGuid();
/* Assignment */
Guid& operator=(const Guid& rhs);
@@ -80,8 +84,9 @@ class Guid
operator uint64_t() const;
operator bool() const;
- static const uint64_t INVALID_GUID = 0;
protected:
+ static const uint64_t INVALID_GUID = 0;
+
/* The integer value of the GUID. */
uint64_t m_GUID;
};
@@ -97,6 +102,12 @@ inline
Guid::Guid(uint64_t guid)
: m_GUID(guid)
{
+}
+
+inline Guid
+Guid::InvalidGuid()
+{
+ return (Guid(INVALID_GUID));
}
inline Guid&
From owner-svn-src-all@freebsd.org Tue Nov 28 17:04:24 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45986DE737A;
Tue, 28 Nov 2017 17:04:24 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D7AF26EAB3;
Tue, 28 Nov 2017 17:04:23 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASH4Me0078602;
Tue, 28 Nov 2017 17:04:22 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASH4MCK078598;
Tue, 28 Nov 2017 17:04:22 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281704.vASH4MCK078598@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:04:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326322 - in stable/11: lib/libc/sys sys/kern
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in stable/11: lib/libc/sys sys/kern
X-SVN-Commit-Revision: 326322
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:04:24 -0000
Author: asomers
Date: Tue Nov 28 17:04:22 2017
New Revision: 326322
URL: https://svnweb.freebsd.org/changeset/base/326322
Log:
MFC r322258, r324941, r324956, r325018
r322258:
Make p1003_1b.aio_listio_max a tunable
p1003_1b.aio_listio_max is now a tunable. Its value is reflected in the
sysctl of the same name, and the sysconf(3) variable _SC_AIO_LISTIO_MAX.
Its value will be bounded from below by the compile-time constant
AIO_LISTIO_MAX and from above by the compile-time constant
MAX_AIO_QUEUE_PER_PROC and the tunable vfs.aio.max_aio_queue.
Reviewed by: jhb, kib
Relnotes: yes
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D11601
r324941:
Remove artificial restriction on lio_listio's operation count
In r322258 I made p1003_1b.aio_listio_max a tunable. However, further
investigation shows that there was never any good reason for that limit to
exist in the first place. It's used in two completely different ways:
* To size a UMA zone, which globally limits the number of concurrent
aio_suspend calls.
* To artifically limit the number of operations in a single lio_listio call.
There doesn't seem to be any memory allocation associated with this limit.
This change does two things:
* Properly names aio_suspend's UMA zone, and sizes it based on a new constant.
* Eliminates the artifical restriction on lio_listio. Instead, lio_listio
calls will now be limited by the more generous max_aio_queue_per_proc. The
old p1003_1b.aio_listio_max is now an alias for
vfs.aio.max_aio_queue_per_proc, so sysconf(3) will still work with
_SC_AIO_LISTIO_MAX.
Reported by: bde
Reviewed by: jhb
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12120
r324956:
Bump man page revision dates for r324941
Reported by: jhb
X-MFC-with: 324941
Sponsored by: Spectra Logic Corp
r325018:
Fix aio_suspend in 32-bit emulation
An off-by-one error has been present since the system call was first present
in 185878. It additionally became a memory corruption bug after change
324941. The failure is actually revealed by our existing AIO tests.
However, apparently nobody's been running those in 32-bit emulation mode.
Reported by: Coverity, cem
CID: 1382114
X-MFC-With: 324941
Sponsored by: Spectra Logic Corp
Modified:
stable/11/lib/libc/sys/aio_suspend.2
stable/11/lib/libc/sys/lio_listio.2
stable/11/sys/kern/posix4_mib.c
stable/11/sys/kern/vfs_aio.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libc/sys/aio_suspend.2
==============================================================================
--- stable/11/lib/libc/sys/aio_suspend.2 Tue Nov 28 16:52:38 2017 (r326321)
+++ stable/11/lib/libc/sys/aio_suspend.2 Tue Nov 28 17:04:22 2017 (r326322)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 2, 1999
+.Dd Oct 23, 2017
.Dt AIO_SUSPEND 2
.Os
.Sh NAME
@@ -85,10 +85,10 @@ expired before any I/O requests completed.
The
.Fa iocbs
argument
-contains more than
-.Dv AIO_LISTIO_MAX
-asynchronous I/O requests, or at least one of the requests is not
-valid.
+contains more asynchronous I/O requests than the
+.Va vfs.aio.max_aio_queue_per_proc
+.Xr sysctl 8
+variable, or at least one of the requests is not valid.
.It Bq Er EINTR
the suspend was interrupted by a signal.
.El
Modified: stable/11/lib/libc/sys/lio_listio.2
==============================================================================
--- stable/11/lib/libc/sys/lio_listio.2 Tue Nov 28 16:52:38 2017 (r326321)
+++ stable/11/lib/libc/sys/lio_listio.2 Tue Nov 28 17:04:22 2017 (r326322)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 15, 2016
+.Dd Oct 23, 2017
.Dt LIO_LISTIO 2
.Os
.Sh NAME
@@ -161,7 +161,7 @@ function will fail if:
There are not enough resources to enqueue the requests.
.It Bq Er EAGAIN
The request would cause the system-wide limit
-.Dv AIO_MAX
+.Dv {AIO_MAX}
to be exceeded.
.It Bq Er EINVAL
The
@@ -173,7 +173,7 @@ nor
or
.Fa nent
is greater than
-.Dv AIO_LISTIO_MAX .
+.Dv {AIO_LISTIO_MAX} .
.It Bq Er EINVAL
The asynchronous notification method in
.Fa sig->sigev_notify
Modified: stable/11/sys/kern/posix4_mib.c
==============================================================================
--- stable/11/sys/kern/posix4_mib.c Tue Nov 28 16:52:38 2017 (r326321)
+++ stable/11/sys/kern/posix4_mib.c Tue Nov 28 17:04:22 2017 (r326322)
@@ -91,7 +91,6 @@ P1B_SYSCTL(CTL_P1003_1B_FSYNC, fsync);
P1B_SYSCTL(CTL_P1003_1B_SHARED_MEMORY_OBJECTS, shared_memory_objects);
P1B_SYSCTL(CTL_P1003_1B_SYNCHRONIZED_IO, synchronized_io);
P1B_SYSCTL(CTL_P1003_1B_TIMERS, timers);
-P1B_SYSCTL(CTL_P1003_1B_AIO_LISTIO_MAX, aio_listio_max);
P1B_SYSCTL(CTL_P1003_1B_AIO_MAX, aio_max);
P1B_SYSCTL(CTL_P1003_1B_AIO_PRIO_DELTA_MAX, aio_prio_delta_max);
P1B_SYSCTL(CTL_P1003_1B_DELAYTIMER_MAX, delaytimer_max);
Modified: stable/11/sys/kern/vfs_aio.c
==============================================================================
--- stable/11/sys/kern/vfs_aio.c Tue Nov 28 16:52:38 2017 (r326321)
+++ stable/11/sys/kern/vfs_aio.c Tue Nov 28 17:04:22 2017 (r326322)
@@ -90,11 +90,11 @@ static uint64_t jobseqno;
#endif
#ifndef MAX_AIO_QUEUE_PER_PROC
-#define MAX_AIO_QUEUE_PER_PROC 256 /* Bigger than AIO_LISTIO_MAX */
+#define MAX_AIO_QUEUE_PER_PROC 256
#endif
#ifndef MAX_AIO_QUEUE
-#define MAX_AIO_QUEUE 1024 /* Bigger than AIO_LISTIO_MAX */
+#define MAX_AIO_QUEUE 1024 /* Bigger than MAX_AIO_QUEUE_PER_PROC */
#endif
#ifndef MAX_BUF_AIO
@@ -102,8 +102,10 @@ static uint64_t jobseqno;
#endif
FEATURE(aio, "Asynchronous I/O");
+SYSCTL_DECL(_p1003_1b);
static MALLOC_DEFINE(M_LIO, "lio", "listio aio control block list");
+static MALLOC_DEFINE(M_AIOS, "aios", "aio_suspend aio control block list");
static SYSCTL_NODE(_vfs, OID_AUTO, aio, CTLFLAG_RW, 0,
"Async IO management");
@@ -168,6 +170,15 @@ static int max_buf_aio = MAX_BUF_AIO;
SYSCTL_INT(_vfs_aio, OID_AUTO, max_buf_aio, CTLFLAG_RW, &max_buf_aio, 0,
"Maximum buf aio requests per process (stored in the process)");
+/*
+ * Though redundant with vfs.aio.max_aio_queue_per_proc, POSIX requires
+ * sysconf(3) to support AIO_LISTIO_MAX, and we implement that with
+ * vfs.aio.aio_listio_max.
+ */
+SYSCTL_INT(_p1003_1b, CTL_P1003_1B_AIO_LISTIO_MAX, aio_listio_max,
+ CTLFLAG_RD | CTLFLAG_CAPRD, &max_aio_queue_per_proc,
+ 0, "Maximum aio requests for a single lio_listio call");
+
#ifdef COMPAT_FREEBSD6
typedef struct oaiocb {
int aio_fildes; /* File descriptor */
@@ -328,10 +339,9 @@ static int filt_lio(struct knote *kn, long hint);
* kaio Per process async io info
* aiop async io process data
* aiocb async io jobs
- * aiol list io job pointer - internal to aio_suspend XXX
* aiolio list io jobs
*/
-static uma_zone_t kaio_zone, aiop_zone, aiocb_zone, aiol_zone, aiolio_zone;
+static uma_zone_t kaio_zone, aiop_zone, aiocb_zone, aiolio_zone;
/* kqueue filters for aio */
static struct filterops aio_filtops = {
@@ -405,14 +415,11 @@ aio_onceonly(void)
NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
aiocb_zone = uma_zcreate("AIOCB", sizeof(struct kaiocb), NULL, NULL,
NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
- aiol_zone = uma_zcreate("AIOL", AIO_LISTIO_MAX*sizeof(intptr_t) , NULL,
- NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
aiolio_zone = uma_zcreate("AIOLIO", sizeof(struct aioliojob), NULL,
NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
aiod_lifetime = AIOD_LIFETIME_DEFAULT;
jobrefid = 1;
p31b_setcfg(CTL_P1003_1B_ASYNCHRONOUS_IO, _POSIX_ASYNCHRONOUS_IO);
- p31b_setcfg(CTL_P1003_1B_AIO_LISTIO_MAX, AIO_LISTIO_MAX);
p31b_setcfg(CTL_P1003_1B_AIO_MAX, MAX_AIO_QUEUE);
p31b_setcfg(CTL_P1003_1B_AIO_PRIO_DELTA_MAX, 0);
@@ -1943,7 +1950,7 @@ sys_aio_suspend(struct thread *td, struct aio_suspend_
struct aiocb **ujoblist;
int error;
- if (uap->nent < 0 || uap->nent > AIO_LISTIO_MAX)
+ if (uap->nent < 0 || uap->nent > max_aio_queue_per_proc)
return (EINVAL);
if (uap->timeout) {
@@ -1954,11 +1961,11 @@ sys_aio_suspend(struct thread *td, struct aio_suspend_
} else
tsp = NULL;
- ujoblist = uma_zalloc(aiol_zone, M_WAITOK);
+ ujoblist = malloc(uap->nent * sizeof(ujoblist[0]), M_AIOS, M_WAITOK);
error = copyin(uap->aiocbp, ujoblist, uap->nent * sizeof(ujoblist[0]));
if (error == 0)
error = kern_aio_suspend(td, uap->nent, ujoblist, tsp);
- uma_zfree(aiol_zone, ujoblist);
+ free(ujoblist, M_AIOS);
return (error);
}
@@ -2151,7 +2158,7 @@ kern_lio_listio(struct thread *td, int mode, struct ai
if ((mode != LIO_NOWAIT) && (mode != LIO_WAIT))
return (EINVAL);
- if (nent < 0 || nent > AIO_LISTIO_MAX)
+ if (nent < 0 || nent > max_aio_queue_per_proc)
return (EINVAL);
if (p->p_aioinfo == NULL)
@@ -2283,7 +2290,7 @@ freebsd6_lio_listio(struct thread *td, struct freebsd6
return (EINVAL);
nent = uap->nent;
- if (nent < 0 || nent > AIO_LISTIO_MAX)
+ if (nent < 0 || nent > max_aio_queue_per_proc)
return (EINVAL);
if (uap->sig && (uap->mode == LIO_NOWAIT)) {
@@ -2320,7 +2327,7 @@ sys_lio_listio(struct thread *td, struct lio_listio_ar
return (EINVAL);
nent = uap->nent;
- if (nent < 0 || nent > AIO_LISTIO_MAX)
+ if (nent < 0 || nent > max_aio_queue_per_proc)
return (EINVAL);
if (uap->sig && (uap->mode == LIO_NOWAIT)) {
@@ -2785,7 +2792,7 @@ freebsd32_aio_suspend(struct thread *td, struct freebs
uint32_t *ujoblist32;
int error, i;
- if (uap->nent < 0 || uap->nent > AIO_LISTIO_MAX)
+ if (uap->nent < 0 || uap->nent > max_aio_queue_per_proc)
return (EINVAL);
if (uap->timeout) {
@@ -2798,17 +2805,17 @@ freebsd32_aio_suspend(struct thread *td, struct freebs
} else
tsp = NULL;
- ujoblist = uma_zalloc(aiol_zone, M_WAITOK);
+ ujoblist = malloc(uap->nent * sizeof(ujoblist[0]), M_AIOS, M_WAITOK);
ujoblist32 = (uint32_t *)ujoblist;
error = copyin(uap->aiocbp, ujoblist32, uap->nent *
sizeof(ujoblist32[0]));
if (error == 0) {
- for (i = uap->nent; i > 0; i--)
+ for (i = uap->nent - 1; i >= 0; i--)
ujoblist[i] = PTRIN(ujoblist32[i]);
error = kern_aio_suspend(td, uap->nent, ujoblist, tsp);
}
- uma_zfree(aiol_zone, ujoblist);
+ free(ujoblist, M_AIOS);
return (error);
}
@@ -2911,7 +2918,7 @@ freebsd6_freebsd32_lio_listio(struct thread *td,
return (EINVAL);
nent = uap->nent;
- if (nent < 0 || nent > AIO_LISTIO_MAX)
+ if (nent < 0 || nent > max_aio_queue_per_proc)
return (EINVAL);
if (uap->sig && (uap->mode == LIO_NOWAIT)) {
@@ -2957,7 +2964,7 @@ freebsd32_lio_listio(struct thread *td, struct freebsd
return (EINVAL);
nent = uap->nent;
- if (nent < 0 || nent > AIO_LISTIO_MAX)
+ if (nent < 0 || nent > max_aio_queue_per_proc)
return (EINVAL);
if (uap->sig && (uap->mode == LIO_NOWAIT)) {
From owner-svn-src-all@freebsd.org Tue Nov 28 17:04:57 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E2D0DE73FF;
Tue, 28 Nov 2017 17:04:57 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail105.syd.optusnet.com.au (mail105.syd.optusnet.com.au
[211.29.132.249])
by mx1.freebsd.org (Postfix) with ESMTP id 1DB966EBF0;
Tue, 28 Nov 2017 17:04:56 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail105.syd.optusnet.com.au (Postfix) with ESMTPS id CB8BD1047070;
Wed, 29 Nov 2017 04:04:49 +1100 (AEDT)
Date: Wed, 29 Nov 2017 04:04:49 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Edward Tomasz Napierala <trasz@freebsd.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326314 - in head/sys: ddb kern sys
In-Reply-To: <201711281253.vASCrtlB071488@repo.freebsd.org>
Message-ID: <20171129030035.W2283@besplex.bde.org>
References: <201711281253.vASCrtlB071488@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=bc8baKHB c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=kJXDIk-I7poipWL2VAoA:9
a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:04:57 -0000
On Tue, 28 Nov 2017, Edward Tomasz Napierala wrote:
> Log:
> Make kdb_reenter() silent when explicitly called from db_error().
> This removes the useless backtrace on various ddb(4) user errors.
>
> Reviewed by: jhb@
> Obtained from: CheriBSD
> MFC after: 2 weeks
> Sponsored by: DARPA, AFRL
> Differential Revision: https://reviews.freebsd.org/D13212
This doesn't fix the spam for user errors that cause a trap, which are
very common (for mistyping memory addresses). ddb sets up trap handlers
using setjmp, and actually does this correctly in many cases, but when
a trap occurs the error handling is:
trap -> kdb_reenter (print spam here) -> ddb (print error message here)
The second error message is useful iff the trap handler was set up
correctly (longjmp then goes back to a place that knows the precise
context so it is easy to print a relevant error message). I forget if
this error message is printed using db_error() which would repeat the
spam, but it probably is in correct cases -- ddb should return to the
main loop using longjmp, but it never calls longjmp directly. Instead
it goes by db_error() to kdb which does the longjmp. So the correct
error handling (still badly implemented) is now:
setjmp in main loop
setjmp in command, perhaps for memory access that might trap
trap
call kdb
print spam (remove this for correctness)
longjmp back to command
back in command after longmp
call db_error
print good error message
call kdb_reenter
print spam (remove this for correctness)
longjmp back to main loop
back in main loop after longjmp
IIRC. the jmp_buf for kdn_reenter() is global, so this must be switched to
set up context-sensitive error handling.
> Modified: head/sys/kern/subr_kdb.c
> ==============================================================================
> --- head/sys/kern/subr_kdb.c Tue Nov 28 11:06:17 2017 (r326313)
> +++ head/sys/kern/subr_kdb.c Tue Nov 28 12:53:55 2017 (r326314)
> @@ -509,6 +509,17 @@ kdb_reenter(void)
> /* NOTREACHED */
> }
>
> +void
> +kdb_reenter_silent(void)
> +{
> +
> + if (!kdb_active || kdb_jmpbufp == NULL)
> + return;
> +
> + longjmp(kdb_jmpbufp, 1);
> + /* NOTREACHED */
This duplicates style bugs (extra blank line and lint support that even lint
doesn't need) from kdb_reenter().
I use the following fix of disabling the spam in all cases (unless reenabled
in all cases using ddb):
X Index: subr_kdb.c
X ===================================================================
X --- subr_kdb.c (revision 325403)
X +++ subr_kdb.c (working copy)
X @@ -1,3 +1,7 @@
X +volatile int bde_ipi = 0;
X +
X +static volatile int bde_kdb_wantspam = 0;
X +
X /*-
X * Copyright (c) 2004 The FreeBSD Project
X * All rights reserved.
X @@ -501,7 +508,9 @@
X if (!kdb_active || kdb_jmpbufp == NULL)
X return;
X
X +if (bde_kdb_wantspam & 1)
X printf("KDB: reentering\n");
X +if (bde_kdb_wantspam & 2)
X kdb_backtrace();
X longjmp(kdb_jmpbufp, 1);
X /* NOTREACHED */
kib is the author of the verbose messages, and he didn't like just removing
them. He agreed to putting them under a sysctl (or perhaps just a variable).
Later, I found a case where the verbose messages are actually useful. I
forget what this was. Probably some bug that I put in ddb. ddb is broken
if it doesn't set up a special trap handler using setjmp() before doing
anything that might trap. So we can detect most unexpected traps by
checking the jmp_buf:
- remove above complications and just longjmp() to the global jmp_buf in
db_error(). This global jmp_buf is owned by ddb. Only the pointer to
it is owned by kdb. So it is not a layering violationg to use it directly.
- in kdb_reenter(), somehow determine if the jmp_buf is the top-level one.
Traps are not expected in this case, so print the spam. Otherwise,
assume that ddb set up jmp_buf for handling the trap and just longjmp().
to it.
The spam also affects gdb in a worse way, and the above doesn't fix
it. gdb also never calls longjmp() directly. It only calls
kdb_reenter() directly after receiving ^C when switching back to ddb
fails. Then it prints "using longjmp, hope it works!", but actually
uses kdb_reenter() which prints spam and actually uses longjmp(). The
spam goes to the console which is a logically different device to the
gdb device, so might be invisible if the device is physical difference
or mess up the gdb device if the devices are physically the same. The
error messages have the same problem. It is the case where switching
back to ddb doesn't work that we prefer to see the messages about this
failure on the gdb device.
Bruce
From owner-svn-src-all@freebsd.org Tue Nov 28 17:07:22 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89CEADE7598;
Tue, 28 Nov 2017 17:07:22 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6426F6EDDF;
Tue, 28 Nov 2017 17:07:22 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASH7LHe078765;
Tue, 28 Nov 2017 17:07:21 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASH7Lxq078764;
Tue, 28 Nov 2017 17:07:21 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281707.vASH7Lxq078764@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:07:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326323 - stable/11/sys/dev/mpr
X-SVN-Group: stable-11
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/11/sys/dev/mpr
X-SVN-Commit-Revision: 326323
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:07:22 -0000
Author: asomers
Date: Tue Nov 28 17:07:21 2017
New Revision: 326323
URL: https://svnweb.freebsd.org/changeset/base/326323
Log:
MFC r325363:
Fix mpr(4) panics caused by bad drive mapping tables
sys/dev/mpr/mpr_mapping.c
If _mapping_process_dpm_pg0 detects inconsistencies in the drive
mapping table (stored in the HBA's NVRAM), abort reading it and
continue to boot as if the mapping table were blank. I observed
such inconsistencies in several HBAs after upgrading firmware from
14.0.0.0 to 15.0.0.0.
Reviewed by: slm
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12901
Modified:
stable/11/sys/dev/mpr/mpr_mapping.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/mpr/mpr_mapping.c
==============================================================================
--- stable/11/sys/dev/mpr/mpr_mapping.c Tue Nov 28 17:04:22 2017 (r326322)
+++ stable/11/sys/dev/mpr/mpr_mapping.c Tue Nov 28 17:07:21 2017 (r326323)
@@ -2210,7 +2210,7 @@ mpr_mapping_free_memory(struct mpr_softc *sc)
free(sc->dpm_pg0, M_MPR);
}
-static void
+static bool
_mapping_process_dpm_pg0(struct mpr_softc *sc)
{
u8 missing_cnt, enc_idx;
@@ -2339,7 +2339,7 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc)
"%s: Conflict in mapping table for "
" enclosure %d\n", __func__,
enc_idx);
- break;
+ goto fail;
}
physical_id =
dpm_entry->PhysicalIdentifier.High;
@@ -2366,7 +2366,7 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc)
mpr_dprint(sc, MPR_ERROR | MPR_MAPPING, "%s: "
"Conflict in mapping table for device %d\n",
__func__, map_idx);
- break;
+ goto fail;
}
physical_id = dpm_entry->PhysicalIdentifier.High;
mt_entry->physical_id = (physical_id << 32) |
@@ -2378,6 +2378,18 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc)
mt_entry->device_info = MPR_DEV_RESERVED;
}
} /*close the loop for DPM table */
+ return (true);
+
+fail:
+ for (entry_num = 0; entry_num < sc->max_dpm_entries; entry_num++) {
+ sc->dpm_entry_used[entry_num] = 0;
+ /*
+ * for IR firmware, it may be necessary to wipe out
+ * sc->mapping_table volumes tooi
+ */
+ }
+ sc->num_enc_table_entries = 0;
+ return (false);
}
/*
@@ -2617,9 +2629,11 @@ retry_read_dpm:
}
}
- if (sc->is_dpm_enable)
- _mapping_process_dpm_pg0(sc);
- else {
+ if (sc->is_dpm_enable) {
+ if (!_mapping_process_dpm_pg0(sc))
+ sc->is_dpm_enable = 0;
+ }
+ if (! sc->is_dpm_enable) {
mpr_dprint(sc, MPR_MAPPING, "%s: DPM processing is disabled. "
"Device mappings will not persist across reboots or "
"resets.\n", __func__);
From owner-svn-src-all@freebsd.org Tue Nov 28 17:20:55 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AAA36DE7C96;
Tue, 28 Nov 2017 17:20:55 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 480FF6F7A4;
Tue, 28 Nov 2017 17:20:55 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASHKsWx083584;
Tue, 28 Nov 2017 17:20:54 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASHKs1p083578;
Tue, 28 Nov 2017 17:20:54 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201711281720.vASHKs1p083578@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:20:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326324 - stable/10/contrib/libc-vis
X-SVN-Group: stable-10
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: stable/10/contrib/libc-vis
X-SVN-Commit-Revision: 326324
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:20:55 -0000
Author: brooks
Date: Tue Nov 28 17:20:53 2017
New Revision: 326324
URL: https://svnweb.freebsd.org/changeset/base/326324
Log:
MFC r301679 (partial), r309626, r326307
r301679:
Update to a June 8th snapshot of (un)vis form NetBSD.
This adds stravis() and some new encoding flags VIS_SHELL, VIS_META,
and VIS_NOLOCALE.
Assorted cleanups and fixes includeing a manpage typo[0].
NOTE: The symbol for stravis() is not exported in this merge.
r309626:
strvis(3): Avoid internal state of multibyte functions being tainted.
The mbtoc(3) and wctomb(3) functions use internal state which may be
tainted before the call to strvis(3). In this context we can just use
the thread-safe versions mbrtoc(3) and wcrtomb(3) which allow passing
our own state from our stack.
r326307:
Update vis(3) the latest from NetBSD.
This adds VIS_DQ for compatiblity with OpenBSD.
Correct by an off-by-one error and a read buffer overflow detected using
asan.
PR: 210013 [0]
Submitted by: pi [0]
Modified:
stable/10/contrib/libc-vis/unvis.3
stable/10/contrib/libc-vis/unvis.c
stable/10/contrib/libc-vis/vis.3
stable/10/contrib/libc-vis/vis.c
stable/10/contrib/libc-vis/vis.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/libc-vis/unvis.3
==============================================================================
--- stable/10/contrib/libc-vis/unvis.3 Tue Nov 28 17:07:21 2017 (r326323)
+++ stable/10/contrib/libc-vis/unvis.3 Tue Nov 28 17:20:53 2017 (r326324)
@@ -1,4 +1,4 @@
-.\" $NetBSD: unvis.3,v 1.27 2012/12/15 07:34:36 wiz Exp $
+.\" $NetBSD: unvis.3,v 1.29 2017/10/24 19:14:55 abhinav Exp $
.\" $FreeBSD$
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -35,7 +35,10 @@
.Os
.Sh NAME
.Nm unvis ,
-.Nm strunvis
+.Nm strunvis ,
+.Nm strnunvis ,
+.Nm strunvisx ,
+.Nm strnunvisx
.Nd decode a visual representation of characters
.Sh LIBRARY
.Lb libc
@@ -184,7 +187,7 @@ char out;
while ((ch = getchar()) != EOF) {
again:
- switch(unvis(\*[Am]out, ch, \*[Am]state, 0)) {
+ switch(unvis(&out, ch, &state, 0)) {
case 0:
case UNVIS_NOCHAR:
break;
@@ -198,7 +201,7 @@ again:
errx(EXIT_FAILURE, "Bad character sequence!");
}
}
-if (unvis(\*[Am]out, '\e0', \*[Am]state, UNVIS_END) == UNVIS_VALID)
+if (unvis(&out, '\e0', &state, UNVIS_END) == UNVIS_VALID)
(void)putchar(out);
.Ed
.Sh ERRORS
Modified: stable/10/contrib/libc-vis/unvis.c
==============================================================================
--- stable/10/contrib/libc-vis/unvis.c Tue Nov 28 17:07:21 2017 (r326323)
+++ stable/10/contrib/libc-vis/unvis.c Tue Nov 28 17:20:53 2017 (r326324)
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.41 2012/12/15 04:29:53 matt Exp $ */
+/* $NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: unvis.c,v 1.41 2012/12/15 04:29:53 matt Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
__FBSDID("$FreeBSD$");
@@ -322,6 +322,12 @@ unvis(char *cp, int c, int *astate, int flag)
*/
*astate = SS(0, S_GROUND);
return UNVIS_NOCHAR;
+ default:
+ if (isgraph(c)) {
+ *cp = c;
+ *astate = SS(0, S_GROUND);
+ return UNVIS_VALID;
+ }
}
goto bad;
Modified: stable/10/contrib/libc-vis/vis.3
==============================================================================
--- stable/10/contrib/libc-vis/vis.3 Tue Nov 28 17:07:21 2017 (r326323)
+++ stable/10/contrib/libc-vis/vis.3 Tue Nov 28 17:20:53 2017 (r326324)
@@ -1,4 +1,4 @@
-.\" $NetBSD: vis.3,v 1.39 2013/02/20 20:05:26 christos Exp $
+.\" $NetBSD: vis.3,v 1.49 2017/08/05 20:22:29 wiz Exp $
.\" $FreeBSD$
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -30,13 +30,14 @@
.\"
.\" @(#)vis.3 8.1 (Berkeley) 6/9/93
.\"
-.Dd February 19, 2013
+.Dd April 22, 2017
.Dt VIS 3
.Os
.Sh NAME
.Nm vis ,
.Nm nvis ,
.Nm strvis ,
+.Nm stravis ,
.Nm strnvis ,
.Nm strvisx ,
.Nm strnvisx ,
@@ -60,6 +61,8 @@
.Ft int
.Fn strvis "char *dst" "const char *src" "int flag"
.Ft int
+.Fn stravis "char **dst" "const char *src" "int flag"
+.Ft int
.Fn strnvis "char *dst" "size_t dlen" "const char *src" "int flag"
.Ft int
.Fn strvisx "char *dst" "const char *src" "size_t len" "int flag"
@@ -112,6 +115,7 @@ encoding format (explained below).
.Pp
The
.Fn strvis ,
+.Fn stravis ,
.Fn strnvis ,
.Fn strvisx ,
and
@@ -158,6 +162,9 @@ forms return the number of characters in
(not including the trailing
.Dv NUL ) .
The
+.Fn stravis
+function allocates space dynamically to hold the string.
+The
.Dq Nm n
versions of the functions also take an additional argument
.Fa dlen
@@ -236,15 +243,37 @@ except space, tab, and newline are encoded (see
The following flags
alter this:
.Bl -tag -width VIS_WHITEX
+.It Dv VIS_DQ
+Also encode double quotes
.It Dv VIS_GLOB
Also encode the magic characters
.Ql ( * ,
.Ql \&? ,
-.Ql \&[
+.Ql \&[ ,
and
.Ql # )
recognized by
.Xr glob 3 .
+.It Dv VIS_SHELL
+Also encode the meta characters used by shells (in addition to the glob
+characters):
+.Ql ( ' ,
+.Ql ` ,
+.Ql \&" ,
+.Ql \&; ,
+.Ql & ,
+.Ql < ,
+.Ql > ,
+.Ql \&( ,
+.Ql \&) ,
+.Ql \&| ,
+.Ql \&] ,
+.Ql \e ,
+.Ql $ ,
+.Ql \&! ,
+.Ql \&^ ,
+and
+.Ql ~ ) .
.It Dv VIS_SP
Also encode space.
.It Dv VIS_TAB
@@ -253,11 +282,10 @@ Also encode tab.
Also encode newline.
.It Dv VIS_WHITE
Synonym for
-.Dv VIS_SP
-\&|
-.Dv VIS_TAB
-\&|
-.Dv VIS_NL .
+.Dv VIS_SP | VIS_TAB | VIS_NL .
+.It Dv VIS_META
+Synonym for
+.Dv VIS_WHITE | VIS_GLOB | VIS_SHELL .
.It Dv VIS_SAFE
Only encode
.Dq unsafe
@@ -284,7 +312,7 @@ warning on the use of the
.Dv VIS_NOSLASH
flag below).
.Pp
-There are four forms of encoding.
+There are six forms of encoding.
All forms use the backslash character
.Ql \e
to introduce a special
@@ -375,6 +403,9 @@ If
.Fa nextc
is an octal digit, the latter representation is used to
avoid ambiguity.
+.Pp
+Non-printable characters without C-style
+backslash sequences use the default representation.
.It Dv VIS_OCTAL
Use a three digit octal sequence.
The form is
@@ -382,6 +413,11 @@ The form is
where
.Em d
represents an octal digit.
+.It Dv VIS_CSTYLE \&| Dv VIS_OCTAL
+Same as
+.Dv VIS_CSTYLE
+except that non-printable characters without C-style
+backslash sequences use a three digit octal sequence.
.It Dv VIS_HTTPSTYLE
Use URI encoding as described in RFC 1738.
The form is
@@ -417,6 +453,11 @@ The encoding conversion is influenced by the setting o
environment variable which defines the set of characters
that can be copied without encoding.
.Pp
+If
+.Dv VIS_NOLOCALE
+is set, processing is done assuming the C locale and overriding
+any other environment settings.
+.Pp
When 8-bit data is present in the input,
.Ev LC_CTYPE
must be set to the correct locale or to the C locale.
@@ -512,7 +553,7 @@ appeared in
.Nx 6.0
and
.Fx 9.2 .
-Myltibyte character support was added in
+Multibyte character support was added in
.Nx 7.0
and
.Fx 9.2 .
Modified: stable/10/contrib/libc-vis/vis.c
==============================================================================
--- stable/10/contrib/libc-vis/vis.c Tue Nov 28 17:07:21 2017 (r326323)
+++ stable/10/contrib/libc-vis/vis.c Tue Nov 28 17:20:53 2017 (r326324)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $ */
+/* $NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.62 2014/09/08 17:35:01 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.74 2017/11/27 16:37:21 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef __FBSDID
__FBSDID("$FreeBSD$");
@@ -97,15 +97,42 @@ static wchar_t *do_svis(wchar_t *, wint_t, int, wint_t
#undef BELL
#define BELL L'\a'
+
+#if defined(LC_C_LOCALE)
+#define iscgraph(c) isgraph_l(c, LC_C_LOCALE)
+#else
+/* Keep it simple for now, no locale stuff */
+#define iscgraph(c) isgraph(c)
+#ifdef notyet
+#include <locale.h>
+static int
+iscgraph(int c) {
+ int rv;
+ char *ol;
+ ol = setlocale(LC_CTYPE, "C");
+ rv = isgraph(c);
+ if (ol)
+ setlocale(LC_CTYPE, ol);
+ return rv;
+}
+#endif
+#endif
+
+#define ISGRAPH(flags, c) \
+ (((flags) & VIS_NOLOCALE) ? iscgraph(c) : iswgraph(c))
+
#define iswoctal(c) (((u_char)(c)) >= L'0' && ((u_char)(c)) <= L'7')
#define iswwhite(c) (c == L' ' || c == L'\t' || c == L'\n')
#define iswsafe(c) (c == L'\b' || c == BELL || c == L'\r')
#define xtoa(c) L"0123456789abcdef"[c]
#define XTOA(c) L"0123456789ABCDEF"[c]
-#define MAXEXTRAS 10
+#define MAXEXTRAS 30
+static const wchar_t char_shell[] = L"'`\";&<>()|{}]\\$!^~";
+static const wchar_t char_glob[] = L"*?[#";
+
#if !HAVE_NBTOOL_CONFIG_H
#ifndef __NetBSD__
/*
@@ -213,8 +240,23 @@ do_mbyte(wchar_t *dst, wint_t c, int flags, wint_t nex
*dst++ = L'0';
}
return dst;
+ /* We cannot encode these characters in VIS_CSTYLE
+ * because they special meaning */
+ case L'n':
+ case L'r':
+ case L'b':
+ case L'a':
+ case L'v':
+ case L't':
+ case L'f':
+ case L's':
+ case L'0':
+ case L'M':
+ case L'^':
+ case L'$': /* vis(1) -l */
+ break;
default:
- if (iswgraph(c)) {
+ if (ISGRAPH(flags, c) && !iswoctal(c)) {
*dst++ = L'\\';
*dst++ = c;
return dst;
@@ -266,7 +308,7 @@ do_svis(wchar_t *dst, wint_t c, int flags, wint_t next
uint64_t bmsk, wmsk;
iswextra = wcschr(extra, c) != NULL;
- if (!iswextra && (iswgraph(c) || iswwhite(c) ||
+ if (!iswextra && (ISGRAPH(flags, c) || iswwhite(c) ||
((flags & VIS_SAFE) && iswsafe(c)))) {
*dst++ = c;
return dst;
@@ -310,29 +352,34 @@ makeextralist(int flags, const char *src)
{
wchar_t *dst, *d;
size_t len;
+ const wchar_t *s;
+ mbstate_t mbstate;
+ bzero(&mbstate, sizeof(mbstate));
len = strlen(src);
if ((dst = calloc(len + MAXEXTRAS, sizeof(*dst))) == NULL)
return NULL;
- if (mbstowcs(dst, src, len) == (size_t)-1) {
+ if ((flags & VIS_NOLOCALE) || mbsrtowcs(dst, &src, len, &mbstate) == (size_t)-1) {
size_t i;
for (i = 0; i < len; i++)
- dst[i] = (wint_t)(u_char)src[i];
+ dst[i] = (wchar_t)(u_char)src[i];
d = dst + len;
} else
d = dst + wcslen(dst);
- if (flags & VIS_GLOB) {
- *d++ = L'*';
- *d++ = L'?';
- *d++ = L'[';
- *d++ = L'#';
- }
+ if (flags & VIS_GLOB)
+ for (s = char_glob; *s; *d++ = *s++)
+ continue;
+ if (flags & VIS_SHELL)
+ for (s = char_shell; *s; *d++ = *s++)
+ continue;
+
if (flags & VIS_SP) *d++ = L' ';
if (flags & VIS_TAB) *d++ = L'\t';
if (flags & VIS_NL) *d++ = L'\n';
+ if (flags & VIS_DQ) *d++ = L'"';
if ((flags & VIS_NOSLASH) == 0) *d++ = L'\\';
*d = L'\0';
@@ -345,7 +392,7 @@ makeextralist(int flags, const char *src)
* All user-visible functions call this one.
*/
static int
-istrsenvisx(char *mbdst, size_t *dlen, const char *mbsrc, size_t mblength,
+istrsenvisx(char **mbdstp, size_t *dlen, const char *mbsrc, size_t mblength,
int flags, const char *mbextra, int *cerr_ptr)
{
wchar_t *dst, *src, *pdst, *psrc, *start, *extra;
@@ -353,14 +400,24 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbs
uint64_t bmsk, wmsk;
wint_t c;
visfun_t f;
- int clen = 0, cerr = 0, error = -1, i, shft;
+ int clen = 0, cerr, error = -1, i, shft;
+ char *mbdst, *mdst;
ssize_t mbslength, maxolen;
+ mbstate_t mbstate;
- _DIAGASSERT(mbdst != NULL);
+ _DIAGASSERT(mbdstp != NULL);
_DIAGASSERT(mbsrc != NULL || mblength == 0);
_DIAGASSERT(mbextra != NULL);
+ mbslength = (ssize_t)mblength;
/*
+ * When inputing a single character, must also read in the
+ * next character for nextc, the look-ahead character.
+ */
+ if (mbslength == 1)
+ mbslength++;
+
+ /*
* Input (mbsrc) is a char string considered to be multibyte
* characters. The input loop will read this string pulling
* one character, possibly multiple bytes, from mbsrc and
@@ -375,16 +432,28 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbs
/* Allocate space for the wide char strings */
psrc = pdst = extra = NULL;
- if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
+ mdst = NULL;
+ if ((psrc = calloc(mbslength + 1, sizeof(*psrc))) == NULL)
return -1;
- if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
+ if ((pdst = calloc((16 * mbslength) + 1, sizeof(*pdst))) == NULL)
goto out;
+ if (*mbdstp == NULL) {
+ if ((mdst = calloc((16 * mbslength) + 1, sizeof(*mdst))) == NULL)
+ goto out;
+ *mbdstp = mdst;
+ }
+
+ mbdst = *mbdstp;
dst = pdst;
src = psrc;
- /* Use caller's multibyte conversion error flag. */
- if (cerr_ptr)
- cerr = *cerr_ptr;
+ if (flags & VIS_NOLOCALE) {
+ /* Do one byte at a time conversion */
+ cerr = 1;
+ } else {
+ /* Use caller's multibyte conversion error flag. */
+ cerr = cerr_ptr ? *cerr_ptr : 0;
+ }
/*
* Input loop.
@@ -392,29 +461,24 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbs
* stop at NULs because we may be processing a block of data
* that includes NULs.
*/
- mbslength = (ssize_t)mblength;
- /*
- * When inputing a single character, must also read in the
- * next character for nextc, the look-ahead character.
- */
- if (mbslength == 1)
- mbslength++;
+ bzero(&mbstate, sizeof(mbstate));
while (mbslength > 0) {
/* Convert one multibyte character to wchar_t. */
if (!cerr)
- clen = mbtowc(src, mbsrc, MB_LEN_MAX);
+ clen = mbrtowc(src, mbsrc, MB_LEN_MAX, &mbstate);
if (cerr || clen < 0) {
/* Conversion error, process as a byte instead. */
*src = (wint_t)(u_char)*mbsrc;
clen = 1;
cerr = 1;
}
- if (clen == 0)
+ if (clen == 0) {
/*
* NUL in input gives 0 return value. process
* as single NUL byte and keep going.
*/
clen = 1;
+ }
/* Advance buffer character pointer. */
src++;
/* Advance input pointer by number of bytes read. */
@@ -424,6 +488,7 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbs
}
len = src - psrc;
src = psrc;
+
/*
* In the single character input case, we will have actually
* processed two characters, c and nextc. Reset len back to
@@ -439,7 +504,7 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbs
errno = ENOSPC;
goto out;
}
- *mbdst = '\0'; /* can't create extra, return "" */
+ *mbdst = '\0'; /* can't create extra, return "" */
error = 0;
goto out;
}
@@ -473,9 +538,10 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbs
len = wcslen(start);
maxolen = dlen ? *dlen : (wcslen(start) * MB_LEN_MAX + 1);
olen = 0;
+ bzero(&mbstate, sizeof(mbstate));
for (dst = start; len > 0; len--) {
if (!cerr)
- clen = wctomb(mbdst, *dst);
+ clen = wcrtomb(mbdst, *dst, &mbstate);
if (cerr || clen < 0) {
/*
* Conversion error, process as a byte(s) instead.
@@ -511,9 +577,11 @@ istrsenvisx(char *mbdst, size_t *dlen, const char *mbs
/* Terminate the output string. */
*mbdst = '\0';
- /* Pass conversion error flag out. */
- if (cerr_ptr)
- *cerr_ptr = cerr;
+ if (flags & VIS_NOLOCALE) {
+ /* Pass conversion error flag out. */
+ if (cerr_ptr)
+ *cerr_ptr = cerr;
+ }
free(extra);
free(pdst);
@@ -524,14 +592,15 @@ out:
free(extra);
free(pdst);
free(psrc);
+ free(mdst);
return error;
}
static int
-istrsenvisxl(char *mbdst, size_t *dlen, const char *mbsrc,
+istrsenvisxl(char **mbdstp, size_t *dlen, const char *mbsrc,
int flags, const char *mbextra, int *cerr_ptr)
{
- return istrsenvisx(mbdst, dlen, mbsrc,
+ return istrsenvisx(mbdstp, dlen, mbsrc,
mbsrc != NULL ? strlen(mbsrc) : 0, flags, mbextra, cerr_ptr);
}
@@ -554,7 +623,7 @@ svis(char *mbdst, int c, int flags, int nextc, const c
cc[0] = c;
cc[1] = nextc;
- ret = istrsenvisx(mbdst, NULL, cc, 1, flags, mbextra, NULL);
+ ret = istrsenvisx(&mbdst, NULL, cc, 1, flags, mbextra, NULL);
if (ret < 0)
return NULL;
return mbdst + ret;
@@ -569,7 +638,7 @@ snvis(char *mbdst, size_t dlen, int c, int flags, int
cc[0] = c;
cc[1] = nextc;
- ret = istrsenvisx(mbdst, &dlen, cc, 1, flags, mbextra, NULL);
+ ret = istrsenvisx(&mbdst, &dlen, cc, 1, flags, mbextra, NULL);
if (ret < 0)
return NULL;
return mbdst + ret;
@@ -578,33 +647,33 @@ snvis(char *mbdst, size_t dlen, int c, int flags, int
int
strsvis(char *mbdst, const char *mbsrc, int flags, const char *mbextra)
{
- return istrsenvisxl(mbdst, NULL, mbsrc, flags, mbextra, NULL);
+ return istrsenvisxl(&mbdst, NULL, mbsrc, flags, mbextra, NULL);
}
int
strsnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags, const char *mbextra)
{
- return istrsenvisxl(mbdst, &dlen, mbsrc, flags, mbextra, NULL);
+ return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, mbextra, NULL);
}
int
strsvisx(char *mbdst, const char *mbsrc, size_t len, int flags, const char *mbextra)
{
- return istrsenvisx(mbdst, NULL, mbsrc, len, flags, mbextra, NULL);
+ return istrsenvisx(&mbdst, NULL, mbsrc, len, flags, mbextra, NULL);
}
int
strsnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
const char *mbextra)
{
- return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, mbextra, NULL);
+ return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, mbextra, NULL);
}
int
strsenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
const char *mbextra, int *cerr_ptr)
{
- return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, mbextra, cerr_ptr);
+ return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, mbextra, cerr_ptr);
}
#endif
@@ -621,7 +690,7 @@ vis(char *mbdst, int c, int flags, int nextc)
cc[0] = c;
cc[1] = nextc;
- ret = istrsenvisx(mbdst, NULL, cc, 1, flags, "", NULL);
+ ret = istrsenvisx(&mbdst, NULL, cc, 1, flags, "", NULL);
if (ret < 0)
return NULL;
return mbdst + ret;
@@ -636,7 +705,7 @@ nvis(char *mbdst, size_t dlen, int c, int flags, int n
cc[0] = c;
cc[1] = nextc;
- ret = istrsenvisx(mbdst, &dlen, cc, 1, flags, "", NULL);
+ ret = istrsenvisx(&mbdst, &dlen, cc, 1, flags, "", NULL);
if (ret < 0)
return NULL;
return mbdst + ret;
@@ -653,15 +722,22 @@ nvis(char *mbdst, size_t dlen, int c, int flags, int n
int
strvis(char *mbdst, const char *mbsrc, int flags)
{
- return istrsenvisxl(mbdst, NULL, mbsrc, flags, "", NULL);
+ return istrsenvisxl(&mbdst, NULL, mbsrc, flags, "", NULL);
}
int
strnvis(char *mbdst, size_t dlen, const char *mbsrc, int flags)
{
- return istrsenvisxl(mbdst, &dlen, mbsrc, flags, "", NULL);
+ return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL);
}
+int
+stravis(char **mbdstp, const char *mbsrc, int flags)
+{
+ *mbdstp = NULL;
+ return istrsenvisxl(mbdstp, NULL, mbsrc, flags, "", NULL);
+}
+
/*
* strvisx - visually encode characters from src into dst
*
@@ -676,19 +752,19 @@ strnvis(char *mbdst, size_t dlen, const char *mbsrc, i
int
strvisx(char *mbdst, const char *mbsrc, size_t len, int flags)
{
- return istrsenvisx(mbdst, NULL, mbsrc, len, flags, "", NULL);
+ return istrsenvisx(&mbdst, NULL, mbsrc, len, flags, "", NULL);
}
int
strnvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags)
{
- return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, "", NULL);
+ return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, "", NULL);
}
int
strenvisx(char *mbdst, size_t dlen, const char *mbsrc, size_t len, int flags,
int *cerr_ptr)
{
- return istrsenvisx(mbdst, &dlen, mbsrc, len, flags, "", cerr_ptr);
+ return istrsenvisx(&mbdst, &dlen, mbsrc, len, flags, "", cerr_ptr);
}
#endif
Modified: stable/10/contrib/libc-vis/vis.h
==============================================================================
--- stable/10/contrib/libc-vis/vis.h Tue Nov 28 17:07:21 2017 (r326323)
+++ stable/10/contrib/libc-vis/vis.h Tue Nov 28 17:20:53 2017 (r326324)
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.h,v 1.21 2013/02/20 17:01:15 christos Exp $ */
+/* $NetBSD: vis.h,v 1.25 2017/04/23 01:57:36 christos Exp $ */
/* $FreeBSD$ */
/*-
@@ -52,6 +52,7 @@
#define VIS_NL 0x0010 /* also encode newline */
#define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL)
#define VIS_SAFE 0x0020 /* only encode "unsafe" characters */
+#define VIS_DQ 0x8000 /* also encode double quotes */
/*
* other
@@ -64,6 +65,9 @@
#define VIS_HTTP1866 0x0400 /* http-style &#num; or &string; */
#define VIS_NOESCAPE 0x0800 /* don't decode `\' */
#define _VIS_END 0x1000 /* for unvis */
+#define VIS_SHELL 0x2000 /* encode shell special characters [not glob] */
+#define VIS_META (VIS_WHITE | VIS_GLOB | VIS_SHELL)
+#define VIS_NOLOCALE 0x4000 /* encode using the C locale */
/*
* unvis return codes
@@ -89,6 +93,7 @@ char *svis(char *, int, int, int, const char *);
char *snvis(char *, size_t, int, int, int, const char *);
int strvis(char *, const char *, int);
+int stravis(char **, const char *, int);
int strnvis(char *, size_t, const char *, int);
int strsvis(char *, const char *, int, const char *);
From owner-svn-src-all@freebsd.org Tue Nov 28 17:25:25 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E912DE7E68;
Tue, 28 Nov 2017 17:25:25 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 0A3666FBA9;
Tue, 28 Nov 2017 17:25:24 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASHPOTg087429;
Tue, 28 Nov 2017 17:25:24 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASHPO2M087428;
Tue, 28 Nov 2017 17:25:24 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281725.vASHPO2M087428@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:25:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326325 -
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Commit-Revision: 326325
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:25:25 -0000
Author: asomers
Date: Tue Nov 28 17:25:24 2017
New Revision: 326325
URL: https://svnweb.freebsd.org/changeset/base/326325
Log:
MFC r322546:
Fix some ZFS debugging messages
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Be more careful about the use of provider names vs vdev names in
ZFS_LOG statements.
Sponsored by: Spectra Logic Corp
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Tue Nov 28 17:20:53 2017 (r326324)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c Tue Nov 28 17:25:24 2017 (r326325)
@@ -747,7 +747,7 @@ vdev_geom_open_by_guids(vdev_t *vd)
ZFS_LOG(1, "Attach by guid [%ju:%ju] succeeded, provider %s.",
(uintmax_t)spa_guid(vd->vdev_spa),
- (uintmax_t)vd->vdev_guid, vd->vdev_path);
+ (uintmax_t)vd->vdev_guid, cp->provider->name);
} else {
ZFS_LOG(1, "Search by guid [%ju:%ju] failed.",
(uintmax_t)spa_guid(vd->vdev_spa),
@@ -849,12 +849,12 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *
VERIFY(tsd_set(zfs_geom_probe_vdev_key, NULL) == 0);
if (cp == NULL) {
- ZFS_LOG(1, "Provider %s not found.", vd->vdev_path);
+ ZFS_LOG(1, "Vdev %s not found.", vd->vdev_path);
error = ENOENT;
} else if (cp->provider->sectorsize > VDEV_PAD_SIZE ||
!ISP2(cp->provider->sectorsize)) {
ZFS_LOG(1, "Provider %s has unsupported sectorsize.",
- vd->vdev_path);
+ cp->provider->name);
vdev_geom_close_locked(vd);
error = EINVAL;
@@ -872,7 +872,7 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *
}
if (error != 0) {
printf("ZFS WARNING: Unable to open %s for writing (error=%d).\n",
- vd->vdev_path, error);
+ cp->provider->name, error);
vdev_geom_close_locked(vd);
cp = NULL;
}
From owner-svn-src-all@freebsd.org Tue Nov 28 17:27:01 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0B8EDE7F21;
Tue, 28 Nov 2017 17:27:01 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7AA246FD08;
Tue, 28 Nov 2017 17:27:01 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASHR0RT087547;
Tue, 28 Nov 2017 17:27:00 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASHR07v087544;
Tue, 28 Nov 2017 17:27:00 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281727.vASHR07v087544@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:27:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326326 - stable/10/etc/periodic/security
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/etc/periodic/security
X-SVN-Commit-Revision: 326326
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:27:01 -0000
Author: asomers
Date: Tue Nov 28 17:27:00 2017
New Revision: 326326
URL: https://svnweb.freebsd.org/changeset/base/326326
Log:
MFC r322868:
Fix 100.chksetuid and 110.neggrpperm for mountpoints with spaces
Also, fix them for mountpoints with tabs.
PR: 48325
Reported by: pguyot@kallisys.net, aaron@baugher.biz
Modified:
stable/10/etc/periodic/security/100.chksetuid
stable/10/etc/periodic/security/110.neggrpperm
stable/10/etc/periodic/security/security.functions
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/periodic/security/100.chksetuid
==============================================================================
--- stable/10/etc/periodic/security/100.chksetuid Tue Nov 28 17:25:24 2017 (r326325)
+++ stable/10/etc/periodic/security/100.chksetuid Tue Nov 28 17:27:00 2017 (r326326)
@@ -45,7 +45,13 @@ if check_yesno_period security_status_chksetuid_enable
then
echo ""
echo 'Checking setuid files and devices:'
- MP=`mount -t ufs,zfs | awk '$0 !~ /no(suid|exec)/ { print $3 }'`
+ IFS=$'\n' # Don't split mount points with spaces or tabs
+ MP=`mount -t ufs,zfs | awk '
+ $0 !~ /no(suid|exec)/ {
+ sub(/^.* on \//, "/");
+ sub(/ \(.*\)/, "");
+ print $0
+ }'`
find -sx $MP /dev/null \( ! -fstype local \) -prune -o -type f \
\( -perm -u+x -or -perm -g+x -or -perm -o+x \) \
\( -perm -u+s -or -perm -g+s \) -exec ls -liTd \{\} \+ |
Modified: stable/10/etc/periodic/security/110.neggrpperm
==============================================================================
--- stable/10/etc/periodic/security/110.neggrpperm Tue Nov 28 17:25:24 2017 (r326325)
+++ stable/10/etc/periodic/security/110.neggrpperm Tue Nov 28 17:27:00 2017 (r326326)
@@ -43,7 +43,13 @@ if check_yesno_period security_status_neggrpperm_enabl
then
echo ""
echo 'Checking negative group permissions:'
- MP=`mount -t ufs,zfs | awk '$0 !~ /no(suid|exec)/ { print $3 }'`
+ IFS=$'\n' # Don't split mount points with spaces or tabs
+ MP=`mount -t ufs,zfs | awk '
+ $0 !~ /no(suid|exec)/ {
+ sub(/^.* on \//, "/");
+ sub(/ \(.*\)/, "");
+ print $0
+ }'`
n=$(find -sx $MP /dev/null \( ! -fstype local \) -prune -o -type f \
\( \( ! -perm +010 -and -perm +001 \) -or \
\( ! -perm +020 -and -perm +002 \) -or \
Modified: stable/10/etc/periodic/security/security.functions
==============================================================================
--- stable/10/etc/periodic/security/security.functions Tue Nov 28 17:25:24 2017 (r326325)
+++ stable/10/etc/periodic/security/security.functions Tue Nov 28 17:27:00 2017 (r326326)
@@ -48,6 +48,7 @@ rc=0
# LABEL is the base name of the ${LOG}/${label}.{today,yesterday} files.
check_diff() {
+ unset IFS
rc=0
if [ "$1" = "new_only" ]; then
shift
From owner-svn-src-all@freebsd.org Tue Nov 28 17:30:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B6F6DE8121;
Tue, 28 Nov 2017 17:30:27 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 33B6C70076;
Tue, 28 Nov 2017 17:30:27 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASHUQ1K087844;
Tue, 28 Nov 2017 17:30:26 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASHUQho087843;
Tue, 28 Nov 2017 17:30:26 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281730.vASHUQho087843@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:30:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326327 - stable/10/cddl/compat/opensolaris/misc
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/cddl/compat/opensolaris/misc
X-SVN-Commit-Revision: 326327
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:30:27 -0000
Author: asomers
Date: Tue Nov 28 17:30:25 2017
New Revision: 326327
URL: https://svnweb.freebsd.org/changeset/base/326327
Log:
MFC r323193:
Honor all options of "zfs mount -o"
The existing code in zmount incorrectly parses the comma-delimited option
string. The result is that nmount only honors the last option. AFAICT the
parsing has been broken ever since ZFS's initial import in change 168404.
PR: 222078
Reviewed by: avg
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12232
Modified:
stable/10/cddl/compat/opensolaris/misc/zmount.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/compat/opensolaris/misc/zmount.c
==============================================================================
--- stable/10/cddl/compat/opensolaris/misc/zmount.c Tue Nov 28 17:27:00 2017 (r326326)
+++ stable/10/cddl/compat/opensolaris/misc/zmount.c Tue Nov 28 17:30:25 2017 (r326327)
@@ -74,7 +74,7 @@ zmount(const char *spec, const char *dir, int mflag, c
char *dataptr, int datalen, char *optptr, int optlen)
{
struct iovec *iov;
- char *optstr, *os, *p;
+ char *optstr, *os, *p, *tofree;
int iovlen, rv;
assert(spec != NULL);
@@ -87,7 +87,7 @@ zmount(const char *spec, const char *dir, int mflag, c
assert(optptr != NULL);
assert(optlen > 0);
- optstr = strdup(optptr);
+ tofree = optstr = strdup(optptr);
assert(optstr != NULL);
iov = NULL;
@@ -98,11 +98,9 @@ zmount(const char *spec, const char *dir, int mflag, c
build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir),
(size_t)-1);
build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
- for (p = optstr; p != NULL; strsep(&p, ",/ ")) {
- if (*p != '\0')
- build_iovec(&iov, &iovlen, p, NULL, (size_t)-1);
- }
+ while ((p = strsep(&optstr, ",/")) != NULL)
+ build_iovec(&iov, &iovlen, p, NULL, (size_t)-1);
rv = nmount(iov, iovlen, 0);
- free(optstr);
+ free(tofree);
return (rv);
}
From owner-svn-src-all@freebsd.org Tue Nov 28 17:33:12 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 511A8DE834D;
Tue, 28 Nov 2017 17:33:12 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 19ADC7046E;
Tue, 28 Nov 2017 17:33:12 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASHXBnP091633;
Tue, 28 Nov 2017 17:33:11 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASHXBYv091632;
Tue, 28 Nov 2017 17:33:11 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281733.vASHXBYv091632@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:33:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326328 - stable/10/sys/cddl/compat/opensolaris/sys
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/sys/cddl/compat/opensolaris/sys
X-SVN-Commit-Revision: 326328
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:33:12 -0000
Author: asomers
Date: Tue Nov 28 17:33:10 2017
New Revision: 326328
URL: https://svnweb.freebsd.org/changeset/base/326328
Log:
MFC r323194:
Fix remounting ZFS filesystem with "zfs mount"
"zfs mount -o" passes a list of mount options directly to nmount(2) after
sanity checking them. In particular, zfs(8) will refuse to mount an already
existing file system unless "remount" is specified in the option list.
However, the "remount" option only exists in Illumos. FreeBSD's equivalent is
"update".
PR: 221985
Reviewed by: avg
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12233
Modified:
stable/10/sys/cddl/compat/opensolaris/sys/mntent.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/compat/opensolaris/sys/mntent.h
==============================================================================
--- stable/10/sys/cddl/compat/opensolaris/sys/mntent.h Tue Nov 28 17:30:25 2017 (r326327)
+++ stable/10/sys/cddl/compat/opensolaris/sys/mntent.h Tue Nov 28 17:33:10 2017 (r326328)
@@ -46,7 +46,7 @@
#define MNTOPT_NODEVICES "nodevices" /* Device-special disallowed */
#define MNTOPT_SETUID "setuid" /* Set uid allowed */
#define MNTOPT_NOSETUID "nosetuid" /* Set uid not allowed */
-#define MNTOPT_REMOUNT "remount" /* Change mount options */
+#define MNTOPT_REMOUNT "update" /* Change mount options */
#define MNTOPT_ATIME "atime" /* update atime for files */
#define MNTOPT_NOATIME "noatime" /* do not update atime for files */
#define MNTOPT_XATTR "xattr" /* enable extended attributes */
From owner-svn-src-all@freebsd.org Tue Nov 28 17:46:05 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FFB7DE893F;
Tue, 28 Nov 2017 17:46:05 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 14EDE70BA1;
Tue, 28 Nov 2017 17:46:04 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASHk3IE096267;
Tue, 28 Nov 2017 17:46:03 GMT (envelope-from alc@FreeBSD.org)
Received: (from alc@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASHk3SS096266;
Tue, 28 Nov 2017 17:46:03 GMT (envelope-from alc@FreeBSD.org)
Message-Id: <201711281746.vASHk3SS096266@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org
using -f
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 28 Nov 2017 17:46:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326329 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: alc
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 326329
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 17:46:05 -0000
Author: alc
Date: Tue Nov 28 17:46:03 2017
New Revision: 326329
URL: https://svnweb.freebsd.org/changeset/base/326329
Log:
When the swap pager allocates space on disk, it requests contiguous
blocks in a single call to blist_alloc(). However, when it frees
that space, it previously called blist_free() on each block, one at a
time. With this change, the swap pager identifies ranges of
contiguous blocks to be freed, and calls blist_free() once per
range. In one extreme case, that is described in the review, the time
to perform an munmap(2) was reduced by 55%.
Submitted by: Doug Moore <dougm@rice.edu>
Reviewed by: kib
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D12397
Modified:
head/sys/vm/swap_pager.c
Modified: head/sys/vm/swap_pager.c
==============================================================================
--- head/sys/vm/swap_pager.c Tue Nov 28 17:33:10 2017 (r326328)
+++ head/sys/vm/swap_pager.c Tue Nov 28 17:46:03 2017 (r326329)
@@ -390,6 +390,7 @@ SYSCTL_INT(_vm, OID_AUTO, dmmax, CTLFLAG_RD, &nsw_clus
static void swp_sizecheck(void);
static void swp_pager_async_iodone(struct buf *bp);
+static bool swp_pager_swblk_empty(struct swblk *sb, int start, int limit);
static int swapongeom(struct vnode *);
static int swaponvp(struct thread *, struct vnode *, u_long);
static int swapoff_one(struct swdevt *sp, struct ucred *cred);
@@ -397,7 +398,7 @@ static int swapoff_one(struct swdevt *sp, struct ucred
/*
* Swap bitmap functions
*/
-static void swp_pager_freeswapspace(daddr_t blk, int npages);
+static void swp_pager_freeswapspace(daddr_t blk, daddr_t npages);
static daddr_t swp_pager_getswapspace(int npages);
/*
@@ -768,10 +769,12 @@ swp_pager_strategy(struct buf *bp)
* This routine may not sleep.
*/
static void
-swp_pager_freeswapspace(daddr_t blk, int npages)
+swp_pager_freeswapspace(daddr_t blk, daddr_t npages)
{
struct swdevt *sp;
+ if (npages == 0)
+ return;
mtx_lock(&sw_dev_mtx);
TAILQ_FOREACH(sp, &swtailq, sw_list) {
if (blk >= sp->sw_first && blk < sp->sw_end) {
@@ -1761,6 +1764,22 @@ next_obj:
*/
/*
+ * SWP_PAGER_SWBLK_EMPTY() - is a range of blocks free?
+ */
+static bool
+swp_pager_swblk_empty(struct swblk *sb, int start, int limit)
+{
+ int i;
+
+ MPASS(0 <= start && start <= limit && limit <= SWAP_META_PAGES);
+ for (i = start; i < limit; i++) {
+ if (sb->d[i] != SWAPBLK_NONE)
+ return (false);
+ }
+ return (true);
+}
+
+/*
* SWP_PAGER_META_BUILD() - add swap block to swap meta data for object
*
* We first convert the object to a swap object if it is a default
@@ -1876,16 +1895,10 @@ allocated:
/*
* Free the swblk if we end up with the empty page run.
*/
- if (swapblk == SWAPBLK_NONE) {
- for (i = 0; i < SWAP_META_PAGES; i++) {
- if (sb->d[i] != SWAPBLK_NONE)
- break;
- }
- if (i == SWAP_META_PAGES) {
- SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks,
- rdpi);
- uma_zfree(swblk_zone, sb);
- }
+ if (swapblk == SWAPBLK_NONE &&
+ swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
+ SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, rdpi);
+ uma_zfree(swblk_zone, sb);
}
}
@@ -1903,37 +1916,46 @@ static void
swp_pager_meta_free(vm_object_t object, vm_pindex_t pindex, vm_pindex_t count)
{
struct swblk *sb;
+ daddr_t first_free, num_free;
vm_pindex_t last;
- int i;
- bool empty;
+ int i, limit, start;
VM_OBJECT_ASSERT_WLOCKED(object);
if (object->type != OBJT_SWAP || count == 0)
return;
- last = pindex + count - 1;
+ first_free = SWAPBLK_NONE;
+ num_free = 0;
+ last = pindex + count;
for (;;) {
sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks,
rounddown(pindex, SWAP_META_PAGES));
- if (sb == NULL || sb->p > last)
+ if (sb == NULL || sb->p >= last)
break;
- empty = true;
- for (i = 0; i < SWAP_META_PAGES; i++) {
+ start = pindex > sb->p ? pindex - sb->p : 0;
+ limit = last - sb->p < SWAP_META_PAGES ? last - sb->p :
+ SWAP_META_PAGES;
+ for (i = start; i < limit; i++) {
if (sb->d[i] == SWAPBLK_NONE)
continue;
- if (pindex <= sb->p + i && sb->p + i <= last) {
- swp_pager_freeswapspace(sb->d[i], 1);
- sb->d[i] = SWAPBLK_NONE;
- } else
- empty = false;
+ if (first_free + num_free == sb->d[i])
+ num_free++;
+ else {
+ swp_pager_freeswapspace(first_free, num_free);
+ first_free = sb->d[i];
+ num_free = 1;
+ }
+ sb->d[i] = SWAPBLK_NONE;
}
- pindex = sb->p + SWAP_META_PAGES;
- if (empty) {
+ if (swp_pager_swblk_empty(sb, 0, start) &&
+ swp_pager_swblk_empty(sb, limit, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks,
sb->p);
uma_zfree(swblk_zone, sb);
}
+ pindex = sb->p + SWAP_META_PAGES;
}
+ swp_pager_freeswapspace(first_free, num_free);
}
/*
@@ -1946,6 +1968,7 @@ static void
swp_pager_meta_free_all(vm_object_t object)
{
struct swblk *sb;
+ daddr_t first_free, num_free;
vm_pindex_t pindex;
int i;
@@ -1953,16 +1976,26 @@ swp_pager_meta_free_all(vm_object_t object)
if (object->type != OBJT_SWAP)
return;
+ first_free = SWAPBLK_NONE;
+ num_free = 0;
for (pindex = 0; (sb = SWAP_PCTRIE_LOOKUP_GE(
&object->un_pager.swp.swp_blks, pindex)) != NULL;) {
pindex = sb->p + SWAP_META_PAGES;
for (i = 0; i < SWAP_META_PAGES; i++) {
- if (sb->d[i] != SWAPBLK_NONE)
- swp_pager_freeswapspace(sb->d[i], 1);
+ if (sb->d[i] == SWAPBLK_NONE)
+ continue;
+ if (first_free + num_free == sb->d[i])
+ num_free++;
+ else {
+ swp_pager_freeswapspace(first_free, num_free);
+ first_free = sb->d[i];
+ num_free = 1;
+ }
}
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p);
uma_zfree(swblk_zone, sb);
}
+ swp_pager_freeswapspace(first_free, num_free);
}
/*
@@ -1987,7 +2020,6 @@ swp_pager_meta_ctl(vm_object_t object, vm_pindex_t pin
{
struct swblk *sb;
daddr_t r1;
- int i;
if ((flags & (SWM_FREE | SWM_POP)) != 0)
VM_OBJECT_ASSERT_WLOCKED(object);
@@ -2010,11 +2042,7 @@ swp_pager_meta_ctl(vm_object_t object, vm_pindex_t pin
return (SWAPBLK_NONE);
if ((flags & (SWM_FREE | SWM_POP)) != 0) {
sb->d[pindex % SWAP_META_PAGES] = SWAPBLK_NONE;
- for (i = 0; i < SWAP_META_PAGES; i++) {
- if (sb->d[i] != SWAPBLK_NONE)
- break;
- }
- if (i == SWAP_META_PAGES) {
+ if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks,
rounddown(pindex, SWAP_META_PAGES));
uma_zfree(swblk_zone, sb);
From owner-svn-src-all@freebsd.org Tue Nov 28 18:02:03 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B504ADE8ED8;
Tue, 28 Nov 2017 18:02:03 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 91B04713B8;
Tue, 28 Nov 2017 18:02:03 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
[73.231.226.104])
by mail.baldwin.cx (Postfix) with ESMTPSA id 39D8D10A8BE;
Tue, 28 Nov 2017 13:01:57 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Mark Johnston <markj@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326286 - head/sys/cddl/dev/dtrace
Date: Mon, 27 Nov 2017 15:58:47 -0800
Message-ID: <1636541.esPCmqdWtd@ralph.baldwin.cx>
User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; )
In-Reply-To: <20171127214140.GB75832@raichu>
References: <201711271842.vARIgNCk007369@repo.freebsd.org>
<2717040.9stBD4iAp4@ralph.baldwin.cx> <20171127214140.GB75832@raichu>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3
(mail.baldwin.cx); Tue, 28 Nov 2017 13:01:57 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx
X-Virus-Status: Clean
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:02:03 -0000
On Monday, November 27, 2017 04:41:40 PM Mark Johnston wrote:
> On Mon, Nov 27, 2017 at 11:28:07AM -0800, John Baldwin wrote:
> > On Monday, November 27, 2017 06:42:23 PM Mark Johnston wrote:
> > > Author: markj
> > > Date: Mon Nov 27 18:42:23 2017
> > > New Revision: 326286
> > > URL: https://svnweb.freebsd.org/changeset/base/326286
> > >
> > > Log:
> > > Don't use pcpu_find() to determine if a CPU ID is valid.
> > >
> > > This addresses assertion failures after r326218.
> >
> > I'd perhaps rather revert the assertion as per my other mail?
>
> I considered waiting for a resolution of that thread, but it seems to me
> that using CPU_FOREACH()/CPU_ABSENT() is more idiomatic anyway? We
> already use CPU_FOREACH() in a few places in dtrace.c, and
> dtrace_ioctl.c is meant to be a fork of the ioctl handler from illumos,
> i.e., we shouldn't make much effort to avoid diverging from upstream.
Fair enough.
--
John Baldwin
From owner-svn-src-all@freebsd.org Tue Nov 28 18:02:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCE43DE8ED3;
Tue, 28 Nov 2017 18:02:02 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9A0FA713B5;
Tue, 28 Nov 2017 18:02:02 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net
[73.231.226.104])
by mail.baldwin.cx (Postfix) with ESMTPSA id F271F10A8BC;
Tue, 28 Nov 2017 13:01:55 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326218 - head/sys/kern
Date: Mon, 27 Nov 2017 16:00:59 -0800
Message-ID: <14058479.lc6xlYgyBM@ralph.baldwin.cx>
User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; )
In-Reply-To: <3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
<3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3
(mail.baldwin.cx); Tue, 28 Nov 2017 13:01:56 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx
X-Virus-Status: Clean
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:02:02 -0000
On Monday, November 27, 2017 02:04:59 PM Nathan Whitehorn wrote:
> Unfortunately, it's unfixable on ppc64. Apologies for breaking dtrace!
> Would you like me to remove the KASSERT() here? I'm happy to do that in
> a few hours (unless you beat me to it first) -- although I do think that
> explicitly checking for CPU_ABSENT is a much better behavior in client
> code than checking the return value of pcpu_find().
It sounds like the dtrace change is actually fine as-is. At the very least
fix the style of the kassert for now I guess. In general though I think our
kernel basically depends on NULL faulting and in the past I recall Bruce has
usually advocated for depending on the page fault from NULL rather than
adding explicit assertions just for 'foo != NULL'.
>From some discussion on IRC after this e-mail though it seems that NULL
might not be entirely unfixable on powerpc64?
--
John Baldwin
From owner-svn-src-all@freebsd.org Tue Nov 28 18:02:59 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3295DE8FBA;
Tue, 28 Nov 2017 18:02:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id CAD12716B2;
Tue, 28 Nov 2017 18:02:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASI2w0M004270;
Tue, 28 Nov 2017 18:02:58 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASI2wxv004268;
Tue, 28 Nov 2017 18:02:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711281802.vASI2wxv004268@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 28 Nov 2017 18:02:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326330 - in head: release share/man/man7
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in head: release share/man/man7
X-SVN-Commit-Revision: 326330
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:03:00 -0000
Author: gjb
Date: Tue Nov 28 18:02:58 2017
New Revision: 326330
URL: https://svnweb.freebsd.org/changeset/base/326330
Log:
Add a comment to release/release.conf.sample documenting
EMBEDDEDPORTS. [1]
Remove and update stale documentation from release(7) while here.
PR: 206344 [1]
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.conf.sample
head/share/man/man7/release.7
Modified: head/release/release.conf.sample
==============================================================================
--- head/release/release.conf.sample Tue Nov 28 17:46:03 2017 (r326329)
+++ head/release/release.conf.sample Tue Nov 28 18:02:58 2017 (r326330)
@@ -61,6 +61,20 @@ PORTBRANCH="ports/head@rHEAD"
## Set when building embedded images.
#EMBEDDEDBUILD=
+## Set to a list of ports required to build embedded system-on-chip
+## images, such as sysutils/u-boot-rpi.
+#EMBEDDEDPORTS=
+
+## Set to the hardware platform of the target userland. This value
+## is passed to make(1) to set the TARGET (value of uname -m) to cross
+## build.
+#EMBEDDED_TARGET=
+
+## Set to the hardware platform of the target userland. This value
+## is passed to make(1) to set the TARGET_ARCH (value of uname -p) to
+## cross build.
+#EMBEDDED_TARGET_ARCH=
+
## Set to skip the chroot environment buildworld/installworld/distribution
## step if it is expected the build environment will exist via alternate
## means.
Modified: head/share/man/man7/release.7
==============================================================================
--- head/share/man/man7/release.7 Tue Nov 28 17:46:03 2017 (r326329)
+++ head/share/man/man7/release.7 Tue Nov 28 18:02:58 2017 (r326330)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 28, 2017
+.Dd November 28, 2017
.Dt RELEASE 7
.Os
.Sh NAME
@@ -314,7 +314,6 @@ variables are relevant only to release builds for embe
.It Va EMBEDDEDBUILD
Set to a non-null value to enable functionality for embedded device
release builds.
-.Pq This option is considered highly experimental.
.Pp
When set,
.Va WITH_DVD
@@ -322,15 +321,15 @@ is unset, and
.Va NODOC
is defined.
Additionally,
-.Va XDEV
+.Va EMBEDDED_TARGET
and
-.Va XDEV_ARCH
+.Va EMBEDDED_TARGET_ARCH
must also be defined.
When the build environment is created,
.Fa release.sh
runs a separate build script located in an architecture-specific
directory in
-.Pa src/release/${XDEV}/ .
+.Pa src/release/${EMBEDDED_TARGET}/ .
.It Va EMBEDDEDPORTS
Set to the list of any ports that are required for the target device
in the format of
@@ -338,27 +337,20 @@ in the format of
The
.Fa devel/subversion
port is built by default.
-.It Va CROCHETSRC
-Set to the source URL for the Crochet build tool.
-.It Va CROCHETBRANCH
-Set to the subversion branch from
-.Va ${CROCHETSRC}
-to use.
-Defaults to
-.Pa trunk .
-.It Va UBOOTSRC
-Set to the source URL of u-boot, if required.
-.It Va UBOOTBRANCH
-Set to the subversion branch from
-.Va ${UBOOTSRC}
-to use.
-Defaults to
-.Pa trunk .
-.It Va UBOOTDIR
-Set to the target directory within
-.Va ${CHROOTDIR}
-to check out
-.Va ${UBOOTSRC}/${UBOOTBRANCH} .
+.It Va EMBEDDED_TARGET
+When set, its value is passed to
+.Xr make 1
+to set the
+.Va TARGET
+.Pq value of Cm uname Fl m
+to cross build the target userland.
+.It Va EMBEDDED_TARGET_ARCH
+When set, its value is passed to
+.Xr make 1
+to set the
+.Va TARGET_ARCH
+.Pq value of Cm uname Fl p
+to cross build the target userland.
.El
.Sh VIRTUAL MACHINE DISK IMAGES
The following
From owner-svn-src-all@freebsd.org Tue Nov 28 18:08:15 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF3D5DEA209;
Tue, 28 Nov 2017 18:08:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 76127719A0;
Tue, 28 Nov 2017 18:08:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASI8EQg004491;
Tue, 28 Nov 2017 18:08:14 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASI8E4c004490;
Tue, 28 Nov 2017 18:08:14 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711281808.vASI8E4c004490@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 28 Nov 2017 18:08:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326331 - head/release
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/release
X-SVN-Commit-Revision: 326331
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:08:15 -0000
Author: gjb
Date: Tue Nov 28 18:08:14 2017
New Revision: 326331
URL: https://svnweb.freebsd.org/changeset/base/326331
Log:
Correct a comment after r326330.
MFC after: 3 days
MFC with: r326330
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.conf.sample
Modified: head/release/release.conf.sample
==============================================================================
--- head/release/release.conf.sample Tue Nov 28 18:02:58 2017 (r326330)
+++ head/release/release.conf.sample Tue Nov 28 18:08:14 2017 (r326331)
@@ -70,9 +70,9 @@ PORTBRANCH="ports/head@rHEAD"
## build.
#EMBEDDED_TARGET=
-## Set to the hardware platform of the target userland. This value
-## is passed to make(1) to set the TARGET_ARCH (value of uname -p) to
-## cross build.
+## Set to the machine processor architecture of the target userland.
+## This value is passed to make(1) to set the TARGET_ARCH (value of uname -p)
+## to cross build.
#EMBEDDED_TARGET_ARCH=
## Set to skip the chroot environment buildworld/installworld/distribution
From owner-svn-src-all@freebsd.org Tue Nov 28 18:18:40 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9066DEA615;
Tue, 28 Nov 2017 18:18:40 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B045971FF9;
Tue, 28 Nov 2017 18:18:40 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASIId9r008846;
Tue, 28 Nov 2017 18:18:39 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASIIdjt008841;
Tue, 28 Nov 2017 18:18:39 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281818.vASIIdjt008841@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 18:18:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326332 - in stable/10: bin/chflags bin/chflags/tests
bin/mkdir bin/mkdir/tests bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests
etc/mtree
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in stable/10: bin/chflags bin/chflags/tests bin/mkdir
bin/mkdir/tests bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests etc/mtree
X-SVN-Commit-Revision: 326332
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:18:40 -0000
Author: asomers
Date: Tue Nov 28 18:18:39 2017
New Revision: 326332
URL: https://svnweb.freebsd.org/changeset/base/326332
Log:
MFC r323275, r324112
r323275:
Add basic tests for chflags, mkdir, rcp, and rmdir
Add basic command line parsing test coverage for these utilities. The tests
were automatically generated based on their man pages. These tests can be
expanded by hand for more thorough coverage. The aim is to generate very
basic amount of test coverage for all the utilities in the base system.
Submitted by: shivansh
Reviewed by: asomers, brooks
Sponsored by: Google, Inc (GSoC 2017)
Differential Revision: https://reviews.freebsd.org/D12036
r324112:
Fix Makefile entries from r323275
Reported by: Vladimir Zakharov <zakharov.vv@gmail.com>
Reviewed by: ngie
X-MFC-With: 323275
Added:
stable/10/bin/chflags/tests/
- copied from r323275, head/bin/chflags/tests/
stable/10/bin/mkdir/tests/
- copied from r323275, head/bin/mkdir/tests/
stable/10/bin/rcp/tests/
- copied from r323275, head/bin/rcp/tests/
stable/10/bin/rmdir/tests/
- copied from r323275, head/bin/rmdir/tests/
Modified:
stable/10/bin/chflags/Makefile
stable/10/bin/mkdir/Makefile
stable/10/bin/rcp/Makefile
stable/10/bin/rmdir/Makefile
stable/10/etc/mtree/BSD.tests.dist
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/bin/chflags/Makefile
==============================================================================
--- stable/10/bin/chflags/Makefile Tue Nov 28 18:08:14 2017 (r326331)
+++ stable/10/bin/chflags/Makefile Tue Nov 28 18:18:39 2017 (r326332)
@@ -1,6 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <bsd.own.mk>
+
+PACKAGE=runtime
PROG= chflags
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/10/bin/mkdir/Makefile
==============================================================================
--- stable/10/bin/mkdir/Makefile Tue Nov 28 18:08:14 2017 (r326331)
+++ stable/10/bin/mkdir/Makefile Tue Nov 28 18:18:39 2017 (r326332)
@@ -1,6 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <bsd.own.mk>
+
+PACKAGE=runtime
PROG= mkdir
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/10/bin/rcp/Makefile
==============================================================================
--- stable/10/bin/rcp/Makefile Tue Nov 28 18:08:14 2017 (r326331)
+++ stable/10/bin/rcp/Makefile Tue Nov 28 18:18:39 2017 (r326332)
@@ -1,6 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
+.include <bsd.own.mk>
+
+PACKAGE=rcmds
PROG= rcp
SRCS= rcp.c util.c
CFLAGS+=-DBINDIR=${BINDIR}
@@ -8,5 +11,8 @@ CFLAGS+=-DBINDIR=${BINDIR}
BINOWN= root
BINMODE=4555
PRECIOUSPROG=
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/10/bin/rmdir/Makefile
==============================================================================
--- stable/10/bin/rmdir/Makefile Tue Nov 28 18:08:14 2017 (r326331)
+++ stable/10/bin/rmdir/Makefile Tue Nov 28 18:18:39 2017 (r326332)
@@ -1,6 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <bsd.own.mk>
+
+PACKAGE=runtime
PROG= rmdir
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist Tue Nov 28 18:08:14 2017 (r326331)
+++ stable/10/etc/mtree/BSD.tests.dist Tue Nov 28 18:18:39 2017 (r326332)
@@ -8,6 +8,8 @@
bin
cat
..
+ chflags
+ ..
chmod
..
date
@@ -22,11 +24,17 @@
..
ls
..
+ mkdir
+ ..
mv
..
pax
..
pkill
+ ..
+ rcp
+ ..
+ rmdir
..
sh
builtins
From owner-svn-src-all@freebsd.org Tue Nov 28 18:23:18 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD286DEA8BA;
Tue, 28 Nov 2017 18:23:18 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A416D7242E;
Tue, 28 Nov 2017 18:23:18 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASINHuO012994;
Tue, 28 Nov 2017 18:23:17 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASINH2P012987;
Tue, 28 Nov 2017 18:23:17 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201711281823.vASINH2P012987@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 28 Nov 2017 18:23:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326333 - in head/sys: amd64/linux amd64/linux32
compat/freebsd32 i386/ibcs2 i386/linux kern
X-SVN-Group: head
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: in head/sys: amd64/linux amd64/linux32 compat/freebsd32
i386/ibcs2 i386/linux kern
X-SVN-Commit-Revision: 326333
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:23:18 -0000
Author: brooks
Date: Tue Nov 28 18:23:17 2017
New Revision: 326333
URL: https://svnweb.freebsd.org/changeset/base/326333
Log:
Disable vim syntax highlighting.
Vim's default pick doesn't understand that ';' is a comment character
and the result looks horrible.
Reviewed by: emaste
Modified:
head/sys/amd64/linux/syscalls.master
head/sys/amd64/linux32/syscalls.master
head/sys/compat/freebsd32/syscalls.master
head/sys/i386/ibcs2/syscalls.master
head/sys/i386/linux/syscalls.master
head/sys/kern/syscalls.master
Modified: head/sys/amd64/linux/syscalls.master
==============================================================================
--- head/sys/amd64/linux/syscalls.master Tue Nov 28 18:18:39 2017 (r326332)
+++ head/sys/amd64/linux/syscalls.master Tue Nov 28 18:23:17 2017 (r326333)
@@ -598,3 +598,4 @@
; please, keep this line at the end.
332 AUE_NULL UNIMPL nosys
+; vim: syntax=off
Modified: head/sys/amd64/linux32/syscalls.master
==============================================================================
--- head/sys/amd64/linux32/syscalls.master Tue Nov 28 18:18:39 2017 (r326332)
+++ head/sys/amd64/linux32/syscalls.master Tue Nov 28 18:23:17 2017 (r326333)
@@ -690,3 +690,4 @@
; please, keep this line at the end.
383 AUE_NULL UNIMPL nosys
+; vim: syntax=off
Modified: head/sys/compat/freebsd32/syscalls.master
==============================================================================
--- head/sys/compat/freebsd32/syscalls.master Tue Nov 28 18:18:39 2017 (r326332)
+++ head/sys/compat/freebsd32/syscalls.master Tue Nov 28 18:23:17 2017 (r326333)
@@ -1119,3 +1119,4 @@
struct kevent32 *eventlist, \
int nevents, \
const struct timespec32 *timeout); }
+; vim: syntax=off
Modified: head/sys/i386/ibcs2/syscalls.master
==============================================================================
--- head/sys/i386/ibcs2/syscalls.master Tue Nov 28 18:18:39 2017 (r326332)
+++ head/sys/i386/ibcs2/syscalls.master Tue Nov 28 18:23:17 2017 (r326333)
@@ -202,3 +202,4 @@
125 AUE_NULL UNIMPL nosys
126 AUE_NULL UNIMPL nosys
127 AUE_NULL UNIMPL nosys
+; vim: syntax=off
Modified: head/sys/i386/linux/syscalls.master
==============================================================================
--- head/sys/i386/linux/syscalls.master Tue Nov 28 18:18:39 2017 (r326332)
+++ head/sys/i386/linux/syscalls.master Tue Nov 28 18:23:17 2017 (r326333)
@@ -697,3 +697,4 @@
; please, keep this line at the end.
383 AUE_NULL UNIMPL nosys
+; vim: syntax=off
Modified: head/sys/kern/syscalls.master
==============================================================================
--- head/sys/kern/syscalls.master Tue Nov 28 18:18:39 2017 (r326332)
+++ head/sys/kern/syscalls.master Tue Nov 28 18:23:17 2017 (r326333)
@@ -1026,3 +1026,4 @@
; Please copy any additions and changes to the following compatability tables:
; sys/compat/freebsd32/syscalls.master
+; vim: syntax=off
From owner-svn-src-all@freebsd.org Tue Nov 28 18:27:26 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEA04DEA9B9;
Tue, 28 Nov 2017 18:27:26 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 97DF572632;
Tue, 28 Nov 2017 18:27:26 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASIRPnd013197;
Tue, 28 Nov 2017 18:27:25 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASIRPhX013196;
Tue, 28 Nov 2017 18:27:25 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281827.vASIRPhX013196@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 18:27:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326334 -
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Commit-Revision: 326334
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:27:26 -0000
Author: asomers
Date: Tue Nov 28 18:27:25 2017
New Revision: 326334
URL: https://svnweb.freebsd.org/changeset/base/326334
Log:
MFC r323813:
MFV r323789: 8473 scrub does not detect errors on active spares
illumos/illumos-gate@554675eee75dd2d7398d960aa5c81083ceb8505a
https://github.com/illumos/illumos-gate/commit/554675eee75dd2d7398d960aa5c81083ceb8505a
https://www.illumos.org/issues/8473
Scrubbing is supposed to detect and repair all errors in the pool. However,
it wrongly ignores active spare devices. The problem can easily be
reproduced in OpenZFS at git rev 0ef125d with these commands:
truncate -s 64m /tmp/a /tmp/b /tmp/c
sudo zpool create testpool mirror /tmp/a /tmp/b spare /tmp/c
sudo zpool replace testpool /tmp/a /tmp/c
/bin/dd if=/dev/zero bs=1024k count=63 oseek=1 conv=notrunc of=/tmp/c
sync
sudo zpool scrub testpool
zpool status testpool # Will show 0 errors, which is wrong
sudo zpool offline testpool /tmp/a
sudo zpool scrub testpool
zpool status testpool # Will show errors on /tmp/c,
# which should've already been fixed
FreeBSD head is partially affected: the first scrub will detect some errors, but the second scrub will detect more.
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Sponsored by: Spectra Logic Corp
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Tue Nov 28 18:23:17 2017 (r326333)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Tue Nov 28 18:27:25 2017 (r326334)
@@ -29,6 +29,9 @@
#include <sys/zfs_context.h>
#include <sys/spa.h>
+#include <sys/spa_impl.h>
+#include <sys/dsl_pool.h>
+#include <sys/dsl_scan.h>
#include <sys/vdev_impl.h>
#include <sys/zio.h>
#include <sys/fs/zfs.h>
@@ -51,7 +54,7 @@ typedef struct mirror_map {
int *mm_preferred;
int mm_preferred_cnt;
int mm_children;
- boolean_t mm_replacing;
+ boolean_t mm_resilvering;
boolean_t mm_root;
mirror_child_t mm_child[];
} mirror_map_t;
@@ -124,13 +127,13 @@ vdev_mirror_map_size(int children)
}
static inline mirror_map_t *
-vdev_mirror_map_alloc(int children, boolean_t replacing, boolean_t root)
+vdev_mirror_map_alloc(int children, boolean_t resilvering, boolean_t root)
{
mirror_map_t *mm;
mm = kmem_zalloc(vdev_mirror_map_size(children), KM_SLEEP);
mm->mm_children = children;
- mm->mm_replacing = replacing;
+ mm->mm_resilvering = resilvering;
mm->mm_root = root;
mm->mm_preferred = (int *)((uintptr_t)mm +
offsetof(mirror_map_t, mm_child[children]));
@@ -222,9 +225,39 @@ vdev_mirror_map_init(zio_t *zio)
mc->mc_offset = DVA_GET_OFFSET(&dva[c]);
}
} else {
- mm = vdev_mirror_map_alloc(vd->vdev_children,
- (vd->vdev_ops == &vdev_replacing_ops ||
- vd->vdev_ops == &vdev_spare_ops), B_FALSE);
+ /*
+ * If we are resilvering, then we should handle scrub reads
+ * differently; we shouldn't issue them to the resilvering
+ * device because it might not have those blocks.
+ *
+ * We are resilvering iff:
+ * 1) We are a replacing vdev (ie our name is "replacing-1" or
+ * "spare-1" or something like that), and
+ * 2) The pool is currently being resilvered.
+ *
+ * We cannot simply check vd->vdev_resilver_txg, because it's
+ * not set in this path.
+ *
+ * Nor can we just check our vdev_ops; there are cases (such as
+ * when a user types "zpool replace pool odev spare_dev" and
+ * spare_dev is in the spare list, or when a spare device is
+ * automatically used to replace a DEGRADED device) when
+ * resilvering is complete but both the original vdev and the
+ * spare vdev remain in the pool. That behavior is intentional.
+ * It helps implement the policy that a spare should be
+ * automatically removed from the pool after the user replaces
+ * the device that originally failed.
+ *
+ * If a spa load is in progress, then spa_dsl_pool may be
+ * uninitialized. But we shouldn't be resilvering during a spa
+ * load anyway.
+ */
+ boolean_t replacing = (vd->vdev_ops == &vdev_replacing_ops ||
+ vd->vdev_ops == &vdev_spare_ops) &&
+ spa_load_state(vd->vdev_spa) == SPA_LOAD_NONE &&
+ dsl_scan_resilvering(vd->vdev_spa->spa_dsl_pool);
+ mm = vdev_mirror_map_alloc(vd->vdev_children, replacing,
+ B_FALSE);
for (c = 0; c < mm->mm_children; c++) {
mc = &mm->mm_child[c];
mc->mc_vd = vd->vdev_child[c];
@@ -454,7 +487,7 @@ vdev_mirror_io_start(zio_t *zio)
mm = vdev_mirror_map_init(zio);
if (zio->io_type == ZIO_TYPE_READ) {
- if ((zio->io_flags & ZIO_FLAG_SCRUB) && !mm->mm_replacing &&
+ if ((zio->io_flags & ZIO_FLAG_SCRUB) && !mm->mm_resilvering &&
mm->mm_children > 1) {
/*
* For scrubbing reads we need to allocate a read
@@ -594,7 +627,7 @@ vdev_mirror_io_done(zio_t *zio)
if (good_copies && spa_writeable(zio->io_spa) &&
(unexpected_errors ||
(zio->io_flags & ZIO_FLAG_RESILVER) ||
- ((zio->io_flags & ZIO_FLAG_SCRUB) && mm->mm_replacing))) {
+ ((zio->io_flags & ZIO_FLAG_SCRUB) && mm->mm_resilvering))) {
/*
* Use the good data we have in hand to repair damaged children.
*/
From owner-svn-src-all@freebsd.org Tue Nov 28 18:36:00 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44768DEAD33;
Tue, 28 Nov 2017 18:36:00 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1DD2C72ADD;
Tue, 28 Nov 2017 18:36:00 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASIZxMG017179;
Tue, 28 Nov 2017 18:35:59 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASIZwxn017174;
Tue, 28 Nov 2017 18:35:58 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281835.vASIZwxn017174@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 18:35:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326335 - in stable/10/cddl/contrib/opensolaris: cmd/zdb
cmd/ztest lib/libzpool/common lib/libzpool/common/sys
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in stable/10/cddl/contrib/opensolaris: cmd/zdb cmd/ztest
lib/libzpool/common lib/libzpool/common/sys
X-SVN-Commit-Revision: 326335
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:36:00 -0000
Author: asomers
Date: Tue Nov 28 18:35:58 2017
New Revision: 326335
URL: https://svnweb.freebsd.org/changeset/base/326335
Log:
MFC r324220:
MFC r316858 7280 Allow changing global libzpool variables in zdb
7280 Allow changing global libzpool variables in zdb and ztest through command line
illumos/illumos-gate@0e60744c982adecd0a1f146f5637475d07ab1069
https://github.com/illumos/illumos-gate/commit/0e60744c982adecd0a1f146f5637475d07ab1069
https://www.illumos.org/issues/7280
zdb is very handy for diagnosing problems with a pool in a safe and
quick way. When a pool is in a bad shape, we often want to disable some
fail-safes, or adjust some tunables in order to open them. In the
kernel, this is done by changing public variables in mdb. The goal of
this feature is to add the same capability to zdb and ztest, so that
they can change libzpool tuneables from the command line.
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Author: Pavel Zakharov <pavel.zakharov@delphix.com>
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8
stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.c
stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
stable/10/cddl/contrib/opensolaris/lib/libzpool/common/util.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Nov 28 18:27:25 2017 (r326334)
+++ stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Nov 28 18:35:58 2017 (r326335)
@@ -33,6 +33,7 @@
.Op Fl U Ar cache
.Op Fl I Ar inflight I/Os
.Op Fl x Ar dumpdir
+.Op Fl o Ar var=value
.Ar poolname
.Op Ar object ...
.Nm
@@ -252,6 +253,10 @@ Limit the number of outstanding checksum I/Os to the s
The default value is 200. This option affects the performance of the
.Fl c
option.
+.It Fl o Ar var=value
+Set the given global libzpool variable to the provided value. The value must be
+an unsigned 32-bit integer. Currently only little-endian systems are supported
+to avoid accidentally setting the high 32 bits of 64-bit variables.
.It Fl P
Print numbers in an unscaled form more amenable to parsing, eg. 1000000 rather
than 1M.
Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Nov 28 18:27:25 2017 (r326334)
+++ stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Nov 28 18:35:58 2017 (r326335)
@@ -119,7 +119,8 @@ usage(void)
{
(void) fprintf(stderr,
"Usage: %s [-CumMdibcsDvhLXFPAG] [-t txg] [-e [-p path...]] "
- "[-U config] [-I inflight I/Os] [-x dumpdir] poolname [object...]\n"
+ "[-U config] [-I inflight I/Os] [-x dumpdir] [-o var=value] "
+ "poolname [object...]\n"
" %s [-divPA] [-e -p path...] [-U config] dataset "
"[object...]\n"
" %s -mM [-LXFPA] [-t txg] [-e [-p path...]] [-U config] "
@@ -181,6 +182,8 @@ usage(void)
"checksumming I/Os [default is 200]\n");
(void) fprintf(stderr, " -G dump zfs_dbgmsg buffer before "
"exiting\n");
+ (void) fprintf(stderr, " -o <variable>=<value> set global "
+ "variable to an unsigned 32-bit integer value\n");
(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
"to make only that option verbose\n");
(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
@@ -3649,7 +3652,7 @@ main(int argc, char **argv)
spa_config_path = spa_config_path_env;
while ((c = getopt(argc, argv,
- "bcdhilmMI:suCDRSAFLXx:evp:t:U:PG")) != -1) {
+ "bcdhilmMI:suCDRSAFLXx:evp:t:U:PGo:")) != -1) {
switch (c) {
case 'b':
case 'c':
@@ -3717,6 +3720,11 @@ main(int argc, char **argv)
break;
case 'x':
vn_dumpdir = optarg;
+ break;
+ case 'o':
+ error = set_global_var(optarg);
+ if (error != 0)
+ usage();
break;
default:
usage();
Modified: stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.c Tue Nov 28 18:27:25 2017 (r326334)
+++ stable/10/cddl/contrib/opensolaris/cmd/ztest/ztest.c Tue Nov 28 18:35:58 2017 (r326335)
@@ -584,6 +584,8 @@ usage(boolean_t requested)
"\t[-F freezeloops (default: %llu)] max loops in spa_freeze()\n"
"\t[-P passtime (default: %llu sec)] time per pass\n"
"\t[-B alt_ztest (default: <none>)] alternate ztest path\n"
+ "\t[-o variable=value] ... set global variable to an unsigned\n"
+ "\t 32-bit integer value\n"
"\t[-h] (print help)\n"
"",
zo->zo_pool,
@@ -619,7 +621,7 @@ process_options(int argc, char **argv)
bcopy(&ztest_opts_defaults, zo, sizeof (*zo));
while ((opt = getopt(argc, argv,
- "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:hF:B:")) != EOF) {
+ "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:hF:B:o:")) != EOF) {
value = 0;
switch (opt) {
case 'v':
@@ -705,6 +707,10 @@ process_options(int argc, char **argv)
break;
case 'B':
(void) strlcpy(altdir, optarg, sizeof (altdir));
+ break;
+ case 'o':
+ if (set_global_var(optarg) != 0)
+ usage(B_FALSE);
break;
case 'h':
usage(B_TRUE);
Modified: stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Tue Nov 28 18:27:25 2017 (r326334)
+++ stable/10/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Tue Nov 28 18:35:58 2017 (r326335)
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
*/
/*
@@ -581,6 +581,7 @@ extern void kernel_fini(void);
struct spa;
extern void nicenum(uint64_t num, char *buf, size_t);
extern void show_pool_stats(struct spa *);
+extern int set_global_var(char *arg);
typedef struct callb_cpr {
kmutex_t *cc_lockp;
Modified: stable/10/cddl/contrib/opensolaris/lib/libzpool/common/util.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzpool/common/util.c Tue Nov 28 18:27:25 2017 (r326334)
+++ stable/10/cddl/contrib/opensolaris/lib/libzpool/common/util.c Tue Nov 28 18:35:58 2017 (r326335)
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
*/
#include <assert.h>
@@ -31,6 +32,7 @@
#include <sys/spa.h>
#include <sys/fs/zfs.h>
#include <sys/refcount.h>
+#include <dlfcn.h>
/*
* Routines needed by more than one client of libzpool.
@@ -127,4 +129,59 @@ show_pool_stats(spa_t *spa)
show_vdev_stats(NULL, ZPOOL_CONFIG_SPARES, nvroot, 0);
nvlist_free(config);
+}
+
+/*
+ * Sets given global variable in libzpool to given unsigned 32-bit value.
+ * arg: "<variable>=<value>"
+ */
+int
+set_global_var(char *arg)
+{
+ void *zpoolhdl;
+ char *varname = arg, *varval;
+ u_longlong_t val;
+
+#ifndef _LITTLE_ENDIAN
+ /*
+ * On big endian systems changing a 64-bit variable would set the high
+ * 32 bits instead of the low 32 bits, which could cause unexpected
+ * results.
+ */
+ fprintf(stderr, "Setting global variables is only supported on "
+ "little-endian systems\n", varname);
+ return (ENOTSUP);
+#endif
+ if ((varval = strchr(arg, '=')) != NULL) {
+ *varval = '\0';
+ varval++;
+ val = strtoull(varval, NULL, 0);
+ if (val > UINT32_MAX) {
+ fprintf(stderr, "Value for global variable '%s' must "
+ "be a 32-bit unsigned integer\n", varname);
+ return (EOVERFLOW);
+ }
+ } else {
+ return (EINVAL);
+ }
+
+ zpoolhdl = dlopen("libzpool.so", RTLD_LAZY);
+ if (zpoolhdl != NULL) {
+ uint32_t *var;
+ var = dlsym(zpoolhdl, varname);
+ if (var == NULL) {
+ fprintf(stderr, "Global variable '%s' does not exist "
+ "in libzpool.so\n", varname);
+ return (EINVAL);
+ }
+ *var = (uint32_t)val;
+
+ dlclose(zpoolhdl);
+ } else {
+ fprintf(stderr, "Failed to open libzpool.so to set global "
+ "variable\n");
+ return (EIO);
+ }
+
+ return (0);
}
From owner-svn-src-all@freebsd.org Tue Nov 28 18:45:00 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29900DEB180;
Tue, 28 Nov 2017 18:45:00 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 033D073127;
Tue, 28 Nov 2017 18:44:59 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASIiwhr021165;
Tue, 28 Nov 2017 18:44:59 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASIiwhF021163;
Tue, 28 Nov 2017 18:44:58 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281844.vASIiwhF021163@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 18:44:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326336 - stable/10/cddl/contrib/opensolaris/cmd/zdb
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/cddl/contrib/opensolaris/cmd/zdb
X-SVN-Commit-Revision: 326336
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 18:45:00 -0000
Author: asomers
Date: Tue Nov 28 18:44:58 2017
New Revision: 326336
URL: https://svnweb.freebsd.org/changeset/base/326336
Log:
MFC r324221:
MFV r316861: 6866 zdb -l should return non-zero if it fails to find any label
illumos/illumos-gate@64723e361134b2a2c45341334174f9d34002f8d0
https://github.com/illumos/illumos-gate/commit/64723e361134b2a2c45341334174f9d34002f8d0
https://www.illumos.org/issues/6866
Need this for #6865.
To be generally more scripting-friendly, overload this issue with adding '-q'
option which should skip printing any label information.
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Author: Yuri Pankov <yuri.pankov@nexenta.com>
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8
stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Nov 28 18:35:58 2017 (r326335)
+++ stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Nov 28 18:44:58 2017 (r326336)
@@ -15,11 +15,12 @@
.\" Copyright 2012, Richard Lowe.
.\" Copyright (c) 2012, Marcelo Araujo <araujo@FreeBSD.org>.
.\" Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+.\" Copyright 2016 Nexenta Systems, Inc.
.\" All Rights Reserved.
.\"
.\" $FreeBSD$
.\"
-.Dd July 26, 2014
+.Dd October 1, 2017
.Dt ZDB 8
.Os
.Sh NAME
@@ -27,7 +28,7 @@
.Nd Display zpool debugging and consistency information
.Sh SYNOPSIS
.Nm
-.Op Fl CumdibcsDvhLMXFPA
+.Op Fl CmdibcsDvhLMXFPA
.Op Fl e Op Fl p Ar path...
.Op Fl t Ar txg
.Op Fl U Ar cache
@@ -64,7 +65,7 @@
.Ar poolname
.Nm
.Fl l
-.Op Fl uA
+.Op Fl Aqu
.Ar device
.Nm
.Fl C
@@ -156,9 +157,14 @@ dataset.
If specified multiple times, display counts of each intent log transaction
type.
.It Fl l Ar device
-Display the vdev labels from the specified device.
+Read the vdev labels from the specified device.
+Return 0 if a valid label was found, 1 if an error occurred, and 2 if no valid
+labels were found.
If the
.Fl u
+option is also specified, also display the uberblocks on this device.
+If the
+.Fl q
option is also specified, also display the uberblocks on this device.
.It Fl L
Disable leak tracing and the loading of space maps.
Modified: stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Nov 28 18:35:58 2017 (r326335)
+++ stable/10/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Nov 28 18:44:58 2017 (r326336)
@@ -23,6 +23,7 @@
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2016 by Delphix. All rights reserved.
* Copyright (c) 2014 Integros [integros.com]
+ * Copyright 2016 Nexenta Systems, Inc.
*/
#include <stdio.h>
@@ -118,7 +119,7 @@ static void
usage(void)
{
(void) fprintf(stderr,
- "Usage: %s [-CumMdibcsDvhLXFPAG] [-t txg] [-e [-p path...]] "
+ "Usage: %s [-CmMdibcsDvhLXFPAG] [-t txg] [-e [-p path...]] "
"[-U config] [-I inflight I/Os] [-x dumpdir] [-o var=value] "
"poolname [object...]\n"
" %s [-divPA] [-e -p path...] [-U config] dataset "
@@ -128,7 +129,7 @@ usage(void)
" %s -R [-A] [-e [-p path...]] poolname "
"vdev:offset:size[:flags]\n"
" %s -S [-PA] [-e [-p path...]] [-U config] poolname\n"
- " %s -l [-uA] device\n"
+ " %s -l [-Aqu] device\n"
" %s -C [-A] [-U config]\n\n",
cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname);
@@ -139,7 +140,6 @@ usage(void)
(void) fprintf(stderr, " If object numbers are specified, only "
"those objects are dumped\n\n");
(void) fprintf(stderr, " Options to control amount of output:\n");
- (void) fprintf(stderr, " -u uberblock\n");
(void) fprintf(stderr, " -d dataset(s)\n");
(void) fprintf(stderr, " -i intent logs\n");
(void) fprintf(stderr, " -C config (or cachefile if alone)\n");
@@ -153,7 +153,7 @@ usage(void)
(void) fprintf(stderr, " -D dedup statistics\n");
(void) fprintf(stderr, " -S simulate dedup to measure effect\n");
(void) fprintf(stderr, " -v verbose (applies to all others)\n");
- (void) fprintf(stderr, " -l dump label contents\n");
+ (void) fprintf(stderr, " -l read label contents\n");
(void) fprintf(stderr, " -L disable leak tracking (do not "
"load spacemaps)\n");
(void) fprintf(stderr, " -R read and display block from a "
@@ -184,6 +184,8 @@ usage(void)
"exiting\n");
(void) fprintf(stderr, " -o <variable>=<value> set global "
"variable to an unsigned 32-bit integer value\n");
+ (void) fprintf(stderr, " -q don't print label contents\n");
+ (void) fprintf(stderr, " -u uberblock\n");
(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
"to make only that option verbose\n");
(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
@@ -2203,84 +2205,94 @@ dump_label_uberblocks(vdev_label_t *lbl, uint64_t ashi
}
}
-static void
+static int
dump_label(const char *dev)
{
int fd;
vdev_label_t label;
- char *path, *buf = label.vl_vdev_phys.vp_nvlist;
+ char path[MAXPATHLEN];
+ char *buf = label.vl_vdev_phys.vp_nvlist;
size_t buflen = sizeof (label.vl_vdev_phys.vp_nvlist);
struct stat64 statbuf;
uint64_t psize, ashift;
- int len = strlen(dev) + 1;
+ boolean_t label_found = B_FALSE;
- if (strncmp(dev, ZFS_DISK_ROOTD, strlen(ZFS_DISK_ROOTD)) == 0) {
- len++;
- path = malloc(len);
- (void) snprintf(path, len, "%s%s", ZFS_RDISK_ROOTD,
- dev + strlen(ZFS_DISK_ROOTD));
- } else {
- path = strdup(dev);
- }
+ (void) strlcpy(path, dev, sizeof (path));
+ if (dev[0] == '/') {
+ if (strncmp(dev, ZFS_DISK_ROOTD,
+ strlen(ZFS_DISK_ROOTD)) == 0) {
+ (void) snprintf(path, sizeof (path), "%s%s",
+ ZFS_RDISK_ROOTD, dev + strlen(ZFS_DISK_ROOTD));
+ }
+ } else if (stat64(path, &statbuf) != 0) {
+ char *s;
- if ((fd = open64(path, O_RDONLY)) < 0) {
- (void) printf("cannot open '%s': %s\n", path, strerror(errno));
- free(path);
- exit(1);
+ (void) snprintf(path, sizeof (path), "%s%s", ZFS_RDISK_ROOTD,
+ dev);
+ if ((s = strrchr(dev, 's')) == NULL || !isdigit(*(s + 1)))
+ (void) strlcat(path, "s0", sizeof (path));
}
- if (fstat64(fd, &statbuf) != 0) {
+ if (stat64(path, &statbuf) != 0) {
(void) printf("failed to stat '%s': %s\n", path,
strerror(errno));
- free(path);
- (void) close(fd);
exit(1);
}
if (S_ISBLK(statbuf.st_mode)) {
(void) printf("cannot use '%s': character device required\n",
path);
- free(path);
- (void) close(fd);
exit(1);
}
+ if ((fd = open64(path, O_RDONLY)) < 0) {
+ (void) printf("cannot open '%s': %s\n", path, strerror(errno));
+ exit(1);
+ }
+
psize = statbuf.st_size;
psize = P2ALIGN(psize, (uint64_t)sizeof (vdev_label_t));
for (int l = 0; l < VDEV_LABELS; l++) {
nvlist_t *config = NULL;
- (void) printf("--------------------------------------------\n");
- (void) printf("LABEL %d\n", l);
- (void) printf("--------------------------------------------\n");
+ if (!dump_opt['q']) {
+ (void) printf("------------------------------------\n");
+ (void) printf("LABEL %d\n", l);
+ (void) printf("------------------------------------\n");
+ }
if (pread64(fd, &label, sizeof (label),
vdev_label_offset(psize, l, 0)) != sizeof (label)) {
- (void) printf("failed to read label %d\n", l);
+ if (!dump_opt['q'])
+ (void) printf("failed to read label %d\n", l);
continue;
}
if (nvlist_unpack(buf, buflen, &config, 0) != 0) {
- (void) printf("failed to unpack label %d\n", l);
+ if (!dump_opt['q'])
+ (void) printf("failed to unpack label %d\n", l);
ashift = SPA_MINBLOCKSHIFT;
} else {
nvlist_t *vdev_tree = NULL;
- dump_nvlist(config, 4);
+ if (!dump_opt['q'])
+ dump_nvlist(config, 4);
if ((nvlist_lookup_nvlist(config,
ZPOOL_CONFIG_VDEV_TREE, &vdev_tree) != 0) ||
(nvlist_lookup_uint64(vdev_tree,
ZPOOL_CONFIG_ASHIFT, &ashift) != 0))
ashift = SPA_MINBLOCKSHIFT;
nvlist_free(config);
+ label_found = B_TRUE;
}
if (dump_opt['u'])
dump_label_uberblocks(&label, ashift);
}
- free(path);
(void) close(fd);
+
+ return (label_found ? 0 : 2);
}
static uint64_t dataset_feature_count[SPA_FEATURES];
@@ -3652,7 +3664,7 @@ main(int argc, char **argv)
spa_config_path = spa_config_path_env;
while ((c = getopt(argc, argv,
- "bcdhilmMI:suCDRSAFLXx:evp:t:U:PGo:")) != -1) {
+ "bcdhilmMI:suCDRSAFLXx:evp:t:U:PGo:q")) != -1) {
switch (c) {
case 'b':
case 'c':
@@ -3678,6 +3690,7 @@ main(int argc, char **argv)
case 'X':
case 'e':
case 'P':
+ case 'q':
dump_opt[c]++;
break;
case 'I':
@@ -3781,10 +3794,8 @@ main(int argc, char **argv)
usage();
}
- if (dump_opt['l']) {
- dump_label(argv[0]);
- return (0);
- }
+ if (dump_opt['l'])
+ return (dump_label(argv[0]));
if (dump_opt['X'] || dump_opt['F'])
rewind = ZPOOL_DO_REWIND |
From owner-svn-src-all@freebsd.org Tue Nov 28 19:09:06 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 987D3DEBA7F;
Tue, 28 Nov 2017 19:09:06 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 648EC73E09;
Tue, 28 Nov 2017 19:09:06 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASJ95cI030151;
Tue, 28 Nov 2017 19:09:05 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASJ952a030150;
Tue, 28 Nov 2017 19:09:05 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201711281909.vASJ952a030150@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 28 Nov 2017 19:09:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326337 - stable/11/usr.sbin/syslogd
X-SVN-Group: stable-11
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: stable/11/usr.sbin/syslogd
X-SVN-Commit-Revision: 326337
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 19:09:06 -0000
Author: glebius
Date: Tue Nov 28 19:09:05 2017
New Revision: 326337
URL: https://svnweb.freebsd.org/changeset/base/326337
Log:
Revert r326103, as it appeared to be incorrect.
Modified:
stable/11/usr.sbin/syslogd/syslogd.c
Modified: stable/11/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/11/usr.sbin/syslogd/syslogd.c Tue Nov 28 18:44:58 2017 (r326336)
+++ stable/11/usr.sbin/syslogd/syslogd.c Tue Nov 28 19:09:05 2017 (r326337)
@@ -972,7 +972,7 @@ static void
logmsg(int pri, const char *msg, const char *from, int flags)
{
struct filed *f;
- int i, j, fac, msglen, omask, prilev;
+ int i, fac, msglen, omask, prilev;
const char *timestamp;
char prog[NAME_MAX+1];
char buf[MAXLINE+1];
@@ -1018,19 +1018,6 @@ logmsg(int pri, const char *msg, const char *from, int
}
prilev = LOG_PRI(pri);
-
- /* skip hostname, see RFC 3164 */
- for (i = 0, j = 0; i < NAME_MAX; i++) {
- if (isspace(msg[i])) {
- j = i + 1;
- }
- if (msg[i] == ':')
- break;
- }
- if (j <= msglen) {
- msg += j;
- msglen -= j;
- }
/* extract program name */
for (i = 0; i < NAME_MAX; i++) {
From owner-svn-src-all@freebsd.org Tue Nov 28 19:18:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3ACBCDEBE98;
Tue, 28 Nov 2017 19:18:02 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 07BB07447F;
Tue, 28 Nov 2017 19:18:01 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASJI1IJ034161;
Tue, 28 Nov 2017 19:18:01 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASJI1bb034160;
Tue, 28 Nov 2017 19:18:01 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201711281918.vASJI1bb034160@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 28 Nov 2017 19:18:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326338 - head/usr.sbin/syslogd
X-SVN-Group: head
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: head/usr.sbin/syslogd
X-SVN-Commit-Revision: 326338
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 19:18:02 -0000
Author: glebius
Date: Tue Nov 28 19:18:00 2017
New Revision: 326338
URL: https://svnweb.freebsd.org/changeset/base/326338
Log:
Fix obvious NULL pointer dereference from r310350.
Modified:
head/usr.sbin/syslogd/syslogd.c
Modified: head/usr.sbin/syslogd/syslogd.c
==============================================================================
--- head/usr.sbin/syslogd/syslogd.c Tue Nov 28 19:09:05 2017 (r326337)
+++ head/usr.sbin/syslogd/syslogd.c Tue Nov 28 19:18:00 2017 (r326338)
@@ -792,14 +792,13 @@ socklist_recv_sock(struct socklist *sl)
} else {
hname = cvthname(sa);
unmapped(sa);
- if (validate(sa, hname) == 0)
- hname = NULL;
+ if (validate(sa, hname) == 0) {
+ dprintf("Message from %s was ignored.", hname);
+ return (-1);
+ }
date = RemoteAddDate ? ADDDATE : 0;
}
- if (hname != NULL)
- printline(hname, line, date);
- else
- dprintf("Invalid msg from %s was ignored.", hname);
+ printline(hname, line, date);
return (0);
}
From owner-svn-src-all@freebsd.org Tue Nov 28 19:25:03 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13EAADEC149;
Tue, 28 Nov 2017 19:25:03 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D3D9C74962;
Tue, 28 Nov 2017 19:25:02 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASJP2W4038342;
Tue, 28 Nov 2017 19:25:02 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASJP2cb038341;
Tue, 28 Nov 2017 19:25:02 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201711281925.vASJP2cb038341@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 28 Nov 2017 19:25:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326339 - head/usr.sbin/syslogd
X-SVN-Group: head
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: head/usr.sbin/syslogd
X-SVN-Commit-Revision: 326339
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 19:25:03 -0000
Author: glebius
Date: Tue Nov 28 19:25:01 2017
New Revision: 326339
URL: https://svnweb.freebsd.org/changeset/base/326339
Log:
Revert r325558 as it is incorrect.
Modified:
head/usr.sbin/syslogd/syslogd.c
Modified: head/usr.sbin/syslogd/syslogd.c
==============================================================================
--- head/usr.sbin/syslogd/syslogd.c Tue Nov 28 19:18:00 2017 (r326338)
+++ head/usr.sbin/syslogd/syslogd.c Tue Nov 28 19:25:01 2017 (r326339)
@@ -1035,7 +1035,7 @@ static void
logmsg(int pri, const char *msg, const char *from, int flags)
{
struct filed *f;
- int i, j, fac, msglen, prilev;
+ int i, fac, msglen, prilev;
const char *timestamp;
char prog[NAME_MAX+1];
char buf[MAXLINE+1];
@@ -1077,19 +1077,6 @@ logmsg(int pri, const char *msg, const char *from, int
return;
prilev = LOG_PRI(pri);
-
- /* skip hostname, see RFC 3164 */
- for (i = 0, j = 0; i < NAME_MAX; i++) {
- if (isspace(msg[i])) {
- j = i + 1;
- }
- if (msg[i] == ':')
- break;
- }
- if (j <= msglen) {
- msg += j;
- msglen -= j;
- }
/* extract program name */
for (i = 0; i < NAME_MAX; i++) {
From owner-svn-src-all@freebsd.org Tue Nov 28 19:46:49 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E11BFDECAF2;
Tue, 28 Nov 2017 19:46:49 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id AD34E7555C;
Tue, 28 Nov 2017 19:46:49 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASJkmLx046772;
Tue, 28 Nov 2017 19:46:48 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASJkmVu046771;
Tue, 28 Nov 2017 19:46:48 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281946.vASJkmVu046771@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 19:46:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326340 - stable/10/share/man/man4
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/share/man/man4
X-SVN-Commit-Revision: 326340
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 19:46:50 -0000
Author: asomers
Date: Tue Nov 28 19:46:48 2017
New Revision: 326340
URL: https://svnweb.freebsd.org/changeset/base/326340
Log:
MFC r324805:
Fix the mps(4) HISTORY section.
Looks like a copy/paste error from r302673.
Sponsored by: Spectra Logic Corp
Modified:
stable/10/share/man/man4/mps.4
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man4/mps.4
==============================================================================
--- stable/10/share/man/man4/mps.4 Tue Nov 28 19:25:01 2017 (r326339)
+++ stable/10/share/man/man4/mps.4 Tue Nov 28 19:46:48 2017 (r326340)
@@ -356,7 +356,8 @@ These bits have the described effects:
.Sh HISTORY
The
.Nm
-driver first appeared in FreeBSD 9.3.
+driver first appeared in
+.Fx 9.0 .
.Sh AUTHORS
The
.Nm
From owner-svn-src-all@freebsd.org Tue Nov 28 19:57:17 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8405CDECF63;
Tue, 28 Nov 2017 19:57:17 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5DAE275C52;
Tue, 28 Nov 2017 19:57:17 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASJvGgP051009;
Tue, 28 Nov 2017 19:57:16 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASJvGDR051008;
Tue, 28 Nov 2017 19:57:16 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711281957.vASJvGDR051008@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 19:57:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326341 - stable/10/sys/dev/mpr
X-SVN-Group: stable-10
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: stable/10/sys/dev/mpr
X-SVN-Commit-Revision: 326341
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 19:57:17 -0000
Author: asomers
Date: Tue Nov 28 19:57:16 2017
New Revision: 326341
URL: https://svnweb.freebsd.org/changeset/base/326341
Log:
MFC r325363:
Fix mpr(4) panics caused by bad drive mapping tables
sys/dev/mpr/mpr_mapping.c
If _mapping_process_dpm_pg0 detects inconsistencies in the drive
mapping table (stored in the HBA's NVRAM), abort reading it and
continue to boot as if the mapping table were blank. I observed
such inconsistencies in several HBAs after upgrading firmware from
14.0.0.0 to 15.0.0.0.
Reviewed by: slm
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D12901
Modified:
stable/10/sys/dev/mpr/mpr_mapping.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/mpr/mpr_mapping.c
==============================================================================
--- stable/10/sys/dev/mpr/mpr_mapping.c Tue Nov 28 19:46:48 2017 (r326340)
+++ stable/10/sys/dev/mpr/mpr_mapping.c Tue Nov 28 19:57:16 2017 (r326341)
@@ -2210,7 +2210,7 @@ mpr_mapping_free_memory(struct mpr_softc *sc)
free(sc->dpm_pg0, M_MPR);
}
-static void
+static bool
_mapping_process_dpm_pg0(struct mpr_softc *sc)
{
u8 missing_cnt, enc_idx;
@@ -2339,7 +2339,7 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc)
"%s: Conflict in mapping table for "
" enclosure %d\n", __func__,
enc_idx);
- break;
+ goto fail;
}
physical_id =
dpm_entry->PhysicalIdentifier.High;
@@ -2366,7 +2366,7 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc)
mpr_dprint(sc, MPR_ERROR | MPR_MAPPING, "%s: "
"Conflict in mapping table for device %d\n",
__func__, map_idx);
- break;
+ goto fail;
}
physical_id = dpm_entry->PhysicalIdentifier.High;
mt_entry->physical_id = (physical_id << 32) |
@@ -2378,6 +2378,18 @@ _mapping_process_dpm_pg0(struct mpr_softc *sc)
mt_entry->device_info = MPR_DEV_RESERVED;
}
} /*close the loop for DPM table */
+ return (true);
+
+fail:
+ for (entry_num = 0; entry_num < sc->max_dpm_entries; entry_num++) {
+ sc->dpm_entry_used[entry_num] = 0;
+ /*
+ * for IR firmware, it may be necessary to wipe out
+ * sc->mapping_table volumes tooi
+ */
+ }
+ sc->num_enc_table_entries = 0;
+ return (false);
}
/*
@@ -2617,9 +2629,11 @@ retry_read_dpm:
}
}
- if (sc->is_dpm_enable)
- _mapping_process_dpm_pg0(sc);
- else {
+ if (sc->is_dpm_enable) {
+ if (!_mapping_process_dpm_pg0(sc))
+ sc->is_dpm_enable = 0;
+ }
+ if (! sc->is_dpm_enable) {
mpr_dprint(sc, MPR_MAPPING, "%s: DPM processing is disabled. "
"Device mappings will not persist across reboots or "
"resets.\n", __func__);
From owner-svn-src-all@freebsd.org Tue Nov 28 20:37:28 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94AA0DEE1E9;
Tue, 28 Nov 2017 20:37:28 +0000 (UTC)
(envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 609DE7752F;
Tue, 28 Nov 2017 20:37:28 +0000 (UTC)
(envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASKbR6g068415;
Tue, 28 Nov 2017 20:37:27 GMT (envelope-from arichardson@FreeBSD.org)
Received: (from arichardson@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASKbRIj068414;
Tue, 28 Nov 2017 20:37:27 GMT (envelope-from arichardson@FreeBSD.org)
Message-Id: <201711282037.vASKbRIj068414@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arichardson set sender to
arichardson@FreeBSD.org using -f
From: Alex Richardson <arichardson@FreeBSD.org>
Date: Tue, 28 Nov 2017 20:37:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326342 - head/lib/libc/mips/gen
X-SVN-Group: head
X-SVN-Commit-Author: arichardson
X-SVN-Commit-Paths: head/lib/libc/mips/gen
X-SVN-Commit-Revision: 326342
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 20:37:28 -0000
Author: arichardson
Date: Tue Nov 28 20:37:27 2017
New Revision: 326342
URL: https://svnweb.freebsd.org/changeset/base/326342
Log:
Fix fabs() for MIPS when used on -0.0
It would previously return negative zero for -0.0 since -0.0 does not
compare less than 0. The issue was discovered when running the libc++
test suite on softfloat MIPS64.
I have verified that both clang and GCC generate sensible code for the
builtin. For soft float they clear the sign bit using integer operations
and in hard float mode they use abs.d.
Reviewed by: #mips, jhb, brooks, imp, emaste
Approved by: jhb (mentor)
Differential Revision: https://reviews.freebsd.org/D13135
Modified:
head/lib/libc/mips/gen/fabs.c
Modified: head/lib/libc/mips/gen/fabs.c
==============================================================================
--- head/lib/libc/mips/gen/fabs.c Tue Nov 28 19:57:16 2017 (r326341)
+++ head/lib/libc/mips/gen/fabs.c Tue Nov 28 20:37:27 2017 (r326342)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
double
fabs(double x)
{
- if (x < 0)
- x = -x;
- return(x);
+
+ return (__builtin_fabs(x));
}
From owner-svn-src-all@freebsd.org Tue Nov 28 20:37:58 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74889DEE248;
Tue, 28 Nov 2017 20:37:58 +0000 (UTC)
(envelope-from asomers@gmail.com)
Received: from mail-lf0-x231.google.com (mail-lf0-x231.google.com
[IPv6:2a00:1450:4010:c07::231])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id E801677677;
Tue, 28 Nov 2017 20:37:57 +0000 (UTC)
(envelope-from asomers@gmail.com)
Received: by mail-lf0-x231.google.com with SMTP id t197so1315407lfe.7;
Tue, 28 Nov 2017 12:37:57 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc;
bh=yiNZ9sLWfbEopR8ioOpk+t53mu0W1eh7DOf04syE36U=;
b=CjJvsDXQQWH9ADZbB40JyMKK8PhpISan2qCBGGrLV4J6GTUv78pA+PVGfO8Xk0JLGk
Rw12j3ROJ9/b2MX+FyGqxBqWqwFYEkLOJnHp4JpQHSVEZ0on+XrXIqNprFp75ZD/duAs
plSaqn2t8xQ9rDwUmK64GB5oDAMQs+TbKKNU8R61iMnZAqcwVQVjhIHjUUdYLjOtVmP+
m0Q4DWZVuBx33XofiaApF9dK+z+HCsqyG7z6HX7RoevXe6aGf30detco7ylkWFlmdxpt
2rpf8ezF94qzs58RNbwgo44M1GMOBnHZcifobp3FqfmXOlN6n2Qf5NChOwFaBnh6Sftn
X/qw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
:date:message-id:subject:to:cc;
bh=yiNZ9sLWfbEopR8ioOpk+t53mu0W1eh7DOf04syE36U=;
b=g5cWKpUOETtjA21psblMp9j3mJvlEIOcDFfnqIzYzQnVT5Qa6L+AAVt3k/UHsDa4hY
KpssjpfEZFuZIpazuSYO2dEp5+amnTAY7gxpMyDWa+M++rHnVtSWV1DQbPFXF1hD9a67
aBr1dTWElaPqPiKojWMkv5SroCkOK08FaR+8Mk4pcuPuWOidkhHxBImYk4BU+KikszLT
xNBiAuyMn59NtgmKmkHNpXE88ztUQ7B0zYnoyU4Qn3mv6U/HJwpuBXILEfS/9mcbi12/
l6bQsdwfn6M+bVkrTb2G0Hou2rt5+kRc8sP+B88RhS8a2AijwY7l4y4AJvbakc98zsJi
8ZEg==
X-Gm-Message-State: AJaThX6msVWkZbUXDP7ehrz+FJtOCKIN4/wBpSmPPLQBu5Ha4JQ3d0BU
dc1E67UYFw7Bfb9ed6ZJfXuqA8FP+UiW+vhNh78=
X-Google-Smtp-Source: AGs4zMb3UdOGejonY8d801+Ck+Iedu5yj4/re1ku2e/Q1wFeA+sIk+lQQbyqy2EBUTiTB9rQluUPODngey6GFYxgagM=
X-Received: by 10.25.121.10 with SMTP id u10mr151336lfc.50.1511901475709; Tue,
28 Nov 2017 12:37:55 -0800 (PST)
MIME-Version: 1.0
Sender: asomers@gmail.com
Received: by 10.179.76.19 with HTTP; Tue, 28 Nov 2017 12:37:55 -0800 (PST)
In-Reply-To: <20171127064940.GA91390@x2.osted.lan>
References: <201711252049.vAPKnRaA026691@repo.freebsd.org>
<20171126064927.GA68986@x2.osted.lan>
<CAGudoHGzi08_Th3DDkyMSWG006akL=fhF08SfZzgE2CBCA1H4Q@mail.gmail.com>
<20171127064940.GA91390@x2.osted.lan>
From: Alan Somers <asomers@freebsd.org>
Date: Tue, 28 Nov 2017 13:37:55 -0700
X-Google-Sender-Auth: CqJpNXyk97sCv3OP99Cknl6B5v8
Message-ID: <CAOtMX2hpG44t=djBsO4+xfvYuA0TY2+TkueZ9UgFJiN=1MGvbw@mail.gmail.com>
Subject: Re: svn commit: r326200 - head/sys/kern
To: Peter Holm <peter@holm.cc>
Cc: Mateusz Guzik <mjguzik@gmail.com>, Mateusz Guzik <mjg@freebsd.org>,
"src-committers@freebsd.org" <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 20:37:58 -0000
On Sun, Nov 26, 2017 at 11:49 PM, Peter Holm <peter@holm.cc> wrote:
> On Sun, Nov 26, 2017 at 10:11:21PM +0100, Mateusz Guzik wrote:
>> On Sun, Nov 26, 2017 at 7:49 AM, Peter Holm <peter@holm.cc> wrote:
>>
>> > On Sat, Nov 25, 2017 at 08:49:27PM +0000, Mateusz Guzik wrote:
>> > > Author: mjg
>> > > Date: Sat Nov 25 20:49:27 2017
>> > > New Revision: 326200
>> > > URL: https://svnweb.freebsd.org/changeset/base/326200
>> > >
>> > > Log:
>> > > Add the missing lockstat check for thread lock.
>> > >
>> > > Modified:
>> > > head/sys/kern/kern_mutex.c
>> > >
>> > > Modified: head/sys/kern/kern_mutex.c
>> > > ============================================================
>> > ==================
>> > > --- head/sys/kern/kern_mutex.c Sat Nov 25 20:37:13 2017
>> > (r326199)
>> >
>> > Hi Mateusz,
>> >
>> > Could this be yours?
>> >
>> > spin lock 0xffffffff81ddc100 (turnstile chain) held by 0xfffff80014e57000
>> > (tid 100277) too long
>> > panic: spin lock held too long
>> > cpuid = 20
>> > time = 1511677687
>> > KDB: stack backtrace:
>> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
>> > 0xfffffe104f86ea40
>> > vpanic() at vpanic+0x268/frame 0xfffffe104f86eb10
>> > kproc_shutdown() at kproc_shutdown/frame 0xfffffe104f86eb70
>> > _mtx_lock_spin_failed() at _mtx_lock_spin_failed+0x87/frame
>> > 0xfffffe104f86eba0
>> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x4ba/frame
>> > 0xfffffe104f86ed10
>> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x21f/frame
>> > 0xfffffe104f86edb0
>> > turnstile_trywait() at turnstile_trywait+0x32/frame 0xfffffe104f86edd0
>> > __rw_rlock_hard() at __rw_rlock_hard+0x118/frame 0xfffffe104f86ee60
>> > __rw_rlock_int() at __rw_rlock_int+0xd5/frame 0xfffffe104f86ee90
>> > getblk() at getblk+0xdb/frame 0xfffffe104f86ef40
>> > breadn_flags() at breadn_flags+0x6e/frame 0xfffffe104f86eff0
>> > ffs_getcg() at ffs_getcg+0x20d/frame 0xfffffe104f86f0d0
>> > ffs_nodealloccg() at ffs_nodealloccg+0xd0/frame 0xfffffe104f86f210
>> > ffs_hashalloc() at ffs_hashalloc+0xb7/frame 0xfffffe104f86f290
>> > ffs_valloc() at ffs_valloc+0x1c1/frame 0xfffffe104f86f390
>> > ufs_makeinode() at ufs_makeinode+0xba/frame 0xfffffe104f86f520
>> > ufs_create() at ufs_create+0x34/frame 0xfffffe104f86f540
>> > VOP_CREATE_APV() at VOP_CREATE_APV+0x241/frame 0xfffffe104f86f5c0
>> > VOP_CREATE() at VOP_CREATE+0x59/frame 0xfffffe104f86f620
>> > vn_open_cred() at vn_open_cred+0x311/frame 0xfffffe104f86f770
>> > vn_open() at vn_open+0x4c/frame 0xfffffe104f86f7b0
>> > kern_openat() at kern_openat+0x212/frame 0xfffffe104f86f920
>> > syscallenter() at syscallenter+0x4e4/frame 0xfffffe104f86f9f0
>> > amd64_syscall() at amd64_syscall+0x4d/frame 0xfffffe104f86fab0
>> >
>> > https://people.freebsd.org/~pho/stress/log/mateusz004.txt
>> >
>> > - Peter
>> >
>>
>> Fixed in r326237.
>>
>
> Yes, that fixed the issue reported.
> After some more tests I got this one:
>
> 20171127 01:19:57 all (31/561): mkfifo2c.sh
> spin lock 0xffffffff81edace0 (smp rendezvous) held by 0xfffff80d2ae31000 (tid 100529) too long
> panic: spin lock held too long
> cpuid = 14
> time = 1511742163
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe105096c0b0
> vpanic() at vpanic+0x19c/frame 0xfffffe105096c130
> panic() at panic+0x43/frame 0xfffffe105096c190
> _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame 0xfffffe105096c200
> __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame 0xfffffe105096c240
> smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame 0xfffffe105096c2c0
> smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame 0xfffffe105096c2f0
> pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame 0xfffffe105096c340
> allocbuf() at allocbuf+0x107/frame 0xfffffe105096c3b0
> brelse() at brelse+0x219/frame 0xfffffe105096c400
> trunc_dependencies() at trunc_dependencies+0x745/frame 0xfffffe105096c4a0
> softdep_setup_freeblocks() at softdep_setup_freeblocks+0x7b4/frame 0xfffffe105096c510
> ffs_truncate() at ffs_truncate+0x6b8/frame 0xfffffe105096c700
> ufs_inactive() at ufs_inactive+0x1cb/frame 0xfffffe105096c740
> VOP_INACTIVE_APV() at VOP_INACTIVE_APV+0xfd/frame 0xfffffe105096c770
> vinactive() at vinactive+0xe3/frame 0xfffffe105096c7c0
> vputx() at vputx+0x31e/frame 0xfffffe105096c820
> kern_rmdirat() at kern_rmdirat+0x1c9/frame 0xfffffe105096c980
> amd64_syscall() at amd64_syscall+0x7ab/frame 0xfffffe105096cab0
>
> Not so much more info here, I'm afraid:
> https://people.freebsd.org/~pho/stress/log/mateusz005.txt
>
> --
> Peter
I'm seeing a similar panic, at r326314:
panic: spin lock held too long
cpuid = 3
time = 1511900768
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe0b58bcef00
vpanic() at vpanic+0x19c/frame 0xfffffe0b58bcef80
panic() at panic+0x43/frame 0xfffffe0b58bcefe0
_mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame 0xfffffe0b58bcf050
__mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame 0xfffffe0b58bcf090
smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame
0xfffffe0b58bcf110
smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame
0xfffffe0b58bcf140
pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame 0xfffffe0b58bcf190
vm_thread_stack_dispose() at vm_thread_stack_dispose+0x2f/frame
0xfffffe0b58bcf1e0
thread_free() at thread_free+0x39/frame 0xfffffe0b58bcf200
thread_reap() at thread_reap+0x9e/frame 0xfffffe0b58bcf220
thread_alloc() at thread_alloc+0xf/frame 0xfffffe0b58bcf240
kthread_add() at kthread_add+0x43/frame 0xfffffe0b58bcf2e0
_taskqueue_start_threads() at _taskqueue_start_threads+0xde/frame
0xfffffe0b58bcf370
taskqueue_start_threads() at taskqueue_start_threads+0x3f/frame
0xfffffe0b58bcf3d0
taskq_create_proc() at taskq_create_proc+0x92/frame 0xfffffe0b58bcf400
spa_activate() at spa_activate+0x372/frame 0xfffffe0b58bcf4a0
spa_open_common() at spa_open_common+0xd2/frame 0xfffffe0b58bcf510
spa_get_stats() at spa_get_stats+0x4f/frame 0xfffffe0b58bcf6f0
zfs_ioc_pool_stats() at zfs_ioc_pool_stats+0x25/frame 0xfffffe0b58bcf730
zfsdev_ioctl() at zfsdev_ioctl+0x766/frame 0xfffffe0b58bcf7e0
devfs_ioctl() at devfs_ioctl+0xcb/frame 0xfffffe0b58bcf830
VOP_IOCTL_APV() at VOP_IOCTL_APV+0xd9/frame 0xfffffe0b58bcf860
vn_ioctl() at vn_ioctl+0x124/frame 0xfffffe0b58bcf970
devfs_ioctl_f() at devfs_ioctl_f+0x1f/frame 0xfffffe0b58bcf990
kern_ioctl() at kern_ioctl+0x2c4/frame 0xfffffe0b58bcf9f0
sys_ioctl() at sys_ioctl+0x15c/frame 0xfffffe0b58bcfac0
amd64_syscall() at amd64_syscall+0x79b/frame 0xfffffe0b58bcfbf0
Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe0b58bcfbf0
From owner-svn-src-all@freebsd.org Tue Nov 28 20:44:11 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2431DEE584;
Tue, 28 Nov 2017 20:44:11 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6F9CE77C73;
Tue, 28 Nov 2017 20:44:11 +0000 (UTC)
(envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASKiArb072664;
Tue, 28 Nov 2017 20:44:10 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASKiAJw072662;
Tue, 28 Nov 2017 20:44:10 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201711282044.vASKiAJw072662@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 28 Nov 2017 20:44:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326343 - head/etc/rc.d
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/etc/rc.d
X-SVN-Commit-Revision: 326343
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 20:44:11 -0000
Author: asomers
Date: Tue Nov 28 20:44:10 2017
New Revision: 326343
URL: https://svnweb.freebsd.org/changeset/base/326343
Log:
Fix fetching ntp leapfile after 325256
Submitted by: Ronald Klop <ronald-lists@klop.ws>
Reviewed by: asomers
MFC after: 3 days
X-MFC-With: 325256
Modified:
head/etc/rc.d/ntpd
Modified: head/etc/rc.d/ntpd
==============================================================================
--- head/etc/rc.d/ntpd Tue Nov 28 20:37:27 2017 (r326342)
+++ head/etc/rc.d/ntpd Tue Nov 28 20:44:10 2017 (r326343)
@@ -20,6 +20,8 @@ fetch_cmd="ntpd_fetch_leapfile"
needfetch_cmd="ntpd_needfetch_leapfile"
start_precmd="ntpd_precmd"
+ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
+
load_rc_config $name
ntpd_precmd()
@@ -92,15 +94,13 @@ ntpd_init_leapfile() {
}
ntpd_needfetch_leapfile() {
- local ntp_tmp_leapfile rc verbose
+ local rc verbose
if checkyesno ntp_leapfile_fetch_verbose; then
verbose=echo
else
verbose=:
fi
-
- ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
ntp_ver_no_src=$(get_ntp_leapfile_ver $ntp_src_leapfile)
ntp_expiry_src=$(get_ntp_leapfile_expiry $ntp_src_leapfile)
From owner-svn-src-all@freebsd.org Tue Nov 28 20:52:24 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7E81DEEA0E;
Tue, 28 Nov 2017 20:52:24 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 97A627848F;
Tue, 28 Nov 2017 20:52:24 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP
id JmrYei8yPRDG7JmraeUU0O; Tue, 28 Nov 2017 13:52:18 -0700
X-Authority-Analysis: v=2.2 cv=b+PC2pOx c=1 sm=1 tr=0
a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17
a=kj9zAlcOel0A:10 a=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=T8hboYP3AAAA:8
a=YxBL1-UpAAAA:8 a=Ix0BpYk2IbgdxZ2hD4QA:9 a=CjuIK1q_8ugA:10
a=IjZwj45LgO3ly-622nXo:22 a=3Xhr1e3L9Km7VwPPQCJS:22 a=Ia-lj3WSrqcvXOmTRaiG:22
Received: from slippy.cwsent.com (slippy8 [10.2.2.6])
by spqr.komquats.com (Postfix) with ESMTPS id EF1A9735;
Tue, 28 Nov 2017 12:52:16 -0800 (PST)
Received: from slippy.cwsent.com (localhost [127.0.0.1])
by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id vASKq0XB048780;
Tue, 28 Nov 2017 12:52:00 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Received: from slippy (cy@localhost)
by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id vASKq05m048772;
Tue, 28 Nov 2017 12:52:00 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Message-Id: <201711282052.vASKq05m048772@slippy.cwsent.com>
X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs
X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7
Reply-to: Cy Schubert <Cy.Schubert@komquats.com>
From: Cy Schubert <Cy.Schubert@komquats.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Alan Somers <asomers@FreeBSD.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326343 - head/etc/rc.d
In-Reply-To: Message from Alan Somers <asomers@FreeBSD.org> of "Tue,
28 Nov 2017 20:44:10 +0000." <201711282044.vASKiAJw072662@repo.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Tue, 28 Nov 2017 12:52:00 -0800
X-CMAE-Envelope: MS4wfGgE7ATF9Lnd8NQaiP0rGuo0qM5hnmpoqS+t2mF78mTlgflODLHUKl7w9j1qm34cIujsQ0BK1A/v1fvpoy4T2q0oBrBG32Ge+5fPy1Y+R3M0mPT8L7mr
rXHiNysZCET3wD9VqdwrcAmZyJoRW9YVP6cCP0YbWMwkI7CQUHWKB33/dWBT4s758E+y+VO9B2+rTO5wHMuPdQwd8HqASKElCjPcslF+Bme9vPaBofFHCj6P
W/U7fUocrZNZtr6A0uSxRoXFi1DO6fcdAlI4KSNQtak+HZr8/9R+QgYt9nAGqfm6
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 20:52:25 -0000
In message <201711282044.vASKiAJw072662@repo.freebsd.org>, Alan Somers
writes:
> Author: asomers
> Date: Tue Nov 28 20:44:10 2017
> New Revision: 326343
> URL: https://svnweb.freebsd.org/changeset/base/326343
>
> Log:
> Fix fetching ntp leapfile after 325256
>
> Submitted by: Ronald Klop <ronald-lists@klop.ws>
> Reviewed by: asomers
> MFC after: 3 days
> X-MFC-With: 325256
>
> Modified:
> head/etc/rc.d/ntpd
>
> Modified: head/etc/rc.d/ntpd
> =============================================================================
> =
> --- head/etc/rc.d/ntpd Tue Nov 28 20:37:27 2017 (r326342)
> +++ head/etc/rc.d/ntpd Tue Nov 28 20:44:10 2017 (r326343)
> @@ -20,6 +20,8 @@ fetch_cmd="ntpd_fetch_leapfile"
> needfetch_cmd="ntpd_needfetch_leapfile"
> start_precmd="ntpd_precmd"
>
> +ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
> +
> load_rc_config $name
>
> ntpd_precmd()
> @@ -92,15 +94,13 @@ ntpd_init_leapfile() {
> }
>
> ntpd_needfetch_leapfile() {
> - local ntp_tmp_leapfile rc verbose
> + local rc verbose
>
> if checkyesno ntp_leapfile_fetch_verbose; then
> verbose=echo
> else
> verbose=:
> fi
> -
> - ntp_tmp_leapfile="/var/run/ntpd.leap-seconds.list"
>
> ntp_ver_no_src=$(get_ntp_leapfile_ver $ntp_src_leapfile)
> ntp_expiry_src=$(get_ntp_leapfile_expiry $ntp_src_leapfile)
>
Thanks.
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
From owner-svn-src-all@freebsd.org Tue Nov 28 21:56:03 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 882A2DF009D;
Tue, 28 Nov 2017 21:56:03 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au
[211.29.132.53])
by mx1.freebsd.org (Postfix) with ESMTP id DF84E7A5CF;
Tue, 28 Nov 2017 21:56:02 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id EE9DDD46CA6;
Wed, 29 Nov 2017 08:55:55 +1100 (AEDT)
Date: Wed, 29 Nov 2017 08:55:55 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Alex Richardson <arichardson@freebsd.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326342 - head/lib/libc/mips/gen
In-Reply-To: <201711282037.vASKbRIj068414@repo.freebsd.org>
Message-ID: <20171129074249.B1145@besplex.bde.org>
References: <201711282037.vASKbRIj068414@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=cK6QihWN c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=oa1cjdcb5Po7lzyVjUwA:9 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 21:56:03 -0000
On Tue, 28 Nov 2017, Alex Richardson wrote:
> Log:
> Fix fabs() for MIPS when used on -0.0
Only arm and mips have this in C in libc. arm still has the broken version,
libm has better versions. Only 1 in C and none in asm, where libc has
many C and asm versions with at least 1 still wrong. The version in
libc is almost never used, ust like the versions in libc, since the
builtin versions are usually used automatically.
> It would previously return negative zero for -0.0 since -0.0 does not
> compare less than 0. The issue was discovered when running the libc++
> test suite on softfloat MIPS64.
Since the builtin is usually used, test programs usually don't find this
bug. Presumably softfloat turns off the builtin, but how does your fix
work then (see below)? For testing libm, I prevent use of builtins and
even in functions in the standard library by renaming functions in a copy
of the source code and testing the renamed functions. -fno-builtin
should work for turning off builtins.
> I have verified that both clang and GCC generate sensible code for the
> builtin. For soft float they clear the sign bit using integer operations
> and in hard float mode they use abs.d.
Seems good enough for a single arch. Did you test O0 -fno-builtin? -O0
should be supported for debugging, but it is not so reasonable to compile
libc with -fno-builtin.
> Modified: head/lib/libc/mips/gen/fabs.c
> ==============================================================================
> --- head/lib/libc/mips/gen/fabs.c Tue Nov 28 19:57:16 2017 (r326341)
> +++ head/lib/libc/mips/gen/fabs.c Tue Nov 28 20:37:27 2017 (r326342)
> @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
> double
> fabs(double x)
> {
> - if (x < 0)
> - x = -x;
> - return(x);
> +
> + return (__builtin_fabs(x));
> }
Why doesn't the libc++ test suite on softfloat MIPS64 hide the bug by using
the builtin instead of this function? If the builtin is turned off completely,
then the above either doesn't compile or generates a call to the nonexistent
public function __builtin_fabs().
The builtin isn't useable in general because some compilers don't have it,
and ones that have it might have a fake version which calls the non-builtin
version which gives endless recursion. This normally calls the function of
the same name (fabs here) instead of a function with the underscored name.
libm's semi-portable implementation for all arches is:
X double
X fabs(double x)
X {
X u_int32_t high;
X GET_HIGH_WORD(high,x);
X SET_HIGH_WORD(x,high&0x7fffffff);
X return x;
X }
This works on any arch with IEEE754 doubles.
It works by zeroing the sign bit. Compilers should turn this into the
same code as the builtin, and clang on amd64 does (clang on i386 is not
so good). However, older compilers tend to pessimize by copying through
32-bit integer registers or the stack just like the code asks for.
Bruce
From owner-svn-src-all@freebsd.org Tue Nov 28 22:47:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1BD06DF12BA;
Tue, 28 Nov 2017 22:47:27 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: from mail-qt0-x22e.google.com (mail-qt0-x22e.google.com
[IPv6:2607:f8b0:400d:c0d::22e])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id C58657BEDD;
Tue, 28 Nov 2017 22:47:26 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: by mail-qt0-x22e.google.com with SMTP id u10so2052452qtg.2;
Tue, 28 Nov 2017 14:47:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:cc; bh=jHojvR76jx0B8FtLeA/CEIJHln5F2m7EJdooU/gQASI=;
b=MCISNV1H56UOj+5E1piJy/mV404kgtQBS6HzSSV12wRVaD0Zc/faMDhk9yGfkyvy7W
cI5hnCQc+zeNP+wUXKAdp5wqguKW/+HIZCU3rRCYWKpqMjeNjXqutvFsPInCKifVNrEB
Bi5jm5oX/T0NUx7tbFeSotLWmw8oKZ4zUE0z4gHPchvAyhQwMYn9HdGpUvhcuDRk+9Ea
J4g4Oaj4eEvRCWVIFxclG1XmUUJZxS+1WNbycFE4Xscp928D7TZ/8gN3FgIziIGiX4tU
puB5p4El82FrGtA5K/EpvNx9/C85I37TAlZH9jXgDkZJMDyd+Lk4uiqxIi0lVUPRJza3
Tk7w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:in-reply-to:references:from:date
:message-id:subject:to:cc;
bh=jHojvR76jx0B8FtLeA/CEIJHln5F2m7EJdooU/gQASI=;
b=hWHhgfFLumaEO+zMvZANyjoZSkwCRda9jfexEkixLC8nVmBqnvIhU0nqNwrFfi5rDS
/3IxP24tl6bteP3FQL8T4vTtxhhd2gDdYO0w4t733arRiDLxuL2Ixf+N/nkVAz0+RAiu
3fMiMM3T0CpdCfxabZhZrLQo4zW/7Jby0eugMlqhsr1adbQnIYRiN0QeRRmg2kgmQaWC
q96Y60uF48s8qbescQUQTDgiIv1yPMmK6EjGkFcjjk7IY/wKHalgddiIW1IqZE1aJYET
iwzaXu1td6lPS1MJp3vKB0sWP5Wqz7OFSYM7e2QPYBAZYlfFJcOcmeueD/kNUZ93amN/
98/w==
X-Gm-Message-State: AJaThX4YfHlToX3EkKnjnE7WjPqItZmtsn+YmuOvF23+Eik3aBz318dt
5WFV1jwLcWxaSaBq0UDXk7sH8NrcK2/MiiEFa/Y=
X-Google-Smtp-Source: AGs4zMajGLrbUG8q8UKJxln1JUS1YqpOIxAEI8ME7x2W2xp5FgwrHoSOvpLUuCPSoaaaci1k9KK2viBJXk7El78VT78=
X-Received: by 10.200.39.122 with SMTP id h55mr1415362qth.56.1511909245786;
Tue, 28 Nov 2017 14:47:25 -0800 (PST)
MIME-Version: 1.0
Received: by 10.200.29.17 with HTTP; Tue, 28 Nov 2017 14:47:25 -0800 (PST)
In-Reply-To: <CAOtMX2hpG44t=djBsO4+xfvYuA0TY2+TkueZ9UgFJiN=1MGvbw@mail.gmail.com>
References: <201711252049.vAPKnRaA026691@repo.freebsd.org>
<20171126064927.GA68986@x2.osted.lan>
<CAGudoHGzi08_Th3DDkyMSWG006akL=fhF08SfZzgE2CBCA1H4Q@mail.gmail.com>
<20171127064940.GA91390@x2.osted.lan>
<CAOtMX2hpG44t=djBsO4+xfvYuA0TY2+TkueZ9UgFJiN=1MGvbw@mail.gmail.com>
From: Mateusz Guzik <mjguzik@gmail.com>
Date: Tue, 28 Nov 2017 23:47:25 +0100
Message-ID: <CAGudoHE=s2fAbvgAU8bxTgzGe8UPnhi7aeFKGV81EkAjBi-vsg@mail.gmail.com>
Subject: Re: svn commit: r326200 - head/sys/kern
To: Alan Somers <asomers@freebsd.org>
Cc: Peter Holm <peter@holm.cc>, Mateusz Guzik <mjg@freebsd.org>,
"src-committers@freebsd.org" <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.25
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 22:47:27 -0000
Sorry for top-posting. I have a reproducer.
If I wont be able to fix it later today I'll revert.
On Tue, Nov 28, 2017 at 9:37 PM, Alan Somers <asomers@freebsd.org> wrote:
> On Sun, Nov 26, 2017 at 11:49 PM, Peter Holm <peter@holm.cc> wrote:
> > On Sun, Nov 26, 2017 at 10:11:21PM +0100, Mateusz Guzik wrote:
> >> On Sun, Nov 26, 2017 at 7:49 AM, Peter Holm <peter@holm.cc> wrote:
> >>
> >> > On Sat, Nov 25, 2017 at 08:49:27PM +0000, Mateusz Guzik wrote:
> >> > > Author: mjg
> >> > > Date: Sat Nov 25 20:49:27 2017
> >> > > New Revision: 326200
> >> > > URL: https://svnweb.freebsd.org/changeset/base/326200
> >> > >
> >> > > Log:
> >> > > Add the missing lockstat check for thread lock.
> >> > >
> >> > > Modified:
> >> > > head/sys/kern/kern_mutex.c
> >> > >
> >> > > Modified: head/sys/kern/kern_mutex.c
> >> > > ============================================================
> >> > ==================
> >> > > --- head/sys/kern/kern_mutex.c Sat Nov 25 20:37:13 2017
> >> > (r326199)
> >> >
> >> > Hi Mateusz,
> >> >
> >> > Could this be yours?
> >> >
> >> > spin lock 0xffffffff81ddc100 (turnstile chain) held by
> 0xfffff80014e57000
> >> > (tid 100277) too long
> >> > panic: spin lock held too long
> >> > cpuid = 20
> >> > time = 1511677687
> >> > KDB: stack backtrace:
> >> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> >> > 0xfffffe104f86ea40
> >> > vpanic() at vpanic+0x268/frame 0xfffffe104f86eb10
> >> > kproc_shutdown() at kproc_shutdown/frame 0xfffffe104f86eb70
> >> > _mtx_lock_spin_failed() at _mtx_lock_spin_failed+0x87/frame
> >> > 0xfffffe104f86eba0
> >> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x4ba/frame
> >> > 0xfffffe104f86ed10
> >> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x21f/frame
> >> > 0xfffffe104f86edb0
> >> > turnstile_trywait() at turnstile_trywait+0x32/frame 0xfffffe104f86edd0
> >> > __rw_rlock_hard() at __rw_rlock_hard+0x118/frame 0xfffffe104f86ee60
> >> > __rw_rlock_int() at __rw_rlock_int+0xd5/frame 0xfffffe104f86ee90
> >> > getblk() at getblk+0xdb/frame 0xfffffe104f86ef40
> >> > breadn_flags() at breadn_flags+0x6e/frame 0xfffffe104f86eff0
> >> > ffs_getcg() at ffs_getcg+0x20d/frame 0xfffffe104f86f0d0
> >> > ffs_nodealloccg() at ffs_nodealloccg+0xd0/frame 0xfffffe104f86f210
> >> > ffs_hashalloc() at ffs_hashalloc+0xb7/frame 0xfffffe104f86f290
> >> > ffs_valloc() at ffs_valloc+0x1c1/frame 0xfffffe104f86f390
> >> > ufs_makeinode() at ufs_makeinode+0xba/frame 0xfffffe104f86f520
> >> > ufs_create() at ufs_create+0x34/frame 0xfffffe104f86f540
> >> > VOP_CREATE_APV() at VOP_CREATE_APV+0x241/frame 0xfffffe104f86f5c0
> >> > VOP_CREATE() at VOP_CREATE+0x59/frame 0xfffffe104f86f620
> >> > vn_open_cred() at vn_open_cred+0x311/frame 0xfffffe104f86f770
> >> > vn_open() at vn_open+0x4c/frame 0xfffffe104f86f7b0
> >> > kern_openat() at kern_openat+0x212/frame 0xfffffe104f86f920
> >> > syscallenter() at syscallenter+0x4e4/frame 0xfffffe104f86f9f0
> >> > amd64_syscall() at amd64_syscall+0x4d/frame 0xfffffe104f86fab0
> >> >
> >> > https://people.freebsd.org/~pho/stress/log/mateusz004.txt
> >> >
> >> > - Peter
> >> >
> >>
> >> Fixed in r326237.
> >>
> >
> > Yes, that fixed the issue reported.
> > After some more tests I got this one:
> >
> > 20171127 01:19:57 all (31/561): mkfifo2c.sh
> > spin lock 0xffffffff81edace0 (smp rendezvous) held by 0xfffff80d2ae31000
> (tid 100529) too long
> > panic: spin lock held too long
> > cpuid = 14
> > time = 1511742163
> > KDB: stack backtrace:
> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> 0xfffffe105096c0b0
> > vpanic() at vpanic+0x19c/frame 0xfffffe105096c130
> > panic() at panic+0x43/frame 0xfffffe105096c190
> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame
> 0xfffffe105096c200
> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame
> 0xfffffe105096c240
> > smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame
> 0xfffffe105096c2c0
> > smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame
> 0xfffffe105096c2f0
> > pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame
> 0xfffffe105096c340
> > allocbuf() at allocbuf+0x107/frame 0xfffffe105096c3b0
> > brelse() at brelse+0x219/frame 0xfffffe105096c400
> > trunc_dependencies() at trunc_dependencies+0x745/frame 0xfffffe105096c4a0
> > softdep_setup_freeblocks() at softdep_setup_freeblocks+0x7b4/frame
> 0xfffffe105096c510
> > ffs_truncate() at ffs_truncate+0x6b8/frame 0xfffffe105096c700
> > ufs_inactive() at ufs_inactive+0x1cb/frame 0xfffffe105096c740
> > VOP_INACTIVE_APV() at VOP_INACTIVE_APV+0xfd/frame 0xfffffe105096c770
> > vinactive() at vinactive+0xe3/frame 0xfffffe105096c7c0
> > vputx() at vputx+0x31e/frame 0xfffffe105096c820
> > kern_rmdirat() at kern_rmdirat+0x1c9/frame 0xfffffe105096c980
> > amd64_syscall() at amd64_syscall+0x7ab/frame 0xfffffe105096cab0
> >
> > Not so much more info here, I'm afraid:
> > https://people.freebsd.org/~pho/stress/log/mateusz005.txt
> >
> > --
> > Peter
>
> I'm seeing a similar panic, at r326314:
>
> panic: spin lock held too long
> cpuid = 3
> time = 1511900768
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> 0xfffffe0b58bcef00
> vpanic() at vpanic+0x19c/frame 0xfffffe0b58bcef80
> panic() at panic+0x43/frame 0xfffffe0b58bcefe0
> _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame
> 0xfffffe0b58bcf050
> __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame
> 0xfffffe0b58bcf090
> smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame
> 0xfffffe0b58bcf110
> smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame
> 0xfffffe0b58bcf140
> pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame
> 0xfffffe0b58bcf190
> vm_thread_stack_dispose() at vm_thread_stack_dispose+0x2f/frame
> 0xfffffe0b58bcf1e0
> thread_free() at thread_free+0x39/frame 0xfffffe0b58bcf200
> thread_reap() at thread_reap+0x9e/frame 0xfffffe0b58bcf220
> thread_alloc() at thread_alloc+0xf/frame 0xfffffe0b58bcf240
> kthread_add() at kthread_add+0x43/frame 0xfffffe0b58bcf2e0
> _taskqueue_start_threads() at _taskqueue_start_threads+0xde/frame
> 0xfffffe0b58bcf370
> taskqueue_start_threads() at taskqueue_start_threads+0x3f/frame
> 0xfffffe0b58bcf3d0
> taskq_create_proc() at taskq_create_proc+0x92/frame 0xfffffe0b58bcf400
> spa_activate() at spa_activate+0x372/frame 0xfffffe0b58bcf4a0
> spa_open_common() at spa_open_common+0xd2/frame 0xfffffe0b58bcf510
> spa_get_stats() at spa_get_stats+0x4f/frame 0xfffffe0b58bcf6f0
> zfs_ioc_pool_stats() at zfs_ioc_pool_stats+0x25/frame 0xfffffe0b58bcf730
> zfsdev_ioctl() at zfsdev_ioctl+0x766/frame 0xfffffe0b58bcf7e0
> devfs_ioctl() at devfs_ioctl+0xcb/frame 0xfffffe0b58bcf830
> VOP_IOCTL_APV() at VOP_IOCTL_APV+0xd9/frame 0xfffffe0b58bcf860
> vn_ioctl() at vn_ioctl+0x124/frame 0xfffffe0b58bcf970
> devfs_ioctl_f() at devfs_ioctl_f+0x1f/frame 0xfffffe0b58bcf990
> kern_ioctl() at kern_ioctl+0x2c4/frame 0xfffffe0b58bcf9f0
> sys_ioctl() at sys_ioctl+0x15c/frame 0xfffffe0b58bcfac0
> amd64_syscall() at amd64_syscall+0x79b/frame 0xfffffe0b58bcfbf0
> Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe0b58bcfbf0
>
--
Mateusz Guzik <mjguzik gmail.com>
From owner-svn-src-all@freebsd.org Tue Nov 28 22:55:34 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01EEADF153A;
Tue, 28 Nov 2017 22:55:34 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 808797C3C8;
Tue, 28 Nov 2017 22:55:33 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASMtWX7027423;
Tue, 28 Nov 2017 22:55:32 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASMtV0o027412;
Tue, 28 Nov 2017 22:55:31 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711282255.vASMtV0o027412@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 28 Nov 2017 22:55:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326344 - in vendor/lua/dist: . doc src
X-SVN-Group: vendor
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in vendor/lua/dist: . doc src
X-SVN-Commit-Revision: 326344
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 22:55:34 -0000
Author: imp
Date: Tue Nov 28 22:55:31 2017
New Revision: 326344
URL: https://svnweb.freebsd.org/changeset/base/326344
Log:
Import Lua 3.5.4
Downloaded from https://www.lua.org/ftp/lua-5.3.4.tar.gz
Added:
vendor/lua/dist/doc/index.css (contents, props changed)
Modified:
vendor/lua/dist/Makefile
vendor/lua/dist/README
vendor/lua/dist/doc/contents.html
vendor/lua/dist/doc/logo.gif
vendor/lua/dist/doc/lua.1
vendor/lua/dist/doc/lua.css
vendor/lua/dist/doc/manual.css
vendor/lua/dist/doc/manual.html
vendor/lua/dist/doc/readme.html
vendor/lua/dist/src/Makefile
vendor/lua/dist/src/lapi.c
vendor/lua/dist/src/lapi.h
vendor/lua/dist/src/lauxlib.c
vendor/lua/dist/src/lauxlib.h
vendor/lua/dist/src/lbaselib.c
vendor/lua/dist/src/lbitlib.c
vendor/lua/dist/src/lcode.c
vendor/lua/dist/src/lcode.h
vendor/lua/dist/src/lcorolib.c
vendor/lua/dist/src/ldblib.c
vendor/lua/dist/src/ldebug.c
vendor/lua/dist/src/ldebug.h
vendor/lua/dist/src/ldo.c
vendor/lua/dist/src/ldo.h
vendor/lua/dist/src/ldump.c
vendor/lua/dist/src/lfunc.h
vendor/lua/dist/src/lgc.c
vendor/lua/dist/src/lgc.h
vendor/lua/dist/src/linit.c
vendor/lua/dist/src/liolib.c
vendor/lua/dist/src/llex.c
vendor/lua/dist/src/llex.h
vendor/lua/dist/src/llimits.h
vendor/lua/dist/src/lmathlib.c
vendor/lua/dist/src/lmem.c
vendor/lua/dist/src/loadlib.c
vendor/lua/dist/src/lobject.c
vendor/lua/dist/src/lobject.h
vendor/lua/dist/src/lopcodes.h
vendor/lua/dist/src/loslib.c
vendor/lua/dist/src/lparser.c
vendor/lua/dist/src/lparser.h
vendor/lua/dist/src/lstate.c
vendor/lua/dist/src/lstate.h
vendor/lua/dist/src/lstring.c
vendor/lua/dist/src/lstring.h
vendor/lua/dist/src/lstrlib.c
vendor/lua/dist/src/ltable.c
vendor/lua/dist/src/ltable.h
vendor/lua/dist/src/ltablib.c
vendor/lua/dist/src/ltm.c
vendor/lua/dist/src/ltm.h
vendor/lua/dist/src/lua.c
vendor/lua/dist/src/lua.h
vendor/lua/dist/src/luac.c
vendor/lua/dist/src/luaconf.h
vendor/lua/dist/src/lualib.h
vendor/lua/dist/src/lundump.c
vendor/lua/dist/src/lundump.h
vendor/lua/dist/src/lutf8lib.c
vendor/lua/dist/src/lvm.c
vendor/lua/dist/src/lvm.h
vendor/lua/dist/src/lzio.c
vendor/lua/dist/src/lzio.h
Modified: vendor/lua/dist/Makefile
==============================================================================
--- vendor/lua/dist/Makefile Tue Nov 28 20:44:10 2017 (r326343)
+++ vendor/lua/dist/Makefile Tue Nov 28 22:55:31 2017 (r326344)
@@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1
# Lua version and release.
V= 5.3
-R= $V.0
+R= $V.4
# Targets start here.
all: $(PLAT)
Modified: vendor/lua/dist/README
==============================================================================
--- vendor/lua/dist/README Tue Nov 28 20:44:10 2017 (r326343)
+++ vendor/lua/dist/README Tue Nov 28 22:55:31 2017 (r326344)
@@ -1,5 +1,5 @@
-This is Lua 5.3.0, released on 06 Jan 2015.
+This is Lua 5.3.4, released on 12 Jan 2017.
For installation instructions, license details, and
further information about Lua, see doc/readme.html.
Modified: vendor/lua/dist/doc/contents.html
==============================================================================
--- vendor/lua/dist/doc/contents.html Tue Nov 28 20:44:10 2017 (r326343)
+++ vendor/lua/dist/doc/contents.html Tue Nov 28 22:55:31 2017 (r326344)
@@ -3,43 +3,42 @@
<HEAD>
<TITLE>Lua 5.3 Reference Manual - contents</TITLE>
<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<LINK REL="stylesheet" TYPE="text/css" HREF="index.css">
<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
-<STYLE TYPE="text/css">
-ul {
- list-style-type: none ;
- list-style-position: outside ;
-}
-</STYLE>
</HEAD>
<BODY>
-<HR>
<H1>
-<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="" BORDER=0></A>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
Lua 5.3 Reference Manual
</H1>
<P>
The reference manual is the official definition of the Lua language.
+<BR>
For a complete introduction to Lua programming, see the book
<A HREF="http://www.lua.org/pil/">Programming in Lua</A>.
-<P>
+<DIV CLASS="menubar">
<A HREF="manual.html">start</A>
·
<A HREF="#contents">contents</A>
·
<A HREF="#index">index</A>
-<HR>
+·
+<A HREF="http://www.lua.org/manual/">other versions</A>
+</DIV>
+
+<P>
<SMALL>
-Copyright © 2015 Lua.org, PUC-Rio.
+Copyright © 2015–2017 Lua.org, PUC-Rio.
Freely available under the terms of the
<A HREF="http://www.lua.org/license.html">Lua license</A>.
</SMALL>
<H2><A NAME="contents">Contents</A></H2>
-<UL style="padding: 0">
+<UL CLASS="contents menubar">
<LI><A HREF="manual.html">1 – Introduction</A>
<P>
<LI><A HREF="manual.html#2">2 – Basic Concepts</A>
@@ -136,15 +135,14 @@ Freely available under the terms of the
</UL>
<H2><A NAME="index">Index</A></H2>
-<TABLE WIDTH="100%">
-<TR VALIGN="top">
+<TABLE CLASS="menubar" WIDTH="100%">
+<TR>
<TD>
<H3><A NAME="functions">Lua functions</A></H3>
<P>
<A HREF="manual.html#6.1">basic</A><BR>
<A HREF="manual.html#pdf-_G">_G</A><BR>
<A HREF="manual.html#pdf-_VERSION">_VERSION</A><BR>
-
<A HREF="manual.html#pdf-assert">assert</A><BR>
<A HREF="manual.html#pdf-collectgarbage">collectgarbage</A><BR>
<A HREF="manual.html#pdf-dofile">dofile</A><BR>
@@ -321,6 +319,7 @@ Freely available under the terms of the
<A HREF="manual.html#pdf-utf8.offset">utf8.offset</A><BR>
<H3><A NAME="env">environment<BR>variables</A></H3>
+<P>
<A HREF="manual.html#pdf-LUA_CPATH">LUA_CPATH</A><BR>
<A HREF="manual.html#pdf-LUA_CPATH_5_3">LUA_CPATH_5_3</A><BR>
<A HREF="manual.html#pdf-LUA_INIT">LUA_INIT</A><BR>
@@ -513,6 +512,7 @@ Freely available under the terms of the
<A HREF="manual.html#luaL_newmetatable">luaL_newmetatable</A><BR>
<A HREF="manual.html#luaL_newstate">luaL_newstate</A><BR>
<A HREF="manual.html#luaL_openlibs">luaL_openlibs</A><BR>
+<A HREF="manual.html#luaL_opt">luaL_opt</A><BR>
<A HREF="manual.html#luaL_optinteger">luaL_optinteger</A><BR>
<A HREF="manual.html#luaL_optlstring">luaL_optlstring</A><BR>
<A HREF="manual.html#luaL_optnumber">luaL_optnumber</A><BR>
@@ -546,6 +546,7 @@ Freely available under the terms of the
<A HREF="manual.html#pdf-luaopen_utf8">luaopen_utf8</A><BR>
<H3><A NAME="constants">constants</A></H3>
+<P>
<A HREF="manual.html#pdf-LUA_ERRERR">LUA_ERRERR</A><BR>
<A HREF="manual.html#pdf-LUA_ERRFILE">LUA_ERRFILE</A><BR>
<A HREF="manual.html#pdf-LUA_ERRGCMM">LUA_ERRGCMM</A><BR>
@@ -606,13 +607,12 @@ Freely available under the terms of the
</TR>
</TABLE>
-<HR>
-<SMALL CLASS="footer">
+<P CLASS="footer">
Last update:
-Tue Dec 9 21:26:07 BRST 2014
-</SMALL>
+Thu Dec 22 18:29:39 BRST 2016
+</P>
<!--
-Last change: updated for Lua 5.3.0 (final)
+Last change: revised for Lua 5.3.4
-->
</BODY>
Added: vendor/lua/dist/doc/index.css
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/lua/dist/doc/index.css Tue Nov 28 22:55:31 2017 (r326344)
@@ -0,0 +1,21 @@
+ul {
+ list-style-type: none ;
+}
+
+ul.contents {
+ padding: 0 ;
+}
+
+table {
+ border: none ;
+ border-spacing: 0 ;
+ border-collapse: collapse ;
+}
+
+td {
+ vertical-align: top ;
+ padding: 0 ;
+ text-align: left ;
+ line-height: 1.25 ;
+ width: 15% ;
+}
Modified: vendor/lua/dist/doc/logo.gif
==============================================================================
Binary file (source and/or target). No diff available.
Modified: vendor/lua/dist/doc/lua.1
==============================================================================
--- vendor/lua/dist/doc/lua.1 Tue Nov 28 20:44:10 2017 (r326343)
+++ vendor/lua/dist/doc/lua.1 Tue Nov 28 22:55:31 2017 (r326344)
@@ -1,4 +1,5 @@
-.TH LUA 1 "$Date: 2014/12/10 15:55:45 $"
+.\" $Id: lua.man,v 1.14 2016/10/17 15:43:50 lhf Exp $
+.TH LUA 1 "$Date: 2016/10/17 15:43:50 $"
.SH NAME
lua \- Lua interpreter
.SH SYNOPSIS
Modified: vendor/lua/dist/doc/lua.css
==============================================================================
--- vendor/lua/dist/doc/lua.css Tue Nov 28 20:44:10 2017 (r326343)
+++ vendor/lua/dist/doc/lua.css Tue Nov 28 22:55:31 2017 (r326344)
@@ -3,89 +3,96 @@ html {
}
body {
- border: solid #a0a0a0 1px ;
- border-radius: 20px ;
- padding: 26px ;
- margin: 16px ;
- color: #000000 ;
background-color: #FFFFFF ;
+ color: #000000 ;
font-family: Helvetica, Arial, sans-serif ;
text-align: justify ;
+ line-height: 1.25 ;
+ margin: 16px auto ;
+ padding: 32px ;
+ border: solid #a0a0a0 1px ;
+ border-radius: 20px ;
+ max-width: 70em ;
+ width: 90% ;
}
h1, h2, h3, h4 {
+ color: #000080 ;
font-family: Verdana, Geneva, sans-serif ;
font-weight: normal ;
font-style: normal ;
+ text-align: left ;
}
-h2 {
- padding-top: 0.4em ;
- padding-bottom: 0.4em ;
- padding-left: 0.8em ;
- padding-right: 0.8em ;
- background-color: #D0D0FF ;
- border-radius: 8px ;
- border: solid #a0a0a0 1px ;
+h1 {
+ font-size: 28pt ;
}
-h3 {
- padding-left: 0.5em ;
- border-left: solid #D0D0FF 1em ;
+h1 img {
+ vertical-align: text-bottom ;
}
-table h3 {
- padding-left: 0px ;
- border-left: none ;
+h2:before {
+ content: "\2756" ;
+ padding-right: 0.5em ;
}
-a:link {
- color: #000080 ;
- background-color: inherit ;
+a {
text-decoration: none ;
}
-a:visited {
- background-color: inherit ;
- text-decoration: none ;
+a:link {
+ color: #000080 ;
}
a:link:hover, a:visited:hover {
- color: #000080 ;
background-color: #D0D0FF ;
- border-radius: 4px;
+ color: #000080 ;
+ border-radius: 4px ;
}
a:link:active, a:visited:active {
color: #FF0000 ;
}
-h1 a img {
- vertical-align: text-bottom ;
+div.menubar {
+ padding-bottom: 0.5em ;
}
-hr {
- border: 0 ;
- height: 1px ;
- color: #a0a0a0 ;
- background-color: #a0a0a0 ;
- display: none ;
+p.menubar {
+ margin-left: 2.5em ;
}
-table hr {
- display: block ;
+.menubar a:hover {
+ margin: -3px -3px -3px -3px ;
+ padding: 3px 3px 3px 3px ;
+ border-radius: 4px ;
}
:target {
- background-color: #F8F8F8 ;
+ background-color: #F0F0F0 ;
+ margin: -8px ;
padding: 8px ;
- border: solid #a0a0a0 2px ;
border-radius: 8px ;
+ outline: none ;
}
+hr {
+ display: none ;
+}
+
+table hr {
+ background-color: #a0a0a0 ;
+ color: #a0a0a0 ;
+ border: 0 ;
+ height: 1px ;
+ display: block ;
+}
+
.footer {
color: gray ;
font-size: x-small ;
+ text-transform: lowercase ;
}
input[type=text] {
@@ -102,4 +109,56 @@ pre.session {
background-color: #F8F8F8 ;
padding: 1em ;
border-radius: 8px ;
+}
+
+td.gutter {
+ width: 4% ;
+}
+
+table.columns {
+ border: none ;
+ border-spacing: 0 ;
+ border-collapse: collapse ;
+}
+
+table.columns td {
+ vertical-align: top ;
+ padding: 0 ;
+ padding-bottom: 1em ;
+ text-align: justify ;
+ line-height: 1.25 ;
+}
+
+p.logos a:link:hover, p.logos a:visited:hover {
+ background-color: inherit ;
+}
+
+table.book {
+ border: none ;
+ border-spacing: 0 ;
+ border-collapse: collapse ;
+}
+
+table.book td {
+ padding: 0 ;
+ vertical-align: top ;
+}
+
+table.book td.cover {
+ padding-right: 1em ;
+}
+
+table.book img {
+ border: solid #000080 1px ;
+}
+
+table.book span {
+ font-size: small ;
+ text-align: left ;
+ display: block ;
+ margin-top: 0.25em ;
+}
+
+img {
+ background-color: white ;
}
Modified: vendor/lua/dist/doc/manual.css
==============================================================================
--- vendor/lua/dist/doc/manual.css Tue Nov 28 20:44:10 2017 (r326343)
+++ vendor/lua/dist/doc/manual.css Tue Nov 28 22:55:31 2017 (r326344)
@@ -8,20 +8,14 @@ pre, code {
}
span.apii {
+ color: gray ;
float: right ;
font-family: inherit ;
font-style: normal ;
font-size: small ;
- color: gray ;
}
-p+h1, ul+h1 {
- font-style: normal ;
- padding-top: 0.4em ;
- padding-bottom: 0.4em ;
- padding-left: 16px ;
- margin-left: -16px ;
- background-color: #D0D0FF ;
- border-radius: 8px ;
- border: solid #000080 1px ;
+h2:before {
+ content: "" ;
+ padding-right: 0em ;
}
Modified: vendor/lua/dist/doc/manual.html
==============================================================================
--- vendor/lua/dist/doc/manual.html Tue Nov 28 20:44:10 2017 (r326343)
+++ vendor/lua/dist/doc/manual.html Tue Nov 28 22:55:31 2017 (r326344)
@@ -1,39 +1,41 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<title>Lua 5.3 Reference Manual</title>
-<link rel="stylesheet" type="text/css" href="lua.css">
-<link rel="stylesheet" type="text/css" href="manual.css">
+<HTML>
+<HEAD>
+<TITLE>Lua 5.3 Reference Manual</TITLE>
+<LINK REL="stylesheet" TYPE="text/css" HREF="lua.css">
+<LINK REL="stylesheet" TYPE="text/css" HREF="manual.css">
<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
-</head>
+</HEAD>
-<body>
+<BODY>
-<hr>
-<h1>
-<a href="http://www.lua.org/"><img src="logo.gif" alt="" border="0"></a>
+<H1>
+<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
Lua 5.3 Reference Manual
-</h1>
+</H1>
+<P>
by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes
-<p>
-<small>
-Copyright © 2015 Lua.org, PUC-Rio.
+
+<P>
+<SMALL>
+Copyright © 2015–2017 Lua.org, PUC-Rio.
Freely available under the terms of the
<a href="http://www.lua.org/license.html">Lua license</a>.
-</small>
-<hr>
-<p>
+</SMALL>
-<a href="contents.html#contents">contents</A>
+<DIV CLASS="menubar">
+<A HREF="contents.html#contents">contents</A>
·
-<a href="contents.html#index">index</A>
+<A HREF="contents.html#index">index</A>
+·
+<A HREF="http://www.lua.org/manual/">other versions</A>
+</DIV>
<!-- ====================================================================== -->
<p>
-<!-- $Id: manual.of,v 1.146 2015/01/06 11:23:01 roberto Exp $ -->
+<!-- $Id: manual.of,v 1.167 2017/01/09 15:18:11 roberto Exp $ -->
@@ -41,30 +43,47 @@ Freely available under the terms of the
<h1>1 – <a name="1">Introduction</a></h1>
<p>
-Lua is an extension programming language designed to support
-general procedural programming with data description
-facilities.
-Lua also offers good support for object-oriented programming,
-functional programming, and data-driven programming.
-Lua is intended to be used as a powerful, lightweight,
-embeddable scripting language for any program that needs one.
+Lua is a powerful, efficient, lightweight, embeddable scripting language.
+It supports procedural programming,
+object-oriented programming, functional programming,
+data-driven programming, and data description.
+
+
+<p>
+Lua combines simple procedural syntax with powerful data description
+constructs based on associative arrays and extensible semantics.
+Lua is dynamically typed,
+runs by interpreting bytecode with a register-based
+virtual machine,
+and has automatic memory management with
+incremental garbage collection,
+making it ideal for configuration, scripting,
+and rapid prototyping.
+
+
+<p>
Lua is implemented as a library, written in <em>clean C</em>,
the common subset of Standard C and C++.
+The Lua distribution includes a host program called <code>lua</code>,
+which uses the Lua library to offer a complete,
+standalone Lua interpreter,
+for interactive or batch use.
+Lua is intended to be used both as a powerful, lightweight,
+embeddable scripting language for any program that needs one,
+and as a powerful but lightweight and efficient stand-alone language.
<p>
As an extension language, Lua has no notion of a "main" program:
-it only works <em>embedded</em> in a host client,
+it works <em>embedded</em> in a host client,
called the <em>embedding program</em> or simply the <em>host</em>.
+(Frequently, this host is the stand-alone <code>lua</code> program.)
The host program can invoke functions to execute a piece of Lua code,
can write and read Lua variables,
and can register C functions to be called by Lua code.
Through the use of C functions, Lua can be augmented to cope with
a wide range of different domains,
thus creating customized programming languages sharing a syntactical framework.
-The Lua distribution includes a sample host program called <code>lua</code>,
-which uses the Lua library to offer a complete, standalone Lua interpreter,
-for interactive or batch use.
<p>
@@ -113,15 +132,15 @@ There are eight basic types in Lua:
<em>nil</em>, <em>boolean</em>, <em>number</em>,
<em>string</em>, <em>function</em>, <em>userdata</em>,
<em>thread</em>, and <em>table</em>.
-<em>Nil</em> is the type of the value <b>nil</b>,
+The type <em>nil</em> has one single value, <b>nil</b>,
whose main property is to be different from any other value;
it usually represents the absence of a useful value.
-<em>Boolean</em> is the type of the values <b>false</b> and <b>true</b>.
+The type <em>boolean</em> has two values, <b>false</b> and <b>true</b>.
Both <b>nil</b> and <b>false</b> make a condition false;
any other value makes it true.
-<em>Number</em> represents both
+The type <em>number</em> represents both
integer numbers and real (floating-point) numbers.
-<em>String</em> represents immutable sequences of bytes.
+The type <em>string</em> represents immutable sequences of bytes.
Lua is 8-bit clean:
strings can contain any 8-bit value,
@@ -132,6 +151,7 @@ it makes no assumptions about the contents of a string
<p>
The type <em>number</em> uses two internal representations,
+or two subtypes,
one called <em>integer</em> and the other called <em>float</em>.
Lua has explicit rules about when each representation is used,
but it also converts between them automatically as needed (see <a href="#3.4.3">§3.4.3</a>).
@@ -142,7 +162,7 @@ or to assume complete control over the representation
Standard Lua uses 64-bit integers and double-precision (64-bit) floats,
but you can also compile Lua so that it
uses 32-bit integers and/or single-precision (32-bit) floats.
-The option with 32 bits for both integers and floats
+The option with 32 bits for both integers and floats
is particularly attractive
for small machines and embedded systems.
(See macro <code>LUA_32BITS</code> in file <code>luaconf.h</code>.)
@@ -185,8 +205,8 @@ even those that do not support threads natively.
The type <em>table</em> implements associative arrays,
that is, arrays that can be indexed not only with numbers,
but with any Lua value except <b>nil</b> and NaN.
-(<em>Not a Number</em> is a special numeric value used to represent
-undefined or unrepresentable results, such as <code>0/0</code>.)
+(<em>Not a Number</em> is a special value used to represent
+undefined or unrepresentable numerical results, such as <code>0/0</code>.)
Tables can be <em>heterogeneous</em>;
that is, they can contain values of all types (except <b>nil</b>).
Any key with value <b>nil</b> is not considered part of the table.
@@ -196,7 +216,7 @@ an associated value <b>nil</b>.
<p>
Tables are the sole data-structuring mechanism in Lua;
-they can be used to represent ordinary arrays, sequences,
+they can be used to represent ordinary arrays, lists,
symbol tables, sets, records, graphs, trees, etc.
To represent records, Lua uses the field name as an index.
The language supports this representation by
@@ -206,13 +226,6 @@ There are several convenient ways to create tables in
<p>
-We use the term <em>sequence</em> to denote a table where
-the set of all positive numeric keys is equal to {1..<em>n</em>}
-for some non-negative integer <em>n</em>,
-which is called the length of the sequence (see <a href="#3.4.7">§3.4.7</a>).
-
-
-<p>
Like indices,
the values of table fields can be of any type.
In particular,
@@ -348,8 +361,8 @@ It is up to the Lua program or its host to handle such
When you use <a href="#pdf-xpcall"><code>xpcall</code></a> or <a href="#lua_pcall"><code>lua_pcall</code></a>,
you may give a <em>message handler</em>
to be called in case of errors.
-This function is called with the original error message
-and returns a new error message.
+This function is called with the original error object
+and returns a new error object.
It is called before the error unwinds the stack,
so that it can gather more information about the error,
for instance by inspecting the stack and creating a stack traceback.
@@ -358,6 +371,9 @@ so, an error inside the message handler
will call the message handler again.
If this loop goes on for too long,
Lua breaks it and returns an appropriate message.
+(The message handler is called only for regular runtime errors.
+It is not called for memory-allocation errors
+nor for errors while running finalizers.)
@@ -379,23 +395,30 @@ Lua calls this function to perform the addition.
<p>
-The keys in a metatable are derived from the <em>event</em> names;
+The key for each event in a metatable is a string
+with the event name prefixed by two underscores;
the corresponding values are called <em>metamethods</em>.
-In the previous example, the event is <code>"add"</code>
+In the previous example, the key is "<code>__add</code>"
and the metamethod is the function that performs the addition.
<p>
You can query the metatable of any value
using the <a href="#pdf-getmetatable"><code>getmetatable</code></a> function.
+Lua queries metamethods in metatables using a raw access (see <a href="#pdf-rawget"><code>rawget</code></a>).
+So, to retrieve the metamethod for event <code>ev</code> in object <code>o</code>,
+Lua does the equivalent to the following code:
+<pre>
+ rawget(getmetatable(<em>o</em>) or {}, "__<em>ev</em>")
+</pre>
<p>
You can replace the metatable of tables
using the <a href="#pdf-setmetatable"><code>setmetatable</code></a> function.
-You cannot change the metatable of other types from Lua
+You cannot change the metatable of other types from Lua code
(except by using the debug library (<a href="#6.10">§6.10</a>));
-you must use the C API for that.
+you should use the C API for that.
<p>
@@ -417,23 +440,7 @@ when a userdata or a table is garbage collected (<a hr
<p>
-A detailed list of events controlled by metatables is given next.
-Each operation is identified by its corresponding event name.
-The key for each event is a string with its name prefixed by
-two underscores, '<code>__</code>';
-for instance, the key for operation "add" is the
-string "<code>__add</code>".
-Note that queries for metamethods are always raw;
-the access to a metamethod does not invoke other metamethods.
-You can emulate how Lua queries a metamethod for an object <code>obj</code>
-with the following code:
-
-<pre>
- rawget(getmetatable(obj) or {}, "__" .. event_name)
-</pre>
-
-<p>
-For the unary operators (negation, length, and bitwise not),
+For the unary operators (negation, length, and bitwise NOT),
the metamethod is computed and called with a dummy second operand,
equal to the first one.
This extra operand is only to simplify Lua's internals
@@ -442,17 +449,21 @@ and may be removed in future versions.
(For most uses this extra operand is irrelevant.)
+<p>
+A detailed list of events controlled by metatables is given next.
+Each operation is identified by its corresponding key.
-<ul>
-<li><b>"add": </b>
-the <code>+</code> operation.
+<ul>
+
+<li><b><code>__add</code>: </b>
+the addition (<code>+</code>) operation.
If any operand for an addition is not a number
(nor a string coercible to a number),
Lua will try to call a metamethod.
First, Lua will check the first operand (even if it is valid).
-If that operand does not define a metamethod for the "<code>__add</code>" event,
+If that operand does not define a metamethod for <code>__add</code>,
then Lua will check the second operand.
If Lua can find a metamethod,
it calls the metamethod with the two operands as arguments,
@@ -463,99 +474,84 @@ Otherwise,
it raises an error.
</li>
-<li><b>"sub": </b>
-the <code>-</code> operation.
-
-Behavior similar to the "add" operation.
+<li><b><code>__sub</code>: </b>
+the subtraction (<code>-</code>) operation.
+Behavior similar to the addition operation.
</li>
-<li><b>"mul": </b>
-the <code>*</code> operation.
-
-Behavior similar to the "add" operation.
+<li><b><code>__mul</code>: </b>
+the multiplication (<code>*</code>) operation.
+Behavior similar to the addition operation.
</li>
-<li><b>"div": </b>
-the <code>/</code> operation.
-
-Behavior similar to the "add" operation.
+<li><b><code>__div</code>: </b>
+the division (<code>/</code>) operation.
+Behavior similar to the addition operation.
</li>
-<li><b>"mod": </b>
-the <code>%</code> operation.
-
-Behavior similar to the "add" operation.
+<li><b><code>__mod</code>: </b>
+the modulo (<code>%</code>) operation.
+Behavior similar to the addition operation.
</li>
-<li><b>"pow": </b>
-the <code>^</code> (exponentiation) operation.
-
-Behavior similar to the "add" operation.
+<li><b><code>__pow</code>: </b>
+the exponentiation (<code>^</code>) operation.
+Behavior similar to the addition operation.
</li>
-<li><b>"unm": </b>
-the <code>-</code> (unary minus) operation.
-
-Behavior similar to the "add" operation.
+<li><b><code>__unm</code>: </b>
+the negation (unary <code>-</code>) operation.
+Behavior similar to the addition operation.
</li>
-<li><b>"idiv": </b>
-the <code>//</code> (floor division) operation.
-
-Behavior similar to the "add" operation.
+<li><b><code>__idiv</code>: </b>
+the floor division (<code>//</code>) operation.
+Behavior similar to the addition operation.
</li>
-<li><b>"band": </b>
-the <code>&</code> (bitwise and) operation.
-
-Behavior similar to the "add" operation,
+<li><b><code>__band</code>: </b>
+the bitwise AND (<code>&</code>) operation.
+Behavior similar to the addition operation,
except that Lua will try a metamethod
-if any operator is neither an integer
+if any operand is neither an integer
nor a value coercible to an integer (see <a href="#3.4.3">§3.4.3</a>).
</li>
-<li><b>"bor": </b>
-the <code>|</code> (bitwise or) operation.
-
-Behavior similar to the "band" operation.
+<li><b><code>__bor</code>: </b>
+the bitwise OR (<code>|</code>) operation.
+Behavior similar to the bitwise AND operation.
</li>
-<li><b>"bxor": </b>
-the <code>~</code> (bitwise exclusive or) operation.
-
-Behavior similar to the "band" operation.
+<li><b><code>__bxor</code>: </b>
+the bitwise exclusive OR (binary <code>~</code>) operation.
+Behavior similar to the bitwise AND operation.
</li>
-<li><b>"bnot": </b>
-the <code>~</code> (bitwise unary not) operation.
-
-Behavior similar to the "band" operation.
+<li><b><code>__bnot</code>: </b>
+the bitwise NOT (unary <code>~</code>) operation.
+Behavior similar to the bitwise AND operation.
</li>
-<li><b>"shl": </b>
-the <code><<</code> (bitwise left shift) operation.
-
-Behavior similar to the "band" operation.
+<li><b><code>__shl</code>: </b>
+the bitwise left shift (<code><<</code>) operation.
+Behavior similar to the bitwise AND operation.
</li>
-<li><b>"shr": </b>
-the <code>>></code> (bitwise right shift) operation.
-
-Behavior similar to the "band" operation.
+<li><b><code>__shr</code>: </b>
+the bitwise right shift (<code>>></code>) operation.
+Behavior similar to the bitwise AND operation.
</li>
-<li><b>"concat": </b>
-the <code>..</code> (concatenation) operation.
-
-Behavior similar to the "add" operation,
+<li><b><code>__concat</code>: </b>
+the concatenation (<code>..</code>) operation.
+Behavior similar to the addition operation,
except that Lua will try a metamethod
-if any operator is neither a string nor a number
+if any operand is neither a string nor a number
(which is always coercible to a string).
</li>
-<li><b>"len": </b>
-the <code>#</code> (length) operation.
-
+<li><b><code>__len</code>: </b>
+the length (<code>#</code>) operation.
If the object is not a string,
Lua will try its metamethod.
If there is a metamethod,
@@ -568,42 +564,40 @@ then Lua uses the table length operation (see <a href=
Otherwise, Lua raises an error.
</li>
-<li><b>"eq": </b>
-the <code>==</code> (equal) operation.
-
-Behavior similar to the "add" operation,
+<li><b><code>__eq</code>: </b>
+the equal (<code>==</code>) operation.
+Behavior similar to the addition operation,
except that Lua will try a metamethod only when the values
being compared are either both tables or both full userdata
and they are not primitively equal.
The result of the call is always converted to a boolean.
</li>
-<li><b>"lt": </b>
-the <code><</code> (less than) operation.
-
-Behavior similar to the "add" operation,
+<li><b><code>__lt</code>: </b>
+the less than (<code><</code>) operation.
+Behavior similar to the addition operation,
except that Lua will try a metamethod only when the values
being compared are neither both numbers nor both strings.
The result of the call is always converted to a boolean.
</li>
-<li><b>"le": </b>
-the <code><=</code> (less equal) operation.
-
+<li><b><code>__le</code>: </b>
+the less equal (<code><=</code>) operation.
Unlike other operations,
-The less-equal operation can use two different events.
-First, Lua looks for the "<code>__le</code>" metamethod in both operands,
-like in the "lt" operation.
+the less-equal operation can use two different events.
+First, Lua looks for the <code>__le</code> metamethod in both operands,
+like in the less than operation.
If it cannot find such a metamethod,
-then it will try the "<code>__lt</code>" event,
+then it will try the <code>__lt</code> metamethod,
assuming that <code>a <= b</code> is equivalent to <code>not (b < a)</code>.
As with the other comparison operators,
the result is always a boolean.
+(This use of the <code>__lt</code> event can be removed in future versions;
+it is also slower than a real <code>__le</code> metamethod.)
</li>
-<li><b>"index": </b>
+<li><b><code>__index</code>: </b>
The indexing access <code>table[key]</code>.
-
This event happens when <code>table</code> is not a table or
when <code>key</code> is not present in <code>table</code>.
The metamethod is looked up in <code>table</code>.
@@ -613,16 +607,18 @@ The metamethod is looked up in <code>table</code>.
Despite the name,
the metamethod for this event can be either a function or a table.
If it is a function,
-it is called with <code>table</code> and <code>key</code> as arguments.
+it is called with <code>table</code> and <code>key</code> as arguments,
+and the result of the call
+(adjusted to one value)
+is the result of the operation.
If it is a table,
the final result is the result of indexing this table with <code>key</code>.
(This indexing is regular, not raw,
and therefore can trigger another metamethod.)
</li>
-<li><b>"newindex": </b>
+<li><b><code>__newindex</code>: </b>
The indexing assignment <code>table[key] = value</code>.
-
Like the index event,
this event happens when <code>table</code> is not a table or
when <code>key</code> is not present in <code>table</code>.
@@ -641,29 +637,47 @@ and therefore can trigger another metamethod.)
<p>
-Whenever there is a "newindex" metamethod,
+Whenever there is a <code>__newindex</code> metamethod,
Lua does not perform the primitive assignment.
(If necessary,
the metamethod itself can call <a href="#pdf-rawset"><code>rawset</code></a>
to do the assignment.)
</li>
-<li><b>"call": </b>
+<li><b><code>__call</code>: </b>
The call operation <code>func(args)</code>.
-
This event happens when Lua tries to call a non-function value
(that is, <code>func</code> is not a function).
The metamethod is looked up in <code>func</code>.
If present,
the metamethod is called with <code>func</code> as its first argument,
followed by the arguments of the original call (<code>args</code>).
+All results of the call
+are the result of the operation.
+(This is the only metamethod that allows multiple results.)
</li>
</ul>
+<p>
+It is a good practice to add all needed metamethods to a table
+before setting it as a metatable of some object.
+In particular, the <code>__gc</code> metamethod works only when this order
+is followed (see <a href="#2.5.1">§2.5.1</a>).
+<p>
+Because metatables are regular tables,
+they can contain arbitrary fields,
+not only the event names defined above.
+Some functions in the standard library
+(e.g., <a href="#pdf-tostring"><code>tostring</code></a>)
+use other fields in metatables for their own purposes.
+
+
+
+
<h2>2.5 – <a name="2.5">Garbage Collection</a></h2>
<p>
@@ -752,8 +766,6 @@ and the metatable has a field indexed by the string "<
Note that if you set a metatable without a <code>__gc</code> field
and later create that field in the metatable,
the object will not be marked for finalization.
-However, after an object has been marked,
-you can freely change the <code>__gc</code> field of its metatable.
<p>
@@ -794,7 +806,7 @@ Moreover, if the finalizer marks a finalizing object f
its finalizer will be called again in the next cycle where the
object is unreachable.
In any case,
-the object memory is freed only in the GC cycle where
+the object memory is freed only in a GC cycle where
the object is unreachable and not marked for finalization.
@@ -822,8 +834,8 @@ then the garbage collector will collect that object.
<p>
A weak table can have weak keys, weak values, or both.
-A table with weak keys allows the collection of its keys,
-but prevents the collection of its values.
+A table with weak values allows the collection of its values,
+but prevents the collection of its keys.
A table with both weak keys and weak values allows the collection of
both keys and values.
In any case, if either the key or the value is collected,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Tue Nov 28 22:57:14 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DA90DF15DB;
Tue, 28 Nov 2017 22:57:14 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 697407C528;
Tue, 28 Nov 2017 22:57:14 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASMvDM3027524;
Tue, 28 Nov 2017 22:57:13 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASMvDbg027523;
Tue, 28 Nov 2017 22:57:13 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711282257.vASMvDbg027523@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 28 Nov 2017 22:57:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326345 - vendor/byacc/5.3.4
X-SVN-Group: vendor
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: vendor/byacc/5.3.4
X-SVN-Commit-Revision: 326345
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 22:57:14 -0000
Author: imp
Date: Tue Nov 28 22:57:13 2017
New Revision: 326345
URL: https://svnweb.freebsd.org/changeset/base/326345
Log:
Tag lua 5.3.4 (dist commit message bogusly said 3.5.4)
Added:
vendor/byacc/5.3.4/
- copied from r326344, vendor/byacc/dist/
From owner-svn-src-all@freebsd.org Tue Nov 28 23:18:37 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52F03DF1D83;
Tue, 28 Nov 2017 23:18:37 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 08E1F7D14B;
Tue, 28 Nov 2017 23:18:36 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASNIal0036093;
Tue, 28 Nov 2017 23:18:36 GMT (envelope-from jeff@FreeBSD.org)
Received: (from jeff@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASNIZYf036085;
Tue, 28 Nov 2017 23:18:35 GMT (envelope-from jeff@FreeBSD.org)
Message-Id: <201711282318.vASNIZYf036085@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jeff set sender to
jeff@FreeBSD.org using -f
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Tue, 28 Nov 2017 23:18:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326346 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: jeff
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 326346
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 23:18:37 -0000
Author: jeff
Date: Tue Nov 28 23:18:35 2017
New Revision: 326346
URL: https://svnweb.freebsd.org/changeset/base/326346
Log:
Move domain iterators into the page layer where domain selection should take
place. This makes the majority of the phys layer explicitly domain specific.
Reviewed by: markj, kib (some objections)
Discussed with: alc
Tested by: pho
Sponsored by: Netflix & Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D13014
Modified:
head/sys/vm/vm_domain.c
head/sys/vm/vm_domain.h
head/sys/vm/vm_page.c
head/sys/vm/vm_page.h
head/sys/vm/vm_phys.c
head/sys/vm/vm_phys.h
head/sys/vm/vm_reserv.c
head/sys/vm/vm_reserv.h
Modified: head/sys/vm/vm_domain.c
==============================================================================
--- head/sys/vm/vm_domain.c Tue Nov 28 22:57:13 2017 (r326345)
+++ head/sys/vm/vm_domain.c Tue Nov 28 23:18:35 2017 (r326346)
@@ -61,6 +61,118 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_domain.h>
+/*
+ * Default to first-touch + round-robin.
+ */
+static struct mtx vm_default_policy_mtx;
+MTX_SYSINIT(vm_default_policy, &vm_default_policy_mtx, "default policy mutex",
+ MTX_DEF);
+#ifdef VM_NUMA_ALLOC
+static struct vm_domain_policy vm_default_policy =
+ VM_DOMAIN_POLICY_STATIC_INITIALISER(VM_POLICY_FIRST_TOUCH_ROUND_ROBIN, 0);
+#else
+/* Use round-robin so the domain policy code will only try once per allocation */
+static struct vm_domain_policy vm_default_policy =
+ VM_DOMAIN_POLICY_STATIC_INITIALISER(VM_POLICY_ROUND_ROBIN, 0);
+#endif
+
+static int
+sysctl_vm_default_policy(SYSCTL_HANDLER_ARGS)
+{
+ char policy_name[32];
+ int error;
+
+ mtx_lock(&vm_default_policy_mtx);
+
+ /* Map policy to output string */
+ switch (vm_default_policy.p.policy) {
+ case VM_POLICY_FIRST_TOUCH:
+ strcpy(policy_name, "first-touch");
+ break;
+ case VM_POLICY_FIRST_TOUCH_ROUND_ROBIN:
+ strcpy(policy_name, "first-touch-rr");
+ break;
+ case VM_POLICY_ROUND_ROBIN:
+ default:
+ strcpy(policy_name, "rr");
+ break;
+ }
+ mtx_unlock(&vm_default_policy_mtx);
+
+ error = sysctl_handle_string(oidp, &policy_name[0],
+ sizeof(policy_name), req);
+ if (error != 0 || req->newptr == NULL)
+ return (error);
+
+ mtx_lock(&vm_default_policy_mtx);
+ /* Set: match on the subset of policies that make sense as a default */
+ if (strcmp("first-touch-rr", policy_name) == 0) {
+ vm_domain_policy_set(&vm_default_policy,
+ VM_POLICY_FIRST_TOUCH_ROUND_ROBIN, 0);
+ } else if (strcmp("first-touch", policy_name) == 0) {
+ vm_domain_policy_set(&vm_default_policy,
+ VM_POLICY_FIRST_TOUCH, 0);
+ } else if (strcmp("rr", policy_name) == 0) {
+ vm_domain_policy_set(&vm_default_policy,
+ VM_POLICY_ROUND_ROBIN, 0);
+ } else {
+ error = EINVAL;
+ goto finish;
+ }
+
+ error = 0;
+finish:
+ mtx_unlock(&vm_default_policy_mtx);
+ return (error);
+}
+
+SYSCTL_PROC(_vm, OID_AUTO, default_policy, CTLTYPE_STRING | CTLFLAG_RW,
+ 0, 0, sysctl_vm_default_policy, "A",
+ "Default policy (rr, first-touch, first-touch-rr");
+
+/*
+ * Initialise a VM domain iterator.
+ *
+ * Check the thread policy, then the proc policy,
+ * then default to the system policy.
+ */
+void
+vm_policy_iterator_init(struct vm_domain_iterator *vi)
+{
+#ifdef VM_NUMA_ALLOC
+ struct vm_domain_policy lcl;
+#endif
+
+ vm_domain_iterator_init(vi);
+
+#ifdef VM_NUMA_ALLOC
+ /* Copy out the thread policy */
+ vm_domain_policy_localcopy(&lcl, &curthread->td_vm_dom_policy);
+ if (lcl.p.policy != VM_POLICY_NONE) {
+ /* Thread policy is present; use it */
+ vm_domain_iterator_set_policy(vi, &lcl);
+ return;
+ }
+
+ vm_domain_policy_localcopy(&lcl,
+ &curthread->td_proc->p_vm_dom_policy);
+ if (lcl.p.policy != VM_POLICY_NONE) {
+ /* Process policy is present; use it */
+ vm_domain_iterator_set_policy(vi, &lcl);
+ return;
+ }
+#endif
+ /* Use system default policy */
+ vm_domain_iterator_set_policy(vi, &vm_default_policy);
+}
+
+void
+vm_policy_iterator_finish(struct vm_domain_iterator *vi)
+{
+
+ vm_domain_iterator_cleanup(vi);
+}
+
#ifdef VM_NUMA_ALLOC
static __inline int
vm_domain_rr_selectdomain(int skip_domain)
Modified: head/sys/vm/vm_domain.h
==============================================================================
--- head/sys/vm/vm_domain.h Tue Nov 28 22:57:13 2017 (r326345)
+++ head/sys/vm/vm_domain.h Tue Nov 28 23:18:35 2017 (r326346)
@@ -63,4 +63,7 @@ extern int vm_domain_iterator_run(struct vm_domain_ite
extern int vm_domain_iterator_isdone(struct vm_domain_iterator *vi);
extern int vm_domain_iterator_cleanup(struct vm_domain_iterator *vi);
+extern void vm_policy_iterator_init(struct vm_domain_iterator *vi);
+extern void vm_policy_iterator_finish(struct vm_domain_iterator *vi);
+
#endif /* __VM_DOMAIN_H__ */
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Tue Nov 28 22:57:13 2017 (r326345)
+++ head/sys/vm/vm_page.c Tue Nov 28 23:18:35 2017 (r326346)
@@ -109,6 +109,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_param.h>
+#include <vm/vm_domain.h>
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
@@ -1603,6 +1604,16 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex,
vm_radix_lookup_le(&object->rtree, pindex) : NULL));
}
+vm_page_t
+vm_page_alloc_domain(vm_object_t object, vm_pindex_t pindex, int domain,
+ int req)
+{
+
+ return (vm_page_alloc_domain_after(object, pindex, domain, req,
+ object != NULL ? vm_radix_lookup_le(&object->rtree, pindex) :
+ NULL));
+}
+
/*
* Allocate a page in the specified object with the given page index. To
* optimize insertion of the page into the object, the caller must also specifiy
@@ -1610,10 +1621,35 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex,
* page index, or NULL if no such page exists.
*/
vm_page_t
-vm_page_alloc_after(vm_object_t object, vm_pindex_t pindex, int req,
- vm_page_t mpred)
+vm_page_alloc_after(vm_object_t object, vm_pindex_t pindex,
+ int req, vm_page_t mpred)
{
+ struct vm_domain_iterator vi;
vm_page_t m;
+ int domain, wait;
+
+ m = NULL;
+ vm_policy_iterator_init(&vi);
+ wait = req & (VM_ALLOC_WAITFAIL | VM_ALLOC_WAITOK);
+ req &= ~wait;
+ while (vm_domain_iterator_run(&vi, &domain) == 0) {
+ if (vm_domain_iterator_isdone(&vi))
+ req |= wait;
+ m = vm_page_alloc_domain_after(object, pindex, domain, req,
+ mpred);
+ if (m != NULL)
+ break;
+ }
+ vm_policy_iterator_finish(&vi);
+
+ return (m);
+}
+
+vm_page_t
+vm_page_alloc_domain_after(vm_object_t object, vm_pindex_t pindex, int domain,
+ int req, vm_page_t mpred)
+{
+ vm_page_t m;
int flags, req_class;
u_int free_count;
@@ -1643,6 +1679,7 @@ vm_page_alloc_after(vm_object_t object, vm_pindex_t pi
* for the request class.
*/
again:
+ m = NULL;
mtx_lock(&vm_page_queue_free_mtx);
if (vm_cnt.v_free_count > vm_cnt.v_free_reserved ||
(req_class == VM_ALLOC_SYSTEM &&
@@ -1655,23 +1692,26 @@ again:
#if VM_NRESERVLEVEL > 0
if (object == NULL || (object->flags & (OBJ_COLORED |
OBJ_FICTITIOUS)) != OBJ_COLORED || (m =
- vm_reserv_alloc_page(object, pindex, mpred)) == NULL)
+ vm_reserv_alloc_page(object, pindex, domain,
+ mpred)) == NULL)
#endif
{
/*
* If not, allocate it from the free page queues.
*/
- m = vm_phys_alloc_pages(object != NULL ?
+ m = vm_phys_alloc_pages(domain, object != NULL ?
VM_FREEPOOL_DEFAULT : VM_FREEPOOL_DIRECT, 0);
#if VM_NRESERVLEVEL > 0
- if (m == NULL && vm_reserv_reclaim_inactive()) {
- m = vm_phys_alloc_pages(object != NULL ?
+ if (m == NULL && vm_reserv_reclaim_inactive(domain)) {
+ m = vm_phys_alloc_pages(domain,
+ object != NULL ?
VM_FREEPOOL_DEFAULT : VM_FREEPOOL_DIRECT,
0);
}
#endif
}
- } else {
+ }
+ if (m == NULL) {
/*
* Not allocatable, give up.
*/
@@ -1799,6 +1839,32 @@ vm_page_alloc_contig(vm_object_t object, vm_pindex_t p
u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,
vm_paddr_t boundary, vm_memattr_t memattr)
{
+ struct vm_domain_iterator vi;
+ vm_page_t m;
+ int domain, wait;
+
+ m = NULL;
+ vm_policy_iterator_init(&vi);
+ wait = req & (VM_ALLOC_WAITFAIL | VM_ALLOC_WAITOK);
+ req &= ~wait;
+ while (vm_domain_iterator_run(&vi, &domain) == 0) {
+ if (vm_domain_iterator_isdone(&vi))
+ req |= wait;
+ m = vm_page_alloc_contig_domain(object, pindex, domain, req,
+ npages, low, high, alignment, boundary, memattr);
+ if (m != NULL)
+ break;
+ }
+ vm_policy_iterator_finish(&vi);
+
+ return (m);
+}
+
+vm_page_t
+vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain,
+ int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,
+ vm_paddr_t boundary, vm_memattr_t memattr)
+{
vm_page_t m, m_ret, mpred;
u_int busy_lock, flags, oflags;
int req_class;
@@ -1838,6 +1904,7 @@ vm_page_alloc_contig(vm_object_t object, vm_pindex_t p
* below the lower bound for the allocation class?
*/
again:
+ m_ret = NULL;
mtx_lock(&vm_page_queue_free_mtx);
if (vm_cnt.v_free_count >= npages + vm_cnt.v_free_reserved ||
(req_class == VM_ALLOC_SYSTEM &&
@@ -1850,31 +1917,27 @@ again:
#if VM_NRESERVLEVEL > 0
retry:
if (object == NULL || (object->flags & OBJ_COLORED) == 0 ||
- (m_ret = vm_reserv_alloc_contig(object, pindex, npages,
- low, high, alignment, boundary, mpred)) == NULL)
+ (m_ret = vm_reserv_alloc_contig(object, pindex, domain,
+ npages, low, high, alignment, boundary, mpred)) == NULL)
#endif
/*
* If not, allocate them from the free page queues.
*/
- m_ret = vm_phys_alloc_contig(npages, low, high,
+ m_ret = vm_phys_alloc_contig(domain, npages, low, high,
alignment, boundary);
- } else {
- if (vm_page_alloc_fail(object, req))
- goto again;
- return (NULL);
- }
- if (m_ret != NULL)
- vm_phys_freecnt_adj(m_ret, -npages);
- else {
#if VM_NRESERVLEVEL > 0
- if (vm_reserv_reclaim_contig(npages, low, high, alignment,
- boundary))
+ if (m_ret == NULL && vm_reserv_reclaim_contig(
+ domain, npages, low, high, alignment, boundary))
goto retry;
#endif
}
- mtx_unlock(&vm_page_queue_free_mtx);
- if (m_ret == NULL)
+ if (m_ret == NULL) {
+ if (vm_page_alloc_fail(object, req))
+ goto again;
return (NULL);
+ }
+ vm_phys_freecnt_adj(m_ret, -npages);
+ mtx_unlock(&vm_page_queue_free_mtx);
for (m = m_ret; m < &m_ret[npages]; m++)
vm_page_alloc_check(m);
@@ -1988,7 +2051,30 @@ vm_page_alloc_check(vm_page_t m)
vm_page_t
vm_page_alloc_freelist(int flind, int req)
{
+ struct vm_domain_iterator vi;
vm_page_t m;
+ int domain, wait;
+
+ m = NULL;
+ vm_policy_iterator_init(&vi);
+ wait = req & (VM_ALLOC_WAITFAIL | VM_ALLOC_WAITOK);
+ req &= ~wait;
+ while (vm_domain_iterator_run(&vi, &domain) == 0) {
+ if (vm_domain_iterator_isdone(&vi))
+ req |= wait;
+ m = vm_page_alloc_freelist_domain(domain, flind, req);
+ if (m != NULL)
+ break;
+ }
+ vm_policy_iterator_finish(&vi);
+
+ return (m);
+}
+
+vm_page_t
+vm_page_alloc_freelist_domain(int domain, int flind, int req)
+{
+ vm_page_t m;
u_int flags, free_count;
int req_class;
@@ -2009,15 +2095,12 @@ again:
(req_class == VM_ALLOC_SYSTEM &&
vm_cnt.v_free_count > vm_cnt.v_interrupt_free_min) ||
(req_class == VM_ALLOC_INTERRUPT &&
- vm_cnt.v_free_count > 0)) {
- m = vm_phys_alloc_freelist_pages(flind, VM_FREEPOOL_DIRECT, 0);
- } else {
+ vm_cnt.v_free_count > 0))
+ m = vm_phys_alloc_freelist_pages(domain, flind,
+ VM_FREEPOOL_DIRECT, 0);
+ if (m == NULL) {
if (vm_page_alloc_fail(NULL, req))
goto again;
- return (NULL);
- }
- if (m == NULL) {
- mtx_unlock(&vm_page_queue_free_mtx);
return (NULL);
}
free_count = vm_phys_freecnt_adj(m, -1);
Modified: head/sys/vm/vm_page.h
==============================================================================
--- head/sys/vm/vm_page.h Tue Nov 28 22:57:13 2017 (r326345)
+++ head/sys/vm/vm_page.h Tue Nov 28 23:18:35 2017 (r326346)
@@ -476,16 +476,24 @@ void vm_page_free_zero(vm_page_t m);
void vm_page_activate (vm_page_t);
void vm_page_advise(vm_page_t m, int advice);
vm_page_t vm_page_alloc(vm_object_t, vm_pindex_t, int);
+vm_page_t vm_page_alloc_domain(vm_object_t, vm_pindex_t, int, int);
vm_page_t vm_page_alloc_after(vm_object_t, vm_pindex_t, int, vm_page_t);
+vm_page_t vm_page_alloc_domain_after(vm_object_t, vm_pindex_t, int, int,
+ vm_page_t);
vm_page_t vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req,
u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,
vm_paddr_t boundary, vm_memattr_t memattr);
+vm_page_t vm_page_alloc_contig_domain(vm_object_t object,
+ vm_pindex_t pindex, int domain, int req, u_long npages, vm_paddr_t low,
+ vm_paddr_t high, u_long alignment, vm_paddr_t boundary,
+ vm_memattr_t memattr);
vm_page_t vm_page_alloc_freelist(int, int);
+vm_page_t vm_page_alloc_freelist_domain(int, int, int);
void vm_page_change_lock(vm_page_t m, struct mtx **mtx);
vm_page_t vm_page_grab (vm_object_t, vm_pindex_t, int);
int vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags,
vm_page_t *ma, int count);
-void vm_page_deactivate (vm_page_t);
+void vm_page_deactivate(vm_page_t);
void vm_page_deactivate_noreuse(vm_page_t);
void vm_page_dequeue(vm_page_t m);
void vm_page_dequeue_locked(vm_page_t m);
@@ -506,6 +514,8 @@ void vm_page_putfake(vm_page_t m);
void vm_page_readahead_finish(vm_page_t m);
bool vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low,
vm_paddr_t high, u_long alignment, vm_paddr_t boundary);
+bool vm_page_reclaim_contig_domain(int req, u_long npages, int domain,
+ vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary);
void vm_page_reference(vm_page_t m);
void vm_page_remove (vm_page_t);
int vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t);
Modified: head/sys/vm/vm_phys.c
==============================================================================
--- head/sys/vm/vm_phys.c Tue Nov 28 22:57:13 2017 (r326345)
+++ head/sys/vm/vm_phys.c Tue Nov 28 23:18:35 2017 (r326346)
@@ -151,23 +151,6 @@ SYSCTL_OID(_vm, OID_AUTO, phys_locality, CTLTYPE_STRIN
SYSCTL_INT(_vm, OID_AUTO, ndomains, CTLFLAG_RD,
&vm_ndomains, 0, "Number of physical memory domains available.");
-/*
- * Default to first-touch + round-robin.
- */
-static struct mtx vm_default_policy_mtx;
-MTX_SYSINIT(vm_default_policy, &vm_default_policy_mtx, "default policy mutex",
- MTX_DEF);
-#ifdef VM_NUMA_ALLOC
-static struct vm_domain_policy vm_default_policy =
- VM_DOMAIN_POLICY_STATIC_INITIALISER(VM_POLICY_FIRST_TOUCH_ROUND_ROBIN, 0);
-#else
-/* Use round-robin so the domain policy code will only try once per allocation */
-static struct vm_domain_policy vm_default_policy =
- VM_DOMAIN_POLICY_STATIC_INITIALISER(VM_POLICY_ROUND_ROBIN, 0);
-#endif
-
-static vm_page_t vm_phys_alloc_domain_pages(int domain, int flind, int pool,
- int order);
static vm_page_t vm_phys_alloc_seg_contig(struct vm_phys_seg *seg,
u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,
vm_paddr_t boundary);
@@ -176,60 +159,6 @@ static void vm_phys_create_seg(vm_paddr_t start, vm_pa
static void vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl,
int order);
-static int
-sysctl_vm_default_policy(SYSCTL_HANDLER_ARGS)
-{
- char policy_name[32];
- int error;
-
- mtx_lock(&vm_default_policy_mtx);
-
- /* Map policy to output string */
- switch (vm_default_policy.p.policy) {
- case VM_POLICY_FIRST_TOUCH:
- strcpy(policy_name, "first-touch");
- break;
- case VM_POLICY_FIRST_TOUCH_ROUND_ROBIN:
- strcpy(policy_name, "first-touch-rr");
- break;
- case VM_POLICY_ROUND_ROBIN:
- default:
- strcpy(policy_name, "rr");
- break;
- }
- mtx_unlock(&vm_default_policy_mtx);
-
- error = sysctl_handle_string(oidp, &policy_name[0],
- sizeof(policy_name), req);
- if (error != 0 || req->newptr == NULL)
- return (error);
-
- mtx_lock(&vm_default_policy_mtx);
- /* Set: match on the subset of policies that make sense as a default */
- if (strcmp("first-touch-rr", policy_name) == 0) {
- vm_domain_policy_set(&vm_default_policy,
- VM_POLICY_FIRST_TOUCH_ROUND_ROBIN, 0);
- } else if (strcmp("first-touch", policy_name) == 0) {
- vm_domain_policy_set(&vm_default_policy,
- VM_POLICY_FIRST_TOUCH, 0);
- } else if (strcmp("rr", policy_name) == 0) {
- vm_domain_policy_set(&vm_default_policy,
- VM_POLICY_ROUND_ROBIN, 0);
- } else {
- error = EINVAL;
- goto finish;
- }
-
- error = 0;
-finish:
- mtx_unlock(&vm_default_policy_mtx);
- return (error);
-}
-
-SYSCTL_PROC(_vm, OID_AUTO, default_policy, CTLTYPE_STRING | CTLFLAG_RW,
- 0, 0, sysctl_vm_default_policy, "A",
- "Default policy (rr, first-touch, first-touch-rr");
-
/*
* Red-black tree helpers for vm fictitious range management.
*/
@@ -271,71 +200,6 @@ vm_phys_fictitious_cmp(struct vm_phys_fictitious_seg *
(uintmax_t)p1->end, (uintmax_t)p2->start, (uintmax_t)p2->end);
}
-#ifdef notyet
-static __inline int
-vm_rr_selectdomain(void)
-{
-#ifdef VM_NUMA_ALLOC
- struct thread *td;
-
- td = curthread;
-
- td->td_dom_rr_idx++;
- td->td_dom_rr_idx %= vm_ndomains;
- return (td->td_dom_rr_idx);
-#else
- return (0);
-#endif
-}
-#endif /* notyet */
-
-/*
- * Initialise a VM domain iterator.
- *
- * Check the thread policy, then the proc policy,
- * then default to the system policy.
- *
- * Later on the various layers will have this logic
- * plumbed into them and the phys code will be explicitly
- * handed a VM domain policy to use.
- */
-static void
-vm_policy_iterator_init(struct vm_domain_iterator *vi)
-{
-#ifdef VM_NUMA_ALLOC
- struct vm_domain_policy lcl;
-#endif
-
- vm_domain_iterator_init(vi);
-
-#ifdef VM_NUMA_ALLOC
- /* Copy out the thread policy */
- vm_domain_policy_localcopy(&lcl, &curthread->td_vm_dom_policy);
- if (lcl.p.policy != VM_POLICY_NONE) {
- /* Thread policy is present; use it */
- vm_domain_iterator_set_policy(vi, &lcl);
- return;
- }
-
- vm_domain_policy_localcopy(&lcl,
- &curthread->td_proc->p_vm_dom_policy);
- if (lcl.p.policy != VM_POLICY_NONE) {
- /* Process policy is present; use it */
- vm_domain_iterator_set_policy(vi, &lcl);
- return;
- }
-#endif
- /* Use system default policy */
- vm_domain_iterator_set_policy(vi, &vm_default_policy);
-}
-
-static void
-vm_policy_iterator_finish(struct vm_domain_iterator *vi)
-{
-
- vm_domain_iterator_cleanup(vi);
-}
-
boolean_t
vm_phys_domain_intersects(long mask, vm_paddr_t low, vm_paddr_t high)
{
@@ -504,7 +368,7 @@ _vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end,
KASSERT(vm_phys_nsegs < VM_PHYSSEG_MAX,
("vm_phys_create_seg: increase VM_PHYSSEG_MAX"));
- KASSERT(domain < vm_ndomains,
+ KASSERT(domain >= 0 && domain < vm_ndomains,
("vm_phys_create_seg: invalid domain provided"));
seg = &vm_phys_segs[vm_phys_nsegs++];
while (seg > vm_phys_segs && (seg - 1)->start >= end) {
@@ -736,29 +600,16 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_f
* The free page queues must be locked.
*/
vm_page_t
-vm_phys_alloc_pages(int pool, int order)
+vm_phys_alloc_pages(int domain, int pool, int order)
{
vm_page_t m;
- int domain, flind;
- struct vm_domain_iterator vi;
+ int flind;
- KASSERT(pool < VM_NFREEPOOL,
- ("vm_phys_alloc_pages: pool %d is out of range", pool));
- KASSERT(order < VM_NFREEORDER,
- ("vm_phys_alloc_pages: order %d is out of range", order));
-
- vm_policy_iterator_init(&vi);
-
- while ((vm_domain_iterator_run(&vi, &domain)) == 0) {
- for (flind = 0; flind < vm_nfreelists; flind++) {
- m = vm_phys_alloc_domain_pages(domain, flind, pool,
- order);
- if (m != NULL)
- return (m);
- }
+ for (flind = 0; flind < vm_nfreelists; flind++) {
+ m = vm_phys_alloc_freelist_pages(domain, flind, pool, order);
+ if (m != NULL)
+ return (m);
}
-
- vm_policy_iterator_finish(&vi);
return (NULL);
}
@@ -770,41 +621,23 @@ vm_phys_alloc_pages(int pool, int order)
* The free page queues must be locked.
*/
vm_page_t
-vm_phys_alloc_freelist_pages(int freelist, int pool, int order)
+vm_phys_alloc_freelist_pages(int domain, int flind, int pool, int order)
{
+ struct vm_freelist *alt, *fl;
vm_page_t m;
- struct vm_domain_iterator vi;
- int domain;
+ int oind, pind;
- KASSERT(freelist < VM_NFREELIST,
+ KASSERT(domain >= 0 && domain < vm_ndomains,
+ ("vm_phys_alloc_freelist_pages: domain %d is out of range",
+ domain));
+ KASSERT(flind < VM_NFREELIST,
("vm_phys_alloc_freelist_pages: freelist %d is out of range",
- freelist));
+ flind));
KASSERT(pool < VM_NFREEPOOL,
("vm_phys_alloc_freelist_pages: pool %d is out of range", pool));
KASSERT(order < VM_NFREEORDER,
("vm_phys_alloc_freelist_pages: order %d is out of range", order));
- vm_policy_iterator_init(&vi);
-
- while ((vm_domain_iterator_run(&vi, &domain)) == 0) {
- m = vm_phys_alloc_domain_pages(domain,
- vm_freelist_to_flind[freelist], pool, order);
- if (m != NULL)
- return (m);
- }
-
- vm_policy_iterator_finish(&vi);
- return (NULL);
-}
-
-static vm_page_t
-vm_phys_alloc_domain_pages(int domain, int flind, int pool, int order)
-{
- struct vm_freelist *fl;
- struct vm_freelist *alt;
- int oind, pind;
- vm_page_t m;
-
mtx_assert(&vm_page_queue_free_mtx, MA_OWNED);
fl = &vm_phys_free_queues[domain][flind][pool][0];
for (oind = order; oind < VM_NFREEORDER; oind++) {
@@ -1261,14 +1094,13 @@ vm_phys_unfree_page(vm_page_t m)
* "alignment" and "boundary" must be a power of two.
*/
vm_page_t
-vm_phys_alloc_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
+vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high,
u_long alignment, vm_paddr_t boundary)
{
vm_paddr_t pa_end, pa_start;
vm_page_t m_run;
- struct vm_domain_iterator vi;
struct vm_phys_seg *seg;
- int domain, segind;
+ int segind;
KASSERT(npages > 0, ("npages is 0"));
KASSERT(powerof2(alignment), ("alignment is not a power of 2"));
@@ -1276,12 +1108,6 @@ vm_phys_alloc_contig(u_long npages, vm_paddr_t low, vm
mtx_assert(&vm_page_queue_free_mtx, MA_OWNED);
if (low >= high)
return (NULL);
- vm_policy_iterator_init(&vi);
-restartdom:
- if (vm_domain_iterator_run(&vi, &domain) != 0) {
- vm_policy_iterator_finish(&vi);
- return (NULL);
- }
m_run = NULL;
for (segind = vm_phys_nsegs - 1; segind >= 0; segind--) {
seg = &vm_phys_segs[segind];
@@ -1304,9 +1130,6 @@ restartdom:
if (m_run != NULL)
break;
}
- if (m_run == NULL && !vm_domain_iterator_isdone(&vi))
- goto restartdom;
- vm_policy_iterator_finish(&vi);
return (m_run);
}
Modified: head/sys/vm/vm_phys.h
==============================================================================
--- head/sys/vm/vm_phys.h Tue Nov 28 22:57:13 2017 (r326345)
+++ head/sys/vm/vm_phys.h Tue Nov 28 23:18:35 2017 (r326346)
@@ -72,10 +72,11 @@ extern int vm_phys_nsegs;
* The following functions are only to be used by the virtual memory system.
*/
void vm_phys_add_seg(vm_paddr_t start, vm_paddr_t end);
-vm_page_t vm_phys_alloc_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
- u_long alignment, vm_paddr_t boundary);
-vm_page_t vm_phys_alloc_freelist_pages(int freelist, int pool, int order);
-vm_page_t vm_phys_alloc_pages(int pool, int order);
+vm_page_t vm_phys_alloc_contig(int domain, u_long npages, vm_paddr_t low,
+ vm_paddr_t high, u_long alignment, vm_paddr_t boundary);
+vm_page_t vm_phys_alloc_freelist_pages(int domain, int freelist, int pool,
+ int order);
+vm_page_t vm_phys_alloc_pages(int domain, int pool, int order);
boolean_t vm_phys_domain_intersects(long mask, vm_paddr_t low, vm_paddr_t high);
int vm_phys_fictitious_reg_range(vm_paddr_t start, vm_paddr_t end,
vm_memattr_t memattr);
@@ -92,12 +93,13 @@ boolean_t vm_phys_unfree_page(vm_page_t m);
int vm_phys_mem_affinity(int f, int t);
/*
- * vm_phys_domain:
*
- * Return the memory domain the page belongs to.
+ * vm_phys_domidx:
+ *
+ * Return the index of the domain the page belongs to.
*/
-static inline struct vm_domain *
-vm_phys_domain(vm_page_t m)
+static inline int
+vm_phys_domidx(vm_page_t m)
{
#ifdef VM_NUMA_ALLOC
int domn, segind;
@@ -107,10 +109,22 @@ vm_phys_domain(vm_page_t m)
KASSERT(segind < vm_phys_nsegs, ("segind %d m %p", segind, m));
domn = vm_phys_segs[segind].domain;
KASSERT(domn < vm_ndomains, ("domain %d m %p", domn, m));
- return (&vm_dom[domn]);
+ return (domn);
#else
- return (&vm_dom[0]);
+ return (0);
#endif
+}
+
+/*
+ * vm_phys_domain:
+ *
+ * Return the memory domain the page belongs to.
+ */
+static inline struct vm_domain *
+vm_phys_domain(vm_page_t m)
+{
+
+ return (&vm_dom[vm_phys_domidx(m)]);
}
static inline u_int
Modified: head/sys/vm/vm_reserv.c
==============================================================================
--- head/sys/vm/vm_reserv.c Tue Nov 28 22:57:13 2017 (r326345)
+++ head/sys/vm/vm_reserv.c Tue Nov 28 23:18:35 2017 (r326346)
@@ -170,6 +170,7 @@ struct vm_reserv {
vm_object_t object; /* containing object */
vm_pindex_t pindex; /* offset within object */
vm_page_t pages; /* first page of a superpage */
+ int domain; /* NUMA domain */
int popcnt; /* # of pages in use */
char inpartpopq;
popmap_t popmap[NPOPMAP]; /* bit vector of used pages */
@@ -207,8 +208,7 @@ static vm_reserv_t vm_reserv_array;
*
* Access to this queue is synchronized by the free page queue lock.
*/
-static TAILQ_HEAD(, vm_reserv) vm_rvq_partpop =
- TAILQ_HEAD_INITIALIZER(vm_rvq_partpop);
+static TAILQ_HEAD(, vm_reserv) vm_rvq_partpop[MAXMEMDOM];
static SYSCTL_NODE(_vm, OID_AUTO, reserv, CTLFLAG_RD, 0, "Reservation Info");
@@ -277,24 +277,27 @@ sysctl_vm_reserv_partpopq(SYSCTL_HANDLER_ARGS)
{
struct sbuf sbuf;
vm_reserv_t rv;
- int counter, error, level, unused_pages;
+ int counter, error, domain, level, unused_pages;
error = sysctl_wire_old_buffer(req, 0);
if (error != 0)
return (error);
sbuf_new_for_sysctl(&sbuf, NULL, 128, req);
- sbuf_printf(&sbuf, "\nLEVEL SIZE NUMBER\n\n");
- for (level = -1; level <= VM_NRESERVLEVEL - 2; level++) {
- counter = 0;
- unused_pages = 0;
- mtx_lock(&vm_page_queue_free_mtx);
- TAILQ_FOREACH(rv, &vm_rvq_partpop/*[level]*/, partpopq) {
- counter++;
- unused_pages += VM_LEVEL_0_NPAGES - rv->popcnt;
+ sbuf_printf(&sbuf, "\nDOMAIN LEVEL SIZE NUMBER\n\n");
+ for (domain = 0; domain < vm_ndomains; domain++) {
+ for (level = -1; level <= VM_NRESERVLEVEL - 2; level++) {
+ counter = 0;
+ unused_pages = 0;
+ mtx_lock(&vm_page_queue_free_mtx);
+ TAILQ_FOREACH(rv, &vm_rvq_partpop[domain], partpopq) {
+ counter++;
+ unused_pages += VM_LEVEL_0_NPAGES - rv->popcnt;
+ }
+ mtx_unlock(&vm_page_queue_free_mtx);
+ sbuf_printf(&sbuf, "%6d, %7d, %6dK, %6d\n",
+ domain, level,
+ unused_pages * ((int)PAGE_SIZE / 1024), counter);
}
- mtx_unlock(&vm_page_queue_free_mtx);
- sbuf_printf(&sbuf, "%5d: %6dK, %6d\n", level,
- unused_pages * ((int)PAGE_SIZE / 1024), counter);
}
error = sbuf_finish(&sbuf);
sbuf_delete(&sbuf);
@@ -321,8 +324,11 @@ vm_reserv_depopulate(vm_reserv_t rv, int index)
index));
KASSERT(rv->popcnt > 0,
("vm_reserv_depopulate: reserv %p's popcnt is corrupted", rv));
+ KASSERT(rv->domain >= 0 && rv->domain < vm_ndomains,
+ ("vm_reserv_depopulate: reserv %p's domain is corrupted %d",
+ rv, rv->domain));
if (rv->inpartpopq) {
- TAILQ_REMOVE(&vm_rvq_partpop, rv, partpopq);
+ TAILQ_REMOVE(&vm_rvq_partpop[rv->domain], rv, partpopq);
rv->inpartpopq = FALSE;
} else {
KASSERT(rv->pages->psind == 1,
@@ -335,11 +341,12 @@ vm_reserv_depopulate(vm_reserv_t rv, int index)
if (rv->popcnt == 0) {
LIST_REMOVE(rv, objq);
rv->object = NULL;
+ rv->domain = -1;
vm_phys_free_pages(rv->pages, VM_LEVEL_0_ORDER);
vm_reserv_freed++;
} else {
rv->inpartpopq = TRUE;
- TAILQ_INSERT_TAIL(&vm_rvq_partpop, rv, partpopq);
+ TAILQ_INSERT_TAIL(&vm_rvq_partpop[rv->domain], rv, partpopq);
}
}
@@ -384,15 +391,18 @@ vm_reserv_populate(vm_reserv_t rv, int index)
("vm_reserv_populate: reserv %p is already full", rv));
KASSERT(rv->pages->psind == 0,
("vm_reserv_populate: reserv %p is already promoted", rv));
+ KASSERT(rv->domain >= 0 && rv->domain < vm_ndomains,
+ ("vm_reserv_populate: reserv %p's domain is corrupted %d",
+ rv, rv->domain));
if (rv->inpartpopq) {
- TAILQ_REMOVE(&vm_rvq_partpop, rv, partpopq);
+ TAILQ_REMOVE(&vm_rvq_partpop[rv->domain], rv, partpopq);
rv->inpartpopq = FALSE;
}
popmap_set(rv->popmap, index);
rv->popcnt++;
if (rv->popcnt < VM_LEVEL_0_NPAGES) {
rv->inpartpopq = TRUE;
- TAILQ_INSERT_TAIL(&vm_rvq_partpop, rv, partpopq);
+ TAILQ_INSERT_TAIL(&vm_rvq_partpop[rv->domain], rv, partpopq);
} else
rv->pages->psind = 1;
}
@@ -413,9 +423,9 @@ vm_reserv_populate(vm_reserv_t rv, int index)
* The object and free page queue must be locked.
*/
vm_page_t
-vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, u_long npages,
- vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary,
- vm_page_t mpred)
+vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex, int domain,
+ u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,
+ vm_paddr_t boundary, vm_page_t mpred)
{
vm_paddr_t pa, size;
vm_page_t m, m_ret, msucc;
@@ -535,7 +545,7 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t
* specified index may not be the first page within the first new
* reservation.
*/
- m = vm_phys_alloc_contig(allocpages, low, high, ulmax(alignment,
+ m = vm_phys_alloc_contig(domain, allocpages, low, high, ulmax(alignment,
VM_LEVEL_0_SIZE), boundary > VM_LEVEL_0_SIZE ? boundary : 0);
if (m == NULL)
return (NULL);
@@ -558,6 +568,7 @@ vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t
LIST_INSERT_HEAD(&object->rvq, rv, objq);
rv->object = object;
rv->pindex = first;
+ rv->domain = vm_phys_domidx(m);
KASSERT(rv->popcnt == 0,
("vm_reserv_alloc_contig: reserv %p's popcnt is corrupted",
rv));
@@ -613,7 +624,8 @@ found:
* The object and free page queue must be locked.
*/
vm_page_t
-vm_reserv_alloc_page(vm_object_t object, vm_pindex_t pindex, vm_page_t mpred)
+vm_reserv_alloc_page(vm_object_t object, vm_pindex_t pindex, int domain,
+ vm_page_t mpred)
{
vm_page_t m, msucc;
vm_pindex_t first, leftcap, rightcap;
@@ -692,7 +704,7 @@ vm_reserv_alloc_page(vm_object_t object, vm_pindex_t p
/*
* Allocate and populate the new reservation.
*/
- m = vm_phys_alloc_pages(VM_FREEPOOL_DEFAULT, VM_LEVEL_0_ORDER);
+ m = vm_phys_alloc_pages(domain, VM_FREEPOOL_DEFAULT, VM_LEVEL_0_ORDER);
if (m == NULL)
return (NULL);
rv = vm_reserv_from_page(m);
@@ -703,6 +715,7 @@ vm_reserv_alloc_page(vm_object_t object, vm_pindex_t p
LIST_INSERT_HEAD(&object->rvq, rv, objq);
rv->object = object;
rv->pindex = first;
+ rv->domain = vm_phys_domidx(m);
KASSERT(rv->popcnt == 0,
("vm_reserv_alloc_page: reserv %p's popcnt is corrupted", rv));
KASSERT(!rv->inpartpopq,
@@ -749,6 +762,7 @@ vm_reserv_break(vm_reserv_t rv, vm_page_t m)
("vm_reserv_break: reserv %p's inpartpopq is TRUE", rv));
LIST_REMOVE(rv, objq);
rv->object = NULL;
+ rv->domain = -1;
if (m != NULL) {
/*
* Since the reservation is being broken, there is no harm in
@@ -818,7 +832,7 @@ vm_reserv_break_all(vm_object_t object)
KASSERT(rv->object == object,
("vm_reserv_break_all: reserv %p is corrupted", rv));
if (rv->inpartpopq) {
- TAILQ_REMOVE(&vm_rvq_partpop, rv, partpopq);
+ TAILQ_REMOVE(&vm_rvq_partpop[rv->domain], rv, partpopq);
rv->inpartpopq = FALSE;
}
vm_reserv_break(rv, NULL);
@@ -856,7 +870,7 @@ vm_reserv_init(void)
{
vm_paddr_t paddr;
struct vm_phys_seg *seg;
- int segind;
+ int i, segind;
/*
* Initialize the reservation array. Specifically, initialize the
@@ -871,6 +885,8 @@ vm_reserv_init(void)
paddr += VM_LEVEL_0_SIZE;
}
}
+ for (i = 0; i < MAXMEMDOM; i++)
+ TAILQ_INIT(&vm_rvq_partpop[i]);
}
/*
@@ -928,7 +944,10 @@ vm_reserv_reclaim(vm_reserv_t rv)
mtx_assert(&vm_page_queue_free_mtx, MA_OWNED);
KASSERT(rv->inpartpopq,
("vm_reserv_reclaim: reserv %p's inpartpopq is FALSE", rv));
- TAILQ_REMOVE(&vm_rvq_partpop, rv, partpopq);
+ KASSERT(rv->domain >= 0 && rv->domain < vm_ndomains,
+ ("vm_reserv_reclaim: reserv %p's domain is corrupted %d",
+ rv, rv->domain));
+ TAILQ_REMOVE(&vm_rvq_partpop[rv->domain], rv, partpopq);
rv->inpartpopq = FALSE;
vm_reserv_break(rv, NULL);
vm_reserv_reclaimed++;
@@ -942,12 +961,12 @@ vm_reserv_reclaim(vm_reserv_t rv)
* The free page queue lock must be held.
*/
boolean_t
-vm_reserv_reclaim_inactive(void)
+vm_reserv_reclaim_inactive(int domain)
{
vm_reserv_t rv;
mtx_assert(&vm_page_queue_free_mtx, MA_OWNED);
- if ((rv = TAILQ_FIRST(&vm_rvq_partpop)) != NULL) {
+ if ((rv = TAILQ_FIRST(&vm_rvq_partpop[domain])) != NULL) {
vm_reserv_reclaim(rv);
return (TRUE);
}
@@ -963,8 +982,8 @@ vm_reserv_reclaim_inactive(void)
* The free page queue lock must be held.
*/
boolean_t
-vm_reserv_reclaim_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
- u_long alignment, vm_paddr_t boundary)
+vm_reserv_reclaim_contig(int domain, u_long npages, vm_paddr_t low,
+ vm_paddr_t high, u_long alignment, vm_paddr_t boundary)
{
vm_paddr_t pa, size;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-all@freebsd.org Tue Nov 28 23:40:57 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B008DF2886;
Tue, 28 Nov 2017 23:40:57 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id ED39B7DEE9;
Tue, 28 Nov 2017 23:40:56 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASNeuJB044394;
Tue, 28 Nov 2017 23:40:56 GMT (envelope-from jeff@FreeBSD.org)
Received: (from jeff@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASNetfP044382;
Tue, 28 Nov 2017 23:40:55 GMT (envelope-from jeff@FreeBSD.org)
Message-Id: <201711282340.vASNetfP044382@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jeff set sender to
jeff@FreeBSD.org using -f
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Tue, 28 Nov 2017 23:40:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326347 - in head/sys: kern sys vm
X-SVN-Group: head
X-SVN-Commit-Author: jeff
X-SVN-Commit-Paths: in head/sys: kern sys vm
X-SVN-Commit-Revision: 326347
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 23:40:57 -0000
Author: jeff
Date: Tue Nov 28 23:40:54 2017
New Revision: 326347
URL: https://svnweb.freebsd.org/changeset/base/326347
Log:
Eliminate kmem_arena and kmem_object in preparation for further NUMA commits.
The arena argument to kmem_*() is now only used in an assert. A follow-up
commit will remove the argument altogether before we freeze the API for the
next release.
This replaces the hard limit on kmem size with a soft limit imposed by UMA. When
the soft limit is exceeded we periodically wakeup the UMA reclaim thread to
attempt to shrink KVA. On 32bit architectures this should behave much more
gracefully as we exhaust KVA. On 64bit the limits are likely never hit.
Reviewed by: markj, kib (some objections)
Discussed with: alc
Tested by: pho
Sponsored by: Netflix / Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D13187
Modified:
head/sys/kern/kern_malloc.c
head/sys/kern/subr_vmem.c
head/sys/sys/vmem.h
head/sys/vm/memguard.c
head/sys/vm/uma.h
head/sys/vm/uma_core.c
head/sys/vm/uma_int.h
head/sys/vm/vm_kern.c
head/sys/vm/vm_map.c
head/sys/vm/vm_object.c
head/sys/vm/vm_object.h
Modified: head/sys/kern/kern_malloc.c
==============================================================================
--- head/sys/kern/kern_malloc.c Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/kern/kern_malloc.c Tue Nov 28 23:40:54 2017 (r326347)
@@ -239,16 +239,22 @@ sysctl_kmem_map_size(SYSCTL_HANDLER_ARGS)
{
u_long size;
- size = vmem_size(kmem_arena, VMEM_ALLOC);
+ size = uma_size();
return (sysctl_handle_long(oidp, &size, 0, req));
}
static int
sysctl_kmem_map_free(SYSCTL_HANDLER_ARGS)
{
- u_long size;
+ u_long size, limit;
- size = vmem_size(kmem_arena, VMEM_FREE);
+ /* The sysctl is unsigned, implement as a saturation value. */
+ size = uma_size();
+ limit = uma_limit();
+ if (size > limit)
+ size = 0;
+ else
+ size = limit - size;
return (sysctl_handle_long(oidp, &size, 0, req));
}
@@ -669,19 +675,6 @@ reallocf(void *addr, unsigned long size, struct malloc
return (mem);
}
-/*
- * Wake the uma reclamation pagedaemon thread when we exhaust KVA. It
- * will call the lowmem handler and uma_reclaim() callbacks in a
- * context that is safe.
- */
-static void
-kmem_reclaim(vmem_t *vm, int flags)
-{
-
- uma_reclaim_wakeup();
- pagedaemon_wakeup();
-}
-
#ifndef __sparc64__
CTASSERT(VM_KMEM_SIZE_SCALE >= 1);
#endif
@@ -759,9 +752,7 @@ kmeminit(void)
#else
tmp = vm_kmem_size;
#endif
- vmem_init(kmem_arena, "kmem arena", kva_alloc(tmp), tmp, PAGE_SIZE,
- 0, 0);
- vmem_set_reclaim(kmem_arena, kmem_reclaim);
+ uma_set_limit(tmp);
#ifdef DEBUG_MEMGUARD
/*
@@ -769,7 +760,7 @@ kmeminit(void)
* replacement allocator used for detecting tamper-after-free
* scenarios as they occur. It is only used for debugging.
*/
- memguard_init(kmem_arena);
+ memguard_init(kernel_arena);
#endif
}
Modified: head/sys/kern/subr_vmem.c
==============================================================================
--- head/sys/kern/subr_vmem.c Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/kern/subr_vmem.c Tue Nov 28 23:40:54 2017 (r326347)
@@ -137,6 +137,7 @@ struct vmem {
int vm_nbusytag;
vmem_size_t vm_inuse;
vmem_size_t vm_size;
+ vmem_size_t vm_limit;
/* Used on import. */
vmem_import_t *vm_importfn;
@@ -228,11 +229,11 @@ static uma_zone_t vmem_bt_zone;
/* boot time arena storage. */
static struct vmem kernel_arena_storage;
-static struct vmem kmem_arena_storage;
static struct vmem buffer_arena_storage;
static struct vmem transient_arena_storage;
+/* kernel and kmem arenas are aliased for backwards KPI compat. */
vmem_t *kernel_arena = &kernel_arena_storage;
-vmem_t *kmem_arena = &kmem_arena_storage;
+vmem_t *kmem_arena = &kernel_arena_storage;
vmem_t *buffer_arena = &buffer_arena_storage;
vmem_t *transient_arena = &transient_arena_storage;
@@ -254,11 +255,11 @@ bt_fill(vmem_t *vm, int flags)
VMEM_ASSERT_LOCKED(vm);
/*
- * Only allow the kmem arena to dip into reserve tags. It is the
+ * Only allow the kernel arena to dip into reserve tags. It is the
* vmem where new tags come from.
*/
flags &= BT_FLAGS;
- if (vm != kmem_arena)
+ if (vm != kernel_arena)
flags &= ~M_USE_RESERVE;
/*
@@ -615,22 +616,22 @@ vmem_bt_alloc(uma_zone_t zone, vm_size_t bytes, uint8_
{
vmem_addr_t addr;
- *pflag = UMA_SLAB_KMEM;
+ *pflag = UMA_SLAB_KERNEL;
/*
* Single thread boundary tag allocation so that the address space
* and memory are added in one atomic operation.
*/
mtx_lock(&vmem_bt_lock);
- if (vmem_xalloc(kmem_arena, bytes, 0, 0, 0, VMEM_ADDR_MIN,
+ if (vmem_xalloc(kernel_arena, bytes, 0, 0, 0, VMEM_ADDR_MIN,
VMEM_ADDR_MAX, M_NOWAIT | M_NOVM | M_USE_RESERVE | M_BESTFIT,
&addr) == 0) {
- if (kmem_back(kmem_object, addr, bytes,
+ if (kmem_back(kernel_object, addr, bytes,
M_NOWAIT | M_USE_RESERVE) == 0) {
mtx_unlock(&vmem_bt_lock);
return ((void *)addr);
}
- vmem_xfree(kmem_arena, addr, bytes);
+ vmem_xfree(kernel_arena, addr, bytes);
mtx_unlock(&vmem_bt_lock);
/*
* Out of memory, not address space. This may not even be
@@ -835,7 +836,7 @@ vmem_import(vmem_t *vm, vmem_size_t size, vmem_size_t
int error;
if (vm->vm_importfn == NULL)
- return EINVAL;
+ return (EINVAL);
/*
* To make sure we get a span that meets the alignment we double it
@@ -845,6 +846,9 @@ vmem_import(vmem_t *vm, vmem_size_t size, vmem_size_t
size = (align * 2) + size;
size = roundup(size, vm->vm_import_quantum);
+ if (vm->vm_limit != 0 && vm->vm_limit < vm->vm_size + size)
+ return (ENOMEM);
+
/*
* Hide MAXALLOC tags so we're guaranteed to be able to add this
* span and the tag we want to allocate from it.
@@ -856,7 +860,7 @@ vmem_import(vmem_t *vm, vmem_size_t size, vmem_size_t
VMEM_LOCK(vm);
vm->vm_nfreetags += BT_MAXALLOC;
if (error)
- return ENOMEM;
+ return (ENOMEM);
vmem_add1(vm, addr, size, BT_TYPE_SPAN);
@@ -978,6 +982,15 @@ vmem_set_import(vmem_t *vm, vmem_import_t *importfn,
}
void
+vmem_set_limit(vmem_t *vm, vmem_size_t limit)
+{
+
+ VMEM_LOCK(vm);
+ vm->vm_limit = limit;
+ VMEM_UNLOCK(vm);
+}
+
+void
vmem_set_reclaim(vmem_t *vm, vmem_reclaim_t *reclaimfn)
{
@@ -1009,6 +1022,7 @@ vmem_init(vmem_t *vm, const char *name, vmem_addr_t ba
vm->vm_quantum_shift = flsl(quantum) - 1;
vm->vm_nbusytag = 0;
vm->vm_size = 0;
+ vm->vm_limit = 0;
vm->vm_inuse = 0;
qc_init(vm, qcache_max);
Modified: head/sys/sys/vmem.h
==============================================================================
--- head/sys/sys/vmem.h Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/sys/vmem.h Tue Nov 28 23:40:54 2017 (r326347)
@@ -76,6 +76,12 @@ void vmem_set_import(vmem_t *vm, vmem_import_t *import
vmem_release_t *releasefn, void *arg, vmem_size_t import_quantum);
/*
+ * Set a limit on the total size of a vmem.
+ */
+
+void vmem_set_limit(vmem_t *vm, vmem_size_t limit);
+
+/*
* Set a callback for reclaiming memory when space is exhausted:
*/
void vmem_set_reclaim(vmem_t *vm, vmem_reclaim_t *reclaimfn);
Modified: head/sys/vm/memguard.c
==============================================================================
--- head/sys/vm/memguard.c Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/memguard.c Tue Nov 28 23:40:54 2017 (r326347)
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
static SYSCTL_NODE(_vm, OID_AUTO, memguard, CTLFLAG_RW, NULL, "MemGuard data");
/*
- * The vm_memguard_divisor variable controls how much of kmem_map should be
+ * The vm_memguard_divisor variable controls how much of kernel_arena should be
* reserved for MemGuard.
*/
static u_int vm_memguard_divisor;
@@ -157,7 +157,7 @@ SYSCTL_ULONG(_vm_memguard, OID_AUTO, frequency_hits, C
/*
* Return a fudged value to be used for vm_kmem_size for allocating
- * the kmem_map. The memguard memory will be a submap.
+ * the kernel_arena. The memguard memory will be a submap.
*/
unsigned long
memguard_fudge(unsigned long km_size, const struct vm_map *parent_map)
@@ -348,7 +348,7 @@ memguard_alloc(unsigned long req_size, int flags)
addr = origaddr;
if (do_guard)
addr += PAGE_SIZE;
- rv = kmem_back(kmem_object, addr, size_p, flags);
+ rv = kmem_back(kernel_object, addr, size_p, flags);
if (rv != KERN_SUCCESS) {
vmem_xfree(memguard_arena, origaddr, size_v);
memguard_fail_pgs++;
@@ -418,7 +418,7 @@ memguard_free(void *ptr)
* vm_map lock to serialize updates to memguard_wasted, since
* we had the lock at increment.
*/
- kmem_unback(kmem_object, addr, size);
+ kmem_unback(kernel_object, addr, size);
if (sizev > size)
addr -= PAGE_SIZE;
vmem_xfree(memguard_arena, addr, sizev);
Modified: head/sys/vm/uma.h
==============================================================================
--- head/sys/vm/uma.h Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/uma.h Tue Nov 28 23:40:54 2017 (r326347)
@@ -609,12 +609,11 @@ void uma_zone_set_freef(uma_zone_t zone, uma_free free
* These flags are setable in the allocf and visible in the freef.
*/
#define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */
-#define UMA_SLAB_KMEM 0x02 /* Slab alloced from kmem_map */
#define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kernel_map */
#define UMA_SLAB_PRIV 0x08 /* Slab alloced from priv allocator */
#define UMA_SLAB_OFFP 0x10 /* Slab is managed separately */
#define UMA_SLAB_MALLOC 0x20 /* Slab is a large malloc slab */
-/* 0x40 and 0x80 are available */
+/* 0x02, 0x40 and 0x80 are available */
/*
* Used to pre-fill a zone with some number of items
Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/uma_core.c Tue Nov 28 23:40:54 2017 (r326347)
@@ -147,6 +147,10 @@ static struct mtx uma_boot_pages_mtx;
static struct sx uma_drain_lock;
+/* kmem soft limit. */
+static unsigned long uma_kmem_limit;
+static volatile unsigned long uma_kmem_total;
+
/* Is the VM done starting up? */
static int booted = 0;
#define UMA_STARTUP 1
@@ -285,6 +289,22 @@ static int zone_warnings = 1;
SYSCTL_INT(_vm, OID_AUTO, zone_warnings, CTLFLAG_RWTUN, &zone_warnings, 0,
"Warn when UMA zones becomes full");
+/* Adjust bytes under management by UMA. */
+static inline void
+uma_total_dec(unsigned long size)
+{
+
+ atomic_subtract_long(&uma_kmem_total, size);
+}
+
+static inline void
+uma_total_inc(unsigned long size)
+{
+
+ if (atomic_fetchadd_long(&uma_kmem_total, size) > uma_kmem_limit)
+ uma_reclaim_wakeup();
+}
+
/*
* This routine checks to see whether or not it's safe to enable buckets.
*/
@@ -831,6 +851,7 @@ keg_free_slab(uma_keg_t keg, uma_slab_t slab, int star
if (keg->uk_flags & UMA_ZONE_OFFPAGE)
zone_free_item(keg->uk_slabzone, slab, NULL, SKIP_NONE);
keg->uk_freef(mem, PAGE_SIZE * keg->uk_ppera, flags);
+ uma_total_dec(PAGE_SIZE * keg->uk_ppera);
}
/*
@@ -935,6 +956,7 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t zone, int wai
{
uma_alloc allocf;
uma_slab_t slab;
+ unsigned long size;
uint8_t *mem;
uint8_t flags;
int i;
@@ -945,6 +967,7 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t zone, int wai
allocf = keg->uk_allocf;
KEG_UNLOCK(keg);
+ size = keg->uk_ppera * PAGE_SIZE;
if (keg->uk_flags & UMA_ZONE_OFFPAGE) {
slab = zone_alloc_item(keg->uk_slabzone, NULL, wait);
@@ -968,13 +991,14 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t zone, int wai
wait |= M_NODUMP;
/* zone is passed for legacy reasons. */
- mem = allocf(zone, keg->uk_ppera * PAGE_SIZE, &flags, wait);
+ mem = allocf(zone, size, &flags, wait);
if (mem == NULL) {
if (keg->uk_flags & UMA_ZONE_OFFPAGE)
zone_free_item(keg->uk_slabzone, slab, NULL, SKIP_NONE);
slab = NULL;
goto out;
}
+ uma_total_inc(size);
/* Point the slab into the allocated memory */
if (!(keg->uk_flags & UMA_ZONE_OFFPAGE))
@@ -1079,8 +1103,8 @@ page_alloc(uma_zone_t zone, vm_size_t bytes, uint8_t *
{
void *p; /* Returned page */
- *pflag = UMA_SLAB_KMEM;
- p = (void *) kmem_malloc(kmem_arena, bytes, wait);
+ *pflag = UMA_SLAB_KERNEL;
+ p = (void *) kmem_malloc(kernel_arena, bytes, wait);
return (p);
}
@@ -1161,9 +1185,7 @@ page_free(void *mem, vm_size_t size, uint8_t flags)
{
struct vmem *vmem;
- if (flags & UMA_SLAB_KMEM)
- vmem = kmem_arena;
- else if (flags & UMA_SLAB_KERNEL)
+ if (flags & UMA_SLAB_KERNEL)
vmem = kernel_arena;
else
panic("UMA: page_free used with invalid flags %x", flags);
@@ -3132,31 +3154,33 @@ uma_reclaim(void)
sx_xunlock(&uma_drain_lock);
}
-static int uma_reclaim_needed;
+static volatile int uma_reclaim_needed;
void
uma_reclaim_wakeup(void)
{
- uma_reclaim_needed = 1;
- wakeup(&uma_reclaim_needed);
+ if (atomic_fetchadd_int(&uma_reclaim_needed, 1) == 0)
+ wakeup(uma_reclaim);
}
void
uma_reclaim_worker(void *arg __unused)
{
- sx_xlock(&uma_drain_lock);
for (;;) {
- sx_sleep(&uma_reclaim_needed, &uma_drain_lock, PVM,
- "umarcl", 0);
- if (uma_reclaim_needed) {
- uma_reclaim_needed = 0;
- sx_xunlock(&uma_drain_lock);
- EVENTHANDLER_INVOKE(vm_lowmem, VM_LOW_KMEM);
- sx_xlock(&uma_drain_lock);
- uma_reclaim_locked(true);
- }
+ sx_xlock(&uma_drain_lock);
+ while (uma_reclaim_needed == 0)
+ sx_sleep(uma_reclaim, &uma_drain_lock, PVM, "umarcl",
+ hz);
+ sx_xunlock(&uma_drain_lock);
+ EVENTHANDLER_INVOKE(vm_lowmem, VM_LOW_KMEM);
+ sx_xlock(&uma_drain_lock);
+ uma_reclaim_locked(true);
+ atomic_set_int(&uma_reclaim_needed, 0);
+ sx_xunlock(&uma_drain_lock);
+ /* Don't fire more than once per-second. */
+ pause("umarclslp", hz);
}
}
@@ -3194,6 +3218,7 @@ uma_large_malloc(vm_size_t size, int wait)
slab->us_data = mem;
slab->us_flags = flags | UMA_SLAB_MALLOC;
slab->us_size = size;
+ uma_total_inc(size);
} else {
zone_free_item(slabzone, slab, NULL, SKIP_NONE);
}
@@ -3206,6 +3231,7 @@ uma_large_free(uma_slab_t slab)
{
page_free(slab->us_data, slab->us_size, slab->us_flags);
+ uma_total_dec(slab->us_size);
zone_free_item(slabzone, slab, NULL, SKIP_NONE);
}
@@ -3219,6 +3245,27 @@ uma_zero_item(void *item, uma_zone_t zone)
bzero(zpcpu_get_cpu(item, i), zone->uz_size);
} else
bzero(item, zone->uz_size);
+}
+
+unsigned long
+uma_limit(void)
+{
+
+ return (uma_kmem_limit);
+}
+
+void
+uma_set_limit(unsigned long limit)
+{
+
+ uma_kmem_limit = limit;
+}
+
+unsigned long
+uma_size(void)
+{
+
+ return uma_kmem_total;
}
void
Modified: head/sys/vm/uma_int.h
==============================================================================
--- head/sys/vm/uma_int.h Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/uma_int.h Tue Nov 28 23:40:54 2017 (r326347)
@@ -425,6 +425,13 @@ vsetslab(vm_offset_t va, uma_slab_t slab)
void *uma_small_alloc(uma_zone_t zone, vm_size_t bytes, uint8_t *pflag,
int wait);
void uma_small_free(void *mem, vm_size_t size, uint8_t flags);
+
+/* Set a global soft limit on UMA managed memory. */
+void uma_set_limit(unsigned long limit);
+unsigned long uma_limit(void);
+
+/* Return the amount of memory managed by UMA. */
+unsigned long uma_size(void);
#endif /* _KERNEL */
#endif /* VM_UMA_INT_H */
Modified: head/sys/vm/vm_kern.c
==============================================================================
--- head/sys/vm/vm_kern.c Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/vm_kern.c Tue Nov 28 23:40:54 2017 (r326347)
@@ -164,11 +164,13 @@ vm_offset_t
kmem_alloc_attr(vmem_t *vmem, vm_size_t size, int flags, vm_paddr_t low,
vm_paddr_t high, vm_memattr_t memattr)
{
- vm_object_t object = vmem == kmem_arena ? kmem_object : kernel_object;
+ vm_object_t object = kernel_object;
vm_offset_t addr, i, offset;
vm_page_t m;
int pflags, tries;
+ KASSERT(vmem == kernel_arena,
+ ("kmem_alloc_attr: Only kernel_arena is supported."));
size = round_page(size);
if (vmem_alloc(vmem, size, M_BESTFIT | flags, &addr))
return (0);
@@ -220,12 +222,14 @@ kmem_alloc_contig(struct vmem *vmem, vm_size_t size, i
vm_paddr_t high, u_long alignment, vm_paddr_t boundary,
vm_memattr_t memattr)
{
- vm_object_t object = vmem == kmem_arena ? kmem_object : kernel_object;
+ vm_object_t object = kernel_object;
vm_offset_t addr, offset, tmp;
vm_page_t end_m, m;
u_long npages;
int pflags, tries;
+ KASSERT(vmem == kernel_arena,
+ ("kmem_alloc_contig: Only kernel_arena is supported."));
size = round_page(size);
if (vmem_alloc(vmem, size, flags | M_BESTFIT, &addr))
return (0);
@@ -314,12 +318,13 @@ kmem_malloc(struct vmem *vmem, vm_size_t size, int fla
vm_offset_t addr;
int rv;
+ KASSERT(vmem == kernel_arena,
+ ("kmem_malloc: Only kernel_arena is supported."));
size = round_page(size);
if (vmem_alloc(vmem, size, flags | M_BESTFIT, &addr))
return (0);
- rv = kmem_back((vmem == kmem_arena) ? kmem_object : kernel_object,
- addr, size, flags);
+ rv = kmem_back(kernel_object, addr, size, flags);
if (rv != KERN_SUCCESS) {
vmem_free(vmem, addr, size);
return (0);
@@ -339,8 +344,8 @@ kmem_back(vm_object_t object, vm_offset_t addr, vm_siz
vm_page_t m, mpred;
int pflags;
- KASSERT(object == kmem_object || object == kernel_object,
- ("kmem_back: only supports kernel objects."));
+ KASSERT(object == kernel_object,
+ ("kmem_back: only supports kernel object."));
offset = addr - VM_MIN_KERNEL_ADDRESS;
pflags = malloc2vm_flags(flags) | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED;
@@ -396,8 +401,8 @@ kmem_unback(vm_object_t object, vm_offset_t addr, vm_s
vm_page_t m, next;
vm_offset_t end, offset;
- KASSERT(object == kmem_object || object == kernel_object,
- ("kmem_unback: only supports kernel objects."));
+ KASSERT(object == kernel_object,
+ ("kmem_unback: only supports kernel object."));
pmap_remove(kernel_pmap, addr, addr + size);
offset = addr - VM_MIN_KERNEL_ADDRESS;
@@ -422,9 +427,10 @@ void
kmem_free(struct vmem *vmem, vm_offset_t addr, vm_size_t size)
{
+ KASSERT(vmem == kernel_arena,
+ ("kmem_free: Only kernel_arena is supported."));
size = round_page(size);
- kmem_unback((vmem == kmem_arena) ? kmem_object : kernel_object,
- addr, size);
+ kmem_unback(kernel_object, addr, size);
vmem_free(vmem, addr, size);
}
Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/vm_map.c Tue Nov 28 23:40:54 2017 (r326347)
@@ -1189,9 +1189,9 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_oof
vm_inherit_t inheritance;
VM_MAP_ASSERT_LOCKED(map);
- KASSERT((object != kmem_object && object != kernel_object) ||
+ KASSERT(object != kernel_object ||
(cow & MAP_COPY_ON_WRITE) == 0,
- ("vm_map_insert: kmem or kernel object and COW"));
+ ("vm_map_insert: kernel object and COW"));
KASSERT(object == NULL || (cow & MAP_NOFAULT) == 0,
("vm_map_insert: paradoxical MAP_NOFAULT request"));
KASSERT((prot & ~max) == 0,
@@ -2990,7 +2990,7 @@ vm_map_entry_delete(vm_map_t map, vm_map_entry_t entry
VM_OBJECT_WLOCK(object);
if (object->ref_count != 1 && ((object->flags & (OBJ_NOSPLIT |
OBJ_ONEMAPPING)) == OBJ_ONEMAPPING ||
- object == kernel_object || object == kmem_object)) {
+ object == kernel_object)) {
vm_object_collapse(object);
/*
Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/vm_object.c Tue Nov 28 23:40:54 2017 (r326347)
@@ -144,7 +144,6 @@ struct object_q vm_object_list;
struct mtx vm_object_list_mtx; /* lock for object list and count */
struct vm_object kernel_object_store;
-struct vm_object kmem_object_store;
static SYSCTL_NODE(_vm_stats, OID_AUTO, object, CTLFLAG_RD, 0,
"VM object stats");
@@ -292,14 +291,6 @@ vm_object_init(void)
#if VM_NRESERVLEVEL > 0
kernel_object->flags |= OBJ_COLORED;
kernel_object->pg_color = (u_short)atop(VM_MIN_KERNEL_ADDRESS);
-#endif
-
- rw_init(&kmem_object->lock, "kmem vm object");
- _vm_object_allocate(OBJT_PHYS, atop(VM_MAX_KERNEL_ADDRESS -
- VM_MIN_KERNEL_ADDRESS), kmem_object);
-#if VM_NRESERVLEVEL > 0
- kmem_object->flags |= OBJ_COLORED;
- kmem_object->pg_color = (u_short)atop(VM_MIN_KERNEL_ADDRESS);
#endif
/*
Modified: head/sys/vm/vm_object.h
==============================================================================
--- head/sys/vm/vm_object.h Tue Nov 28 23:18:35 2017 (r326346)
+++ head/sys/vm/vm_object.h Tue Nov 28 23:40:54 2017 (r326347)
@@ -227,10 +227,10 @@ extern struct object_q vm_object_list; /* list of allo
extern struct mtx vm_object_list_mtx; /* lock for object list and count */
extern struct vm_object kernel_object_store;
-extern struct vm_object kmem_object_store;
+/* kernel and kmem are aliased for backwards KPI compat. */
#define kernel_object (&kernel_object_store)
-#define kmem_object (&kmem_object_store)
+#define kmem_object (&kernel_object_store)
#define VM_OBJECT_ASSERT_LOCKED(object) \
rw_assert(&(object)->lock, RA_LOCKED)
From owner-svn-src-all@freebsd.org Wed Nov 29 00:08:00 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B48ADF3614;
Wed, 29 Nov 2017 00:08:00 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 674CB7EDDA;
Wed, 29 Nov 2017 00:08:00 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT07x2E056852;
Wed, 29 Nov 2017 00:07:59 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT07xQQ056851;
Wed, 29 Nov 2017 00:07:59 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711290007.vAT07xQQ056851@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Nov 2017 00:07:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326348 - vendor/lua/5.3.4
X-SVN-Group: vendor
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: vendor/lua/5.3.4
X-SVN-Commit-Revision: 326348
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 00:08:00 -0000
Author: imp
Date: Wed Nov 29 00:07:59 2017
New Revision: 326348
URL: https://svnweb.freebsd.org/changeset/base/326348
Log:
Tag lua 5.3.4 (dist commit message bogusly said 3.5.4)
Added:
vendor/lua/5.3.4/
- copied from r326347, vendor/byacc/dist/
From owner-svn-src-all@freebsd.org Wed Nov 29 00:08:12 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB044DF3643;
Wed, 29 Nov 2017 00:08:12 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 730EC7EEF8;
Wed, 29 Nov 2017 00:08:12 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT08AYs056910;
Wed, 29 Nov 2017 00:08:10 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT08AZG056909;
Wed, 29 Nov 2017 00:08:10 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711290008.vAT08AZG056909@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Nov 2017 00:08:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326349 - vendor/lua/5.3.4/dist
X-SVN-Group: vendor
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: vendor/lua/5.3.4/dist
X-SVN-Commit-Revision: 326349
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 00:08:12 -0000
Author: imp
Date: Wed Nov 29 00:08:10 2017
New Revision: 326349
URL: https://svnweb.freebsd.org/changeset/base/326349
Log:
Tag lua 5.3.4 (dist commit message bogusly said 3.5.4)
Added:
vendor/lua/5.3.4/dist/
- copied from r326348, vendor/lua/dist/
From owner-svn-src-all@freebsd.org Wed Nov 29 00:10:20 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7508BDF37D3;
Wed, 29 Nov 2017 00:10:20 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 404667F08F;
Wed, 29 Nov 2017 00:10:20 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT0AJqZ057046;
Wed, 29 Nov 2017 00:10:19 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT0AJoS057045;
Wed, 29 Nov 2017 00:10:19 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711290010.vAT0AJoS057045@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Nov 2017 00:10:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326350 - vendor/byacc/5.3.4
X-SVN-Group: vendor
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: vendor/byacc/5.3.4
X-SVN-Commit-Revision: 326350
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 00:10:20 -0000
Author: imp
Date: Wed Nov 29 00:10:19 2017
New Revision: 326350
URL: https://svnweb.freebsd.org/changeset/base/326350
Log:
Bogusly used byacc template to tag lua. Delete unwanated detritis
Deleted:
vendor/byacc/5.3.4/
From owner-svn-src-all@freebsd.org Wed Nov 29 00:40:39 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE229DF459E;
Wed, 29 Nov 2017 00:40:39 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7141780019;
Wed, 29 Nov 2017 00:40:39 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT0ecgH070576;
Wed, 29 Nov 2017 00:40:38 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT0ec8S070575;
Wed, 29 Nov 2017 00:40:38 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711290040.vAT0ec8S070575@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Nov 2017 00:40:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326351 - vendor/lua/5.3.4
X-SVN-Group: vendor
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: vendor/lua/5.3.4
X-SVN-Commit-Revision: 326351
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 00:40:39 -0000
Author: imp
Date: Wed Nov 29 00:40:38 2017
New Revision: 326351
URL: https://svnweb.freebsd.org/changeset/base/326351
Log:
Bogusly used byacc template to tag lua. Delete unwanated detritis
Deleted:
vendor/lua/5.3.4/
From owner-svn-src-all@freebsd.org Wed Nov 29 00:40:47 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4CF39DF45D1;
Wed, 29 Nov 2017 00:40:47 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E353280189;
Wed, 29 Nov 2017 00:40:46 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT0ekIK070626;
Wed, 29 Nov 2017 00:40:46 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT0ekSR070625;
Wed, 29 Nov 2017 00:40:46 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711290040.vAT0ekSR070625@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Nov 2017 00:40:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-vendor@freebsd.org
Subject: svn commit: r326352 - vendor/lua/5.3.4
X-SVN-Group: vendor
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: vendor/lua/5.3.4
X-SVN-Commit-Revision: 326352
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 00:40:47 -0000
Author: imp
Date: Wed Nov 29 00:40:45 2017
New Revision: 326352
URL: https://svnweb.freebsd.org/changeset/base/326352
Log:
Tag lua 5.3.4 (dist commit message bogusly said 3.5.4)
Added:
vendor/lua/5.3.4/
- copied from r326351, vendor/lua/dist/
From owner-svn-src-all@freebsd.org Wed Nov 29 00:46:37 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD4BADF4968;
Wed, 29 Nov 2017 00:46:37 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id AAA148063E;
Wed, 29 Nov 2017 00:46:37 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT0kaAe074000;
Wed, 29 Nov 2017 00:46:36 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT0ka2q073999;
Wed, 29 Nov 2017 00:46:36 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711290046.vAT0ka2q073999@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Nov 2017 00:46:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326353 - head/contrib/lua
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/contrib/lua
X-SVN-Commit-Revision: 326353
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 00:46:38 -0000
Author: imp
Date: Wed Nov 29 00:46:36 2017
New Revision: 326353
URL: https://svnweb.freebsd.org/changeset/base/326353
Log:
Import lua 5.3.4 to contrib
Added:
head/contrib/lua/
- copied from r326352, vendor/lua/dist/
From owner-svn-src-all@freebsd.org Wed Nov 29 01:26:08 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A486CDF5490;
Wed, 29 Nov 2017 01:26:08 +0000 (UTC)
(envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 716FF81874;
Wed, 29 Nov 2017 01:26:08 +0000 (UTC)
(envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT1Q7BX090574;
Wed, 29 Nov 2017 01:26:07 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT1Q77g090573;
Wed, 29 Nov 2017 01:26:07 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201711290126.vAT1Q77g090573@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 29 Nov 2017 01:26:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326354 - head/sys/powerpc/booke
X-SVN-Group: head
X-SVN-Commit-Author: jhibbits
X-SVN-Commit-Paths: head/sys/powerpc/booke
X-SVN-Commit-Revision: 326354
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 01:26:08 -0000
Author: jhibbits
Date: Wed Nov 29 01:26:07 2017
New Revision: 326354
URL: https://svnweb.freebsd.org/changeset/base/326354
Log:
Only check the page tables if within the KVA.
Devices aren't mapped within the KVA, and with the way 64-bit hashes the
addresses pte_vatopa() may not return a 0 physical address for a device.
MFC after: 1 week
Modified:
head/sys/powerpc/booke/pmap.c
Modified: head/sys/powerpc/booke/pmap.c
==============================================================================
--- head/sys/powerpc/booke/pmap.c Wed Nov 29 00:46:36 2017 (r326353)
+++ head/sys/powerpc/booke/pmap.c Wed Nov 29 01:26:07 2017 (r326354)
@@ -2091,10 +2091,11 @@ static vm_paddr_t
mmu_booke_kextract(mmu_t mmu, vm_offset_t va)
{
tlb_entry_t e;
- vm_paddr_t p;
+ vm_paddr_t p = 0;
int i;
- p = pte_vatopa(mmu, kernel_pmap, va);
+ if (va >= VM_MIN_KERNEL_ADDRESS && va <= VM_MAX_KERNEL_ADDRESS)
+ p = pte_vatopa(mmu, kernel_pmap, va);
if (p == 0) {
/* Check TLB1 mappings */
From owner-svn-src-all@freebsd.org Wed Nov 29 05:07:55 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C2EFDF86A9;
Wed, 29 Nov 2017 05:07:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 34E636529B;
Wed, 29 Nov 2017 05:07:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT57snK083666;
Wed, 29 Nov 2017 05:07:54 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT57sNX083665;
Wed, 29 Nov 2017 05:07:54 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201711290507.vAT57sNX083665@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 29 Nov 2017 05:07:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326356 - head/usr.bin/truss
X-SVN-Group: head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: head/usr.bin/truss
X-SVN-Commit-Revision: 326356
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 05:07:55 -0000
Author: jhb
Date: Wed Nov 29 05:07:54 2017
New Revision: 326356
URL: https://svnweb.freebsd.org/changeset/base/326356
Log:
Replace a reference to a license in another file with the license text.
The relevant file was recently renamed, so the reference was stale.
In addition, explicit licenses are more typical in our sources.
Modified:
head/usr.bin/truss/syscall.h
Modified: head/usr.bin/truss/syscall.h
==============================================================================
--- head/usr.bin/truss/syscall.h Wed Nov 29 03:52:10 2017 (r326355)
+++ head/usr.bin/truss/syscall.h Wed Nov 29 05:07:54 2017 (r326356)
@@ -1,6 +1,39 @@
-/*
- * See i386-fbsd.c for copyright and license terms.
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
*
+ * Copyright 1997 Sean Eric Fagan
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Sean Eric Fagan
+ * 4. Neither the name of the author may be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
* System call arguments come in several flavours:
* Hex -- values that should be printed in hex (addresses)
* Octal -- Same as above, but octal
@@ -34,9 +67,6 @@
* In addition, the pointer types (String, Ptr) may have OUT masked in --
* this means that the data is set on *return* from the system call -- or
* IN (meaning that the data is passed *into* the system call).
- */
-/*
- * $FreeBSD$
*/
enum Argtype { None = 1, Hex, Octal, Int, UInt, LongHex, Name, Ptr, Stat, Stat11, Ioctl,
From owner-svn-src-all@freebsd.org Wed Nov 29 05:35:29 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5828CDF8E9D;
Wed, 29 Nov 2017 05:35:29 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2407165E0E;
Wed, 29 Nov 2017 05:35:29 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT5ZSkB096123;
Wed, 29 Nov 2017 05:35:28 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT5ZSRn096122;
Wed, 29 Nov 2017 05:35:28 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711290535.vAT5ZSRn096122@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 29 Nov 2017 05:35:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326357 - stable/10/crypto/openssl/crypto/x509v3
X-SVN-Group: stable-10
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: stable/10/crypto/openssl/crypto/x509v3
X-SVN-Commit-Revision: 326357
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 05:35:29 -0000
Author: delphij
Date: Wed Nov 29 05:35:28 2017
New Revision: 326357
URL: https://svnweb.freebsd.org/changeset/base/326357
Log:
Avoid out-of-bounds read.
Security: CVE-2017-3735
Security: FreeBSD-SA-17:11.openssl
Obtained from: OpenSSL https://github.com/openssl/openssl/pull/4276
Modified:
stable/10/crypto/openssl/crypto/x509v3/v3_addr.c
Modified: stable/10/crypto/openssl/crypto/x509v3/v3_addr.c
==============================================================================
--- stable/10/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:07:54 2017 (r326356)
+++ stable/10/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:35:28 2017 (r326357)
@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi)
*/
unsigned int v3_addr_get_afi(const IPAddressFamily *f)
{
- return ((f != NULL &&
- f->addressFamily != NULL && f->addressFamily->data != NULL)
- ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
- : 0);
+ if (f == NULL
+ || f->addressFamily == NULL
+ || f->addressFamily->data == NULL
+ || f->addressFamily->length < 2)
+ return 0;
+ return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
}
/*
From owner-svn-src-all@freebsd.org Wed Nov 29 05:59:15 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15AE9DF9454;
Wed, 29 Nov 2017 05:59:15 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DDA68666D7;
Wed, 29 Nov 2017 05:59:14 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT5xD4V004623;
Wed, 29 Nov 2017 05:59:13 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT5xDMe004614;
Wed, 29 Nov 2017 05:59:13 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711290559.vAT5xDMe004614@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 29 Nov 2017 05:59:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-releng@freebsd.org
Subject: svn commit: r326358 - in releng: 11.0
11.0/crypto/openssl/crypto/bn/asm 11.0/crypto/openssl/crypto/x509v3
11.0/secure/lib/libcrypto/amd64 11.0/sys/conf 11.1
11.1/crypto/openssl/crypto/bn/asm 11.1/c...
X-SVN-Group: releng
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: in releng: 11.0 11.0/crypto/openssl/crypto/bn/asm
11.0/crypto/openssl/crypto/x509v3 11.0/secure/lib/libcrypto/amd64
11.0/sys/conf 11.1 11.1/crypto/openssl/crypto/bn/asm
11.1/crypto/openssl/crypto/x509...
X-SVN-Commit-Revision: 326358
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 05:59:15 -0000
Author: delphij
Date: Wed Nov 29 05:59:12 2017
New Revision: 326358
URL: https://svnweb.freebsd.org/changeset/base/326358
Log:
Fix multiple vulnerabilities of OpenSSL.
Security: FreeBSD-SA-17:11
Approved by: so
Modified:
releng/11.0/UPDATING
releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c
releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S
releng/11.0/sys/conf/newvers.sh
releng/11.1/UPDATING
releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c
releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S
Modified: releng/11.0/UPDATING
==============================================================================
--- releng/11.0/UPDATING Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.0/UPDATING Wed Nov 29 05:59:12 2017 (r326358)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.
+20171129 p16 FreeBSD-SA-17:11.openssl
+
+ Fix multiple vulnerabilities of OpenSSL.
+
20171115 p15 FreeBSD-SA-17:08.ptrace
FreeBSD-SA-17:10.kldstat
Modified: releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
==============================================================================
--- releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.0/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:59:12 2017 (r326358)
@@ -3090,11 +3090,19 @@ $code.=<<___;
.align 32
.Lsqrx8x_break:
- sub 16+8(%rsp),%r8 # consume last carry
+ xor $zero,$zero
+ sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf
+ adcx $zero,%r8
mov 24+8(%rsp),$carry # initial $tptr, borrow $carry
+ adcx $zero,%r9
mov 0*8($aptr),%rdx # a[8], modulo-scheduled
- xor %ebp,%ebp # xor $zero,$zero
+ adc \$0,%r10
mov %r8,0*8($tptr)
+ adc \$0,%r11
+ adc \$0,%r12
+ adc \$0,%r13
+ adc \$0,%r14
+ adc \$0,%r15
cmp $carry,$tptr # cf=0, of=0
je .Lsqrx8x_outer_loop
Modified: releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c
==============================================================================
--- releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.0/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358)
@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi)
*/
unsigned int v3_addr_get_afi(const IPAddressFamily *f)
{
- return ((f != NULL &&
- f->addressFamily != NULL && f->addressFamily->data != NULL)
- ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
- : 0);
+ if (f == NULL
+ || f->addressFamily == NULL
+ || f->addressFamily->data == NULL
+ || f->addressFamily->length < 2)
+ return 0;
+ return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
}
/*
Modified: releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S
==============================================================================
--- releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.0/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:59:12 2017 (r326358)
@@ -3077,11 +3077,19 @@ __bn_sqrx8x_internal:
.align 32
.Lsqrx8x_break:
- subq 16+8(%rsp),%r8
+ xorq %rbp,%rbp
+ subq 16+8(%rsp),%rbx
+ adcxq %rbp,%r8
movq 24+8(%rsp),%rcx
+ adcxq %rbp,%r9
movq 0(%rsi),%rdx
- xorl %ebp,%ebp
+ adcq $0,%r10
movq %r8,0(%rdi)
+ adcq $0,%r11
+ adcq $0,%r12
+ adcq $0,%r13
+ adcq $0,%r14
+ adcq $0,%r15
cmpq %rcx,%rdi
je .Lsqrx8x_outer_loop
Modified: releng/11.0/sys/conf/newvers.sh
==============================================================================
--- releng/11.0/sys/conf/newvers.sh Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.0/sys/conf/newvers.sh Wed Nov 29 05:59:12 2017 (r326358)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="11.0"
-BRANCH="RELEASE-p15"
+BRANCH="RELEASE-p16"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/11.1/UPDATING
==============================================================================
--- releng/11.1/UPDATING Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.1/UPDATING Wed Nov 29 05:59:12 2017 (r326358)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.
+20171129 p5 FreeBSD-SA-17:11.openssl
+
+ Fix multiple vulnerabilities of OpenSSL.
+
20171115 p4 FreeBSD-SA-17:08.ptrace
FreeBSD-SA-17:10.kldstat
Modified: releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
==============================================================================
--- releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.1/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl Wed Nov 29 05:59:12 2017 (r326358)
@@ -3090,11 +3090,19 @@ $code.=<<___;
.align 32
.Lsqrx8x_break:
- sub 16+8(%rsp),%r8 # consume last carry
+ xor $zero,$zero
+ sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf
+ adcx $zero,%r8
mov 24+8(%rsp),$carry # initial $tptr, borrow $carry
+ adcx $zero,%r9
mov 0*8($aptr),%rdx # a[8], modulo-scheduled
- xor %ebp,%ebp # xor $zero,$zero
+ adc \$0,%r10
mov %r8,0*8($tptr)
+ adc \$0,%r11
+ adc \$0,%r12
+ adc \$0,%r13
+ adc \$0,%r14
+ adc \$0,%r15
cmp $carry,$tptr # cf=0, of=0
je .Lsqrx8x_outer_loop
Modified: releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c
==============================================================================
--- releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.1/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358)
@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi)
*/
unsigned int v3_addr_get_afi(const IPAddressFamily *f)
{
- return ((f != NULL &&
- f->addressFamily != NULL && f->addressFamily->data != NULL)
- ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
- : 0);
+ if (f == NULL
+ || f->addressFamily == NULL
+ || f->addressFamily->data == NULL
+ || f->addressFamily->length < 2)
+ return 0;
+ return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
}
/*
Modified: releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S
==============================================================================
--- releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:35:28 2017 (r326357)
+++ releng/11.1/secure/lib/libcrypto/amd64/x86_64-mont5.S Wed Nov 29 05:59:12 2017 (r326358)
@@ -3077,11 +3077,19 @@ __bn_sqrx8x_internal:
.align 32
.Lsqrx8x_break:
- subq 16+8(%rsp),%r8
+ xorq %rbp,%rbp
+ subq 16+8(%rsp),%rbx
+ adcxq %rbp,%r8
movq 24+8(%rsp),%rcx
+ adcxq %rbp,%r9
movq 0(%rsi),%rdx
- xorl %ebp,%ebp
+ adcq $0,%r10
movq %r8,0(%rdi)
+ adcq $0,%r11
+ adcq $0,%r12
+ adcq $0,%r13
+ adcq $0,%r14
+ adcq $0,%r15
cmpq %rcx,%rdi
je .Lsqrx8x_outer_loop
From owner-svn-src-all@freebsd.org Wed Nov 29 05:59:52 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DF96DF94B4;
Wed, 29 Nov 2017 05:59:52 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 281186680B;
Wed, 29 Nov 2017 05:59:52 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT5xp9e004700;
Wed, 29 Nov 2017 05:59:51 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT5xoTV004694;
Wed, 29 Nov 2017 05:59:50 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711290559.vAT5xoTV004694@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 29 Nov 2017 05:59:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-releng@freebsd.org
Subject: svn commit: r326359 - in releng: 10.3
10.3/crypto/openssl/crypto/x509v3 10.3/sys/conf 10.4
10.4/crypto/openssl/crypto/x509v3 10.4/sys/conf
X-SVN-Group: releng
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: in releng: 10.3 10.3/crypto/openssl/crypto/x509v3
10.3/sys/conf 10.4 10.4/crypto/openssl/crypto/x509v3 10.4/sys/conf
X-SVN-Commit-Revision: 326359
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 05:59:52 -0000
Author: delphij
Date: Wed Nov 29 05:59:50 2017
New Revision: 326359
URL: https://svnweb.freebsd.org/changeset/base/326359
Log:
Fix OpenSSL out-of-bounds read vulnerability.
Security: FreeBSD-SA-17:11
Approved by: so
Modified:
releng/10.3/UPDATING
releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c
releng/10.3/sys/conf/newvers.sh
releng/10.4/UPDATING
releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c
releng/10.4/sys/conf/newvers.sh
Modified: releng/10.3/UPDATING
==============================================================================
--- releng/10.3/UPDATING Wed Nov 29 05:59:12 2017 (r326358)
+++ releng/10.3/UPDATING Wed Nov 29 05:59:50 2017 (r326359)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20171129 p25 FreeBSD-SA-17:11.openssl
+
+ Fix OpenSSL out-of-bounds read vulnerability.
+
20171115 p24 FreeBSD-SA-17:08.ptrace
FreeBSD-SA-17:09.shm
FreeBSD-SA-17:10.kldstat
Modified: releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c
==============================================================================
--- releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358)
+++ releng/10.3/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:50 2017 (r326359)
@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi)
*/
unsigned int v3_addr_get_afi(const IPAddressFamily *f)
{
- return ((f != NULL &&
- f->addressFamily != NULL && f->addressFamily->data != NULL)
- ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
- : 0);
+ if (f == NULL
+ || f->addressFamily == NULL
+ || f->addressFamily->data == NULL
+ || f->addressFamily->length < 2)
+ return 0;
+ return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
}
/*
Modified: releng/10.3/sys/conf/newvers.sh
==============================================================================
--- releng/10.3/sys/conf/newvers.sh Wed Nov 29 05:59:12 2017 (r326358)
+++ releng/10.3/sys/conf/newvers.sh Wed Nov 29 05:59:50 2017 (r326359)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p24"
+BRANCH="RELEASE-p25"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/10.4/UPDATING
==============================================================================
--- releng/10.4/UPDATING Wed Nov 29 05:59:12 2017 (r326358)
+++ releng/10.4/UPDATING Wed Nov 29 05:59:50 2017 (r326359)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20171129 p4 FreeBSD-SA-17:11.openssl
+
+ Fix OpenSSL out-of-bounds read vulnerability.
+
20171115 p3 FreeBSD-SA-17:08.ptrace
FreeBSD-SA-17:09.shm
FreeBSD-SA-17:10.kldstat
Modified: releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c
==============================================================================
--- releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:12 2017 (r326358)
+++ releng/10.4/crypto/openssl/crypto/x509v3/v3_addr.c Wed Nov 29 05:59:50 2017 (r326359)
@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi)
*/
unsigned int v3_addr_get_afi(const IPAddressFamily *f)
{
- return ((f != NULL &&
- f->addressFamily != NULL && f->addressFamily->data != NULL)
- ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
- : 0);
+ if (f == NULL
+ || f->addressFamily == NULL
+ || f->addressFamily->data == NULL
+ || f->addressFamily->length < 2)
+ return 0;
+ return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
}
/*
Modified: releng/10.4/sys/conf/newvers.sh
==============================================================================
--- releng/10.4/sys/conf/newvers.sh Wed Nov 29 05:59:12 2017 (r326358)
+++ releng/10.4/sys/conf/newvers.sh Wed Nov 29 05:59:50 2017 (r326359)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.4"
-BRANCH="RELEASE-p3"
+BRANCH="RELEASE-p4"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
From owner-svn-src-all@freebsd.org Wed Nov 29 06:57:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91F98DFB263;
Wed, 29 Nov 2017 06:57:02 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "freefall.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 70956689ED;
Wed, 29 Nov 2017 06:57:02 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
id B0414CFE6; Wed, 29 Nov 2017 06:57:01 +0000 (UTC)
Date: Wed, 29 Nov 2017 06:57:01 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Bruce Evans <brde@optusnet.com.au>
Cc: Edward Tomasz Napierala <trasz@freebsd.org>, svn-src-head@freebsd.org,
svn-src-all@freebsd.org, src-committers@freebsd.org
Subject: Re: svn commit: r326314 - in head/sys: ddb kern sys
Message-ID: <20171129065701.GB71839@FreeBSD.org>
References: <201711281253.vASCrtlB071488@repo.freebsd.org>
<20171129030035.W2283@besplex.bde.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="OXfL5xGRrasGEqWY"
Content-Disposition: inline
In-Reply-To: <20171129030035.W2283@besplex.bde.org>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 06:57:02 -0000
--OXfL5xGRrasGEqWY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Wed, Nov 29, 2017 at 04:04:49AM +1100, Bruce Evans wrote:
> On Tue, 28 Nov 2017, Edward Tomasz Napierala wrote:
> > Log:
> > Make kdb_reenter() silent when explicitly called from db_error().
> > This removes the useless backtrace on various ddb(4) user errors.
> >
> > Reviewed by: jhb@
> > Obtained from: CheriBSD
> > MFC after: 2 weeks
> > Sponsored by: DARPA, AFRL
> > Differential Revision: https://reviews.freebsd.org/D13212
>
> This doesn't fix the spam for user errors that cause a trap, which are
> very common (for mistyping memory addresses). ddb sets up trap handlers
> using setjmp, and actually does this correctly in many cases, but when
> a trap occurs the error handling is: [...]
>
> I use the following fix of disabling the spam in all cases (unless reenabled
> in all cases using ddb): [...]
Since someone is hacking on subr_kdb.c, may I ask them to commit attached
small patch? I want to do some work in that area, and these style issues
bug me.
./danfe
--OXfL5xGRrasGEqWY
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="subr_kdb.c.diff"
Index: kern/subr_kdb.c
===================================================================
--- kern/subr_kdb.c (revision 326310)
+++ kern/subr_kdb.c (working copy)
@@ -224,7 +224,7 @@
return (0);
}
-void
+static void
kdb_panic(const char *msg)
{
@@ -232,7 +232,7 @@
panic("%s", msg);
}
-void
+static void
kdb_reboot(void)
{
@@ -362,7 +362,6 @@
* is selected or the current debugger does not support backtraces, this
* function silently returns.
*/
-
void
kdb_backtrace(void)
{
@@ -410,7 +409,6 @@
/*
* Set/change the current backend.
*/
-
int
kdb_dbbe_select(const char *name)
{
@@ -450,7 +448,6 @@
/*
* Initialize the kernel debugger interface.
*/
-
void
kdb_init(void)
{
@@ -485,7 +482,6 @@
/*
* Handle contexts.
*/
-
void *
kdb_jmpbuf(jmp_buf new)
{
@@ -510,9 +506,8 @@
}
/*
- * Thread related support functions.
+ * Thread-related support functions.
*/
-
struct pcb *
kdb_thr_ctx(struct thread *thr)
{
@@ -606,7 +601,6 @@
/*
* Enter the debugger due to a trap.
*/
-
int
kdb_trap(int type, int code, struct trapframe *tf)
{
--OXfL5xGRrasGEqWY--
From owner-svn-src-all@freebsd.org Wed Nov 29 07:41:41 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4045EDFBECE;
Wed, 29 Nov 2017 07:41:41 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id DF68769E42;
Wed, 29 Nov 2017 07:41:40 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT7fd9D047168;
Wed, 29 Nov 2017 07:41:39 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT7fdhf047167;
Wed, 29 Nov 2017 07:41:39 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711290741.vAT7fdhf047167@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 29 Nov 2017 07:41:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-releng@freebsd.org
Subject: svn commit: r326360 - releng/11.1/sys/conf
X-SVN-Group: releng
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: releng/11.1/sys/conf
X-SVN-Commit-Revision: 326360
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 07:41:41 -0000
Author: delphij
Date: Wed Nov 29 07:41:39 2017
New Revision: 326360
URL: https://svnweb.freebsd.org/changeset/base/326360
Log:
Bump patch level.
Reported by: Franco Fichtner <franco lastsummer de>
Approved by: so
Modified:
releng/11.1/sys/conf/newvers.sh
Modified: releng/11.1/sys/conf/newvers.sh
==============================================================================
--- releng/11.1/sys/conf/newvers.sh Wed Nov 29 05:59:50 2017 (r326359)
+++ releng/11.1/sys/conf/newvers.sh Wed Nov 29 07:41:39 2017 (r326360)
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.1"
-BRANCH="RELEASE-p4"
+BRANCH="RELEASE-p5"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
From owner-svn-src-all@freebsd.org Wed Nov 29 09:18:25 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFF18DFE615;
Wed, 29 Nov 2017 09:18:25 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 7CC7C6C67D;
Wed, 29 Nov 2017 09:18:25 +0000 (UTC)
(envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT9IOsY087893;
Wed, 29 Nov 2017 09:18:24 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT9IO40087892;
Wed, 29 Nov 2017 09:18:24 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201711290918.vAT9IO40087892@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 29 Nov 2017 09:18:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326361 - head/usr.bin/ipcs
X-SVN-Group: head
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: head/usr.bin/ipcs
X-SVN-Commit-Revision: 326361
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 09:18:25 -0000
Author: delphij
Date: Wed Nov 29 09:18:24 2017
New Revision: 326361
URL: https://svnweb.freebsd.org/changeset/base/326361
Log:
Remove unused include.
MFC after: 2 weeks
Modified:
head/usr.bin/ipcs/ipc.c
Modified: head/usr.bin/ipcs/ipc.c
==============================================================================
--- head/usr.bin/ipcs/ipc.c Wed Nov 29 07:41:39 2017 (r326360)
+++ head/usr.bin/ipcs/ipc.c Wed Nov 29 09:18:24 2017 (r326361)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <kvm.h>
#include <nlist.h>
#include <stddef.h>
-#include <stdio.h>
#include "ipc.h"
From owner-svn-src-all@freebsd.org Wed Nov 29 09:40:13 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AC0CDFE9B3;
Wed, 29 Nov 2017 09:40:13 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D71246CE80;
Wed, 29 Nov 2017 09:40:12 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT9eCiv096250;
Wed, 29 Nov 2017 09:40:12 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT9eBWV096246;
Wed, 29 Nov 2017 09:40:11 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201711290940.vAT9eBWV096246@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 29 Nov 2017 09:40:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326362 - in head: share/man/man4 sys/net
X-SVN-Group: head
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: in head: share/man/man4 sys/net
X-SVN-Commit-Revision: 326362
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 09:40:13 -0000
Author: hselasky
Date: Wed Nov 29 09:40:11 2017
New Revision: 326362
URL: https://svnweb.freebsd.org/changeset/base/326362
Log:
Disallow TUN and TAP character device IOCTLs to modify the network device
type to any value. This can cause page faults and panics due to accessing
uninitialized fields in the "struct ifnet" which are specific to the network
device type.
MFC after: 1 week
Found by: jau@iki.fi
PR: 223767
Sponsored by: Mellanox Technologies
Modified:
head/share/man/man4/tap.4
head/share/man/man4/tun.4
head/sys/net/if_tap.c
head/sys/net/if_tun.c
Modified: head/share/man/man4/tap.4
==============================================================================
--- head/share/man/man4/tap.4 Wed Nov 29 09:18:24 2017 (r326361)
+++ head/share/man/man4/tap.4 Wed Nov 29 09:40:11 2017 (r326362)
@@ -1,7 +1,7 @@
.\" $FreeBSD$
.\" Based on PR#2411
.\"
-.Dd April 10, 2015
+.Dd November 29, 2017
.Dt TAP 4
.Os
.Sh NAME
@@ -171,7 +171,14 @@ calls are supported
.In net/if_tap.h ) :
.Bl -tag -width VMIO_SIOCSETMACADDR
.It Dv TAPSIFINFO
-Set network interface information (line speed, MTU and type).
+Set network interface information (line speed and MTU).
+The type must be the same as returned by
+.Dv TAPGIFINFO
+or set to
+.Dv IFT_ETHER
+else the
+.Xr ioctl 2
+call will fail.
The argument should be a pointer to a
.Va struct tapinfo .
.It Dv TAPGIFINFO
Modified: head/share/man/man4/tun.4
==============================================================================
--- head/share/man/man4/tun.4 Wed Nov 29 09:18:24 2017 (r326361)
+++ head/share/man/man4/tun.4 Wed Nov 29 09:40:11 2017 (r326362)
@@ -2,7 +2,7 @@
.\" $FreeBSD$
.\" Based on PR#2411
.\"
-.Dd November 30, 2014
+.Dd November 29, 2017
.Dt TUN 4
.Os
.Sh NAME
@@ -208,8 +208,15 @@ this stores the internal debugging variable's value in
.It Dv TUNSIFINFO
The argument should be a pointer to an
.Vt struct tuninfo
-and allows setting the MTU, the type, and the baudrate of the tunnel
+and allows setting the MTU and the baudrate of the tunnel
device.
+The type must be the same as returned by
+.Dv TUNGIFINFO
+or set to
+.Dv IFT_PPP
+else the
+.Xr ioctl 2
+call will fail.
The
.Vt struct tuninfo
is declared in
Modified: head/sys/net/if_tap.c
==============================================================================
--- head/sys/net/if_tap.c Wed Nov 29 09:18:24 2017 (r326361)
+++ head/sys/net/if_tap.c Wed Nov 29 09:40:11 2017 (r326362)
@@ -737,9 +737,10 @@ tapioctl(struct cdev *dev, u_long cmd, caddr_t data, i
switch (cmd) {
case TAPSIFINFO:
tapp = (struct tapinfo *)data;
+ if (ifp->if_type != tapp->type)
+ return (EPROTOTYPE);
mtx_lock(&tp->tap_mtx);
ifp->if_mtu = tapp->mtu;
- ifp->if_type = tapp->type;
ifp->if_baudrate = tapp->baudrate;
mtx_unlock(&tp->tap_mtx);
break;
Modified: head/sys/net/if_tun.c
==============================================================================
--- head/sys/net/if_tun.c Wed Nov 29 09:18:24 2017 (r326361)
+++ head/sys/net/if_tun.c Wed Nov 29 09:40:11 2017 (r326362)
@@ -676,9 +676,10 @@ tunioctl(struct cdev *dev, u_long cmd, caddr_t data, i
if (error)
return (error);
}
+ if (TUN2IFP(tp)->if_type != tunp->type)
+ return (EPROTOTYPE);
mtx_lock(&tp->tun_mtx);
TUN2IFP(tp)->if_mtu = tunp->mtu;
- TUN2IFP(tp)->if_type = tunp->type;
TUN2IFP(tp)->if_baudrate = tunp->baudrate;
mtx_unlock(&tp->tun_mtx);
break;
From owner-svn-src-all@freebsd.org Wed Nov 29 09:52:07 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 363A0DFED09;
Wed, 29 Nov 2017 09:52:07 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au
[211.29.132.53])
by mx1.freebsd.org (Postfix) with ESMTP id EC1906D580;
Wed, 29 Nov 2017 09:52:06 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id 932A0D480C9;
Wed, 29 Nov 2017 20:52:04 +1100 (AEDT)
Date: Wed, 29 Nov 2017 20:52:04 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Alexey Dokuchaev <danfe@freebsd.org>
cc: Edward Tomasz Napierala <trasz@freebsd.org>, svn-src-head@freebsd.org,
svn-src-all@freebsd.org, src-committers@freebsd.org
Subject: Re: svn commit: r326314 - in head/sys: ddb kern sys
In-Reply-To: <20171129065701.GB71839@FreeBSD.org>
Message-ID: <20171129200224.A930@besplex.bde.org>
References: <201711281253.vASCrtlB071488@repo.freebsd.org>
<20171129030035.W2283@besplex.bde.org> <20171129065701.GB71839@FreeBSD.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=KeqiiUQD c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=8q-Vw9gMTgeYB0UvPNYA:9 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 09:52:07 -0000
On Wed, 29 Nov 2017, Alexey Dokuchaev wrote:
> On Wed, Nov 29, 2017 at 04:04:49AM +1100, Bruce Evans wrote:
>> I use the following fix of disabling the spam in all cases (unless reenabled
>> in all cases using ddb): [...]
>
> Since someone is hacking on subr_kdb.c, may I ask them to commit attached
> small patch? I want to do some work in that area, and these style issues
Mergeing external diffs is actually harder for me since I have too many
local changes that aren't quite ready to commit.
X Index: kern/subr_kdb.c
X ===================================================================
X --- kern/subr_kdb.c (revision 326310)
X +++ kern/subr_kdb.c (working copy)
X @@ -224,7 +224,7 @@
X return (0);
X }
X
X -void
X +static void
X kdb_panic(const char *msg)
X {
X
X @@ -232,7 +232,7 @@
X panic("%s", msg);
X }
X
X -void
X +static void
X kdb_reboot(void)
X {
X
These changes are problematic. They don't compile, since the functions
are still declared as implicit-extern in <sys/kdb.h>. More seriously,
if these functions can be static because they are only called from
kdb_alternate_break_internal(), then all calls to them are broken since
"alternate" "break"s are broken (more broken than their name). They
are done from interrupt handlers where it is invalid to call almost any
function for the "fast" interrupt handler case (serial console drivers)
and invalid to call most functions in the normal interrupt handler case
(syscons and vt).
Calling kdb_reboot() from an interrupt handler is most invalid. It
calls shutdown_nice(), which needs normal thread context. In the usual
case where initproc != NULL, shutdown_nice() begins with PROC_LOCK(initproc).
This deadlocks if the lock is already held, which is possible iff the
interrupt handler is "fast". Normal interrupt handlers might work since
ithreads have close enough to normal context. However, they might hold
an unrelated spinlock so acquiring a sleep lock might cause a LOR and a
warning for this, and should cause a warning even if no LOR.
Calling kdb_panic() from an interrupt handler has a chance of working
since panic() ignores locking. Races might occur instead. Console input
on the device handling the interrupt might be broken during panic. It
is required to work in ddb, but this requires delicate locking and special
methods while kdb is active and is not done for panics. Panicing from
within ddb is similarly broken.
"alternate" "break"s also open some minor security holes in syscons keyboard
enables.
X @@ -362,7 +362,6 @@
X * is selected or the current debugger does not support backtraces, this
X * function silently returns.
X */
X -
X void
X kdb_backtrace(void)
X {
X ...
The style fixes are correct.
Bruce
From owner-svn-src-all@freebsd.org Wed Nov 29 10:04:13 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70248DFF11C;
Wed, 29 Nov 2017 10:04:13 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 306556DB6D;
Wed, 29 Nov 2017 10:04:13 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATA4CdQ008369;
Wed, 29 Nov 2017 10:04:12 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATA4BBu008365;
Wed, 29 Nov 2017 10:04:11 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201711291004.vATA4BBu008365@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 29 Nov 2017 10:04:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326363 - in head/sys/dev/mlx5: . mlx5_en
X-SVN-Group: head
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: in head/sys/dev/mlx5: . mlx5_en
X-SVN-Commit-Revision: 326363
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 10:04:13 -0000
Author: kib
Date: Wed Nov 29 10:04:11 2017
New Revision: 326363
URL: https://svnweb.freebsd.org/changeset/base/326363
Log:
Implement hardware mlx5(4) rx timestamps.
Driver support is only provided for ConnectX4/5.
System-time timestamp is calculated based on the free-running counter
timestamp provided by hardware. Driver periodically samples the
counter to calibrate it against the system clock and uses linear
interpolation to convert. Stability of the crystal which drives the
clock is +-50 ppm at the operational temperature, which makes the
algorithm good enough.
The calculation is somewhat delicate because all values are 64bit and
overflow the naive formula for linear interpolation. The calculation
drops the least significant bits in advance, see the PREC shift in
mlx5_mbuf_tstmp().
Hardware stamps can be turned off by 'ifconfig mceN -hwrxtsmp'. Buggy
firmware might result in small but visible errors in the reported
timestamps, detectable e.g. by nonsensical (negative) RTT values for
LAN pings.
Reviewed by: gallatin, hselasky
Sponsored by: Mellanox Technologies
Differential revision: https://reviews.freebsd.org/D12638
Modified:
head/sys/dev/mlx5/device.h
head/sys/dev/mlx5/mlx5_en/en.h
head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
head/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
Modified: head/sys/dev/mlx5/device.h
==============================================================================
--- head/sys/dev/mlx5/device.h Wed Nov 29 09:40:11 2017 (r326362)
+++ head/sys/dev/mlx5/device.h Wed Nov 29 10:04:11 2017 (r326363)
@@ -619,6 +619,8 @@ struct mlx5_cqe64 {
u8 op_own;
};
+#define MLX5_CQE_TSTMP_PTP (1ULL << 63)
+
static inline bool get_cqe_lro_timestamp_valid(struct mlx5_cqe64 *cqe)
{
return (cqe->lro_tcppsh_abort_dupack >> 7) & 1;
Modified: head/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- head/sys/dev/mlx5/mlx5_en/en.h Wed Nov 29 09:40:11 2017 (r326362)
+++ head/sys/dev/mlx5/mlx5_en/en.h Wed Nov 29 10:04:11 2017 (r326363)
@@ -650,6 +650,16 @@ struct mlx5e_flow_tables {
struct mlx5e_flow_table inner_rss;
};
+#define MLX5E_TSTMP_PREC 10
+
+struct mlx5e_clbr_point {
+ uint64_t base_curr;
+ uint64_t base_prev;
+ uint64_t clbr_hw_prev;
+ uint64_t clbr_hw_curr;
+ u_int clbr_gen;
+};
+
struct mlx5e_priv {
/* priv data path fields - start */
int order_base_2_num_channels;
@@ -704,6 +714,12 @@ struct mlx5e_priv {
int media_active_last;
struct callout watchdog;
+
+ struct callout tstmp_clbr;
+ int clbr_done;
+ int clbr_curr;
+ struct mlx5e_clbr_point clbr_points[2];
+ u_int clbr_gen;
};
#define MLX5E_NET_IP_ALIGN 2
Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Wed Nov 29 09:40:11 2017 (r326362)
+++ head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Wed Nov 29 10:04:11 2017 (r326363)
@@ -154,6 +154,8 @@ static const struct {
MALLOC_DEFINE(M_MLX5EN, "MLX5EN", "MLX5 Ethernet");
+static SYSCTL_NODE(_hw, OID_AUTO, mlx5, CTLFLAG_RW, 0, "MLX5 driver parameters");
+
static void
mlx5e_update_carrier(struct mlx5e_priv *priv)
{
@@ -637,6 +639,109 @@ mlx5e_disable_async_events(struct mlx5e_priv *priv)
mtx_unlock(&priv->async_events_mtx);
}
+static void mlx5e_calibration_callout(void *arg);
+static int mlx5e_calibration_duration = 20;
+static int mlx5e_fast_calibration = 1;
+static int mlx5e_normal_calibration = 30;
+
+static SYSCTL_NODE(_hw_mlx5, OID_AUTO, calibr, CTLFLAG_RW, 0,
+ "MLX5 timestamp calibration parameteres");
+
+SYSCTL_INT(_hw_mlx5_calibr, OID_AUTO, duration, CTLFLAG_RWTUN,
+ &mlx5e_calibration_duration, 0,
+ "Duration of initial calibration");
+SYSCTL_INT(_hw_mlx5_calibr, OID_AUTO, fast, CTLFLAG_RWTUN,
+ &mlx5e_fast_calibration, 0,
+ "Recalibration interval during initial calibration");
+SYSCTL_INT(_hw_mlx5_calibr, OID_AUTO, normal, CTLFLAG_RWTUN,
+ &mlx5e_normal_calibration, 0,
+ "Recalibration interval during normal operations");
+
+/*
+ * Ignites the calibration process.
+ */
+static void
+mlx5e_reset_calibration_callout(struct mlx5e_priv *priv)
+{
+
+ if (priv->clbr_done == 0)
+ mlx5e_calibration_callout(priv);
+ else
+ callout_reset_curcpu(&priv->tstmp_clbr, (priv->clbr_done <
+ mlx5e_calibration_duration ? mlx5e_fast_calibration :
+ mlx5e_normal_calibration) * hz, mlx5e_calibration_callout,
+ priv);
+}
+
+static uint64_t
+mlx5e_timespec2usec(const struct timespec *ts)
+{
+
+ return ((uint64_t)ts->tv_sec * 1000000000 + ts->tv_nsec);
+}
+
+static uint64_t
+mlx5e_hw_clock(struct mlx5e_priv *priv)
+{
+ struct mlx5_init_seg *iseg;
+ uint32_t hw_h, hw_h1, hw_l;
+
+ iseg = priv->mdev->iseg;
+ do {
+ hw_h = ioread32be(&iseg->internal_timer_h);
+ hw_l = ioread32be(&iseg->internal_timer_l);
+ hw_h1 = ioread32be(&iseg->internal_timer_h);
+ } while (hw_h1 != hw_h);
+ return (((uint64_t)hw_h << 32) | hw_l);
+}
+
+/*
+ * The calibration callout, it runs either in the context of the
+ * thread which enables calibration, or in callout. It takes the
+ * snapshot of system and adapter clocks, then advances the pointers to
+ * the calibration point to allow rx path to read the consistent data
+ * lockless.
+ */
+static void
+mlx5e_calibration_callout(void *arg)
+{
+ struct mlx5e_priv *priv;
+ struct mlx5e_clbr_point *next, *curr;
+ struct timespec ts;
+ int clbr_curr_next;
+
+ priv = arg;
+ curr = &priv->clbr_points[priv->clbr_curr];
+ clbr_curr_next = priv->clbr_curr + 1;
+ if (clbr_curr_next >= nitems(priv->clbr_points))
+ clbr_curr_next = 0;
+ next = &priv->clbr_points[clbr_curr_next];
+
+ next->base_prev = curr->base_curr;
+ next->clbr_hw_prev = curr->clbr_hw_curr;
+
+ next->clbr_hw_curr = mlx5e_hw_clock(priv);
+ if (((next->clbr_hw_curr - curr->clbr_hw_prev) >> MLX5E_TSTMP_PREC) ==
+ 0) {
+ if_printf(priv->ifp, "HW failed tstmp frozen %#jx %#jx,"
+ "disabling\n", next->clbr_hw_curr, curr->clbr_hw_prev);
+ priv->clbr_done = 0;
+ return;
+ }
+
+ nanouptime(&ts);
+ next->base_curr = mlx5e_timespec2usec(&ts);
+
+ curr->clbr_gen = 0;
+ atomic_thread_fence_rel();
+ priv->clbr_curr = clbr_curr_next;
+ atomic_store_rel_int(&next->clbr_gen, ++(priv->clbr_gen));
+
+ if (priv->clbr_done < mlx5e_calibration_duration)
+ priv->clbr_done++;
+ mlx5e_reset_calibration_callout(priv);
+}
+
static const char *mlx5e_rq_stats_desc[] = {
MLX5E_RQ_STATS(MLX5E_STATS_DESC)
};
@@ -2693,6 +2798,16 @@ mlx5e_ioctl(struct ifnet *ifp, u_long command, caddr_t
mlx5e_open_locked(ifp);
}
}
+ if (mask & IFCAP_HWRXTSTMP) {
+ ifp->if_capenable ^= IFCAP_HWRXTSTMP;
+ if (ifp->if_capenable & IFCAP_HWRXTSTMP) {
+ if (priv->clbr_done == 0)
+ mlx5e_reset_calibration_callout(priv);
+ } else {
+ callout_drain(&priv->tstmp_clbr);
+ priv->clbr_done = 0;
+ }
+ }
out:
PRIV_UNLOCK(priv);
break;
@@ -3198,7 +3313,7 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev)
ifp->if_capabilities |= IFCAP_LINKSTATE | IFCAP_JUMBO_MTU;
ifp->if_capabilities |= IFCAP_LRO;
ifp->if_capabilities |= IFCAP_TSO | IFCAP_VLAN_HWTSO;
- ifp->if_capabilities |= IFCAP_HWSTATS;
+ ifp->if_capabilities |= IFCAP_HWSTATS | IFCAP_HWRXTSTMP;
/* set TSO limits so that we don't have to drop TX packets */
ifp->if_hw_tsomax = MLX5E_MAX_TX_PAYLOAD_SIZE - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
@@ -3347,6 +3462,13 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev)
mlx5e_update_stats(priv);
mtx_unlock(&priv->async_events_mtx);
+ SYSCTL_ADD_INT(&priv->sysctl_ctx, SYSCTL_CHILDREN(priv->sysctl_ifnet),
+ OID_AUTO, "rx_clbr_done", CTLFLAG_RD,
+ &priv->clbr_done, 0,
+ "RX timestamps calibration state");
+ callout_init(&priv->tstmp_clbr, CALLOUT_DIRECT);
+ mlx5e_reset_calibration_callout(priv);
+
return (priv);
err_dealloc_transport_domain:
@@ -3390,6 +3512,8 @@ mlx5e_destroy_ifp(struct mlx5_core_dev *mdev, void *vp
/* stop watchdog timer */
callout_drain(&priv->watchdog);
+
+ callout_drain(&priv->tstmp_clbr);
if (priv->vlan_attach != NULL)
EVENTHANDLER_DEREGISTER(vlan_config, priv->vlan_attach);
Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
==============================================================================
--- head/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c Wed Nov 29 09:40:11 2017 (r326362)
+++ head/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c Wed Nov 29 10:04:11 2017 (r326363)
@@ -179,13 +179,43 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe6
/* TODO: handle tcp checksum */
}
+static uint64_t
+mlx5e_mbuf_tstmp(struct mlx5e_priv *priv, uint64_t hw_tstmp)
+{
+ struct mlx5e_clbr_point *cp;
+ uint64_t a1, a2, res;
+ u_int gen;
+
+ do {
+ cp = &priv->clbr_points[priv->clbr_curr];
+ gen = atomic_load_acq_int(&cp->clbr_gen);
+ a1 = (hw_tstmp - cp->clbr_hw_prev) >> MLX5E_TSTMP_PREC;
+ a2 = (cp->base_curr - cp->base_prev) >> MLX5E_TSTMP_PREC;
+ res = (a1 * a2) << MLX5E_TSTMP_PREC;
+
+ /*
+ * Divisor cannot be zero because calibration callback
+ * checks for the condition and disables timestamping
+ * if clock halted.
+ */
+ res /= (cp->clbr_hw_curr - cp->clbr_hw_prev) >>
+ MLX5E_TSTMP_PREC;
+
+ res += cp->base_prev;
+ atomic_thread_fence_acq();
+ } while (gen == 0 || gen != cp->clbr_gen);
+ return (res);
+}
+
static inline void
mlx5e_build_rx_mbuf(struct mlx5_cqe64 *cqe,
struct mlx5e_rq *rq, struct mbuf *mb,
u32 cqe_bcnt)
{
struct ifnet *ifp = rq->ifp;
+ struct mlx5e_channel *c;
int lro_num_seg; /* HW LRO session aggregated packets counter */
+ uint64_t tstmp;
lro_num_seg = be32_to_cpu(cqe->srqn) >> 24;
if (lro_num_seg > 1) {
@@ -249,6 +279,21 @@ mlx5e_build_rx_mbuf(struct mlx5_cqe64 *cqe,
if (cqe_has_vlan(cqe)) {
mb->m_pkthdr.ether_vtag = be16_to_cpu(cqe->vlan_info);
mb->m_flags |= M_VLANTAG;
+ }
+
+ c = container_of(rq, struct mlx5e_channel, rq);
+ if (c->priv->clbr_done >= 2) {
+ tstmp = mlx5e_mbuf_tstmp(c->priv, be64_to_cpu(cqe->timestamp));
+ if ((tstmp & MLX5_CQE_TSTMP_PTP) != 0) {
+ /*
+ * Timestamp was taken on the packet entrance,
+ * instead of the cqe generation.
+ */
+ tstmp &= ~MLX5_CQE_TSTMP_PTP;
+ mb->m_flags |= M_TSTMP_HPREC;
+ }
+ mb->m_pkthdr.rcv_tstmp = tstmp;
+ mb->m_flags |= M_TSTMP;
}
}
From owner-svn-src-all@freebsd.org Wed Nov 29 10:06:04 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F924DFF19B;
Wed, 29 Nov 2017 10:06:04 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
[IPv6:2610:1c1:1:6074::16:84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "freefall.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 0FBDD6DCFC;
Wed, 29 Nov 2017 10:06:04 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
id 4E217EF02; Wed, 29 Nov 2017 10:06:03 +0000 (UTC)
Date: Wed, 29 Nov 2017 10:06:03 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Bruce Evans <brde@optusnet.com.au>
Cc: Edward Tomasz Napierala <trasz@freebsd.org>, svn-src-head@freebsd.org,
svn-src-all@freebsd.org, src-committers@freebsd.org
Subject: Re: svn commit: r326314 - in head/sys: ddb kern sys
Message-ID: <20171129100603.GA30636@FreeBSD.org>
References: <201711281253.vASCrtlB071488@repo.freebsd.org>
<20171129030035.W2283@besplex.bde.org>
<20171129065701.GB71839@FreeBSD.org>
<20171129200224.A930@besplex.bde.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171129200224.A930@besplex.bde.org>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 10:06:04 -0000
On Wed, Nov 29, 2017 at 08:52:04PM +1100, Bruce Evans wrote:
> On Wed, 29 Nov 2017, Alexey Dokuchaev wrote:
> ...
> X Index: kern/subr_kdb.c
> X ===================================================================
> X --- kern/subr_kdb.c (revision 326310)
> X +++ kern/subr_kdb.c (working copy)
> X @@ -224,7 +224,7 @@
> X return (0);
> X }
> X
> X -void
> X +static void
> X kdb_panic(const char *msg)
> X {
> X
> X @@ -232,7 +232,7 @@
> X panic("%s", msg);
> X }
> X
> X -void
> X +static void
> X kdb_reboot(void)
> X {
>
> These changes are problematic. They don't compile, since the functions
> are still declared as implicit-extern in <sys/kdb.h>. More seriously,
> if these functions can be static because they are only called from
> kdb_alternate_break_internal(), then all calls to them are broken since
> "alternate" "break"s are broken (more broken than their name). They
> are done from interrupt handlers where it is invalid to call almost any
> function for the "fast" interrupt handler case (serial console drivers)
> and invalid to call most functions in the normal interrupt handler case
> (syscons and vt). [...]
Yes, I was already told that they are part of public KPI and thus cannot
be easily removed. This issue is to be discussed separately.
> The style fixes are correct.
Thanks; I've already got approval from bapt@ for those and intend to
commit them shortly.
./danfe
From owner-svn-src-all@freebsd.org Wed Nov 29 10:51:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38444DFFD2F;
Wed, 29 Nov 2017 10:51:46 +0000 (UTC)
(envelope-from ohartmann@walstatt.org)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.21])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id AD3A66F278;
Wed, 29 Nov 2017 10:51:45 +0000 (UTC)
(envelope-from ohartmann@walstatt.org)
Received: from hermann ([78.52.117.12]) by mail.gmx.com (mrgmx101
[212.227.17.168]) with ESMTPSA (Nemesis) id 0M9fLX-1ePGsb2GCN-00D2OM; Wed, 29
Nov 2017 11:51:42 +0100
Date: Wed, 29 Nov 2017 11:51:31 +0100
From: "Hartmann, O." <ohartmann@walstatt.org>
To: Hans Petter Selasky <hselasky@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326362 - in head: share/man/man4 sys/net
Message-ID: <20171129115125.24dd4aa0@hermann>
In-Reply-To: <201711290940.vAT9eBWV096246@repo.freebsd.org>
References: <201711290940.vAT9eBWV096246@repo.freebsd.org>
Organization: walstatt.org
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:c+F/nrtVeltbTZqygBgk0z25WE2MOBv4Z7foiwbEaTS1alUlLoh
W+I17Vzenz+q/CXcf+12u4wIw4MS4RpVRHfez99PTdMdWy1rg9Be//kErkEcAx3CQG1HgXf
/rF+V0t1CuM7ppKiOfVrie5G5L7rdG+i7++DwaPj2ttTOsDwUuaVDiIqlNlMXVctYNado7n
IdfmBmttAFn8mKCjWm3Jg==
X-UI-Out-Filterresults: notjunk:1;V01:K0:JxYsDd82wmE=:BDEQAWDYQKgMGHb+RNTBox
S11UUJePIy1iAJXUr5L371pe7xMaVKzadwjgKmglKLDcfBAuz9Utm+Q1il0q8sR7dWRJbUb1S
cLLRr+cdRQa4xib9mNh7EIFHJrC0lQM3e2dMjEFAdnfyADf2rDh4trsq/A4eSmemJq5u200JP
1U5S9I51lVZX77cL5rfPbWBCkzl7W0rju8imqDevTc/TclRojjfwc7MTsQs4Yglh3M2I3Hh/s
3/cQnXjeTY0K/Bms41BN2tEO6B9xfmtRlMXEVMp9iUWVTNZNYWGa59X7NO++DSxIOs5/LLcUN
mXJDLqvtktZ152UA3QTIQLZBUkgD0bI5I34tlAEq5dn1tLQDtt1pD3435ZwpsXPjKO+Nv5A5Q
NDXTneswjkqwhazUB3m5s7CUoR3lnZuBsgWPHQIqDzsDo+HSJvNUBq03LD0o8iq824vobQwp0
sznLgFW1P72/uZfETS/LuRHNkLYptJkMTk6pHw+a4wHMcSvgzSonMkTt4V3m/SuwkMmNmiKNh
RPcDwevL29PW+tLa5M794/84Anw7WWH1xd9AiJt09pxTJzPCHbbTUEjus4JiEAqelPnn9KnOJ
f+bB5CU2gaxPHsMqA1TFcWpTcbbfMj8rUzqNUlvMsfMzh8Wp2YYpweSN+yQoBponLFqKdALlZ
2lcBHv3ChaW9ioX1oyfxqThEjw+l/psAbD53qnmHHnoBWXJzU8rV3uaaNKf0XFSJkvi0lq4nG
GjiC3HBKp+J0daxGf+ohmFSesGw6jonjWH/BEZJpB1OEL2uwizzqfV+y1XIlJuKeX+zYYJIaU
0ld2vKqEGsBkSmoml5K4g/x3Vm4iqHrrRjewI/r/HvrF0CtX7Y=
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 10:51:46 -0000
On Wed, 29 Nov 2017 09:40:11 +0000 (UTC)
Hans Petter Selasky <hselasky@FreeBSD.org> wrote:
> Author: hselasky
> Date: Wed Nov 29 09:40:11 2017
> New Revision: 326362
> URL: https://svnweb.freebsd.org/changeset/base/326362
>
> Log:
> Disallow TUN and TAP character device IOCTLs to modify the network
> device type to any value. This can cause page faults and panics due
> to accessing uninitialized fields in the "struct ifnet" which are
> specific to the network device type.
>
> MFC after: 1 week
> Found by: jau@iki.fi
> PR: 223767
> Sponsored by: Mellanox Technologies
>
> Modified:
> head/share/man/man4/tap.4
> head/share/man/man4/tun.4
> head/sys/net/if_tap.c
> head/sys/net/if_tun.c
>
> Modified: head/share/man/man4/tap.4
> ==============================================================================
> --- head/share/man/man4/tap.4 Wed Nov 29 09:18:24 2017
> (r326361) +++ head/share/man/man4/tap.4 Wed Nov 29 09:40:11
> 2017 (r326362) @@ -1,7 +1,7 @@
> .\" $FreeBSD$
> .\" Based on PR#2411
> .\"
> -.Dd April 10, 2015
> +.Dd November 29, 2017
> .Dt TAP 4
> .Os
> .Sh NAME
> @@ -171,7 +171,14 @@ calls are supported
> .In net/if_tap.h ) :
> .Bl -tag -width VMIO_SIOCSETMACADDR
> .It Dv TAPSIFINFO
> -Set network interface information (line speed, MTU and type).
> +Set network interface information (line speed and MTU).
> +The type must be the same as returned by
> +.Dv TAPGIFINFO
> +or set to
> +.Dv IFT_ETHER
> +else the
> +.Xr ioctl 2
> +call will fail.
> The argument should be a pointer to a
> .Va struct tapinfo .
> .It Dv TAPGIFINFO
>
> Modified: head/share/man/man4/tun.4
> ==============================================================================
> --- head/share/man/man4/tun.4 Wed Nov 29 09:18:24 2017
> (r326361) +++ head/share/man/man4/tun.4 Wed Nov 29 09:40:11
> 2017 (r326362) @@ -2,7 +2,7 @@
> .\" $FreeBSD$
> .\" Based on PR#2411
> .\"
> -.Dd November 30, 2014
> +.Dd November 29, 2017
> .Dt TUN 4
> .Os
> .Sh NAME
> @@ -208,8 +208,15 @@ this stores the internal debugging variable's
> value in .It Dv TUNSIFINFO
> The argument should be a pointer to an
> .Vt struct tuninfo
> -and allows setting the MTU, the type, and the baudrate of the tunnel
> +and allows setting the MTU and the baudrate of the tunnel
> device.
> +The type must be the same as returned by
> +.Dv TUNGIFINFO
> +or set to
> +.Dv IFT_PPP
> +else the
> +.Xr ioctl 2
> +call will fail.
> The
> .Vt struct tuninfo
> is declared in
>
> Modified: head/sys/net/if_tap.c
> ==============================================================================
> --- head/sys/net/if_tap.c Wed Nov 29 09:18:24 2017
> (r326361) +++ head/sys/net/if_tap.c Wed Nov 29 09:40:11
> 2017 (r326362) @@ -737,9 +737,10 @@ tapioctl(struct cdev *dev,
> u_long cmd, caddr_t data, i switch (cmd) {
> case TAPSIFINFO:
> tapp = (struct tapinfo *)data;
> + if (ifp->if_type != tapp->type)
> + return (EPROTOTYPE);
> mtx_lock(&tp->tap_mtx);
> ifp->if_mtu = tapp->mtu;
> - ifp->if_type = tapp->type;
> ifp->if_baudrate = tapp->baudrate;
> mtx_unlock(&tp->tap_mtx);
> break;
>
> Modified: head/sys/net/if_tun.c
> ==============================================================================
> --- head/sys/net/if_tun.c Wed Nov 29 09:18:24 2017
> (r326361) +++ head/sys/net/if_tun.c Wed Nov 29 09:40:11
> 2017 (r326362) @@ -676,9 +676,10 @@ tunioctl(struct cdev *dev,
> u_long cmd, caddr_t data, i if (error)
> return (error);
> }
> + if (TUN2IFP(tp)->if_type != tunp->type)
> + return (EPROTOTYPE);
> mtx_lock(&tp->tun_mtx);
> TUN2IFP(tp)->if_mtu = tunp->mtu;
> - TUN2IFP(tp)->if_type = tunp->type;
> TUN2IFP(tp)->if_baudrate = tunp->baudrate;
> mtx_unlock(&tp->tun_mtx);
> break;
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to
> "svn-src-head-unsubscribe@freebsd.org"
after updating from r325893 to r326362, FreeBSD CURRENT crashes while
booting the kernel. I'm sorry having no further informations, it
happens on a laptop with reduced space.
At the moment, it seems that a lot of boxes running most recent CURRENT
tend to crash spontanously.
In a more severe case, after upgrading to r326347, the kernel doesn't
boot further - i gets stuck after printing attached USB devices and
then remains frozen forver. USB keyboard works. I tried to boot the old
kernel, but its the same bahaviour.
The last few changes within the vm system tend to crash FreeBSD also
while installing world. If someone, like me, is sometimes sloppy and
lazy and doing installkernel installworld from multiuser, which worked
for a long time and is, I know, not recommended, will be highly the
victim of a crash while installing! I do not know wether this is worth
a warning (again, within the summertime of this year we had a similkar
saituation).
oh
From owner-svn-src-all@freebsd.org Wed Nov 29 11:40:57 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAEC8E4FBD1;
Wed, 29 Nov 2017 11:40:57 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (tensor.andric.com [87.251.56.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "tensor.andric.com",
Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id A3EC970737;
Wed, 29 Nov 2017 11:40:57 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from coleburn.avinity.tv (unknown [77.95.97.98])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by tensor.andric.com (Postfix) with ESMTPSA id D625037046;
Wed, 29 Nov 2017 12:40:48 +0100 (CET)
From: Dimitry Andric <dim@FreeBSD.org>
Message-Id: <744C69EF-C0A5-46DC-9D65-EEE78BD32BAF@FreeBSD.org>
Content-Type: multipart/signed;
boundary="Apple-Mail=_86AB4C81-AB14-4E44-8570-8930BCECEE51";
protocol="application/pgp-signature"; micalg=pgp-sha1
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: svn commit: r326343 - head/etc/rc.d
Date: Wed, 29 Nov 2017 12:40:47 +0100
In-Reply-To: <201711282044.vASKiAJw072662@repo.freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
To: Alan Somers <asomers@freebsd.org>
References: <201711282044.vASKiAJw072662@repo.freebsd.org>
X-Mailer: Apple Mail (2.3273)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 11:40:58 -0000
--Apple-Mail=_86AB4C81-AB14-4E44-8570-8930BCECEE51
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=us-ascii
On 28 Nov 2017, at 21:44, Alan Somers <asomers@freebsd.org> wrote:
>
> Author: asomers
> Date: Tue Nov 28 20:44:10 2017
> New Revision: 326343
> URL: https://svnweb.freebsd.org/changeset/base/326343
>
> Log:
> Fix fetching ntp leapfile after 325256
>
> Submitted by: Ronald Klop <ronald-lists@klop.ws>
> Reviewed by: asomers
Reviewed by yourself? :)
-Dimitry
--Apple-Mail=_86AB4C81-AB14-4E44-8570-8930BCECEE51
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=signature.asc
Content-Type: application/pgp-signature;
name=signature.asc
Content-Description: Message signed with OpenPGP
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.2
iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCWh6cvwAKCRCwXqMKLiCW
oyJHAJwLapz/5fUqGFpT/rO2GAFfA40ACACggscNIP7AMj9Oo/LCkNK8kucnVUs=
=YUbY
-----END PGP SIGNATURE-----
--Apple-Mail=_86AB4C81-AB14-4E44-8570-8930BCECEE51--
From owner-svn-src-all@freebsd.org Wed Nov 29 11:52:07 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB7B6E51118;
Wed, 29 Nov 2017 11:52:07 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 84F8F70E09;
Wed, 29 Nov 2017 11:52:07 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2016.home.selasky.org (unknown [62.141.128.70])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by mail.turbocat.net (Postfix) with ESMTPSA id 9206D260072;
Wed, 29 Nov 2017 12:52:03 +0100 (CET)
Subject: Re: svn commit: r326362 - in head: share/man/man4 sys/net
To: "Hartmann, O." <ohartmann@walstatt.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
References: <201711290940.vAT9eBWV096246@repo.freebsd.org>
<20171129115125.24dd4aa0@hermann>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <dccf8e08-b181-17da-25c7-f2f27685543e@selasky.org>
Date: Wed, 29 Nov 2017 12:49:19 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <20171129115125.24dd4aa0@hermann>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 11:52:08 -0000
On 11/29/17 11:51, Hartmann, O. wrote:
> On Wed, 29 Nov 2017 09:40:11 +0000 (UTC)
> Hans Petter Selasky <hselasky@FreeBSD.org> wrote:
>
>> Author: hselasky
>> Date: Wed Nov 29 09:40:11 2017
>> New Revision: 326362
>> URL: https://svnweb.freebsd.org/changeset/base/326362
>>
>> Log:
>> Disallow TUN and TAP character device IOCTLs to modify the network
>> device type to any value. This can cause page faults and panics due
>> to accessing uninitialized fields in the "struct ifnet" which are
>> specific to the network device type.
>>
>> MFC after: 1 week
>> Found by: jau@iki.fi
>> PR: 223767
>> Sponsored by: Mellanox Technologies
>>
>> Modified:
>> head/share/man/man4/tap.4
>> head/share/man/man4/tun.4
>> head/sys/net/if_tap.c
>> head/sys/net/if_tun.c
>>
>> Modified: head/share/man/man4/tap.4
>> ==============================================================================
>> --- head/share/man/man4/tap.4 Wed Nov 29 09:18:24 2017
>> (r326361) +++ head/share/man/man4/tap.4 Wed Nov 29 09:40:11
>> 2017 (r326362) @@ -1,7 +1,7 @@
>> .\" $FreeBSD$
>> .\" Based on PR#2411
>> .\"
>> -.Dd April 10, 2015
>> +.Dd November 29, 2017
>> .Dt TAP 4
>> .Os
>> .Sh NAME
>> @@ -171,7 +171,14 @@ calls are supported
>> .In net/if_tap.h ) :
>> .Bl -tag -width VMIO_SIOCSETMACADDR
>> .It Dv TAPSIFINFO
>> -Set network interface information (line speed, MTU and type).
>> +Set network interface information (line speed and MTU).
>> +The type must be the same as returned by
>> +.Dv TAPGIFINFO
>> +or set to
>> +.Dv IFT_ETHER
>> +else the
>> +.Xr ioctl 2
>> +call will fail.
>> The argument should be a pointer to a
>> .Va struct tapinfo .
>> .It Dv TAPGIFINFO
>>
>> Modified: head/share/man/man4/tun.4
>> ==============================================================================
>> --- head/share/man/man4/tun.4 Wed Nov 29 09:18:24 2017
>> (r326361) +++ head/share/man/man4/tun.4 Wed Nov 29 09:40:11
>> 2017 (r326362) @@ -2,7 +2,7 @@
>> .\" $FreeBSD$
>> .\" Based on PR#2411
>> .\"
>> -.Dd November 30, 2014
>> +.Dd November 29, 2017
>> .Dt TUN 4
>> .Os
>> .Sh NAME
>> @@ -208,8 +208,15 @@ this stores the internal debugging variable's
>> value in .It Dv TUNSIFINFO
>> The argument should be a pointer to an
>> .Vt struct tuninfo
>> -and allows setting the MTU, the type, and the baudrate of the tunnel
>> +and allows setting the MTU and the baudrate of the tunnel
>> device.
>> +The type must be the same as returned by
>> +.Dv TUNGIFINFO
>> +or set to
>> +.Dv IFT_PPP
>> +else the
>> +.Xr ioctl 2
>> +call will fail.
>> The
>> .Vt struct tuninfo
>> is declared in
>>
>> Modified: head/sys/net/if_tap.c
>> ==============================================================================
>> --- head/sys/net/if_tap.c Wed Nov 29 09:18:24 2017
>> (r326361) +++ head/sys/net/if_tap.c Wed Nov 29 09:40:11
>> 2017 (r326362) @@ -737,9 +737,10 @@ tapioctl(struct cdev *dev,
>> u_long cmd, caddr_t data, i switch (cmd) {
>> case TAPSIFINFO:
>> tapp = (struct tapinfo *)data;
>> + if (ifp->if_type != tapp->type)
>> + return (EPROTOTYPE);
>> mtx_lock(&tp->tap_mtx);
>> ifp->if_mtu = tapp->mtu;
>> - ifp->if_type = tapp->type;
>> ifp->if_baudrate = tapp->baudrate;
>> mtx_unlock(&tp->tap_mtx);
>> break;
>>
>> Modified: head/sys/net/if_tun.c
>> ==============================================================================
>> --- head/sys/net/if_tun.c Wed Nov 29 09:18:24 2017
>> (r326361) +++ head/sys/net/if_tun.c Wed Nov 29 09:40:11
>> 2017 (r326362) @@ -676,9 +676,10 @@ tunioctl(struct cdev *dev,
>> u_long cmd, caddr_t data, i if (error)
>> return (error);
>> }
>> + if (TUN2IFP(tp)->if_type != tunp->type)
>> + return (EPROTOTYPE);
>> mtx_lock(&tp->tun_mtx);
>> TUN2IFP(tp)->if_mtu = tunp->mtu;
>> - TUN2IFP(tp)->if_type = tunp->type;
>> TUN2IFP(tp)->if_baudrate = tunp->baudrate;
>> mtx_unlock(&tp->tun_mtx);
>> break;
>> _______________________________________________
>> svn-src-head@freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to
>> "svn-src-head-unsubscribe@freebsd.org"
>
> after updating from r325893 to r326362, FreeBSD CURRENT crashes while
> booting the kernel. I'm sorry having no further informations, it
> happens on a laptop with reduced space.
>
> At the moment, it seems that a lot of boxes running most recent CURRENT
> tend to crash spontanously.
>
Hi,
And you built the kernel from scratch and made sure your source tree
does not contain any .o files nor /usr/obj/* .
--HPS
From owner-svn-src-all@freebsd.org Wed Nov 29 12:16:07 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DA8CE5254E;
Wed, 29 Nov 2017 12:16:07 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.20])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 7DDDB71C18;
Wed, 29 Nov 2017 12:16:06 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from hermann ([78.52.117.12]) by mail.gmx.com (mrgmx103
[212.227.17.168]) with ESMTPSA (Nemesis) id 0MQih7-1ehQnX02gv-00U0pv; Wed, 29
Nov 2017 13:16:02 +0100
Date: Wed, 29 Nov 2017 13:16:00 +0100
From: "Hartmann, O." <o.hartmann@walstatt.org>
To: Hans Petter Selasky <hps@selasky.org>
Cc: "Hartmann, O." <ohartmann@walstatt.org>, svn-src-head@freebsd.org,
svn-src-all@freebsd.org, src-committers@freebsd.org
Subject: Re: svn commit: r326362 - in head: share/man/man4 sys/net
Message-ID: <20171129131556.2247c97c@hermann>
In-Reply-To: <dccf8e08-b181-17da-25c7-f2f27685543e@selasky.org>
References: <201711290940.vAT9eBWV096246@repo.freebsd.org>
<20171129115125.24dd4aa0@hermann>
<dccf8e08-b181-17da-25c7-f2f27685543e@selasky.org>
Organization: walstatt.org
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:spfdgGKBeRO21cG8/Cna9FhHBPkYbMKOWPdMmOZBNbO5cAXBiYB
cM36Eu3iP8d0/sxXOe+ktP8dXEmYCWuqH7NUAOUlpjOz11EMLfjQtI7xXqw+DCRBsI47JtV
pXaIbK2+d7gU5XMiUvnr9Iub8Bw1qIOMecNV3HRy5bzzDzibx1ZFBhZEsgl5zQvePw6bVwa
HiZ9l0i/Dd3ys+N64VftA==
X-UI-Out-Filterresults: notjunk:1;V01:K0:WByoBd/3oAc=:TEJ79XdLz/wTD8GCcTlJ4N
iR+QXCSJMsbquJdVQcO4z/6HaBLf2eVMD+68LDaQspR5Fc9aRz20VS0QbF0r8rPrytQU0gPWI
FRRwheD+g45WeEG8xqk+AXx/J95rMQU7P9NrWvkr5iy1qcFQSuwiinmK2rqVivS+fTm6PDEJH
eeDmNOngARxlHIKayeBq+NdMvzmwg0wf+g8t1/umvJTTrg0yynAMkM+oNjk9UkFWfKIQ60Ofu
SJDwmh+S4KbEcu70FiAu4zpuFIaTE0YsLgGwUze/9kU7xkOx4r+fa+ijFmWuCKZ7+5AJfzqf6
EZdoXae74P75Tf5xbCVuDcFdREF+2Pngb1WROxRHaxsRBJQepPED0oHlT5+4TdS4AJsI/8Bzn
+0rK439vunfpkO+vm+ny2/u5bVQ/7FbjzbHuWHUjdtmwD8L+YZ+7DlCmptAx0wx1j1tHE+g+B
7+yQQv7nvHM7g0LiDioFppqdWRPsKJdSJHgHE6IUdq4aFRAgWtlz3qIdzzPUHH3fYMRKUxgT3
Dw+F3bpYJI0IkxQN2zaL9xHnDsF7FfqCq/c4zpmFVgBoKWO8CVSoOflFjF7o0jWApL2hCCGjU
Cu8UOqTA6YOg0vQydjkuzZ83RB4nGYwFIV8YZNLmaahUzUtkgX/sO/zGWUYgpP3zlggN/rPRr
HFmIGfrbQk0FgrNcsln6QBv/J5umlu6z8MLwvJEpNnRia2BfpOq8TXBKgBj2WoKExrKO8xC5W
CKNC271K5n3jZv6wMl1Xyph8WdQHSLaQVr+z3mjTjBKpQYPrk5haEj1ozw/nSLsNXGrOUIsPE
bO8IjvdlDQF+OD1hMnx7tIzg3WVGHEWOUzSKb1/X753+szaeBY=
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 12:16:07 -0000
On Wed, 29 Nov 2017 12:49:19 +0100
Hans Petter Selasky <hps@selasky.org> wrote:
> On 11/29/17 11:51, Hartmann, O. wrote:
> > On Wed, 29 Nov 2017 09:40:11 +0000 (UTC)
> > Hans Petter Selasky <hselasky@FreeBSD.org> wrote:
> >
> >> Author: hselasky
> >> Date: Wed Nov 29 09:40:11 2017
> >> New Revision: 326362
> >> URL: https://svnweb.freebsd.org/changeset/base/326362
> >>
> >> Log:
> >> Disallow TUN and TAP character device IOCTLs to modify the
> >> network device type to any value. This can cause page faults and
> >> panics due to accessing uninitialized fields in the "struct ifnet"
> >> which are specific to the network device type.
> >>
> >> MFC after: 1 week
> >> Found by: jau@iki.fi
> >> PR: 223767
> >> Sponsored by: Mellanox Technologies
> >>
> >> Modified:
> >> head/share/man/man4/tap.4
> >> head/share/man/man4/tun.4
> >> head/sys/net/if_tap.c
> >> head/sys/net/if_tun.c
> >>
> >> Modified: head/share/man/man4/tap.4
> >> ==============================================================================
> >> --- head/share/man/man4/tap.4 Wed Nov 29 09:18:24 2017
> >> (r326361) +++ head/share/man/man4/tap.4 Wed Nov 29 09:40:11
> >> 2017 (r326362) @@ -1,7 +1,7 @@
> >> .\" $FreeBSD$
> >> .\" Based on PR#2411
> >> .\"
> >> -.Dd April 10, 2015
> >> +.Dd November 29, 2017
> >> .Dt TAP 4
> >> .Os
> >> .Sh NAME
> >> @@ -171,7 +171,14 @@ calls are supported
> >> .In net/if_tap.h ) :
> >> .Bl -tag -width VMIO_SIOCSETMACADDR
> >> .It Dv TAPSIFINFO
> >> -Set network interface information (line speed, MTU and type).
> >> +Set network interface information (line speed and MTU).
> >> +The type must be the same as returned by
> >> +.Dv TAPGIFINFO
> >> +or set to
> >> +.Dv IFT_ETHER
> >> +else the
> >> +.Xr ioctl 2
> >> +call will fail.
> >> The argument should be a pointer to a
> >> .Va struct tapinfo .
> >> .It Dv TAPGIFINFO
> >>
> >> Modified: head/share/man/man4/tun.4
> >> ==============================================================================
> >> --- head/share/man/man4/tun.4 Wed Nov 29 09:18:24 2017
> >> (r326361) +++ head/share/man/man4/tun.4 Wed Nov 29 09:40:11
> >> 2017 (r326362) @@ -2,7 +2,7 @@
> >> .\" $FreeBSD$
> >> .\" Based on PR#2411
> >> .\"
> >> -.Dd November 30, 2014
> >> +.Dd November 29, 2017
> >> .Dt TUN 4
> >> .Os
> >> .Sh NAME
> >> @@ -208,8 +208,15 @@ this stores the internal debugging variable's
> >> value in .It Dv TUNSIFINFO
> >> The argument should be a pointer to an
> >> .Vt struct tuninfo
> >> -and allows setting the MTU, the type, and the baudrate of the
> >> tunnel +and allows setting the MTU and the baudrate of the tunnel
> >> device.
> >> +The type must be the same as returned by
> >> +.Dv TUNGIFINFO
> >> +or set to
> >> +.Dv IFT_PPP
> >> +else the
> >> +.Xr ioctl 2
> >> +call will fail.
> >> The
> >> .Vt struct tuninfo
> >> is declared in
> >>
> >> Modified: head/sys/net/if_tap.c
> >> ==============================================================================
> >> --- head/sys/net/if_tap.c Wed Nov 29 09:18:24 2017
> >> (r326361) +++ head/sys/net/if_tap.c Wed Nov 29 09:40:11
> >> 2017 (r326362) @@ -737,9 +737,10 @@ tapioctl(struct cdev
> >> *dev, u_long cmd, caddr_t data, i switch (cmd) {
> >> case TAPSIFINFO:
> >> tapp = (struct tapinfo *)data;
> >> + if (ifp->if_type != tapp->type)
> >> + return (EPROTOTYPE);
> >> mtx_lock(&tp->tap_mtx);
> >> ifp->if_mtu = tapp->mtu;
> >> - ifp->if_type = tapp->type;
> >> ifp->if_baudrate = tapp->baudrate;
> >> mtx_unlock(&tp->tap_mtx);
> >> break;
> >>
> >> Modified: head/sys/net/if_tun.c
> >> ==============================================================================
> >> --- head/sys/net/if_tun.c Wed Nov 29 09:18:24 2017
> >> (r326361) +++ head/sys/net/if_tun.c Wed Nov 29 09:40:11
> >> 2017 (r326362) @@ -676,9 +676,10 @@ tunioctl(struct cdev
> >> *dev, u_long cmd, caddr_t data, i if (error)
> >> return (error);
> >> }
> >> + if (TUN2IFP(tp)->if_type != tunp->type)
> >> + return (EPROTOTYPE);
> >> mtx_lock(&tp->tun_mtx);
> >> TUN2IFP(tp)->if_mtu = tunp->mtu;
> >> - TUN2IFP(tp)->if_type = tunp->type;
> >> TUN2IFP(tp)->if_baudrate = tunp->baudrate;
> >> mtx_unlock(&tp->tun_mtx);
> >> break;
> >> _______________________________________________
> >> svn-src-head@freebsd.org mailing list
> >> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> >> To unsubscribe, send any mail to
> >> "svn-src-head-unsubscribe@freebsd.org"
> >
> > after updating from r325893 to r326362, FreeBSD CURRENT crashes
> > while booting the kernel. I'm sorry having no further informations,
> > it happens on a laptop with reduced space.
> >
> > At the moment, it seems that a lot of boxes running most recent
> > CURRENT tend to crash spontanously.
> >
>
> Hi,
>
> And you built the kernel from scratch and made sure your source tree
> does not contain any .o files nor /usr/obj/* .
>
> --HPS
Last time I did the make cleandir was when the OFED driver problem
occured, that was some days ago. Useually, I build world and kernel
with WITH_META_MODE set.
Sinverely
oh
From owner-svn-src-all@freebsd.org Wed Nov 29 12:19:17 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD5B7E52612;
Wed, 29 Nov 2017 12:19:17 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 81AC971DAD;
Wed, 29 Nov 2017 12:19:17 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2016.home.selasky.org (unknown [62.141.128.70])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by mail.turbocat.net (Postfix) with ESMTPSA id D59A7260072;
Wed, 29 Nov 2017 13:19:12 +0100 (CET)
Subject: Re: svn commit: r326362 - in head: share/man/man4 sys/net
To: "Hartmann, O." <o.hartmann@walstatt.org>
Cc: "Hartmann, O." <ohartmann@walstatt.org>, svn-src-head@freebsd.org,
svn-src-all@freebsd.org, src-committers@freebsd.org
References: <201711290940.vAT9eBWV096246@repo.freebsd.org>
<20171129115125.24dd4aa0@hermann>
<dccf8e08-b181-17da-25c7-f2f27685543e@selasky.org>
<20171129131556.2247c97c@hermann>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <b2316fba-0357-a215-a54e-f7ee0b4b88a8@selasky.org>
Date: Wed, 29 Nov 2017 13:16:28 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <20171129131556.2247c97c@hermann>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 12:19:17 -0000
On 11/29/17 13:16, Hartmann, O. wrote:
> On Wed, 29 Nov 2017 12:49:19 +0100
> Hans Petter Selasky <hps@selasky.org> wrote:
>
>> On 11/29/17 11:51, Hartmann, O. wrote:
>>> On Wed, 29 Nov 2017 09:40:11 +0000 (UTC)
>>> Hans Petter Selasky <hselasky@FreeBSD.org> wrote:
>>>
>>>> Author: hselasky
>>>> Date: Wed Nov 29 09:40:11 2017
>>>> New Revision: 326362
>>>> URL: https://svnweb.freebsd.org/changeset/base/326362
>>>>
>>>> Log:
>>>> Disallow TUN and TAP character device IOCTLs to modify the
>>>> network device type to any value. This can cause page faults and
>>>> panics due to accessing uninitialized fields in the "struct ifnet"
>>>> which are specific to the network device type.
>>>>
>>>> MFC after: 1 week
>>>> Found by: jau@iki.fi
>>>> PR: 223767
>>>> Sponsored by: Mellanox Technologies
>>>>
>>>> Modified:
>>>> head/share/man/man4/tap.4
>>>> head/share/man/man4/tun.4
>>>> head/sys/net/if_tap.c
>>>> head/sys/net/if_tun.c
>>>>
>>>> Modified: head/share/man/man4/tap.4
>>>> ==============================================================================
>>>> --- head/share/man/man4/tap.4 Wed Nov 29 09:18:24 2017
>>>> (r326361) +++ head/share/man/man4/tap.4 Wed Nov 29 09:40:11
>>>> 2017 (r326362) @@ -1,7 +1,7 @@
>>>> .\" $FreeBSD$
>>>> .\" Based on PR#2411
>>>> .\"
>>>> -.Dd April 10, 2015
>>>> +.Dd November 29, 2017
>>>> .Dt TAP 4
>>>> .Os
>>>> .Sh NAME
>>>> @@ -171,7 +171,14 @@ calls are supported
>>>> .In net/if_tap.h ) :
>>>> .Bl -tag -width VMIO_SIOCSETMACADDR
>>>> .It Dv TAPSIFINFO
>>>> -Set network interface information (line speed, MTU and type).
>>>> +Set network interface information (line speed and MTU).
>>>> +The type must be the same as returned by
>>>> +.Dv TAPGIFINFO
>>>> +or set to
>>>> +.Dv IFT_ETHER
>>>> +else the
>>>> +.Xr ioctl 2
>>>> +call will fail.
>>>> The argument should be a pointer to a
>>>> .Va struct tapinfo .
>>>> .It Dv TAPGIFINFO
>>>>
>>>> Modified: head/share/man/man4/tun.4
>>>> ==============================================================================
>>>> --- head/share/man/man4/tun.4 Wed Nov 29 09:18:24 2017
>>>> (r326361) +++ head/share/man/man4/tun.4 Wed Nov 29 09:40:11
>>>> 2017 (r326362) @@ -2,7 +2,7 @@
>>>> .\" $FreeBSD$
>>>> .\" Based on PR#2411
>>>> .\"
>>>> -.Dd November 30, 2014
>>>> +.Dd November 29, 2017
>>>> .Dt TUN 4
>>>> .Os
>>>> .Sh NAME
>>>> @@ -208,8 +208,15 @@ this stores the internal debugging variable's
>>>> value in .It Dv TUNSIFINFO
>>>> The argument should be a pointer to an
>>>> .Vt struct tuninfo
>>>> -and allows setting the MTU, the type, and the baudrate of the
>>>> tunnel +and allows setting the MTU and the baudrate of the tunnel
>>>> device.
>>>> +The type must be the same as returned by
>>>> +.Dv TUNGIFINFO
>>>> +or set to
>>>> +.Dv IFT_PPP
>>>> +else the
>>>> +.Xr ioctl 2
>>>> +call will fail.
>>>> The
>>>> .Vt struct tuninfo
>>>> is declared in
>>>>
>>>> Modified: head/sys/net/if_tap.c
>>>> ==============================================================================
>>>> --- head/sys/net/if_tap.c Wed Nov 29 09:18:24 2017
>>>> (r326361) +++ head/sys/net/if_tap.c Wed Nov 29 09:40:11
>>>> 2017 (r326362) @@ -737,9 +737,10 @@ tapioctl(struct cdev
>>>> *dev, u_long cmd, caddr_t data, i switch (cmd) {
>>>> case TAPSIFINFO:
>>>> tapp = (struct tapinfo *)data;
>>>> + if (ifp->if_type != tapp->type)
>>>> + return (EPROTOTYPE);
>>>> mtx_lock(&tp->tap_mtx);
>>>> ifp->if_mtu = tapp->mtu;
>>>> - ifp->if_type = tapp->type;
>>>> ifp->if_baudrate = tapp->baudrate;
>>>> mtx_unlock(&tp->tap_mtx);
>>>> break;
>>>>
>>>> Modified: head/sys/net/if_tun.c
>>>> ==============================================================================
>>>> --- head/sys/net/if_tun.c Wed Nov 29 09:18:24 2017
>>>> (r326361) +++ head/sys/net/if_tun.c Wed Nov 29 09:40:11
>>>> 2017 (r326362) @@ -676,9 +676,10 @@ tunioctl(struct cdev
>>>> *dev, u_long cmd, caddr_t data, i if (error)
>>>> return (error);
>>>> }
>>>> + if (TUN2IFP(tp)->if_type != tunp->type)
>>>> + return (EPROTOTYPE);
>>>> mtx_lock(&tp->tun_mtx);
>>>> TUN2IFP(tp)->if_mtu = tunp->mtu;
>>>> - TUN2IFP(tp)->if_type = tunp->type;
>>>> TUN2IFP(tp)->if_baudrate = tunp->baudrate;
>>>> mtx_unlock(&tp->tun_mtx);
>>>> break;
>>>> _______________________________________________
>>>> svn-src-head@freebsd.org mailing list
>>>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>>>> To unsubscribe, send any mail to
>>>> "svn-src-head-unsubscribe@freebsd.org"
>>>
>>> after updating from r325893 to r326362, FreeBSD CURRENT crashes
>>> while booting the kernel. I'm sorry having no further informations,
>>> it happens on a laptop with reduced space.
>>>
>>> At the moment, it seems that a lot of boxes running most recent
>>> CURRENT tend to crash spontanously.
>>>
>>
>> Hi,
>>
>> And you built the kernel from scratch and made sure your source tree
>> does not contain any .o files nor /usr/obj/* .
>>
>> --HPS
>
> Last time I did the make cleandir was when the OFED driver problem
> occured, that was some days ago. Useually, I build world and kernel
> with WITH_META_MODE set.
>
Hi,
Try to do a clean build w/o META mode.
rm -rf /usr/obj/*
And check:
find /usr/src -name "*.o"
--HPS
From owner-svn-src-all@freebsd.org Wed Nov 29 12:42:48 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2572E531F5;
Wed, 29 Nov 2017 12:42:48 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.22])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 1F31B72D05;
Wed, 29 Nov 2017 12:42:47 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from hermann ([78.52.117.12]) by mail.gmx.com (mrgmx103
[212.227.17.168]) with ESMTPSA (Nemesis) id 0Lxgnf-1fCeOu2zCl-017Dnn; Wed, 29
Nov 2017 13:42:43 +0100
Date: Wed, 29 Nov 2017 13:42:42 +0100
From: "Hartmann, O." <o.hartmann@walstatt.org>
To: Hans Petter Selasky <hps@selasky.org>
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
src-committers@freebsd.org, "Hartmann, O." <ohartmann@walstatt.org>
Subject: Re: svn commit: r326362 - in head: share/man/man4 sys/net
Message-ID: <20171129134228.4c7bcefe@hermann>
In-Reply-To: <b2316fba-0357-a215-a54e-f7ee0b4b88a8@selasky.org>
References: <201711290940.vAT9eBWV096246@repo.freebsd.org>
<20171129115125.24dd4aa0@hermann>
<dccf8e08-b181-17da-25c7-f2f27685543e@selasky.org>
<20171129131556.2247c97c@hermann>
<b2316fba-0357-a215-a54e-f7ee0b4b88a8@selasky.org>
Organization: walstatt.org
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:Z7qP7NNlbwWBRpvoIv3M0oAHOiH56T6hhUqRJt8NEse2dcBy3KG
YJgXA+VuQfocvhmQvJh5ZcbnNWAxW7hW4swi9YFESQpbaiJcJl/EYH4FDhThpodQZGFCJ3j
JNjElbpnXvJA+eWWYcLFWHDj643pgjpnf3oVbjd8d/rJQsL0pFhWZ7TFI0SYUVnpoA1fmhO
1a6mBtuwCS8VxvHvgdqFw==
X-UI-Out-Filterresults: notjunk:1;V01:K0:uuLTo60x+RI=:b4jqrH/cZXjzPsdQHIBle6
e7QCUmMOKT6XPBdF0f3DTlAcf5ZCOX5xPZR4x0hR7IQhxRCIiDPl7L8mkID4ei3PNpcqphXKl
12GlJFKl9iKYbbq4wEaV3fO+L9p15z6h1TSgn+AHf7wnoiWFAZItyoRVyg0qVBMXtLdqdGFD8
wpTXtsOoZKArsLzn2sP25POJW89K9xspXIcxfZubtw6izbE8Pb4KOKOKISwo6gaaKBSFzaDxV
mMpB/d+K8e8cgJKvHdTHQ+a8ngrVhoJyWY7MU0qxX+6FzkbRQDxS2LSFDhgI+9dttVZYNyO7r
9XTYCiZuxjJmMm4z6S1Hke8hS1YYvPFe7bE639jsE2v2pyz3Rejk4QARJrH6wyAelJAQIhXsd
x5ykGJg+b7OMv8/HZ4iDgNRzv72+9E/fKrKyHRvUGdvZeAGLmN833vJOadb3SiNoteyj5FeEW
j3Y+gXJLjEjZO9ubKTiBuwnv51WW0gRvj0nF96kcqu+5Hnks0mNMk+evA13Ez3N0zq/HetL+L
HUQDU21o0tdILGPAuq2GhtJYpdSR2FASadqlRZU133yuEnWZhMwPTjFZZMGWL+3/fAxxjSQjR
HIAwIYnPBHtKor4Iy4v8hBtfwLyyeQd4VuoBH8WEY2qOrhwNB8gOznXCWw/JLTZBe2PQY1FAX
snUEeU1UtqYX3BpnGU/boOxyw/LBjuTi3NvVbbDRcGSuY87rl4/dMbxG/YvFfYFBLd27atTLv
J/GIA5NeSweDDE3eHg7ShglrsvkAaNZF0XRg3SM8K5CpNFHpZers67Hw8VZEtgBQR5Zr/sDoq
gpW3bkoECCj4Q/iojT1WXIJtRGhqmmKpD3Nli04I6S/HnEuvM8=
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 12:42:48 -0000
On Wed, 29 Nov 2017 13:16:28 +0100
Hans Petter Selasky <hps@selasky.org> wrote:
> On 11/29/17 13:16, Hartmann, O. wrote:
> > On Wed, 29 Nov 2017 12:49:19 +0100
> > Hans Petter Selasky <hps@selasky.org> wrote:
> >
> >> On 11/29/17 11:51, Hartmann, O. wrote:
> >>> On Wed, 29 Nov 2017 09:40:11 +0000 (UTC)
> >>> Hans Petter Selasky <hselasky@FreeBSD.org> wrote:
> >>>
> >>>> Author: hselasky
> >>>> Date: Wed Nov 29 09:40:11 2017
> >>>> New Revision: 326362
> >>>> URL: https://svnweb.freebsd.org/changeset/base/326362
> >>>>
> >>>> Log:
> >>>> Disallow TUN and TAP character device IOCTLs to modify the
> >>>> network device type to any value. This can cause page faults and
> >>>> panics due to accessing uninitialized fields in the "struct
> >>>> ifnet" which are specific to the network device type.
> >>>>
> >>>> MFC after: 1 week
> >>>> Found by: jau@iki.fi
> >>>> PR: 223767
> >>>> Sponsored by: Mellanox Technologies
> >>>>
> >>>> Modified:
> >>>> head/share/man/man4/tap.4
> >>>> head/share/man/man4/tun.4
> >>>> head/sys/net/if_tap.c
> >>>> head/sys/net/if_tun.c
> >>>>
> >>>> Modified: head/share/man/man4/tap.4
> >>>> ==============================================================================
> >>>> --- head/share/man/man4/tap.4 Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/share/man/man4/tap.4 Wed Nov 29
> >>>> 09:40:11 2017 (r326362) @@ -1,7 +1,7 @@
> >>>> .\" $FreeBSD$
> >>>> .\" Based on PR#2411
> >>>> .\"
> >>>> -.Dd April 10, 2015
> >>>> +.Dd November 29, 2017
> >>>> .Dt TAP 4
> >>>> .Os
> >>>> .Sh NAME
> >>>> @@ -171,7 +171,14 @@ calls are supported
> >>>> .In net/if_tap.h ) :
> >>>> .Bl -tag -width VMIO_SIOCSETMACADDR
> >>>> .It Dv TAPSIFINFO
> >>>> -Set network interface information (line speed, MTU and type).
> >>>> +Set network interface information (line speed and MTU).
> >>>> +The type must be the same as returned by
> >>>> +.Dv TAPGIFINFO
> >>>> +or set to
> >>>> +.Dv IFT_ETHER
> >>>> +else the
> >>>> +.Xr ioctl 2
> >>>> +call will fail.
> >>>> The argument should be a pointer to a
> >>>> .Va struct tapinfo .
> >>>> .It Dv TAPGIFINFO
> >>>>
> >>>> Modified: head/share/man/man4/tun.4
> >>>> ==============================================================================
> >>>> --- head/share/man/man4/tun.4 Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/share/man/man4/tun.4 Wed Nov 29
> >>>> 09:40:11 2017 (r326362) @@ -2,7 +2,7 @@
> >>>> .\" $FreeBSD$
> >>>> .\" Based on PR#2411
> >>>> .\"
> >>>> -.Dd November 30, 2014
> >>>> +.Dd November 29, 2017
> >>>> .Dt TUN 4
> >>>> .Os
> >>>> .Sh NAME
> >>>> @@ -208,8 +208,15 @@ this stores the internal debugging
> >>>> variable's value in .It Dv TUNSIFINFO
> >>>> The argument should be a pointer to an
> >>>> .Vt struct tuninfo
> >>>> -and allows setting the MTU, the type, and the baudrate of the
> >>>> tunnel +and allows setting the MTU and the baudrate of the tunnel
> >>>> device.
> >>>> +The type must be the same as returned by
> >>>> +.Dv TUNGIFINFO
> >>>> +or set to
> >>>> +.Dv IFT_PPP
> >>>> +else the
> >>>> +.Xr ioctl 2
> >>>> +call will fail.
> >>>> The
> >>>> .Vt struct tuninfo
> >>>> is declared in
> >>>>
> >>>> Modified: head/sys/net/if_tap.c
> >>>> ==============================================================================
> >>>> --- head/sys/net/if_tap.c Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/sys/net/if_tap.c Wed Nov 29 09:40:11
> >>>> 2017 (r326362) @@ -737,9 +737,10 @@ tapioctl(struct cdev
> >>>> *dev, u_long cmd, caddr_t data, i switch (cmd) {
> >>>> case TAPSIFINFO:
> >>>> tapp = (struct tapinfo *)data;
> >>>> + if (ifp->if_type != tapp->type)
> >>>> + return (EPROTOTYPE);
> >>>> mtx_lock(&tp->tap_mtx);
> >>>> ifp->if_mtu = tapp->mtu;
> >>>> - ifp->if_type = tapp->type;
> >>>> ifp->if_baudrate = tapp->baudrate;
> >>>> mtx_unlock(&tp->tap_mtx);
> >>>> break;
> >>>>
> >>>> Modified: head/sys/net/if_tun.c
> >>>> ==============================================================================
> >>>> --- head/sys/net/if_tun.c Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/sys/net/if_tun.c Wed Nov 29 09:40:11
> >>>> 2017 (r326362) @@ -676,9 +676,10 @@ tunioctl(struct cdev
> >>>> *dev, u_long cmd, caddr_t data, i if (error)
> >>>> return (error);
> >>>> }
> >>>> + if (TUN2IFP(tp)->if_type != tunp->type)
> >>>> + return (EPROTOTYPE);
> >>>> mtx_lock(&tp->tun_mtx);
> >>>> TUN2IFP(tp)->if_mtu = tunp->mtu;
> >>>> - TUN2IFP(tp)->if_type = tunp->type;
> >>>> TUN2IFP(tp)->if_baudrate = tunp->baudrate;
> >>>> mtx_unlock(&tp->tun_mtx);
> >>>> break;
> >>>> _______________________________________________
> >>>> svn-src-head@freebsd.org mailing list
> >>>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> >>>> To unsubscribe, send any mail to
> >>>> "svn-src-head-unsubscribe@freebsd.org"
> >>>
> >>> after updating from r325893 to r326362, FreeBSD CURRENT crashes
> >>> while booting the kernel. I'm sorry having no further
> >>> informations, it happens on a laptop with reduced space.
> >>>
> >>> At the moment, it seems that a lot of boxes running most recent
> >>> CURRENT tend to crash spontanously.
> >>>
> >>
> >> Hi,
> >>
> >> And you built the kernel from scratch and made sure your source
> >> tree does not contain any .o files nor /usr/obj/* .
> >>
> >> --HPS
> >
> > Last time I did the make cleandir was when the OFED driver problem
> > occured, that was some days ago. Useually, I build world and kernel
> > with WITH_META_MODE set.
> >
>
> Hi,
>
> Try to do a clean build w/o META mode.
>
> rm -rf /usr/obj/*
>
> And check:
>
> find /usr/src -name "*.o"
>
> --HPS
I just started a while ago after "make cleanworld" - which seems to
kill all subsequent folders in /usr/obj or whatever MAKEOBJDIRPREFIX
path is set. I hope this suffice for thew moment, my hardware is not
the fastest.
Sincerely
oh
From owner-svn-src-all@freebsd.org Wed Nov 29 12:49:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E049EE533C5;
Wed, 29 Nov 2017 12:49:23 +0000 (UTC)
(envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A92A2730B3;
Wed, 29 Nov 2017 12:49:23 +0000 (UTC)
(envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATCnM1I075504;
Wed, 29 Nov 2017 12:49:22 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATCnMaF075503;
Wed, 29 Nov 2017 12:49:22 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201711291249.vATCnMaF075503@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 29 Nov 2017 12:49:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326364 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 326364
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 12:49:24 -0000
Author: danfe (ports committer)
Date: Wed Nov 29 12:49:22 2017
New Revision: 326364
URL: https://svnweb.freebsd.org/changeset/base/326364
Log:
Fix several noticed style issues.
Reviewed by: bde
Approved by: bapt
Modified:
head/sys/kern/subr_kdb.c
Modified: head/sys/kern/subr_kdb.c
==============================================================================
--- head/sys/kern/subr_kdb.c Wed Nov 29 10:04:11 2017 (r326363)
+++ head/sys/kern/subr_kdb.c Wed Nov 29 12:49:22 2017 (r326364)
@@ -250,7 +250,6 @@ kdb_reboot(void)
* its arguments. Its up to the caller to ensure that the state variable is
* consistent.
*/
-
#define KEY_CR 13 /* CR '\r' */
#define KEY_TILDE 126 /* ~ */
#define KEY_CRTLB 2 /* ^B */
@@ -362,7 +361,6 @@ kdb_alt_break_gdb(int key, int *state)
* is selected or the current debugger does not support backtraces, this
* function silently returns.
*/
-
void
kdb_backtrace(void)
{
@@ -410,7 +408,6 @@ kdb_backtrace_thread(struct thread *td)
/*
* Set/change the current backend.
*/
-
int
kdb_dbbe_select(const char *name)
{
@@ -450,7 +447,6 @@ kdb_enter(const char *why, const char *msg)
/*
* Initialize the kernel debugger interface.
*/
-
void
kdb_init(void)
{
@@ -485,7 +481,6 @@ kdb_init(void)
/*
* Handle contexts.
*/
-
void *
kdb_jmpbuf(jmp_buf new)
{
@@ -521,9 +516,8 @@ kdb_reenter_silent(void)
}
/*
- * Thread related support functions.
+ * Thread-related support functions.
*/
-
struct pcb *
kdb_thr_ctx(struct thread *thr)
{
@@ -617,7 +611,6 @@ kdb_thr_select(struct thread *thr)
/*
* Enter the debugger due to a trap.
*/
-
int
kdb_trap(int type, int code, struct trapframe *tf)
{
From owner-svn-src-all@freebsd.org Wed Nov 29 13:14:10 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F62FE53B3C;
Wed, 29 Nov 2017 13:14:10 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.21])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 1C0A573D38;
Wed, 29 Nov 2017 13:14:09 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from hermann ([78.52.117.12]) by mail.gmx.com (mrgmx103
[212.227.17.168]) with ESMTPSA (Nemesis) id 0MY75A-1eg3Bf0aem-00Ur4v; Wed, 29
Nov 2017 14:14:07 +0100
Date: Wed, 29 Nov 2017 14:14:05 +0100
From: "Hartmann, O." <o.hartmann@walstatt.org>
To: Alexey Dokuchaev <danfe@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326364 - head/sys/kern
Message-ID: <20171129141343.1d6331f8@hermann>
In-Reply-To: <201711291249.vATCnMaF075503@repo.freebsd.org>
References: <201711291249.vATCnMaF075503@repo.freebsd.org>
Organization: walstatt.org
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:1esxQ22w6tLZS3651TjybwEm5L6WHNj+Qr+skUcVvg6QfNU8nRT
sZB8zNBOE5HZSXtYAfpaXLyXxWlV9JON2aJL7+MKwEBRBiHE+VIxECUcPj74TLG7kyEgPGz
BrqzYy6mJC1w8Fj4obrGGGg1zeiVYtxqxFMqNn8nVkten96VhdiPi9FYArGz0Kfyrxn4I8g
xG1hxztyBGO5Easym01AQ==
X-UI-Out-Filterresults: notjunk:1;V01:K0:xOCHddtohMg=:oUfdYGSCMMMyTFwzrFWb3y
QvV9ETLfhvItx3gPyZiBfOqWU4VyFtV/DhKALld1GeWuAc4mZV4U9X7k0l6A+lZZtn4n1b3P3
vWUB8j9yTh86TDdiqi/BcsLI1ZI6R5O/T8VmAcuaLV5ZSleq/u9cXJOvTSED0e+hiYIPPuLh7
Ueagf0g24aut0Wa3W7fQq5dCEV6nhmj4KV/wRjT8WZFzfr21GyYybFGDMX0Vy3Gb0AcVUeEOg
4Qe1i+x4DJ4BrH5Drn3xluz/hQnJS9uhCxwYyUVkzRPIUUvxbMnM0YtcpQHMvR09C4dX/ceb9
oWKMzr2wPOqb93vyQ7W8yYRMZbzcbDw3kNy8Z2SUveNtWIANl26FZnqrbvxUukRwfbDH++nmX
nN+YbAXGt9fZsQEXcSuZ5xA2nCdHo5L7vQOLxmz5Yt9jzD7OJwroCP8w4GQor32IDXpre8E43
Ip3v5mwLyvOGm26Fz6ScMqYP9SznRdR/IeRmkI5ym0FFiARNE/L8LsIYfO9qiRy5CZs1GEv+K
SvvEK+IsCUK9W39hv1uSJJiSZF8I4mfwxx8p77vewOEfAc3jCQkmcJme/fIOrP2c86VVfrCtM
U/t1Gc7cqspIftQRlhVh/D5ceMpIpOreZArfOTgMkYGT+/py5M8g8AyQOnMWQ6NK5ZcMIKniP
ca+hcQz/5MZ03LUW3GIOhUkLXnO9guay0WZUtgU8fCFAyZggvskpM0Vvia4SS77rVTazuBmP7
ZAqbIaXz5Qeif15t0hjOYzXKLXtWBaLGvS4PTU6YbNSofyy5htuQiIURwDoyTax/qi3JsxcPx
CRYL4wM3xvWjsf00Ens2mI/2HxV8mXhTrVof+eaj6AQXyCXghM=
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 13:14:10 -0000
On Wed, 29 Nov 2017 12:49:22 +0000 (UTC)
Alexey Dokuchaev <danfe@FreeBSD.org> wrote:
> Author: danfe (ports committer)
> Date: Wed Nov 29 12:49:22 2017
> New Revision: 326364
> URL: https://svnweb.freebsd.org/changeset/base/326364
>
> Log:
> Fix several noticed style issues.
>
> Reviewed by: bde
> Approved by: bapt
>
> Modified:
> head/sys/kern/subr_kdb.c
>
> Modified: head/sys/kern/subr_kdb.c
> ==============================================================================
> --- head/sys/kern/subr_kdb.c Wed Nov 29 10:04:11 2017
> (r326363) +++ head/sys/kern/subr_kdb.c Wed Nov 29 12:49:22
> 2017 (r326364) @@ -250,7 +250,6 @@ kdb_reboot(void)
> * its arguments. Its up to the caller to ensure that the state
> variable is
> * consistent.
> */
> -
> #define KEY_CR 13 /* CR '\r' */
> #define KEY_TILDE 126 /* ~ */
> #define KEY_CRTLB 2 /* ^B */
> @@ -362,7 +361,6 @@ kdb_alt_break_gdb(int key, int *state)
> * is selected or the current debugger does not support backtraces,
> this
> * function silently returns.
> */
> -
> void
> kdb_backtrace(void)
> {
> @@ -410,7 +408,6 @@ kdb_backtrace_thread(struct thread *td)
> /*
> * Set/change the current backend.
> */
> -
> int
> kdb_dbbe_select(const char *name)
> {
> @@ -450,7 +447,6 @@ kdb_enter(const char *why, const char *msg)
> /*
> * Initialize the kernel debugger interface.
> */
> -
> void
> kdb_init(void)
> {
> @@ -485,7 +481,6 @@ kdb_init(void)
> /*
> * Handle contexts.
> */
> -
> void *
> kdb_jmpbuf(jmp_buf new)
> {
> @@ -521,9 +516,8 @@ kdb_reenter_silent(void)
> }
>
> /*
> - * Thread related support functions.
> + * Thread-related support functions.
> */
> -
> struct pcb *
> kdb_thr_ctx(struct thread *thr)
> {
> @@ -617,7 +611,6 @@ kdb_thr_select(struct thread *thr)
> /*
> * Enter the debugger due to a trap.
> */
> -
> int
> kdb_trap(int type, int code, struct trapframe *tf)
> {
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to
> "svn-src-head-unsubscribe@freebsd.org"
r326363 produces a panic while performing installworld. This happens
even with the recommended procedure in singleuser mode with booted
kerenl r326363. While installing manpages, the system went down
reporting a "spinlock held too long".
As a great result of that, booting the box results in a fancy screen
with register dumps from BTX loader and BTX halted. This leaves me now
with the second box completely crashed within two days with the same
serious bug! Well done.
As an emergency recovery I tried to replace /bin, /sbin, /libexec /lib
with binaries from another system of the same architecture (Ivybridge
XEON), from 27th of November (it is a system compiled around 21 h local
German time, I have no access to those systems anymore as I try to
explain). In one case this rescue did not work - neither the old nor
the new kernel boot, they get stuck.
Since all systems do have a "clean from scratch build" of CURRENT
world, this infrastructure is not accessible anymore sinde the
rediculous reduced images of FreebSD is useless for system recovery via
installworld/installkernel since any necessary compiler infrastructure
is now erased.
What to do? How can I fix this? I need at least one box working again
to repair the others.
Thanks in advance and thank you very much.
oh
From owner-svn-src-all@freebsd.org Wed Nov 29 13:26:28 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF1DEE53E6A;
Wed, 29 Nov 2017 13:26:28 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.21])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 6D10674321;
Wed, 29 Nov 2017 13:26:27 +0000 (UTC)
(envelope-from o.hartmann@walstatt.org)
Received: from hermann ([78.52.117.12]) by mail.gmx.com (mrgmx103
[212.227.17.168]) with ESMTPSA (Nemesis) id 0MIMyZ-1eGT551mYR-004CYg; Wed, 29
Nov 2017 14:26:24 +0100
Date: Wed, 29 Nov 2017 14:26:23 +0100
From: "Hartmann, O." <o.hartmann@walstatt.org>
To: Hans Petter Selasky <hps@selasky.org>
Cc: "Hartmann, O." <ohartmann@walstatt.org>, svn-src-head@freebsd.org,
svn-src-all@freebsd.org, src-committers@freebsd.org
Subject: Re: svn commit: r326362 - in head: share/man/man4 sys/net
Message-ID: <20171129142619.4525628d@hermann>
In-Reply-To: <b2316fba-0357-a215-a54e-f7ee0b4b88a8@selasky.org>
References: <201711290940.vAT9eBWV096246@repo.freebsd.org>
<20171129115125.24dd4aa0@hermann>
<dccf8e08-b181-17da-25c7-f2f27685543e@selasky.org>
<20171129131556.2247c97c@hermann>
<b2316fba-0357-a215-a54e-f7ee0b4b88a8@selasky.org>
Organization: walstatt.org
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:sDn09nX69Qt8wETp9uPMTojW9PaOyYk+Cjhjcyxbfzi30oiJJiF
1UCZkGh+HsLP8Klie5FCq42zYTNE5hF5vi8uXYb3dhZ8fLXvedJmcwnZ91FXqqEef/Bdy8/
Lt6vovNUuTg+s6dy9dyzgFIv2dMxgqsiT4P3pM0pwa0ObhYROYJDrjtSArWU7It6eYNuJT+
DiLmvd0CD2txc+nuoduvQ==
X-UI-Out-Filterresults: notjunk:1;V01:K0:2QKcRT+xp7w=:/qao9y1KCcbrLUaucf9HiH
P8fXtaQGuQiLK+9hGhkJ5aTvOBtey9ww5FYjnaEJYndP4Whusen9Q9G69xQml9MFsvDhPfj49
/sHcMNWViU3fjJNlQc3erbwij+jLgdNaJCpe7VZnAq9by9CvBgPbfpux5IC4f14+V0sluSMnn
dJFcO8TFJl0nPqmyPBf/qKoresaWwMO26ub5VjHNRhMHlSUtsVo2mhZzkIHI5GylFQC5ycxpn
RAT1ILCbfk98oj68HfyJkTwlgQfmvJo3ymMSOEWzS5PAcSdU35DjESR/wc+OC4YWF62uHDm9a
NTyfpdEfZXMK9XKqqMdriBFm5P4C1nhX6BK5R+MzKuOD8UmC+nnD5kE6WaNaX+qf8GBMzs6ks
wPFQT4fjpViNhvHRM12zqbuNAxJBf2GgDsXsZ+RBmnUISn7c4xy21uaazxhio1oPmAn6EYKKI
Om/juE/FCM5TsJMgxDhqwiB3KPo7nSqhtTIfsj66TVq2hJopXvfDM0vLt04eXyIyjPifEIXZ1
SWX5cW3XmTFQMQRT5nsQm/JtLVTHCTLt3Xg+ATB3/XXGkqh/ekZDZxX7YUGW+/1PFupkBEdpo
EW8NG+SeBp58LTaZmgMdKjZeydyZFm/+fAa5zsGSuTJrIhb1uB4jGbLJzJ/UY6Xw1zO35Lt8C
/SQZWvzcrMzDLgM+5LrpE6MaQwK9ujLJXZifE8vXzApvlqYQLjaHtg6f02YfqoIItoRWN+eWU
oBbMDox8XgUCTX8dL3Lt3ji+b6VeGgQnfmeScVB1jSkwiJ1Tpif7Vr1riTqQYii1WqgvQXoEb
BD2BXHYqX/FvtnvyxuuIwsJ4gf6DD5Z5X6MCRlH8YtaHaA13DE=
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 13:26:29 -0000
On Wed, 29 Nov 2017 13:16:28 +0100
Hans Petter Selasky <hps@selasky.org> wrote:
> On 11/29/17 13:16, Hartmann, O. wrote:
> > On Wed, 29 Nov 2017 12:49:19 +0100
> > Hans Petter Selasky <hps@selasky.org> wrote:
> >
> >> On 11/29/17 11:51, Hartmann, O. wrote:
> >>> On Wed, 29 Nov 2017 09:40:11 +0000 (UTC)
> >>> Hans Petter Selasky <hselasky@FreeBSD.org> wrote:
> >>>
> >>>> Author: hselasky
> >>>> Date: Wed Nov 29 09:40:11 2017
> >>>> New Revision: 326362
> >>>> URL: https://svnweb.freebsd.org/changeset/base/326362
> >>>>
> >>>> Log:
> >>>> Disallow TUN and TAP character device IOCTLs to modify the
> >>>> network device type to any value. This can cause page faults and
> >>>> panics due to accessing uninitialized fields in the "struct
> >>>> ifnet" which are specific to the network device type.
> >>>>
> >>>> MFC after: 1 week
> >>>> Found by: jau@iki.fi
> >>>> PR: 223767
> >>>> Sponsored by: Mellanox Technologies
> >>>>
> >>>> Modified:
> >>>> head/share/man/man4/tap.4
> >>>> head/share/man/man4/tun.4
> >>>> head/sys/net/if_tap.c
> >>>> head/sys/net/if_tun.c
> >>>>
> >>>> Modified: head/share/man/man4/tap.4
> >>>> ==============================================================================
> >>>> --- head/share/man/man4/tap.4 Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/share/man/man4/tap.4 Wed Nov 29
> >>>> 09:40:11 2017 (r326362) @@ -1,7 +1,7 @@
> >>>> .\" $FreeBSD$
> >>>> .\" Based on PR#2411
> >>>> .\"
> >>>> -.Dd April 10, 2015
> >>>> +.Dd November 29, 2017
> >>>> .Dt TAP 4
> >>>> .Os
> >>>> .Sh NAME
> >>>> @@ -171,7 +171,14 @@ calls are supported
> >>>> .In net/if_tap.h ) :
> >>>> .Bl -tag -width VMIO_SIOCSETMACADDR
> >>>> .It Dv TAPSIFINFO
> >>>> -Set network interface information (line speed, MTU and type).
> >>>> +Set network interface information (line speed and MTU).
> >>>> +The type must be the same as returned by
> >>>> +.Dv TAPGIFINFO
> >>>> +or set to
> >>>> +.Dv IFT_ETHER
> >>>> +else the
> >>>> +.Xr ioctl 2
> >>>> +call will fail.
> >>>> The argument should be a pointer to a
> >>>> .Va struct tapinfo .
> >>>> .It Dv TAPGIFINFO
> >>>>
> >>>> Modified: head/share/man/man4/tun.4
> >>>> ==============================================================================
> >>>> --- head/share/man/man4/tun.4 Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/share/man/man4/tun.4 Wed Nov 29
> >>>> 09:40:11 2017 (r326362) @@ -2,7 +2,7 @@
> >>>> .\" $FreeBSD$
> >>>> .\" Based on PR#2411
> >>>> .\"
> >>>> -.Dd November 30, 2014
> >>>> +.Dd November 29, 2017
> >>>> .Dt TUN 4
> >>>> .Os
> >>>> .Sh NAME
> >>>> @@ -208,8 +208,15 @@ this stores the internal debugging
> >>>> variable's value in .It Dv TUNSIFINFO
> >>>> The argument should be a pointer to an
> >>>> .Vt struct tuninfo
> >>>> -and allows setting the MTU, the type, and the baudrate of the
> >>>> tunnel +and allows setting the MTU and the baudrate of the tunnel
> >>>> device.
> >>>> +The type must be the same as returned by
> >>>> +.Dv TUNGIFINFO
> >>>> +or set to
> >>>> +.Dv IFT_PPP
> >>>> +else the
> >>>> +.Xr ioctl 2
> >>>> +call will fail.
> >>>> The
> >>>> .Vt struct tuninfo
> >>>> is declared in
> >>>>
> >>>> Modified: head/sys/net/if_tap.c
> >>>> ==============================================================================
> >>>> --- head/sys/net/if_tap.c Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/sys/net/if_tap.c Wed Nov 29 09:40:11
> >>>> 2017 (r326362) @@ -737,9 +737,10 @@ tapioctl(struct cdev
> >>>> *dev, u_long cmd, caddr_t data, i switch (cmd) {
> >>>> case TAPSIFINFO:
> >>>> tapp = (struct tapinfo *)data;
> >>>> + if (ifp->if_type != tapp->type)
> >>>> + return (EPROTOTYPE);
> >>>> mtx_lock(&tp->tap_mtx);
> >>>> ifp->if_mtu = tapp->mtu;
> >>>> - ifp->if_type = tapp->type;
> >>>> ifp->if_baudrate = tapp->baudrate;
> >>>> mtx_unlock(&tp->tap_mtx);
> >>>> break;
> >>>>
> >>>> Modified: head/sys/net/if_tun.c
> >>>> ==============================================================================
> >>>> --- head/sys/net/if_tun.c Wed Nov 29 09:18:24 2017
> >>>> (r326361) +++ head/sys/net/if_tun.c Wed Nov 29 09:40:11
> >>>> 2017 (r326362) @@ -676,9 +676,10 @@ tunioctl(struct cdev
> >>>> *dev, u_long cmd, caddr_t data, i if (error)
> >>>> return (error);
> >>>> }
> >>>> + if (TUN2IFP(tp)->if_type != tunp->type)
> >>>> + return (EPROTOTYPE);
> >>>> mtx_lock(&tp->tun_mtx);
> >>>> TUN2IFP(tp)->if_mtu = tunp->mtu;
> >>>> - TUN2IFP(tp)->if_type = tunp->type;
> >>>> TUN2IFP(tp)->if_baudrate = tunp->baudrate;
> >>>> mtx_unlock(&tp->tun_mtx);
> >>>> break;
> >>>> _______________________________________________
> >>>> svn-src-head@freebsd.org mailing list
> >>>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> >>>> To unsubscribe, send any mail to
> >>>> "svn-src-head-unsubscribe@freebsd.org"
> >>>
> >>> after updating from r325893 to r326362, FreeBSD CURRENT crashes
> >>> while booting the kernel. I'm sorry having no further
> >>> informations, it happens on a laptop with reduced space.
> >>>
> >>> At the moment, it seems that a lot of boxes running most recent
> >>> CURRENT tend to crash spontanously.
> >>>
> >>
> >> Hi,
> >>
> >> And you built the kernel from scratch and made sure your source
> >> tree does not contain any .o files nor /usr/obj/* .
> >>
> >> --HPS
> >
> > Last time I did the make cleandir was when the OFED driver problem
> > occured, that was some days ago. Useually, I build world and kernel
> > with WITH_META_MODE set.
> >
>
> Hi,
>
> Try to do a clean build w/o META mode.
>
> rm -rf /usr/obj/*
>
> And check:
>
> find /usr/src -name "*.o"
>
> --HPS
>
The last remaining system I had finished building a clean world. The
box is now wrecked, too. As the others.
After booting the box in single user mode, performing an installkernel
and rebooting the r326363 kernel in single user mode and performing
installworld, the box quit service via crashing with an obscure message
like
"spinlock held too long"
and died. Now this last remaining server of mine is also out of service
- with the very same message two others died yesterday and this morning.
The boxes boot and then I get immediately a dump of CPU registeres from
BTX and systems quit service with "BTX halted".
In one case I tried to "repair" by copy manually binaries
to /sbin, /libexec, /lib and /bin via pax -rw -pe to get rid of the
problem, but this also ended in a catastrophy - the kernel, whichever,
new one or the old, do not boot anymore, they get stuck at a certain
point (probably when they load binary images like init, but I have no
clue when this happens in the vein of processes).
Thank you very much in advance for some tips.
oh
From owner-svn-src-all@freebsd.org Wed Nov 29 13:26:33 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65875E53E7E;
Wed, 29 Nov 2017 13:26:33 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
[IPv6:2610:1c1:1:6074::16:84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "freefall.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4594D7432B;
Wed, 29 Nov 2017 13:26:33 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
id 78C5711B17; Wed, 29 Nov 2017 13:26:32 +0000 (UTC)
Date: Wed, 29 Nov 2017 13:26:32 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: "Hartmann, O." <o.hartmann@walstatt.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326364 - head/sys/kern
Message-ID: <20171129132632.GA42677@FreeBSD.org>
References: <201711291249.vATCnMaF075503@repo.freebsd.org>
<20171129141343.1d6331f8@hermann>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171129141343.1d6331f8@hermann>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 13:26:33 -0000
On Wed, Nov 29, 2017 at 02:14:05PM +0100, Hartmann, O. wrote:
> On Wed, 29 Nov 2017 12:49:22 +0000 (UTC)
> Alexey Dokuchaev <danfe@FreeBSD.org> wrote:
> > Author: danfe (ports committer)
> > Date: Wed Nov 29 12:49:22 2017
> > New Revision: 326364
> > URL: https://svnweb.freebsd.org/changeset/base/326364
> >
> > Log:
> > Fix several noticed style issues.
>
> r326363 produces a panic while performing installworld. This happens
> even with the recommended procedure in singleuser mode with booted
> kerenl r326363. While installing manpages, the system went down
> reporting a "spinlock held too long".
Oh, I'm sorry to hear that. However, this r326364 does not bring any
changes, code-wise. I've only decided to step in since the code was
stirred anyway, and I plan to work on it as well (style bugs were just
too annoying).
./danfe
From owner-svn-src-all@freebsd.org Wed Nov 29 13:46:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC319E5498F;
Wed, 29 Nov 2017 13:46:46 +0000 (UTC)
(envelope-from mad@madpilot.net)
Received: from mail.madpilot.net (grunt.madpilot.net [78.47.145.38])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5F37C74FF4;
Wed, 29 Nov 2017 13:46:45 +0000 (UTC)
(envelope-from mad@madpilot.net)
Received: from mail (mail [192.168.254.3])
by mail.madpilot.net (Postfix) with ESMTP id 3yn1zR1JzqzbT4;
Wed, 29 Nov 2017 14:46:43 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=madpilot.net; h=
content-transfer-encoding:content-language:content-type
:content-type:in-reply-to:mime-version:user-agent:date:date
:message-id:from:from:references:subject:subject:received
:received; s=mail; t=1511963200; x=1513777601; bh=4q7G999BMI0pdr
dcrnFa80VRk5ilcIPrcv3oAQ3/Yj8=; b=YXB9cb0MEMptzSqJynBN8zbJZvRNF0
3wcw1uT+lc5Z934g+/e3l5tQcedWSd7e2LNS6btU1tJ7/MHH4vZdmtlt7ofYQ+jV
Wa9onX/0UuLJGDhY5YQTiivK/YSTXVmnyZ+iOdtgsliXUCuNgzC/bToNpLW8J+jG
czx3E4XXD/140=
Received: from mail.madpilot.net ([192.168.254.3])
by mail (mail.madpilot.net [192.168.254.3]) (amavisd-new, port 10024)
with ESMTP id A2EHWK0kPn5O; Wed, 29 Nov 2017 14:46:40 +0100 (CET)
Received: from tommy.madpilot.net (micro.madpilot.net [88.149.173.206])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by mail.madpilot.net (Postfix) with ESMTPSA;
Wed, 29 Nov 2017 14:46:40 +0100 (CET)
Subject: Re: svn commit: r326364 - head/sys/kern
To: "Hartmann, O." <o.hartmann@walstatt.org>,
Alexey Dokuchaev <danfe@FreeBSD.org>
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
src-committers@freebsd.org
References: <201711291249.vATCnMaF075503@repo.freebsd.org>
<20171129141343.1d6331f8@hermann>
From: Guido Falsi <mad@madpilot.net>
Message-ID: <70c6fc56-0c43-c185-2363-95e312b10c93@madpilot.net>
Date: Wed, 29 Nov 2017 14:46:40 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <20171129141343.1d6331f8@hermann>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 13:46:46 -0000
On 11/29/2017 14:14, Hartmann, O. wrote:
> On Wed, 29 Nov 2017 12:49:22 +0000 (UTC)
> Alexey Dokuchaev <danfe@FreeBSD.org> wrote:
>
>> Author: danfe (ports committer)
>> Date: Wed Nov 29 12:49:22 2017
>> New Revision: 326364
>> URL: https://svnweb.freebsd.org/changeset/base/326364
>>
>> Log:
>> Fix several noticed style issues.
>>
>> Reviewed by: bde
>> Approved by: bapt
>>
>> Modified:
>> head/sys/kern/subr_kdb.c
>>
>> Modified: head/sys/kern/subr_kdb.c
>> ==============================================================================
>> --- head/sys/kern/subr_kdb.c Wed Nov 29 10:04:11 2017
>> (r326363) +++ head/sys/kern/subr_kdb.c Wed Nov 29 12:49:22
>> 2017 (r326364) @@ -250,7 +250,6 @@ kdb_reboot(void)
>> * its arguments. Its up to the caller to ensure that the state
>> variable is
>> * consistent.
>> */
>> -
>> #define KEY_CR 13 /* CR '\r' */
>> #define KEY_TILDE 126 /* ~ */
>> #define KEY_CRTLB 2 /* ^B */
>> @@ -362,7 +361,6 @@ kdb_alt_break_gdb(int key, int *state)
>> * is selected or the current debugger does not support backtraces,
>> this
>> * function silently returns.
>> */
>> -
>> void
>> kdb_backtrace(void)
>> {
>> @@ -410,7 +408,6 @@ kdb_backtrace_thread(struct thread *td)
>> /*
>> * Set/change the current backend.
>> */
>> -
>> int
>> kdb_dbbe_select(const char *name)
>> {
>> @@ -450,7 +447,6 @@ kdb_enter(const char *why, const char *msg)
>> /*
>> * Initialize the kernel debugger interface.
>> */
>> -
>> void
>> kdb_init(void)
>> {
>> @@ -485,7 +481,6 @@ kdb_init(void)
>> /*
>> * Handle contexts.
>> */
>> -
>> void *
>> kdb_jmpbuf(jmp_buf new)
>> {
>> @@ -521,9 +516,8 @@ kdb_reenter_silent(void)
>> }
>>
>> /*
>> - * Thread related support functions.
>> + * Thread-related support functions.
>> */
>> -
>> struct pcb *
>> kdb_thr_ctx(struct thread *thr)
>> {
>> @@ -617,7 +611,6 @@ kdb_thr_select(struct thread *thr)
>> /*
>> * Enter the debugger due to a trap.
>> */
>> -
>> int
>> kdb_trap(int type, int code, struct trapframe *tf)
>> {
>> _______________________________________________
>> svn-src-head@freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to
>> "svn-src-head-unsubscribe@freebsd.org"
>
> r326363 produces a panic while performing installworld. This happens
> even with the recommended procedure in singleuser mode with booted
> kerenl r326363. While installing manpages, the system went down
> reporting a "spinlock held too long".
>
I'm having a similar problem, looks like it's related to r326200.
I've locally reverted that(and it's followup r326237) and testing again.
--
Guido Falsi <mad@madpilot.net>
From owner-svn-src-all@freebsd.org Wed Nov 29 14:24:06 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3845E55309;
Wed, 29 Nov 2017 14:24:05 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id BD4BF761EE;
Wed, 29 Nov 2017 14:24:05 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATEO4Df017236;
Wed, 29 Nov 2017 14:24:04 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATEO499017235;
Wed, 29 Nov 2017 14:24:04 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711291424.vATEO499017235@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 29 Nov 2017 14:24:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326365 - stable/11/sys/netinet
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/11/sys/netinet
X-SVN-Commit-Revision: 326365
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 14:24:06 -0000
Author: markj
Date: Wed Nov 29 14:24:04 2017
New Revision: 326365
URL: https://svnweb.freebsd.org/changeset/base/326365
Log:
MFC r326093:
Use the right variable for the IP header parameter to tcp:::send.
Modified:
stable/11/sys/netinet/tcp_subr.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/netinet/tcp_subr.c
==============================================================================
--- stable/11/sys/netinet/tcp_subr.c Wed Nov 29 12:49:22 2017 (r326364)
+++ stable/11/sys/netinet/tcp_subr.c Wed Nov 29 14:24:04 2017 (r326365)
@@ -1133,16 +1133,20 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcph
if (flags & TH_RST)
TCP_PROBE5(accept__refused, NULL, NULL, m, tp, nth);
- TCP_PROBE5(send, NULL, tp, m, tp, nth);
#ifdef INET6
- if (isipv6)
- (void) ip6_output(m, NULL, NULL, 0, NULL, NULL, inp);
+ if (isipv6) {
+ TCP_PROBE5(send, NULL, tp, ip6, tp, nth);
+ (void)ip6_output(m, NULL, NULL, 0, NULL, NULL, inp);
+ }
#endif /* INET6 */
#if defined(INET) && defined(INET6)
else
#endif
#ifdef INET
- (void) ip_output(m, NULL, NULL, 0, NULL, inp);
+ {
+ TCP_PROBE5(send, NULL, tp, ip, tp, nth);
+ (void)ip_output(m, NULL, NULL, 0, NULL, inp);
+ }
#endif
}
From owner-svn-src-all@freebsd.org Wed Nov 29 14:25:19 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F563E553C3;
Wed, 29 Nov 2017 14:25:19 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 182A876364;
Wed, 29 Nov 2017 14:25:19 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATEPIDC017333;
Wed, 29 Nov 2017 14:25:18 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATEPIS2017332;
Wed, 29 Nov 2017 14:25:18 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711291425.vATEPIS2017332@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 29 Nov 2017 14:25:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326366 - stable/11/cddl/usr.sbin/dtrace/tests/tools
X-SVN-Group: stable-11
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/11/cddl/usr.sbin/dtrace/tests/tools
X-SVN-Commit-Revision: 326366
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 14:25:19 -0000
Author: markj
Date: Wed Nov 29 14:25:17 2017
New Revision: 326366
URL: https://svnweb.freebsd.org/changeset/base/326366
Log:
MFC r326096:
Annotate pragma/err.invalidlibdep.ksh as EXFAIL.
Modified:
stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
==============================================================================
--- stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Wed Nov 29 14:24:04 2017 (r326365)
+++ stable/11/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Wed Nov 29 14:25:17 2017 (r326366)
@@ -148,6 +148,11 @@ exclude EXFAIL common/pid/tst.provregex4.ksh
exclude EXFAIL common/pid/tst.weak1.d
exclude EXFAIL common/pid/tst.weak2.d
+# This test appears to be invalid. dtrace is supposed to press on if a
+# depends_on pragma cannot be satisfied, per the comment above
+# dt_load_libs_dir() in libdtrace.
+exclude EXFAIL common/pragma/err.invalidlibdep.ksh
+
# This test checks for a leading tab on a line before #define. That is illegal
# on Solaris, but the clang pre-processor on FreeBSD is happy with code like
# that.
From owner-svn-src-all@freebsd.org Wed Nov 29 14:34:06 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0457E55709;
Wed, 29 Nov 2017 14:34:06 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8A2E77695F;
Wed, 29 Nov 2017 14:34:06 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATEY50n021409;
Wed, 29 Nov 2017 14:34:05 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATEY5MJ021408;
Wed, 29 Nov 2017 14:34:05 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711291434.vATEY5MJ021408@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 29 Nov 2017 14:34:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326367 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 326367
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 14:34:06 -0000
Author: markj
Date: Wed Nov 29 14:34:05 2017
New Revision: 326367
URL: https://svnweb.freebsd.org/changeset/base/326367
Log:
Remove some comments that became incorrect with r325530.
Modified:
head/sys/vm/vm_page.c
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Wed Nov 29 14:25:17 2017 (r326366)
+++ head/sys/vm/vm_page.c Wed Nov 29 14:34:05 2017 (r326367)
@@ -1593,8 +1593,6 @@ vm_page_rename(vm_page_t m, vm_object_t new_object, vm
* VM_ALLOC_SBUSY shared busy the allocated page
* VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page
- *
- * This routine may not sleep.
*/
vm_page_t
vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req)
@@ -1831,8 +1829,6 @@ again:
* VM_ALLOC_SBUSY shared busy the allocated page
* VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page
- *
- * This routine may not sleep.
*/
vm_page_t
vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req,
@@ -2045,8 +2041,6 @@ vm_page_alloc_check(vm_page_t m)
* intends to allocate
* VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page
- *
- * This routine may not sleep.
*/
vm_page_t
vm_page_alloc_freelist(int flind, int req)
From owner-svn-src-all@freebsd.org Wed Nov 29 14:45:29 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BC47E55E48;
Wed, 29 Nov 2017 14:45:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6389977152;
Wed, 29 Nov 2017 14:45:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATEjSO4025857;
Wed, 29 Nov 2017 14:45:28 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATEjSAi025855;
Wed, 29 Nov 2017 14:45:28 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711291445.vATEjSAi025855@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 29 Nov 2017 14:45:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326368 - in stable: 10/release/doc/share/xml
11/release/doc/share/xml
X-SVN-Group: stable-10
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in stable: 10/release/doc/share/xml
11/release/doc/share/xml
X-SVN-Commit-Revision: 326368
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 14:45:29 -0000
Author: gjb
Date: Wed Nov 29 14:45:28 2017
New Revision: 326368
URL: https://svnweb.freebsd.org/changeset/base/326368
Log:
Document SA-17:06 through SA-17:11 and EN-17:07 through EN:17-10.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/doc/share/xml/errata.xml
stable/10/release/doc/share/xml/security.xml
Changes in other areas also in this revision:
Modified:
stable/11/release/doc/share/xml/errata.xml
stable/11/release/doc/share/xml/security.xml
Modified: stable/10/release/doc/share/xml/errata.xml
==============================================================================
--- stable/10/release/doc/share/xml/errata.xml Wed Nov 29 14:34:05 2017 (r326367)
+++ stable/10/release/doc/share/xml/errata.xml Wed Nov 29 14:45:28 2017 (r326368)
@@ -19,9 +19,11 @@
<tbody>
<row>
- <entry><para>No notices.</para></entry>
- <entry><para> </para></entry>
- <entry><para> </para></entry>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-17:10.tzdata.asc">FreeBSD-EN-17:10.tzdata</link></entry>
+ <entry>2 November 2017</entry>
+ <entry><para>Timezone database information
+ update</para></entry>
</row>
</tbody>
</tgroup>
Modified: stable/10/release/doc/share/xml/security.xml
==============================================================================
--- stable/10/release/doc/share/xml/security.xml Wed Nov 29 14:34:05 2017 (r326367)
+++ stable/10/release/doc/share/xml/security.xml Wed Nov 29 14:45:28 2017 (r326368)
@@ -19,9 +19,47 @@
<tbody>
<row>
- <entry><para>No advisories.</para></entry>
- <entry><para> </para></entry>
- <entry><para> </para></entry>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:06.openssh.asc">FreeBSD-SA-17:06.openssh</link></entry>
+ <entry>10 August 2017</entry>
+ <entry><para>Denial of Service vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:07.wpa.asc">FreeBSD-SA-17:07.wpa</link></entry>
+ <entry>16 October 2017</entry>
+ <entry><para>WPA2 protocol vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:08.ptrace.asc">FreeBSD-SA-17:08.ptrace</link></entry>
+ <entry>15 November 2017</entry>
+ <entry><para>Kernel data leak via
+ <function>ptrace(PT_LWPINFO)</function></para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:09.sch.asc">FreeBSD-SA-17:09.shm</link></entry>
+ <entry>15 November 2017</entry>
+ <entry><para>POSIX shm allows jails to access global
+ namespace</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:10.kldstat.asc">FreeBSD-SA-17:10.kldstat</link></entry>
+ <entry>15 November 2017</entry>
+ <entry><para>Information leak</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:11.openssl.asc">FreeBSD-SA-17:11.openssl</link></entry>
+ <entry>29 November 2017</entry>
+ <entry><para>Multiple vulnerabilities</para></entry>
</row>
</tbody>
</tgroup>
From owner-svn-src-all@freebsd.org Wed Nov 29 14:45:29 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2E1DE55E4D;
Wed, 29 Nov 2017 14:45:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 825DF77153;
Wed, 29 Nov 2017 14:45:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATEjSkf025864;
Wed, 29 Nov 2017 14:45:28 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATEjShK025862;
Wed, 29 Nov 2017 14:45:28 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711291445.vATEjShK025862@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 29 Nov 2017 14:45:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326368 - in stable: 10/release/doc/share/xml
11/release/doc/share/xml
X-SVN-Group: stable-11
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in stable: 10/release/doc/share/xml
11/release/doc/share/xml
X-SVN-Commit-Revision: 326368
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 14:45:29 -0000
Author: gjb
Date: Wed Nov 29 14:45:28 2017
New Revision: 326368
URL: https://svnweb.freebsd.org/changeset/base/326368
Log:
Document SA-17:06 through SA-17:11 and EN-17:07 through EN:17-10.
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/release/doc/share/xml/errata.xml
stable/11/release/doc/share/xml/security.xml
Changes in other areas also in this revision:
Modified:
stable/10/release/doc/share/xml/errata.xml
stable/10/release/doc/share/xml/security.xml
Modified: stable/11/release/doc/share/xml/errata.xml
==============================================================================
--- stable/11/release/doc/share/xml/errata.xml Wed Nov 29 14:34:05 2017 (r326367)
+++ stable/11/release/doc/share/xml/errata.xml Wed Nov 29 14:45:28 2017 (r326368)
@@ -19,9 +19,27 @@
<tbody>
<row>
- <entry>No notices</entry>
- <entry> </entry>
- <entry> </entry>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-17:07.vnet.asc">FreeBSD-EN-17:07.vnet</link></entry>
+ <entry>10 August 2017</entry>
+ <entry><para>VNET kernel panic with asynchronous
+ I/O</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-17:08.pf.asc">FreeBSD-EN-17:08.pf</link></entry>
+ <entry>10 August 2017</entry>
+ <entry><para>&man.pf.4; housekeeping thread causes kernel
+ panic</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-17:10.tzdata.asc">FreeBSD-EN-17:10.tzdata</link></entry>
+ <entry>2 November 2017</entry>
+ <entry><para>Timezone database information
+ update</para></entry>
</row>
</tbody>
</tgroup>
Modified: stable/11/release/doc/share/xml/security.xml
==============================================================================
--- stable/11/release/doc/share/xml/security.xml Wed Nov 29 14:34:05 2017 (r326367)
+++ stable/11/release/doc/share/xml/security.xml Wed Nov 29 14:45:28 2017 (r326368)
@@ -19,9 +19,39 @@
<tbody>
<row>
- <entry>No advisories</entry>
- <entry> </entry>
- <entry> </entry>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:06.openssh.asc">FreeBSD-SA-17:06.openssh</link></entry>
+ <entry>10 August 2017</entry>
+ <entry><para>Denial of Service vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:07.wpa.asc">FreeBSD-SA-17:07.wpa</link></entry>
+ <entry>16 October 2017</entry>
+ <entry><para>WPA2 protocol vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:08.ptrace.asc">FreeBSD-SA-17:08.ptrace</link></entry>
+ <entry>15 November 2017</entry>
+ <entry><para>Kernel data leak via
+ <function>ptrace(PT_LWPINFO)</function></para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:10.kldstat.asc">FreeBSD-SA-17:10.kldstat</link></entry>
+ <entry>15 November 2017</entry>
+ <entry><para>Information leak</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-17:11.openssl.asc">FreeBSD-SA-17:11.openssl</link></entry>
+ <entry>29 November 2017</entry>
+ <entry><para>Multiple vulnerabilities</para></entry>
</row>
</tbody>
</tgroup>
From owner-svn-src-all@freebsd.org Wed Nov 29 15:26:38 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0ED6E56B40;
Wed, 29 Nov 2017 15:26:38 +0000 (UTC)
(envelope-from asomers@gmail.com)
Received: from mail-lf0-x236.google.com (mail-lf0-x236.google.com
[IPv6:2a00:1450:4010:c07::236])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 245E17887E;
Wed, 29 Nov 2017 15:26:38 +0000 (UTC)
(envelope-from asomers@gmail.com)
Received: by mail-lf0-x236.google.com with SMTP id r143so4295017lfe.13;
Wed, 29 Nov 2017 07:26:38 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc;
bh=Gvpac1Sq5wlpSsQcih8SpvxpUr6xaSchqT2g58sjs/0=;
b=kF8WP1VGvTZ6v9/mxsOmfxH+jZCiQ/Lw6fKIE2dX8TEqtvbv+fZnBwBouVm0QVdbvj
uNpE2TG78R1Mhp9NqwQQEZ6luhXyT56skKiAnoy1Ui6uJCBXAGj65uoAi2D8uKWdFm9z
GGFgAITYTeT0fVvI9eAhE4yRQ0djKYZXZrnyMi5a9z+gdG5RAk77CuwIMZeON6E1nHWO
glMky8RJXhnHaQqV5GkqnVim2Uixjba22piwRhB7fDppiDG0F5GXy+/MEzx+rK/2i2vv
0aENgUTVclQ73wyWBV1YDslBTHq7pTD96UM/EKpnne++bsTmRGPnuFRahc59g+29pOBb
tYLg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
:date:message-id:subject:to:cc;
bh=Gvpac1Sq5wlpSsQcih8SpvxpUr6xaSchqT2g58sjs/0=;
b=Izg0xnqPMFgdUv+ig7aStBq/cQEJIv/d/0rgHOcxGYJbK26a4FoDB12xsNnnIzW1QQ
R83MMyT9YcHJKE52Gb1kGDo/ELfYC+U3Z+cp7VAMfKLGNdoKSMxbouvkIgjZ+C+mRqTU
kITX1GBBAM4Gdv9bBaLhXg4YBpoOPMDYdiwUfLzWDZ2Sx1Vq8HRg2H9rNn+HX7C8VdiL
hgLpM+IjQk4GVodk/SMsMOzRHaSN/IdEGq6h7vAdgfjappD+/0OXGB4APC6ESe03Orfb
Ele6y0XbFk/0eG2jdSGMkPx+ITuJ2+k+3XidXrMuA2cTDaVD+9BMGVkR4grE4+R+1d/e
cCqw==
X-Gm-Message-State: AJaThX7xDTUHPoHA7RF5/MS3NiJP1GRf5KNQNmVlHviYLaCSPWqiqH1e
EL9+LGmVhihgyJ7JVF2a2mgZw0+lp11xuXInAi4=
X-Google-Smtp-Source: AGs4zMY/zh5Wab/ySqH1bFNZm2iXfLlIithS4vPkdRVe0gGd2kAS98XOxszVtejltWXzI4NWFk+hvsmyiEG4I3n/xvw=
X-Received: by 10.46.88.77 with SMTP id x13mr1656051ljd.80.1511969196086; Wed,
29 Nov 2017 07:26:36 -0800 (PST)
MIME-Version: 1.0
Sender: asomers@gmail.com
Received: by 10.179.76.19 with HTTP; Wed, 29 Nov 2017 07:26:35 -0800 (PST)
In-Reply-To: <744C69EF-C0A5-46DC-9D65-EEE78BD32BAF@FreeBSD.org>
References: <201711282044.vASKiAJw072662@repo.freebsd.org>
<744C69EF-C0A5-46DC-9D65-EEE78BD32BAF@FreeBSD.org>
From: Alan Somers <asomers@freebsd.org>
Date: Wed, 29 Nov 2017 08:26:35 -0700
X-Google-Sender-Auth: k49xTo0YqItKYpxH7T_RvSJ4rFs
Message-ID: <CAOtMX2j0QeP8u6uyH5VhzfyFdMHiJmAr=a1zE4kQWEBxXurX3A@mail.gmail.com>
Subject: Re: svn commit: r326343 - head/etc/rc.d
To: Dimitry Andric <dim@freebsd.org>
Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 15:26:38 -0000
On Wed, Nov 29, 2017 at 4:40 AM, Dimitry Andric <dim@freebsd.org> wrote:
> On 28 Nov 2017, at 21:44, Alan Somers <asomers@freebsd.org> wrote:
>>
>> Author: asomers
>> Date: Tue Nov 28 20:44:10 2017
>> New Revision: 326343
>> URL: https://svnweb.freebsd.org/changeset/base/326343
>>
>> Log:
>> Fix fetching ntp leapfile after 325256
>>
>> Submitted by: Ronald Klop <ronald-lists@klop.ws>
>> Reviewed by: asomers
>
> Reviewed by yourself? :)
>
> -Dimitry
>
Yep. Written by Ronald Klop, and reviewed by me.
From owner-svn-src-all@freebsd.org Wed Nov 29 15:36:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9EB4E56DFA;
Wed, 29 Nov 2017 15:36:46 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [88.99.82.50])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A7F9B78DBD;
Wed, 29 Nov 2017 15:36:46 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2016.home.selasky.org (unknown [62.141.128.70])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by mail.turbocat.net (Postfix) with ESMTPSA id 2BA4D260072;
Wed, 29 Nov 2017 16:36:35 +0100 (CET)
Subject: Re: svn commit: r326218 - head/sys/kern
To: John Baldwin <jhb@freebsd.org>, Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org, Konstantin Belousov <kib@FreeBSD.org>,
"O. Hartmann" <ohartmann@walstatt.org>,
KrishnamRaju ErapaRaju <Krishna2@chelsio.com>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
<3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
<14058479.lc6xlYgyBM@ralph.baldwin.cx>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <2e752d6a-d34a-dde0-acea-fdbf8bebea51@selasky.org>
Date: Wed, 29 Nov 2017 16:33:50 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <14058479.lc6xlYgyBM@ralph.baldwin.cx>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 15:36:47 -0000
Hi Nathan,
The chunk below causes sched_pin() to stop working and should be removed
from your commit ??!!
It probably explains the hangs seen recently reported by various brave
people running 12-current :-)
Specifically I see threads migrating between CPUs when td->td_pinned > 0
using the LinuxKPI RCU API, which in turn leads to a hang when trying to
synchronize RCU.
--HPS
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 5c8bae5afa1..bd4b505f6c3 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -2453,7 +2453,7 @@ sched_add(struct thread *td, int flags)
* Pick the destination cpu and if it isn't ours transfer to the
* target cpu.
*/
- td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
start */
+// td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
start */
cpu = sched_pickcpu(td, flags);
tdq = sched_setcpu(td, cpu, flags);
tdq_add(tdq, td, flags);
From owner-svn-src-all@freebsd.org Wed Nov 29 15:45:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11438E570AC;
Wed, 29 Nov 2017 15:45:23 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
[IPv6:2610:1c1:1:6074::16:84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "freefall.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id E304F792C8;
Wed, 29 Nov 2017 15:45:22 +0000 (UTC)
(envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
id 21CF114194; Wed, 29 Nov 2017 15:45:22 +0000 (UTC)
Date: Wed, 29 Nov 2017 15:45:22 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Alan Somers <asomers@freebsd.org>
Cc: Dimitry Andric <dim@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"src-committers@freebsd.org" <src-committers@freebsd.org>
Subject: Re: svn commit: r326343 - head/etc/rc.d
Message-ID: <20171129154522.GA35070@FreeBSD.org>
References: <201711282044.vASKiAJw072662@repo.freebsd.org>
<744C69EF-C0A5-46DC-9D65-EEE78BD32BAF@FreeBSD.org>
<CAOtMX2j0QeP8u6uyH5VhzfyFdMHiJmAr=a1zE4kQWEBxXurX3A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAOtMX2j0QeP8u6uyH5VhzfyFdMHiJmAr=a1zE4kQWEBxXurX3A@mail.gmail.com>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 15:45:23 -0000
On Wed, Nov 29, 2017 at 08:26:35AM -0700, Alan Somers wrote:
> On Wed, Nov 29, 2017 at 4:40 AM, Dimitry Andric <dim@freebsd.org> wrote:
> > On 28 Nov 2017, at 21:44, Alan Somers <asomers@freebsd.org> wrote:
> >> New Revision: 326343
> >> URL: https://svnweb.freebsd.org/changeset/base/326343
> >>
> >> Log:
> >> Fix fetching ntp leapfile after 325256
> >>
> >> Submitted by: Ronald Klop <ronald-lists@klop.ws>
> >> Reviewed by: asomers
> >
> > Reviewed by yourself? :)
>
> Yep. Written by Ronald Klop, and reviewed by me.
It's assumed by default that whoever committed the patch had reviewed
and tested it; explicit "Reviewed by" is typically placed when there
were other people who also did the review.
./danfe
From owner-svn-src-all@freebsd.org Wed Nov 29 16:14:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E19DE57F84;
Wed, 29 Nov 2017 16:14:02 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id EA2ED7A775;
Wed, 29 Nov 2017 16:14:01 +0000 (UTC)
(envelope-from kostikbel@gmail.com)
Received: from tom.home (kib@localhost [127.0.0.1])
by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id vATGDueb022766
(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Wed, 29 Nov 2017 18:13:56 +0200 (EET)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua vATGDueb022766
Received: (from kostik@localhost)
by tom.home (8.15.2/8.15.2/Submit) id vATGDus9022765;
Wed, 29 Nov 2017 18:13:56 +0200 (EET)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
using -f
Date: Wed, 29 Nov 2017 18:13:56 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Hans Petter Selasky <hps@selasky.org>
Cc: John Baldwin <jhb@freebsd.org>, Nathan Whitehorn <nwhitehorn@freebsd.org>,
src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org, Konstantin Belousov <kib@FreeBSD.org>,
"O. Hartmann" <ohartmann@walstatt.org>,
KrishnamRaju ErapaRaju <Krishna2@chelsio.com>
Subject: Re: svn commit: r326218 - head/sys/kern
Message-ID: <20171129161356.GA2272@kib.kiev.ua>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
<3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
<14058479.lc6xlYgyBM@ralph.baldwin.cx>
<2e752d6a-d34a-dde0-acea-fdbf8bebea51@selasky.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <2e752d6a-d34a-dde0-acea-fdbf8bebea51@selasky.org>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
autolearn_force=no version=3.4.1
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 16:14:02 -0000
On Wed, Nov 29, 2017 at 04:33:50PM +0100, Hans Petter Selasky wrote:
> Hi Nathan,
>
> The chunk below causes sched_pin() to stop working and should be removed
> from your commit ??!!
>
> It probably explains the hangs seen recently reported by various brave
> people running 12-current :-)
>
> Specifically I see threads migrating between CPUs when td->td_pinned > 0
> using the LinuxKPI RCU API, which in turn leads to a hang when trying to
> synchronize RCU.
>
> --HPS
>
> diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
> index 5c8bae5afa1..bd4b505f6c3 100644
> --- a/sys/kern/sched_ule.c
> +++ b/sys/kern/sched_ule.c
> @@ -2453,7 +2453,7 @@ sched_add(struct thread *td, int flags)
> * Pick the destination cpu and if it isn't ours transfer to the
> * target cpu.
> */
> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
> start */
> +// td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
> start */
> cpu = sched_pickcpu(td, flags);
> tdq = sched_setcpu(td, cpu, flags);
> tdq_add(tdq, td, flags);
To clarify. It seems that this change breaks sched_bind().
It might be that LinuxKPI does use sched_pin() in somewhat questionable
way. Namely, the code puts the thread off the CPU (e.g. by taking a
lock). Then, is it guaranteed that the pinned thread returns to the same
cpu after sched_add() ?
I think that the second behaviour is not guaranteed, but it might
happens by the way the things are arranged. If guaranteed, then the
sched_pin() breakage is same as for sched_bind().
From owner-svn-src-all@freebsd.org Wed Nov 29 16:59:35 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97D86E5DB62;
Wed, 29 Nov 2017 16:59:35 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: from mail-it0-x241.google.com (mail-it0-x241.google.com
[IPv6:2607:f8b0:4001:c0b::241])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 6388C7BCBA;
Wed, 29 Nov 2017 16:59:35 +0000 (UTC)
(envelope-from chmeeedalf@gmail.com)
Received: by mail-it0-x241.google.com with SMTP id d16so4948823itj.1;
Wed, 29 Nov 2017 08:59:35 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc;
bh=Og1mbLFppyTW07t02QgexPOLQmWA25fSM/E3PZoBh4A=;
b=AtOaxpV8iC2ufpdtBMZlb62+oRsZk22mjZnAITxQz1SIdxuDaIQgXSTC2d2yHuPTy0
fOGjoIG0ZTghqf0BbxPaIm8rx0sliuQAuxfb9Yx3pLDJFeIlrr2Y5Er8SVmah4meR7dd
xBjcloHy5N3iwFFeVLrk5CV0o6UltK+PIHNqM3sa8htN2VpvlLWVex2qluRNLuDfKK2m
e/aR6pshEuO8+xnsQ0olGaqdp9UpP8V3F25gyYUz0YvJi/K33oWuXtsl2H9XOr/JuRpr
n4/Kv9ZkWhX9OI3D15YGXTvdhuw+mo5bcvkFo2Kg59D5VrEUD0NkAtAP4AVQJjIhbgUf
5mSg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
:date:message-id:subject:to:cc;
bh=Og1mbLFppyTW07t02QgexPOLQmWA25fSM/E3PZoBh4A=;
b=leUxbpOaoOmq9JxvgGgyFjFH7mKlVWfSfOfxD7qRKdakt/WJnj5vNU1a3mHbq8NhqH
AIlzkmFNVdy8an19VU1JBAiXBM+GGKaMv2mF8h8feNxvKhwFs9fK27NB1n/M5Y+ja3cQ
Hyag8Atmjd9tSX6vZoKZY2q3cogklHg+EElJDLaiTmowCob8MBuWI6F6OmiKTSaal2wO
hKZgvRMeIGAqOYelRqEqumqLf3yYDd388s+qY0Lxs7e98UlYINqNsChq2wYRRYjyFdb6
fzGZxWIVYQPTs0GuJ/V7rKbm1x3YJlLsLNRkYvlpQkX/3XxaXm+ypCkIm4ZExBtlDrIo
P1qw==
X-Gm-Message-State: AJaThX736tBmOGqfcWHOLhzD/ax7pR6yPRN0qi1nad7O2RpktMQ7yz2y
i3ygThA+oQC7elLopR0yLG2DKGBMpR4oQ2uZ+kY=
X-Google-Smtp-Source: AGs4zMaV7MafvqkG1XkinQlLtK9c7jqZJsrVTHpzAct/QC9vIjd1ezXFTJ7O0jCaQhh3i0vfj7DaxTFm27p2rUg6od0=
X-Received: by 10.36.245.200 with SMTP id k191mr8049256ith.20.1511974774563;
Wed, 29 Nov 2017 08:59:34 -0800 (PST)
MIME-Version: 1.0
Sender: chmeeedalf@gmail.com
Received: by 10.79.78.207 with HTTP; Wed, 29 Nov 2017 08:59:34 -0800 (PST)
In-Reply-To: <20171129161356.GA2272@kib.kiev.ua>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
<3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
<14058479.lc6xlYgyBM@ralph.baldwin.cx>
<2e752d6a-d34a-dde0-acea-fdbf8bebea51@selasky.org>
<20171129161356.GA2272@kib.kiev.ua>
From: Justin Hibbits <jrh29@alumni.cwru.edu>
Date: Wed, 29 Nov 2017 10:59:34 -0600
X-Google-Sender-Auth: GjREahYCMJB1jhZEcmdezfMzWB8
Message-ID: <CAHSQbTAfQcudcVRUGR=wwm9hvbgvhaFuTVjA8D15C+8fRfN=hw@mail.gmail.com>
Subject: Re: svn commit: r326218 - head/sys/kern
To: Konstantin Belousov <kostikbel@gmail.com>
Cc: Hans Petter Selasky <hps@selasky.org>, John Baldwin <jhb@freebsd.org>,
Nathan Whitehorn <nwhitehorn@freebsd.org>,
src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>,
Konstantin Belousov <kib@freebsd.org>,
"O. Hartmann" <ohartmann@walstatt.org>,
KrishnamRaju ErapaRaju <Krishna2@chelsio.com>
Content-Type: text/plain; charset="UTF-8"
X-Mailman-Approved-At: Wed, 29 Nov 2017 17:11:30 +0000
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 16:59:35 -0000
On Wed, Nov 29, 2017 at 10:13 AM, Konstantin Belousov
<kostikbel@gmail.com> wrote:
> On Wed, Nov 29, 2017 at 04:33:50PM +0100, Hans Petter Selasky wrote:
>> Hi Nathan,
>>
>> The chunk below causes sched_pin() to stop working and should be removed
>> from your commit ??!!
>>
>> It probably explains the hangs seen recently reported by various brave
>> people running 12-current :-)
>>
>> Specifically I see threads migrating between CPUs when td->td_pinned > 0
>> using the LinuxKPI RCU API, which in turn leads to a hang when trying to
>> synchronize RCU.
>>
>> --HPS
>>
>> diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
>> index 5c8bae5afa1..bd4b505f6c3 100644
>> --- a/sys/kern/sched_ule.c
>> +++ b/sys/kern/sched_ule.c
>> @@ -2453,7 +2453,7 @@ sched_add(struct thread *td, int flags)
>> * Pick the destination cpu and if it isn't ours transfer to the
>> * target cpu.
>> */
>> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
>> start */
>> +// td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
>> start */
>> cpu = sched_pickcpu(td, flags);
>> tdq = sched_setcpu(td, cpu, flags);
>> tdq_add(tdq, td, flags);
>
> To clarify. It seems that this change breaks sched_bind().
>
> It might be that LinuxKPI does use sched_pin() in somewhat questionable
> way. Namely, the code puts the thread off the CPU (e.g. by taking a
> lock). Then, is it guaranteed that the pinned thread returns to the same
> cpu after sched_add() ?
>
> I think that the second behaviour is not guaranteed, but it might
> happens by the way the things are arranged. If guaranteed, then the
> sched_pin() breakage is same as for sched_bind().
>
I see the same breakage on PowerPC with the dtsec(4) driver, which
pins interrupts to CPUs, now causing interrupts to migrate to cores
without the matching portal mapping.
- Justin
From owner-svn-src-all@freebsd.org Wed Nov 29 18:14:58 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65C97E5FC37;
Wed, 29 Nov 2017 18:14:58 +0000 (UTC)
(envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3081C7F2A1;
Wed, 29 Nov 2017 18:14:58 +0000 (UTC)
(envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATIEvlw015599;
Wed, 29 Nov 2017 18:14:57 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATIEv0T015598;
Wed, 29 Nov 2017 18:14:57 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201711291814.vATIEv0T015598@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: shurd set sender to
shurd@FreeBSD.org using -f
From: Stephen Hurd <shurd@FreeBSD.org>
Date: Wed, 29 Nov 2017 18:14:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326369 - head/sys/net
X-SVN-Group: head
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: head/sys/net
X-SVN-Commit-Revision: 326369
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 18:14:58 -0000
Author: shurd
Date: Wed Nov 29 18:14:57 2017
New Revision: 326369
URL: https://svnweb.freebsd.org/changeset/base/326369
Log:
Ensure that ctx->ifc_cpus is always initialized
If a device didn't support MSI-X, ctx->ifc_cpus would not be initialized,
but the IRQ allocation routines still uses the value. Move the
initialization to common code.
Sponsored by: Limelight Networks
Modified:
head/sys/net/iflib.c
Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c Wed Nov 29 14:45:28 2017 (r326368)
+++ head/sys/net/iflib.c Wed Nov 29 18:14:57 2017 (r326369)
@@ -4259,6 +4259,14 @@ iflib_device_register(device_t dev, void *sc, if_share
GROUPTASK_INIT(&ctx->ifc_admin_task, 0, _task_fn_admin, ctx);
/* XXX format name */
taskqgroup_attach(qgroup_if_config_tqg, &ctx->ifc_admin_task, ctx, -1, "admin");
+
+ /* Set up cpu set. If it fails, zero out the set. */
+ if (bus_get_cpus(dev, INTR_CPUS, sizeof(ctx->ifc_cpus), &ctx->ifc_cpus) != 0) {
+ device_printf(dev, "Unable to fetch CPU list\n");
+ CPU_COPY(&all_cpus, &ctx->ifc_cpus);
+ }
+ MPASS(CPU_COUNT(&ctx->ifc_cpus) > 0);
+
/*
** Now setup MSI or MSI/X, should
** return us the number of supported
@@ -4984,7 +4992,7 @@ find_nth(if_ctx_t ctx, cpuset_t *cpus, int qid)
int i, cpuid, eqid, count;
CPU_COPY(&ctx->ifc_cpus, cpus);
- count = CPU_COUNT(&ctx->ifc_cpus);
+ count = CPU_COUNT(cpus);
eqid = qid % count;
/* clear up to the qid'th bit */
for (i = 0; i < eqid; i++) {
@@ -5391,20 +5399,14 @@ iflib_msix_init(if_ctx_t ctx)
#else
queuemsgs = msgs - admincnt;
#endif
- if (bus_get_cpus(dev, INTR_CPUS, sizeof(ctx->ifc_cpus), &ctx->ifc_cpus) == 0) {
#ifdef RSS
- queues = imin(queuemsgs, rss_getnumbuckets());
+ queues = imin(queuemsgs, rss_getnumbuckets());
#else
- queues = queuemsgs;
+ queues = queuemsgs;
#endif
- queues = imin(CPU_COUNT(&ctx->ifc_cpus), queues);
- device_printf(dev, "pxm cpus: %d queue msgs: %d admincnt: %d\n",
- CPU_COUNT(&ctx->ifc_cpus), queuemsgs, admincnt);
- } else {
- device_printf(dev, "Unable to fetch CPU list\n");
- /* Figure out a reasonable auto config value */
- queues = min(queuemsgs, mp_ncpus);
- }
+ queues = imin(CPU_COUNT(&ctx->ifc_cpus), queues);
+ device_printf(dev, "pxm cpus: %d queue msgs: %d admincnt: %d\n",
+ CPU_COUNT(&ctx->ifc_cpus), queuemsgs, admincnt);
#ifdef RSS
/* If we're doing RSS, clamp at the number of RSS buckets */
if (queues > rss_getnumbuckets())
From owner-svn-src-all@freebsd.org Wed Nov 29 18:21:18 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6DD7E5FDEE;
Wed, 29 Nov 2017 18:21:18 +0000 (UTC)
(envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 917037F5C2;
Wed, 29 Nov 2017 18:21:18 +0000 (UTC)
(envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATILHjB018244;
Wed, 29 Nov 2017 18:21:17 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATILHPD018243;
Wed, 29 Nov 2017 18:21:17 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201711291821.vATILHPD018243@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: shurd set sender to
shurd@FreeBSD.org using -f
From: Stephen Hurd <shurd@FreeBSD.org>
Date: Wed, 29 Nov 2017 18:21:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326370 - head/sys/net
X-SVN-Group: head
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: head/sys/net
X-SVN-Commit-Revision: 326370
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 18:21:18 -0000
Author: shurd
Date: Wed Nov 29 18:21:17 2017
New Revision: 326370
URL: https://svnweb.freebsd.org/changeset/base/326370
Log:
Fix comment introduced in r326369
The code uses the set of all CPUs, it doesn't zero out the set.
Sponsored by: Limelight Networks
Modified:
head/sys/net/iflib.c
Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c Wed Nov 29 18:14:57 2017 (r326369)
+++ head/sys/net/iflib.c Wed Nov 29 18:21:17 2017 (r326370)
@@ -4260,7 +4260,7 @@ iflib_device_register(device_t dev, void *sc, if_share
/* XXX format name */
taskqgroup_attach(qgroup_if_config_tqg, &ctx->ifc_admin_task, ctx, -1, "admin");
- /* Set up cpu set. If it fails, zero out the set. */
+ /* Set up cpu set. If it fails, use the set of all CPUs. */
if (bus_get_cpus(dev, INTR_CPUS, sizeof(ctx->ifc_cpus), &ctx->ifc_cpus) != 0) {
device_printf(dev, "Unable to fetch CPU list\n");
CPU_COPY(&all_cpus, &ctx->ifc_cpus);
From owner-svn-src-all@freebsd.org Wed Nov 29 18:59:34 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55FFEE65E3E;
Wed, 29 Nov 2017 18:59:34 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1E61F80F4F;
Wed, 29 Nov 2017 18:59:34 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2016.home.selasky.org (unknown [62.141.128.70])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by mail.turbocat.net (Postfix) with ESMTPSA id E63F22602F2;
Wed, 29 Nov 2017 19:59:31 +0100 (CET)
Subject: Re: svn commit: r326218 - head/sys/kern
To: "Hartmann, O." <ohartmann@walstatt.org>
Cc: src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
Konstantin Belousov <kib@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
<3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
<14058479.lc6xlYgyBM@ralph.baldwin.cx>
<2e752d6a-d34a-dde0-acea-fdbf8bebea51@selasky.org>
<20171129161356.GA2272@kib.kiev.ua>
<CAHSQbTAfQcudcVRUGR=wwm9hvbgvhaFuTVjA8D15C+8fRfN=hw@mail.gmail.com>
<20171129193647.77859f62@hermann>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <28766f0d-0811-cbc8-59f4-779cbb6f2538@selasky.org>
Date: Wed, 29 Nov 2017 19:56:46 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <20171129193647.77859f62@hermann>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 18:59:34 -0000
On 11/29/17 19:36, Hartmann, O. wrote:
> I can not understand why this untested patch isn't reverted already.
Hi,
Setting:
kern.smp.disabled=1
In the loader or /boot/loader.conf should get your system up and running
again, so that you can build a new kernel or revert the broken diff.
Hope that helps until Nathan has properly fixed this issue.
Thank you!
--HPS
From owner-svn-src-all@freebsd.org Wed Nov 29 18:37:15 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E646E6548D;
Wed, 29 Nov 2017 18:37:15 +0000 (UTC)
(envelope-from ohartmann@walstatt.org)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.18])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 1F8997FF60;
Wed, 29 Nov 2017 18:37:14 +0000 (UTC)
(envelope-from ohartmann@walstatt.org)
Received: from hermann ([78.52.117.12]) by mail.gmx.com (mrgmx001
[212.227.17.190]) with ESMTPSA (Nemesis) id 0MePcd-1eTdjR1P03-00QBDt; Wed, 29
Nov 2017 19:36:58 +0100
Date: Wed, 29 Nov 2017 19:36:52 +0100
From: "Hartmann, O." <ohartmann@walstatt.org>
To: Justin Hibbits <jrh29@alumni.cwru.edu>
Cc: Konstantin Belousov <kostikbel@gmail.com>, Hans Petter Selasky
<hps@selasky.org>, src-committers <src-committers@freebsd.org>, John
Baldwin <jhb@freebsd.org>, "svn-src-all@freebsd.org"
<svn-src-all@freebsd.org>, KrishnamRaju ErapaRaju <Krishna2@chelsio.com>,
Konstantin Belousov <kib@freebsd.org>, Nathan Whitehorn
<nwhitehorn@freebsd.org>, "svn-src-head@freebsd.org"
<svn-src-head@freebsd.org>, "O. Hartmann" <ohartmann@walstatt.org>
Subject: Re: svn commit: r326218 - head/sys/kern
Message-ID: <20171129193647.77859f62@hermann>
In-Reply-To: <CAHSQbTAfQcudcVRUGR=wwm9hvbgvhaFuTVjA8D15C+8fRfN=hw@mail.gmail.com>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
<3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
<14058479.lc6xlYgyBM@ralph.baldwin.cx>
<2e752d6a-d34a-dde0-acea-fdbf8bebea51@selasky.org>
<20171129161356.GA2272@kib.kiev.ua>
<CAHSQbTAfQcudcVRUGR=wwm9hvbgvhaFuTVjA8D15C+8fRfN=hw@mail.gmail.com>
Organization: walstatt.org
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:J5ivfFK6aKP4S2InQoAR6D9Iymq1XYLkDu+tICdvwJYqxADaNQj
h+eU6gCGdYqr+KkvLLS89Uf90GqCTC5SUsAK5OzGuMooQoG6KDsaTkR7FPwQ5EDwUX9JHGT
/iv9+mLQgdS3V22mCmbyzAAGaphZjL0KHLIr8l/YX4ALnuXlAbyKvo6WtThnsGhvg01Iszb
oGEYlE/AsjnGJ+WsAtf7A==
X-UI-Out-Filterresults: notjunk:1;V01:K0:rqILWROsx8g=:XTT4bTKXQc/j01y+ViFxuR
bYZF6x+qNZz65E+Y0ZnmOt09lD/MRzL3Iid9WVz++HEtmUM9iFVvlsj3x/b1XGD0sZKVFzgBR
s6RlLDYBPz4HT7F9RFYWoHsfAafah8yuaAknoxpn0nTVQMJIRmNUnUGZmjFd4u6VWOXvPV5oN
zmGDXOn+pGd/D0Be9jCj5XfSDDPub9K2okCtxmsEvNMPoX939YVoY08QXRzLe3RI7hN6Cn0Of
o7z9O6rAv+Lup12LQSrHsp8TZglHbAz7eUO7GB32MkEe5cTZShw2C7vJTYhMfYsoSI6a2t19+
kMGXgYvWJ98K+gR0WZkMbB+Rv5bW6my9kWfi57djqulNweqSZSA2vfoMu9mLvwU3RcFFrwXfv
IAmVZyNdlFn+d6cw5LD7yO10+ea9W0C5KhPlzYJ9vmQl3h8MWuEYGm7R7hfDz43bIJfLiGaRW
+rdzjiBss8PUd4oGDHHPsB0mO7/ohBR6Fq7cN0yt+f0rsgYDYsii8tLUB52dVhyU0Q7lBg6Yb
5+t4rJOipa8nL2sAWu55QuFrFkoeMVxczCdQ5jBw3y8w6fI2k62CYIswwaIHGm+v94Lzov3s6
5wjwPg7cqJmzVkOikuNyxSiruFX3OXFmg36dUO5zcu49eiiqD9y6mZ19e1f31y+yepqhyjxka
aN3xgZsyVb0Ud1Bp81j4vS6nfYHfMraLjBvD2AMpONyaqU/ajmtlzr9hNNTzavahIhnlKeCWZ
hay8n0KpOQx5Myp36JB/m7lhvQ3J9YkU0/zHCz4WCsfJjrNM51MzgM6fem7j647dXkotd4Gko
/kOZbstYK1KVHC7T35M1pFY/SIJg2jJDLlICC/2jEKw/oKw/ew=
X-Mailman-Approved-At: Wed, 29 Nov 2017 19:00:21 +0000
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 18:37:15 -0000
On Wed, 29 Nov 2017 10:59:34 -0600
Justin Hibbits <jrh29@alumni.cwru.edu> wrote:
> On Wed, Nov 29, 2017 at 10:13 AM, Konstantin Belousov
> <kostikbel@gmail.com> wrote:
> > On Wed, Nov 29, 2017 at 04:33:50PM +0100, Hans Petter Selasky
> > wrote:
> >> Hi Nathan,
> >>
> >> The chunk below causes sched_pin() to stop working and should be
> >> removed from your commit ??!!
> >>
> >> It probably explains the hangs seen recently reported by various
> >> brave people running 12-current :-)
> >>
> >> Specifically I see threads migrating between CPUs when
> >> td->td_pinned > 0 using the LinuxKPI RCU API, which in turn leads
> >> to a hang when trying to synchronize RCU.
> >>
> >> --HPS
> >>
> >> diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
> >> index 5c8bae5afa1..bd4b505f6c3 100644
> >> --- a/sys/kern/sched_ule.c
> >> +++ b/sys/kern/sched_ule.c
> >> @@ -2453,7 +2453,7 @@ sched_add(struct thread *td, int flags)
> >> * Pick the destination cpu and if it isn't ours transfer
> >> to the
> >> * target cpu.
> >> */
> >> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid
> >> to start */
> >> +// td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid
> >> to start */
> >> cpu = sched_pickcpu(td, flags);
> >> tdq = sched_setcpu(td, cpu, flags);
> >> tdq_add(tdq, td, flags);
> >
> > To clarify. It seems that this change breaks sched_bind().
> >
> > It might be that LinuxKPI does use sched_pin() in somewhat
> > questionable way. Namely, the code puts the thread off the CPU
> > (e.g. by taking a lock). Then, is it guaranteed that the pinned
> > thread returns to the same cpu after sched_add() ?
> >
> > I think that the second behaviour is not guaranteed, but it might
> > happens by the way the things are arranged. If guaranteed, then the
> > sched_pin() breakage is same as for sched_bind().
> >
>
> I see the same breakage on PowerPC with the dtsec(4) driver, which
> pins interrupts to CPUs, now causing interrupts to migrate to cores
> without the matching portal mapping.
>
> - Justin
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to
> "svn-src-head-unsubscribe@freebsd.org"
I can not understand why this untested patch isn't reverted already. It
brings down any system I have at hand within short time and if someone
is stupid enough - like me - performing an installworld while new
kernel already has been installed, the old binaries, one day old, seem
to be incompatible and BTX immediately bails out.
I brought down the fourth box - by intention and the problem is serious
and can be reproduced easily.
From owner-svn-src-all@freebsd.org Wed Nov 29 18:45:00 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37EACE65817;
Wed, 29 Nov 2017 18:45:00 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (turbocat.net [88.99.82.50])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C13D8803DE;
Wed, 29 Nov 2017 18:44:59 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from hps2016.home.selasky.org (unknown [62.141.128.70])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by mail.turbocat.net (Postfix) with ESMTPSA id F292F2602F2;
Wed, 29 Nov 2017 19:44:55 +0100 (CET)
Subject: Re: svn commit: r326218 - head/sys/kern
To: Justin Hibbits <jrh29@alumni.cwru.edu>,
Konstantin Belousov <kostikbel@gmail.com>
Cc: John Baldwin <jhb@freebsd.org>, Nathan Whitehorn
<nwhitehorn@freebsd.org>, src-committers <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>,
Konstantin Belousov <kib@freebsd.org>, "O. Hartmann"
<ohartmann@walstatt.org>, KrishnamRaju ErapaRaju <Krishna2@chelsio.com>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
<14322447.103fKFTi3y@ralph.baldwin.cx>
<3fc45d5f-22b9-0562-278b-c515e36f48e7@freebsd.org>
<14058479.lc6xlYgyBM@ralph.baldwin.cx>
<2e752d6a-d34a-dde0-acea-fdbf8bebea51@selasky.org>
<20171129161356.GA2272@kib.kiev.ua>
<CAHSQbTAfQcudcVRUGR=wwm9hvbgvhaFuTVjA8D15C+8fRfN=hw@mail.gmail.com>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <0baa25c3-f235-78c5-5c72-9eab5dab89c6@selasky.org>
Date: Wed, 29 Nov 2017 19:42:10 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <CAHSQbTAfQcudcVRUGR=wwm9hvbgvhaFuTVjA8D15C+8fRfN=hw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Mailman-Approved-At: Wed, 29 Nov 2017 19:00:36 +0000
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 18:45:00 -0000
On 11/29/17 17:59, Justin Hibbits wrote:
> On Wed, Nov 29, 2017 at 10:13 AM, Konstantin Belousov
> <kostikbel@gmail.com> wrote:
>> On Wed, Nov 29, 2017 at 04:33:50PM +0100, Hans Petter Selasky wrote:
>>> Hi Nathan,
>>>
>>> The chunk below causes sched_pin() to stop working and should be removed
>>> from your commit ??!!
>>>
>>> It probably explains the hangs seen recently reported by various brave
>>> people running 12-current :-)
>>>
>>> Specifically I see threads migrating between CPUs when td->td_pinned > 0
>>> using the LinuxKPI RCU API, which in turn leads to a hang when trying to
>>> synchronize RCU.
>>>
>>> --HPS
>>>
>>> diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
>>> index 5c8bae5afa1..bd4b505f6c3 100644
>>> --- a/sys/kern/sched_ule.c
>>> +++ b/sys/kern/sched_ule.c
>>> @@ -2453,7 +2453,7 @@ sched_add(struct thread *td, int flags)
>>> * Pick the destination cpu and if it isn't ours transfer to the
>>> * target cpu.
>>> */
>>> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
>>> start */
>>> +// td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to
>>> start */
>>> cpu = sched_pickcpu(td, flags);
>>> tdq = sched_setcpu(td, cpu, flags);
>>> tdq_add(tdq, td, flags);
>>
>> To clarify. It seems that this change breaks sched_bind().
>>
>> It might be that LinuxKPI does use sched_pin() in somewhat questionable
>> way. Namely, the code puts the thread off the CPU (e.g. by taking a
>> lock). Then, is it guaranteed that the pinned thread returns to the same
>> cpu after sched_add() ?
>>
>> I think that the second behaviour is not guaranteed, but it might
>> happens by the way the things are arranged. If guaranteed, then the
>> sched_pin() breakage is same as for sched_bind().
>>
>
> I see the same breakage on PowerPC with the dtsec(4) driver, which
> pins interrupts to CPUs, now causing interrupts to migrate to cores
> without the matching portal mapping.
>
> - Justin
Hi Nathan,
Looking at your patch I think what you wanted to do is something like
shown below. I'm not sure if sched_setup() is run early enough to catch
all created threads in the registered eventhandler hook. I'll leave the
final solution and analysis up to you.
--HPS
> diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
> index 5c8bae5afa1..42ccf58ea0c 100644
> --- a/sys/kern/sched_ule.c
> +++ b/sys/kern/sched_ule.c
> @@ -1387,6 +1387,13 @@ sched_setup_smp(void)
> }
> #endif
>
> +static void
> +sched_thread_ctor(void *arg __unused, struct thread *td)
> +{
> + /* Pick a valid initial CPU number */
> + td_get_sched(td)->ts_cpu = curcpu;
> +}
> +
> /*
> * Setup the thread queues and initialize the topology based on MD
> * information.
> @@ -1396,6 +1403,9 @@ sched_setup(void *dummy)
> {
> struct tdq *tdq;
>
> + (void) EVENTHANDLER_REGISTER(thread_ctor,
> + sched_thread_ctor, NULL, EVENTHANDLER_PRI_ANY);
> +
> tdq = TDQ_SELF();
> #ifdef SMP
> sched_setup_smp();
> @@ -2453,7 +2463,6 @@ sched_add(struct thread *td, int flags)
> * Pick the destination cpu and if it isn't ours transfer to the
> * target cpu.
> */
> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
> cpu = sched_pickcpu(td, flags);
> tdq = sched_setcpu(td, cpu, flags);
> tdq_add(tdq, td, flags);
From owner-svn-src-all@freebsd.org Wed Nov 29 19:47:10 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEBB2DBA06D;
Wed, 29 Nov 2017 19:47:10 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id AC14F29F8;
Wed, 29 Nov 2017 19:47:10 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATJl99K053390;
Wed, 29 Nov 2017 19:47:09 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATJl9fI053389;
Wed, 29 Nov 2017 19:47:09 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201711291947.vATJl9fI053389@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 29 Nov 2017 19:47:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326371 - head/sys/vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/vm
X-SVN-Commit-Revision: 326371
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 19:47:11 -0000
Author: markj
Date: Wed Nov 29 19:47:09 2017
New Revision: 326371
URL: https://svnweb.freebsd.org/changeset/base/326371
Log:
Verify the object/vnode association after vget() in vm_pageout_clean().
It's theoretically possible for the vnode and object to be disassociated
while locks are dropped around the vget() call, in which case we
shouldn't proceed with laundering.
Noted and reviewed by: kib
MFC after: 1 week
Modified:
head/sys/vm/vm_pageout.c
Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c Wed Nov 29 18:21:17 2017 (r326370)
+++ head/sys/vm/vm_pageout.c Wed Nov 29 19:47:09 2017 (r326371)
@@ -647,7 +647,17 @@ vm_pageout_clean(vm_page_t m, int *numpagedout)
goto unlock_mp;
}
VM_OBJECT_WLOCK(object);
+
+ /*
+ * Ensure that the object and vnode were not disassociated
+ * while locks were dropped.
+ */
+ if (vp->v_object != object) {
+ error = ENOENT;
+ goto unlock_all;
+ }
vm_page_lock(m);
+
/*
* While the object and page were unlocked, the page
* may have been:
From owner-svn-src-all@freebsd.org Wed Nov 29 20:38:22 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BACA7DBB453;
Wed, 29 Nov 2017 20:38:22 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8440E63A1E;
Wed, 29 Nov 2017 20:38:22 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATKcLlp074521;
Wed, 29 Nov 2017 20:38:21 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATKcLi3074520;
Wed, 29 Nov 2017 20:38:21 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711292038.vATKcLi3074520@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 29 Nov 2017 20:38:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326373 - stable/11/usr.sbin/freebsd-update
X-SVN-Group: stable-11
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/11/usr.sbin/freebsd-update
X-SVN-Commit-Revision: 326373
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 20:38:22 -0000
Author: emaste
Date: Wed Nov 29 20:38:21 2017
New Revision: 326373
URL: https://svnweb.freebsd.org/changeset/base/326373
Log:
MFC r326082: freebsd-update: do not duplicate patchlist entries
PR: 221079
Submitted by: Masachika ISHIZUKA
Submitted by: ota@j.email.ne.jp
Reviewed by: cperciva
Modified:
stable/11/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/11/usr.sbin/freebsd-update/freebsd-update.sh Wed Nov 29 20:15:29 2017 (r326372)
+++ stable/11/usr.sbin/freebsd-update/freebsd-update.sh Wed Nov 29 20:38:21 2017 (r326373)
@@ -1047,7 +1047,7 @@ fetch_make_patchlist () {
continue
fi
echo "${X}|${Y}"
- done | uniq
+ done | sort -u
}
# Print user-friendly progress statistics
From owner-svn-src-all@freebsd.org Wed Nov 29 20:44:42 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D423DBB66B;
Wed, 29 Nov 2017 20:44:42 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 25A0B63E5F;
Wed, 29 Nov 2017 20:44:42 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATKifbk078440;
Wed, 29 Nov 2017 20:44:41 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATKifWx078439;
Wed, 29 Nov 2017 20:44:41 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711292044.vATKifWx078439@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 29 Nov 2017 20:44:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326374 - stable/10/usr.sbin/freebsd-update
X-SVN-Group: stable-10
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/10/usr.sbin/freebsd-update
X-SVN-Commit-Revision: 326374
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 20:44:42 -0000
Author: emaste
Date: Wed Nov 29 20:44:40 2017
New Revision: 326374
URL: https://svnweb.freebsd.org/changeset/base/326374
Log:
MFC r326082: freebsd-update: do not duplicate patchlist entries
PR: 221079
Submitted by: Masachika ISHIZUKA
Submitted by: ota@j.email.ne.jp
Reviewed by: cperciva
Modified:
stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Wed Nov 29 20:38:21 2017 (r326373)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Wed Nov 29 20:44:40 2017 (r326374)
@@ -1047,7 +1047,7 @@ fetch_make_patchlist () {
continue
fi
echo "${X}|${Y}"
- done | uniq
+ done | sort -u
}
# Print user-friendly progress statistics
From owner-svn-src-all@freebsd.org Wed Nov 29 21:16:15 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 995A3DEA0D7;
Wed, 29 Nov 2017 21:16:15 +0000 (UTC)
(envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 62BD765062;
Wed, 29 Nov 2017 21:16:15 +0000 (UTC)
(envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATLGEk6091743;
Wed, 29 Nov 2017 21:16:14 GMT (envelope-from arichardson@FreeBSD.org)
Received: (from arichardson@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATLGEB2091742;
Wed, 29 Nov 2017 21:16:14 GMT (envelope-from arichardson@FreeBSD.org)
Message-Id: <201711292116.vATLGEB2091742@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arichardson set sender to
arichardson@FreeBSD.org using -f
From: Alex Richardson <arichardson@FreeBSD.org>
Date: Wed, 29 Nov 2017 21:16:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326375 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: arichardson
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 326375
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 21:16:15 -0000
Author: arichardson
Date: Wed Nov 29 21:16:14 2017
New Revision: 326375
URL: https://svnweb.freebsd.org/changeset/base/326375
Log:
Don't fail the build due to clang integer constant range warnings
This warning checks whether a constant is out of range of the integer
type. An example is `comparison of 'u_int' > 4294967295 is always false`
and in this case the warning makes sense.
However, when the type is a typedef that can be either 64 or 32 bits the
if condition is only tautological in some configurations so this should
not be a warning that fails the build.
Reviewed by: dim
Approved by: jhb (mentor)
Differential Revision: https://reviews.freebsd.org/D12912
Modified:
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Wed Nov 29 20:44:40 2017 (r326374)
+++ head/share/mk/bsd.sys.mk Wed Nov 29 21:16:14 2017 (r326375)
@@ -81,6 +81,9 @@ CWARNFLAGS.clang+= -Wno-unused-local-typedef
.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 40000
CWARNFLAGS.clang+= -Wno-address-of-packed-member
.endif
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000
+CWARNFLAGS.clang+= -Wno-error=tautological-constant-compare
+.endif
.endif # WARNS <= 3
.if ${WARNS} <= 2
CWARNFLAGS.clang+= -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter
From owner-svn-src-all@freebsd.org Wed Nov 29 23:11:36 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B431DEC7C2;
Wed, 29 Nov 2017 23:11:36 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (glebi.us [96.95.210.25])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 0217068904;
Wed, 29 Nov 2017 23:11:35 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (localhost [127.0.0.1])
by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id vATNBSIX049085
(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Wed, 29 Nov 2017 15:11:29 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by cell.glebi.us (8.15.2/8.15.2/Submit) id vATNBSe6049084;
Wed, 29 Nov 2017 15:11:28 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebi.us: glebius set sender to
glebius@FreeBSD.org using -f
Date: Wed, 29 Nov 2017 15:11:28 -0800
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326218 - head/sys/kern
Message-ID: <20171129231128.GO1063@FreeBSD.org>
References: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201711252341.vAPNf5Qx001464@repo.freebsd.org>
User-Agent: Mutt/1.9.1 (2017-09-22)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 23:11:36 -0000
Hi Nathan,
On Sat, Nov 25, 2017 at 11:41:05PM +0000, Nathan Whitehorn wrote:
N> Author: nwhitehorn
N> Date: Sat Nov 25 23:41:05 2017
N> New Revision: 326218
N> URL: https://svnweb.freebsd.org/changeset/base/326218
N>
N> Log:
N> Remove some, but not all, assumptions that the BSP is CPU 0 and that CPUs
N> are numbered densely from there to n_cpus.
I got experimental branch, where counter(9) can be used at very early
stages of startup, e.g. at VM initialization. I suspect it would be broken
once I merge in your changes.
Basically, what I need is that CPU_FOREACH() works before AP startup, with
one iteration - the BSP. Now I achieve that with this hack:
https://github.com/glebius/FreeBSD/commit/834b857464972b45e659f99fa2dd91e987b17dc9
Can you please suggest a better way to do that?
--
Gleb Smirnoff
From owner-svn-src-all@freebsd.org Wed Nov 29 23:28:41 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8CB1DECC07;
Wed, 29 Nov 2017 23:28:41 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8332069076;
Wed, 29 Nov 2017 23:28:41 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATNSeCw046519;
Wed, 29 Nov 2017 23:28:40 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATNSeOM046518;
Wed, 29 Nov 2017 23:28:40 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201711292328.vATNSeOM046518@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 29 Nov 2017 23:28:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326376 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 326376
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 23:28:41 -0000
Author: hselasky
Date: Wed Nov 29 23:28:40 2017
New Revision: 326376
URL: https://svnweb.freebsd.org/changeset/base/326376
Log:
The sched_add() function is not only used when the thread is initially
started, but also by the turnstiles to mark a thread as runnable for
all locks, for instance sleepqueues do:
setrunnable()->sched_wakeup()->sched_add()
In r326218 code was added to allow booting from non-zero CPU numbers
by setting the ts_cpu field inside the ULE scheduler's sched_add()
function. This had an undesired side-effect that prior sched_pin() and
sched_bind() calls got disregarded. This patch fixes the
initialization of the ts_cpu field for the ULE scheduler to only
happen once when the initial thread is constructed during system
init. Forking will then later on ensure that a valid ts_cpu value gets
copied to all children.
Reviewed by: jhb, kib
Discussed with: nwhitehorn
MFC after: 1 month
Differential revision: https://reviews.freebsd.org/D13298
Sponsored by: Mellanox Technologies
Modified:
head/sys/kern/sched_ule.c
Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c Wed Nov 29 21:16:14 2017 (r326375)
+++ head/sys/kern/sched_ule.c Wed Nov 29 23:28:40 2017 (r326376)
@@ -1405,7 +1405,6 @@ sched_setup(void *dummy)
/* Add thread0's load since it's running. */
TDQ_LOCK(tdq);
- td_get_sched(&thread0)->ts_cpu = curcpu; /* Something valid to start */
thread0.td_lock = TDQ_LOCKPTR(TDQ_SELF());
tdq_load_add(tdq, &thread0);
tdq->tdq_lowpri = thread0.td_priority;
@@ -1642,6 +1641,7 @@ schedinit(void)
ts0->ts_ltick = ticks;
ts0->ts_ftick = ticks;
ts0->ts_slice = 0;
+ ts0->ts_cpu = curcpu; /* set valid CPU number */
}
/*
@@ -2453,7 +2453,6 @@ sched_add(struct thread *td, int flags)
* Pick the destination cpu and if it isn't ours transfer to the
* target cpu.
*/
- td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
cpu = sched_pickcpu(td, flags);
tdq = sched_setcpu(td, cpu, flags);
tdq_add(tdq, td, flags);
From owner-svn-src-all@freebsd.org Wed Nov 29 23:41:52 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29F1BDECF95;
Wed, 29 Nov 2017 23:41:52 +0000 (UTC)
(envelope-from scottl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 009A969813;
Wed, 29 Nov 2017 23:41:51 +0000 (UTC)
(envelope-from scottl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATNfoAs054615;
Wed, 29 Nov 2017 23:41:50 GMT (envelope-from scottl@FreeBSD.org)
Received: (from scottl@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATNfoSS054606;
Wed, 29 Nov 2017 23:41:50 GMT (envelope-from scottl@FreeBSD.org)
Message-Id: <201711292341.vATNfoSS054606@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: scottl set sender to
scottl@FreeBSD.org using -f
From: Scott Long <scottl@FreeBSD.org>
Date: Wed, 29 Nov 2017 23:41:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326377 - in head/sys: amd64/conf arm/conf i386/conf
mips/conf modules/aic7xxx/ahc modules/aic7xxx/ahd powerpc/conf sparc64/conf
X-SVN-Group: head
X-SVN-Commit-Author: scottl
X-SVN-Commit-Paths: in head/sys: amd64/conf arm/conf i386/conf mips/conf
modules/aic7xxx/ahc modules/aic7xxx/ahd powerpc/conf sparc64/conf
X-SVN-Commit-Revision: 326377
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 23:41:52 -0000
Author: scottl
Date: Wed Nov 29 23:41:49 2017
New Revision: 326377
URL: https://svnweb.freebsd.org/changeset/base/326377
Log:
It's time to retire AHC_REG_PRETTY_PRINT and AHD_REG_PRETTY_PRINT from
the standard kernels. They are still available as custom compile
options.
Modified:
head/sys/amd64/conf/GENERIC
head/sys/arm/conf/CRB
head/sys/i386/conf/GENERIC
head/sys/mips/conf/OCTEON1
head/sys/modules/aic7xxx/ahc/Makefile
head/sys/modules/aic7xxx/ahd/Makefile
head/sys/powerpc/conf/GENERIC
head/sys/powerpc/conf/GENERIC64
head/sys/sparc64/conf/GENERIC
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/amd64/conf/GENERIC Wed Nov 29 23:41:49 2017 (r326377)
@@ -123,11 +123,7 @@ device siis # SiliconImage SiI3124/SiI3132/SiI3531
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
-options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~128k to driver.
device ahd # AHA39320/29320 and onboard AIC79xx devices
-options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~215k to driver.
device esp # AMD Am53C974 (Tekram DC-390(T))
device hptiop # Highpoint RocketRaid 3xxx series
device isp # Qlogic family
Modified: head/sys/arm/conf/CRB
==============================================================================
--- head/sys/arm/conf/CRB Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/arm/conf/CRB Wed Nov 29 23:41:49 2017 (r326377)
@@ -84,11 +84,6 @@ device "7seg"
# SCSI Controllers
-#options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~128k to driver.
-#options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~215k to driver.
-
options XSCALE_CACHE_READ_WRITE_ALLOCATE
device md
device random # Entropy device
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/i386/conf/GENERIC Wed Nov 29 23:41:49 2017 (r326377)
@@ -120,11 +120,6 @@ device siis # SiliconImage SiI3124/SiI3132/SiI3531
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
-options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~128k to driver.
-device ahd # AHA39320/29320 and onboard AIC79xx devices
-options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~215k to driver.
device esp # AMD Am53C974 (Tekram DC-390(T))
device hptiop # Highpoint RocketRaid 3xxx series
device isp # Qlogic family
Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1 Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/mips/conf/OCTEON1 Wed Nov 29 23:41:49 2017 (r326377)
@@ -118,11 +118,7 @@ options ROOTDEVNAME=\"ufs:cf0s2a\" # Default root fil
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
-options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~128k to driver.
device ahd # AHA39320/29320 and onboard AIC79xx devices
-options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~215k to driver.
device esp # AMD Am53C974 (Tekram DC-390(T))
device hptiop # Highpoint RocketRaid 3xxx series
device isp # Qlogic family
Modified: head/sys/modules/aic7xxx/ahc/Makefile
==============================================================================
--- head/sys/modules/aic7xxx/ahc/Makefile Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/modules/aic7xxx/ahc/Makefile Wed Nov 29 23:41:49 2017 (r326377)
@@ -9,7 +9,7 @@ KMOD= ahc
SUBDIR+= ahc_isa ahc_pci
GENSRCS= aic7xxx_seq.h aic7xxx_reg.h
-AHC_REG_PRETTY_PRINT=1
+# AHC_REG_PRETTY_PRINT=1
REG_PRINT_OPT=
.ifdef AHC_REG_PRETTY_PRINT
GENSRCS+= aic7xxx_reg_print.c
Modified: head/sys/modules/aic7xxx/ahd/Makefile
==============================================================================
--- head/sys/modules/aic7xxx/ahd/Makefile Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/modules/aic7xxx/ahd/Makefile Wed Nov 29 23:41:49 2017 (r326377)
@@ -6,7 +6,7 @@ KMOD= ahd
GENSRCS= aic79xx_seq.h aic79xx_reg.h
REG_PRINT_OPT=
-AHD_REG_PRETTY_PRINT=1
+# AHD_REG_PRETTY_PRINT=1
.ifdef AHD_REG_PRETTY_PRINT
GENSRCS += aic79xx_reg_print.c
CFLAGS+= -DAHD_REG_PRETTY_PRINT=1
Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/powerpc/conf/GENERIC Wed Nov 29 23:41:49 2017 (r326377)
@@ -118,8 +118,6 @@ device siis # SiliconImage SiI3124/SiI3132/SiI3531 S
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
options AHC_ALLOW_MEMIO # Attempt to use memory mapped I/O
-options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~128k to driver.
device isp # Qlogic family
device ispfw # Firmware module for Qlogic host adapters
device mpt # LSI-Logic MPT-Fusion
Modified: head/sys/powerpc/conf/GENERIC64
==============================================================================
--- head/sys/powerpc/conf/GENERIC64 Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/powerpc/conf/GENERIC64 Wed Nov 29 23:41:49 2017 (r326377)
@@ -114,8 +114,6 @@ device siis # SiliconImage SiI3124/SiI3132/SiI3531 S
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
options AHC_ALLOW_MEMIO # Attempt to use memory mapped I/O
-options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~128k to driver.
device isp # Qlogic family
device ispfw # Firmware module for Qlogic host adapters
device mpt # LSI-Logic MPT-Fusion
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Wed Nov 29 23:28:40 2017 (r326376)
+++ head/sys/sparc64/conf/GENERIC Wed Nov 29 23:41:49 2017 (r326377)
@@ -112,8 +112,6 @@ device siis # SiliconImage SiI3124/SiI3132/SiI3531 S
# SCSI Controllers
device ahc # AHA2940 and onboard AIC7xxx devices
options AHC_ALLOW_MEMIO # Attempt to use memory mapped I/O
-options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
- # output. Adds ~128k to driver.
device esp # AMD Am53C974, Sun ESP and FAS families
device isp # Qlogic family
device ispfw # Firmware module for Qlogic host adapters
From owner-svn-src-all@freebsd.org Wed Nov 29 23:52:33 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18834DED3AE;
Wed, 29 Nov 2017 23:52:33 +0000 (UTC)
(envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D0F3E69E63;
Wed, 29 Nov 2017 23:52:32 +0000 (UTC)
(envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vATNqVCh058852;
Wed, 29 Nov 2017 23:52:31 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vATNqVKc058851;
Wed, 29 Nov 2017 23:52:31 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201711292352.vATNqVKc058851@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 29 Nov 2017 23:52:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326378 - head/sys/x86/cpufreq
X-SVN-Group: head
X-SVN-Commit-Author: jkim
X-SVN-Commit-Paths: head/sys/x86/cpufreq
X-SVN-Commit-Revision: 326378
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Nov 2017 23:52:33 -0000
Author: jkim
Date: Wed Nov 29 23:52:31 2017
New Revision: 326378
URL: https://svnweb.freebsd.org/changeset/base/326378
Log:
Fix style(9).
Modified:
head/sys/x86/cpufreq/hwpstate.c
Modified: head/sys/x86/cpufreq/hwpstate.c
==============================================================================
--- head/sys/x86/cpufreq/hwpstate.c Wed Nov 29 23:41:49 2017 (r326377)
+++ head/sys/x86/cpufreq/hwpstate.c Wed Nov 29 23:52:31 2017 (r326378)
@@ -90,10 +90,10 @@ __FBSDID("$FreeBSD$");
#define AMD_17H_CUR_FID(msr) ((msr) & 0xFF)
#define HWPSTATE_DEBUG(dev, msg...) \
- do{ \
- if(hwpstate_verbose) \
+ do { \
+ if (hwpstate_verbose) \
device_printf(dev, msg); \
- }while(0)
+ } while (0)
struct hwpstate_setting {
int freq; /* CPU clock in Mhz or 100ths of a percent. */
@@ -125,7 +125,7 @@ static int hwpstate_goto_pstate(device_t dev, int psta
static int hwpstate_verbose = 0;
SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RWTUN,
- &hwpstate_verbose, 0, "Debug hwpstate");
+ &hwpstate_verbose, 0, "Debug hwpstate");
static device_method_t hwpstate_methods[] = {
/* Device interface */
@@ -169,7 +169,7 @@ hwpstate_goto_pstate(device_t dev, int pstate)
int limit;
int id = pstate;
int error;
-
+
/* get the current pstate limit */
msr = rdmsr(MSR_AMD_10H_11H_LIMIT);
limit = AMD_10H_11H_GET_PSTATE_LIMIT(msr);
@@ -197,7 +197,7 @@ hwpstate_goto_pstate(device_t dev, int pstate)
sched_bind(curthread, i);
thread_unlock(curthread);
/* wait loop (100*100 usec is enough ?) */
- for (j = 0; j < 100; j++){
+ for (j = 0; j < 100; j++) {
/* get the result. not assure msr=id */
msr = rdmsr(MSR_AMD_10H_11H_STATUS);
if (msr == id)
@@ -250,7 +250,7 @@ hwpstate_get(device_t dev, struct cf_setting *cf)
if (cf == NULL)
return (EINVAL);
msr = rdmsr(MSR_AMD_10H_11H_STATUS);
- if(msr >= sc->cfnum)
+ if (msr >= sc->cfnum)
return (EINVAL);
set = sc->hwpstate_settings[msr];
@@ -425,7 +425,7 @@ hwpstate_get_info_from_msr(device_t dev)
fid = AMD_10H_11H_CUR_FID(msr);
/* Convert fid/did to frequency. */
- switch(family) {
+ switch (family) {
case 0x11:
hwpstate_set[i].freq = (100 * (fid + 0x08)) >> did;
break;
From owner-svn-src-all@freebsd.org Thu Nov 30 00:24:29 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50399DEE18C;
Thu, 30 Nov 2017 00:24:29 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1C0696AC7A;
Thu, 30 Nov 2017 00:24:29 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU0OSca071378;
Thu, 30 Nov 2017 00:24:28 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU0OSZ2071377;
Thu, 30 Nov 2017 00:24:28 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711300024.vAU0OSZ2071377@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 30 Nov 2017 00:24:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326379 - stable/11/contrib/binutils/bfd
X-SVN-Group: stable-11
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/11/contrib/binutils/bfd
X-SVN-Commit-Revision: 326379
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 00:24:29 -0000
Author: emaste
Date: Thu Nov 30 00:24:28 2017
New Revision: 326379
URL: https://svnweb.freebsd.org/changeset/base/326379
Log:
MFC r326136: bfd: avoid crash on corrupt binaries
From binutils commits 5a4b0ccc20ba30caef53b01bee2c0aaa5b855339 and
7e1e19887abd24aeb15066b141cdff5541e0ec8e, made available under GPLv2
by Nick Clifton.
PR: 198824
Security: CVE-2014-8501
Security: CVE-2014-8502
Modified:
stable/11/contrib/binutils/bfd/peXXigen.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/binutils/bfd/peXXigen.c
==============================================================================
--- stable/11/contrib/binutils/bfd/peXXigen.c Wed Nov 29 23:52:31 2017 (r326378)
+++ stable/11/contrib/binutils/bfd/peXXigen.c Thu Nov 30 00:24:28 2017 (r326379)
@@ -448,6 +448,17 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
{
int idx;
+ /* PR 17512: Corrupt PE binaries can cause seg-faults. */
+ if (a->NumberOfRvaAndSizes > 16)
+ {
+ (*_bfd_error_handler)
+ (_("%B: aout header specifies an invalid number of data-directory entries: %d"),
+ abfd, a->NumberOfRvaAndSizes);
+ /* Paranoia: If the number is corrupt, then assume that the
+ actual entries themselves might be corrupt as well. */
+ a->NumberOfRvaAndSizes = 0;
+ }
+
for (idx = 0; idx < 16; idx++)
{
/* If data directory is empty, rva also should be 0. */
@@ -1426,6 +1437,15 @@ pe_print_edata (bfd * abfd, void * vfile)
section->name);
return TRUE;
}
+ }
+
+ /* PR 17512: Handle corrupt PE binaries. */
+ if (datasize < 36)
+ {
+ fprintf (file,
+ _("\nThere is an export table in %s, but it is too small (%d)\n"),
+ section->name, (int) datasize);
+ return TRUE;
}
fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"),
From owner-svn-src-all@freebsd.org Thu Nov 30 00:25:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 455B0DEE291;
Thu, 30 Nov 2017 00:25:27 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 11B026ADC2;
Thu, 30 Nov 2017 00:25:26 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU0PQ1W071485;
Thu, 30 Nov 2017 00:25:26 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU0PQU6071484;
Thu, 30 Nov 2017 00:25:26 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711300025.vAU0PQU6071484@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 30 Nov 2017 00:25:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326380 - stable/10/contrib/binutils/bfd
X-SVN-Group: stable-10
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/10/contrib/binutils/bfd
X-SVN-Commit-Revision: 326380
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 00:25:27 -0000
Author: emaste
Date: Thu Nov 30 00:25:25 2017
New Revision: 326380
URL: https://svnweb.freebsd.org/changeset/base/326380
Log:
MFC r326136: bfd: avoid crash on corrupt binaries
From binutils commits 5a4b0ccc20ba30caef53b01bee2c0aaa5b855339 and
7e1e19887abd24aeb15066b141cdff5541e0ec8e, made available under GPLv2
by Nick Clifton.
PR: 198824
Security: CVE-2014-8501
Security: CVE-2014-8502
Modified:
stable/10/contrib/binutils/bfd/peXXigen.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/binutils/bfd/peXXigen.c
==============================================================================
--- stable/10/contrib/binutils/bfd/peXXigen.c Thu Nov 30 00:24:28 2017 (r326379)
+++ stable/10/contrib/binutils/bfd/peXXigen.c Thu Nov 30 00:25:25 2017 (r326380)
@@ -448,6 +448,17 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
{
int idx;
+ /* PR 17512: Corrupt PE binaries can cause seg-faults. */
+ if (a->NumberOfRvaAndSizes > 16)
+ {
+ (*_bfd_error_handler)
+ (_("%B: aout header specifies an invalid number of data-directory entries: %d"),
+ abfd, a->NumberOfRvaAndSizes);
+ /* Paranoia: If the number is corrupt, then assume that the
+ actual entries themselves might be corrupt as well. */
+ a->NumberOfRvaAndSizes = 0;
+ }
+
for (idx = 0; idx < 16; idx++)
{
/* If data directory is empty, rva also should be 0. */
@@ -1426,6 +1437,15 @@ pe_print_edata (bfd * abfd, void * vfile)
section->name);
return TRUE;
}
+ }
+
+ /* PR 17512: Handle corrupt PE binaries. */
+ if (datasize < 36)
+ {
+ fprintf (file,
+ _("\nThere is an export table in %s, but it is too small (%d)\n"),
+ section->name, (int) datasize);
+ return TRUE;
}
fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"),
From owner-svn-src-all@freebsd.org Thu Nov 30 00:26:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBB25DEE36E;
Thu, 30 Nov 2017 00:26:46 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B7BEE6AF2A;
Thu, 30 Nov 2017 00:26:46 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU0QjgX071598;
Thu, 30 Nov 2017 00:26:45 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU0QjEW071597;
Thu, 30 Nov 2017 00:26:45 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711300026.vAU0QjEW071597@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 30 Nov 2017 00:26:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326381 - stable/11/contrib/binutils/bfd
X-SVN-Group: stable-11
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/11/contrib/binutils/bfd
X-SVN-Commit-Revision: 326381
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 00:26:47 -0000
Author: emaste
Date: Thu Nov 30 00:26:45 2017
New Revision: 326381
URL: https://svnweb.freebsd.org/changeset/base/326381
Log:
MFC r326135: bfd: fix segfault in the ihex parser on malformed ihex file
From binutils commit 0102ea8cec5fc509bba6c91df61b7ce23a799d32, made
available under GPLv2 by Nick Clifton.
PR: 198824
Security: CVE-2014-8503
Modified:
stable/11/contrib/binutils/bfd/ihex.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/binutils/bfd/ihex.c
==============================================================================
--- stable/11/contrib/binutils/bfd/ihex.c Thu Nov 30 00:25:25 2017 (r326380)
+++ stable/11/contrib/binutils/bfd/ihex.c Thu Nov 30 00:26:45 2017 (r326381)
@@ -320,7 +320,7 @@ ihex_scan (bfd *abfd)
{
if (! ISHEX (buf[i]))
{
- ihex_bad_byte (abfd, lineno, hdr[i], error);
+ ihex_bad_byte (abfd, lineno, buf[i], error);
goto error_return;
}
}
From owner-svn-src-all@freebsd.org Thu Nov 30 00:27:50 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6943CDEE3E5;
Thu, 30 Nov 2017 00:27:50 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 357E66B07C;
Thu, 30 Nov 2017 00:27:50 +0000 (UTC)
(envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU0RnTX071702;
Thu, 30 Nov 2017 00:27:49 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU0RnnA071701;
Thu, 30 Nov 2017 00:27:49 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201711300027.vAU0RnnA071701@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 30 Nov 2017 00:27:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r326382 - stable/10/contrib/binutils/bfd
X-SVN-Group: stable-10
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/10/contrib/binutils/bfd
X-SVN-Commit-Revision: 326382
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 00:27:50 -0000
Author: emaste
Date: Thu Nov 30 00:27:49 2017
New Revision: 326382
URL: https://svnweb.freebsd.org/changeset/base/326382
Log:
MFC r326135: bfd: fix segfault in the ihex parser on malformed ihex file
From binutils commit 0102ea8cec5fc509bba6c91df61b7ce23a799d32, made
available under GPLv2 by Nick Clifton.
PR: 198824
Security: CVE-2014-8503
Modified:
stable/10/contrib/binutils/bfd/ihex.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/binutils/bfd/ihex.c
==============================================================================
--- stable/10/contrib/binutils/bfd/ihex.c Thu Nov 30 00:26:45 2017 (r326381)
+++ stable/10/contrib/binutils/bfd/ihex.c Thu Nov 30 00:27:49 2017 (r326382)
@@ -320,7 +320,7 @@ ihex_scan (bfd *abfd)
{
if (! ISHEX (buf[i]))
{
- ihex_bad_byte (abfd, lineno, hdr[i], error);
+ ihex_bad_byte (abfd, lineno, buf[i], error);
goto error_return;
}
}
From owner-svn-src-all@freebsd.org Thu Nov 30 00:47:45 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D10A5DEF0EF;
Thu, 30 Nov 2017 00:47:45 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au
[211.29.132.59])
by mx1.freebsd.org (Postfix) with ESMTP id 20F8D6C0D6;
Thu, 30 Nov 2017 00:47:45 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 036D91A63D9;
Thu, 30 Nov 2017 11:46:20 +1100 (AEDT)
Date: Thu, 30 Nov 2017 11:46:20 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Alex Richardson <arichardson@freebsd.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326375 - head/share/mk
In-Reply-To: <201711292116.vATLGEB2091742@repo.freebsd.org>
Message-ID: <20171130110747.B1188@besplex.bde.org>
References: <201711292116.vATLGEB2091742@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=KeqiiUQD c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=6I5d2MoRAAAA:8 a=HgAegpf116_E81IoGS0A:9
a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 00:47:45 -0000
On Wed, 29 Nov 2017, Alex Richardson wrote:
> Log:
> Don't fail the build due to clang integer constant range warnings
>
> This warning checks whether a constant is out of range of the integer
> type. An example is `comparison of 'u_int' > 4294967295 is always false`
> and in this case the warning makes sense.
> However, when the type is a typedef that can be either 64 or 32 bits the
> if condition is only tautological in some configurations so this should
> not be a warning that fails the build.
Even when the type is not a typedef, its limits are MD (except POSIX
specifies precise limits for unsigned char and signed char).
> Reviewed by: dim
> Approved by: jhb (mentor)
> Differential Revision: https://reviews.freebsd.org/D12912
>
> Modified:
> head/share/mk/bsd.sys.mk
>
> Modified: head/share/mk/bsd.sys.mk
> ==============================================================================
> --- head/share/mk/bsd.sys.mk Wed Nov 29 20:44:40 2017 (r326374)
> +++ head/share/mk/bsd.sys.mk Wed Nov 29 21:16:14 2017 (r326375)
> @@ -81,6 +81,9 @@ CWARNFLAGS.clang+= -Wno-unused-local-typedef
> .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 40000
> CWARNFLAGS.clang+= -Wno-address-of-packed-member
> .endif
> +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 60000
> +CWARNFLAGS.clang+= -Wno-error=tautological-constant-compare
> +.endif
> .endif # WARNS <= 3
> .if ${WARNS} <= 2
> CWARNFLAGS.clang+= -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter
But this breaks the warning in all cases.
There are related problems for signedness, especially for typedefed
types and plain char. Robust code must not assume any particular
signedness unless the type is documented as unsigned integral, so it
checks for < 0. Then if compilers warn about tautological comparisons
with 0, the warnings are usually "fixed" by removing the checks. Then
if the type or typedef is changed to signed, the code breaks. It is
better to break the warning as above.
Bruce
From owner-svn-src-all@freebsd.org Thu Nov 30 01:22:19 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9BDCBDEFCFF;
Thu, 30 Nov 2017 01:22:19 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail108.syd.optusnet.com.au (mail108.syd.optusnet.com.au
[211.29.132.59])
by mx1.freebsd.org (Postfix) with ESMTP id 628126D23B;
Thu, 30 Nov 2017 01:22:18 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au
[110.21.101.228])
by mail108.syd.optusnet.com.au (Postfix) with ESMTPS id 313B71A6DAE;
Thu, 30 Nov 2017 12:19:19 +1100 (AEDT)
Date: Thu, 30 Nov 2017 12:19:18 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Scott Long <scottl@freebsd.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326377 - in head/sys: amd64/conf arm/conf i386/conf
mips/conf modules/aic7xxx/ahc modules/aic7xxx/ahd powerpc/conf
sparc64/conf
In-Reply-To: <201711292341.vATNfoSS054606@repo.freebsd.org>
Message-ID: <20171130115317.X1349@besplex.bde.org>
References: <201711292341.vATNfoSS054606@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.2 cv=cK6QihWN c=1 sm=1 tr=0
a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17
a=kj9zAlcOel0A:10 a=6Qs8Of_ElRUx6x6vf64A:9 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 01:22:19 -0000
On Wed, 29 Nov 2017, Scott Long wrote:
> Log:
> It's time to retire AHC_REG_PRETTY_PRINT and AHD_REG_PRETTY_PRINT from
> the standard kernels. They are still available as custom compile
> options.
MI NOTES still gives MI sizes for these options. It seems unlikely
that these sizes are still correct even for 1 arch where they were measured
on.
> Modified: head/sys/amd64/conf/GENERIC
> ==============================================================================
> --- head/sys/amd64/conf/GENERIC Wed Nov 29 23:28:40 2017 (r326376)
> +++ head/sys/amd64/conf/GENERIC Wed Nov 29 23:41:49 2017 (r326377)
> @@ -123,11 +123,7 @@ device siis # SiliconImage SiI3124/SiI3132/SiI3531
>
> # SCSI Controllers
> device ahc # AHA2940 and onboard AIC7xxx devices
> -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
> - # output. Adds ~128k to driver.
> device ahd # AHA39320/29320 and onboard AIC79xx devices
> -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
> - # output. Adds ~215k to driver.
k is a bogus unit for memory sizes. NOTES has the same bug.
> Modified: head/sys/i386/conf/GENERIC
> ==============================================================================
> --- head/sys/i386/conf/GENERIC Wed Nov 29 23:28:40 2017 (r326376)
> +++ head/sys/i386/conf/GENERIC Wed Nov 29 23:41:49 2017 (r326377)
> @@ -120,11 +120,6 @@ device siis # SiliconImage SiI3124/SiI3132/SiI3531
>
> # SCSI Controllers
> device ahc # AHA2940 and onboard AIC7xxx devices
> -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
> - # output. Adds ~128k to driver.
> -device ahd # AHA39320/29320 and onboard AIC79xx devices
> -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
> - # output. Adds ~215k to driver.
> device esp # AMD Am53C974 (Tekram DC-390(T))
> device hptiop # Highpoint RocketRaid 3xxx series
> device isp # Qlogic family
>
This also removes ahd. This bug is only new on i386/GENERIC. Other arches
except amd64 never had ahd. arm/conf/CRB was most broken -- it had 2 PRETTY
options but neither ahc or ahd. Perhaps these old drivers don't belong in
any GENERIC.
Bruce
From owner-svn-src-all@freebsd.org Thu Nov 30 01:40:08 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45A0FDF05ED;
Thu, 30 Nov 2017 01:40:08 +0000 (UTC)
(envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1FAF46DD43;
Thu, 30 Nov 2017 01:40:08 +0000 (UTC)
(envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU1e7ec001293;
Thu, 30 Nov 2017 01:40:07 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU1e7dC001292;
Thu, 30 Nov 2017 01:40:07 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201711300140.vAU1e7dC001292@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 30 Nov 2017 01:40:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326383 - head/sys/x86/cpufreq
X-SVN-Group: head
X-SVN-Commit-Author: jkim
X-SVN-Commit-Paths: head/sys/x86/cpufreq
X-SVN-Commit-Revision: 326383
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 01:40:08 -0000
Author: jkim
Date: Thu Nov 30 01:40:07 2017
New Revision: 326383
URL: https://svnweb.freebsd.org/changeset/base/326383
Log:
Add a tunable "debug.hwpstate_verify" to check P-state after changing it and
turn it off by default. It is very inefficient to verify current P-state of
each core, especially for CPUs with many cores. When multiple commands are
requested to the same power domain before completion of pending transitions,
the last command is executed according to the manual. Because requests are
serialized by the caller, all cores will receive the same command for each
call. Do not call sched_bind() and sched_unbind(). It is redundant because
the caller does it anyway.
Modified:
head/sys/x86/cpufreq/hwpstate.c
Modified: head/sys/x86/cpufreq/hwpstate.c
==============================================================================
--- head/sys/x86/cpufreq/hwpstate.c Thu Nov 30 00:27:49 2017 (r326382)
+++ head/sys/x86/cpufreq/hwpstate.c Thu Nov 30 01:40:07 2017 (r326383)
@@ -123,10 +123,14 @@ static int hwpstate_get_info_from_acpi_perf(device_t d
static int hwpstate_get_info_from_msr(device_t dev);
static int hwpstate_goto_pstate(device_t dev, int pstate_id);
-static int hwpstate_verbose = 0;
+static int hwpstate_verbose;
SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RWTUN,
&hwpstate_verbose, 0, "Debug hwpstate");
+static int hwpstate_verify;
+SYSCTL_INT(_debug, OID_AUTO, hwpstate_verify, CTLFLAG_RWTUN,
+ &hwpstate_verify, 0, "Verify P-state after setting");
+
static device_method_t hwpstate_methods[] = {
/* Device interface */
DEVMETHOD(device_identify, hwpstate_identify),
@@ -160,15 +164,13 @@ DRIVER_MODULE(hwpstate, cpu, hwpstate_driver, hwpstate
* Go to Px-state on all cpus considering the limit.
*/
static int
-hwpstate_goto_pstate(device_t dev, int pstate)
+hwpstate_goto_pstate(device_t dev, int id)
{
sbintime_t sbt;
int i;
uint64_t msr;
int j;
int limit;
- int id = pstate;
- int error;
/* get the current pstate limit */
msr = rdmsr(MSR_AMD_10H_11H_LIMIT);
@@ -176,47 +178,57 @@ hwpstate_goto_pstate(device_t dev, int pstate)
if (limit > id)
id = limit;
+ HWPSTATE_DEBUG(dev, "setting P%d-state on cpu%d\n", id,
+ PCPU_GET(cpuid));
+ /* Go To Px-state */
+ wrmsr(MSR_AMD_10H_11H_CONTROL, id);
+
/*
* We are going to the same Px-state on all cpus.
* Probably should take _PSD into account.
*/
- error = 0;
CPU_FOREACH(i) {
+ if (i == PCPU_GET(cpuid))
+ continue;
+
/* Bind to each cpu. */
thread_lock(curthread);
sched_bind(curthread, i);
thread_unlock(curthread);
- HWPSTATE_DEBUG(dev, "setting P%d-state on cpu%d\n",
- id, PCPU_GET(cpuid));
+ HWPSTATE_DEBUG(dev, "setting P%d-state on cpu%d\n", id, i);
/* Go To Px-state */
wrmsr(MSR_AMD_10H_11H_CONTROL, id);
}
- CPU_FOREACH(i) {
- /* Bind to each cpu. */
- thread_lock(curthread);
- sched_bind(curthread, i);
- thread_unlock(curthread);
- /* wait loop (100*100 usec is enough ?) */
- for (j = 0; j < 100; j++) {
- /* get the result. not assure msr=id */
- msr = rdmsr(MSR_AMD_10H_11H_STATUS);
- if (msr == id)
- break;
- sbt = SBT_1MS / 10;
- tsleep_sbt(dev, PZERO, "pstate_goto", sbt,
- sbt >> tc_precexp, 0);
+
+ /*
+ * Verify whether each core is in the requested P-state.
+ */
+ if (hwpstate_verify) {
+ CPU_FOREACH(i) {
+ thread_lock(curthread);
+ sched_bind(curthread, i);
+ thread_unlock(curthread);
+ /* wait loop (100*100 usec is enough ?) */
+ for (j = 0; j < 100; j++) {
+ /* get the result. not assure msr=id */
+ msr = rdmsr(MSR_AMD_10H_11H_STATUS);
+ if (msr == id)
+ break;
+ sbt = SBT_1MS / 10;
+ tsleep_sbt(dev, PZERO, "pstate_goto", sbt,
+ sbt >> tc_precexp, 0);
+ }
+ HWPSTATE_DEBUG(dev, "result: P%d-state on cpu%d\n",
+ (int)msr, i);
+ if (msr != id) {
+ HWPSTATE_DEBUG(dev,
+ "error: loop is not enough.\n");
+ return (ENXIO);
+ }
}
- HWPSTATE_DEBUG(dev, "result: P%d-state on cpu%d\n",
- (int)msr, PCPU_GET(cpuid));
- if (msr != id) {
- HWPSTATE_DEBUG(dev, "error: loop is not enough.\n");
- error = ENXIO;
- }
}
- thread_lock(curthread);
- sched_unbind(curthread);
- thread_unlock(curthread);
- return (error);
+
+ return (0);
}
static int
From owner-svn-src-all@freebsd.org Thu Nov 30 03:02:47 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1403DDF3E43;
Thu, 30 Nov 2017 03:02:47 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id B840C71002;
Thu, 30 Nov 2017 03:02:46 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP
id KF7Ver3DVRDG7KF7WeZf1L; Wed, 29 Nov 2017 20:02:40 -0700
X-Authority-Analysis: v=2.2 cv=b+PC2pOx c=1 sm=1 tr=0
a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17
a=kj9zAlcOel0A:10 a=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8
a=GeZk732AS-P6FUiDfOsA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22
a=Ia-lj3WSrqcvXOmTRaiG:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTPS id B1432413;
Wed, 29 Nov 2017 19:02:36 -0800 (PST)
Received: from slippy.cwsent.com (localhost [127.0.0.1])
by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id vAU32aGw002438;
Wed, 29 Nov 2017 19:02:36 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Received: from slippy (cy@localhost)
by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id vAU1tJfe070900;
Wed, 29 Nov 2017 17:56:55 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Message-Id: <201711300156.vAU1tJfe070900@slippy.cwsent.com>
X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs
X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7
Reply-to: Cy Schubert <Cy.Schubert@komquats.com>
From: Cy Schubert <Cy.Schubert@komquats.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Hans Petter Selasky <hselasky@FreeBSD.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326376 - head/sys/kern
In-Reply-To: Message from Hans Petter Selasky <hselasky@FreeBSD.org> of "Wed,
29 Nov 2017 23:28:40 +0000." <201711292328.vATNSeOM046518@repo.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 29 Nov 2017 17:55:19 -0800
X-CMAE-Envelope: MS4wfOOsIBcqqwXMVhMly9c7pdXzu7GOl8YR37egqm9S5luI/Qj/ohkx3PYlJJtAGuPQlFXk/33v6d6r12dCPpjKERBOWXGtgbs5mFTf1gC3t9i0LFwtGPUe
PRk5QuZ80/yYQOB9o6z/WZpIMiGsuNUuJhfPkGpYYVc1hRswLhVBSdDTO78g+A6fF2u9bjhsg9Q8+esfowD2exvxqVAMxHWEtTHt3WX2gaX2lyjwfayPbrKZ
EEZUKl35Nw1ST/Ha1oSNPJa4UpRgBo5kMyRWPJZwsvmKkPEUxhIlWCgW2PR3RsNR
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 03:02:47 -0000
In message <201711292328.vATNSeOM046518@repo.freebsd.org>, Hans Petter
Selasky
writes:
> Author: hselasky
> Date: Wed Nov 29 23:28:40 2017
> New Revision: 326376
> URL: https://svnweb.freebsd.org/changeset/base/326376
>
> Log:
> The sched_add() function is not only used when the thread is initially
> started, but also by the turnstiles to mark a thread as runnable for
> all locks, for instance sleepqueues do:
> setrunnable()->sched_wakeup()->sched_add()
>
> In r326218 code was added to allow booting from non-zero CPU numbers
> by setting the ts_cpu field inside the ULE scheduler's sched_add()
> function. This had an undesired side-effect that prior sched_pin() and
> sched_bind() calls got disregarded. This patch fixes the
> initialization of the ts_cpu field for the ULE scheduler to only
> happen once when the initial thread is constructed during system
> init. Forking will then later on ensure that a valid ts_cpu value gets
> copied to all children.
>
> Reviewed by: jhb, kib
> Discussed with: nwhitehorn
> MFC after: 1 month
> Differential revision: https://reviews.freebsd.org/D13298
> Sponsored by: Mellanox Technologies
>
> Modified:
> head/sys/kern/sched_ule.c
>
> Modified: head/sys/kern/sched_ule.c
> =============================================================================
> =
> --- head/sys/kern/sched_ule.c Wed Nov 29 21:16:14 2017 (r326375)
> +++ head/sys/kern/sched_ule.c Wed Nov 29 23:28:40 2017 (r326376)
> @@ -1405,7 +1405,6 @@ sched_setup(void *dummy)
>
> /* Add thread0's load since it's running. */
> TDQ_LOCK(tdq);
> - td_get_sched(&thread0)->ts_cpu = curcpu; /* Something valid to start */
> thread0.td_lock = TDQ_LOCKPTR(TDQ_SELF());
> tdq_load_add(tdq, &thread0);
> tdq->tdq_lowpri = thread0.td_priority;
> @@ -1642,6 +1641,7 @@ schedinit(void)
> ts0->ts_ltick = ticks;
> ts0->ts_ftick = ticks;
> ts0->ts_slice = 0;
> + ts0->ts_cpu = curcpu; /* set valid CPU number */
> }
>
> /*
> @@ -2453,7 +2453,6 @@ sched_add(struct thread *td, int flags)
> * Pick the destination cpu and if it isn't ours transfer to the
> * target cpu.
> */
> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
> cpu = sched_pickcpu(td, flags);
> tdq = sched_setcpu(td, cpu, flags);
> tdq_add(tdq, td, flags);
>
Thank you.
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
From owner-svn-src-all@freebsd.org Thu Nov 30 04:06:47 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6E12DF572C;
Thu, 30 Nov 2017 04:06:47 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 6E1D5729F5;
Thu, 30 Nov 2017 04:06:47 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP
id KG7XezdG9GvLHKG7YeRVR1; Wed, 29 Nov 2017 21:06:45 -0700
X-Authority-Analysis: v=2.2 cv=a9pAzQaF c=1 sm=1 tr=0
a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17
a=kj9zAlcOel0A:10 a=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8
a=78CjFdp1RPxrEkepkUMA:9 a=VPwzsgBRkA50Rqjy:21 a=hH7XQIo0ZUhc2Vji:21
a=NRzsi8a8g4lbl3px:21 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22
a=Ia-lj3WSrqcvXOmTRaiG:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTPS id CCB76582;
Wed, 29 Nov 2017 20:06:42 -0800 (PST)
Received: from slippy.cwsent.com (localhost [127.0.0.1])
by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id vAU46g8Q012714;
Wed, 29 Nov 2017 20:06:42 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Received: from slippy (cy@localhost)
by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id vAU46gCX012711;
Wed, 29 Nov 2017 20:06:42 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Message-Id: <201711300406.vAU46gCX012711@slippy.cwsent.com>
X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs
X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7
Reply-to: Cy Schubert <Cy.Schubert@komquats.com>
From: Cy Schubert <Cy.Schubert@komquats.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Hans Petter Selasky <hselasky@FreeBSD.org>
cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: Re: svn commit: r326376 - head/sys/kern
In-Reply-To: Message from Hans Petter Selasky <hselasky@FreeBSD.org> of "Wed,
29 Nov 2017 23:28:40 +0000." <201711292328.vATNSeOM046518@repo.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 29 Nov 2017 20:06:42 -0800
X-CMAE-Envelope: MS4wfBo7+ckhybYttgz9j68s7+TF3NcPR/3VAI+Z8O/49Cbxw/LwcmM7Xjs1rFim6THkFuFjv4izzyyUjABhy0u6180g93YHyzad6Aaijy7NMuviLLZBmM61
npx6sikvvyiPx1oKNMYljZsAj3C8NRSq9cIETo+Jvlwf53gNFxUfO1Bv1LYg8Byp5u6X+8CvLw3H+OgIb3ysyiRhOIwoaN9tgr9BGg+Vmsq5jqbBOGuhamJt
+DBIy1BLpaNWg7GFPK45c+8YZCTsiXRfxkrOzf4f/hn/XgiUp16lUq5IbKThsd+K
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 04:06:47 -0000
In message <201711292328.vATNSeOM046518@repo.freebsd.org>, Hans Petter
Selasky
writes:
> Author: hselasky
> Date: Wed Nov 29 23:28:40 2017
> New Revision: 326376
> URL: https://svnweb.freebsd.org/changeset/base/326376
>
> Log:
> The sched_add() function is not only used when the thread is initially
> started, but also by the turnstiles to mark a thread as runnable for
> all locks, for instance sleepqueues do:
> setrunnable()->sched_wakeup()->sched_add()
>
> In r326218 code was added to allow booting from non-zero CPU numbers
> by setting the ts_cpu field inside the ULE scheduler's sched_add()
> function. This had an undesired side-effect that prior sched_pin() and
> sched_bind() calls got disregarded. This patch fixes the
> initialization of the ts_cpu field for the ULE scheduler to only
> happen once when the initial thread is constructed during system
> init. Forking will then later on ensure that a valid ts_cpu value gets
> copied to all children.
>
> Reviewed by: jhb, kib
> Discussed with: nwhitehorn
> MFC after: 1 month
> Differential revision: https://reviews.freebsd.org/D13298
> Sponsored by: Mellanox Technologies
>
> Modified:
> head/sys/kern/sched_ule.c
>
> Modified: head/sys/kern/sched_ule.c
> =============================================================================
> =
> --- head/sys/kern/sched_ule.c Wed Nov 29 21:16:14 2017 (r326375)
> +++ head/sys/kern/sched_ule.c Wed Nov 29 23:28:40 2017 (r326376)
> @@ -1405,7 +1405,6 @@ sched_setup(void *dummy)
>
> /* Add thread0's load since it's running. */
> TDQ_LOCK(tdq);
> - td_get_sched(&thread0)->ts_cpu = curcpu; /* Something valid to start */
> thread0.td_lock = TDQ_LOCKPTR(TDQ_SELF());
> tdq_load_add(tdq, &thread0);
> tdq->tdq_lowpri = thread0.td_priority;
> @@ -1642,6 +1641,7 @@ schedinit(void)
> ts0->ts_ltick = ticks;
> ts0->ts_ftick = ticks;
> ts0->ts_slice = 0;
> + ts0->ts_cpu = curcpu; /* set valid CPU number */
> }
>
> /*
> @@ -2453,7 +2453,6 @@ sched_add(struct thread *td, int flags)
> * Pick the destination cpu and if it isn't ours transfer to the
> * target cpu.
> */
> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
> cpu = sched_pickcpu(td, flags);
> tdq = sched_setcpu(td, cpu, flags);
> tdq_add(tdq, td, flags);
>
Hi Hans,
Sorry I didn't get to this sooner: $JOB (and I have a change window in an
hour).
I sent you a couple of photos from my laptop however I've been able to
reproduce this on my testbed.
It boots okay without INVARIANTS and and WITNESS however with them it gets
a double fault.
Type '?' for a list of commands, 'help' for more detailed help.
OK include /boot/testbed/amd64-current-t
/
testbed/amd64-current-t (12.0-CURRENT) loader file selected
/
unload complete
vfs.zfs.arc_max set to 1024M
vm.kmem_size set to 1536M
vm.kmem_size_max set to 1536M
currdev set to disk1s3f:
/boot/kernel/kernel text=0xc3262c data=0xc5288+0x3a5048
syms=[0x8+0x116508+0x8+0x11285a]
/boot/kernel/if_sk.ko size 0x17cd0 at 0x16c6000
/boot/kernel/if_nfe.ko size 0x1a710 at 0x16de000
/boot/kernel/opensolaris.ko size 0xd6e0 at 0x16f9000
/boot/kernel/zfs.ko size 0x4ef290 at 0x1707000
/boot/kernel/amdtemp.ko size 0x53d0 at 0x1bf7000
loading required module 'amdsmn'
/boot/kernel/amdsmn.ko size 0x2d78 at 0x1bfd000
/boot/kernel/cpufreq.ko size 0x168c0 at 0x1c00000
/boot/kernel/tmpfs.ko size 0x203b0 at 0x1c17000
/boot/kernel/fdescfs.ko size 0x9d98 at 0x1c38000
/boot/kernel/nullfs.ko size 0xd308 at 0x1c42000
-
new kernel has been loaded
OK boot
Booting...
GDB: no debug ports present
KDB: debugger backends: ddb
KDB: current backend: ddb
Copyright (c) 1992-2017 The FreeBSD Project.
Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
The Regents of the University of California. All rights reserved.
FreeBSD is a registered trademark of The FreeBSD Foundation.
FreeBSD 12.0-CURRENT #0 r326382M: Wed Nov 29 19:44:24 PST 2017
root@bob:/export/obj/opt/src/svn-current/amd64.amd64/sys/BREAK4 amd64
FreeBSD clang version 5.0.0 (tags/RELEASE_500/final 312559) (based on LLVM
5.0.0svn)
WARNING: WITNESS option enabled, expect reduced performance.
VT(vga): text 80x25
CPU: AMD Athlon(tm) 64 X2 Dual Core Processor 5000+ (2612.09-MHz K8-class
CPU)
Origin="AuthenticAMD" Id=0x60fb2 Family=0xf Model=0x6b Stepping=2
Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,M
CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
Features2=0x2001<SSE3,CX16>
AMD Features=0xea500800<SYSCALL,NX,MMX+,FFXSR,RDTSCP,LM,3DNow!+,3DNow!>
AMD Features2=0x11f<LAHF,CMP,SVM,ExtAPIC,CR8,Prefetch>
SVM: NAsids=64
real memory = 5368709120 (5120 MB)
avail memory = 5134057472 (4896 MB)
Event timer "LAPIC" quality 100
ACPI APIC Table: <Nvidia ASUSACPI>
FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
FreeBSD/SMP: 1 package(s) x 2 core(s)
arc4random: no preloaded entropy cache
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
32/8 (20171110/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
16/8 (20171110/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8
(20171110/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
(20171110/tbfadt-748)
Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe1Block: 128/8
(20171110/tbfadt-748)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
default 32 (20171110/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using
default 16 (20171110/tbfadt-850)
Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
default 32 (20171110/tbfadt-850)
ioapic0: Changing APIC ID to 4
ioapic0 <Version 1.1> irqs 0-23 on motherboard
random: entropy device external interface
module_register_init: MOD_LOAD (vesa, 0xffffffff80cad0f0, 0) error 19
nexus0
vtvga0: <VT VGA driver> on motherboard
cryptosoft0: <software crypto> on motherboard
acpi0: <Nvidia ASUSACPI> on motherboard
ACPI Error: Could not find/resolve named package element: \_PR_.CPU0
(20171110/dspkginit-513)
acpi0: Power Button (fixed)
cpu0: <ACPI CPU> on acpi0
cpu1: <ACPI CPU> on acpi0
attimer0: <AT timer> port 0x40-0x43 on acpi0
Timecounter "i8254" frequency 1193182 Hz quality 0
Event timer "i8254" frequency 1193182 Hz quality 100
hpet0: <High Precision Event Timer> iomem 0xfefff000-0xfefff3ff irq 0,8 on
acpi0
Timecounter "HPET" frequency 25000000 Hz quality 950
atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
atrtc0: registered as a time-of-day clock, resolution 1.000000s
Event timer "RTC" frequency 32768 Hz quality 0
Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
acpi_button0: <Power Button> on acpi0
pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
pci0: <ACPI PCI bus> on pcib0
pci0: <memory, RAM> at device 0.0 (no driver attached)
isab0: <PCI-ISA bridge> at device 1.0 on pci0
isa0: <ISA bus> on isab0
ohci0: <nVidia nForce MCP55 USB Controller> mem 0xfe02f000-0xfe02ffff irq
21 at device 2.0 on pci0
usbus0 on ohci0
ehci0: <NVIDIA nForce MCP55 USB 2.0 controller> mem 0xfe02e000-0xfe02e0ff
irq 22 at device 2.1 on pci0
usbus1: EHCI version 1.0
usbus1 on ehci0
atapci0: <nVidia nForce MCP55 UDMA133 controller> port
0x1f0-0x1f7,0x3f6,0x170-0x177,0x376,0xfc00-0xfc0f at device 4.0 on pci0
ata0: <ATA channel> at channel 0 on atapci0
ata1: <ATA channel> at channel 1 on atapci0
atapci1: <nVidia nForce MCP55 SATA300 controller> port
0x9f0-0x9f7,0xbf0-0xbf3,0x970-0x977,0xb70-0xb73,0xf700-0xf70f mem
0xfe02d000-0xfe02dfff irq 23 at device 5.0 on pci0
ata2: <ATA channel> at channel 0 on atapci1
ata3: <ATA channel> at channel 1 on atapci1
atapci2: <nVidia nForce MCP55 SATA300 controller> port
0x9e0-0x9e7,0xbe0-0xbe3,0x960-0x967,0xb60-0xb63,0xf200-0xf20f mem
0xfe02c000-0xfe02cfff irq 20 at device 5.1 on pci0
ata4: <ATA channel> at channel 0 on atapci2
ata5: <ATA channel> at channel 1 on atapci2
atapci3: <nVidia nForce MCP55 SATA300 controller> port
0xf100-0xf107,0xf000-0xf003,0xef00-0xef07,0xee00-0xee03,0xed00-0xed0f mem
0xfe02b000-0xfe02bfff irq 21 at device 5.2 on pci0
ata6: <ATA channel> at channel 0 on atapci3
ata7: <ATA channel> at channel 1 on atapci3
pcib1: <ACPI PCI-PCI bridge> at device 6.0 on pci0
pci1: <ACPI PCI bus> on pcib1
pci1: <network, ethernet> at device 6.0 (no driver attached)
skc0: <D-Link DGE-530T Gigabit Ethernet> port 0xd800-0xd8ff mem
0xfdef8000-0xfdefbfff irq 17 at device 7.0 on pci1
skc0: DGE-530T Gigabit Ethernet Adapter rev. (0x1)
sk0: <Marvell Semiconductor, Inc. Yukon> on skc0
sk0: Ethernet address: 00:13:46:73:0c:0d
miibus0: <MII bus> on sk0
e1000phy0: <Marvell 88E1011 Gigabit PHY> PHY 0 on miibus0
e1000phy0: none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
1000baseT, 1000baseT-master, 1000baseT-FDX, 1000baseT-FDX-master, auto
pci0: <multimedia, HDA> at device 6.1 (no driver attached)
nfe0: <NVIDIA nForce MCP55 Networking Adapter> port 0xec00-0xec07 mem
0xfe02a000-0xfe02afff,0xfe029000-0xfe0290ff,0xfe028000-0xfe02800f irq 23 at
device 8.0 on pci0
miibus1: <MII bus> on nfe0
e1000phy1: <Marvell 88E1116 Gigabit PHY> PHY 1 on miibus1
e1000phy1: none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
1000baseT, 1000baseT-master, 1000baseT-FDX, 1000baseT-FDX-master, auto,
auto-flow
nfe0: Using defaults for TSO: 65518/35/2048
nfe0: Ethernet address: 00:18:f3:a0:dc:a4
pcib2: <ACPI PCI-PCI bridge> at device 15.0 on pci0
pci2: <ACPI PCI bus> on pcib2
vgapci0: <VGA-compatible display> mem 0xe8000000-0xefffffff,0xfddfe000-0xfdd
fffff irq 16 at device 0.0 on pci2
vgapci0: Boot video device
amdtemp0: <AMD CPU On-Die Thermal Sensors> on hostb3
acpi_tz0: <Thermal Zone> on acpi0
fdc0: <floppy drive controller> port 0x3f0-0x3f5,0x3f7 irq 6 drq 2 on acpi0
fd0: <1440-KB 3.5" drive> on fdc0 drive 0
uart0: <16550 or compatible> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
uart0: console (9600,n,8,1)
orm0: <ISA Option ROM> at iomem 0xc0000-0xcc7ff on isa0
vga0: <Generic ISA VGA> at port 0x3c0-0x3df iomem 0xa0000-0xbffff on isa0
atkbdc0: <Keyboard controller (i8042)> at port 0x60,0x64 on isa0
atkbd0: <AT Keyboard> irq 1 on atkbdc0
kbd0 at atkbd0
atkbd0: [GIANT-LOCKED]
powernow0: <PowerNow! K8> on cpu0
powernow1: <PowerNow! K8> on cpu1
ZFS filesystem version: 5
ZFS storage pool version: features support (5000)
Timecounters tick every 1.000 msec
usbus0: 12Mbps Full Speed USB v1.0
usbus1: 480Mbps High Speed USB v2.0
ugen0.1: <nVidia OHCI root HUB> at usbus0
uhub0: <nVidia OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus0
ugen1.1: <nVidia EHCI root HUB> at usbus1
uhub1: <nVidia EHCI root HUB, class 9/0, rev 2.00/1.00, addr 1> on usbus1
uhub0: 10 ports with 10 removable, self powered
uhub1: 10 ports with 10 removable, self powered
ada0 at ata0 bus 0 scbus0 target 0 lun 0
ada0: <SAMSUNG SP0802N TK100-24> ATA-7 device
ada0: Serial Number S00JJ20X889726
ada0: 100.000MB/s transfers (UDMA5, PIO 8192bytes)
ada0: 76351MB (156368016 512 byte sectors)
ada1 at ata0 bus 0 scbus0 target 1 lun 0
ada1: <Maxtor 6Y120P0 YAR41BW0> ATA-7 device
ada1: Serial Number Y327ZJ1E
ada1: 133.000MB/s transfers (UDMA6, PIO 8192bytes)
ada1: 117246MB (240121728 512 byte sectors)
ada2 at ata2 bus 0 scbus2 target 0 lun 0
ada2: <ST3500413AS JC4B> ATA8-ACS SATA 3.x device
ada2: Serial Number 6VMRAGM7
ada2: 300.000MB/s transfers (SATA 2.x, UDMA5, PIO 8192bytes)
ada2: 476940MB (976773168 512 byte sectors)
ada3 at ata3 bus 0 scbus3 target 0 lun 0
ada3: <ST3320620AS 3.ADG> ATA-7 SATA 2.x device
ada3: Serial Number 9QFA0729
ada3: 300.000MB/s transfers (SATA 2.x, UDMA5, PIO 8192bytes)
ada3: 305245MB (625142448 512 byte sectors)
SMP: AP CPU #1 Launched!
random: unblocking device.
WARNING: WITNESS option enabled, expect reduced performance.
arc4random: no preloaded entropy cache
arc4random: no preloaded entropy cache
Trying to mount root from ufs:/dev/ada0s3f [rw]...
sysctl: kern.ipc.nmbclusters=32768 at line 28: Invalid argument
Setting hostuuid: 3428e43e-d455-9478-f48e-14a3b4bb94dd.
Setting hostid: 0x448c33e0.
Fatal double fault
rip 0xffffffff80793105 rsp 0xfffffe0036358fe0 rbp 0xfffffe0036359150
rax 0 rdx 0xfffffe00363590f8 rbx 0x2
rcx 0x1 rsi 0x2 rdi 0
r8 0xfffffe00363592f0 r9 0xfffffe0036359350 r10 0
r11 0 r12 0x60 r13 0xfffffe003635b200
r14 0xfffffe0036359d30 r15 0x60 rflags 0x10002
cs 0x20 ss 0x28 ds 0x3b es 0x3b fs 0x13 gs 0x1b
fsbase 0x80063f8b0 gsbase 0xffffffff8142be80 kgsbase 0
cpuid = 1; apic id = 01
panic: double fault
cpuid = 1
time = 1511985616
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2c/frame
0xfffffe00003fdb40
kdb_backtrace() at kdb_backtrace+0x53/frame 0xfffffe00003fdc10
vpanic() at vpanic+0x268/frame 0xfffffe00003fdce0
kproc_shutdown() at kproc_shutdown/frame 0xfffffe00003fdd40
dblfault_handler() at dblfault_handler+0x387/frame 0xfffffe00003fdf30
Xdblfault() at Xdblfault+0xac/frame 0xfffffe00003fdf30
--- trap 0x17, rip = 0xffffffff80793105, rsp = 0xfffffe0036358fe0, rbp =
0xfffffe0036359150 ---
cpu_search_lowest() at cpu_search_lowest+0x1b5/frame 0xfffffe0036359150
cpu_search_lowest() at cpu_search_lowest+0x35e/frame 0xfffffe00363592d0
sched_lowest() at sched_lowest+0x66/frame 0xfffffe0036359340
sched_pickcpu() at sched_pickcpu+0x5af/frame 0xfffffe0036359470
sched_add() at sched_add+0x111/frame 0xfffffe00363594e0
sched_wakeup() at sched_wakeup+0x10a/frame 0xfffffe0036359530
setrunnable() at setrunnable+0x1c8/frame 0xfffffe0036359580
sleepq_resume_thread() at sleepq_resume_thread+0x634/frame
0xfffffe0036359600
sleepq_remove_matching() at sleepq_remove_matching+0xa9/frame
0xfffffe0036359660
sleepq_broadcast() at sleepq_broadcast+0x142/frame 0xfffffe00363596a0
wakeup() at wakeup+0x29/frame 0xfffffe00363596d0
g_io_request() at g_io_request+0x739/frame 0xfffffe0036359750
vdev_geom_io_start() at vdev_geom_io_start+0x582/frame 0xfffffe0036359800
zio_vdev_io_start() at zio_vdev_io_start+0x962/frame 0xfffffe0036359950
zio_execute() at zio_execute+0x28a/frame 0xfffffe00363599b0
zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359a00
vdev_cache_read() at vdev_cache_read+0x47c/frame 0xfffffe0036359b20
zio_vdev_io_start() at zio_vdev_io_start+0x82a/frame 0xfffffe0036359c70
zio_execute() at zio_execute+0x28a/frame 0xfffffe0036359cd0
zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359d20
vdev_mirror_io_start() at vdev_mirror_io_start+0x28a/frame
0xfffffe0036359dc0
zio_vdev_io_start() at zio_vdev_io_start+0x11f/frame 0xfffffe0036359f10
zio_execute() at zio_execute+0x28a/frame 0xfffffe0036359f70
zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359fc0
arc_read() at arc_read+0x1e8f/frame 0xfffffe003635a380
traverse_prefetch_metadata() at traverse_prefetch_metadata+0x21b/frame
0xfffffe003635a3f0
traverse_visitbp() at traverse_visitbp+0x831/frame 0xfffffe003635a600
traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635a810
traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635aa20
traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635ac30
traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635ae40
traverse_dnode() at traverse_dnode+0x176/frame 0xfffffe003635aee0
traverse_visitbp() at traverse_visitbp+0xde8/frame 0xfffffe003635b0f0
traverse_impl() at traverse_impl+0x73a/frame 0xfffffe003635b320
traverse_dataset_resume() at traverse_dataset_resume+0x92/frame
0xfffffe003635b390
traverse_dataset() at traverse_dataset+0x43/frame 0xfffffe003635b3d0
traverse_pool() at traverse_pool+0x1da/frame 0xfffffe003635b4d0
spa_load_verify() at spa_load_verify+0x15e/frame 0xfffffe003635b580
spa_load_impl() at spa_load_impl+0x2241/frame 0xfffffe003635ba30
spa_load() at spa_load+0x301/frame 0xfffffe003635baf0
spa_load_impl() at spa_load_impl+0x1445/frame 0xfffffe003635bfa0
spa_load() at spa_load+0x301/frame 0xfffffe003635c060
spa_load_best() at spa_load_best+0xbd/frame 0xfffffe003635c100
spa_open_common() at spa_open_common+0x228/frame 0xfffffe003635c1f0
spa_open() at spa_open+0x35/frame 0xfffffe003635c220
pool_status_check() at pool_status_check+0x8e/frame 0xfffffe003635c280
zfsdev_ioctl() at zfsdev_ioctl+0xb9d/frame 0xfffffe003635c540
devfs_ioctl() at devfs_ioctl+0x187/frame 0xfffffe003635c5e0
VOP_IOCTL_APV() at VOP_IOCTL_APV+0x227/frame 0xfffffe003635c660
VOP_IOCTL() at VOP_IOCTL+0x6e/frame 0xfffffe003635c6e0
vn_ioctl() at vn_ioctl+0x1cc/frame 0xfffffe003635c820
devfs_ioctl_f() at devfs_ioctl_f+0x62/frame 0xfffffe003635c870
fo_ioctl() at fo_ioctl+0x4c/frame 0xfffffe003635c8b0
kern_ioctl() at kern_ioctl+0x361/frame 0xfffffe003635c980
sys_ioctl() at sys_ioctl+0x2af/frame 0xfffffe003635ca60
syscallenter() at syscallenter+0x4e4/frame 0xfffffe003635cb30
amd64_syscall() at amd64_syscall+0x1b/frame 0xfffffe003635cbf0
Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe003635cbf0
--- syscall (54, FreeBSD ELF64, sys_ioctl), rip = 0x80143b5aa, rsp =
0x7fffffffcf78, rbp = 0x7fffffffcff0 ---
KDB: enter: panic
[ thread pid 44 tid 100102 ]
Stopped at breakpoint+0x5: popq %rbp
db>
The type of CPU doesn't matter. The testbed (above) is an AMD X2 5000+ The
laptop is a core i3.
I'll poke around at it after tonight's change window, before bed.
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
From owner-svn-src-all@freebsd.org Thu Nov 30 05:01:57 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B1BDDF72C4;
Thu, 30 Nov 2017 05:01:57 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 685C17447B;
Thu, 30 Nov 2017 05:01:57 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU51uYY095957;
Thu, 30 Nov 2017 05:01:56 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU51uH1095955;
Thu, 30 Nov 2017 05:01:56 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711300501.vAU51uH1095955@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 30 Nov 2017 05:01:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326384 - head/stand/powerpc/kboot
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/stand/powerpc/kboot
X-SVN-Commit-Revision: 326384
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 05:01:57 -0000
Author: imp
Date: Thu Nov 30 05:01:56 2017
New Revision: 326384
URL: https://svnweb.freebsd.org/changeset/base/326384
Log:
Use const pointers to avoid casting away constness.
The host_open interface was a legitimate mismatch to the userboot
function, while the other pointers didn't need to be non-const.
This makes the powerpc warning free again.
Sponsored by: Netflix
Modified:
head/stand/powerpc/kboot/host_syscall.h
head/stand/powerpc/kboot/kbootfdt.c
Modified: head/stand/powerpc/kboot/host_syscall.h
==============================================================================
--- head/stand/powerpc/kboot/host_syscall.h Thu Nov 30 01:40:07 2017 (r326383)
+++ head/stand/powerpc/kboot/host_syscall.h Thu Nov 30 05:01:56 2017 (r326384)
@@ -33,7 +33,7 @@
ssize_t host_read(int fd, void *buf, size_t nbyte);
ssize_t host_write(int fd, const void *buf, size_t nbyte);
ssize_t host_seek(int fd, int64_t offset, int whence);
-int host_open(char *path, int flags, int mode);
+int host_open(const char *path, int flags, int mode);
int host_close(int fd);
void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, int);
#define host_getmem(size) host_mmap(0, size, 3 /* RW */, 0x22 /* ANON */, -1, 0);
Modified: head/stand/powerpc/kboot/kbootfdt.c
==============================================================================
--- head/stand/powerpc/kboot/kbootfdt.c Thu Nov 30 01:40:07 2017 (r326383)
+++ head/stand/powerpc/kboot/kbootfdt.c Thu Nov 30 05:01:56 2017 (r326384)
@@ -119,7 +119,7 @@ fdt_linux_fixups(void *fdtp)
offset = fdt_path_offset(fdtp, "/ibm,opal");
if (offset > 0) {
- uint64_t *base, *size;
+ const uint64_t *base, *size;
base = fdt_getprop(fdtp, offset, "opal-base-address",
&len);
size = fdt_getprop(fdtp, offset, "opal-runtime-size",
@@ -130,7 +130,7 @@ fdt_linux_fixups(void *fdtp)
}
offset = fdt_path_offset(fdtp, "/rtas");
if (offset > 0) {
- uint32_t *base, *size;
+ const uint32_t *base, *size;
base = fdt_getprop(fdtp, offset, "linux,rtas-base", &len);
size = fdt_getprop(fdtp, offset, "rtas-size", &len);
if (base != NULL && size != NULL)
From owner-svn-src-all@freebsd.org Thu Nov 30 05:13:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36009DF75CD;
Thu, 30 Nov 2017 05:13:27 +0000 (UTC)
(envelope-from truckman@FreeBSD.org)
Received: from gw.catspoiler.org (unknown [IPv6:2602:304:b010:ef20::f2])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "gw.catspoiler.org", Issuer "gw.catspoiler.org" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id C2EAD749B4;
Thu, 30 Nov 2017 05:13:26 +0000 (UTC)
(envelope-from truckman@FreeBSD.org)
Received: from mousie.catspoiler.org (mousie.catspoiler.org [192.168.101.2])
by gw.catspoiler.org (8.15.2/8.15.2) with ESMTPS id vAU5DMSn076605
(version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Wed, 29 Nov 2017 21:13:23 -0800 (PST)
(envelope-from truckman@FreeBSD.org)
Date: Wed, 29 Nov 2017 21:13:17 -0800 (PST)
From: Don Lewis <truckman@FreeBSD.org>
Subject: Re: svn commit: r326376 - head/sys/kern
To: Cy Schubert <Cy.Schubert@komquats.com>
cc: Hans Petter Selasky <hselasky@FreeBSD.org>, src-committers@freebsd.org,
svn-src-all@freebsd.org, svn-src-head@freebsd.org
In-Reply-To: <201711300406.vAU46gCX012711@slippy.cwsent.com>
Message-ID: <tkrat.347f5c4c22bb6769@FreeBSD.org>
References: Message from Hans Petter Selasky <hselasky@FreeBSD.org> of "Wed,
29 Nov 2017 23:28:40 +0000."
<201711292328.vATNSeOM046518@repo.freebsd.org>
<201711300406.vAU46gCX012711@slippy.cwsent.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; CHARSET=us-ascii
Content-Disposition: INLINE
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 05:13:27 -0000
On 29 Nov, Cy Schubert wrote:
> In message <201711292328.vATNSeOM046518@repo.freebsd.org>, Hans Petter
> Selasky
> writes:
>> Author: hselasky
>> Date: Wed Nov 29 23:28:40 2017
>> New Revision: 326376
>> URL: https://svnweb.freebsd.org/changeset/base/326376
>>
>> Log:
>> The sched_add() function is not only used when the thread is initially
>> started, but also by the turnstiles to mark a thread as runnable for
>> all locks, for instance sleepqueues do:
>> setrunnable()->sched_wakeup()->sched_add()
>>
>> In r326218 code was added to allow booting from non-zero CPU numbers
>> by setting the ts_cpu field inside the ULE scheduler's sched_add()
>> function. This had an undesired side-effect that prior sched_pin() and
>> sched_bind() calls got disregarded. This patch fixes the
>> initialization of the ts_cpu field for the ULE scheduler to only
>> happen once when the initial thread is constructed during system
>> init. Forking will then later on ensure that a valid ts_cpu value gets
>> copied to all children.
>>
>> Reviewed by: jhb, kib
>> Discussed with: nwhitehorn
>> MFC after: 1 month
>> Differential revision: https://reviews.freebsd.org/D13298
>> Sponsored by: Mellanox Technologies
>>
>> Modified:
>> head/sys/kern/sched_ule.c
>>
>> Modified: head/sys/kern/sched_ule.c
>> =============================================================================
>> =
>> --- head/sys/kern/sched_ule.c Wed Nov 29 21:16:14 2017 (r326375)
>> +++ head/sys/kern/sched_ule.c Wed Nov 29 23:28:40 2017 (r326376)
>> @@ -1405,7 +1405,6 @@ sched_setup(void *dummy)
>>
>> /* Add thread0's load since it's running. */
>> TDQ_LOCK(tdq);
>> - td_get_sched(&thread0)->ts_cpu = curcpu; /* Something valid to start */
>> thread0.td_lock = TDQ_LOCKPTR(TDQ_SELF());
>> tdq_load_add(tdq, &thread0);
>> tdq->tdq_lowpri = thread0.td_priority;
>> @@ -1642,6 +1641,7 @@ schedinit(void)
>> ts0->ts_ltick = ticks;
>> ts0->ts_ftick = ticks;
>> ts0->ts_slice = 0;
>> + ts0->ts_cpu = curcpu; /* set valid CPU number */
>> }
>>
>> /*
>> @@ -2453,7 +2453,6 @@ sched_add(struct thread *td, int flags)
>> * Pick the destination cpu and if it isn't ours transfer to the
>> * target cpu.
>> */
>> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
>> cpu = sched_pickcpu(td, flags);
>> tdq = sched_setcpu(td, cpu, flags);
>> tdq_add(tdq, td, flags);
>>
>
> Hi Hans,
>
> Sorry I didn't get to this sooner: $JOB (and I have a change window in an
> hour).
>
> I sent you a couple of photos from my laptop however I've been able to
> reproduce this on my testbed.
>
> It boots okay without INVARIANTS and and WITNESS however with them it gets
> a double fault.
>
> Type '?' for a list of commands, 'help' for more detailed help.
> OK include /boot/testbed/amd64-current-t
> /
>
> testbed/amd64-current-t (12.0-CURRENT) loader file selected
> /
> unload complete
> vfs.zfs.arc_max set to 1024M
> vm.kmem_size set to 1536M
> vm.kmem_size_max set to 1536M
> currdev set to disk1s3f:
>
> /boot/kernel/kernel text=0xc3262c data=0xc5288+0x3a5048
> syms=[0x8+0x116508+0x8+0x11285a]
> /boot/kernel/if_sk.ko size 0x17cd0 at 0x16c6000
> /boot/kernel/if_nfe.ko size 0x1a710 at 0x16de000
> /boot/kernel/opensolaris.ko size 0xd6e0 at 0x16f9000
> /boot/kernel/zfs.ko size 0x4ef290 at 0x1707000
> /boot/kernel/amdtemp.ko size 0x53d0 at 0x1bf7000
> loading required module 'amdsmn'
> /boot/kernel/amdsmn.ko size 0x2d78 at 0x1bfd000
> /boot/kernel/cpufreq.ko size 0x168c0 at 0x1c00000
> /boot/kernel/tmpfs.ko size 0x203b0 at 0x1c17000
> /boot/kernel/fdescfs.ko size 0x9d98 at 0x1c38000
> /boot/kernel/nullfs.ko size 0xd308 at 0x1c42000
> -
> new kernel has been loaded
>
> OK boot
> Booting...
> GDB: no debug ports present
> KDB: debugger backends: ddb
> KDB: current backend: ddb
> Copyright (c) 1992-2017 The FreeBSD Project.
> Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> The Regents of the University of California. All rights reserved.
> FreeBSD is a registered trademark of The FreeBSD Foundation.
> FreeBSD 12.0-CURRENT #0 r326382M: Wed Nov 29 19:44:24 PST 2017
> root@bob:/export/obj/opt/src/svn-current/amd64.amd64/sys/BREAK4 amd64
> FreeBSD clang version 5.0.0 (tags/RELEASE_500/final 312559) (based on LLVM
> 5.0.0svn)
> WARNING: WITNESS option enabled, expect reduced performance.
> VT(vga): text 80x25
> CPU: AMD Athlon(tm) 64 X2 Dual Core Processor 5000+ (2612.09-MHz K8-class
> CPU)
> Origin="AuthenticAMD" Id=0x60fb2 Family=0xf Model=0x6b Stepping=2
> Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,M
> CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> Features2=0x2001<SSE3,CX16>
> AMD Features=0xea500800<SYSCALL,NX,MMX+,FFXSR,RDTSCP,LM,3DNow!+,3DNow!>
> AMD Features2=0x11f<LAHF,CMP,SVM,ExtAPIC,CR8,Prefetch>
> SVM: NAsids=64
> real memory = 5368709120 (5120 MB)
> avail memory = 5134057472 (4896 MB)
> Event timer "LAPIC" quality 100
> ACPI APIC Table: <Nvidia ASUSACPI>
> FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
> FreeBSD/SMP: 1 package(s) x 2 core(s)
> arc4random: no preloaded entropy cache
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
> 32/8 (20171110/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
> 16/8 (20171110/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8
> (20171110/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
> (20171110/tbfadt-748)
> Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe1Block: 128/8
> (20171110/tbfadt-748)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
> default 32 (20171110/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using
> default 16 (20171110/tbfadt-850)
> Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
> default 32 (20171110/tbfadt-850)
> ioapic0: Changing APIC ID to 4
> ioapic0 <Version 1.1> irqs 0-23 on motherboard
> random: entropy device external interface
> module_register_init: MOD_LOAD (vesa, 0xffffffff80cad0f0, 0) error 19
> nexus0
> vtvga0: <VT VGA driver> on motherboard
> cryptosoft0: <software crypto> on motherboard
> acpi0: <Nvidia ASUSACPI> on motherboard
> ACPI Error: Could not find/resolve named package element: \_PR_.CPU0
> (20171110/dspkginit-513)
> acpi0: Power Button (fixed)
> cpu0: <ACPI CPU> on acpi0
> cpu1: <ACPI CPU> on acpi0
> attimer0: <AT timer> port 0x40-0x43 on acpi0
> Timecounter "i8254" frequency 1193182 Hz quality 0
> Event timer "i8254" frequency 1193182 Hz quality 100
> hpet0: <High Precision Event Timer> iomem 0xfefff000-0xfefff3ff irq 0,8 on
> acpi0
> Timecounter "HPET" frequency 25000000 Hz quality 950
> atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
> atrtc0: registered as a time-of-day clock, resolution 1.000000s
> Event timer "RTC" frequency 32768 Hz quality 0
> Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
> acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
> acpi_button0: <Power Button> on acpi0
> pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
> pci0: <ACPI PCI bus> on pcib0
> pci0: <memory, RAM> at device 0.0 (no driver attached)
> isab0: <PCI-ISA bridge> at device 1.0 on pci0
> isa0: <ISA bus> on isab0
> ohci0: <nVidia nForce MCP55 USB Controller> mem 0xfe02f000-0xfe02ffff irq
> 21 at device 2.0 on pci0
> usbus0 on ohci0
> ehci0: <NVIDIA nForce MCP55 USB 2.0 controller> mem 0xfe02e000-0xfe02e0ff
> irq 22 at device 2.1 on pci0
> usbus1: EHCI version 1.0
> usbus1 on ehci0
> atapci0: <nVidia nForce MCP55 UDMA133 controller> port
> 0x1f0-0x1f7,0x3f6,0x170-0x177,0x376,0xfc00-0xfc0f at device 4.0 on pci0
> ata0: <ATA channel> at channel 0 on atapci0
> ata1: <ATA channel> at channel 1 on atapci0
> atapci1: <nVidia nForce MCP55 SATA300 controller> port
> 0x9f0-0x9f7,0xbf0-0xbf3,0x970-0x977,0xb70-0xb73,0xf700-0xf70f mem
> 0xfe02d000-0xfe02dfff irq 23 at device 5.0 on pci0
> ata2: <ATA channel> at channel 0 on atapci1
> ata3: <ATA channel> at channel 1 on atapci1
> atapci2: <nVidia nForce MCP55 SATA300 controller> port
> 0x9e0-0x9e7,0xbe0-0xbe3,0x960-0x967,0xb60-0xb63,0xf200-0xf20f mem
> 0xfe02c000-0xfe02cfff irq 20 at device 5.1 on pci0
> ata4: <ATA channel> at channel 0 on atapci2
> ata5: <ATA channel> at channel 1 on atapci2
> atapci3: <nVidia nForce MCP55 SATA300 controller> port
> 0xf100-0xf107,0xf000-0xf003,0xef00-0xef07,0xee00-0xee03,0xed00-0xed0f mem
> 0xfe02b000-0xfe02bfff irq 21 at device 5.2 on pci0
> ata6: <ATA channel> at channel 0 on atapci3
> ata7: <ATA channel> at channel 1 on atapci3
> pcib1: <ACPI PCI-PCI bridge> at device 6.0 on pci0
> pci1: <ACPI PCI bus> on pcib1
> pci1: <network, ethernet> at device 6.0 (no driver attached)
> skc0: <D-Link DGE-530T Gigabit Ethernet> port 0xd800-0xd8ff mem
> 0xfdef8000-0xfdefbfff irq 17 at device 7.0 on pci1
> skc0: DGE-530T Gigabit Ethernet Adapter rev. (0x1)
> sk0: <Marvell Semiconductor, Inc. Yukon> on skc0
> sk0: Ethernet address: 00:13:46:73:0c:0d
> miibus0: <MII bus> on sk0
> e1000phy0: <Marvell 88E1011 Gigabit PHY> PHY 0 on miibus0
> e1000phy0: none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
> 1000baseT, 1000baseT-master, 1000baseT-FDX, 1000baseT-FDX-master, auto
> pci0: <multimedia, HDA> at device 6.1 (no driver attached)
> nfe0: <NVIDIA nForce MCP55 Networking Adapter> port 0xec00-0xec07 mem
> 0xfe02a000-0xfe02afff,0xfe029000-0xfe0290ff,0xfe028000-0xfe02800f irq 23 at
> device 8.0 on pci0
> miibus1: <MII bus> on nfe0
> e1000phy1: <Marvell 88E1116 Gigabit PHY> PHY 1 on miibus1
> e1000phy1: none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
> 1000baseT, 1000baseT-master, 1000baseT-FDX, 1000baseT-FDX-master, auto,
> auto-flow
> nfe0: Using defaults for TSO: 65518/35/2048
> nfe0: Ethernet address: 00:18:f3:a0:dc:a4
> pcib2: <ACPI PCI-PCI bridge> at device 15.0 on pci0
> pci2: <ACPI PCI bus> on pcib2
> vgapci0: <VGA-compatible display> mem 0xe8000000-0xefffffff,0xfddfe000-0xfdd
> fffff irq 16 at device 0.0 on pci2
> vgapci0: Boot video device
> amdtemp0: <AMD CPU On-Die Thermal Sensors> on hostb3
> acpi_tz0: <Thermal Zone> on acpi0
> fdc0: <floppy drive controller> port 0x3f0-0x3f5,0x3f7 irq 6 drq 2 on acpi0
> fd0: <1440-KB 3.5" drive> on fdc0 drive 0
> uart0: <16550 or compatible> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
> uart0: console (9600,n,8,1)
> orm0: <ISA Option ROM> at iomem 0xc0000-0xcc7ff on isa0
> vga0: <Generic ISA VGA> at port 0x3c0-0x3df iomem 0xa0000-0xbffff on isa0
> atkbdc0: <Keyboard controller (i8042)> at port 0x60,0x64 on isa0
> atkbd0: <AT Keyboard> irq 1 on atkbdc0
> kbd0 at atkbd0
> atkbd0: [GIANT-LOCKED]
> powernow0: <PowerNow! K8> on cpu0
> powernow1: <PowerNow! K8> on cpu1
> ZFS filesystem version: 5
> ZFS storage pool version: features support (5000)
> Timecounters tick every 1.000 msec
> usbus0: 12Mbps Full Speed USB v1.0
> usbus1: 480Mbps High Speed USB v2.0
> ugen0.1: <nVidia OHCI root HUB> at usbus0
> uhub0: <nVidia OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus0
> ugen1.1: <nVidia EHCI root HUB> at usbus1
> uhub1: <nVidia EHCI root HUB, class 9/0, rev 2.00/1.00, addr 1> on usbus1
> uhub0: 10 ports with 10 removable, self powered
> uhub1: 10 ports with 10 removable, self powered
> ada0 at ata0 bus 0 scbus0 target 0 lun 0
> ada0: <SAMSUNG SP0802N TK100-24> ATA-7 device
> ada0: Serial Number S00JJ20X889726
> ada0: 100.000MB/s transfers (UDMA5, PIO 8192bytes)
> ada0: 76351MB (156368016 512 byte sectors)
> ada1 at ata0 bus 0 scbus0 target 1 lun 0
> ada1: <Maxtor 6Y120P0 YAR41BW0> ATA-7 device
> ada1: Serial Number Y327ZJ1E
> ada1: 133.000MB/s transfers (UDMA6, PIO 8192bytes)
> ada1: 117246MB (240121728 512 byte sectors)
> ada2 at ata2 bus 0 scbus2 target 0 lun 0
> ada2: <ST3500413AS JC4B> ATA8-ACS SATA 3.x device
> ada2: Serial Number 6VMRAGM7
> ada2: 300.000MB/s transfers (SATA 2.x, UDMA5, PIO 8192bytes)
> ada2: 476940MB (976773168 512 byte sectors)
> ada3 at ata3 bus 0 scbus3 target 0 lun 0
> ada3: <ST3320620AS 3.ADG> ATA-7 SATA 2.x device
> ada3: Serial Number 9QFA0729
> ada3: 300.000MB/s transfers (SATA 2.x, UDMA5, PIO 8192bytes)
> ada3: 305245MB (625142448 512 byte sectors)
> SMP: AP CPU #1 Launched!
> random: unblocking device.
> WARNING: WITNESS option enabled, expect reduced performance.
> arc4random: no preloaded entropy cache
> arc4random: no preloaded entropy cache
> Trying to mount root from ufs:/dev/ada0s3f [rw]...
> sysctl: kern.ipc.nmbclusters=32768 at line 28: Invalid argument
> Setting hostuuid: 3428e43e-d455-9478-f48e-14a3b4bb94dd.
> Setting hostid: 0x448c33e0.
>
> Fatal double fault
> rip 0xffffffff80793105 rsp 0xfffffe0036358fe0 rbp 0xfffffe0036359150
> rax 0 rdx 0xfffffe00363590f8 rbx 0x2
> rcx 0x1 rsi 0x2 rdi 0
> r8 0xfffffe00363592f0 r9 0xfffffe0036359350 r10 0
> r11 0 r12 0x60 r13 0xfffffe003635b200
> r14 0xfffffe0036359d30 r15 0x60 rflags 0x10002
> cs 0x20 ss 0x28 ds 0x3b es 0x3b fs 0x13 gs 0x1b
> fsbase 0x80063f8b0 gsbase 0xffffffff8142be80 kgsbase 0
> cpuid = 1; apic id = 01
> panic: double fault
> cpuid = 1
> time = 1511985616
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2c/frame
> 0xfffffe00003fdb40
> kdb_backtrace() at kdb_backtrace+0x53/frame 0xfffffe00003fdc10
> vpanic() at vpanic+0x268/frame 0xfffffe00003fdce0
> kproc_shutdown() at kproc_shutdown/frame 0xfffffe00003fdd40
> dblfault_handler() at dblfault_handler+0x387/frame 0xfffffe00003fdf30
> Xdblfault() at Xdblfault+0xac/frame 0xfffffe00003fdf30
> --- trap 0x17, rip = 0xffffffff80793105, rsp = 0xfffffe0036358fe0, rbp =
> 0xfffffe0036359150 ---
> cpu_search_lowest() at cpu_search_lowest+0x1b5/frame 0xfffffe0036359150
> cpu_search_lowest() at cpu_search_lowest+0x35e/frame 0xfffffe00363592d0
> sched_lowest() at sched_lowest+0x66/frame 0xfffffe0036359340
> sched_pickcpu() at sched_pickcpu+0x5af/frame 0xfffffe0036359470
> sched_add() at sched_add+0x111/frame 0xfffffe00363594e0
> sched_wakeup() at sched_wakeup+0x10a/frame 0xfffffe0036359530
> setrunnable() at setrunnable+0x1c8/frame 0xfffffe0036359580
> sleepq_resume_thread() at sleepq_resume_thread+0x634/frame
> 0xfffffe0036359600
> sleepq_remove_matching() at sleepq_remove_matching+0xa9/frame
> 0xfffffe0036359660
> sleepq_broadcast() at sleepq_broadcast+0x142/frame 0xfffffe00363596a0
> wakeup() at wakeup+0x29/frame 0xfffffe00363596d0
> g_io_request() at g_io_request+0x739/frame 0xfffffe0036359750
> vdev_geom_io_start() at vdev_geom_io_start+0x582/frame 0xfffffe0036359800
> zio_vdev_io_start() at zio_vdev_io_start+0x962/frame 0xfffffe0036359950
> zio_execute() at zio_execute+0x28a/frame 0xfffffe00363599b0
> zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359a00
> vdev_cache_read() at vdev_cache_read+0x47c/frame 0xfffffe0036359b20
> zio_vdev_io_start() at zio_vdev_io_start+0x82a/frame 0xfffffe0036359c70
> zio_execute() at zio_execute+0x28a/frame 0xfffffe0036359cd0
> zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359d20
> vdev_mirror_io_start() at vdev_mirror_io_start+0x28a/frame
> 0xfffffe0036359dc0
> zio_vdev_io_start() at zio_vdev_io_start+0x11f/frame 0xfffffe0036359f10
> zio_execute() at zio_execute+0x28a/frame 0xfffffe0036359f70
> zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359fc0
> arc_read() at arc_read+0x1e8f/frame 0xfffffe003635a380
> traverse_prefetch_metadata() at traverse_prefetch_metadata+0x21b/frame
> 0xfffffe003635a3f0
> traverse_visitbp() at traverse_visitbp+0x831/frame 0xfffffe003635a600
> traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635a810
> traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635aa20
> traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635ac30
> traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635ae40
> traverse_dnode() at traverse_dnode+0x176/frame 0xfffffe003635aee0
> traverse_visitbp() at traverse_visitbp+0xde8/frame 0xfffffe003635b0f0
> traverse_impl() at traverse_impl+0x73a/frame 0xfffffe003635b320
> traverse_dataset_resume() at traverse_dataset_resume+0x92/frame
> 0xfffffe003635b390
> traverse_dataset() at traverse_dataset+0x43/frame 0xfffffe003635b3d0
> traverse_pool() at traverse_pool+0x1da/frame 0xfffffe003635b4d0
> spa_load_verify() at spa_load_verify+0x15e/frame 0xfffffe003635b580
> spa_load_impl() at spa_load_impl+0x2241/frame 0xfffffe003635ba30
> spa_load() at spa_load+0x301/frame 0xfffffe003635baf0
> spa_load_impl() at spa_load_impl+0x1445/frame 0xfffffe003635bfa0
> spa_load() at spa_load+0x301/frame 0xfffffe003635c060
> spa_load_best() at spa_load_best+0xbd/frame 0xfffffe003635c100
> spa_open_common() at spa_open_common+0x228/frame 0xfffffe003635c1f0
> spa_open() at spa_open+0x35/frame 0xfffffe003635c220
> pool_status_check() at pool_status_check+0x8e/frame 0xfffffe003635c280
> zfsdev_ioctl() at zfsdev_ioctl+0xb9d/frame 0xfffffe003635c540
> devfs_ioctl() at devfs_ioctl+0x187/frame 0xfffffe003635c5e0
> VOP_IOCTL_APV() at VOP_IOCTL_APV+0x227/frame 0xfffffe003635c660
> VOP_IOCTL() at VOP_IOCTL+0x6e/frame 0xfffffe003635c6e0
> vn_ioctl() at vn_ioctl+0x1cc/frame 0xfffffe003635c820
> devfs_ioctl_f() at devfs_ioctl_f+0x62/frame 0xfffffe003635c870
> fo_ioctl() at fo_ioctl+0x4c/frame 0xfffffe003635c8b0
> kern_ioctl() at kern_ioctl+0x361/frame 0xfffffe003635c980
> sys_ioctl() at sys_ioctl+0x2af/frame 0xfffffe003635ca60
> syscallenter() at syscallenter+0x4e4/frame 0xfffffe003635cb30
> amd64_syscall() at amd64_syscall+0x1b/frame 0xfffffe003635cbf0
> Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe003635cbf0
> --- syscall (54, FreeBSD ELF64, sys_ioctl), rip = 0x80143b5aa, rsp =
> 0x7fffffffcf78, rbp = 0x7fffffffcff0 ---
> KDB: enter: panic
> [ thread pid 44 tid 100102 ]
> Stopped at breakpoint+0x5: popq %rbp
> db>
Looks like a kernel stack overflow. That's a pretty deep call stack.
Try setting kern.kstack_pages to a larger value (> 4) in the loader.
From owner-svn-src-all@freebsd.org Thu Nov 30 05:18:56 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33A24DF78C3;
Thu, 30 Nov 2017 05:18:56 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: from mail-qk0-x22f.google.com (mail-qk0-x22f.google.com
[IPv6:2607:f8b0:400d:c09::22f])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id E6CAE74C06;
Thu, 30 Nov 2017 05:18:55 +0000 (UTC)
(envelope-from mjguzik@gmail.com)
Received: by mail-qk0-x22f.google.com with SMTP id j207so7409848qke.10;
Wed, 29 Nov 2017 21:18:55 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:cc; bh=ioiFQLH2FfQSP0EC3WzBDH5UOpoBMbcmK5Nam+XtNtE=;
b=AkrzwxXdJiUBG0dxsQAjyRBrcZcdq50f6SEp7FXUGwZZzQIqWIS7oNeDD0J+uZ8X2x
QQSrkgdRMOUj/qTNAhUGICVsgFk6S1wD4kMGKih225p9/HH9ZzBH7QibTAqk8jc75umc
7/bGK5LFUmP/DTJe5eur+duju8cL0rERVZxU2YiL28j4u2vgK32w/PjVSNfQttq+cYI2
cyeMHYir0cn+RKY/OWHebJf5PZkEvboHY1guttTAac8YcM7B6jAFmYVRDzYIEH94tBBX
FJZ9eJHyRVhqAmoMh9VRp63AFin6WUXNHK+92NAw61zNOBbay1fYCYjJJgLnnJWTT93F
+uaA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:in-reply-to:references:from:date
:message-id:subject:to:cc;
bh=ioiFQLH2FfQSP0EC3WzBDH5UOpoBMbcmK5Nam+XtNtE=;
b=J5bI7kpvyY+uBfGFbavIxDIgjZC70wMlv7ezY8XmjzvY0aJsxzbB+Z5Fbk2DI0OoBe
hBStVZUaAzaORijzqi8vnzKjsq8Y9QeM7S0WJrfHclsoziPRE0gJMBtO06JTzvSG+LwZ
Ar1LBNI6qRsJ9NPr0feRMHpjUqeVBMke+L2QH2OkEcJRpjQZzZXvaarcBbcDB6LPyUPa
898T0yL8NWGASTAC67m9BojcdVZgEL623ZpvG2hcag11QepDEzOWmv3D4yG1Z63gNDTE
4yAXE/Xs2wIwutEPC2Av+VjfYRdU+OclomK5tIXA9DMq9BloASdcHkNr4jpFGbvhwbY+
4pGA==
X-Gm-Message-State: AKGB3mL0/f3CEGZllCwYVs+M/DlCUvvWnGind9w8T01hOM5ulN9U5WEb
F2tuabsLiXmRmuo4SXPD23VjmlnKLBwqSmRRq4q5SQ==
X-Google-Smtp-Source: AGs4zMZnBLJvu39KGbCE5pDuSJT2Vsr1guJ+/nxi/MIz+RE/d/VldbFQuYaybgDnKPDHbCpJC/tO7xQw8ztq/qVaSXM=
X-Received: by 10.55.19.19 with SMTP id d19mr1002599qkh.189.1512019134517;
Wed, 29 Nov 2017 21:18:54 -0800 (PST)
MIME-Version: 1.0
Received: by 10.200.44.214 with HTTP; Wed, 29 Nov 2017 21:18:54 -0800 (PST)
In-Reply-To: <CAOtMX2hpG44t=djBsO4+xfvYuA0TY2+TkueZ9UgFJiN=1MGvbw@mail.gmail.com>
References: <201711252049.vAPKnRaA026691@repo.freebsd.org>
<20171126064927.GA68986@x2.osted.lan>
<CAGudoHGzi08_Th3DDkyMSWG006akL=fhF08SfZzgE2CBCA1H4Q@mail.gmail.com>
<20171127064940.GA91390@x2.osted.lan>
<CAOtMX2hpG44t=djBsO4+xfvYuA0TY2+TkueZ9UgFJiN=1MGvbw@mail.gmail.com>
From: Mateusz Guzik <mjguzik@gmail.com>
Date: Thu, 30 Nov 2017 06:18:54 +0100
Message-ID: <CAGudoHFKvn3+sLZXN-8ahDV4uZG=RRt27cff-eoOeqCj5o649w@mail.gmail.com>
Subject: Re: svn commit: r326200 - head/sys/kern
To: Alan Somers <asomers@freebsd.org>
Cc: Peter Holm <peter@holm.cc>, Mateusz Guzik <mjg@freebsd.org>,
"src-committers@freebsd.org" <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.25
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 05:18:56 -0000
So this is not my bug after all, it just had unfortunate timing with
scheduler changes.
I can't reproduce anything with r326376.
On Tue, Nov 28, 2017 at 9:37 PM, Alan Somers <asomers@freebsd.org> wrote:
> On Sun, Nov 26, 2017 at 11:49 PM, Peter Holm <peter@holm.cc> wrote:
> > On Sun, Nov 26, 2017 at 10:11:21PM +0100, Mateusz Guzik wrote:
> >> On Sun, Nov 26, 2017 at 7:49 AM, Peter Holm <peter@holm.cc> wrote:
> >>
> >> > On Sat, Nov 25, 2017 at 08:49:27PM +0000, Mateusz Guzik wrote:
> >> > > Author: mjg
> >> > > Date: Sat Nov 25 20:49:27 2017
> >> > > New Revision: 326200
> >> > > URL: https://svnweb.freebsd.org/changeset/base/326200
> >> > >
> >> > > Log:
> >> > > Add the missing lockstat check for thread lock.
> >> > >
> >> > > Modified:
> >> > > head/sys/kern/kern_mutex.c
> >> > >
> >> > > Modified: head/sys/kern/kern_mutex.c
> >> > > ============================================================
> >> > ==================
> >> > > --- head/sys/kern/kern_mutex.c Sat Nov 25 20:37:13 2017
> >> > (r326199)
> >> >
> >> > Hi Mateusz,
> >> >
> >> > Could this be yours?
> >> >
> >> > spin lock 0xffffffff81ddc100 (turnstile chain) held by
> 0xfffff80014e57000
> >> > (tid 100277) too long
> >> > panic: spin lock held too long
> >> > cpuid = 20
> >> > time = 1511677687
> >> > KDB: stack backtrace:
> >> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> >> > 0xfffffe104f86ea40
> >> > vpanic() at vpanic+0x268/frame 0xfffffe104f86eb10
> >> > kproc_shutdown() at kproc_shutdown/frame 0xfffffe104f86eb70
> >> > _mtx_lock_spin_failed() at _mtx_lock_spin_failed+0x87/frame
> >> > 0xfffffe104f86eba0
> >> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x4ba/frame
> >> > 0xfffffe104f86ed10
> >> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x21f/frame
> >> > 0xfffffe104f86edb0
> >> > turnstile_trywait() at turnstile_trywait+0x32/frame 0xfffffe104f86edd0
> >> > __rw_rlock_hard() at __rw_rlock_hard+0x118/frame 0xfffffe104f86ee60
> >> > __rw_rlock_int() at __rw_rlock_int+0xd5/frame 0xfffffe104f86ee90
> >> > getblk() at getblk+0xdb/frame 0xfffffe104f86ef40
> >> > breadn_flags() at breadn_flags+0x6e/frame 0xfffffe104f86eff0
> >> > ffs_getcg() at ffs_getcg+0x20d/frame 0xfffffe104f86f0d0
> >> > ffs_nodealloccg() at ffs_nodealloccg+0xd0/frame 0xfffffe104f86f210
> >> > ffs_hashalloc() at ffs_hashalloc+0xb7/frame 0xfffffe104f86f290
> >> > ffs_valloc() at ffs_valloc+0x1c1/frame 0xfffffe104f86f390
> >> > ufs_makeinode() at ufs_makeinode+0xba/frame 0xfffffe104f86f520
> >> > ufs_create() at ufs_create+0x34/frame 0xfffffe104f86f540
> >> > VOP_CREATE_APV() at VOP_CREATE_APV+0x241/frame 0xfffffe104f86f5c0
> >> > VOP_CREATE() at VOP_CREATE+0x59/frame 0xfffffe104f86f620
> >> > vn_open_cred() at vn_open_cred+0x311/frame 0xfffffe104f86f770
> >> > vn_open() at vn_open+0x4c/frame 0xfffffe104f86f7b0
> >> > kern_openat() at kern_openat+0x212/frame 0xfffffe104f86f920
> >> > syscallenter() at syscallenter+0x4e4/frame 0xfffffe104f86f9f0
> >> > amd64_syscall() at amd64_syscall+0x4d/frame 0xfffffe104f86fab0
> >> >
> >> > https://people.freebsd.org/~pho/stress/log/mateusz004.txt
> >> >
> >> > - Peter
> >> >
> >>
> >> Fixed in r326237.
> >>
> >
> > Yes, that fixed the issue reported.
> > After some more tests I got this one:
> >
> > 20171127 01:19:57 all (31/561): mkfifo2c.sh
> > spin lock 0xffffffff81edace0 (smp rendezvous) held by 0xfffff80d2ae31000
> (tid 100529) too long
> > panic: spin lock held too long
> > cpuid = 14
> > time = 1511742163
> > KDB: stack backtrace:
> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> 0xfffffe105096c0b0
> > vpanic() at vpanic+0x19c/frame 0xfffffe105096c130
> > panic() at panic+0x43/frame 0xfffffe105096c190
> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame
> 0xfffffe105096c200
> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame
> 0xfffffe105096c240
> > smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame
> 0xfffffe105096c2c0
> > smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame
> 0xfffffe105096c2f0
> > pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame
> 0xfffffe105096c340
> > allocbuf() at allocbuf+0x107/frame 0xfffffe105096c3b0
> > brelse() at brelse+0x219/frame 0xfffffe105096c400
> > trunc_dependencies() at trunc_dependencies+0x745/frame 0xfffffe105096c4a0
> > softdep_setup_freeblocks() at softdep_setup_freeblocks+0x7b4/frame
> 0xfffffe105096c510
> > ffs_truncate() at ffs_truncate+0x6b8/frame 0xfffffe105096c700
> > ufs_inactive() at ufs_inactive+0x1cb/frame 0xfffffe105096c740
> > VOP_INACTIVE_APV() at VOP_INACTIVE_APV+0xfd/frame 0xfffffe105096c770
> > vinactive() at vinactive+0xe3/frame 0xfffffe105096c7c0
> > vputx() at vputx+0x31e/frame 0xfffffe105096c820
> > kern_rmdirat() at kern_rmdirat+0x1c9/frame 0xfffffe105096c980
> > amd64_syscall() at amd64_syscall+0x7ab/frame 0xfffffe105096cab0
> >
> > Not so much more info here, I'm afraid:
> > https://people.freebsd.org/~pho/stress/log/mateusz005.txt
> >
> > --
> > Peter
>
> I'm seeing a similar panic, at r326314:
>
> panic: spin lock held too long
> cpuid = 3
> time = 1511900768
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> 0xfffffe0b58bcef00
> vpanic() at vpanic+0x19c/frame 0xfffffe0b58bcef80
> panic() at panic+0x43/frame 0xfffffe0b58bcefe0
> _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame
> 0xfffffe0b58bcf050
> __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame
> 0xfffffe0b58bcf090
> smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame
> 0xfffffe0b58bcf110
> smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame
> 0xfffffe0b58bcf140
> pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame
> 0xfffffe0b58bcf190
> vm_thread_stack_dispose() at vm_thread_stack_dispose+0x2f/frame
> 0xfffffe0b58bcf1e0
> thread_free() at thread_free+0x39/frame 0xfffffe0b58bcf200
> thread_reap() at thread_reap+0x9e/frame 0xfffffe0b58bcf220
> thread_alloc() at thread_alloc+0xf/frame 0xfffffe0b58bcf240
> kthread_add() at kthread_add+0x43/frame 0xfffffe0b58bcf2e0
> _taskqueue_start_threads() at _taskqueue_start_threads+0xde/frame
> 0xfffffe0b58bcf370
> taskqueue_start_threads() at taskqueue_start_threads+0x3f/frame
> 0xfffffe0b58bcf3d0
> taskq_create_proc() at taskq_create_proc+0x92/frame 0xfffffe0b58bcf400
> spa_activate() at spa_activate+0x372/frame 0xfffffe0b58bcf4a0
> spa_open_common() at spa_open_common+0xd2/frame 0xfffffe0b58bcf510
> spa_get_stats() at spa_get_stats+0x4f/frame 0xfffffe0b58bcf6f0
> zfs_ioc_pool_stats() at zfs_ioc_pool_stats+0x25/frame 0xfffffe0b58bcf730
> zfsdev_ioctl() at zfsdev_ioctl+0x766/frame 0xfffffe0b58bcf7e0
> devfs_ioctl() at devfs_ioctl+0xcb/frame 0xfffffe0b58bcf830
> VOP_IOCTL_APV() at VOP_IOCTL_APV+0xd9/frame 0xfffffe0b58bcf860
> vn_ioctl() at vn_ioctl+0x124/frame 0xfffffe0b58bcf970
> devfs_ioctl_f() at devfs_ioctl_f+0x1f/frame 0xfffffe0b58bcf990
> kern_ioctl() at kern_ioctl+0x2c4/frame 0xfffffe0b58bcf9f0
> sys_ioctl() at sys_ioctl+0x15c/frame 0xfffffe0b58bcfac0
> amd64_syscall() at amd64_syscall+0x79b/frame 0xfffffe0b58bcfbf0
> Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe0b58bcfbf0
>
--
Mateusz Guzik <mjguzik gmail.com>
From owner-svn-src-all@freebsd.org Thu Nov 30 06:03:13 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF611DF9591;
Thu, 30 Nov 2017 06:03:13 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "Client", Issuer "CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 6B779765DE;
Thu, 30 Nov 2017 06:03:12 +0000 (UTC)
(envelope-from cy.schubert@komquats.com)
Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP
id KHw7eSI8Oss4TKHw9eXK2i; Wed, 29 Nov 2017 23:03:06 -0700
X-Authority-Analysis: v=2.2 cv=JuuBlIwC c=1 sm=1 tr=0
a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17
a=kj9zAlcOel0A:10 a=sC3jslCIGhcA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8
a=knX8lsZhYKQ9mOk2PLYA:9 a=k2ETrr8GBex8efOi:21 a=kM0Jw4yGHRywIaKM:21
a=NRzsi8a8g4lbl3px:21 a=CjuIK1q_8ugA:10 a=xsL0faLc8PcA:10
a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22
Received: from slippy.cwsent.com (slippy [10.1.1.91])
by spqr.komquats.com (Postfix) with ESMTPS id 9C3D08C2;
Wed, 29 Nov 2017 22:03:03 -0800 (PST)
Received: from slippy.cwsent.com (localhost [127.0.0.1])
by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id vAU633SG000577;
Wed, 29 Nov 2017 22:03:03 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Received: from slippy (cy@localhost)
by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id vAU633IK000574;
Wed, 29 Nov 2017 22:03:03 -0800 (PST)
(envelope-from Cy.Schubert@cschubert.com)
Message-Id: <201711300603.vAU633IK000574@slippy.cwsent.com>
X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs
X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7
Reply-to: Cy Schubert <Cy.Schubert@komquats.com>
From: Cy Schubert <Cy.Schubert@komquats.com>
X-os: FreeBSD
X-Sender: cy@cwsent.com
X-URL: http://www.cschubert.com/
To: Don Lewis <truckman@FreeBSD.org>
cc: Cy Schubert <Cy.Schubert@komquats.com>,
Hans Petter Selasky <hselasky@FreeBSD.org>, src-committers@freebsd.org,
svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject: Re: svn commit: r326376 - head/sys/kern
In-Reply-To: Message from Don Lewis <truckman@FreeBSD.org>
of "Wed, 29 Nov 2017 21:13:17 -0800." <tkrat.347f5c4c22bb6769@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 29 Nov 2017 22:03:03 -0800
X-CMAE-Envelope: MS4wfAjIrR27aXlpzUWnCNCAXH3FXo6cel5KjUp6+6u6OFDFdRKSrUeb5SJtVLwKaEG/ZLO2mybkXlukSaAgnLOoHIhjiT4pnR+V3FTRt5oeN0RVYAG1+GN3
gTCwDdgXe6NRV3MVDLKtYz08BwGlFdb1A6HTxdxb19bPBZAZU+RX7yUEjmMezUl1fx5sdH37NriWjFsqVK62b2kLWqtG+AEdDrWXSkoMLMhfLfjt18bEKSZj
VvZa1LD7DqK3XdJ6lOX0aLa6R3qstQciBjspKXnlUutJ0uvXJ1qoHAGH7LcI2r3evZRQ0lb1GfD8bZFnsXfcJQ==
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 06:03:13 -0000
In message <tkrat.347f5c4c22bb6769@FreeBSD.org>, Don Lewis writes:
> On 29 Nov, Cy Schubert wrote:
> > In message <201711292328.vATNSeOM046518@repo.freebsd.org>, Hans Petter
> > Selasky
> > writes:
> >> Author: hselasky
> >> Date: Wed Nov 29 23:28:40 2017
> >> New Revision: 326376
> >> URL: https://svnweb.freebsd.org/changeset/base/326376
> >>
> >> Log:
> >> The sched_add() function is not only used when the thread is initially
> >> started, but also by the turnstiles to mark a thread as runnable for
> >> all locks, for instance sleepqueues do:
> >> setrunnable()->sched_wakeup()->sched_add()
> >>
> >> In r326218 code was added to allow booting from non-zero CPU numbers
> >> by setting the ts_cpu field inside the ULE scheduler's sched_add()
> >> function. This had an undesired side-effect that prior sched_pin() and
> >> sched_bind() calls got disregarded. This patch fixes the
> >> initialization of the ts_cpu field for the ULE scheduler to only
> >> happen once when the initial thread is constructed during system
> >> init. Forking will then later on ensure that a valid ts_cpu value gets
> >> copied to all children.
> >>
> >> Reviewed by: jhb, kib
> >> Discussed with: nwhitehorn
> >> MFC after: 1 month
> >> Differential revision: https://reviews.freebsd.org/D13298
> >> Sponsored by: Mellanox Technologies
> >>
> >> Modified:
> >> head/sys/kern/sched_ule.c
> >>
> >> Modified: head/sys/kern/sched_ule.c
> >> ==========================================================================
> ===
> >> =
> >> --- head/sys/kern/sched_ule.c Wed Nov 29 21:16:14 2017 (r32637
> 5)
> >> +++ head/sys/kern/sched_ule.c Wed Nov 29 23:28:40 2017 (r32637
> 6)
> >> @@ -1405,7 +1405,6 @@ sched_setup(void *dummy)
> >>
> >> /* Add thread0's load since it's running. */
> >> TDQ_LOCK(tdq);
> >> - td_get_sched(&thread0)->ts_cpu = curcpu; /* Something valid to start */
> >> thread0.td_lock = TDQ_LOCKPTR(TDQ_SELF());
> >> tdq_load_add(tdq, &thread0);
> >> tdq->tdq_lowpri = thread0.td_priority;
> >> @@ -1642,6 +1641,7 @@ schedinit(void)
> >> ts0->ts_ltick = ticks;
> >> ts0->ts_ftick = ticks;
> >> ts0->ts_slice = 0;
> >> + ts0->ts_cpu = curcpu; /* set valid CPU number */
> >> }
> >>
> >> /*
> >> @@ -2453,7 +2453,6 @@ sched_add(struct thread *td, int flags)
> >> * Pick the destination cpu and if it isn't ours transfer to the
> >> * target cpu.
> >> */
> >> - td_get_sched(td)->ts_cpu = curcpu; /* Pick something valid to start */
> >> cpu = sched_pickcpu(td, flags);
> >> tdq = sched_setcpu(td, cpu, flags);
> >> tdq_add(tdq, td, flags);
> >>
> >
> > Hi Hans,
> >
> > Sorry I didn't get to this sooner: $JOB (and I have a change window in an
> > hour).
> >
> > I sent you a couple of photos from my laptop however I've been able to
> > reproduce this on my testbed.
> >
> > It boots okay without INVARIANTS and and WITNESS however with them it gets
> > a double fault.
> >
> > Type '?' for a list of commands, 'help' for more detailed help.
> > OK include /boot/testbed/amd64-current-t
> > /
> >
> > testbed/amd64-current-t (12.0-CURRENT) loader file selected
> > /
> > unload complete
> > vfs.zfs.arc_max set to 1024M
> > vm.kmem_size set to 1536M
> > vm.kmem_size_max set to 1536M
> > currdev set to disk1s3f:
> >
> > /boot/kernel/kernel text=0xc3262c data=0xc5288+0x3a5048
> > syms=[0x8+0x116508+0x8+0x11285a]
> > /boot/kernel/if_sk.ko size 0x17cd0 at 0x16c6000
> > /boot/kernel/if_nfe.ko size 0x1a710 at 0x16de000
> > /boot/kernel/opensolaris.ko size 0xd6e0 at 0x16f9000
> > /boot/kernel/zfs.ko size 0x4ef290 at 0x1707000
> > /boot/kernel/amdtemp.ko size 0x53d0 at 0x1bf7000
> > loading required module 'amdsmn'
> > /boot/kernel/amdsmn.ko size 0x2d78 at 0x1bfd000
> > /boot/kernel/cpufreq.ko size 0x168c0 at 0x1c00000
> > /boot/kernel/tmpfs.ko size 0x203b0 at 0x1c17000
> > /boot/kernel/fdescfs.ko size 0x9d98 at 0x1c38000
> > /boot/kernel/nullfs.ko size 0xd308 at 0x1c42000
> > -
> > new kernel has been loaded
> >
> > OK boot
> > Booting...
> > GDB: no debug ports present
> > KDB: debugger backends: ddb
> > KDB: current backend: ddb
> > Copyright (c) 1992-2017 The FreeBSD Project.
> > Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
> > The Regents of the University of California. All rights reserved.
> > FreeBSD is a registered trademark of The FreeBSD Foundation.
> > FreeBSD 12.0-CURRENT #0 r326382M: Wed Nov 29 19:44:24 PST 2017
> > root@bob:/export/obj/opt/src/svn-current/amd64.amd64/sys/BREAK4 amd64
> > FreeBSD clang version 5.0.0 (tags/RELEASE_500/final 312559) (based on LLVM
> > 5.0.0svn)
> > WARNING: WITNESS option enabled, expect reduced performance.
> > VT(vga): text 80x25
> > CPU: AMD Athlon(tm) 64 X2 Dual Core Processor 5000+ (2612.09-MHz K8-class
> > CPU)
> > Origin="AuthenticAMD" Id=0x60fb2 Family=0xf Model=0x6b Stepping=2
> > Features=0x178bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,
> M
> > CA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2,HTT>
> > Features2=0x2001<SSE3,CX16>
> > AMD Features=0xea500800<SYSCALL,NX,MMX+,FFXSR,RDTSCP,LM,3DNow!+,3DNow!>
> > AMD Features2=0x11f<LAHF,CMP,SVM,ExtAPIC,CR8,Prefetch>
> > SVM: NAsids=64
> > real memory = 5368709120 (5120 MB)
> > avail memory = 5134057472 (4896 MB)
> > Event timer "LAPIC" quality 100
> > ACPI APIC Table: <Nvidia ASUSACPI>
> > FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
> > FreeBSD/SMP: 1 package(s) x 2 core(s)
> > arc4random: no preloaded entropy cache
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aEventBlock:
> > 32/8 (20171110/tbfadt-748)
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Pm1aControlBlock:
> > 16/8 (20171110/tbfadt-748)
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/PmTimerBlock: 32/8
> > (20171110/tbfadt-748)
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe0Block: 64/8
> > (20171110/tbfadt-748)
> > Firmware Warning (ACPI): 32/64X length mismatch in FADT/Gpe1Block: 128/8
> > (20171110/tbfadt-748)
> > Firmware Warning (ACPI): Invalid length for FADT/Pm1aEventBlock: 8, using
> > default 32 (20171110/tbfadt-850)
> > Firmware Warning (ACPI): Invalid length for FADT/Pm1aControlBlock: 8, using
>
> > default 16 (20171110/tbfadt-850)
> > Firmware Warning (ACPI): Invalid length for FADT/PmTimerBlock: 8, using
> > default 32 (20171110/tbfadt-850)
> > ioapic0: Changing APIC ID to 4
> > ioapic0 <Version 1.1> irqs 0-23 on motherboard
> > random: entropy device external interface
> > module_register_init: MOD_LOAD (vesa, 0xffffffff80cad0f0, 0) error 19
> > nexus0
> > vtvga0: <VT VGA driver> on motherboard
> > cryptosoft0: <software crypto> on motherboard
> > acpi0: <Nvidia ASUSACPI> on motherboard
> > ACPI Error: Could not find/resolve named package element: \_PR_.CPU0
> > (20171110/dspkginit-513)
> > acpi0: Power Button (fixed)
> > cpu0: <ACPI CPU> on acpi0
> > cpu1: <ACPI CPU> on acpi0
> > attimer0: <AT timer> port 0x40-0x43 on acpi0
> > Timecounter "i8254" frequency 1193182 Hz quality 0
> > Event timer "i8254" frequency 1193182 Hz quality 100
> > hpet0: <High Precision Event Timer> iomem 0xfefff000-0xfefff3ff irq 0,8 on
> > acpi0
> > Timecounter "HPET" frequency 25000000 Hz quality 950
> > atrtc0: <AT realtime clock> port 0x70-0x73 on acpi0
> > atrtc0: registered as a time-of-day clock, resolution 1.000000s
> > Event timer "RTC" frequency 32768 Hz quality 0
> > Timecounter "ACPI-fast" frequency 3579545 Hz quality 900
> > acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
> > acpi_button0: <Power Button> on acpi0
> > pcib0: <ACPI Host-PCI bridge> port 0xcf8-0xcff on acpi0
> > pci0: <ACPI PCI bus> on pcib0
> > pci0: <memory, RAM> at device 0.0 (no driver attached)
> > isab0: <PCI-ISA bridge> at device 1.0 on pci0
> > isa0: <ISA bus> on isab0
> > ohci0: <nVidia nForce MCP55 USB Controller> mem 0xfe02f000-0xfe02ffff irq
> > 21 at device 2.0 on pci0
> > usbus0 on ohci0
> > ehci0: <NVIDIA nForce MCP55 USB 2.0 controller> mem 0xfe02e000-0xfe02e0ff
> > irq 22 at device 2.1 on pci0
> > usbus1: EHCI version 1.0
> > usbus1 on ehci0
> > atapci0: <nVidia nForce MCP55 UDMA133 controller> port
> > 0x1f0-0x1f7,0x3f6,0x170-0x177,0x376,0xfc00-0xfc0f at device 4.0 on pci0
> > ata0: <ATA channel> at channel 0 on atapci0
> > ata1: <ATA channel> at channel 1 on atapci0
> > atapci1: <nVidia nForce MCP55 SATA300 controller> port
> > 0x9f0-0x9f7,0xbf0-0xbf3,0x970-0x977,0xb70-0xb73,0xf700-0xf70f mem
> > 0xfe02d000-0xfe02dfff irq 23 at device 5.0 on pci0
> > ata2: <ATA channel> at channel 0 on atapci1
> > ata3: <ATA channel> at channel 1 on atapci1
> > atapci2: <nVidia nForce MCP55 SATA300 controller> port
> > 0x9e0-0x9e7,0xbe0-0xbe3,0x960-0x967,0xb60-0xb63,0xf200-0xf20f mem
> > 0xfe02c000-0xfe02cfff irq 20 at device 5.1 on pci0
> > ata4: <ATA channel> at channel 0 on atapci2
> > ata5: <ATA channel> at channel 1 on atapci2
> > atapci3: <nVidia nForce MCP55 SATA300 controller> port
> > 0xf100-0xf107,0xf000-0xf003,0xef00-0xef07,0xee00-0xee03,0xed00-0xed0f mem
> > 0xfe02b000-0xfe02bfff irq 21 at device 5.2 on pci0
> > ata6: <ATA channel> at channel 0 on atapci3
> > ata7: <ATA channel> at channel 1 on atapci3
> > pcib1: <ACPI PCI-PCI bridge> at device 6.0 on pci0
> > pci1: <ACPI PCI bus> on pcib1
> > pci1: <network, ethernet> at device 6.0 (no driver attached)
> > skc0: <D-Link DGE-530T Gigabit Ethernet> port 0xd800-0xd8ff mem
> > 0xfdef8000-0xfdefbfff irq 17 at device 7.0 on pci1
> > skc0: DGE-530T Gigabit Ethernet Adapter rev. (0x1)
> > sk0: <Marvell Semiconductor, Inc. Yukon> on skc0
> > sk0: Ethernet address: 00:13:46:73:0c:0d
> > miibus0: <MII bus> on sk0
> > e1000phy0: <Marvell 88E1011 Gigabit PHY> PHY 0 on miibus0
> > e1000phy0: none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
> > 1000baseT, 1000baseT-master, 1000baseT-FDX, 1000baseT-FDX-master, auto
> > pci0: <multimedia, HDA> at device 6.1 (no driver attached)
> > nfe0: <NVIDIA nForce MCP55 Networking Adapter> port 0xec00-0xec07 mem
> > 0xfe02a000-0xfe02afff,0xfe029000-0xfe0290ff,0xfe028000-0xfe02800f irq 23 at
>
> > device 8.0 on pci0
> > miibus1: <MII bus> on nfe0
> > e1000phy1: <Marvell 88E1116 Gigabit PHY> PHY 1 on miibus1
> > e1000phy1: none, 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX,
> > 1000baseT, 1000baseT-master, 1000baseT-FDX, 1000baseT-FDX-master, auto,
> > auto-flow
> > nfe0: Using defaults for TSO: 65518/35/2048
> > nfe0: Ethernet address: 00:18:f3:a0:dc:a4
> > pcib2: <ACPI PCI-PCI bridge> at device 15.0 on pci0
> > pci2: <ACPI PCI bus> on pcib2
> > vgapci0: <VGA-compatible display> mem 0xe8000000-0xefffffff,0xfddfe000-0xfd
> d
> > fffff irq 16 at device 0.0 on pci2
> > vgapci0: Boot video device
> > amdtemp0: <AMD CPU On-Die Thermal Sensors> on hostb3
> > acpi_tz0: <Thermal Zone> on acpi0
> > fdc0: <floppy drive controller> port 0x3f0-0x3f5,0x3f7 irq 6 drq 2 on acpi0
> > fd0: <1440-KB 3.5" drive> on fdc0 drive 0
> > uart0: <16550 or compatible> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
> > uart0: console (9600,n,8,1)
> > orm0: <ISA Option ROM> at iomem 0xc0000-0xcc7ff on isa0
> > vga0: <Generic ISA VGA> at port 0x3c0-0x3df iomem 0xa0000-0xbffff on isa0
> > atkbdc0: <Keyboard controller (i8042)> at port 0x60,0x64 on isa0
> > atkbd0: <AT Keyboard> irq 1 on atkbdc0
> > kbd0 at atkbd0
> > atkbd0: [GIANT-LOCKED]
> > powernow0: <PowerNow! K8> on cpu0
> > powernow1: <PowerNow! K8> on cpu1
> > ZFS filesystem version: 5
> > ZFS storage pool version: features support (5000)
> > Timecounters tick every 1.000 msec
> > usbus0: 12Mbps Full Speed USB v1.0
> > usbus1: 480Mbps High Speed USB v2.0
> > ugen0.1: <nVidia OHCI root HUB> at usbus0
> > uhub0: <nVidia OHCI root HUB, class 9/0, rev 1.00/1.00, addr 1> on usbus0
> > ugen1.1: <nVidia EHCI root HUB> at usbus1
> > uhub1: <nVidia EHCI root HUB, class 9/0, rev 2.00/1.00, addr 1> on usbus1
> > uhub0: 10 ports with 10 removable, self powered
> > uhub1: 10 ports with 10 removable, self powered
> > ada0 at ata0 bus 0 scbus0 target 0 lun 0
> > ada0: <SAMSUNG SP0802N TK100-24> ATA-7 device
> > ada0: Serial Number S00JJ20X889726
> > ada0: 100.000MB/s transfers (UDMA5, PIO 8192bytes)
> > ada0: 76351MB (156368016 512 byte sectors)
> > ada1 at ata0 bus 0 scbus0 target 1 lun 0
> > ada1: <Maxtor 6Y120P0 YAR41BW0> ATA-7 device
> > ada1: Serial Number Y327ZJ1E
> > ada1: 133.000MB/s transfers (UDMA6, PIO 8192bytes)
> > ada1: 117246MB (240121728 512 byte sectors)
> > ada2 at ata2 bus 0 scbus2 target 0 lun 0
> > ada2: <ST3500413AS JC4B> ATA8-ACS SATA 3.x device
> > ada2: Serial Number 6VMRAGM7
> > ada2: 300.000MB/s transfers (SATA 2.x, UDMA5, PIO 8192bytes)
> > ada2: 476940MB (976773168 512 byte sectors)
> > ada3 at ata3 bus 0 scbus3 target 0 lun 0
> > ada3: <ST3320620AS 3.ADG> ATA-7 SATA 2.x device
> > ada3: Serial Number 9QFA0729
> > ada3: 300.000MB/s transfers (SATA 2.x, UDMA5, PIO 8192bytes)
> > ada3: 305245MB (625142448 512 byte sectors)
> > SMP: AP CPU #1 Launched!
> > random: unblocking device.
> > WARNING: WITNESS option enabled, expect reduced performance.
> > arc4random: no preloaded entropy cache
> > arc4random: no preloaded entropy cache
> > Trying to mount root from ufs:/dev/ada0s3f [rw]...
> > sysctl: kern.ipc.nmbclusters=32768 at line 28: Invalid argument
> > Setting hostuuid: 3428e43e-d455-9478-f48e-14a3b4bb94dd.
> > Setting hostid: 0x448c33e0.
> >
> > Fatal double fault
> > rip 0xffffffff80793105 rsp 0xfffffe0036358fe0 rbp 0xfffffe0036359150
> > rax 0 rdx 0xfffffe00363590f8 rbx 0x2
> > rcx 0x1 rsi 0x2 rdi 0
> > r8 0xfffffe00363592f0 r9 0xfffffe0036359350 r10 0
> > r11 0 r12 0x60 r13 0xfffffe003635b200
> > r14 0xfffffe0036359d30 r15 0x60 rflags 0x10002
> > cs 0x20 ss 0x28 ds 0x3b es 0x3b fs 0x13 gs 0x1b
> > fsbase 0x80063f8b0 gsbase 0xffffffff8142be80 kgsbase 0
> > cpuid = 1; apic id = 01
> > panic: double fault
> > cpuid = 1
> > time = 1511985616
> > KDB: stack backtrace:
> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2c/frame
> > 0xfffffe00003fdb40
> > kdb_backtrace() at kdb_backtrace+0x53/frame 0xfffffe00003fdc10
> > vpanic() at vpanic+0x268/frame 0xfffffe00003fdce0
> > kproc_shutdown() at kproc_shutdown/frame 0xfffffe00003fdd40
> > dblfault_handler() at dblfault_handler+0x387/frame 0xfffffe00003fdf30
> > Xdblfault() at Xdblfault+0xac/frame 0xfffffe00003fdf30
> > --- trap 0x17, rip = 0xffffffff80793105, rsp = 0xfffffe0036358fe0, rbp =
> > 0xfffffe0036359150 ---
> > cpu_search_lowest() at cpu_search_lowest+0x1b5/frame 0xfffffe0036359150
> > cpu_search_lowest() at cpu_search_lowest+0x35e/frame 0xfffffe00363592d0
> > sched_lowest() at sched_lowest+0x66/frame 0xfffffe0036359340
> > sched_pickcpu() at sched_pickcpu+0x5af/frame 0xfffffe0036359470
> > sched_add() at sched_add+0x111/frame 0xfffffe00363594e0
> > sched_wakeup() at sched_wakeup+0x10a/frame 0xfffffe0036359530
> > setrunnable() at setrunnable+0x1c8/frame 0xfffffe0036359580
> > sleepq_resume_thread() at sleepq_resume_thread+0x634/frame
> > 0xfffffe0036359600
> > sleepq_remove_matching() at sleepq_remove_matching+0xa9/frame
> > 0xfffffe0036359660
> > sleepq_broadcast() at sleepq_broadcast+0x142/frame 0xfffffe00363596a0
> > wakeup() at wakeup+0x29/frame 0xfffffe00363596d0
> > g_io_request() at g_io_request+0x739/frame 0xfffffe0036359750
> > vdev_geom_io_start() at vdev_geom_io_start+0x582/frame 0xfffffe0036359800
> > zio_vdev_io_start() at zio_vdev_io_start+0x962/frame 0xfffffe0036359950
> > zio_execute() at zio_execute+0x28a/frame 0xfffffe00363599b0
> > zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359a00
> > vdev_cache_read() at vdev_cache_read+0x47c/frame 0xfffffe0036359b20
> > zio_vdev_io_start() at zio_vdev_io_start+0x82a/frame 0xfffffe0036359c70
> > zio_execute() at zio_execute+0x28a/frame 0xfffffe0036359cd0
> > zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359d20
> > vdev_mirror_io_start() at vdev_mirror_io_start+0x28a/frame
> > 0xfffffe0036359dc0
> > zio_vdev_io_start() at zio_vdev_io_start+0x11f/frame 0xfffffe0036359f10
> > zio_execute() at zio_execute+0x28a/frame 0xfffffe0036359f70
> > zio_nowait() at zio_nowait+0x129/frame 0xfffffe0036359fc0
> > arc_read() at arc_read+0x1e8f/frame 0xfffffe003635a380
> > traverse_prefetch_metadata() at traverse_prefetch_metadata+0x21b/frame
> > 0xfffffe003635a3f0
> > traverse_visitbp() at traverse_visitbp+0x831/frame 0xfffffe003635a600
> > traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635a810
> > traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635aa20
> > traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635ac30
> > traverse_visitbp() at traverse_visitbp+0x8d6/frame 0xfffffe003635ae40
> > traverse_dnode() at traverse_dnode+0x176/frame 0xfffffe003635aee0
> > traverse_visitbp() at traverse_visitbp+0xde8/frame 0xfffffe003635b0f0
> > traverse_impl() at traverse_impl+0x73a/frame 0xfffffe003635b320
> > traverse_dataset_resume() at traverse_dataset_resume+0x92/frame
> > 0xfffffe003635b390
> > traverse_dataset() at traverse_dataset+0x43/frame 0xfffffe003635b3d0
> > traverse_pool() at traverse_pool+0x1da/frame 0xfffffe003635b4d0
> > spa_load_verify() at spa_load_verify+0x15e/frame 0xfffffe003635b580
> > spa_load_impl() at spa_load_impl+0x2241/frame 0xfffffe003635ba30
> > spa_load() at spa_load+0x301/frame 0xfffffe003635baf0
> > spa_load_impl() at spa_load_impl+0x1445/frame 0xfffffe003635bfa0
> > spa_load() at spa_load+0x301/frame 0xfffffe003635c060
> > spa_load_best() at spa_load_best+0xbd/frame 0xfffffe003635c100
> > spa_open_common() at spa_open_common+0x228/frame 0xfffffe003635c1f0
> > spa_open() at spa_open+0x35/frame 0xfffffe003635c220
> > pool_status_check() at pool_status_check+0x8e/frame 0xfffffe003635c280
> > zfsdev_ioctl() at zfsdev_ioctl+0xb9d/frame 0xfffffe003635c540
> > devfs_ioctl() at devfs_ioctl+0x187/frame 0xfffffe003635c5e0
> > VOP_IOCTL_APV() at VOP_IOCTL_APV+0x227/frame 0xfffffe003635c660
> > VOP_IOCTL() at VOP_IOCTL+0x6e/frame 0xfffffe003635c6e0
> > vn_ioctl() at vn_ioctl+0x1cc/frame 0xfffffe003635c820
> > devfs_ioctl_f() at devfs_ioctl_f+0x62/frame 0xfffffe003635c870
> > fo_ioctl() at fo_ioctl+0x4c/frame 0xfffffe003635c8b0
> > kern_ioctl() at kern_ioctl+0x361/frame 0xfffffe003635c980
> > sys_ioctl() at sys_ioctl+0x2af/frame 0xfffffe003635ca60
> > syscallenter() at syscallenter+0x4e4/frame 0xfffffe003635cb30
> > amd64_syscall() at amd64_syscall+0x1b/frame 0xfffffe003635cbf0
> > Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe003635cbf0
> > --- syscall (54, FreeBSD ELF64, sys_ioctl), rip = 0x80143b5aa, rsp =
> > 0x7fffffffcf78, rbp = 0x7fffffffcff0 ---
> > KDB: enter: panic
> > [ thread pid 44 tid 100102 ]
> > Stopped at breakpoint+0x5: popq %rbp
> > db>
>
> Looks like a kernel stack overflow. That's a pretty deep call stack.
> Try setting kern.kstack_pages to a larger value (> 4) in the loader.
>
Yes. That fixed it.
Interestingly without WITNESS and INVARIANTS it booted but with, a stack
overflow. We should probably consider increasing default kern.kstack_pages
to 6.
--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
From owner-svn-src-all@freebsd.org Thu Nov 30 06:41:47 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4418DFA2D9;
Thu, 30 Nov 2017 06:41:47 +0000 (UTC) (envelope-from pho@holm.cc)
Received: from relay01.pair.com (relay01.pair.com [209.68.5.15])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8B0E1776D1;
Thu, 30 Nov 2017 06:41:46 +0000 (UTC) (envelope-from pho@holm.cc)
Received: from x2.osted.lan (87-58-223-204-dynamic.dk.customer.tdc.net
[87.58.223.204])
by relay01.pair.com (Postfix) with ESMTP id BBD94D0037A;
Thu, 30 Nov 2017 01:41:39 -0500 (EST)
Received: from x2.osted.lan (localhost [127.0.0.1])
by x2.osted.lan (8.14.9/8.14.9) with ESMTP id vAU6fbwG088127
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Thu, 30 Nov 2017 07:41:37 +0100 (CET)
(envelope-from pho@x2.osted.lan)
Received: (from pho@localhost)
by x2.osted.lan (8.14.9/8.14.9/Submit) id vAU6fbY9088126;
Thu, 30 Nov 2017 07:41:37 +0100 (CET) (envelope-from pho)
Date: Thu, 30 Nov 2017 07:41:37 +0100
From: Peter Holm <peter@holm.cc>
To: Mateusz Guzik <mjguzik@gmail.com>
Cc: Alan Somers <asomers@freebsd.org>, Mateusz Guzik <mjg@freebsd.org>,
"src-committers@freebsd.org" <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Subject: Re: svn commit: r326200 - head/sys/kern
Message-ID: <20171130064137.GA88002@x2.osted.lan>
References: <201711252049.vAPKnRaA026691@repo.freebsd.org>
<20171126064927.GA68986@x2.osted.lan>
<CAGudoHGzi08_Th3DDkyMSWG006akL=fhF08SfZzgE2CBCA1H4Q@mail.gmail.com>
<20171127064940.GA91390@x2.osted.lan>
<CAOtMX2hpG44t=djBsO4+xfvYuA0TY2+TkueZ9UgFJiN=1MGvbw@mail.gmail.com>
<CAGudoHFKvn3+sLZXN-8ahDV4uZG=RRt27cff-eoOeqCj5o649w@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAGudoHFKvn3+sLZXN-8ahDV4uZG=RRt27cff-eoOeqCj5o649w@mail.gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 06:41:47 -0000
On Thu, Nov 30, 2017 at 06:18:54AM +0100, Mateusz Guzik wrote:
> So this is not my bug after all, it just had unfortunate timing with
> scheduler changes.
>
> I can't reproduce anything with r326376.
>
Thank you for investigating.
- Peter
> On Tue, Nov 28, 2017 at 9:37 PM, Alan Somers <asomers@freebsd.org> wrote:
>
> > On Sun, Nov 26, 2017 at 11:49 PM, Peter Holm <peter@holm.cc> wrote:
> > > On Sun, Nov 26, 2017 at 10:11:21PM +0100, Mateusz Guzik wrote:
> > >> On Sun, Nov 26, 2017 at 7:49 AM, Peter Holm <peter@holm.cc> wrote:
> > >>
> > >> > On Sat, Nov 25, 2017 at 08:49:27PM +0000, Mateusz Guzik wrote:
> > >> > > Author: mjg
> > >> > > Date: Sat Nov 25 20:49:27 2017
> > >> > > New Revision: 326200
> > >> > > URL: https://svnweb.freebsd.org/changeset/base/326200
> > >> > >
> > >> > > Log:
> > >> > > Add the missing lockstat check for thread lock.
> > >> > >
> > >> > > Modified:
> > >> > > head/sys/kern/kern_mutex.c
> > >> > >
> > >> > > Modified: head/sys/kern/kern_mutex.c
> > >> > > ============================================================
> > >> > ==================
> > >> > > --- head/sys/kern/kern_mutex.c Sat Nov 25 20:37:13 2017
> > >> > (r326199)
> > >> >
> > >> > Hi Mateusz,
> > >> >
> > >> > Could this be yours?
> > >> >
> > >> > spin lock 0xffffffff81ddc100 (turnstile chain) held by
> > 0xfffff80014e57000
> > >> > (tid 100277) too long
> > >> > panic: spin lock held too long
> > >> > cpuid = 20
> > >> > time = 1511677687
> > >> > KDB: stack backtrace:
> > >> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> > >> > 0xfffffe104f86ea40
> > >> > vpanic() at vpanic+0x268/frame 0xfffffe104f86eb10
> > >> > kproc_shutdown() at kproc_shutdown/frame 0xfffffe104f86eb70
> > >> > _mtx_lock_spin_failed() at _mtx_lock_spin_failed+0x87/frame
> > >> > 0xfffffe104f86eba0
> > >> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x4ba/frame
> > >> > 0xfffffe104f86ed10
> > >> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0x21f/frame
> > >> > 0xfffffe104f86edb0
> > >> > turnstile_trywait() at turnstile_trywait+0x32/frame 0xfffffe104f86edd0
> > >> > __rw_rlock_hard() at __rw_rlock_hard+0x118/frame 0xfffffe104f86ee60
> > >> > __rw_rlock_int() at __rw_rlock_int+0xd5/frame 0xfffffe104f86ee90
> > >> > getblk() at getblk+0xdb/frame 0xfffffe104f86ef40
> > >> > breadn_flags() at breadn_flags+0x6e/frame 0xfffffe104f86eff0
> > >> > ffs_getcg() at ffs_getcg+0x20d/frame 0xfffffe104f86f0d0
> > >> > ffs_nodealloccg() at ffs_nodealloccg+0xd0/frame 0xfffffe104f86f210
> > >> > ffs_hashalloc() at ffs_hashalloc+0xb7/frame 0xfffffe104f86f290
> > >> > ffs_valloc() at ffs_valloc+0x1c1/frame 0xfffffe104f86f390
> > >> > ufs_makeinode() at ufs_makeinode+0xba/frame 0xfffffe104f86f520
> > >> > ufs_create() at ufs_create+0x34/frame 0xfffffe104f86f540
> > >> > VOP_CREATE_APV() at VOP_CREATE_APV+0x241/frame 0xfffffe104f86f5c0
> > >> > VOP_CREATE() at VOP_CREATE+0x59/frame 0xfffffe104f86f620
> > >> > vn_open_cred() at vn_open_cred+0x311/frame 0xfffffe104f86f770
> > >> > vn_open() at vn_open+0x4c/frame 0xfffffe104f86f7b0
> > >> > kern_openat() at kern_openat+0x212/frame 0xfffffe104f86f920
> > >> > syscallenter() at syscallenter+0x4e4/frame 0xfffffe104f86f9f0
> > >> > amd64_syscall() at amd64_syscall+0x4d/frame 0xfffffe104f86fab0
> > >> >
> > >> > https://people.freebsd.org/~pho/stress/log/mateusz004.txt
> > >> >
> > >> > - Peter
> > >> >
> > >>
> > >> Fixed in r326237.
> > >>
> > >
> > > Yes, that fixed the issue reported.
> > > After some more tests I got this one:
> > >
> > > 20171127 01:19:57 all (31/561): mkfifo2c.sh
> > > spin lock 0xffffffff81edace0 (smp rendezvous) held by 0xfffff80d2ae31000
> > (tid 100529) too long
> > > panic: spin lock held too long
> > > cpuid = 14
> > > time = 1511742163
> > > KDB: stack backtrace:
> > > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> > 0xfffffe105096c0b0
> > > vpanic() at vpanic+0x19c/frame 0xfffffe105096c130
> > > panic() at panic+0x43/frame 0xfffffe105096c190
> > > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame
> > 0xfffffe105096c200
> > > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame
> > 0xfffffe105096c240
> > > smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame
> > 0xfffffe105096c2c0
> > > smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame
> > 0xfffffe105096c2f0
> > > pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame
> > 0xfffffe105096c340
> > > allocbuf() at allocbuf+0x107/frame 0xfffffe105096c3b0
> > > brelse() at brelse+0x219/frame 0xfffffe105096c400
> > > trunc_dependencies() at trunc_dependencies+0x745/frame 0xfffffe105096c4a0
> > > softdep_setup_freeblocks() at softdep_setup_freeblocks+0x7b4/frame
> > 0xfffffe105096c510
> > > ffs_truncate() at ffs_truncate+0x6b8/frame 0xfffffe105096c700
> > > ufs_inactive() at ufs_inactive+0x1cb/frame 0xfffffe105096c740
> > > VOP_INACTIVE_APV() at VOP_INACTIVE_APV+0xfd/frame 0xfffffe105096c770
> > > vinactive() at vinactive+0xe3/frame 0xfffffe105096c7c0
> > > vputx() at vputx+0x31e/frame 0xfffffe105096c820
> > > kern_rmdirat() at kern_rmdirat+0x1c9/frame 0xfffffe105096c980
> > > amd64_syscall() at amd64_syscall+0x7ab/frame 0xfffffe105096cab0
> > >
> > > Not so much more info here, I'm afraid:
> > > https://people.freebsd.org/~pho/stress/log/mateusz005.txt
> > >
> > > --
> > > Peter
> >
> > I'm seeing a similar panic, at r326314:
> >
> > panic: spin lock held too long
> > cpuid = 3
> > time = 1511900768
> > KDB: stack backtrace:
> > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
> > 0xfffffe0b58bcef00
> > vpanic() at vpanic+0x19c/frame 0xfffffe0b58bcef80
> > panic() at panic+0x43/frame 0xfffffe0b58bcefe0
> > _mtx_lock_spin_cookie() at _mtx_lock_spin_cookie+0x352/frame
> > 0xfffffe0b58bcf050
> > __mtx_lock_spin_flags() at __mtx_lock_spin_flags+0xd8/frame
> > 0xfffffe0b58bcf090
> > smp_targeted_tlb_shootdown() at smp_targeted_tlb_shootdown+0xd7/frame
> > 0xfffffe0b58bcf110
> > smp_masked_invlpg_range() at smp_masked_invlpg_range+0x50/frame
> > 0xfffffe0b58bcf140
> > pmap_invalidate_range() at pmap_invalidate_range+0x1f4/frame
> > 0xfffffe0b58bcf190
> > vm_thread_stack_dispose() at vm_thread_stack_dispose+0x2f/frame
> > 0xfffffe0b58bcf1e0
> > thread_free() at thread_free+0x39/frame 0xfffffe0b58bcf200
> > thread_reap() at thread_reap+0x9e/frame 0xfffffe0b58bcf220
> > thread_alloc() at thread_alloc+0xf/frame 0xfffffe0b58bcf240
> > kthread_add() at kthread_add+0x43/frame 0xfffffe0b58bcf2e0
> > _taskqueue_start_threads() at _taskqueue_start_threads+0xde/frame
> > 0xfffffe0b58bcf370
> > taskqueue_start_threads() at taskqueue_start_threads+0x3f/frame
> > 0xfffffe0b58bcf3d0
> > taskq_create_proc() at taskq_create_proc+0x92/frame 0xfffffe0b58bcf400
> > spa_activate() at spa_activate+0x372/frame 0xfffffe0b58bcf4a0
> > spa_open_common() at spa_open_common+0xd2/frame 0xfffffe0b58bcf510
> > spa_get_stats() at spa_get_stats+0x4f/frame 0xfffffe0b58bcf6f0
> > zfs_ioc_pool_stats() at zfs_ioc_pool_stats+0x25/frame 0xfffffe0b58bcf730
> > zfsdev_ioctl() at zfsdev_ioctl+0x766/frame 0xfffffe0b58bcf7e0
> > devfs_ioctl() at devfs_ioctl+0xcb/frame 0xfffffe0b58bcf830
> > VOP_IOCTL_APV() at VOP_IOCTL_APV+0xd9/frame 0xfffffe0b58bcf860
> > vn_ioctl() at vn_ioctl+0x124/frame 0xfffffe0b58bcf970
> > devfs_ioctl_f() at devfs_ioctl_f+0x1f/frame 0xfffffe0b58bcf990
> > kern_ioctl() at kern_ioctl+0x2c4/frame 0xfffffe0b58bcf9f0
> > sys_ioctl() at sys_ioctl+0x15c/frame 0xfffffe0b58bcfac0
> > amd64_syscall() at amd64_syscall+0x79b/frame 0xfffffe0b58bcfbf0
> > Xfast_syscall() at Xfast_syscall+0xfb/frame 0xfffffe0b58bcfbf0
> >
>
>
>
> --
> Mateusz Guzik <mjguzik gmail.com>
From owner-svn-src-all@freebsd.org Thu Nov 30 07:03:44 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0115BDFAB99;
Thu, 30 Nov 2017 07:03:44 +0000 (UTC)
(envelope-from scottl@samsco.org)
Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com
[66.111.4.28])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C4AB87869E;
Thu, 30 Nov 2017 07:03:43 +0000 (UTC)
(envelope-from scottl@samsco.org)
Received: from compute6.internal (compute6.nyi.internal [10.202.2.46])
by mailout.nyi.internal (Postfix) with ESMTP id BFB7220C8B;
Thu, 30 Nov 2017 02:03:41 -0500 (EST)
Received: from frontend2 ([10.202.2.161])
by compute6.internal (MEProxy); Thu, 30 Nov 2017 02:03:41 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsco.org; h=cc
:content-transfer-encoding:content-type:date:from:in-reply-to
:message-id:mime-version:references:subject:to:x-me-sender
:x-me-sender:x-sasl-enc; s=fm1; bh=N3LjB9rNng6MHNkNLcWu7N3TAy/JD
aIDplBzYKdAuWI=; b=CGQLxvJR0cxBFclScL4SPpQm+FJE36ApBW3YDYaEq+6i1
P6hu6y+4DZlJ69xKwjXA4lnEZ5QcbG022WkqyAJDb6yKGBj1fDHxNyHocd+Zl3Dd
EqcxcMmJW0UYOPiZbfEFMvbH+QJysImw/f90AHggheRMnrueEQdkRT9kTpFDPsyl
lXDllJUifytMKSTRBwHAl9SdAiVFyb+ibw+/RS+eUEsRVfBWG9FVYLVvz55WN8ma
VUlMlGgOpO6y+vwVGGWs2fabe/l7k33IwIWF49EreEsPudinveNZ4JTd2ov+ZLq7
hyEsjNm8qmkZTQ3ZXWU83UHCI+mQPwz3vQtLC8ISQ==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:content-type
:date:from:in-reply-to:message-id:mime-version:references
:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=N3LjB9
rNng6MHNkNLcWu7N3TAy/JDaIDplBzYKdAuWI=; b=UoFb1VwIf1f066N5SPXQ5P
gZJWTVxtp/pNfHsiNQ4TcKdjDIClieS1vAcwDvv60u+TgM4HforLXu12qhLmrGXI
zENHQuIcgHS7kVye2Q+7lTRhfwllHc56li+P+/0WG07KCFsQ9lOOab/nd+xWHuvF
Il1wbiRYwosH96p3tTlrKzZmE+mQvSP4u/GHS+hRP5RACbc5KpR6V1Bqyb9JB7VD
JphYBTZWgZzn5Ta5xbmOIdXqnv63jh2lvkiO2KEYKhZERerHm3d2tiYXyuVKSK6I
J21BJqg05lVv7wvrjLvaQa7JLutEcYkl7B81+6xVM34UIlqT6SM8e3ekobZm6u5Q
==
X-ME-Sender: <xms:Ta0fWtlUfW4FHFxmBCvFko0zBysC77heGIp6HuXx_enNZf15rRNSsQ>
Received: from [192.168.0.109] (unknown [161.97.249.191])
by mail.messagingengine.com (Postfix) with ESMTPA id 2431D243F9;
Thu, 30 Nov 2017 02:03:41 -0500 (EST)
Content-Type: text/plain;
charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 11.1 \(3445.4.7\))
Subject: Re: svn commit: r326377 - in head/sys: amd64/conf arm/conf i386/conf
mips/conf modules/aic7xxx/ahc modules/aic7xxx/ahd powerpc/conf
sparc64/conf
From: Scott Long <scottl@samsco.org>
In-Reply-To: <20171130115317.X1349@besplex.bde.org>
Date: Thu, 30 Nov 2017 00:03:38 -0700
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <B0B12180-C71B-4343-8B7D-FEA7673FEAB4@samsco.org>
References: <201711292341.vATNfoSS054606@repo.freebsd.org>
<20171130115317.X1349@besplex.bde.org>
To: Bruce Evans <brde@optusnet.com.au>
X-Mailer: Apple Mail (2.3445.4.7)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 07:03:44 -0000
> On Nov 29, 2017, at 6:19 PM, Bruce Evans <brde@optusnet.com.au> wrote:
>=20
> On Wed, 29 Nov 2017, Scott Long wrote:
>=20
>> Log:
>> It's time to retire AHC_REG_PRETTY_PRINT and AHD_REG_PRETTY_PRINT =
from
>> the standard kernels. They are still available as custom compile
>> options.
>=20
> MI NOTES still gives MI sizes for these options. It seems unlikely
> that these sizes are still correct even for 1 arch where they were =
measured
> on.
>=20
Today, I measured a savings of ~130KiB when both options were removed. =
I
also did the original size measurements back in 2000-whatever. I=E2=80=99=
m guessing
that the difference is due to improvements in compiler technology.
>> Modified: head/sys/amd64/conf/GENERIC
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/amd64/conf/GENERIC Wed Nov 29 23:28:40 2017 =
(r326376)
>> +++ head/sys/amd64/conf/GENERIC Wed Nov 29 23:41:49 2017 =
(r326377)
>> @@ -123,11 +123,7 @@ device siis # =
SiliconImage SiI3124/SiI3132/SiI3531
>>=20
>> # SCSI Controllers
>> device ahc # AHA2940 and onboard =
AIC7xxx devices
>> -options AHC_REG_PRETTY_PRINT # Print register bitfields in =
debug
>> - # output. Adds ~128k to driver.
>> device ahd # AHA39320/29320 and =
onboard AIC79xx devices
>> -options AHD_REG_PRETTY_PRINT # Print register bitfields in =
debug
>> - # output. Adds ~215k to driver.
>=20
> k is a bogus unit for memory sizes. NOTES has the same bug.
>=20
>> Modified: head/sys/i386/conf/GENERIC
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/sys/i386/conf/GENERIC Wed Nov 29 23:28:40 2017 =
(r326376)
>> +++ head/sys/i386/conf/GENERIC Wed Nov 29 23:41:49 2017 =
(r326377)
>> @@ -120,11 +120,6 @@ device siis # =
SiliconImage SiI3124/SiI3132/SiI3531
>>=20
>> # SCSI Controllers
>> device ahc # AHA2940 and onboard =
AIC7xxx devices
>> -options AHC_REG_PRETTY_PRINT # Print register bitfields in =
debug
>> - # output. Adds ~128k to driver.
>> -device ahd # AHA39320/29320 and =
onboard AIC79xx devices
>> -options AHD_REG_PRETTY_PRINT # Print register bitfields in =
debug
>> - # output. Adds ~215k to driver.
>> device esp # AMD Am53C974 (Tekram =
DC-390(T))
>> device hptiop # Highpoint RocketRaid =
3xxx series
>> device isp # Qlogic family
>>=20
>=20
> This also removes ahd. This bug is only new on i386/GENERIC.
Oops!
> Other arches
> except amd64 never had ahd. arm/conf/CRB was most broken -- it had 2 =
PRETTY
> options but neither ahc or ahd. Perhaps these old drivers don't =
belong in
> any GENERIC.
There=E2=80=99s a good argument to be made for doing a house-cleaning of =
GENERIC
between now and when FreeBSD 12.0 is released.
Scott
From owner-svn-src-all@freebsd.org Thu Nov 30 07:08:47 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D760DFAD50;
Thu, 30 Nov 2017 07:08:47 +0000 (UTC)
(envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 45F937889B;
Thu, 30 Nov 2017 07:08:47 +0000 (UTC)
(envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU78kLu051241;
Thu, 30 Nov 2017 07:08:46 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU78kD8051237;
Thu, 30 Nov 2017 07:08:46 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201711300708.vAU78kD8051237@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 30 Nov 2017 07:08:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326385 - head/usr.bin/pr
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/usr.bin/pr
X-SVN-Commit-Revision: 326385
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 07:08:47 -0000
Author: eadler
Date: Thu Nov 30 07:08:45 2017
New Revision: 326385
URL: https://svnweb.freebsd.org/changeset/base/326385
Log:
Remove advertising clause from pr(1)
Permitted by https://www.freebsd.org/copyright/license.html
Renumber 4->3 to be consistent with other files
Modified:
head/usr.bin/pr/egetopt.c
head/usr.bin/pr/extern.h
head/usr.bin/pr/pr.c
head/usr.bin/pr/pr.h
Modified: head/usr.bin/pr/egetopt.c
==============================================================================
--- head/usr.bin/pr/egetopt.c Thu Nov 30 05:01:56 2017 (r326384)
+++ head/usr.bin/pr/egetopt.c Thu Nov 30 07:08:45 2017 (r326385)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
Modified: head/usr.bin/pr/extern.h
==============================================================================
--- head/usr.bin/pr/extern.h Thu Nov 30 05:01:56 2017 (r326384)
+++ head/usr.bin/pr/extern.h Thu Nov 30 07:08:45 2017 (r326385)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,11 +16,8 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
* California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
Modified: head/usr.bin/pr/pr.c
==============================================================================
--- head/usr.bin/pr/pr.c Thu Nov 30 05:01:56 2017 (r326384)
+++ head/usr.bin/pr/pr.c Thu Nov 30 07:08:45 2017 (r326385)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
Modified: head/usr.bin/pr/pr.h
==============================================================================
--- head/usr.bin/pr/pr.h Thu Nov 30 05:01:56 2017 (r326384)
+++ head/usr.bin/pr/pr.h Thu Nov 30 07:08:45 2017 (r326385)
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
From owner-svn-src-all@freebsd.org Thu Nov 30 07:15:33 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A161CDFB056;
Thu, 30 Nov 2017 07:15:33 +0000 (UTC)
(envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6CBA478DB1;
Thu, 30 Nov 2017 07:15:33 +0000 (UTC)
(envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU7FWDx055458;
Thu, 30 Nov 2017 07:15:32 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU7FWkZ055457;
Thu, 30 Nov 2017 07:15:32 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201711300715.vAU7FWkZ055457@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 30 Nov 2017 07:15:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326386 - head/share/man/man3
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/share/man/man3
X-SVN-Commit-Revision: 326386
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 07:15:33 -0000
Author: eadler
Date: Thu Nov 30 07:15:32 2017
New Revision: 326386
URL: https://svnweb.freebsd.org/changeset/base/326386
Log:
Fix pthread_condattr(3) type
Reported by: Sascha Wildner <swildner@dragonflybsd.org>
Reviewed by: mjg
Modified:
head/share/man/man3/pthread_condattr.3
Modified: head/share/man/man3/pthread_condattr.3
==============================================================================
--- head/share/man/man3/pthread_condattr.3 Thu Nov 30 07:08:45 2017 (r326385)
+++ head/share/man/man3/pthread_condattr.3 Thu Nov 30 07:15:32 2017 (r326386)
@@ -46,9 +46,9 @@
.Ft int
.Fn pthread_condattr_destroy "pthread_condattr_t *attr"
.Ft int
-.Fn pthread_condattr_getclock "pthread_condattr_t * restrict attr" "clock_t * restrict clock_id"
+.Fn pthread_condattr_getclock "pthread_condattr_t * restrict attr" "clockid_t * restrict clock_id"
.Ft int
-.Fn pthread_condattr_setclock "pthread_condattr_t *attr" "clock_t clock_id"
+.Fn pthread_condattr_setclock "pthread_condattr_t *attr" "clockid_t clock_id"
.Ft int
.Fn pthread_condattr_getpshared "pthread_condattr_t * restrict attr" "int * restrict pshared"
.Ft int
From owner-svn-src-all@freebsd.org Thu Nov 30 07:24:34 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5AD2DFB323;
Thu, 30 Nov 2017 07:24:34 +0000 (UTC)
(envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A6D567922F;
Thu, 30 Nov 2017 07:24:34 +0000 (UTC)
(envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU7OXEl059416;
Thu, 30 Nov 2017 07:24:33 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU7OXOE059415;
Thu, 30 Nov 2017 07:24:33 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201711300724.vAU7OXOE059415@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 30 Nov 2017 07:24:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r326387 - head/sys/dev/ata/chipsets
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/sys/dev/ata/chipsets
X-SVN-Commit-Revision: 326387
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 07:24:35 -0000
Author: eadler
Date: Thu Nov 30 07:24:33 2017
New Revision: 326387
URL: https://svnweb.freebsd.org/changeset/base/326387
Log:
Fix typo
Reported by: mjg, zrj@dragonflybsd.org
Modified:
head/sys/dev/ata/chipsets/ata-micron.c
Modified: head/sys/dev/ata/chipsets/ata-micron.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-micron.c Thu Nov 30 07:15:32 2017 (r326386)
+++ head/sys/dev/ata/chipsets/ata-micron.c Thu Nov 30 07:24:33 2017 (r326387)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <ata_if.h>
/*
- * Cenatek chipset support functions
+ * Micron chipset support functions
*/
static int
ata_micron_probe(device_t dev)
From owner-svn-src-all@freebsd.org Thu Nov 30 07:42:58 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 567D6DFBA94;
Thu, 30 Nov 2017 07:42:58 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 0971E79D28;
Thu, 30 Nov 2017 07:42:57 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAU7gvpI067847;
Thu, 30 Nov 2017 07:42:57 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAU7gujR067843;
Thu, 30 Nov 2017 07:42:56 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201711300742.vAU7gujR067843@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 30 Nov 2017 07:42:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326388 - stable/11/sys/netpfil/ipfw
X-SVN-Group: stable-11
X-SVN-Commit-Author: ae
X-SVN-Commit-Paths: stable/11/sys/netpfil/ipfw
X-SVN-Commit-Revision: 326388
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 07:42:58 -0000
Author: ae
Date: Thu Nov 30 07:42:56 2017
New Revision: 326388
URL: https://svnweb.freebsd.org/changeset/base/326388
Log:
MFC r326086:
Add ipfw_add_protected_rule() function that creates rule with 65535
number in the reserved set 31. Use this function to create def