From owner-svn-src-head@freebsd.org Sun Apr 7 08:58:10 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDDB0157BF2F; Sun, 7 Apr 2019 08:58:09 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 94C6388C7E; Sun, 7 Apr 2019 08:58:09 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 832B59D8E; Sun, 7 Apr 2019 08:58:09 +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 x378w95J095056; Sun, 7 Apr 2019 08:58:09 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x378w9b3095055; Sun, 7 Apr 2019 08:58:09 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904070858.x378w9b3095055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 7 Apr 2019 08:58:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345997 - head/sys/dev/pci X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/pci X-SVN-Commit-Revision: 345997 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 94C6388C7E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 08:58:10 -0000 Author: kib Date: Sun Apr 7 08:58:09 2019 New Revision: 345997 URL: https://svnweb.freebsd.org/changeset/base/345997 Log: Give new home to the comment from ppt_pci_reset(), explaining a nuance of power reset. Noted by: soralx@cydem.org Sponsored by: Mellanox Technologies MFC after: 12 days Modified: head/sys/dev/pci/pci.c Modified: head/sys/dev/pci/pci.c ============================================================================== --- head/sys/dev/pci/pci.c Sat Apr 6 23:35:23 2019 (r345996) +++ head/sys/dev/pci/pci.c Sun Apr 7 08:58:09 2019 (r345997) @@ -6394,6 +6394,11 @@ pcie_flr(device_t dev, u_int max_delay, bool force) return (true); } +/* + * Attempt a power-management reset by cycling the device in/out of D3 + * state. PCI spec says we can only go into D3 state from D0 state. + * Transition from D[12] into D0 before going to D3 state. + */ int pci_power_reset(device_t dev) { From owner-svn-src-head@freebsd.org Sun Apr 7 11:48:42 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26B11157E4F4; Sun, 7 Apr 2019 11:48:42 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AADD58CF2A; Sun, 7 Apr 2019 11:48:41 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98184B9F9; Sun, 7 Apr 2019 11:48:41 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37BmfPg084573; Sun, 7 Apr 2019 11:48:41 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37BmfId084572; Sun, 7 Apr 2019 11:48:41 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201904071148.x37BmfId084572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 7 Apr 2019 11:48:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345998 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 345998 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AADD58CF2A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 11:48:42 -0000 Author: tsoome Date: Sun Apr 7 11:48:41 2019 New Revision: 345998 URL: https://svnweb.freebsd.org/changeset/base/345998 Log: loader: malloc+bzero is calloc Replace malloc+bzero in module.c with calloc. MFC after: 1w Modified: head/stand/common/module.c Modified: head/stand/common/module.c ============================================================================== --- head/stand/common/module.c Sun Apr 7 08:58:09 2019 (r345997) +++ head/stand/common/module.c Sun Apr 7 11:48:41 2019 (r345998) @@ -926,10 +926,9 @@ file_addmodule(struct preloaded_file *fp, char *modnam mp = file_findmodule(fp, modname, &mdepend); if (mp) return (EEXIST); - mp = malloc(sizeof(struct kernel_module)); + mp = calloc(1, sizeof(struct kernel_module)); if (mp == NULL) return (ENOMEM); - bzero(mp, sizeof(struct kernel_module)); mp->m_name = strdup(modname); mp->m_version = version; mp->m_fp = fp; @@ -980,12 +979,8 @@ file_discard(struct preloaded_file *fp) struct preloaded_file * file_alloc(void) { - struct preloaded_file *fp; - if ((fp = malloc(sizeof(struct preloaded_file))) != NULL) { - bzero(fp, sizeof(struct preloaded_file)); - } - return (fp); + return (calloc(1, sizeof(struct preloaded_file))); } /* From owner-svn-src-head@freebsd.org Sun Apr 7 11:50:42 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A118F157E578; Sun, 7 Apr 2019 11:50:42 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 486DF8D097; Sun, 7 Apr 2019 11:50:42 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23EE0BCCB; Sun, 7 Apr 2019 11:50:42 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37BogGI084728; Sun, 7 Apr 2019 11:50:42 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37BogKs084727; Sun, 7 Apr 2019 11:50:42 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201904071150.x37BogKs084727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 7 Apr 2019 11:50:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345999 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 345999 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 486DF8D097 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 11:50:42 -0000 Author: tsoome Date: Sun Apr 7 11:50:41 2019 New Revision: 345999 URL: https://svnweb.freebsd.org/changeset/base/345999 Log: loader: file_addmodule should check for memory allocation strdup() can return NULL. MFC after: 1w Modified: head/stand/common/module.c Modified: head/stand/common/module.c ============================================================================== --- head/stand/common/module.c Sun Apr 7 11:48:41 2019 (r345998) +++ head/stand/common/module.c Sun Apr 7 11:50:41 2019 (r345999) @@ -930,6 +930,10 @@ file_addmodule(struct preloaded_file *fp, char *modnam if (mp == NULL) return (ENOMEM); mp->m_name = strdup(modname); + if (mp->m_name == NULL) { + free(mp); + return (ENOMEM); + } mp->m_version = version; mp->m_fp = fp; mp->m_next = fp->f_modules; From owner-svn-src-head@freebsd.org Sun Apr 7 11:55:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 904FD157E747; Sun, 7 Apr 2019 11:55:12 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3879C8D491; Sun, 7 Apr 2019 11:55:12 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 12E81BD5D; Sun, 7 Apr 2019 11:55:12 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37BtB9Z089710; Sun, 7 Apr 2019 11:55:11 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37BtBQL089709; Sun, 7 Apr 2019 11:55:11 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201904071155.x37BtBQL089709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 7 Apr 2019 11:55:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346000 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 346000 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3879C8D491 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 11:55:12 -0000 Author: tsoome Date: Sun Apr 7 11:55:11 2019 New Revision: 346000 URL: https://svnweb.freebsd.org/changeset/base/346000 Log: loader: remove pointer checks before free() in module.c free() does check for NULL argument, remove duplicate checks. MFC after: 1w Modified: head/stand/common/module.c Modified: head/stand/common/module.c ============================================================================== --- head/stand/common/module.c Sun Apr 7 11:50:41 2019 (r345999) +++ head/stand/common/module.c Sun Apr 7 11:55:11 2019 (r346000) @@ -534,8 +534,7 @@ mod_load(char *modname, struct mod_depend *verinfo, in mp = file_findmodule(NULL, modname, verinfo); if (mp) { #ifdef moduleargs - if (mp->m_args) - free(mp->m_args); + free(mp->m_args); mp->m_args = unargv(argc, argv); #endif snprintf(command_errbuf, sizeof(command_errbuf), @@ -961,18 +960,14 @@ file_discard(struct preloaded_file *fp) } mp = fp->f_modules; while (mp) { - if (mp->m_name) - free(mp->m_name); + free(mp->m_name); mp1 = mp; mp = mp->m_next; free(mp1); } - if (fp->f_name != NULL) - free(fp->f_name); - if (fp->f_type != NULL) - free(fp->f_type); - if (fp->f_args != NULL) - free(fp->f_args); + free(fp->f_name); + free(fp->f_type); + free(fp->f_args); free(fp); } @@ -1055,10 +1050,8 @@ moduledir_readhints(struct moduledir *mdp) return; bad: close(fd); - if (mdp->d_hints) { - free(mdp->d_hints); - mdp->d_hints = NULL; - } + free(mdp->d_hints); + mdp->d_hints = NULL; mdp->d_flags |= MDIR_NOHINTS; return; } @@ -1119,8 +1112,7 @@ moduledir_rebuild(void) if ((mdp->d_flags & MDIR_REMOVED) == 0) { mdp = STAILQ_NEXT(mdp, d_link); } else { - if (mdp->d_hints) - free(mdp->d_hints); + free(mdp->d_hints); mtmp = mdp; mdp = STAILQ_NEXT(mdp, d_link); STAILQ_REMOVE(&moduledir_list, mtmp, moduledir, d_link); From owner-svn-src-head@freebsd.org Sun Apr 7 12:10:20 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90CB115314B1; Sun, 7 Apr 2019 12:10:20 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2ACFE8DF1F; Sun, 7 Apr 2019 12:10:20 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6C2ABF07; Sun, 7 Apr 2019 12:10:19 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37CAJod095540; Sun, 7 Apr 2019 12:10:19 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37CAJHE095539; Sun, 7 Apr 2019 12:10:19 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201904071210.x37CAJHE095539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 7 Apr 2019 12:10:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346001 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 346001 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2ACFE8DF1F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 12:10:20 -0000 Author: tsoome Date: Sun Apr 7 12:10:19 2019 New Revision: 346001 URL: https://svnweb.freebsd.org/changeset/base/346001 Log: loader: file_addmetadata() should check for memory allocation malloc() can return NULL. MFC after: 1w Modified: head/stand/common/module.c Modified: head/stand/common/module.c ============================================================================== --- head/stand/common/module.c Sun Apr 7 11:55:11 2019 (r346000) +++ head/stand/common/module.c Sun Apr 7 12:10:19 2019 (r346001) @@ -677,10 +677,12 @@ file_addmetadata(struct preloaded_file *fp, int type, struct file_metadata *md; md = malloc(sizeof(struct file_metadata) - sizeof(md->md_data) + size); - md->md_size = size; - md->md_type = type; - bcopy(p, md->md_data, size); - md->md_next = fp->f_metadata; + if (md != NULL) { + md->md_size = size; + md->md_type = type; + bcopy(p, md->md_data, size); + md->md_next = fp->f_metadata; + } fp->f_metadata = md; } From owner-svn-src-head@freebsd.org Sun Apr 7 12:20:18 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 339F015317A7; Sun, 7 Apr 2019 12:20:18 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C58A08E350; Sun, 7 Apr 2019 12:20:17 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98F90C0AA; Sun, 7 Apr 2019 12:20:17 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37CKHcg001204; Sun, 7 Apr 2019 12:20:17 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37CKHeP001203; Sun, 7 Apr 2019 12:20:17 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201904071220.x37CKHeP001203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 7 Apr 2019 12:20:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346002 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 346002 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C58A08E350 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 12:20:18 -0000 Author: tsoome Date: Sun Apr 7 12:20:17 2019 New Revision: 346002 URL: https://svnweb.freebsd.org/changeset/base/346002 Log: loader: mod_loadkld() error: we previously assumed 'last_file' could be null The last_file variable is used to reset the loadaddr variable back to original value; however, it is possible the last_file is NULL, so we can not blindly trust it. But then again, we can just save the original loadaddr and use the saved value for recovery. MFC after: 1w Modified: head/stand/common/module.c Modified: head/stand/common/module.c ============================================================================== --- head/stand/common/module.c Sun Apr 7 12:10:19 2019 (r346001) +++ head/stand/common/module.c Sun Apr 7 12:20:17 2019 (r346002) @@ -559,9 +559,10 @@ mod_load(char *modname, struct mod_depend *verinfo, in int mod_loadkld(const char *kldname, int argc, char *argv[]) { - struct preloaded_file *fp, *last_file; - int err; + struct preloaded_file *fp; + int err; char *filename; + vm_offset_t loadaddr_saved; /* * Get fully qualified KLD name @@ -582,22 +583,19 @@ mod_loadkld(const char *kldname, int argc, char *argv[ free(filename); return (0); } - for (last_file = preloaded_files; - last_file != NULL && last_file->f_next != NULL; - last_file = last_file->f_next) - ; do { err = file_load(filename, loadaddr, &fp); if (err) break; fp->f_args = unargv(argc, argv); + loadaddr_saved = loadaddr; loadaddr = fp->f_addr + fp->f_size; file_insert_tail(fp); /* Add to the list of loaded files */ if (file_load_dependencies(fp) != 0) { err = ENOENT; last_file->f_next = NULL; - loadaddr = last_file->f_addr + last_file->f_size; + loadaddr = loadaddr_saved; fp = NULL; break; } From owner-svn-src-head@freebsd.org Sun Apr 7 13:36:18 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AB7F1552BFC; Sun, 7 Apr 2019 13:36:18 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A036A90C2E; Sun, 7 Apr 2019 13:36:17 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75BDACE0A; Sun, 7 Apr 2019 13:36:17 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37DaHEB042794; Sun, 7 Apr 2019 13:36:17 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37DaHhT042793; Sun, 7 Apr 2019 13:36:17 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201904071336.x37DaHhT042793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 7 Apr 2019 13:36:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346007 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 346007 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A036A90C2E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 13:36:18 -0000 Author: tsoome Date: Sun Apr 7 13:36:17 2019 New Revision: 346007 URL: https://svnweb.freebsd.org/changeset/base/346007 Log: loader: add file_remove() function to undo file_insert_tail(). 346002 did miss the fact that we do not only undo the loadaddr, but also we need to remove the inserted module. Implement file_remove() to do the job. MFC after: 1w Modified: head/stand/common/module.c Modified: head/stand/common/module.c ============================================================================== --- head/stand/common/module.c Sun Apr 7 13:26:45 2019 (r346006) +++ head/stand/common/module.c Sun Apr 7 13:36:17 2019 (r346007) @@ -52,16 +52,18 @@ struct moduledir { STAILQ_ENTRY(moduledir) d_link; }; -static int file_load(char *filename, vm_offset_t dest, struct preloaded_file **result); -static int file_load_dependencies(struct preloaded_file *base_mod); -static char * file_search(const char *name, char **extlist); -static struct kernel_module * file_findmodule(struct preloaded_file *fp, char *modname, struct mod_depend *verinfo); -static int file_havepath(const char *name); -static char *mod_searchmodule(char *name, struct mod_depend *verinfo); -static void file_insert_tail(struct preloaded_file *mp); -struct file_metadata* metadata_next(struct file_metadata *base_mp, int type); -static void moduledir_readhints(struct moduledir *mdp); -static void moduledir_rebuild(void); +static int file_load(char *, vm_offset_t, struct preloaded_file **); +static int file_load_dependencies(struct preloaded_file *); +static char * file_search(const char *, char **); +static struct kernel_module *file_findmodule(struct preloaded_file *, char *, + struct mod_depend *); +static int file_havepath(const char *); +static char *mod_searchmodule(char *, struct mod_depend *); +static void file_insert_tail(struct preloaded_file *); +static void file_remove(struct preloaded_file *); +struct file_metadata *metadata_next(struct file_metadata *, int); +static void moduledir_readhints(struct moduledir *); +static void moduledir_rebuild(void); /* load address should be tweaked by first module loaded (kernel) */ static vm_offset_t loadaddr = 0; @@ -70,10 +72,11 @@ static vm_offset_t loadaddr = 0; static const char *default_searchpath = "/boot/kernel;/boot/modules;/boot/dtb"; #else -static const char *default_searchpath ="/boot/kernel;/boot/modules"; +static const char *default_searchpath = "/boot/kernel;/boot/modules"; #endif -static STAILQ_HEAD(, moduledir) moduledir_list = STAILQ_HEAD_INITIALIZER(moduledir_list); +static STAILQ_HEAD(, moduledir) moduledir_list = + STAILQ_HEAD_INITIALIZER(moduledir_list); struct preloaded_file *preloaded_files = NULL; @@ -591,10 +594,10 @@ mod_loadkld(const char *kldname, int argc, char *argv[ fp->f_args = unargv(argc, argv); loadaddr_saved = loadaddr; loadaddr = fp->f_addr + fp->f_size; - file_insert_tail(fp); /* Add to the list of loaded files */ + file_insert_tail(fp); /* Add to the list of loaded files */ if (file_load_dependencies(fp) != 0) { err = ENOENT; - last_file->f_next = NULL; + file_remove(fp); loadaddr = loadaddr_saved; fp = NULL; break; @@ -998,6 +1001,29 @@ file_insert_tail(struct preloaded_file *fp) for (cm = preloaded_files; cm->f_next != NULL; cm = cm->f_next) ; cm->f_next = fp; + } +} + +/* + * Remove module from the chain + */ +static void +file_remove(struct preloaded_file *fp) +{ + struct preloaded_file *cm; + + if (preloaded_files == NULL) + return; + + if (preloaded_files == fp) { + preloaded_files = fp->f_next; + return; + } + for (cm = preloaded_files; cm->f_next != NULL; cm = cm->f_next) { + if (cm->f_next == fp) { + cm->f_next = fp->f_next; + return; + } } } From owner-svn-src-head@freebsd.org Sun Apr 7 14:07:29 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 454DC1553523; Sun, 7 Apr 2019 14:07:29 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D41A8916FF; Sun, 7 Apr 2019 14:07:28 +0000 (UTC) (envelope-from tsoome@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A375AD30D; Sun, 7 Apr 2019 14:07:28 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37E7Sbj058470; Sun, 7 Apr 2019 14:07:28 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37E7SvN058469; Sun, 7 Apr 2019 14:07:28 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201904071407.x37E7SvN058469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Sun, 7 Apr 2019 14:07:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346008 - head/stand/efi/loader X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/efi/loader X-SVN-Commit-Revision: 346008 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D41A8916FF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 14:07:29 -0000 Author: tsoome Date: Sun Apr 7 14:07:28 2019 New Revision: 346008 URL: https://svnweb.freebsd.org/changeset/base/346008 Log: loader: command_lsefi: ret can be used uninitialized MFC after: 1w Modified: head/stand/efi/loader/main.c Modified: head/stand/efi/loader/main.c ============================================================================== --- head/stand/efi/loader/main.c Sun Apr 7 13:36:17 2019 (r346007) +++ head/stand/efi/loader/main.c Sun Apr 7 14:07:28 2019 (r346008) @@ -1217,7 +1217,7 @@ command_lsefi(int argc __unused, char *argv[] __unused EFI_HANDLE handle; UINTN bufsz = 0, i, j; EFI_STATUS status; - int ret; + int ret = 0; status = BS->LocateHandle(AllHandles, NULL, NULL, &bufsz, buffer); if (status != EFI_BUFFER_TOO_SMALL) { From owner-svn-src-head@freebsd.org Sun Apr 7 14:12:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A180315537A7 for ; Sun, 7 Apr 2019 14:12:47 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7399291AF7 for ; Sun, 7 Apr 2019 14:12:46 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x833.google.com with SMTP id w30so12545719qta.8 for ; Sun, 07 Apr 2019 07:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=TgPhBcD3zwJHRSLGyuk19Clndj5w8XL3cIJzR9UppKE=; b=GEdNsvbOGkl4pSFUXgfWB259tYqmOYU8+5dCkMs1TlPpg43XWu1/PwDf611tu5pvx2 yJWxKGVEjv5s31CyrHPohydb4CtAAlf0qaMAmMqPTFwrmVvuewN0gK8twY0YQJEbO7h2 YAkXprybZlSqqS/gefLkVwiaAH8kLcRg6/FOiSn/+5cvqT8/CZPzxqzJQ53IcR85ps1Q 1XB1dzHo5ytA369In8MHO1kKhQecrZK77ZouFVWqVYR8fq9TbX0y2h6c+IeOBECt+aG6 G6mLRj/Ewk/l5bLT8ZJFJwoMTMwt5riGOZPWWRHhPS3K4u4XJ+6dF5HNVaro+xyuAGMW qOzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=TgPhBcD3zwJHRSLGyuk19Clndj5w8XL3cIJzR9UppKE=; b=cXIBLRkWHwpZ2WnVw3YkT4oElEe+FMG0CXEmLbnCFE+FqSHbqzLUmYA85DaLKQlTZG SLUtM6+qnAtZ57Jyel1pQNQFyRh0Mz/0aPvE9b/ynCARK+m3CNBXt8RkVUIPs5vmNiZt d96/VUb/eU6rw2v4S8LY+14x7sZG67vwJLoavnVVTGG+/YhcrLeAqt8I9sjd9u2/6f0T upmJG7tEgWJiGm1HlSTEj2gq4hpgMZoBwofIQdSwppsLoTPvz2v8+34DxLGQ8w/NAHJI 91FWCpMObxqcp3/P/P/N6tfJb4RmyxlzUwwcYu34Gd7n+O3BiQ9t5yiI0aRPXipa3tuh AFEw== X-Gm-Message-State: APjAAAVCQx7upZWD1Yn8BuHip3SojKEMUo6YDk7FS0iQm5VweJY/EwSV RnSnI2TShUh04odCLCqMW1269w== X-Google-Smtp-Source: APXvYqwAEzWOoSAxmtj3rSdHHq3st4lg/Ryi5gJbBLduBSXbaly/jWTmEcliIZvfWOw7WnLnbtnU/Q== X-Received: by 2002:aed:3b09:: with SMTP id p9mr20695421qte.152.1554646365754; Sun, 07 Apr 2019 07:12:45 -0700 (PDT) Received: from mutt-hbsd ([151.196.118.239]) by smtp.gmail.com with ESMTPSA id s12sm14342642qtj.1.2019.04.07.07.12.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Apr 2019 07:12:44 -0700 (PDT) Date: Sun, 7 Apr 2019 10:11:52 -0400 From: Shawn Webb To: Mariusz Zaborski Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs Message-ID: <20190407141152.oyf35rgomoa2qoki@mutt-hbsd> References: <201904060934.x369YQn9043498@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xs5qggpndjt5h2y5" Content-Disposition: inline In-Reply-To: <201904060934.x369YQn9043498@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD r345948+db88569731b7(hardened/current/master) HARDENEDBSD-13-CURRENT amd64 X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: 7399291AF7 X-Spamd-Bar: ------- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=GEdNsvbO; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::833 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-7.91 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; MX_GOOD(-0.01)[alt1.aspmx.l.google.com,aspmx.l.google.com,aspmx2.googlemail.com,alt2.aspmx.l.google.com,aspmx3.googlemail.com]; NEURAL_HAM_SHORT(-0.99)[-0.995,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; IP_SCORE(-2.80)[ip: (-8.84), ipnet: 2607:f8b0::/32(-2.94), asn: 15169(-2.17), country: US(-0.06)]; RECEIVED_SPAMHAUS_PBL(0.00)[239.118.196.151.zen.spamhaus.org : 127.0.0.10]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[3.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; MID_RHS_NOT_FQDN(0.50)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 14:12:47 -0000 --xs5qggpndjt5h2y5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: > Author: oshogbo > Date: Sat Apr 6 09:34:26 2019 > New Revision: 345982 > URL: https://svnweb.freebsd.org/changeset/base/345982 >=20 > Log: > Introduce funlinkat syscall that always us to check if we are removing > the file associated with the given file descriptor. > =20 > Reviewed by: kib, asomers > Reviewed by: cem, jilles, brooks (they reviewed previous version) > Discussed with: pjd, and many others > Differential Revision: https://reviews.freebsd.org/D14567 Hey Mariusz, Is __FreeBSD_version supposed to be bumped after adding new syscalls? I can't remember off-hand. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 443-546-8752 Tor+XMPP+OTR: lattera@is.a.hacker.sx GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 --xs5qggpndjt5h2y5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAlyqBSMACgkQ/y5nonf4 4frJLw//ejcyubdA9Uqy5Z1aRLOeJjb9rNk/eF9wyheoIsUhPo5B2JEobeUUDnHr HHTUJ5RNtG1jHfpQLQ6tfxB+QjrmHc7UUwe6zjJ9PJSxzN7+yx+SPj/7S7uwhKxE xciEaIp3CroYheGGcqiqOvLwTibeEb3mgK3ljOqTXUbnjimUQImRrcwC814dzLil P7cvZvhMogwjAIa72ZiMsB9xQZ39PJRjKSt19nWQaNfETD+/SutPytQbrht4mYAe CsyvGIYGGG6X12Fnkcxf1L0FKEXoYk65V3SF93FcaDkfT55ubJA4Q9rCRvRYU4XO Ib+12lrikWcWHkJCXZ7SYPhvv3nJJZZKlcP/mWVDRgoguP7+lY7tOI6hBGL+vwvS Pl9nm1P4+hjtY3lLU/ow74YL67a4OYt3SvZ8fPSjIvaUZzslvcKzrOWXeB+j94/P dA1m/0JwbrNx2Bh4T2d/XNTM93lKWvwBhuaFlgpQElJM7SvWuPkMzy80oUHKTN2V J6v+iph/lLeAudd1kqMRvAW+DThr3yKh71y4TjsFf1MlQwavbMwhao7G2Mz3oX8n zKGAXxQevEPKTJYucu+cm62obMNQnEVDolCMK81OFmDB9hUtnnuJ4ieuFv9hPWU1 lM4+qPfZq/JZWUZ3XgW6at8Q1HK73Qiez1q8pWIQ7CdTabvRygo= =A+Ux -----END PGP SIGNATURE----- --xs5qggpndjt5h2y5-- From owner-svn-src-head@freebsd.org Sun Apr 7 14:26:16 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 260071553B1C; Sun, 7 Apr 2019 14:26:16 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFC8891FFE; Sun, 7 Apr 2019 14:26:15 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D395D667; Sun, 7 Apr 2019 14:26:15 +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 x37EQFYc068640; Sun, 7 Apr 2019 14:26:15 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37EQFVB068638; Sun, 7 Apr 2019 14:26:15 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201904071426.x37EQFVB068638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 7 Apr 2019 14:26:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346009 - in head: sys/kern tests/sys/kern X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head: sys/kern tests/sys/kern X-SVN-Commit-Revision: 346009 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BFC8891FFE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 14:26:16 -0000 Author: markj Date: Sun Apr 7 14:26:14 2019 New Revision: 346009 URL: https://svnweb.freebsd.org/changeset/base/346009 Log: Set the p_oppid field of orphans when exiting. Such processes will be reparented to the reaper when the current parent is done with them (i.e., ptrace detached), so p_oppid must be updated accordingly. Add a regression test to exercise this code path. Previously it would not be possible to reap an orphan with a stale oppid. Reviewed by: kib, mjg Tested by: pho MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19825 Modified: head/sys/kern/kern_exit.c head/tests/sys/kern/ptrace_test.c Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Sun Apr 7 14:07:28 2019 (r346008) +++ head/sys/kern/kern_exit.c Sun Apr 7 14:26:14 2019 (r346009) @@ -543,6 +543,11 @@ exit1(struct thread *td, int rval, int signo) */ while ((q = LIST_FIRST(&p->p_orphans)) != NULL) { PROC_LOCK(q); + KASSERT(q->p_oppid == p->p_pid, + ("orphan %p of %p has unexpected oppid %d", q, p, + q->p_oppid)); + q->p_oppid = q->p_reaper->p_pid; + /* * If we are the real parent of this process * but it has been reparented to a debugger, then Modified: head/tests/sys/kern/ptrace_test.c ============================================================================== --- head/tests/sys/kern/ptrace_test.c Sun Apr 7 14:07:28 2019 (r346008) +++ head/tests/sys/kern/ptrace_test.c Sun Apr 7 14:26:14 2019 (r346009) @@ -452,6 +452,67 @@ ATF_TC_BODY(ptrace__parent_sees_exit_after_unrelated_d } /* + * Make sure that we can collect the exit status of an orphaned process. + */ +ATF_TC_WITHOUT_HEAD(ptrace__parent_exits_before_child); +ATF_TC_BODY(ptrace__parent_exits_before_child, tc) +{ + ssize_t n; + int cpipe1[2], cpipe2[2], gcpipe[2], status; + pid_t child, gchild; + + ATF_REQUIRE(pipe(cpipe1) == 0); + ATF_REQUIRE(pipe(cpipe2) == 0); + ATF_REQUIRE(pipe(gcpipe) == 0); + + ATF_REQUIRE(procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) == 0); + + ATF_REQUIRE((child = fork()) != -1); + if (child == 0) { + CHILD_REQUIRE((gchild = fork()) != -1); + if (gchild == 0) { + status = 1; + do { + n = read(gcpipe[0], &status, sizeof(status)); + } while (n == -1 && errno == EINTR); + _exit(status); + } + + CHILD_REQUIRE(write(cpipe1[1], &gchild, sizeof(gchild)) == + sizeof(gchild)); + CHILD_REQUIRE(read(cpipe2[0], &status, sizeof(status)) == + sizeof(status)); + _exit(status); + } + + ATF_REQUIRE(read(cpipe1[0], &gchild, sizeof(gchild)) == sizeof(gchild)); + + ATF_REQUIRE(ptrace(PT_ATTACH, gchild, NULL, 0) == 0); + + status = 0; + ATF_REQUIRE(write(cpipe2[1], &status, sizeof(status)) == + sizeof(status)); + ATF_REQUIRE(waitpid(child, &status, 0) == child); + ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 0); + + status = 0; + ATF_REQUIRE(write(gcpipe[1], &status, sizeof(status)) == + sizeof(status)); + ATF_REQUIRE(waitpid(gchild, &status, 0) == gchild); + ATF_REQUIRE(WIFSTOPPED(status)); + ATF_REQUIRE(ptrace(PT_DETACH, gchild, (caddr_t)1, 0) == 0); + ATF_REQUIRE(waitpid(gchild, &status, 0) == gchild); + ATF_REQUIRE(WIFEXITED(status) && WEXITSTATUS(status) == 0); + + ATF_REQUIRE(close(cpipe1[0]) == 0); + ATF_REQUIRE(close(cpipe1[1]) == 0); + ATF_REQUIRE(close(cpipe2[0]) == 0); + ATF_REQUIRE(close(cpipe2[1]) == 0); + ATF_REQUIRE(close(gcpipe[0]) == 0); + ATF_REQUIRE(close(gcpipe[1]) == 0); +} + +/* * The parent process should always act the same regardless of how the * debugger is attached to it. */ @@ -3850,6 +3911,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, ptrace__parent_wait_after_attach); ATF_TP_ADD_TC(tp, ptrace__parent_sees_exit_after_child_debugger); ATF_TP_ADD_TC(tp, ptrace__parent_sees_exit_after_unrelated_debugger); + ATF_TP_ADD_TC(tp, ptrace__parent_exits_before_child); ATF_TP_ADD_TC(tp, ptrace__follow_fork_both_attached); ATF_TP_ADD_TC(tp, ptrace__follow_fork_child_detached); ATF_TP_ADD_TC(tp, ptrace__follow_fork_parent_detached); From owner-svn-src-head@freebsd.org Sun Apr 7 14:28:03 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9985C1553BC4; Sun, 7 Apr 2019 14:28:03 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3E61E9215F; Sun, 7 Apr 2019 14:28:03 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17C06D66C; Sun, 7 Apr 2019 14:28:03 +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 x37ES2cf068753; Sun, 7 Apr 2019 14:28:02 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37ES2XS068752; Sun, 7 Apr 2019 14:28:02 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201904071428.x37ES2XS068752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 7 Apr 2019 14:28:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346010 - head/usr.sbin/bhyve X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.sbin/bhyve X-SVN-Commit-Revision: 346010 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3E61E9215F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 14:28:03 -0000 Author: markj Date: Sun Apr 7 14:28:02 2019 New Revision: 346010 URL: https://svnweb.freebsd.org/changeset/base/346010 Log: Fix indentation. No functional change intended. Reviewed by: bcran, jhb, rgrimes MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19786 Modified: head/usr.sbin/bhyve/uart_emul.c Modified: head/usr.sbin/bhyve/uart_emul.c ============================================================================== --- head/usr.sbin/bhyve/uart_emul.c Sun Apr 7 14:26:14 2019 (r346009) +++ head/usr.sbin/bhyve/uart_emul.c Sun Apr 7 14:28:02 2019 (r346010) @@ -440,75 +440,75 @@ uart_write(struct uart_softc *sc, int offset, uint8_t */ sc->ier = value & 0x0F; break; - case REG_FCR: - /* - * When moving from FIFO and 16450 mode and vice versa, - * the FIFO contents are reset. - */ - if ((sc->fcr & FCR_ENABLE) ^ (value & FCR_ENABLE)) { - fifosz = (value & FCR_ENABLE) ? FIFOSZ : 1; - rxfifo_reset(sc, fifosz); - } + case REG_FCR: + /* + * When moving from FIFO and 16450 mode and vice versa, + * the FIFO contents are reset. + */ + if ((sc->fcr & FCR_ENABLE) ^ (value & FCR_ENABLE)) { + fifosz = (value & FCR_ENABLE) ? FIFOSZ : 1; + rxfifo_reset(sc, fifosz); + } - /* - * The FCR_ENABLE bit must be '1' for the programming - * of other FCR bits to be effective. - */ - if ((value & FCR_ENABLE) == 0) { - sc->fcr = 0; - } else { - if ((value & FCR_RCV_RST) != 0) - rxfifo_reset(sc, FIFOSZ); + /* + * The FCR_ENABLE bit must be '1' for the programming + * of other FCR bits to be effective. + */ + if ((value & FCR_ENABLE) == 0) { + sc->fcr = 0; + } else { + if ((value & FCR_RCV_RST) != 0) + rxfifo_reset(sc, FIFOSZ); - sc->fcr = value & - (FCR_ENABLE | FCR_DMA | FCR_RX_MASK); - } - break; - case REG_LCR: - sc->lcr = value; - break; - case REG_MCR: - /* Apply mask so that bits 5-7 are 0 */ - sc->mcr = value & 0x1F; - msr = modem_status(sc->mcr); + sc->fcr = value & + (FCR_ENABLE | FCR_DMA | FCR_RX_MASK); + } + break; + case REG_LCR: + sc->lcr = value; + break; + case REG_MCR: + /* Apply mask so that bits 5-7 are 0 */ + sc->mcr = value & 0x1F; + msr = modem_status(sc->mcr); - /* - * Detect if there has been any change between the - * previous and the new value of MSR. If there is - * then assert the appropriate MSR delta bit. - */ - if ((msr & MSR_CTS) ^ (sc->msr & MSR_CTS)) - sc->msr |= MSR_DCTS; - if ((msr & MSR_DSR) ^ (sc->msr & MSR_DSR)) - sc->msr |= MSR_DDSR; - if ((msr & MSR_DCD) ^ (sc->msr & MSR_DCD)) - sc->msr |= MSR_DDCD; - if ((sc->msr & MSR_RI) != 0 && (msr & MSR_RI) == 0) - sc->msr |= MSR_TERI; + /* + * Detect if there has been any change between the + * previous and the new value of MSR. If there is + * then assert the appropriate MSR delta bit. + */ + if ((msr & MSR_CTS) ^ (sc->msr & MSR_CTS)) + sc->msr |= MSR_DCTS; + if ((msr & MSR_DSR) ^ (sc->msr & MSR_DSR)) + sc->msr |= MSR_DDSR; + if ((msr & MSR_DCD) ^ (sc->msr & MSR_DCD)) + sc->msr |= MSR_DDCD; + if ((sc->msr & MSR_RI) != 0 && (msr & MSR_RI) == 0) + sc->msr |= MSR_TERI; - /* - * Update the value of MSR while retaining the delta - * bits. - */ - sc->msr &= MSR_DELTA_MASK; - sc->msr |= msr; - break; - case REG_LSR: - /* - * Line status register is not meant to be written to - * during normal operation. - */ - break; - case REG_MSR: - /* - * As far as I can tell MSR is a read-only register. - */ - break; - case REG_SCR: - sc->scr = value; - break; - default: - break; + /* + * Update the value of MSR while retaining the delta + * bits. + */ + sc->msr &= MSR_DELTA_MASK; + sc->msr |= msr; + break; + case REG_LSR: + /* + * Line status register is not meant to be written to + * during normal operation. + */ + break; + case REG_MSR: + /* + * As far as I can tell MSR is a read-only register. + */ + break; + case REG_SCR: + sc->scr = value; + break; + default: + break; } done: From owner-svn-src-head@freebsd.org Sun Apr 7 14:30:18 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76A561553C87; Sun, 7 Apr 2019 14:30:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B58A922DC; Sun, 7 Apr 2019 14:30:18 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5F18D681; Sun, 7 Apr 2019 14:30:17 +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 x37EUHo9068919; Sun, 7 Apr 2019 14:30:17 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37EUHxV068918; Sun, 7 Apr 2019 14:30:17 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201904071430.x37EUHxV068918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 7 Apr 2019 14:30:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346011 - head/usr.sbin/bhyve X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.sbin/bhyve X-SVN-Commit-Revision: 346011 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1B58A922DC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 14:30:18 -0000 Author: markj Date: Sun Apr 7 14:30:17 2019 New Revision: 346011 URL: https://svnweb.freebsd.org/changeset/base/346011 Log: Stop compiling bhyve(8) with -O0. DEBUG_FLAGS is always added to CFLAGS. This setting appears to be accidental and came in with r243327. Reviewed by: anish, emaste, jhb, rgrimes MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19787 Modified: head/usr.sbin/bhyve/Makefile Modified: head/usr.sbin/bhyve/Makefile ============================================================================== --- head/usr.sbin/bhyve/Makefile Sun Apr 7 14:28:02 2019 (r346010) +++ head/usr.sbin/bhyve/Makefile Sun Apr 7 14:30:17 2019 (r346011) @@ -9,8 +9,6 @@ CFLAGS+=-I${SRCTOP}/sys PROG= bhyve PACKAGE= bhyve -DEBUG_FLAGS= -g -O0 - MAN= bhyve.8 BHYVE_SYSDIR?=${SRCTOP} From owner-svn-src-head@freebsd.org Sun Apr 7 14:54:04 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68D7E1557E76 for ; Sun, 7 Apr 2019 14:54:04 +0000 (UTC) (envelope-from jiashiun@gmail.com) Received: from mail-vs1-xe33.google.com (mail-vs1-xe33.google.com [IPv6:2607:f8b0:4864:20::e33]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6111593377; Sun, 7 Apr 2019 14:54:02 +0000 (UTC) (envelope-from jiashiun@gmail.com) Received: by mail-vs1-xe33.google.com with SMTP id t78so6153283vsc.1; Sun, 07 Apr 2019 07:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EOBuwZobIlnniiihWt+Dlujx/uVW5r4DnzhbmocvjTA=; b=LFwgYlrMVR0buWfDo4YJG8Lw3yZGKSIdqdrN5BhvYLj6g0hMELG9D4nLFy1l7Rl7hn arlTnYRPamcHq2P/qm7zO5ZsXiGjSu8nx+nKwZIDNhxlLRGqmQ68WkJ0+vttdZRsZxgF Yak0otnXLP4a8R9VzXKOeRJa/ir2zApeCtYp12VZL0htGs8a4tOepeD81M7t5FoMUdbo 9xvDEwnU09jXG30Kt6QJu6EQrOLB2h7nzkyEsXJm61KFQXj9DCU6Re8kvLq2MYO9VNlg P6GJPUi0sztCzk/NmKVI+iKO8PznKGtbFDZ64/2ROKjraWMqSYu/qg9nr5HGXXUFKkvh 7Uow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EOBuwZobIlnniiihWt+Dlujx/uVW5r4DnzhbmocvjTA=; b=m9U6IMIIQK29PzfIlSrsw0ZCdSvB70Q42PAH6ppngKqpXbQfrkV1Mj9qaQaSnOIYRI Hdy8rD6ggcXqvL3QwtdMaSq6mP21P+fzOae5BDAqldVHHmfDOP1yIJPadCHdTE83sIVF Qhx7oOvdaRRiE9aGs9hU36hVXYal6yI9YJVC22q9kvvTKweaGoakptwgd0OswssWaj0Z lU1Pp9GiFnKB64cmEEs0ikBwRrnvwuUvzzNKeGdc383my1I0rqMkrTKDvd48gwccWVjZ qYuF6Gvobja5IlXpvb51y66DeEdF90ABnTzUV1mPy/T5WJASYpGSzQpYxPOZjl8Sf98L 3myA== X-Gm-Message-State: APjAAAXgHFk3G6mevxlBALubp+y5pNnqg6jytnYTeYAMYU2nAxaZCKgo S5+gNloW7HCBWu0x2VFthxg3h6X7U1rv7zchbvxKwxM5dBo= X-Google-Smtp-Source: APXvYqztc6FQlWkCK4kG7sSPDgtZcQSur6mVPwyjCtVZ2NXpnwntEiolyhrc7+xPRwIZOCRLo1Zi599dwGGvyKEqz7k= X-Received: by 2002:a67:1345:: with SMTP id 66mr13706215vst.30.1554648841249; Sun, 07 Apr 2019 07:54:01 -0700 (PDT) MIME-Version: 1.0 References: <201903241911.x2OJBj6x024102@repo.freebsd.org> In-Reply-To: <201903241911.x2OJBj6x024102@repo.freebsd.org> From: Jia-Shiun Li Date: Sun, 7 Apr 2019 22:53:35 +0800 Message-ID: Subject: Re: svn commit: r345480 - in head/sys: conf geom geom/label To: Ian Lepore Cc: svn-src-head@freebsd.org X-Rspamd-Queue-Id: 6111593377 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=LFwgYlrM; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of jiashiun@gmail.com designates 2607:f8b0:4864:20::e33 as permitted sender) smtp.mailfrom=jiashiun@gmail.com X-Spamd-Result: default: False [-6.80 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[3.3.e.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.84)[-0.842,0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; IP_SCORE(-2.95)[ip: (-9.57), ipnet: 2607:f8b0::/32(-2.94), asn: 15169(-2.18), country: US(-0.06)]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 14:54:04 -0000 Hi Ian, after this commit it is not possible to load geom_label as module. Loading geom_flashmap does not help. # uname -a FreeBSD 4cbsd 13.0-CURRENT FreeBSD 13.0-CURRENT r345759 MINIMAL-NODEBUG amd64 # kldload /boot/MINIMAL-NODEBUG/geom_label.ko kldload: an error occurred while loading module /boot/MINIMAL-NODEBUG/geom_label.ko. Please check dmesg(8) for more details. # dmesg | tail -2 link_elf_obj: symbol g_label_flashmap undefined linker_load_file: /boot/MINIMAL-NODEBUG/geom_label.ko - unsupported file type # I used ufsid label to locate root fs, and have to fall back to partition name for now. /boot/loader.conf: #vfs.root.mountfrom="ufs:/dev/ufsid/54a0236e063b0242" vfs.root.mountfrom="ufs:/dev/ada0s4a" - Jia-Shiun. On Mon, Mar 25, 2019 at 3:12 AM Ian Lepore wrote: > Author: ian > Date: Sun Mar 24 19:11:45 2019 > New Revision: 345480 > URL: https://svnweb.freebsd.org/changeset/base/345480 > > Log: > Support device-independent labels for geom_flashmap slices. > > While geom_flashmap has always supported label names for its slices, it > does > so by appending "s.labelname" to the provider device name, meaning you > still > have to know the name and unit of the hardware device to use the labels. > > These changes add support for device-independent geom_flashmap labels, > using > the standard geom_label infrastructure. geom_flashmap now creates a softc > struct attached to its geom, and as it creates slices it stores the label > into an array in the softc. The new geom_label_flashmap uses those labels > when tasting a geom_flashmap provider. > > Differential Revision: https://reviews.freebsd.org/D19535 > > Added: > head/sys/geom/geom_flashmap.h (contents, props changed) > head/sys/geom/label/g_label_flashmap.c (contents, props changed) > Modified: > head/sys/conf/files > head/sys/geom/geom_flashmap.c > head/sys/geom/label/g_label.c > head/sys/geom/label/g_label.h > > Modified: head/sys/conf/files > > ============================================================================== > --- head/sys/conf/files Sun Mar 24 19:09:50 2019 (r345479) > +++ head/sys/conf/files Sun Mar 24 19:11:45 2019 (r345480) > @@ -3628,6 +3628,7 @@ geom/journal/g_journal.c optional geom_journal > geom/journal/g_journal_ufs.c optional geom_journal > geom/label/g_label.c optional geom_label | geom_label_gpt > geom/label/g_label_ext2fs.c optional geom_label > +geom/label/g_label_flashmap.c optional geom_label > geom/label/g_label_iso9660.c optional geom_label > geom/label/g_label_msdosfs.c optional geom_label > geom/label/g_label_ntfs.c optional geom_label > > Modified: head/sys/geom/geom_flashmap.c > > ============================================================================== > --- head/sys/geom/geom_flashmap.c Sun Mar 24 19:09:50 2019 > (r345479) > +++ head/sys/geom/geom_flashmap.c Sun Mar 24 19:11:45 2019 > (r345480) > @@ -39,13 +39,12 @@ __FBSDID("$FreeBSD$"); > #include > > #include > -#include > #include > +#include > +#include > > #include > > -#define FLASHMAP_CLASS_NAME "Flashmap" > - > struct g_flashmap_slice { > off_t sl_start; > off_t sl_end; > @@ -71,8 +70,8 @@ static g_taste_t g_flashmap_taste; > > static int g_flashmap_load(device_t dev, struct g_provider *pp, > flash_slicer_t slicer, struct g_flashmap_head *head); > -static int g_flashmap_modify(struct g_geom *gp, const char *devname, > - int secsize, struct g_flashmap_head *slices); > +static int g_flashmap_modify(struct g_flashmap *gfp, struct g_geom *gp, > + const char *devname, int secsize, struct g_flashmap_head *slices); > static void g_flashmap_print(struct g_flashmap_slice *slice); > > MALLOC_DECLARE(M_FLASHMAP); > @@ -88,8 +87,8 @@ g_flashmap_print(struct g_flashmap_slice *slice) > } > > static int > -g_flashmap_modify(struct g_geom *gp, const char *devname, int secsize, > - struct g_flashmap_head *slices) > +g_flashmap_modify(struct g_flashmap *gfp, struct g_geom *gp, > + const char *devname, int secsize, struct g_flashmap_head *slices) > { > struct g_flashmap_slice *slice; > int i, error; > @@ -114,6 +113,8 @@ g_flashmap_modify(struct g_geom *gp, const char *devna > > i = 0; > STAILQ_FOREACH(slice, slices, sl_link) { > + free(__DECONST(void *, gfp->labels[i]), M_FLASHMAP); > + gfp->labels[i] = strdup(slice->sl_name, M_FLASHMAP); > error = g_slice_config(gp, i++, G_SLICE_CONFIG_SET, > slice->sl_start, > slice->sl_end - slice->sl_start + 1, > @@ -153,6 +154,7 @@ g_flashmap_taste(struct g_class *mp, struct g_provider > struct g_consumer *cp; > struct g_flashmap_head head; > struct g_flashmap_slice *slice, *slice_temp; > + struct g_flashmap *gfp; > flash_slicer_t slicer; > device_t dev; > int i, size; > @@ -164,7 +166,8 @@ g_flashmap_taste(struct g_class *mp, struct g_provider > strcmp(pp->geom->class->name, G_DISK_CLASS_NAME) != 0) > return (NULL); > > - gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, NULL, 0, NULL); > + gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, (void**)&gfp, > + sizeof(struct g_flashmap), NULL); > if (gp == NULL) > return (NULL); > > @@ -186,7 +189,7 @@ g_flashmap_taste(struct g_class *mp, struct g_provider > if (g_flashmap_load(dev, pp, slicer, &head) == 0) > break; > > - g_flashmap_modify(gp, cp->provider->name, > + g_flashmap_modify(gfp, gp, cp->provider->name, > cp->provider->sectorsize, &head); > } while (0); > > > Added: head/sys/geom/geom_flashmap.h > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/geom/geom_flashmap.h Sun Mar 24 19:11:45 2019 > (r345480) > @@ -0,0 +1,39 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause > + * > + * Copyright (c) 2019 Ian Lepore > + * > + * 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$ > + */ > + > +#ifndef _GEOM_GEOM_FLASHMAP_H_ > + > +#define FLASHMAP_CLASS_NAME "Flashmap" > + > +struct g_flashmap { > + const char *labels[FLASH_SLICES_MAX_NUM]; > +}; > + > +#endif > + > > Modified: head/sys/geom/label/g_label.c > > ============================================================================== > --- head/sys/geom/label/g_label.c Sun Mar 24 19:09:50 2019 > (r345479) > +++ head/sys/geom/label/g_label.c Sun Mar 24 19:11:45 2019 > (r345480) > @@ -95,6 +95,7 @@ const struct g_label_desc *g_labels[] = { > &g_label_reiserfs, > &g_label_ntfs, > &g_label_disk_ident, > + &g_label_flashmap, > #endif > NULL > }; > > Modified: head/sys/geom/label/g_label.h > > ============================================================================== > --- head/sys/geom/label/g_label.h Sun Mar 24 19:09:50 2019 > (r345479) > +++ head/sys/geom/label/g_label.h Sun Mar 24 19:11:45 2019 > (r345480) > @@ -88,6 +88,7 @@ extern struct g_label_desc g_label_ntfs; > extern struct g_label_desc g_label_gpt; > extern struct g_label_desc g_label_gpt_uuid; > extern struct g_label_desc g_label_disk_ident; > +extern struct g_label_desc g_label_flashmap; > > extern void g_label_rtrim(char *label, size_t size); > #endif /* _KERNEL */ > > Added: head/sys/geom/label/g_label_flashmap.c > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/geom/label/g_label_flashmap.c Sun Mar 24 19:11:45 2019 > (r345480) > @@ -0,0 +1,77 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2019 Ian Lepore > + * > + * 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. > + */ > + > +#include > +__FBSDID("$FreeBSD$"); > + > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > +#include > + > +#define G_LABEL_FLASHMAP_SLICE_DIR "flash" > + > +static void > +g_label_flashmap_taste(struct g_consumer *cp, char *label, size_t size) > +{ > + struct g_flashmap *gfp; > + struct g_slicer *gsp; > + struct g_provider *pp; > + > + g_topology_assert_not(); > + > + pp = cp->provider; > + label[0] = '\0'; > + > + /* We taste only partitions handled by flashmap */ > + if (strncmp(pp->geom->class->name, FLASHMAP_CLASS_NAME, > + sizeof(FLASHMAP_CLASS_NAME)) != 0) > + return; > + > + gsp = (struct g_slicer *)pp->geom->softc; > + gfp = (struct g_flashmap *)gsp->softc; > + > + /* If it's handled by flashmap it should have a label, but be > safe. */ > + if (gfp->labels[pp->index] == NULL) > + return; > + > + strlcpy(label, gfp->labels[pp->index], size); > +} > + > +struct g_label_desc g_label_flashmap = { > + .ld_taste = g_label_flashmap_taste, > + .ld_dir = G_LABEL_FLASHMAP_SLICE_DIR, > + .ld_enabled = 1 > +}; > + > +G_LABEL_INIT(flashmap, g_label_flashmap, "Create device nodes for > Flashmap labels"); > _______________________________________________ > 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" > From owner-svn-src-head@freebsd.org Sun Apr 7 15:04:51 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A4A61558396; Sun, 7 Apr 2019 15:04:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.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 78DEA938E2; Sun, 7 Apr 2019 15:04:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id D9IzhAeW3sAGkD9J0hj18o; Sun, 07 Apr 2019 09:01:59 -0600 X-Authority-Analysis: v=2.3 cv=WeVylHpX c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=oexKYjalfGEA:10 a=ypVJL4-jAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=XXoiANQANLpcMMperh8A:9 a=QEXdDO2ut3YA:10 a=khIbc0fXALFIcTpOSxgJ:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from [192.168.0.103] (S0106002401cb186f.gv.shawcable.net [70.67.125.17]) by spqr.komquats.com (Postfix) with ESMTPSA id BAAA5A58; Sun, 7 Apr 2019 08:01:55 -0700 (PDT) Date: Sun, 07 Apr 2019 08:01:54 -0700 User-Agent: K-9 Mail for Android In-Reply-To: <20190407141152.oyf35rgomoa2qoki@mutt-hbsd> References: <201904060934.x369YQn9043498@repo.freebsd.org> <20190407141152.oyf35rgomoa2qoki@mutt-hbsd> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs To: Shawn Webb , Mariusz Zaborski CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Cy Schubert Message-ID: X-CMAE-Envelope: MS4wfLxt9wiwN8v+dmkcWyWQGUJiWVuAvkfekJiH7EZ5IyAo/DM25X9jkLBZd11G6G3bpdEa33Y8pEO/UFlyJzWFPBzmatzxcj0hQbQhCXKocp5GRUJm6zfL H+mKdB2Gpwa8dL5wg7MwVFoVYxt7kY7FvmsUBP3bh9SOfLhhUgKp2tBV2LXy7ISHx0+1ZojxdtMa+ZPDsbWkWfhooL7QB0ABo8YKBOKfGhJgGRmxc1u5oNpT LfWuXWYICHIsjEJseEVPfV5EDyml4NnVWrZXOeOFoK7GNthGaixvPHCAs5gLW7zxOOua1CZx6+z6cAoWqoZhbQH9fSTKZiyephaZte3ihWw= X-Rspamd-Queue-Id: 78DEA938E2 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-7.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 15:04:51 -0000 On April 7, 2019 7:11:52 AM PDT, Shawn Webb wrote: >On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: >> Author: oshogbo >> Date: Sat Apr 6 09:34:26 2019 >> New Revision: 345982 >> URL: https://svnweb=2Efreebsd=2Eorg/changeset/base/345982 >>=20 >> Log: >> Introduce funlinkat syscall that always us to check if we are >removing >> the file associated with the given file descriptor=2E >> =20 >> Reviewed by: kib, asomers >> Reviewed by: cem, jilles, brooks (they reviewed previous version) >> Discussed with: pjd, and many others >> Differential Revision: https://reviews=2Efreebsd=2Eorg/D14567 > >Hey Mariusz, > >Is __FreeBSD_version supposed to be bumped after adding new syscalls? >I can't remember off-hand=2E > >Thanks, I don't think so=2E Why force the rebuild of all ports through poudriere o= ver something that would never affect any of them? --=20 Pardon the typos and autocorrect, small keyboard in use=2E Cheers, Cy Schubert FreeBSD UNIX: Web: http://www=2EFreeBSD=2Eorg The need of the many outweighs the greed of the few=2E From owner-svn-src-head@freebsd.org Sun Apr 7 15:10:14 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EDB115584E2; Sun, 7 Apr 2019 15:10:14 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 8192393A89; Sun, 7 Apr 2019 15:10:13 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x37FA7lL050627; Sun, 7 Apr 2019 08:10:07 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x37FA7tm050626; Sun, 7 Apr 2019 08:10:07 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs In-Reply-To: To: Cy Schubert Date: Sun, 7 Apr 2019 08:10:07 -0700 (PDT) CC: Shawn Webb , Mariusz Zaborski , 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-Rspamd-Queue-Id: 8192393A89 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 15:10:14 -0000 > On April 7, 2019 7:11:52 AM PDT, Shawn Webb wrote: > >On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: > >> Author: oshogbo > >> Date: Sat Apr 6 09:34:26 2019 > >> New Revision: 345982 > >> URL: https://svnweb.freebsd.org/changeset/base/345982 > >> > >> Log: > >> Introduce funlinkat syscall that always us to check if we are > >removing > >> the file associated with the given file descriptor. > >> > >> Reviewed by: kib, asomers > >> Reviewed by: cem, jilles, brooks (they reviewed previous version) > >> Discussed with: pjd, and many others > >> Differential Revision: https://reviews.freebsd.org/D14567 > > > >Hey Mariusz, > > > >Is __FreeBSD_version supposed to be bumped after adding new syscalls? > >I can't remember off-hand. > > > >Thanks, > > I don't think so. Why force the rebuild of all ports through poudriere over something that would never affect any of them? So that you can if version >= foo to know it is safe to use the new syscal? Or if version < foo you must use the old way. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Sun Apr 7 15:35:17 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58C161558E45; Sun, 7 Apr 2019 15:35:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (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 5DDCA947EB; Sun, 7 Apr 2019 15:35:15 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id D9p9hArldsAGkD9pBhj6ZO; Sun, 07 Apr 2019 09:35:13 -0600 X-Authority-Analysis: v=2.3 cv=WeVylHpX c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=oexKYjalfGEA:10 a=iKhvJSA4AAAA:8 a=ypVJL4-jAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=tOixRJis2aQXTnQbcsUA:9 a=CjuIK1q_8ugA:10 a=odh9cflL3HIXMm4fY7Wr:22 a=khIbc0fXALFIcTpOSxgJ:22 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 53635A97; Sun, 7 Apr 2019 08:35:11 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x37FZ9UY073863; Sun, 7 Apr 2019 08:35:10 -0700 (PDT) (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 x37FZ7bk073860; Sun, 7 Apr 2019 08:35:08 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201904071535.x37FZ7bk073860@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.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: rgrimes@freebsd.org cc: Cy Schubert , Shawn Webb , Mariusz Zaborski , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs In-Reply-To: Message from "Rodney W. Grimes" of "Sun, 07 Apr 2019 08:10:07 -0700." <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 07 Apr 2019 08:35:07 -0700 X-CMAE-Envelope: MS4wfG3rgtUpQn8xKpViiuqfymRbiV8C2340SHr8zNNRlD3i2RN3MakARtkOJJ5BPbXZErpRt/Kfdl5xUeZyxi9jtxmX/ZFyjE9X/oy8Oh5449svOgjbPhTT cmBOSdL1B7+wSyzXdw6DTtmF6cFtJ92EQ8/wlL+1SuA1exqfeekuBCzFo0ETwnRfQvE9yjTJQNc+2YptT6pVsIJOrqmdglmgtgy7rGtROO+gF1J2uNDskE6c u0zfMhKTLQsGjhp8qTImp/fQktESOLLNhLKDMRyPA6Sz6D6zT8JSFmigF0ZDxsss9KwgrJX6hgiw0aRgnR7/zmAS6ZJ9fndd5to+yYnFY6tFkhEiJZNHkGxO H74ExKwB X-Rspamd-Queue-Id: 5DDCA947EB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-4.99 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.zen.spamhaus.org : 127.0.0.11]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; REPLYTO_EQ_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: spqr.komquats.com]; NEURAL_HAM_SHORT(-0.93)[-0.932,0]; RCPT_COUNT_SEVEN(0.00)[7]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_SPF_NA(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[9.134.59.64.list.dnswl.org : 127.0.5.1]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-2.35)[ip: (-6.20), ipnet: 64.59.128.0/20(-3.08), asn: 6327(-2.38), country: CA(-0.09)]; FROM_EQ_ENVFROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 15:35:17 -0000 In message <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net>, "Rodney W. Grimes" writes: > > On April 7, 2019 7:11:52 AM PDT, Shawn Webb wr > ote: > > >On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: > > >> Author: oshogbo > > >> Date: Sat Apr 6 09:34:26 2019 > > >> New Revision: 345982 > > >> URL: https://svnweb.freebsd.org/changeset/base/345982 > > >> > > >> Log: > > >> Introduce funlinkat syscall that always us to check if we are > > >removing > > >> the file associated with the given file descriptor. > > >> > > >> Reviewed by: kib, asomers > > >> Reviewed by: cem, jilles, brooks (they reviewed previous version) > > >> Discussed with: pjd, and many others > > >> Differential Revision: https://reviews.freebsd.org/D14567 > > > > > >Hey Mariusz, > > > > > >Is __FreeBSD_version supposed to be bumped after adding new syscalls? > > >I can't remember off-hand. > > > > > >Thanks, > > > > I don't think so. Why force the rebuild of all ports through poudriere over > something that would never affect any of them? > > So that you can if version >= foo to know it is safe to use the new syscal? > Or if version < foo you must use the old way. Granted. However we do need something to avoid gratuitous rebuilds of ports. Personally, my poudriere script adjusts the pkg version ($JAILPATH/data/packages/${JAIL}-${PORTS}/.building/.jailversion) with that of the jail version (reported by poudriere jail -i -j $JAIL), rebuilding all ports when I (the human) determines when the machine should rebuild all ports with -c. In that regard FreeBSD version bumps occasionally seem a little gratuitous. Using the same indicator to tell whether software should be able to use a new feature and when ports build infrastructure should summarily delete all packages forcing a rebuild of absolutely everything is probably not the best. Just throwing out an idea, what if poudriere considers the first N bytes of __FreeBSD_version significant? Having said that, looking at __FreeBSD_version, I don't think we have enough digits to do what I was planning on suggesting. But, you get the idea of what I'm driving at. Maybe a new macro such as __FreeBSD_ports that is incremented every time a change that affects ports? Anyhow, I'm not too terribly concerned as what I have (selfishly speaking) works. But we may as a group might want to consider this at some point to build some efficiency into the ports part of the equation. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Sun Apr 7 16:07:42 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BA081563136; Sun, 7 Apr 2019 16:07:42 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA4FD957EC; Sun, 7 Apr 2019 16:07:41 +0000 (UTC) (envelope-from oshogbo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9713BE715; Sun, 7 Apr 2019 16:07:41 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37G7fof021280; Sun, 7 Apr 2019 16:07:41 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37G7fFP021279; Sun, 7 Apr 2019 16:07:41 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904071607.x37G7fFP021279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sun, 7 Apr 2019 16:07:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346012 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 346012 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AA4FD957EC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 16:07:42 -0000 Author: oshogbo Date: Sun Apr 7 16:07:41 2019 New Revision: 346012 URL: https://svnweb.freebsd.org/changeset/base/346012 Log: Bump FreeBSD version after r345982. Reported by: Shawn Webb Discussed with: imp, cy, rgrimes Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Sun Apr 7 14:30:17 2019 (r346011) +++ head/sys/sys/param.h Sun Apr 7 16:07:41 2019 (r346012) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300017 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300018 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-head@freebsd.org Sun Apr 7 16:10:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB9DA1563212 for ; Sun, 7 Apr 2019 16:10:46 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 614F695AA4 for ; Sun, 7 Apr 2019 16:10:46 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82b.google.com with SMTP id k2so12793098qtm.1 for ; Sun, 07 Apr 2019 09:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6C15y/EwF8qjdlIzpTk8WM25tFfyF7RydrDG/QHuW4E=; b=guXqcWnfUsBcCnUDnEZ+gdzlMuUui/8LS9qB5Bf3pMXRXmoJoPZvC3hPNHLqBzu/9Z //sCRTpDB/C6hHnCo1DTUY/LowFmsGjS5wpAjlENKPUjqbYRj3eI6mWxwi6lFVx8wBqK rsuT3PxvRPhRpBIo5TbjEP03ozKyapVbNecYKRjr+xBnQWj/toAFU3M5HoxudkZnqShf W5URaq6fTR9Jc9tgOUrP+kq9bcGNa9Ne5GJJDzN630QFR/8nt0o9Ertlf/mA2b9nhMyX zy4QVgAu4lrmlx/ABUntkUUQaYmHE8IcSDa0XbXl6S0vZ9b6lN5LZSaWhtTD7MPBmkq0 O4dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6C15y/EwF8qjdlIzpTk8WM25tFfyF7RydrDG/QHuW4E=; b=aDXnpA8mxGWibA5AoDptJzcV6S47tmTYSG5Tn+eh7mMuh3ricIQGZI4C2MMPOD4xdB uxBGjK292OO9e/MfG4VpHJDJZsjkY+yjCbyeppIf6izeLZScAi0F9xH8y1KOMAQccFnw LX5Q1ckYgg3inkex8XCk36/3RlNg6w4C/Not/FgF9mxLckt0NBo9YzY369W6bprb25oZ o0TI/q2eDURveFdFB2Dayv9SNNN/RQ+XCI3kpEOIzK78oRGlQ/oA9XXeYMZpmZKXHURz 8CJqRWyqF0y5PyqUUby7WJTPpF0nT0MYMB/RrDEfxEdG/D3GRNhqt3gMT+gKok+vyxpW PiEg== X-Gm-Message-State: APjAAAX5mmd/13tptz6U2jcQuENoSu6RI+3l7XKxoYpIseDDvlPQy6ac FUF7i7ZItZtRUPfNLj+5STqchKk7zbFPFk/RavmO3A== X-Google-Smtp-Source: APXvYqyoYa3wYbmqt5Wnxtxtk1NUVaLxe2VS5+mURa6Sf6HC70Pxnz/8Evmhf0qD1marEfb+XrZOYdrkI67QqDK//G8= X-Received: by 2002:a0c:9922:: with SMTP id h31mr19336547qvd.137.1554653445352; Sun, 07 Apr 2019 09:10:45 -0700 (PDT) MIME-Version: 1.0 References: <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net> <201904071535.x37FZ7bk073860@slippy.cwsent.com> In-Reply-To: <201904071535.x37FZ7bk073860@slippy.cwsent.com> From: Warner Losh Date: Sun, 7 Apr 2019 10:10:34 -0600 Message-ID: Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs To: Cy Schubert Cc: "Rodney W. Grimes" , Shawn Webb , Mariusz Zaborski , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 614F695AA4 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 16:10:47 -0000 On Sun, Apr 7, 2019 at 9:35 AM Cy Schubert wrote: > In message <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net>, "Rodney W. > Grimes" > writes: > > > On April 7, 2019 7:11:52 AM PDT, Shawn Webb < > shawn.webb@hardenedbsd.org> wr > > ote: > > > >On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: > > > >> Author: oshogbo > > > >> Date: Sat Apr 6 09:34:26 2019 > > > >> New Revision: 345982 > > > >> URL: https://svnweb.freebsd.org/changeset/base/345982 > > > >> > > > >> Log: > > > >> Introduce funlinkat syscall that always us to check if we are > > > >removing > > > >> the file associated with the given file descriptor. > > > >> > > > >> Reviewed by: kib, asomers > > > >> Reviewed by: cem, jilles, brooks (they reviewed previous > version) > > > >> Discussed with: pjd, and many others > > > >> Differential Revision: https://reviews.freebsd.org/D14567 > > > > > > > >Hey Mariusz, > > > > > > > >Is __FreeBSD_version supposed to be bumped after adding new syscalls? > > > >I can't remember off-hand. > > > > > > > >Thanks, > > > > > > I don't think so. Why force the rebuild of all ports through poudriere > over > > something that would never affect any of them? > > > > So that you can if version >= foo to know it is safe to use the new > syscal? > > Or if version < foo you must use the old way. > > Granted. However we do need something to avoid gratuitous rebuilds of > ports. > > Personally, my poudriere script adjusts the pkg version > ($JAILPATH/data/packages/${JAIL}-${PORTS}/.building/.jailversion) with > that of the jail version (reported by poudriere jail -i -j $JAIL), > rebuilding all ports when I (the human) determines when the machine > should rebuild all ports with -c. > > In that regard FreeBSD version bumps occasionally seem a little > gratuitous. Using the same indicator to tell whether software should be > able to use a new feature and when ports build infrastructure should > summarily delete all packages forcing a rebuild of absolutely > everything is probably not the best. > > Just throwing out an idea, what if poudriere considers the first N > bytes of __FreeBSD_version significant? Having said that, looking at > __FreeBSD_version, I don't think we have enough digits to do what I was > planning on suggesting. But, you get the idea of what I'm driving at. > Maybe a new macro such as __FreeBSD_ports that is incremented every > time a change that affects ports? > > Anyhow, I'm not too terribly concerned as what I have (selfishly > speaking) works. But we may as a group might want to consider this at > some point to build some efficiency into the ports part of the equation. > We generally bump the version around the time we add a syscall. This allows any wrappers to call it or not based on the kernel version and avoid a SIGSYS when we're doing forward compatibility hacks for whatever reason. The current overloading of __FreeBSD_version is unfortunate. We've been quite liberal over the past 2 decades at bumping it because it's free to do so. Or so the thinking has been. I personally think we should continue to do so, but maybe look at piggy-backing those changes we can if someone else bumped it in the last few days. To give some perspective, in the ~120 days since we branched, we've bumped it 17 times. This is more or less weekly, which suggests we don't have a problem that we need to optimize too much here. If Poudriere wants to optimize building, I'd suggest that you have a command line argument / config file thing that sets the maximum skew. Normally, you could set it up to be pretty tolerant, but if you knew something was a big deal, you could then crank down to intolerant. The current setting of '1' for this skew should be the default. I'm not sure a FreeBSD_ports would scale. How do you know a port won't need to know about the new syscall? It's from Linux, and there may be some ports that use it if available. As a src committer, I've not easy way to know (and no hard way to know that's not a full exprun). Warner From owner-svn-src-head@freebsd.org Sun Apr 7 16:12:03 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2271715633FC; Sun, 7 Apr 2019 16:12:03 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 850FE95CCA; Sun, 7 Apr 2019 16:12:02 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-lj1-x241.google.com with SMTP id q66so9080855ljq.7; Sun, 07 Apr 2019 09:12:02 -0700 (PDT) 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=zKBJgPPpYeE2fRAQDfKtArFbxuSMFkoVrGfEkJcwdc0=; b=VfL0w7uChzynMtA3D/Bnq4+ixUfJfp5PEw4SRoQvIGpZp+I0DfA9/dpxfAS+Xku9T/ NTBdiD/4HfAbF3JUTtgCgtnPdANj8scoTQwRLWe0bKWPDUJabY+/6fHc0bclLxlgXDpZ h5PMYIO047f5oVdm6UlixE5qhRzhmBfDTBFf4w/kbmk/hZB6dxVYEW8U2gEybazszQSL I6fXTyJ3p/TDCNdPHKO9yodD1+IoXhxqHLiVH3EPOI+QCtY11V9IMjT4f/KZQZHkxmUk M+GRghOtdtVnyAGm5pxrXvn2Yvv5BZ/b9V83hYPXceBXm6MCEsZyIixRaJb8o0S5T/eJ 9sTA== 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=zKBJgPPpYeE2fRAQDfKtArFbxuSMFkoVrGfEkJcwdc0=; b=I+lbAUD7O5DNJDSpOmg8dWhwmDi3NKiYdf2tEgzPTQhcD4DuEACV8ekRQM0yVSlk6H kD/j6NQFry21eo7lcrIhVdQ/NXBIXy5l1vjgIp/RVK+aJJTyqsFQGIhKH6DH0pl4ZEF7 +8aUWU1BaMgSoWjWSOhRqat773X2fn5F4qf7kkHag0WAz7Djgp2tYtiqECQRSBDudQwh e5aRQNvCyBgPbnXpVieiJu6EWinRYJeJQWvAWJvQ1vwJXJ/0wgUQGTC7+4JlswjE57Kn lr9u29wW3Aos0x6utRD2wV1H8pvZXFybfzkiF8pEoYy6hrCk8E6W8NsXdQKo7zjnSfQQ pZHQ== X-Gm-Message-State: APjAAAXmgi8wyzatqlcGPNcgn97z8ZPBxtwhvTQ0p+ATY8CadGaPG7rB lAcK/4sUqWP1qXoBSlRQ6ts4aEZvM+z+dw== X-Google-Smtp-Source: APXvYqzezo02ZEqWOpPWnzwwO4+Fi6b4EN0dTH0Q5iudLC/rKitWd36K3QMZlwwOCUTUNaxfp5UOoA== X-Received: by 2002:a2e:9010:: with SMTP id h16mr13001040ljg.16.1554653521216; Sun, 07 Apr 2019 09:12:01 -0700 (PDT) Received: from x-wing (87-206-170-77.dynamic.chello.pl. [87.206.170.77]) by smtp.gmail.com with ESMTPSA id t14sm5575298lfl.38.2019.04.07.09.11.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Apr 2019 09:11:59 -0700 (PDT) Sender: Mariusz Zaborski Date: Sun, 7 Apr 2019 18:11:58 +0200 From: Mariusz Zaborski To: Cy Schubert Cc: rgrimes@freebsd.org, Shawn Webb , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs Message-ID: <20190407161158.GA40247@x-wing> References: <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net> <201904071535.x37FZ7bk073860@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ibTvN161/egqYuK8" Content-Disposition: inline In-Reply-To: <201904071535.x37FZ7bk073860@slippy.cwsent.com> User-Agent: Mutt/1.11.2 (2019-01-07) X-Rspamd-Queue-Id: 850FE95CCA X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 16:12:03 -0000 --ibTvN161/egqYuK8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In the https://wiki.freebsd.org/AddingSyscalls we mentions that we need to = bump __FreeBSD_version. I confirmed that with Warner. So this was my mistake. Thanks Shawn. --=20 Mariusz Zaborski oshogbo//vx | http://oshogbo.vexillium.org FreeBSD committer | https://freebsd.org Software developer | http://wheelsystems.com If it's not broken, let's fix it till it is!!1 On Sun, Apr 07, 2019 at 08:35:07AM -0700, Cy Schubert wrote: > In message <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net>, "Rodney W.=20 > Grimes" > writes: > > > On April 7, 2019 7:11:52 AM PDT, Shawn Webb wr > > ote: > > > >On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: > > > >> Author: oshogbo > > > >> Date: Sat Apr 6 09:34:26 2019 > > > >> New Revision: 345982 > > > >> URL: https://svnweb.freebsd.org/changeset/base/345982 > > > >>=20 > > > >> Log: > > > >> Introduce funlinkat syscall that always us to check if we are > > > >removing > > > >> the file associated with the given file descriptor. > > > >> =20 > > > >> Reviewed by: kib, asomers > > > >> Reviewed by: cem, jilles, brooks (they reviewed previous version) > > > >> Discussed with: pjd, and many others > > > >> Differential Revision: https://reviews.freebsd.org/D14567 > > > > > > > >Hey Mariusz, > > > > > > > >Is __FreeBSD_version supposed to be bumped after adding new syscalls? > > > >I can't remember off-hand. > > > > > > > >Thanks, > > >=20 > > > I don't think so. Why force the rebuild of all ports through poudrier= e over > > something that would never affect any of them? > > > > So that you can if version >=3D foo to know it is safe to use the new s= yscal? > > Or if version < foo you must use the old way. >=20 > Granted. However we do need something to avoid gratuitous rebuilds of=20 > ports. >=20 > Personally, my poudriere script adjusts the pkg version=20 > ($JAILPATH/data/packages/${JAIL}-${PORTS}/.building/.jailversion) with=20 > that of the jail version (reported by poudriere jail -i -j $JAIL),=20 > rebuilding all ports when I (the human) determines when the machine=20 > should rebuild all ports with -c. >=20 > In that regard FreeBSD version bumps occasionally seem a little=20 > gratuitous. Using the same indicator to tell whether software should be= =20 > able to use a new feature and when ports build infrastructure should=20 > summarily delete all packages forcing a rebuild of absolutely=20 > everything is probably not the best. >=20 > Just throwing out an idea, what if poudriere considers the first N=20 > bytes of __FreeBSD_version significant? Having said that, looking at=20 > __FreeBSD_version, I don't think we have enough digits to do what I was= =20 > planning on suggesting. But, you get the idea of what I'm driving at.=20 > Maybe a new macro such as __FreeBSD_ports that is incremented every=20 > time a change that affects ports? >=20 > Anyhow, I'm not too terribly concerned as what I have (selfishly=20 > speaking) works. But we may as a group might want to consider this at=20 > some point to build some efficiency into the ports part of the equation. >=20 >=20 > --=20 > Cheers, > Cy Schubert > FreeBSD UNIX: Web: http://www.FreeBSD.org >=20 > The need of the many outweighs the greed of the few. > =20 >=20 --ibTvN161/egqYuK8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkD1x0xkJXVVY1Gwf38KEGuLGxWQFAlyqIUoACgkQ38KEGuLG xWRSaQ/+K9Xb1fcdDZ5U+5bVEfQKBJJGnMjla+sGEDqTzTN24NWqs9KETAtyqXjY c7PLJxlWCaEtWZPsFMNikBm0k6OA4WaqgNS4EIdwgS2oGW9uKRv3dv1iuFzD6Ovl qt7DQd+Bb9AX/3tFamQHc6ZgDyFwWq2GzbH0g1F9XXLEdXAbK5W/itU54RxBP795 iIOwg66KcppvHZ/UytgV90+nuK8VbQqL4pFYqPCNk7vADwqWQF02GRrqWaKimmlt CA3D2q+gDWA81mb+hxc6CrhZTJxws8i/rA7qEodUjmBqlsZulLyw19/B+hVSjy/2 tx1rvvk8eIjuM/lDOQftvmjN3jLreld4Q3zZewOCYPR4CwqzaiwIwF+t5M/TLy99 jRoZXZmzeNCpvo6bDcHs5RUU1xL8Ma6diOGbMnqHLl3hptOcODEFyaxrd/frrIZ4 WmmG4RwjkVkcmsvOlB4k6PAEH3p1OeSPnMclQb8OYdZy965CaGB2M/wbUTeOtxIZ IV1zWgd2/rwSPPJRGryXAikaNNEtkHVjNxC0Y56MPr4vbwxuO1pUbkWVQAdKzvPJ L8ITyDZUIieVrsbQSwMlNq814MNoO0eXO9oaLpbZP1ArXE+eDfSobablyDVPcNxz VCFCwalaiel9p71pTPb5kxSIDdwbfYadzIbcTtxufSSlUgsatkA= =OXw0 -----END PGP SIGNATURE----- --ibTvN161/egqYuK8-- From owner-svn-src-head@freebsd.org Sun Apr 7 16:33:23 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD3891563D2D; Sun, 7 Apr 2019 16:33:23 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5D80496AD3; Sun, 7 Apr 2019 16:33:23 +0000 (UTC) (envelope-from ian@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA015EC33; Sun, 7 Apr 2019 16:33:22 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37GXMBD037457; Sun, 7 Apr 2019 16:33:22 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37GXMni037456; Sun, 7 Apr 2019 16:33:22 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201904071633.x37GXMni037456@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 7 Apr 2019 16:33:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346013 - head/sys/modules/geom/geom_label X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: head/sys/modules/geom/geom_label X-SVN-Commit-Revision: 346013 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5D80496AD3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 16:33:23 -0000 Author: ian Date: Sun Apr 7 16:33:22 2019 New Revision: 346013 URL: https://svnweb.freebsd.org/changeset/base/346013 Log: Add g_label_flashmap.c to the module, should have been part of r345480. Reported by: Jia-Shiun Li Modified: head/sys/modules/geom/geom_label/Makefile Modified: head/sys/modules/geom/geom_label/Makefile ============================================================================== --- head/sys/modules/geom/geom_label/Makefile Sun Apr 7 16:07:41 2019 (r346012) +++ head/sys/modules/geom/geom_label/Makefile Sun Apr 7 16:33:22 2019 (r346013) @@ -6,6 +6,7 @@ KMOD= geom_label SRCS= g_label.c SRCS+= g_label_disk_ident.c SRCS+= g_label_ext2fs.c +SRCS+= g_label_flashmap.c SRCS+= g_label_gpt.c SRCS+= g_label_iso9660.c SRCS+= g_label_msdosfs.c From owner-svn-src-head@freebsd.org Sun Apr 7 16:34:28 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3AC91563DBA for ; Sun, 7 Apr 2019 16:34:27 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1.eu.mailhop.org (outbound1.eu.mailhop.org [52.28.251.132]) (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 4F39896C4A for ; Sun, 7 Apr 2019 16:34:27 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1554654859; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=s2DouP0pmS6w2+dQPF1VpyBmk7bhI7TuZ7D6bAq4vYosHEHpo25R851jD/7F9cBUEeI6onXuZSlEV hv0FSoZ7c8D2h7DBq6E4B0C8uKdXdn57nbOLDdjt9OrP4jhLUvUDdSnBed2D7Muclnglag8IBP7yXn li9xrVD9cER94ouZHbA8ayhAsFH9Ci1dz+IaUovbfTmJqnNLscE1CzPRxT2EHKlJtdUchjWuXsrI8q 7TxJjvpBnVxeuzZMaCQTDEDnXKraHhkmjOJ2ah7d31b74VrcRiCKsetT5mMALPPnwm9pBpXk6bir/D 4u+ioJR80eB24aMnF3JmXDrzv2Lsa/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:dkim-signature:from; bh=aUDWfUV9/PDB7uDBBM/m8NY9DdwZRD/c63+Uua/QbsE=; b=TLuxz4fQXL+biz1RqV/F6ypLlAYB85ACz/uh5Dm5bqh70x6wiWIGr4OWNasKacezfHWsMJNqBH9R2 7NTfOLWY2g7ayVhA+iy9Ij2UvAuWGqkjbafeO0xK6aMxLHOBa1g4qU6WuaR64Y0eVaYs+/sGD46Dks vVLP/KNEkKmmL/vwVxAxgT10a0/r1W4YfEbtlmrs1M9Nv8QdgrcG8rpDYrzYKRaitS31mbfm6TWXJF X6k9kHxuJNTDss6SERCW3pSPJUVTfBM1g2N8YNCWiyWHeLWgY5clFFsLNgAYWy93LluIRRI2qKhBKP ZBGQv2bQHmVd3GDxLxepXOhdzKprsKg== ARC-Authentication-Results: i=1; outbound3.eu.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:from; bh=aUDWfUV9/PDB7uDBBM/m8NY9DdwZRD/c63+Uua/QbsE=; b=BP0vnSCreb/OlhO8pIjjIEkxociybwDHUQ5pazqw0TS3sb4AfTOlNQ08Gt2CChPH474idyyZ6n1oO kdfIsihbHTetVitJ1CrE+oDA8EDpgY98r+VIzLSjfEJHGlS4en+AFvq7rCz+Z6i/Xp2hwV8mah+QYV 907+e7dScn+xKx4aUqvXSWNDWXCoKPgtBshyaau5u7J7cXGcJGbQhZ7g9+lp9+odz2sp8Ywd3vYkbz OlBaFZYLgeQuna9bMey4cGwb/M4myCICMV4ThJqEGJdFzV0rRJwX9uyJHRIwCBoP+/Z/j5nR+b0Gtp FpSdpsLWD0mmc8dtir2m1S6VxXfqFCw== X-MHO-RoutePath: aGlwcGll X-MHO-User: fbba9b4d-5952-11e9-908b-352056dbf2de X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound3.eu.mailhop.org (Halon) with ESMTPSA id fbba9b4d-5952-11e9-908b-352056dbf2de; Sun, 07 Apr 2019 16:34:16 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id x37GYF5B010967; Sun, 7 Apr 2019 10:34:15 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <832a6f77ed5e48687ba2b265c1cbb37f7d624ead.camel@freebsd.org> Subject: Re: svn commit: r345480 - in head/sys: conf geom geom/label From: Ian Lepore To: Jia-Shiun Li Cc: svn-src-head@freebsd.org Date: Sun, 07 Apr 2019 10:34:15 -0600 In-Reply-To: References: <201903241911.x2OJBj6x024102@repo.freebsd.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4F39896C4A X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.990,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 16:34:28 -0000 On Sun, 2019-04-07 at 22:53 +0800, Jia-Shiun Li wrote: > Hi Ian, > > after this commit it is not possible to load geom_label as module. > Loading geom_flashmap does not help. > > # uname -a > FreeBSD 4cbsd 13.0-CURRENT FreeBSD 13.0-CURRENT r345759 MINIMAL- > NODEBUG > amd64 > # kldload /boot/MINIMAL-NODEBUG/geom_label.ko > kldload: an error occurred while loading module > /boot/MINIMAL-NODEBUG/geom_label.ko. Please check dmesg(8) for more > details. > # dmesg | tail -2 > link_elf_obj: symbol g_label_flashmap undefined > linker_load_file: /boot/MINIMAL-NODEBUG/geom_label.ko - unsupported > file > type > # > > I used ufsid label to locate root fs, and have to fall back to > partition > name for now. > > /boot/loader.conf: > #vfs.root.mountfrom="ufs:/dev/ufsid/54a0236e063b0242" > vfs.root.mountfrom="ufs:/dev/ada0s4a" > > > - Jia-Shiun. > Oops, sorry abou that, I forgot to add the new source file to the module makefile. Should be fixed with r346013. -- Ian > On Mon, Mar 25, 2019 at 3:12 AM Ian Lepore wrote: > > > Author: ian > > Date: Sun Mar 24 19:11:45 2019 > > New Revision: 345480 > > URL: https://svnweb.freebsd.org/changeset/base/345480 > > > > Log: > > Support device-independent labels for geom_flashmap slices. > > > > While geom_flashmap has always supported label names for its > > slices, it > > does > > so by appending "s.labelname" to the provider device name, > > meaning you > > still > > have to know the name and unit of the hardware device to use the > > labels. > > > > These changes add support for device-independent geom_flashmap > > labels, > > using > > the standard geom_label infrastructure. geom_flashmap now creates > > a softc > > struct attached to its geom, and as it creates slices it stores > > the label > > into an array in the softc. The new geom_label_flashmap uses > > those labels > > when tasting a geom_flashmap provider. > > > > Differential Revision: https://reviews.freebsd.org/D19535 > > > > Added: > > head/sys/geom/geom_flashmap.h (contents, props changed) > > head/sys/geom/label/g_label_flashmap.c (contents, props > > changed) > > Modified: > > head/sys/conf/files > > head/sys/geom/geom_flashmap.c > > head/sys/geom/label/g_label.c > > head/sys/geom/label/g_label.h > > > > Modified: head/sys/conf/files > > > > =================================================================== > > =========== > > --- head/sys/conf/files Sun Mar 24 19:09:50 2019 (r345479) > > +++ head/sys/conf/files Sun Mar 24 19:11:45 2019 (r345480) > > @@ -3628,6 +3628,7 @@ geom/journal/g_journal.c optional > > geom_journal > > geom/journal/g_journal_ufs.c optional geom_journal > > geom/label/g_label.c optional geom_label | > > geom_label_gpt > > geom/label/g_label_ext2fs.c optional geom_label > > +geom/label/g_label_flashmap.c optional geom_label > > geom/label/g_label_iso9660.c optional geom_label > > geom/label/g_label_msdosfs.c optional geom_label > > geom/label/g_label_ntfs.c optional geom_label > > > > Modified: head/sys/geom/geom_flashmap.c > > > > =================================================================== > > =========== > > --- head/sys/geom/geom_flashmap.c Sun Mar 24 19:09:50 2019 > > (r345479) > > +++ head/sys/geom/geom_flashmap.c Sun Mar 24 19:11:45 2019 > > (r345480) > > @@ -39,13 +39,12 @@ __FBSDID("$FreeBSD$"); > > #include > > > > #include > > -#include > > #include > > +#include > > +#include > > > > #include > > > > -#define FLASHMAP_CLASS_NAME "Flashmap" > > - > > struct g_flashmap_slice { > > off_t sl_start; > > off_t sl_end; > > @@ -71,8 +70,8 @@ static g_taste_t g_flashmap_taste; > > > > static int g_flashmap_load(device_t dev, struct g_provider *pp, > > flash_slicer_t slicer, struct g_flashmap_head *head); > > -static int g_flashmap_modify(struct g_geom *gp, const char > > *devname, > > - int secsize, struct g_flashmap_head *slices); > > +static int g_flashmap_modify(struct g_flashmap *gfp, struct g_geom > > *gp, > > + const char *devname, int secsize, struct g_flashmap_head > > *slices); > > static void g_flashmap_print(struct g_flashmap_slice *slice); > > > > MALLOC_DECLARE(M_FLASHMAP); > > @@ -88,8 +87,8 @@ g_flashmap_print(struct g_flashmap_slice *slice) > > } > > > > static int > > -g_flashmap_modify(struct g_geom *gp, const char *devname, int > > secsize, > > - struct g_flashmap_head *slices) > > +g_flashmap_modify(struct g_flashmap *gfp, struct g_geom *gp, > > + const char *devname, int secsize, struct g_flashmap_head > > *slices) > > { > > struct g_flashmap_slice *slice; > > int i, error; > > @@ -114,6 +113,8 @@ g_flashmap_modify(struct g_geom *gp, const char > > *devna > > > > i = 0; > > STAILQ_FOREACH(slice, slices, sl_link) { > > + free(__DECONST(void *, gfp->labels[i]), > > M_FLASHMAP); > > + gfp->labels[i] = strdup(slice->sl_name, > > M_FLASHMAP); > > error = g_slice_config(gp, i++, G_SLICE_CONFIG_SET, > > slice->sl_start, > > slice->sl_end - slice->sl_start + 1, > > @@ -153,6 +154,7 @@ g_flashmap_taste(struct g_class *mp, struct > > g_provider > > struct g_consumer *cp; > > struct g_flashmap_head head; > > struct g_flashmap_slice *slice, *slice_temp; > > + struct g_flashmap *gfp; > > flash_slicer_t slicer; > > device_t dev; > > int i, size; > > @@ -164,7 +166,8 @@ g_flashmap_taste(struct g_class *mp, struct > > g_provider > > strcmp(pp->geom->class->name, G_DISK_CLASS_NAME) != 0) > > return (NULL); > > > > - gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, NULL, > > 0, NULL); > > + gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, > > (void**)&gfp, > > + sizeof(struct g_flashmap), NULL); > > if (gp == NULL) > > return (NULL); > > > > @@ -186,7 +189,7 @@ g_flashmap_taste(struct g_class *mp, struct > > g_provider > > if (g_flashmap_load(dev, pp, slicer, &head) == 0) > > break; > > > > - g_flashmap_modify(gp, cp->provider->name, > > + g_flashmap_modify(gfp, gp, cp->provider->name, > > cp->provider->sectorsize, &head); > > } while (0); > > > > > > Added: head/sys/geom/geom_flashmap.h > > > > =================================================================== > > =========== > > --- /dev/null 00:00:00 1970 (empty, because file is newly > > added) > > +++ head/sys/geom/geom_flashmap.h Sun Mar 24 19:11:45 2019 > > (r345480) > > @@ -0,0 +1,39 @@ > > +/*- > > + * SPDX-License-Identifier: BSD-2-Clause > > + * > > + * Copyright (c) 2019 Ian Lepore > > + * > > + * 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$ > > + */ > > + > > +#ifndef _GEOM_GEOM_FLASHMAP_H_ > > + > > +#define FLASHMAP_CLASS_NAME "Flashmap" > > + > > +struct g_flashmap { > > + const char *labels[FLASH_SLICES_MAX_NUM]; > > +}; > > + > > +#endif > > + > > > > Modified: head/sys/geom/label/g_label.c > > > > =================================================================== > > =========== > > --- head/sys/geom/label/g_label.c Sun Mar 24 19:09:50 2019 > > (r345479) > > +++ head/sys/geom/label/g_label.c Sun Mar 24 19:11:45 2019 > > (r345480) > > @@ -95,6 +95,7 @@ const struct g_label_desc *g_labels[] = { > > &g_label_reiserfs, > > &g_label_ntfs, > > &g_label_disk_ident, > > + &g_label_flashmap, > > #endif > > NULL > > }; > > > > Modified: head/sys/geom/label/g_label.h > > > > =================================================================== > > =========== > > --- head/sys/geom/label/g_label.h Sun Mar 24 19:09:50 2019 > > (r345479) > > +++ head/sys/geom/label/g_label.h Sun Mar 24 19:11:45 2019 > > (r345480) > > @@ -88,6 +88,7 @@ extern struct g_label_desc g_label_ntfs; > > extern struct g_label_desc g_label_gpt; > > extern struct g_label_desc g_label_gpt_uuid; > > extern struct g_label_desc g_label_disk_ident; > > +extern struct g_label_desc g_label_flashmap; > > > > extern void g_label_rtrim(char *label, size_t size); > > #endif /* _KERNEL */ > > > > Added: head/sys/geom/label/g_label_flashmap.c > > > > =================================================================== > > =========== > > --- /dev/null 00:00:00 1970 (empty, because file is newly > > added) > > +++ head/sys/geom/label/g_label_flashmap.c Sun Mar 24 19:11:45 > > 2019 > > (r345480) > > @@ -0,0 +1,77 @@ > > +/*- > > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > > + * > > + * Copyright (c) 2019 Ian Lepore > > + * > > + * 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. > > + */ > > + > > +#include > > +__FBSDID("$FreeBSD$"); > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include > > +#include > > +#include > > +#include > > + > > +#define G_LABEL_FLASHMAP_SLICE_DIR "flash" > > + > > +static void > > +g_label_flashmap_taste(struct g_consumer *cp, char *label, size_t > > size) > > +{ > > + struct g_flashmap *gfp; > > + struct g_slicer *gsp; > > + struct g_provider *pp; > > + > > + g_topology_assert_not(); > > + > > + pp = cp->provider; > > + label[0] = '\0'; > > + > > + /* We taste only partitions handled by flashmap */ > > + if (strncmp(pp->geom->class->name, FLASHMAP_CLASS_NAME, > > + sizeof(FLASHMAP_CLASS_NAME)) != 0) > > + return; > > + > > + gsp = (struct g_slicer *)pp->geom->softc; > > + gfp = (struct g_flashmap *)gsp->softc; > > + > > + /* If it's handled by flashmap it should have a label, but > > be > > safe. */ > > + if (gfp->labels[pp->index] == NULL) > > + return; > > + > > + strlcpy(label, gfp->labels[pp->index], size); > > +} > > + > > +struct g_label_desc g_label_flashmap = { > > + .ld_taste = g_label_flashmap_taste, > > + .ld_dir = G_LABEL_FLASHMAP_SLICE_DIR, > > + .ld_enabled = 1 > > +}; > > + > > +G_LABEL_INIT(flashmap, g_label_flashmap, "Create device nodes for > > Flashmap labels"); > > _______________________________________________ > > 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" > > From owner-svn-src-head@freebsd.org Sun Apr 7 16:52:45 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 341D51564831; Sun, 7 Apr 2019 16:52:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.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 3CC8497BF5; Sun, 7 Apr 2019 16:52:42 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id DB26hu2mYo7SQDB27hSY0o; Sun, 07 Apr 2019 10:52:41 -0600 X-Authority-Analysis: v=2.3 cv=Go88BX9C c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=oexKYjalfGEA:10 a=xfDLHkLGAAAA:8 a=YxBL1-UpAAAA:8 a=iKhvJSA4AAAA:8 a=ypVJL4-jAAAA:8 a=6I5d2MoRAAAA:8 a=FeRXxS_nJQ1RsfFfj7UA:9 a=CjuIK1q_8ugA:10 a=IfaqVvZgccqrtc8gcwf2:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=odh9cflL3HIXMm4fY7Wr:22 a=khIbc0fXALFIcTpOSxgJ:22 a=IjZwj45LgO3ly-622nXo:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 060A0B56; Sun, 7 Apr 2019 09:52:36 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x37Gqawe075828; Sun, 7 Apr 2019 09:52:36 -0700 (PDT) (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 x37GqYU9075823; Sun, 7 Apr 2019 09:52:34 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201904071652.x37GqYU9075823@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.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , "Rodney W. Grimes" , Shawn Webb , Mariusz Zaborski , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs In-Reply-To: Message from Warner Losh of "Sun, 07 Apr 2019 10:10:34 -0600." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 07 Apr 2019 09:52:34 -0700 X-CMAE-Envelope: MS4wfGsk4elrxU6Bw1ajaiU74lmu1w5cgLMMEBUcyaZphA25sDdM/lGb/MxSpvCN0R5HTkHs+LniMvyD78mcN2wrBEXt7qh7+bf4H99sMRQz9gHCBaSzYSCQ 3PTNA1FPofL8+LtPv0coiSrNeu1+tLwtEFXxfUDGJFCSDFpXjNhaLnZFE2fEHrtrGiefAVwOP42NFU4oq6JZMQH7EYvF701o4V34jH2gxRgIGPw5twVUIa1o 75KeZa/MB3r88BS1k0S4h5iodjZuv8ZRBO62WHl3Tiv5M+1PP5ETNoMIlKEVp7kDLvv1JRMLH3bVE5/yTGeAbqFHFbmgemrj/iBi6gmzeIlw5y5R4n3vPt7V 4nAh4bG3olctqlL/RYAbnPT/xpZmidfIdgXkopUASdBfEGFrIsE= X-Rspamd-Queue-Id: 3CC8497BF5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-4.76 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; REPLYTO_EQ_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.zen.spamhaus.org : 127.0.0.11]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[cached: spqr.komquats.com]; NEURAL_HAM_SHORT(-0.76)[-0.759,0]; RCPT_COUNT_SEVEN(0.00)[8]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-2.29)[ip: (-5.93), ipnet: 64.59.128.0/20(-3.07), asn: 6327(-2.38), country: CA(-0.09)]; RCVD_IN_DNSWL_LOW(-0.10)[137.136.59.64.list.dnswl.org : 127.0.5.1] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 16:52:45 -0000 In message , Warner Losh writes: > --0000000000005c05ef0585f2f684 > Content-Type: text/plain; charset="UTF-8" > > On Sun, Apr 7, 2019 at 9:35 AM Cy Schubert > wrote: > > > In message <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net>, "Rodney W. > > Grimes" > > writes: > > > > On April 7, 2019 7:11:52 AM PDT, Shawn Webb < > > shawn.webb@hardenedbsd.org> wr > > > ote: > > > > >On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: > > > > >> Author: oshogbo > > > > >> Date: Sat Apr 6 09:34:26 2019 > > > > >> New Revision: 345982 > > > > >> URL: https://svnweb.freebsd.org/changeset/base/345982 > > > > >> > > > > >> Log: > > > > >> Introduce funlinkat syscall that always us to check if we are > > > > >removing > > > > >> the file associated with the given file descriptor. > > > > >> > > > > >> Reviewed by: kib, asomers > > > > >> Reviewed by: cem, jilles, brooks (they reviewed previous > > version) > > > > >> Discussed with: pjd, and many others > > > > >> Differential Revision: https://reviews.freebsd.org/D14567 > > > > > > > > > >Hey Mariusz, > > > > > > > > > >Is __FreeBSD_version supposed to be bumped after adding new syscalls? > > > > >I can't remember off-hand. > > > > > > > > > >Thanks, > > > > > > > > I don't think so. Why force the rebuild of all ports through poudriere > > over > > > something that would never affect any of them? > > > > > > So that you can if version >= foo to know it is safe to use the new > > syscal? > > > Or if version < foo you must use the old way. > > > > Granted. However we do need something to avoid gratuitous rebuilds of > > ports. > > > > Personally, my poudriere script adjusts the pkg version > > ($JAILPATH/data/packages/${JAIL}-${PORTS}/.building/.jailversion) with > > that of the jail version (reported by poudriere jail -i -j $JAIL), > > rebuilding all ports when I (the human) determines when the machine > > should rebuild all ports with -c. > > > > In that regard FreeBSD version bumps occasionally seem a little > > gratuitous. Using the same indicator to tell whether software should be > > able to use a new feature and when ports build infrastructure should > > summarily delete all packages forcing a rebuild of absolutely > > everything is probably not the best. > > > > Just throwing out an idea, what if poudriere considers the first N > > bytes of __FreeBSD_version significant? Having said that, looking at > > __FreeBSD_version, I don't think we have enough digits to do what I was > > planning on suggesting. But, you get the idea of what I'm driving at. > > Maybe a new macro such as __FreeBSD_ports that is incremented every > > time a change that affects ports? > > > > Anyhow, I'm not too terribly concerned as what I have (selfishly > > speaking) works. But we may as a group might want to consider this at > > some point to build some efficiency into the ports part of the equation. > > > > We generally bump the version around the time we add a syscall. This allows > any wrappers to call it or not based on the kernel version and avoid a > SIGSYS when we're doing forward compatibility hacks for whatever reason. > > The current overloading of __FreeBSD_version is unfortunate. We've been > quite liberal over the past 2 decades at bumping it because it's free to do > so. Or so the thinking has been. I personally think we should continue to > do so, but maybe look at piggy-backing those changes we can if someone else > bumped it in the last few days. To give some perspective, in the ~120 days > since we branched, we've bumped it 17 times. This is more or less weekly, > which suggests we don't have a problem that we need to optimize too much > here. > > If Poudriere wants to optimize building, I'd suggest that you have a > command line argument / config file thing that sets the maximum skew. > Normally, you could set it up to be pretty tolerant, but if you knew > something was a big deal, you could then crank down to intolerant. The > current setting of '1' for this skew should be the default. It's not that simple. A skew may miss an important change to base that will affect ports. Having resulting packages that segfault could be unacceptable outcome. An argument to ignore the jail/pkg version comparison or arbitrarily update it (like my script does) would solve this. However someone not monitoring base commit log commits, an arbitrary argument to poudriere could result in unnecessary mailing list noise or bugzilla tickets, both of which are time wasters. > > I'm not sure a FreeBSD_ports would scale. How do you know a port won't need > to know about the new syscall? It's from Linux, and there may be some ports > that use it if available. As a src committer, I've not easy way to know > (and no hard way to know that's not a full exprun). That's the other problem. Not everyone will know how a change may affect applications. I suppose the best might be a poudriere flag or config option to ignore jail and pkg version differences and let the human decide. Not all changes affect all ports and those that do should have have a portrevision bump anyway, which BTW is sometimes done. My making kerberos private in base is one such example. There are quite a few ports affected. The exp-run only identified a few who's options don't need kerberos in their default configuration. The more I look the more I discover. The base part of the project was easy (and pretty much ready to commit might I add). Ports OTOH tedious and still much to do. In the very worst case a version bump hardly scratches the surface ... unfortunately. I don't think we can answer this here. Maybe this rises to the level of a developer summit topic one year. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Sun Apr 7 17:28:30 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B8431565984; Sun, 7 Apr 2019 17:28:30 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 C717D6A6B5; Sun, 7 Apr 2019 17:28:29 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x37HSRIf051226; Sun, 7 Apr 2019 10:28:27 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x37HSR2A051225; Sun, 7 Apr 2019 10:28:27 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904071728.x37HSR2A051225@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346012 - head/sys/sys In-Reply-To: <201904071607.x37G7fFP021279@repo.freebsd.org> To: Mariusz Zaborski Date: Sun, 7 Apr 2019 10:28:27 -0700 (PDT) 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-Rspamd-Queue-Id: C717D6A6B5 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.91 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.91)[-0.914,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 17:28:30 -0000 > Author: oshogbo > Date: Sun Apr 7 16:07:41 2019 > New Revision: 346012 > URL: https://svnweb.freebsd.org/changeset/base/346012 > > Log: > Bump FreeBSD version after r345982. > > Reported by: Shawn Webb > Discussed with: imp, cy, rgrimes This is just a note for future reference. Though there was some email exchange on the list, I am not sure that quantifies as what we call "discussed with", for one I never sent to, nor responded to, any email from/to you directly. Regards, Rod > Modified: > head/sys/sys/param.h > > Modified: head/sys/sys/param.h > ============================================================================== > --- head/sys/sys/param.h Sun Apr 7 14:30:17 2019 (r346011) > +++ head/sys/sys/param.h Sun Apr 7 16:07:41 2019 (r346012) > @@ -60,7 +60,7 @@ > * in the range 5 to 9. > */ > #undef __FreeBSD_version > -#define __FreeBSD_version 1300017 /* Master, propagated to newvers */ > +#define __FreeBSD_version 1300018 /* Master, propagated to newvers */ > > /* > * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Sun Apr 7 17:34:54 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81CB91565CAB for ; Sun, 7 Apr 2019 17:34:54 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D0466AB66 for ; Sun, 7 Apr 2019 17:34:54 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x842.google.com with SMTP id w5so12838699qtb.11 for ; Sun, 07 Apr 2019 10:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=UAbBekVDhxJT5CSdvsfCRbrg25l68MYS2PLzE7bYqYs=; b=P4kVY65Fod6ExxQrPEL8b6rY6Khu8pb4sKHM9Ry4S9CGSNgH6O+psfRNNOykDUsBsl pblCu9BxQMxmHE5yuy0KOg7y3MTWy08MNUKZya+Pg1U7PWV3zTU3yqS2YaC6tU7kPuvg UnBQdPxbBebgsK9unZO/5mc2s85a0cZHPeVaOrfV2pHSjVBWjcv23OLDp3++pnJo6/HB usbC0cUOHgpyPkRxeg/fpErqnErWM6LgnMHvXGw1fNar49W80bbtEIk3AFhyfbc5pjiQ Fa65kh/van6zZaVIZwI+S1Wl+yTX58JmZZCUXebntWtjX7kf9HtfuEKWgWshDhepatJR p1pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=UAbBekVDhxJT5CSdvsfCRbrg25l68MYS2PLzE7bYqYs=; b=TXbxl6075+8qsBKol2vP4xnq1sgdnXec67oO3kKG2ZCKC52RuBRpiwB8LDtnctwtJM b3Ynwifd0FbrKR1Dxi9pFc+1j07H4DU9nd6INK6wqNFefrgfbZCKiUbCRYmRryCzD7KG T5kbU/4+5M1sSeke1uYxQUeWU11+m9Z4pZwRN62+cQcTau9zmMMIIOOkGSNlftSM8HLB gaZ7MFwczO1kBmrEc0z7mICD487U84Ks2MhsX2nEhuM+9vwkSVu+reEGJmC0GrOrNyCc zQaDdXqUKfCGi3JIoh7OT/BOgrGOxlhNP6L4jauzua7Em0vCJL2KEOpLymsdRIdNx6oC iPUQ== X-Gm-Message-State: APjAAAUl96EVTzHvzT/Oq95jhxAgy3jKe1C/SFqnl2ZejRV4yywaFMrI 6VHqZVtpxJqY02kTsaj4KlixRg== X-Google-Smtp-Source: APXvYqw2Ikz4Y26A1HGK1B+HUfeskC76s4TOhgT+mj5dqAvTh0uAhOjkzkfHlQep4KT1K0yHJXvJFw== X-Received: by 2002:ac8:38f5:: with SMTP id g50mr20013847qtc.119.1554658493581; Sun, 07 Apr 2019 10:34:53 -0700 (PDT) Received: from mutt-hbsd ([151.196.118.239]) by smtp.gmail.com with ESMTPSA id x24sm4619410qtm.65.2019.04.07.10.34.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Apr 2019 10:34:52 -0700 (PDT) Date: Sun, 7 Apr 2019 13:33:59 -0400 From: Shawn Webb To: Mariusz Zaborski Cc: Cy Schubert , rgrimes@freebsd.org, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345982 - in head: include lib/libc/sys sys/cddl/compat/opensolaris/sys sys/compat/cloudabi sys/compat/freebsd32 sys/compat/linux sys/kern sys/sys sys/ufs/ffs Message-ID: <20190407173359.vc2fwmnsbky7dlkj@mutt-hbsd> References: <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net> <201904071535.x37FZ7bk073860@slippy.cwsent.com> <20190407161158.GA40247@x-wing> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="h5gs4klk52ndinq6" Content-Disposition: inline In-Reply-To: <20190407161158.GA40247@x-wing> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD r345948+db88569731b7(hardened/current/master) HARDENEDBSD-13-CURRENT amd64 X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: 1D0466AB66 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 17:34:54 -0000 --h5gs4klk52ndinq6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable No worries. Thanks for the correction! --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 443-546-8752 Tor+XMPP+OTR: lattera@is.a.hacker.sx GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 On Sun, Apr 07, 2019 at 06:11:58PM +0200, Mariusz Zaborski wrote: > In the https://wiki.freebsd.org/AddingSyscalls we mentions that we need t= o bump > __FreeBSD_version. I confirmed that with Warner. So this was my mistake. >=20 > Thanks Shawn. > --=20 > Mariusz Zaborski > oshogbo//vx | http://oshogbo.vexillium.org > FreeBSD committer | https://freebsd.org > Software developer | http://wheelsystems.com > If it's not broken, let's fix it till it is!!1 >=20 > On Sun, Apr 07, 2019 at 08:35:07AM -0700, Cy Schubert wrote: > > In message <201904071510.x37FA7tm050626@gndrsh.dnsmgr.net>, "Rodney W.= =20 > > Grimes" > > writes: > > > > On April 7, 2019 7:11:52 AM PDT, Shawn Webb wr > > > ote: > > > > >On Sat, Apr 06, 2019 at 09:34:26AM +0000, Mariusz Zaborski wrote: > > > > >> Author: oshogbo > > > > >> Date: Sat Apr 6 09:34:26 2019 > > > > >> New Revision: 345982 > > > > >> URL: https://svnweb.freebsd.org/changeset/base/345982 > > > > >>=20 > > > > >> Log: > > > > >> Introduce funlinkat syscall that always us to check if we are > > > > >removing > > > > >> the file associated with the given file descriptor. > > > > >> =20 > > > > >> Reviewed by: kib, asomers > > > > >> Reviewed by: cem, jilles, brooks (they reviewed previous versi= on) > > > > >> Discussed with: pjd, and many others > > > > >> Differential Revision: https://reviews.freebsd.org/D14567 > > > > > > > > > >Hey Mariusz, > > > > > > > > > >Is __FreeBSD_version supposed to be bumped after adding new syscal= ls? > > > > >I can't remember off-hand. > > > > > > > > > >Thanks, > > > >=20 > > > > I don't think so. Why force the rebuild of all ports through poudri= ere over > > > something that would never affect any of them? > > > > > > So that you can if version >=3D foo to know it is safe to use the new= syscal? > > > Or if version < foo you must use the old way. > >=20 > > Granted. However we do need something to avoid gratuitous rebuilds of= =20 > > ports. > >=20 > > Personally, my poudriere script adjusts the pkg version=20 > > ($JAILPATH/data/packages/${JAIL}-${PORTS}/.building/.jailversion) with= =20 > > that of the jail version (reported by poudriere jail -i -j $JAIL),=20 > > rebuilding all ports when I (the human) determines when the machine=20 > > should rebuild all ports with -c. > >=20 > > In that regard FreeBSD version bumps occasionally seem a little=20 > > gratuitous. Using the same indicator to tell whether software should be= =20 > > able to use a new feature and when ports build infrastructure should=20 > > summarily delete all packages forcing a rebuild of absolutely=20 > > everything is probably not the best. > >=20 > > Just throwing out an idea, what if poudriere considers the first N=20 > > bytes of __FreeBSD_version significant? Having said that, looking at=20 > > __FreeBSD_version, I don't think we have enough digits to do what I was= =20 > > planning on suggesting. But, you get the idea of what I'm driving at.= =20 > > Maybe a new macro such as __FreeBSD_ports that is incremented every=20 > > time a change that affects ports? > >=20 > > Anyhow, I'm not too terribly concerned as what I have (selfishly=20 > > speaking) works. But we may as a group might want to consider this at= =20 > > some point to build some efficiency into the ports part of the equation. > >=20 > >=20 > > --=20 > > Cheers, > > Cy Schubert > > FreeBSD UNIX: Web: http://www.FreeBSD.org > >=20 > > The need of the many outweighs the greed of the few. > > =20 > >=20 --h5gs4klk52ndinq6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAlyqNIAACgkQ/y5nonf4 4fr28xAAh1pFG/uwPHj1IgEn40Dm66GilPg84s02U2zbRzmV3rfCXK7jeN2yysVm eKZCzJtrdyXZeG7syqibhGvNRaIYcxXcStQFWl+G2qT/iPpLw9PdJI987TzRyKqY uXX8Stxsc7g1Nz/48HD7aXXv6wa42SXO2XNSlOR4o6S0lh2hKefYFteD2ftSoMK6 JT7+yCLzQJQU0BIvP4kT/FPMSfg/eCjR1FqGOXVkv4VygaVGoP3QUs4VAszwbh9E inBl8oQr2jZF9w09OlHf7w5vSp0vYhs34McIi4BonyaEhUz7jjNZ6BdbjOrwo85g o28/agMPeDvP25mM3Ifyn2F9U8etM2Y4WrPyIc8fYPSuCxgfTpnfiF2dN74t6Epc mzbwickapoadulnEeCIW/Z9R/FS5TTiGgkKl7u7YKL8QDZu96gjJn8PBsSDy4PaH 9j+8MEaz0J4eiAU+SEySrTU2GWW6RuzbZ6hymVXLlNzZfpG3Z9oRNgOD41dG+Y49 /3pF9ZhL2XLMTMxDZLPGSyv9AbOijTdmzZuTTj9U2/Ei2DT4Yyy0+zp1iOlpy9dg LHq5Nvztuk9yA7Ig25s6952CseuvjnscJ/5yHng2QPdGpEXcme9lY1yjZF/70tn5 MZGYo38hr6kwnLHTJ38ucw2FT+uV2cPuzKbwqxW31eOuI1T7gyM= =K2n/ -----END PGP SIGNATURE----- --h5gs4klk52ndinq6-- From owner-svn-src-head@freebsd.org Sun Apr 7 18:24:29 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C911915671F3; Sun, 7 Apr 2019 18:24:29 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 621176C5B3; Sun, 7 Apr 2019 18:24:29 +0000 (UTC) (envelope-from mhorne@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C73CFF45; Sun, 7 Apr 2019 18:24:29 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37IOTvg096350; Sun, 7 Apr 2019 18:24:29 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37IORSh096341; Sun, 7 Apr 2019 18:24:27 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <201904071824.x37IORSh096341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Sun, 7 Apr 2019 18:24:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346016 - in head: lib/clang lib/clang/include/llvm/Config lib/clang/libllvm share/man/man5 share/mk tools/build/options X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: in head: lib/clang lib/clang/include/llvm/Config lib/clang/libllvm share/man/man5 share/mk tools/build/options X-SVN-Commit-Revision: 346016 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 621176C5B3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 18:24:30 -0000 Author: mhorne Date: Sun Apr 7 18:24:26 2019 New Revision: 346016 URL: https://svnweb.freebsd.org/changeset/base/346016 Log: Add option to build LLVM RISC-V target Reviewed by: emaste, dim Approved by: markj (mentor) MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D19759 Added: head/tools/build/options/WITHOUT_LLVM_TARGET_RISCV (contents, props changed) head/tools/build/options/WITH_LLVM_TARGET_RISCV (contents, props changed) Modified: head/lib/clang/include/llvm/Config/AsmParsers.def head/lib/clang/include/llvm/Config/AsmPrinters.def head/lib/clang/include/llvm/Config/Disassemblers.def head/lib/clang/include/llvm/Config/Targets.def head/lib/clang/libllvm/Makefile head/lib/clang/llvm.build.mk head/share/man/man5/src.conf.5 head/share/mk/src.opts.mk Modified: head/lib/clang/include/llvm/Config/AsmParsers.def ============================================================================== --- head/lib/clang/include/llvm/Config/AsmParsers.def Sun Apr 7 17:49:39 2019 (r346015) +++ head/lib/clang/include/llvm/Config/AsmParsers.def Sun Apr 7 18:24:26 2019 (r346016) @@ -19,6 +19,9 @@ LLVM_ASM_PARSER(Mips) #ifdef LLVM_TARGET_ENABLE_POWERPC LLVM_ASM_PARSER(PowerPC) #endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_ASM_PARSER(RISCV) +#endif #ifdef LLVM_TARGET_ENABLE_SPARC LLVM_ASM_PARSER(Sparc) #endif Modified: head/lib/clang/include/llvm/Config/AsmPrinters.def ============================================================================== --- head/lib/clang/include/llvm/Config/AsmPrinters.def Sun Apr 7 17:49:39 2019 (r346015) +++ head/lib/clang/include/llvm/Config/AsmPrinters.def Sun Apr 7 18:24:26 2019 (r346016) @@ -19,6 +19,9 @@ LLVM_ASM_PRINTER(Mips) #ifdef LLVM_TARGET_ENABLE_POWERPC LLVM_ASM_PRINTER(PowerPC) #endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_ASM_PRINTER(RISCV) +#endif #ifdef LLVM_TARGET_ENABLE_SPARC LLVM_ASM_PRINTER(Sparc) #endif Modified: head/lib/clang/include/llvm/Config/Disassemblers.def ============================================================================== --- head/lib/clang/include/llvm/Config/Disassemblers.def Sun Apr 7 17:49:39 2019 (r346015) +++ head/lib/clang/include/llvm/Config/Disassemblers.def Sun Apr 7 18:24:26 2019 (r346016) @@ -19,6 +19,9 @@ LLVM_DISASSEMBLER(Mips) #ifdef LLVM_TARGET_ENABLE_POWERPC LLVM_DISASSEMBLER(PowerPC) #endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_DISASSEMBLER(RISCV) +#endif #ifdef LLVM_TARGET_ENABLE_SPARC LLVM_DISASSEMBLER(Sparc) #endif Modified: head/lib/clang/include/llvm/Config/Targets.def ============================================================================== --- head/lib/clang/include/llvm/Config/Targets.def Sun Apr 7 17:49:39 2019 (r346015) +++ head/lib/clang/include/llvm/Config/Targets.def Sun Apr 7 18:24:26 2019 (r346016) @@ -19,6 +19,9 @@ LLVM_TARGET(Mips) #ifdef LLVM_TARGET_ENABLE_POWERPC LLVM_TARGET(PowerPC) #endif +#ifdef LLVM_TARGET_ENABLE_RISCV +LLVM_TARGET(RISCV) +#endif #ifdef LLVM_TARGET_ENABLE_SPARC LLVM_TARGET(Sparc) #endif Modified: head/lib/clang/libllvm/Makefile ============================================================================== --- head/lib/clang/libllvm/Makefile Sun Apr 7 17:49:39 2019 (r346015) +++ head/lib/clang/libllvm/Makefile Sun Apr 7 18:24:26 2019 (r346016) @@ -10,14 +10,15 @@ CFLAGS+= -I${.OBJDIR} .if ${MK_LLVM_TARGET_AARCH64} == "no" && ${MK_LLVM_TARGET_ARM} == "no" && \ ${MK_LLVM_TARGET_BPF} == "no" && ${MK_LLVM_TARGET_MIPS} == "no" && \ - ${MK_LLVM_TARGET_POWERPC} == "no" && ${MK_LLVM_TARGET_SPARC} == "no" && \ - ${MK_LLVM_TARGET_X86} == "no" + ${MK_LLVM_TARGET_POWERPC} == "no" && ${MK_LLVM_TARGET_RISCV} == "no" && \ + ${MK_LLVM_TARGET_SPARC} == "no" && ${MK_LLVM_TARGET_X86} == "no" .error Please enable at least one of: MK_LLVM_TARGET_AARCH64,\ MK_LLVM_TARGET_ARM, MK_LLVM_TARGET_BPF, MK_LLVM_TARGET_MIPS, \ - MK_LLVM_TARGET_POWERPC, MK_LLVM_TARGET_SPARC, or MK_LLVM_TARGET_X86 + MK_LLVM_TARGET_POWERPC, MK_LLVM_TARGET_RISCV, MK_LLVM_TARGET_SPARC, \ + or MK_LLVM_TARGET_X86 .endif -.for arch in AArch64 ARM BPF Mips PowerPC Sparc X86 +.for arch in AArch64 ARM BPF Mips PowerPC RISCV Sparc X86 . if ${MK_LLVM_TARGET_${arch:tu}} != "no" CFLAGS+= -I${LLVM_SRCS}/lib/Target/${arch} . endif @@ -1128,6 +1129,34 @@ SRCS_MIN+= Target/PowerPC/PPCVSXFMAMutate.cpp SRCS_MIN+= Target/PowerPC/PPCVSXSwapRemoval.cpp SRCS_MIN+= Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp .endif # MK_LLVM_TARGET_POWERPC +.if ${MK_LLVM_TARGET_RISCV} != "no" +SRCS_MIN+= Target/RISCV/AsmParser/RISCVAsmParser.cpp +SRCS_MIN+= Target/RISCV/Disassembler/RISCVDisassembler.cpp +SRCS_MIN+= Target/RISCV/InstPrinter/RISCVInstPrinter.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVMCAsmInfo.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVMCCodeEmitter.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.cpp +SRCS_MIN+= Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp +SRCS_MIN+= Target/RISCV/RISCVAsmPrinter.cpp +SRCS_MIN+= Target/RISCV/RISCVExpandPseudoInsts.cpp +SRCS_MIN+= Target/RISCV/RISCVFrameLowering.cpp +SRCS_MIN+= Target/RISCV/RISCVInstrInfo.cpp +SRCS_MIN+= Target/RISCV/RISCVISelDAGToDAG.cpp +SRCS_MIN+= Target/RISCV/RISCVISelLowering.cpp +SRCS_MIN+= Target/RISCV/RISCVMCInstLower.cpp +SRCS_MIN+= Target/RISCV/RISCVMergeBaseOffset.cpp +SRCS_MIN+= Target/RISCV/RISCVRegisterInfo.cpp +SRCS_MIN+= Target/RISCV/RISCVSubtarget.cpp +SRCS_MIN+= Target/RISCV/RISCVTargetMachine.cpp +SRCS_MIN+= Target/RISCV/RISCVTargetObjectFile.cpp +SRCS_MIN+= Target/RISCV/TargetInfo/RISCVTargetInfo.cpp +SRCS_MIN+= Target/RISCV/Utils/RISCVBaseInfo.cpp +SRCS_MIN+= Target/RISCV/Utils/RISCVMatInt.cpp +.endif # MK_LLVM_TARGET_RISCV .if ${MK_LLVM_TARGET_SPARC} != "no" SRCS_MIN+= Target/Sparc/AsmParser/SparcAsmParser.cpp SRCS_MIN+= Target/Sparc/DelaySlotFiller.cpp @@ -1545,13 +1574,15 @@ beforebuild: # Note: some rules are superfluous, not every combination is valid. .for arch in \ - AArch64/AArch64 ARM/ARM BPF/BPF Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86 + AArch64/AArch64 ARM/ARM BPF/BPF Mips/Mips PowerPC/PPC Sparc/Sparc \ + RISCV/RISCV X86/X86 . for hdr in \ AsmMatcher/-gen-asm-matcher \ AsmWriter1/-gen-asm-writer,-asmwriternum=1 \ AsmWriter/-gen-asm-writer \ CallingConv/-gen-callingconv \ CodeEmitter/-gen-emitter \ + CompressInstEmitter/-gen-compress-inst-emitter \ DAGISel/-gen-dag-isel \ DisassemblerTables/-gen-disassembler \ EVEX2VEXTables/-gen-x86-EVEX2VEX-tables \ @@ -1643,6 +1674,21 @@ TGHDRS+= PPCGenMCCodeEmitter.inc TGHDRS+= PPCGenRegisterInfo.inc TGHDRS+= PPCGenSubtargetInfo.inc .endif # MK_LLVM_TARGET_POWERPC +.if ${MK_LLVM_TARGET_RISCV} != "no" +TGHDRS+= RISCVGenAsmMatcher.inc +TGHDRS+= RISCVGenAsmWriter.inc +TGHDRS+= RISCVGenCallingConv.inc +TGHDRS+= RISCVGenCompressInstEmitter.inc +TGHDRS+= RISCVGenDAGISel.inc +TGHDRS+= RISCVGenDisassemblerTables.inc +TGHDRS+= RISCVGenDAGISel.inc +TGHDRS+= RISCVGenInstrInfo.inc +TGHDRS+= RISCVGenMCCodeEmitter.inc +TGHDRS+= RISCVGenMCPseudoLowering.inc +TGHDRS+= RISCVGenRegisterInfo.inc +TGHDRS+= RISCVGenSubtargetInfo.inc +TGHDRS+= RISCVGenSystemOperands.inc +.endif # MK_LLVM_TARGET_RISCV .if ${MK_LLVM_TARGET_SPARC} != "no" TGHDRS+= SparcGenAsmMatcher.inc TGHDRS+= SparcGenAsmWriter.inc Modified: head/lib/clang/llvm.build.mk ============================================================================== --- head/lib/clang/llvm.build.mk Sun Apr 7 17:49:39 2019 (r346015) +++ head/lib/clang/llvm.build.mk Sun Apr 7 18:24:26 2019 (r346016) @@ -69,6 +69,12 @@ CFLAGS+= -DLLVM_TARGET_ENABLE_POWERPC LLVM_NATIVE_ARCH= PowerPC . endif .endif +.if ${MK_LLVM_TARGET_RISCV} != "no" +CFLAGS+= -DLLVM_TARGET_ENABLE_RISCV +. if ${MACHINE_CPUARCH} == "riscv" +LLVM_NATIVE_ARCH= RISCV +. endif +.endif .if ${MK_LLVM_TARGET_SPARC} != "no" CFLAGS+= -DLLVM_TARGET_ENABLE_SPARC . if ${MACHINE_CPUARCH} == "sparc64" Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Sun Apr 7 17:49:39 2019 (r346015) +++ head/share/man/man5/src.conf.5 Sun Apr 7 18:24:26 2019 (r346016) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd March 16, 2019 +.Dd March 29, 2019 .Dt SRC.CONF 5 .Os .Sh NAME @@ -399,6 +399,10 @@ is set explicitly) (unless .Va WITH_LLVM_TARGET_POWERPC is set explicitly) +.It Va WITHOUT_LLVM_TARGET_RISCV +(unless +.Va WITH_LLVM_TARGET_RISCV +is set explicitly) .It Va WITHOUT_LLVM_TARGET_SPARC (unless .Va WITH_LLVM_TARGET_SPARC @@ -1210,6 +1214,20 @@ option should be used rather than this in most cases. .Pp This is a default setting on amd64/amd64, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe. +.It Va WITHOUT_LLVM_TARGET_RISCV +Set to not build LLVM target support for RISC-V. +The +.Va LLVM_TARGET_ALL +option should be used rather than this in most cases. +.Pp +This is a default setting on +amd64/amd64, arm/arm, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, and sparc/sparc64. +.It Va WITH_LLVM_TARGET_RISCV +Set to build LLVM target support for RISC-V. +The +.Va LLVM_TARGET_ALL +option should be used rather than this in most cases. +.Pp .It Va WITHOUT_LLVM_TARGET_SPARC Set to not build LLVM target support for SPARC. The Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sun Apr 7 17:49:39 2019 (r346015) +++ head/share/mk/src.opts.mk Sun Apr 7 18:24:26 2019 (r346016) @@ -290,6 +290,7 @@ __DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_${__llt:${__ .endfor __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF +__DEFAULT_NO_OPTIONS+=LLVM_TARGET_RISCV .include # If the compiler is not C++11 capable, disable Clang and use GCC instead. Added: head/tools/build/options/WITHOUT_LLVM_TARGET_RISCV ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_LLVM_TARGET_RISCV Sun Apr 7 18:24:26 2019 (r346016) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build LLVM target support for RISC-V. +The +.Va LLVM_TARGET_ALL +option should be used rather than this in most cases. Added: head/tools/build/options/WITH_LLVM_TARGET_RISCV ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_LLVM_TARGET_RISCV Sun Apr 7 18:24:26 2019 (r346016) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to build LLVM target support for RISC-V. +The +.Va LLVM_TARGET_ALL +option should be used rather than this in most cases. From owner-svn-src-head@freebsd.org Sun Apr 7 18:31:48 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3FB1156732D; Sun, 7 Apr 2019 18:31:47 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E9C56C90E; Sun, 7 Apr 2019 18:31:47 +0000 (UTC) (envelope-from crees@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 59C25180BF; Sun, 7 Apr 2019 18:31:47 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37IVlRJ096812; Sun, 7 Apr 2019 18:31:47 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37IVj4r096803; Sun, 7 Apr 2019 18:31:45 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201904071831.x37IVj4r096803@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Sun, 7 Apr 2019 18:31:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head: libexec/rc libexec/rc/rc.d share/man/man5 X-SVN-Commit-Revision: 346017 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7E9C56C90E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 18:31:48 -0000 Author: crees (doc,ports committer) Date: Sun Apr 7 18:31:45 2019 New Revision: 346017 URL: https://svnweb.freebsd.org/changeset/base/346017 Log: Remove now unnecessary kldstat check before attempting to load modules. Since r233109, kldload has the -n option, which silently ignores options that are already loaded. https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.html Note that this script no longer reports if the module is already loaded, but it could be argued this wasn't particularly useful information. PR: docs/234248 Reviewed by: bcr (docs), kib, rgrimes (visual) Approved by: jilles Differential Revision: https://reviews.freebsd.org/D18670 Modified: head/libexec/rc/rc.d/abi head/libexec/rc/rc.d/bthidd head/libexec/rc/rc.d/cfumass head/libexec/rc/rc.d/kld head/libexec/rc/rc.d/mdconfig head/libexec/rc/rc.d/mdconfig2 head/libexec/rc/rc.d/mountcritremote head/libexec/rc/rc.d/syscons head/libexec/rc/rc.subr head/share/man/man5/rc.conf.5 Modified: head/libexec/rc/rc.d/abi ============================================================================== --- head/libexec/rc/rc.d/abi Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/abi Sun Apr 7 18:31:45 2019 (r346017) @@ -27,10 +27,10 @@ linux_start() local _tmpdir echo -n ' linux' - load_kld -e 'linux(aout|elf)' linux + load_kld linux case `sysctl -n hw.machine_arch` in amd64) - load_kld -e 'linux64elf' linux64 + load_kld linux64 ;; esac if [ -x /compat/linux/sbin/ldconfigDisabled ]; then Modified: head/libexec/rc/rc.d/bthidd ============================================================================== --- head/libexec/rc/rc.d/bthidd Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/bthidd Sun Apr 7 18:31:45 2019 (r346017) @@ -34,11 +34,11 @@ evdev_enabled() bthidd_prestart() { if evdev_enabled; then - load_kld -m uinput uinput + load_kld uinput fi - load_kld -m kbdmux kbdmux - load_kld -m vkbd vkbd - load_kld -m ng_btsocket ng_btsocket + load_kld kbdmux + load_kld vkbd + load_kld ng_btsocket return 0 } Modified: head/libexec/rc/rc.d/cfumass ============================================================================== --- head/libexec/rc/rc.d/cfumass Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/cfumass Sun Apr 7 18:31:45 2019 (r346017) @@ -75,7 +75,7 @@ cfumass_start() return "${err}" fi - load_kld -e cfumass cfumass + load_kld cfumass # If the template is already switched to Mass Storage, then reset # it to -1 to force the host to reenumerate it; otherwise it might Modified: head/libexec/rc/rc.d/kld ============================================================================== --- head/libexec/rc/rc.d/kld Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/kld Sun Apr 7 18:31:45 2019 (r346017) @@ -46,7 +46,7 @@ kld_start() echo 'Loading kernel modules:' for _kld in $kld_list ; do - load_kld -e ${_kld}.ko $_kld + load_kld $_kld done } Modified: head/libexec/rc/rc.d/mdconfig ============================================================================== --- head/libexec/rc/rc.d/mdconfig Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/mdconfig Sun Apr 7 18:31:45 2019 (r346017) @@ -114,7 +114,7 @@ mdconfig_start() continue fi if [ "${_file}" != "${_file%.uzip}" ]; then - load_kld -m g_uzip geom_uzip || return 3 + load_kld geom_uzip || return 3 # sleep a bit to allow creation of /dev/mdX.uzip sleep 2 fi Modified: head/libexec/rc/rc.d/mdconfig2 ============================================================================== --- head/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:31:45 2019 (r346017) @@ -123,7 +123,7 @@ mdconfig2_start() # been created. if [ "${_type}" = "vnode" -a "${_fs}" != "/" ]; then if [ "${_file}" != "${_file%.uzip}" ]; then - load_kld -m g_uzip geom_uzip || return 3 + load_kld geom_uzip || return 3 fi if is_readonly ${_fs}; then warn "${_fs} is mounted read-only, skipping ${_md}." Modified: head/libexec/rc/rc.d/mountcritremote ============================================================================== --- head/libexec/rc/rc.d/mountcritremote Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/mountcritremote Sun Apr 7 18:31:45 2019 (r346017) @@ -27,7 +27,7 @@ mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in *mount_nfs*) # Handle absent nfs client support - load_kld -m nfs nfscl || return 1 + load_kld nfscl || return 1 ;; esac return 0 Modified: head/libexec/rc/rc.d/syscons ============================================================================== --- head/libexec/rc/rc.d/syscons Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.d/syscons Sun Apr 7 18:31:45 2019 (r346017) @@ -346,7 +346,7 @@ syscons_start() for i in `kldstat | awk '$5 ~ "_saver\.ko$" { print $5 }'`; do kldunload ${i} done - load_kld -e _saver ${saver}_saver + load_kld ${saver}_saver ;; esac Modified: head/libexec/rc/rc.subr ============================================================================== --- head/libexec/rc/rc.subr Sun Apr 7 18:24:26 2019 (r346016) +++ head/libexec/rc/rc.subr Sun Apr 7 18:31:45 2019 (r346017) @@ -1853,48 +1853,29 @@ mount_md() } # Code common to scripts that need to load a kernel module -# if it isn't in the kernel yet. Syntax: -# load_kld [-e regex] [-m module] file -# where -e or -m chooses the way to check if the module -# is already loaded: -# regex is egrep'd in the output from `kldstat -v', -# module is passed to `kldstat -m'. -# The default way is as though `-m file' were specified. +# if it isn't in the kernel yet. Syntax: +# load_kld file load_kld() { - local _loaded _mod _opt _re + local _opt + # Silently ignore legacy options; they are unnecessary while getopts "e:m:" _opt; do case "$_opt" in - e) _re="$OPTARG" ;; - m) _mod="$OPTARG" ;; - *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; + e) ;; + m) ;; + *) err 3 'USAGE: load_kld file' ;; esac done shift $(($OPTIND - 1)) if [ $# -ne 1 ]; then - err 3 'USAGE: load_kld [-e regex] [-m module] file' + err 3 'USAGE: load_kld file' fi - _mod=${_mod:-$1} - _loaded=false - if [ -n "$_re" ]; then - if kldstat -v | egrep -q -e "$_re"; then - _loaded=true - fi + if ! kldload -n "$1"; then + warn "Unable to load kernel module $1" + return 1 else - if kldstat -q -m "$_mod"; then - _loaded=true - fi - fi - if ! $_loaded; then - if ! kldload "$1"; then - warn "Unable to load kernel module $1" - return 1 - else - info "$1 kernel module loaded." - fi - else - debug "load_kld: $1 kernel module already loaded." + info "$1 kernel module loaded." fi return 0 } Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Sun Apr 7 18:24:26 2019 (r346016) +++ head/share/man/man5/rc.conf.5 Sun Apr 7 18:31:45 2019 (r346017) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 21, 2019 +.Dd April 7, 2019 .Dt RC.CONF 5 .Os .Sh NAME @@ -249,9 +249,7 @@ Default .It Va kld_list .Pq Vt str A whitespace-separated list of kernel modules to load right after -the local disks are mounted, without any -.Pa .ko -extension or path. +the local disks are mounted, with optional path. Loading modules at this point in the boot process is much faster than doing it via .Pa /boot/loader.conf From owner-svn-src-head@freebsd.org Sun Apr 7 18:39:57 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B39E1567657; Sun, 7 Apr 2019 18:39:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9764E6CD21; Sun, 7 Apr 2019 18:39:56 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 738BB1810D; Sun, 7 Apr 2019 18:39:56 +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 x37IduLa002008; Sun, 7 Apr 2019 18:39:56 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37IduPO002007; Sun, 7 Apr 2019 18:39:56 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201904071839.x37IduPO002007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 7 Apr 2019 18:39:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346018 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 346018 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9764E6CD21 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 18:39:57 -0000 Author: imp Date: Sun Apr 7 18:39:55 2019 New Revision: 346018 URL: https://svnweb.freebsd.org/changeset/base/346018 Log: Use default shell assignment rather more complicated if then construct. Discussed with: emaste@, allanjude@ (changes (or not) based on their feedback) Differential Revision: https://reviews.freebsd.org/D19797 Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Sun Apr 7 18:31:45 2019 (r346017) +++ head/sys/conf/newvers.sh Sun Apr 7 18:39:55 2019 (r346018) @@ -46,10 +46,7 @@ TYPE="FreeBSD" REVISION="13.0" -BRANCH="CURRENT" -if [ -n "${BRANCH_OVERRIDE}" ]; then - BRANCH=${BRANCH_OVERRIDE} -fi +BRANCH=${BRANCH_OVERRIDE:-CURRENT} RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" @@ -108,21 +105,16 @@ if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/.. fi -if [ -n "${PARAMFILE}" ]; then - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ - ${PARAMFILE}) -else - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ - ${SYSDIR}/sys/param.h) -fi +RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ + ${PARAMFILE:-${SYSDIR}/sys/param.h}) -b=share/examples/etc/bsd-style-copyright if [ -r "${SYSDIR}/../COPYRIGHT" ]; then year=$(sed -Ee '/^Copyright .* The FreeBSD Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) else year=$(date +%Y) fi # look for copyright template +b=share/examples/etc/bsd-style-copyright for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b do if [ -r "$bsd_copyright" ]; then @@ -150,9 +142,7 @@ COPYRIGHT="$COPYRIGHT # VARS_ONLY means no files should be generated, this is just being # included. -if [ -n "$VARS_ONLY" ]; then - return 0 -fi +[ -n "$VARS_ONLY" ] && return 0 LC_ALL=C; export LC_ALL if [ ! -r version ] From owner-svn-src-head@freebsd.org Sun Apr 7 19:32:48 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94FC01568AC9; Sun, 7 Apr 2019 19:32:48 +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 F05FD6E834; Sun, 7 Apr 2019 19:32:47 +0000 (UTC) (envelope-from o.hartmann@walstatt.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1554665564; bh=1FnzX9wB3qF310c5nGrlmwXZJt1mem/l7W/iS84TQms=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=XRHfoqUe/mq4bRZVmF7CVzolA1aCiU/z/ZaeaqSI0d1eLCeNf9lGp2ZFNVp6c98Jv cmS+s6TghgjZ89j4LbDSiGKS4XO9afSEh5tU2xy84NXCz+0TurNDrlAza9N+oSQTto Q2qvACvk3xwEOgufhcG7JWOIhL3+YBqq7rCmQv1Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from thor.intern.walstatt.dynvpn.de ([77.13.158.167]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MFz0E-1h9PYi3J02-00EtnF; Sun, 07 Apr 2019 21:27:30 +0200 Date: Sun, 7 Apr 2019 21:26:56 +0200 From: "O. Hartmann" To: Mariusz Zaborski Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346012 - head/sys/sys Message-ID: <20190407212723.52279631@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201904071607.x37G7fFP021279@repo.freebsd.org> References: <201904071607.x37G7fFP021279@repo.freebsd.org> Organization: WALSTATT User-Agent: OutScare 3.1415926 X-Operating-System: ImNotAnOperatingSystem 3.141592527 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 X-Provags-ID: V03:K1:tPxrTWo+RVHhtCC0SWJOgVSvFqdGdo5EjXI0UL20TvBD9TRO0Mx M2ES0Ox9MLOhHyJejwrwhUxvLX6PiXMGATk7zBWMAAajn0XDTbD4Q5ifsQlvdBAqIagfHCv ydLH1nGUYA2qDDhSvp1FTRYbL6Bks9Jslhu6XHAelFFvGZsvDjdnsXSvAdRlE4x29QBgjd9 8ULzyKQaz6vIAi6mU2Pbg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:y2qOhGpq66E=:Z8isNtuQmnre4Y1SGq7vW6 AIUYlmXY7Fqd6w2S4vpqURu1s8qFymBoRFUIyIBVupKBgFUOYKEL2eAylAaEDQdKfgYofmBZk KBjQqX+oZvkKDSU1deDLWhuoUh4A3UfIXHD9A/3drR+u/lN3yC40EqBO4AXxSDdwUbexCYaZx MfXO1Fpog3Q/4UggiZTyOsBz6AJqghti/el4mizNzeU0bF5PW1r04RImnxuVVFC9f9gOgCpgl QjXt6cJob/JjY7cgLqvodAxBWUYh3VgdirbzUUDrteLUqeOAJ619Rls0sKOoTiataxm8frkzY INIZ1h/bCh7Nt9XHd1JhyHUJklQxMOlSUmMuZA8JNOGKBPARCty16ndVeDOl3m28it4Z/Pte4 L7EZLMhRA8O/o8o11wPb7WxuSH9MQqy2Nv8qpCdmTDpWZLU6HW1OApn/z75biDUDdPyfrC4X6 118XEAjKMPpNsbeGow/jD2egQdhekGYBVuWk7f3X3lxzo8nKq6f/TBQvfc2flBW+NXYL/R7J2 A8lKxxystvH7nOFGfSJtGe+EW9AzTBYzpY8mkCgGVt9WMVvQQ+Q0D/X0dEkSgQNxHtHvXHJJy /PKzhXZMLokACR/+vOb8a6OK7HL0K0uTfgAxFjasF1W4hNwy6mVo2huzbuYp7WW1JTJME26gy ggAFUfkz4qDcLdvAi0RQDJeVNlAhKWserqr87g896DwmfopdhldKi51W8Ncq/LboXfupOppVH 18Dq7oHNFFtUrhEOHyOkbC+jXGbD0nLdtt4LfJXccBk8n9zFTHlJFAr1Thqh32RyKmHs0xKMd VbXirJmpjvYLx2tkHO+KsTTH8kU+FA55dYQY0tZmIqu/FlevgNhsdp/dRtfAniJtDJCf/UFBq UCtBrzzyTPfnot3FxlPoixJV1uvwdtg6YYlcXr6LPURx2d7H+QNVh8Zh1KAtRyJjDEv67uGbH aN1QBqQ3KUA== X-Rspamd-Queue-Id: F05FD6E834 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.989,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 19:32:48 -0000 LS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQ0KSGFzaDogU0hBMjU2DQoNCkFtIFN1 biwgNyBBcHIgMjAxOSAxNjowNzo0MSArMDAwMCAoVVRDKQ0KTWFyaXVzeiBaYWJvcnNraSA8b3No b2dib0BGcmVlQlNELm9yZz4gc2NocmllYjoNCg0KPiBBdXRob3I6IG9zaG9nYm8NCj4gRGF0ZTog U3VuIEFwciAgNyAxNjowNzo0MSAyMDE5DQo+IE5ldyBSZXZpc2lvbjogMzQ2MDEyDQo+IFVSTDog aHR0cHM6Ly9zdm53ZWIuZnJlZWJzZC5vcmcvY2hhbmdlc2V0L2Jhc2UvMzQ2MDEyDQo+IA0KPiBM b2c6DQo+ICAgQnVtcCBGcmVlQlNEIHZlcnNpb24gYWZ0ZXIgcjM0NTk4Mi4NCj4gICANCj4gICBS ZXBvcnRlZCBieToJU2hhd24gV2ViYiA8c2hhd24ud2ViYkBoYXJkZW5lZGJzZC5vcmc+DQo+ICAg RGlzY3Vzc2VkIHdpdGg6IGltcCwgY3ksIHJncmltZXMNCj4gDQo+IE1vZGlmaWVkOg0KPiAgIGhl YWQvc3lzL3N5cy9wYXJhbS5oDQo+IA0KPiBNb2RpZmllZDogaGVhZC9zeXMvc3lzL3BhcmFtLmgN Cj4gPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQo+IC0tLSBoZWFkL3N5cy9zeXMvcGFyYW0uaAlTdW4g QXByICA3IDE0OjMwOjE3IDIwMTkJKHIzNDYwMTEpDQo+ICsrKyBoZWFkL3N5cy9zeXMvcGFyYW0u aAlTdW4gQXByICA3IDE2OjA3OjQxIDIwMTkJKHIzNDYwMTIpDQo+IEBAIC02MCw3ICs2MCw3IEBA DQo+ICAgKgkJaW4gdGhlIHJhbmdlIDUgdG8gOS4NCj4gICAqLw0KPiAgI3VuZGVmIF9fRnJlZUJT RF92ZXJzaW9uDQo+IC0jZGVmaW5lIF9fRnJlZUJTRF92ZXJzaW9uIDEzMDAwMTcJLyogTWFzdGVy LCBwcm9wYWdhdGVkIHRvIG5ld3ZlcnMgKi8NCj4gKyNkZWZpbmUgX19GcmVlQlNEX3ZlcnNpb24g MTMwMDAxOAkvKiBNYXN0ZXIsIHByb3BhZ2F0ZWQgdG8gbmV3dmVycyAqLw0KPiAgDQo+ICAvKg0K PiAgICogX19GcmVlQlNEX2tlcm5lbF9fIGluZGljYXRlcyB0aGF0IHRoaXMgc3lzdGVtIHVzZXMg dGhlIGtlcm5lbCBvZiBGcmVlQlNELA0KPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXw0KPiBzdm4tc3JjLWhlYWRAZnJlZWJzZC5vcmcgbWFpbGluZyBsaXN0 DQo+IGh0dHBzOi8vbGlzdHMuZnJlZWJzZC5vcmcvbWFpbG1hbi9saXN0aW5mby9zdm4tc3JjLWhl YWQNCj4gVG8gdW5zdWJzY3JpYmUsIHNlbmQgYW55IG1haWwgdG8gInN2bi1zcmMtaGVhZC11bnN1 YnNjcmliZUBmcmVlYnNkLm9yZyINCg0KSSBmaW5kIG15c2VsZiBidWdnZWQgYnkgdGhpcyBlcnJv ciB3aGlsZSBjb21waWxpbmcgd29ybGQgYWZ0ZXIgdGhlIHVwZGF0ZSBvZiBDVVJSRU5UIHRvDQpy MzQ2MDIwOg0KDQpbLi4uXQ0KQnVpbGRpbmcgL3Vzci9vYmovdXNyL3NyYy9hbWQ2NC5hbWQ2NC91 c3Iuc2Jpbi9ibGFja2xpc3RkL2NvbmYubw0KLSAtLS0gYWxsX3N1YmRpcl91c3Iuc2Jpbi9hbWQg LS0tDQotIC0tLSBhbWQubyAtLS0NCi91c3Ivc3JjL2NvbnRyaWIvYW1kL2FtZC9hbWQuYzoyNzU6 MTc6IGVycm9yOiB1c2Ugb2YgdW5kZWNsYXJlZCBpZGVudGlmaWVyICdIT1NUX09TX05BTUUnDQog IGdvcHQub3Bfc3lzID0gSE9TVF9PU19OQU1FOw0KICAgICAgICAgICAgICAgIF4NCi91c3Ivc3Jj L2NvbnRyaWIvYW1kL2FtZC9hbWQuYzoyNzg6MjE6IGVycm9yOiB1c2Ugb2YgdW5kZWNsYXJlZCBp ZGVudGlmaWVyICdIT1NUX09TX1ZFUlNJT04nDQogIGdvcHQub3Bfc3lzX3ZlciA9IEhPU1RfT1Nf VkVSU0lPTjsNCiAgICAgICAgICAgICAgICAgICAgXg0KL3Vzci9zcmMvY29udHJpYi9hbWQvYW1k L2FtZC5jOjI4MToyMjogZXJyb3I6IHVzZSBvZiB1bmRlY2xhcmVkIGlkZW50aWZpZXIgJ0hPU1Rf T1MnDQogIGdvcHQub3Bfc3lzX2Z1bGwgPSBIT1NUX09TOw0KICAgICAgICAgICAgICAgICAgICAg Xg0KMyBlcnJvcnMgZ2VuZXJhdGVkLg0KDQpbLi4uXQ0KDQpSZWdhcmRzLA0KDQpvaA0KLSAtLSAN Ck8uIEhhcnRtYW5uDQoNCkljaCB3aWRlcnNwcmVjaGUgZGVyIE51dHp1bmcgb2RlciDDnGJlcm1p dHRsdW5nIG1laW5lciBEYXRlbiBmw7xyDQpXZXJiZXp3ZWNrZSBvZGVyIGbDvHIgZGllIE1hcmt0 LSBvZGVyIE1laW51bmdzZm9yc2NodW5nICjCpyAyOCBBYnMuIDQgQkRTRykuDQotLS0tLUJFR0lO IFBHUCBTSUdOQVRVUkUtLS0tLQ0KDQppSFVFQVJZSUFCMFdJUVN5OElCeEFQRGtxVkJhVEo0NE4x WlpQYmE1UndVQ1hLcFBIQUFLQ1JBNE4xWlpQYmE1DQpSNlBaQVA5eTJyVzl2RXFNTDVkY21rblVV eVlhd0VzOERlTWQ2MjVOMElwd2xKeHMxQUVBNUpXL1JBQitRd0VFDQp2NDdhQW5ST3FHQ01WSFJp eEdHTkxKYTB2S29vT0E4PQ0KPTFWaHQNCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQ0K From owner-svn-src-head@freebsd.org Sun Apr 7 19:54:29 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4267D1568EDD; Sun, 7 Apr 2019 19:54:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (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 B22BC6EF5F; Sun, 7 Apr 2019 19:54:27 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id DDryhtimYGusjDDrzhh79U; Sun, 07 Apr 2019 13:54:24 -0600 X-Authority-Analysis: v=2.3 cv=fOdHIqSe c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=8nJEP1OIZ-IA:10 a=oexKYjalfGEA:10 a=6I5d2MoRAAAA:8 a=ypVJL4-jAAAA:8 a=YxBL1-UpAAAA:8 a=hkyuMYPH1GyjwF8KufwA:9 a=wPNLvfGTeEIA:10 a=IjZwj45LgO3ly-622nXo:22 a=khIbc0fXALFIcTpOSxgJ:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id B2BD0C86; Sun, 7 Apr 2019 12:54:21 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x37JsLlC019656; Sun, 7 Apr 2019 12:54:21 -0700 (PDT) (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 x37JsLJj019639; Sun, 7 Apr 2019 12:54:21 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201904071954.x37JsLJj019639@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.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "O. Hartmann" cc: Mariusz Zaborski , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346012 - head/sys/sys In-Reply-To: Message from "O. Hartmann" of "Sun, 07 Apr 2019 21:26:56 +0200." <20190407212723.52279631@thor.intern.walstatt.dynvpn.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Sun, 07 Apr 2019 12:54:21 -0700 X-CMAE-Envelope: MS4wfErZu2j7H9NYPsdDcpDNMX5w7oqBYlU/T/f08MOG4XhuTmB3DaNRtum3Tn2vagoLE/YkF3tRPofdsB2xrIJTcUl7rSZYLczOUE+whOCR42rEchUrAI+Z 3PoJM98Gd9LW1/DgW3sdiwsg7I90b8BQX67OofIB3kYN5MafqbuiHtA0H/oFGFPAqpmah9oDZe0YcXF3ShA8hnLeoGzRrvkgpE9NRmRnWEWIqyIyh0IZnxtl RCSKDk7RGW7nAOPapsnHgQP9BHllBFlBlkIlXKVfS6a9o15w32q1+i1pkga00BkEUOA3LJajr6QbeUdXcGZjL0JxLHAS4lqyGw+T+QU1NHk= X-Rspamd-Queue-Id: B22BC6EF5F X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-4.86 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; IP_SCORE(-2.18)[ip: (-5.36), ipnet: 64.59.128.0/20(-3.07), asn: 6327(-2.38), country: CA(-0.09)]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCPT_COUNT_FIVE(0.00)[5]; REPLYTO_EQ_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: spqr.komquats.com]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_SPF_NA(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.zen.spamhaus.org : 127.0.0.11]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[139.136.59.64.list.dnswl.org : 127.0.5.1] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 19:54:29 -0000 In message <20190407212723.52279631@thor.intern.walstatt.dynvpn.de>, "O. Hartma nn" writes: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Am Sun, 7 Apr 2019 16:07:41 +0000 (UTC) > Mariusz Zaborski schrieb: > > > Author: oshogbo > > Date: Sun Apr 7 16:07:41 2019 > > New Revision: 346012 > > URL: https://svnweb.freebsd.org/changeset/base/346012 > > > > Log: > > Bump FreeBSD version after r345982. > > > > Reported by: Shawn Webb > > Discussed with: imp, cy, rgrimes > > > > Modified: > > head/sys/sys/param.h > > > > Modified: head/sys/sys/param.h > > =========================================================================== > === > > --- head/sys/sys/param.h Sun Apr 7 14:30:17 2019 (r346011) > > +++ head/sys/sys/param.h Sun Apr 7 16:07:41 2019 (r346012) > > @@ -60,7 +60,7 @@ > > * in the range 5 to 9. > > */ > > #undef __FreeBSD_version > > -#define __FreeBSD_version 1300017 /* Master, propagated to newvers */ > > +#define __FreeBSD_version 1300018 /* Master, propagated to newvers */ > > > > /* > > * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBS > D, > > _______________________________________________ > > 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 find myself bugged by this error while compiling world after the update of > CURRENT to > r346020: > > [...] > Building /usr/obj/usr/src/amd64.amd64/usr.sbin/blacklistd/conf.o > - --- all_subdir_usr.sbin/amd --- > - --- amd.o --- > /usr/src/contrib/amd/amd/amd.c:275:17: error: use of undeclared identifier 'H > OST_OS_NAME' > gopt.op_sys = HOST_OS_NAME; > ^ > /usr/src/contrib/amd/amd/amd.c:278:21: error: use of undeclared identifier 'H > OST_OS_VERSION' > gopt.op_sys_ver = HOST_OS_VERSION; > ^ > /usr/src/contrib/amd/amd/amd.c:281:22: error: use of undeclared identifier 'H > OST_OS' > gopt.op_sys_full = HOST_OS; > ^ > 3 errors generated. > > [...] Can you grep or ag HOST_OS in /usr/obj/opt/src/svn-current/amd64.amd64/u sr.sbin/amd/include/config_local.h please? -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Sun Apr 7 20:12:26 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDE631569824; Sun, 7 Apr 2019 20:12:25 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 83C377078F; Sun, 7 Apr 2019 20:12:25 +0000 (UTC) (envelope-from mhorne@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74CC7191F3; Sun, 7 Apr 2019 20:12:25 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37KCPHW056300; Sun, 7 Apr 2019 20:12:25 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37KCPHt056299; Sun, 7 Apr 2019 20:12:25 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <201904072012.x37KCPHt056299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Sun, 7 Apr 2019 20:12:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346021 - in head/sys/riscv: include riscv X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: in head/sys/riscv: include riscv X-SVN-Commit-Revision: 346021 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 83C377078F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 20:12:26 -0000 Author: mhorne Date: Sun Apr 7 20:12:24 2019 New Revision: 346021 URL: https://svnweb.freebsd.org/changeset/base/346021 Log: RISC-V: initialize pcpu slightly earlier In certain scenarios, it is possible for PCPU data to be accessed before it has been initialized (e.g. during printf if the kernel was built with the TSLOG option). Initialize the PCPU pointer for hart 0 at the beginning of initriscv() rather than near the end. Reviewed by: markj Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D19726 Modified: head/sys/riscv/include/pcpu.h head/sys/riscv/riscv/machdep.c Modified: head/sys/riscv/include/pcpu.h ============================================================================== --- head/sys/riscv/include/pcpu.h Sun Apr 7 19:08:07 2019 (r346020) +++ head/sys/riscv/include/pcpu.h Sun Apr 7 20:12:24 2019 (r346021) @@ -53,7 +53,6 @@ struct pcb; struct pcpu; -extern struct pcpu *pcpup; static inline struct pcpu * get_pcpu(void) Modified: head/sys/riscv/riscv/machdep.c ============================================================================== --- head/sys/riscv/riscv/machdep.c Sun Apr 7 19:08:07 2019 (r346020) +++ head/sys/riscv/riscv/machdep.c Sun Apr 7 20:12:24 2019 (r346021) @@ -120,8 +120,6 @@ int64_t idcache_line_size; /* The minimum cache line s extern int *end; extern int *initstack_end; -struct pcpu *pcpup; - uintptr_t mcall_trap(uintptr_t mcause, uintptr_t* regs); uintptr_t @@ -627,6 +625,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask static void init_proc0(vm_offset_t kstack) { + struct pcpu *pcpup; pcpup = &__pcpu[0]; @@ -798,6 +797,7 @@ void initriscv(struct riscv_bootparams *rvbp) { struct mem_region mem_regions[FDT_MEM_REGIONS]; + struct pcpu *pcpup; vm_offset_t rstart, rend; vm_offset_t s, e; int mem_regions_sz; @@ -806,6 +806,15 @@ initriscv(struct riscv_bootparams *rvbp) caddr_t kmdp; int i; + /* Set the pcpu data, this is needed by pmap_bootstrap */ + pcpup = &__pcpu[0]; + pcpu_init(pcpup, 0, sizeof(struct pcpu)); + + /* Set the pcpu pointer */ + __asm __volatile("mv gp, %0" :: "r"(pcpup)); + + PCPU_SET(curthread, &thread0); + /* Set the module data location */ lastaddr = fake_preload_metadata(rvbp); @@ -848,15 +857,6 @@ initriscv(struct riscv_bootparams *rvbp) } } #endif - - /* Set the pcpu data, this is needed by pmap_bootstrap */ - pcpup = &__pcpu[0]; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - - /* Set the pcpu pointer */ - __asm __volatile("mv gp, %0" :: "r"(pcpup)); - - PCPU_SET(curthread, &thread0); /* Do basic tuning, hz etc */ init_param1(); From owner-svn-src-head@freebsd.org Sun Apr 7 21:01:04 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5CB8156AA96; Sun, 7 Apr 2019 21:01:03 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8594D72198; Sun, 7 Apr 2019 21:01:03 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62697198EA; Sun, 7 Apr 2019 21:01:03 +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 x37L13vr081336; Sun, 7 Apr 2019 21:01:03 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37L133n081335; Sun, 7 Apr 2019 21:01:03 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201904072101.x37L133n081335@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 7 Apr 2019 21:01:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346022 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 346022 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8594D72198 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 21:01:04 -0000 Author: imp Date: Sun Apr 7 21:01:02 2019 New Revision: 346022 URL: https://svnweb.freebsd.org/changeset/base/346022 Log: Make RELDATE be on a single line. All variable assignments that start in column 1 have to be on a single line for amd to build due to as weird dependency there (most likely it can be fixed to use the new VARS_ONLY feature, but it isn't today). usr.sbin/amd/include/Makefile calls usr.sbin/amd/include/newvers.sh which does: eval `LC_ALL=C egrep '^[A-Z]+=' $1 | grep -v COPYRIGHT` which is where that requirement comes from. It handles COPYRIGHT since that's an exception. Rather than add additional exceptions, cope with the long line in newvers.sh instead. Note: it no longer needs to filter COPYRIGHT because the assignment doesn't start in column 1 anymore. I had done a universe when I had an earlier version of r346018 that had it as one line. When I changed it to multi-line as suggested in the review, I only built kernels on a couple of architectures to make sure it didn't break anything. Add comment to newvers.sh noting this. Obviously, this unbreaks the amd build. Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Sun Apr 7 20:12:24 2019 (r346021) +++ head/sys/conf/newvers.sh Sun Apr 7 21:01:02 2019 (r346022) @@ -44,6 +44,9 @@ # checkout from a version control system. Metadata is # included if the tree is modified. +# Note: usr.sbin/amd/include/newvers.sh assumes all variable assignments of +# upper case variables starting in column 1 are on one line w/o continuation. + TYPE="FreeBSD" REVISION="13.0" BRANCH=${BRANCH_OVERRIDE:-CURRENT} @@ -105,8 +108,7 @@ if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/.. fi -RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ - ${PARAMFILE:-${SYSDIR}/sys/param.h}) +RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h}) if [ -r "${SYSDIR}/../COPYRIGHT" ]; then year=$(sed -Ee '/^Copyright .* The FreeBSD Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) From owner-svn-src-head@freebsd.org Sun Apr 7 21:14:59 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C95E9156B947 for ; Sun, 7 Apr 2019 21:14:58 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yb1-xb2a.google.com (mail-yb1-xb2a.google.com [IPv6:2607:f8b0:4864:20::b2a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 51CAD72F7C for ; Sun, 7 Apr 2019 21:14:58 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yb1-xb2a.google.com with SMTP id d20so4400056ybm.10 for ; Sun, 07 Apr 2019 14:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=vK+jm5SNo/rtmKTQ9iWH74DwxEDZ1h3rQo2maF/0Zro=; b=i8JBmdQ2InQw9doHeHVjGNjppYI0RXsgQpHrvlSmyIZBhkjvF6V3NWIcW8qjE3IU4G iJ34uv3FUJSV3jLD17YTe3s+z2NoU+r64yaJnHeYqHFj8jKsZH522INlDnm6y9obxpKk kpaeiVNW9KKoULaq9XL/M/x7Emf3q71OtrUo6+hfBf9gPG9Wf3V5b86OgFruY7toby/A US38YxBMT8A9CwKw8gjxr5NdCYpZnaMwV5Xmir5+Dbjn+jo5+sF25W9x9HO2MBvm+Z9R KehFPIG2ekHTgOReQeflgis83HFCJt3kLD5LnpgUYrSSmycW8ErAo0Z2t8idLnljuv4x fqBA== 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=vK+jm5SNo/rtmKTQ9iWH74DwxEDZ1h3rQo2maF/0Zro=; b=J6PP8oEV64JpE1in6DuM3HG+21yl18GX2wowM6j9XbT+dGDm1Dk+WjF4pzYjgGYcKm SvojLw/7U4EWQUBOPhCFQ1qeJIl39AdpWnmWWJIT8tTAsQ3SAkTTurKHzhFGeD4kHcVt TA5Kk9mm20Vnk0FJ38I4Klk5m0lZJDYeocbEmxR2TkrOAGR14lUbD6lRpvmStJVlhoR0 63cieC2xyjNpUG9AIhBNXYLoiEs8d/5qASZpfrIgqKanvqRl6Lq3M7k9S4HipXiTT14q pwJQORMeN3x3V5cg4NsZ/NVvBGmo6M6/2/mZOg+Qyb45whOBsopHbUr7G1+MRDey38IG C9SQ== X-Gm-Message-State: APjAAAUt+4Tv94dRrvX34Smz3OQdwszAaO+mW2//G6qB/1kK/JCeFzsd ZDr1kgtnwZvmUN1ZvdkUGVKz+dvE8X4XzKLvI3zbKA== X-Google-Smtp-Source: APXvYqxrRyXSw9+AjHYD7/UjwPKaLnOsYNBOkqpeJh6O0yYb8HlzFAqtO7b4F+LvsNCXNGR0mhZGupMN4z+KbEZKYP8= X-Received: by 2002:a25:241:: with SMTP id 62mr11706901ybc.10.1554671697487; Sun, 07 Apr 2019 14:14:57 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:810e:0:0:0:0:0 with HTTP; Sun, 7 Apr 2019 14:14:56 -0700 (PDT) In-Reply-To: <201904071831.x37IVj4r096803@repo.freebsd.org> References: <201904071831.x37IVj4r096803@repo.freebsd.org> From: Oliver Pinter Date: Sun, 7 Apr 2019 23:14:56 +0200 Message-ID: Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: Chris Rees Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Konstantin Belousov X-Rspamd-Queue-Id: 51CAD72F7C X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 21:14:59 -0000 On Sunday, April 7, 2019, Chris Rees wrote: > Author: crees (doc,ports committer) > Date: Sun Apr 7 18:31:45 2019 > New Revision: 346017 > URL: https://svnweb.freebsd.org/changeset/base/346017 > > Log: > Remove now unnecessary kldstat check before attempting to load modules. > > Since r233109, kldload has the -n option, which silently ignores options > that are already loaded. > > https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.html > > Note that this script no longer reports if the module is already loaded, > but it could be argued this wasn't particularly useful information. > > PR: docs/234248 This is why a docs PR? > Reviewed by: bcr (docs), kib, rgrimes (visual) I haven't seen kib on the reviewers list. > Approved by: jilles > Differential Revision: https://reviews.freebsd.org/D18670 > > Modified: > head/libexec/rc/rc.d/abi > head/libexec/rc/rc.d/bthidd > head/libexec/rc/rc.d/cfumass > head/libexec/rc/rc.d/kld > head/libexec/rc/rc.d/mdconfig > head/libexec/rc/rc.d/mdconfig2 > head/libexec/rc/rc.d/mountcritremote > head/libexec/rc/rc.d/syscons > head/libexec/rc/rc.subr > head/share/man/man5/rc.conf.5 > > Modified: head/libexec/rc/rc.d/abi > ============================================================ > ================== > --- head/libexec/rc/rc.d/abi Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.d/abi Sun Apr 7 18:31:45 2019 (r346017) > @@ -27,10 +27,10 @@ linux_start() > local _tmpdir > > echo -n ' linux' > - load_kld -e 'linux(aout|elf)' linux > + load_kld linux > case `sysctl -n hw.machine_arch` in > amd64) > - load_kld -e 'linux64elf' linux64 > + load_kld linux64 > ;; > esac > if [ -x /compat/linux/sbin/ldconfigDisabled ]; then > > Modified: head/libexec/rc/rc.d/bthidd > ============================================================ > ================== > --- head/libexec/rc/rc.d/bthidd Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.d/bthidd Sun Apr 7 18:31:45 2019 (r346017) > @@ -34,11 +34,11 @@ evdev_enabled() > bthidd_prestart() > { > if evdev_enabled; then > - load_kld -m uinput uinput > + load_kld uinput > fi > - load_kld -m kbdmux kbdmux > - load_kld -m vkbd vkbd > - load_kld -m ng_btsocket ng_btsocket > + load_kld kbdmux > + load_kld vkbd > + load_kld ng_btsocket > return 0 > } > > > Modified: head/libexec/rc/rc.d/cfumass > ============================================================ > ================== > --- head/libexec/rc/rc.d/cfumass Sun Apr 7 18:24:26 2019 > (r346016) > +++ head/libexec/rc/rc.d/cfumass Sun Apr 7 18:31:45 2019 > (r346017) > @@ -75,7 +75,7 @@ cfumass_start() > return "${err}" > fi > > - load_kld -e cfumass cfumass > + load_kld cfumass > > # If the template is already switched to Mass Storage, then reset > # it to -1 to force the host to reenumerate it; otherwise it might > > Modified: head/libexec/rc/rc.d/kld > ============================================================ > ================== > --- head/libexec/rc/rc.d/kld Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.d/kld Sun Apr 7 18:31:45 2019 (r346017) > @@ -46,7 +46,7 @@ kld_start() > > echo 'Loading kernel modules:' > for _kld in $kld_list ; do > - load_kld -e ${_kld}.ko $_kld > + load_kld $_kld > done > } > > > Modified: head/libexec/rc/rc.d/mdconfig > ============================================================ > ================== > --- head/libexec/rc/rc.d/mdconfig Sun Apr 7 18:24:26 2019 > (r346016) > +++ head/libexec/rc/rc.d/mdconfig Sun Apr 7 18:31:45 2019 > (r346017) > @@ -114,7 +114,7 @@ mdconfig_start() > continue > fi > if [ "${_file}" != "${_file%.uzip}" ]; then > - load_kld -m g_uzip geom_uzip || > return 3 > + load_kld geom_uzip || return 3 > # sleep a bit to allow creation of > /dev/mdX.uzip > sleep 2 > fi > > Modified: head/libexec/rc/rc.d/mdconfig2 > ============================================================ > ================== > --- head/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:24:26 2019 > (r346016) > +++ head/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:31:45 2019 > (r346017) > @@ -123,7 +123,7 @@ mdconfig2_start() > # been created. > if [ "${_type}" = "vnode" -a "${_fs}" != "/" ]; then > if [ "${_file}" != "${_file%.uzip}" ]; then > - load_kld -m g_uzip geom_uzip || return 3 > + load_kld geom_uzip || return 3 > fi > if is_readonly ${_fs}; then > warn "${_fs} is mounted read-only, > skipping ${_md}." > > Modified: head/libexec/rc/rc.d/mountcritremote > ============================================================ > ================== > --- head/libexec/rc/rc.d/mountcritremote Sun Apr 7 18:24:26 2019 > (r346016) > +++ head/libexec/rc/rc.d/mountcritremote Sun Apr 7 18:31:45 2019 > (r346017) > @@ -27,7 +27,7 @@ mountcritremote_precmd() > case "`mount -d -a -t nfs 2> /dev/null`" in > *mount_nfs*) > # Handle absent nfs client support > - load_kld -m nfs nfscl || return 1 > + load_kld nfscl || return 1 > ;; > esac > return 0 > > Modified: head/libexec/rc/rc.d/syscons > ============================================================ > ================== > --- head/libexec/rc/rc.d/syscons Sun Apr 7 18:24:26 2019 > (r346016) > +++ head/libexec/rc/rc.d/syscons Sun Apr 7 18:31:45 2019 > (r346017) > @@ -346,7 +346,7 @@ syscons_start() > for i in `kldstat | awk '$5 ~ "_saver\.ko$" { print $5 > }'`; do > kldunload ${i} > done > - load_kld -e _saver ${saver}_saver > + load_kld ${saver}_saver > ;; > esac > > > Modified: head/libexec/rc/rc.subr > ============================================================ > ================== > --- head/libexec/rc/rc.subr Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.subr Sun Apr 7 18:31:45 2019 (r346017) > @@ -1853,48 +1853,29 @@ mount_md() > } > > # Code common to scripts that need to load a kernel module > -# if it isn't in the kernel yet. Syntax: > -# load_kld [-e regex] [-m module] file > -# where -e or -m chooses the way to check if the module > -# is already loaded: > -# regex is egrep'd in the output from `kldstat -v', > -# module is passed to `kldstat -m'. > -# The default way is as though `-m file' were specified. > +# if it isn't in the kernel yet. Syntax: > +# load_kld file > load_kld() > { > - local _loaded _mod _opt _re > + local _opt > > + # Silently ignore legacy options; they are unnecessary > while getopts "e:m:" _opt; do > case "$_opt" in > - e) _re="$OPTARG" ;; > - m) _mod="$OPTARG" ;; > - *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; > + e) ;; > + m) ;; > + *) err 3 'USAGE: load_kld file' ;; > esac > done > shift $(($OPTIND - 1)) > if [ $# -ne 1 ]; then > - err 3 'USAGE: load_kld [-e regex] [-m module] file' > + err 3 'USAGE: load_kld file' > fi > - _mod=${_mod:-$1} > - _loaded=false > - if [ -n "$_re" ]; then > - if kldstat -v | egrep -q -e "$_re"; then > - _loaded=true > - fi > + if ! kldload -n "$1"; then > + warn "Unable to load kernel module $1" > + return 1 > else > - if kldstat -q -m "$_mod"; then > - _loaded=true > - fi > - fi > - if ! $_loaded; then > - if ! kldload "$1"; then > - warn "Unable to load kernel module $1" > - return 1 > - else > - info "$1 kernel module loaded." > - fi > - else > - debug "load_kld: $1 kernel module already loaded." > + info "$1 kernel module loaded." > fi > return 0 > } > > Modified: head/share/man/man5/rc.conf.5 > ============================================================ > ================== > --- head/share/man/man5/rc.conf.5 Sun Apr 7 18:24:26 2019 > (r346016) > +++ head/share/man/man5/rc.conf.5 Sun Apr 7 18:31:45 2019 > (r346017) > @@ -24,7 +24,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd March 21, 2019 > +.Dd April 7, 2019 > .Dt RC.CONF 5 > .Os > .Sh NAME > @@ -249,9 +249,7 @@ Default > .It Va kld_list > .Pq Vt str > A whitespace-separated list of kernel modules to load right after > -the local disks are mounted, without any > -.Pa .ko > -extension or path. > +the local disks are mounted, with optional path. > Loading modules at this point in the boot process is > much faster than doing it via > .Pa /boot/loader.conf > _______________________________________________ > 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" > From owner-svn-src-head@freebsd.org Sun Apr 7 21:16:53 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2ABF7156BA14 for ; Sun, 7 Apr 2019 21:16:53 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BA9C473104 for ; Sun, 7 Apr 2019 21:16:52 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yb1-xb2f.google.com with SMTP id b18so4398304yba.12 for ; Sun, 07 Apr 2019 14:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Rtc1TVoHjK6ckspqcZvjJdJXPuRcZb9r7WnDqEe8Ix0=; b=UfhiZ2FLG89/GyQA/JavWN7h73z/hWgOuqh+4ZTdChs+OnXY0SDE8TMlMz5XyysSNQ BQ5a3142rbVouXvO3mvBMzlMyH0tXBPgkINvJl6bKKFX6tr6QtmCLd5i5OkMCZbv5uW2 gYf2OFX6MkfkyuBicwGnXhgFCsfv64GvNuXx7uecWga5fogP1SHDUL1JCrA6fAA6rRBN /5Oibh8/BQIhqSjcngfXBPZFf+D4Y8EhKW5sJpdFXHY8AZY1S5QN3hQG73DdzX/NtMHM 9wFbm1V8iW/OJtGSYBfuCgYd7e0CXUapMfzfQmxHr2y9mU6BopTTAjk+Gmjju33VOM3c oNOQ== 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=Rtc1TVoHjK6ckspqcZvjJdJXPuRcZb9r7WnDqEe8Ix0=; b=ge6LPp1Kjmu/DNRd43Su29rip5TkmbT1RNb+tTY0QovsPHiG3UVJniUpzQkcpvGzDS 7rc0jPBJDcDsFHIl4N7/QNuHGR2FuySaxyxvhrS6j51mHzkdAltqVDj697x7Il37KIPB n2rtiCSQOAEIk7f1HN1UARNN0c9IZ6kclOA/E6ljrQvArQ5AmsNKE6pu9YXwVHUUQg65 0Z3CJtGfKG1KSHqMjRdVWdMm8tSbYjx0U7fpcsDEkC2fGo1vuRH0nBk868QVHja6v72H cOR5pKGcGS56+ERrJjG7I6qHETRw+CC1cpEuB67hxwDT54fHdoPrQJsJpnyLzLp39OZn GA4Q== X-Gm-Message-State: APjAAAXD0UgIi2iLC/aXGAjSVyQaJqEQpxpZ3FtbLlDqzXvHRaYAWLIY an5C67FyRmzO8MRS8/RFIaWwLos2WpYqH2/JIDSfKQ== X-Google-Smtp-Source: APXvYqxKBaOZcRDoWZk+HAvh1oQm/JzuC9Ht/G2dOUDrD2JamDFwxYID0CtlrqbT9KaSJHLyJmi1Roy5KRI6crgPzSo= X-Received: by 2002:a25:4642:: with SMTP id t63mr22507328yba.116.1554671812196; Sun, 07 Apr 2019 14:16:52 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:810e:0:0:0:0:0 with HTTP; Sun, 7 Apr 2019 14:16:51 -0700 (PDT) In-Reply-To: <201904071839.x37IduPO002007@repo.freebsd.org> References: <201904071839.x37IduPO002007@repo.freebsd.org> From: Oliver Pinter Date: Sun, 7 Apr 2019 23:16:51 +0200 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Warner Losh Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Rspamd-Queue-Id: BA9C473104 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 21:16:53 -0000 Please revert this patch. If I'm not wrong, this will break the freebsd-version command's generation or output. On Sunday, April 7, 2019, Warner Losh wrote: > Author: imp > Date: Sun Apr 7 18:39:55 2019 > New Revision: 346018 > URL: https://svnweb.freebsd.org/changeset/base/346018 > > Log: > Use default shell assignment rather more complicated if then > construct. > > Discussed with: emaste@, allanjude@ (changes (or not) based on their > feedback) > Differential Revision: https://reviews.freebsd.org/D19797 > > Modified: > head/sys/conf/newvers.sh > > Modified: head/sys/conf/newvers.sh > ============================================================ > ================== > --- head/sys/conf/newvers.sh Sun Apr 7 18:31:45 2019 (r346017) > +++ head/sys/conf/newvers.sh Sun Apr 7 18:39:55 2019 (r346018) > @@ -46,10 +46,7 @@ > > TYPE="FreeBSD" > REVISION="13.0" > -BRANCH="CURRENT" > -if [ -n "${BRANCH_OVERRIDE}" ]; then > - BRANCH=${BRANCH_OVERRIDE} > -fi > +BRANCH=${BRANCH_OVERRIDE:-CURRENT} > RELEASE="${REVISION}-${BRANCH}" > VERSION="${TYPE} ${RELEASE}" > > @@ -108,21 +105,16 @@ if [ -z "${SYSDIR}" ]; then > SYSDIR=$(dirname $0)/.. > fi > > -if [ -n "${PARAMFILE}" ]; then > - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print > $3}' \ > - ${PARAMFILE}) > -else > - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print > $3}' \ > - ${SYSDIR}/sys/param.h) > -fi > +RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ > + ${PARAMFILE:-${SYSDIR}/sys/param.h}) > > -b=share/examples/etc/bsd-style-copyright > if [ -r "${SYSDIR}/../COPYRIGHT" ]; then > year=$(sed -Ee '/^Copyright .* The FreeBSD > Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) > else > year=$(date +%Y) > fi > # look for copyright template > +b=share/examples/etc/bsd-style-copyright > for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b > do > if [ -r "$bsd_copyright" ]; then > @@ -150,9 +142,7 @@ COPYRIGHT="$COPYRIGHT > > # VARS_ONLY means no files should be generated, this is just being > # included. > -if [ -n "$VARS_ONLY" ]; then > - return 0 > -fi > +[ -n "$VARS_ONLY" ] && return 0 > > LC_ALL=C; export LC_ALL > if [ ! -r version ] > _______________________________________________ > 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" > From owner-svn-src-head@freebsd.org Sun Apr 7 21:41:20 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7712156C128; Sun, 7 Apr 2019 21:41:19 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mail56c50.megamailservers.eu (mail168c50.megamailservers.eu [91.136.10.178]) (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 A301273C1B; Sun, 7 Apr 2019 21:41:18 +0000 (UTC) (envelope-from crees@bayofrum.net) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554671973; bh=PqCXngQw4k598eox3LWp5UyLIJ6R7Gy/M9lz5lHPHi8=; h=Date:In-Reply-To:References:Subject:To:CC:From:From; b=QmPfB+6FMlU8/QOY6Xh1mXLztk9FfvjPikBJtIudSWyFd/yLGnXupz6Ypk5G858Mz EVVVPw32W8Hen5QneYJ2GzYWD41xYkP+bcGdxMVbpZKO0e12NJFJzx7uSlxUEdM7/S LwsnKlAYOI0d9vGzLt3ng+UpNR9FbANQ+HZABeLw= Feedback-ID: crees@bayofrum. Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail56c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x37LJVHW010591; Sun, 7 Apr 2019 21:19:32 +0000 Received: from R.bayofrum.net (R.bayofrum.net [192.168.1.129]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id CD0E4131F7; Sun, 7 Apr 2019 22:19:27 +0100 (BST) Date: Sun, 07 Apr 2019 22:19:24 +0100 User-Agent: K-9 Mail for Android In-Reply-To: References: <201904071831.x37IVj4r096803@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: Oliver Pinter , Chris Rees CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , Konstantin Belousov From: Chris Rees Message-ID: <7C6350D0-864E-4BCE-B562-06533076D222@bayofrum.net> X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: CD0E4131F7.A7D73 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@bayofrum.net X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B0215.5CAA6965.0014, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=G6gy7es5 c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=oexKYjalfGEA:10 a=ypVJL4-jAAAA:8 a=6I5d2MoRAAAA:8 a=NV2mcPfE25mr8LH4jqIA:9 a=QEXdDO2ut3YA:10 a=HOOHyrUpFT4A:10 a=khIbc0fXALFIcTpOSxgJ:22 a=IjZwj45LgO3ly-622nXo:22 X-Rspamd-Queue-Id: A301273C1B X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 21:41:20 -0000 Hey, On 7 April 2019 22:14:56 BST, Oliver Pinter = wrote: >On Sunday, April 7, 2019, Chris Rees wrote: > >> Author: crees (doc,ports committer) >> Date: Sun Apr 7 18:31:45 2019 >> New Revision: 346017 >> URL: https://svnweb.freebsd.org/changeset/base/346017 >> >> Log: >> Remove now unnecessary kldstat check before attempting to load >modules. >> >> Since r233109, kldload has the -n option, which silently ignores >options >> that are already loaded. >> >>=20=20 >https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.html >> >> Note that this script no longer reports if the module is already >loaded, >> but it could be argued this wasn't particularly useful information. >> >> PR: docs/234248 > > >This is why a docs PR? Followup from that PR. >> Reviewed by: bcr (docs), kib, rgrimes (visual) > > >I haven't seen kib on the reviewers list. Please refer to the conversation on freebsd-rc that I linked in the commit = message. Chris --=20 Sent from my Android device with K-9 Mail. Please excuse my brevity. --=20 This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Mon Apr 8 00:08:34 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67592156F411 for ; Mon, 8 Apr 2019 00:08:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9C38779DF for ; Mon, 8 Apr 2019 00:08:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72c.google.com with SMTP id z76so6923873qkb.12 for ; Sun, 07 Apr 2019 17:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XC8Md6R4JhyuN6HSXkDxIANAOnaGVhPKM+1LvwF8NzY=; b=NeVT1xsSVZRi6utCheURa4Cl1uH9r2PJsV/tvh14b1lJL8AsAV9NQLtB6VSOBPPEXD 0vltzRoa1TUyzLhHiwglZZfbUl7copERQqZARstJbvp8PjqhIMqcH8i6J5pNbI+do/OQ j9jlXLVj3iohwfiit7EQmZWG84l5GSHtFCvw8xBfqTpXfV11X+q9dJt8xtirvdXKFMpL O/ZPDFmE8NQmXyxFDIsEYcE6vYClHqLWrUPwGqbtdPaZdOqLHtd4k+CVrkzq/1CmbbGe 23xhs5wuQPCd98ZvFObyLrGXPsWhyJRq59lOXFRYNLKO15qBUpjGJcZpgRWwylRivdw/ 1a/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XC8Md6R4JhyuN6HSXkDxIANAOnaGVhPKM+1LvwF8NzY=; b=cC/x3mmJzLPraE/w6tJvAO5tBKImNGDi1yr+QLNqmEwmwDnlcOZakfQuOrZDyhIoay F1LjOknJd5wmfB6Z6km4gxmmnpnO+23d/xGSwXhh/fjvhyqrkLuwBLK6G4jq8wIcU0Ex K77y6wyirV9ADEJaHE856uIO0UDDgcivMXmENxwXQsehAZyPs/DdsvAvm7wRuu6yvRHz ml27SNh/CUJDzV7V+NWIAz355XBdetueQKGkNeN60yq16uL7g+V1P9mZ+LQWZtDn6hwC EGA+g5/WfkFLnDsdKGUhykUNxxl6rU3dsdXCJn1UXha7p5QkmMNiAKWucZILHymMrFy3 ScWg== X-Gm-Message-State: APjAAAXl9iUNkCqINQsHbsO0JQGaoWhFZlrraLmo6x70gxRRLIGmR7y7 EcAFLXNLXu9evePb0yOpqK9C3fK++t6kGgHKlKmXD1JG X-Google-Smtp-Source: APXvYqzeGYywS27croiMevH7Rh2ISg1V8cPM6R/jfDr7SpuWaOEFZNd/BygrnGuBcON0dFIwchKpDJoqQRsK3/X6SOM= X-Received: by 2002:a05:620a:1024:: with SMTP id a4mr21117561qkk.232.1554682113091; Sun, 07 Apr 2019 17:08:33 -0700 (PDT) MIME-Version: 1.0 References: <201904071839.x37IduPO002007@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Sun, 7 Apr 2019 18:08:21 -0600 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Oliver Pinter Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Rspamd-Queue-Id: D9C38779DF X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.983,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 00:08:34 -0000 On Sun, Apr 7, 2019, 3:16 PM Oliver Pinter wrote: > Please revert this patch. If I'm not wrong, this will break the > freebsd-version command's generation or output. > You are going to need to be a lot more specific about this. It makes no sense to me at all how any of this could break that. The code is identical logically and produces the same result. Warner On Sunday, April 7, 2019, Warner Losh wrote: > >> Author: imp >> Date: Sun Apr 7 18:39:55 2019 >> New Revision: 346018 >> URL: https://svnweb.freebsd.org/changeset/base/346018 >> >> Log: >> Use default shell assignment rather more complicated if then >> construct. >> >> Discussed with: emaste@, allanjude@ (changes (or not) based on their >> feedback) >> Differential Revision: https://reviews.freebsd.org/D19797 >> >> Modified: >> head/sys/conf/newvers.sh >> >> Modified: head/sys/conf/newvers.sh >> >> ============================================================================== >> --- head/sys/conf/newvers.sh Sun Apr 7 18:31:45 2019 (r346017) >> +++ head/sys/conf/newvers.sh Sun Apr 7 18:39:55 2019 (r346018) >> @@ -46,10 +46,7 @@ >> >> TYPE="FreeBSD" >> REVISION="13.0" >> -BRANCH="CURRENT" >> -if [ -n "${BRANCH_OVERRIDE}" ]; then >> - BRANCH=${BRANCH_OVERRIDE} >> -fi >> +BRANCH=${BRANCH_OVERRIDE:-CURRENT} >> RELEASE="${REVISION}-${BRANCH}" >> VERSION="${TYPE} ${RELEASE}" >> >> @@ -108,21 +105,16 @@ if [ -z "${SYSDIR}" ]; then >> SYSDIR=$(dirname $0)/.. >> fi >> >> -if [ -n "${PARAMFILE}" ]; then >> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print >> $3}' \ >> - ${PARAMFILE}) >> -else >> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print >> $3}' \ >> - ${SYSDIR}/sys/param.h) >> -fi >> +RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ >> + ${PARAMFILE:-${SYSDIR}/sys/param.h}) >> >> -b=share/examples/etc/bsd-style-copyright >> if [ -r "${SYSDIR}/../COPYRIGHT" ]; then >> year=$(sed -Ee '/^Copyright .* The FreeBSD >> Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) >> else >> year=$(date +%Y) >> fi >> # look for copyright template >> +b=share/examples/etc/bsd-style-copyright >> for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b >> do >> if [ -r "$bsd_copyright" ]; then >> @@ -150,9 +142,7 @@ COPYRIGHT="$COPYRIGHT >> >> # VARS_ONLY means no files should be generated, this is just being >> # included. >> -if [ -n "$VARS_ONLY" ]; then >> - return 0 >> -fi >> +[ -n "$VARS_ONLY" ] && return 0 >> >> LC_ALL=C; export LC_ALL >> if [ ! -r version ] >> _______________________________________________ >> 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" >> > From owner-svn-src-head@freebsd.org Mon Apr 8 00:17:23 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3DD5A156F781 for ; Mon, 8 Apr 2019 00:17:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B86E577E48 for ; Mon, 8 Apr 2019 00:17:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x830.google.com with SMTP id k2so13535729qtm.1 for ; Sun, 07 Apr 2019 17:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6+Jc9nYpEglXDiJnYkv1hCb6Si/Qp2f1ROP2YoqsguU=; b=PizH6M5u2Pi9IP2yj8Pm1N0pWfgM8M7AoIEz7bSegzz38Mt7zOOKyd1mi6UEx/orFC EzXP3uvGE34wpTBofidn659oAe9/o4Yc7lNvhuJHtTtGmnhUojv1BL1eQAurmou22/Z/ jBU3HYfSlVg5py6RmikFEisIKSc73rTwDwp7ya1RHQ4h37tOHvUUCt8GGz97HFr5Cgc4 p2itu6WDa3nUDW/xNlYkC5jSrSb7b4jfN+/QJop9W9w9CPQxwhjuhTTjj7beQiV3tfM8 SCtsEG12AUgSDyiSGRsCv6zt/TCyzeKDL8LTG2xhEF8r3sgzz+QtLkhE4fq8t+8kKZEw vo8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6+Jc9nYpEglXDiJnYkv1hCb6Si/Qp2f1ROP2YoqsguU=; b=JA43p9MY+B9Tbu/fnJ1r6FrhJux+3UWq8poBbqHXbc9Ea9+BQe5uCtS9Mt/Ui0eNC4 XJ1O/OMM7ujt21BhuhXiW8yxrkaTFgYhbMZ4CTKe9j3IPLOJI/3xJO6S65LLN06dnTNl Z1n/6jAZs+kuh1bOEkNgqDjNtC6E9kAeYjmkZEP1ig6l+/nUvpobR52sGZZXNMYaccLJ m5/Cvp9eRHUPiuYi9WIl92/HPT3unF3/ynCP/QQnWR6H6zaZuypiv/yWVTmAhzTIuMlh mDXrrrKxDSNrkrBE4PxE85VgNiDfHaoN9cdLUOTwRlWObcV8rKnpbBrWQ5RfdwpG+8z7 xEKA== X-Gm-Message-State: APjAAAXQNcR8UPRYgq79g0OC8L9X0EaeJOosRXv20Vtn2gyOwr6SA49m 2pW3nF/6hUa6iMKN1q2IwdtmIdhS8Br+n2l5Ro+37g== X-Google-Smtp-Source: APXvYqzEcC1267kGCKJXGWJyiCueuoiyl1JUFDOh4mr1+3EJpE0yp6zfm2TmjjsbRNLZZ9RWp2dQRpC8hP3nBw8s1rk= X-Received: by 2002:ac8:3328:: with SMTP id t37mr21673589qta.246.1554682641945; Sun, 07 Apr 2019 17:17:21 -0700 (PDT) MIME-Version: 1.0 References: <201904071607.x37G7fFP021279@repo.freebsd.org> <20190407212723.52279631@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20190407212723.52279631@thor.intern.walstatt.dynvpn.de> From: Warner Losh Date: Sun, 7 Apr 2019 18:17:10 -0600 Message-ID: Subject: Re: svn commit: r346012 - head/sys/sys To: "O. Hartmann" Cc: Mariusz Zaborski , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: B86E577E48 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 00:17:23 -0000 On Sun, Apr 7, 2019, 1:32 PM O. Hartmann wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Am Sun, 7 Apr 2019 16:07:41 +0000 (UTC) > Mariusz Zaborski schrieb: > > > Author: oshogbo > > Date: Sun Apr 7 16:07:41 2019 > > New Revision: 346012 > > URL: https://svnweb.freebsd.org/changeset/base/346012 > > > > Log: > > Bump FreeBSD version after r345982. > > > > Reported by: Shawn Webb > > Discussed with: imp, cy, rgrimes > > > > Modified: > > head/sys/sys/param.h > > > > Modified: head/sys/sys/param.h > > > =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/sys/param.h Sun Apr 7 14:30:17 2019 (r346011) > > +++ head/sys/sys/param.h Sun Apr 7 16:07:41 2019 (r346012) > > @@ -60,7 +60,7 @@ > > * in the range 5 to 9. > > */ > > #undef __FreeBSD_version > > -#define __FreeBSD_version 1300017 /* Master, propagated to newvers = */ > > +#define __FreeBSD_version 1300018 /* Master, propagated to newvers = */ > > > > /* > > * __FreeBSD_kernel__ indicates that this system uses the kernel of > FreeBSD, > > _______________________________________________ > > 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 find myself bugged by this error while compiling world after the update > of CURRENT to > r346020: > > [...] > Building /usr/obj/usr/src/amd64.amd64/usr.sbin/blacklistd/conf.o > - --- all_subdir_usr.sbin/amd --- > - --- amd.o --- > /usr/src/contrib/amd/amd/amd.c:275:17: error: use of undeclared identifie= r > 'HOST_OS_NAME' > gopt.op_sys =3D HOST_OS_NAME; > ^ > /usr/src/contrib/amd/amd/amd.c:278:21: error: use of undeclared identifie= r > 'HOST_OS_VERSION' > gopt.op_sys_ver =3D HOST_OS_VERSION; > ^ > /usr/src/contrib/amd/amd/amd.c:281:22: error: use of undeclared identifie= r > 'HOST_OS' > gopt.op_sys_full =3D HOST_OS; > ^ > 3 errors generated. > That was my bad. A fix has committed as r346022. Warner [...] > > Regards, > > oh > - -- > O. Hartmann > > Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr > Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Ab= s. 4 BDSG). > -----BEGIN PGP SIGNATURE----- > > iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCXKpPHAAKCRA4N1ZZPba5 > R6PZAP9y2rW9vEqML5dcmknUUyYawEs8DeMd625N0IpwlJxs1AEA5JW/RAB+QwEE > v47aAnROqGCMVHRixGGNLJa0vKooOA8=3D > =3D1Vht > -----END PGP SIGNATURE----- > From owner-svn-src-head@freebsd.org Mon Apr 8 03:35:49 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 061181572C7F; Mon, 8 Apr 2019 03:35:49 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8FC6584E92; Mon, 8 Apr 2019 03:35:48 +0000 (UTC) (envelope-from oshogbo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A2671DC54; Mon, 8 Apr 2019 03:35:48 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x383ZmG9086094; Mon, 8 Apr 2019 03:35:48 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x383ZmuS086093; Mon, 8 Apr 2019 03:35:48 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904080335.x383ZmuS086093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Mon, 8 Apr 2019 03:35:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346023 - head/usr.bin/strings X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/usr.bin/strings X-SVN-Commit-Revision: 346023 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8FC6584E92 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 03:35:49 -0000 Author: oshogbo Date: Mon Apr 8 03:35:47 2019 New Revision: 346023 URL: https://svnweb.freebsd.org/changeset/base/346023 Log: strings: disable Casper support while building native-xtools Reported by: Charlie Li Tested by: Charlie Li Modified: head/usr.bin/strings/Makefile Modified: head/usr.bin/strings/Makefile ============================================================================== --- head/usr.bin/strings/Makefile Sun Apr 7 21:01:02 2019 (r346022) +++ head/usr.bin/strings/Makefile Mon Apr 8 03:35:47 2019 (r346023) @@ -10,7 +10,7 @@ PROG= strings LIBADD= elftc elf -.if ${MK_CASPER} != "no" && !defined(BOOTSTRAPPING) +.if ${MK_CASPER} != "no" && !defined(BOOTSTRAPPING) && !defined(NXB_TARGET) LIBADD+= casper LIBADD+= cap_fileargs CFLAGS+= -DWITH_CASPER From owner-svn-src-head@freebsd.org Mon Apr 8 04:07:38 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C44E15732FC; Mon, 8 Apr 2019 04:07:38 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 21F0D85A4C; Mon, 8 Apr 2019 04:07:38 +0000 (UTC) (envelope-from bde@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED5221E172; Mon, 8 Apr 2019 04:07:37 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3847bLL001700; Mon, 8 Apr 2019 04:07:37 GMT (envelope-from bde@FreeBSD.org) Received: (from bde@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3847boA001699; Mon, 8 Apr 2019 04:07:37 GMT (envelope-from bde@FreeBSD.org) Message-Id: <201904080407.x3847boA001699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org using -f From: Bruce Evans Date: Mon, 8 Apr 2019 04:07:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346024 - head/usr.sbin/vidcontrol X-SVN-Group: head X-SVN-Commit-Author: bde X-SVN-Commit-Paths: head/usr.sbin/vidcontrol X-SVN-Commit-Revision: 346024 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 21F0D85A4C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 04:07:38 -0000 Author: bde Date: Mon Apr 8 04:07:37 2019 New Revision: 346024 URL: https://svnweb.freebsd.org/changeset/base/346024 Log: Fix restoring the geometry when recovering from an error. Just restore the previous geometry, and don't do extra work to calculate the default geometry so as to reset to that. Modified: head/usr.sbin/vidcontrol/vidcontrol.c Modified: head/usr.sbin/vidcontrol/vidcontrol.c ============================================================================== --- head/usr.sbin/vidcontrol/vidcontrol.c Mon Apr 8 03:35:47 2019 (r346023) +++ head/usr.sbin/vidcontrol/vidcontrol.c Mon Apr 8 04:07:37 2019 (r346024) @@ -171,9 +171,8 @@ revert(void) else ioctl(0, _IO('S', cur_info.video_mode_number), NULL); if (cur_info.video_mode_info.vi_flags & V_INFO_GRAPHICS) { - size[0] = cur_info.video_mode_info.vi_width / 8; - size[1] = cur_info.video_mode_info.vi_height / - cur_info.console_info.font_size; + size[0] = cur_info.console_info.mv_csz; + size[1] = cur_info.console_info.mv_rsz; size[2] = cur_info.console_info.font_size; ioctl(0, KDRASTER, size); } From owner-svn-src-head@freebsd.org Mon Apr 8 04:54:17 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2EA71573FF6; Mon, 8 Apr 2019 04:54:16 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 712ED86C3F; Mon, 8 Apr 2019 04:54:16 +0000 (UTC) (envelope-from bde@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 478F61E9C6; Mon, 8 Apr 2019 04:54:16 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x384sG1W027272; Mon, 8 Apr 2019 04:54:16 GMT (envelope-from bde@FreeBSD.org) Received: (from bde@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x384sGZ2027271; Mon, 8 Apr 2019 04:54:16 GMT (envelope-from bde@FreeBSD.org) Message-Id: <201904080454.x384sGZ2027271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org using -f From: Bruce Evans Date: Mon, 8 Apr 2019 04:54:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346025 - head/lib/libvgl X-SVN-Group: head X-SVN-Commit-Author: bde X-SVN-Commit-Paths: head/lib/libvgl X-SVN-Commit-Revision: 346025 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 712ED86C3F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 04:54:17 -0000 Author: bde Date: Mon Apr 8 04:54:15 2019 New Revision: 346025 URL: https://svnweb.freebsd.org/changeset/base/346025 Log: Fix copying of MEMBUFs to MEMBUFs. This case was implemented by using the same code as the VIDBUF8 case, so it only worked for depths <= 8. The 2 directions for copying between VIDBUFs and MEMBUFs worked by using a Read/Write organization which makes the destination a VIDBUF so the MEMBUF case was not reached, and the VIDBUF cases have already been fixed. Fix this by removing "optimizations" for the VIDBUF8 case so that the MEMBUF case can fall through to the general (non-segmented) case. The optimizations were to duplicate code for the VIDBUF8 case so as to avoid 2 multiplications by 1 at runtime. This optimization is not useful since the multiplications are not in the inner loop. Remove the same "optimization" for the VIDBUF8S case. It was even less useful there since it duplicated more to do relatively less. Modified: head/lib/libvgl/bitmap.c Modified: head/lib/libvgl/bitmap.c ============================================================================== --- head/lib/libvgl/bitmap.c Mon Apr 8 04:07:37 2019 (r346024) +++ head/lib/libvgl/bitmap.c Mon Apr 8 04:54:15 2019 (r346025) @@ -136,16 +136,6 @@ WriteVerticalLine(VGLBitmap *dst, int x, int y, int wi } break; case VIDBUF8S: - pos = dst->VXsize * y + x; - while (width > 0) { - offset = VGLSetSegment(pos); - i = min(VGLAdpInfo.va_window_size - offset, width); - bcopy(line, dst->Bitmap + offset, i); - line += i; - pos += i; - width -= i; - } - break; case VIDBUF16S: case VIDBUF24S: case VIDBUF32S: @@ -160,11 +150,8 @@ WriteVerticalLine(VGLBitmap *dst, int x, int y, int wi width -= i; } break; - case VIDBUF8: case MEMBUF: - address = dst->Bitmap + dst->VXsize * y + x; - bcopy(line, address, width); - break; + case VIDBUF8: case VIDBUF16: case VIDBUF24: case VIDBUF32: @@ -251,16 +238,6 @@ read_planar: } break; case VIDBUF8S: - pos = src->VXsize * y + x; - while (width > 0) { - offset = VGLSetSegment(pos); - i = min(VGLAdpInfo.va_window_size - offset, width); - bcopy(src->Bitmap + offset, line, i); - line += i; - pos += i; - width -= i; - } - break; case VIDBUF16S: case VIDBUF24S: case VIDBUF32S: @@ -275,11 +252,8 @@ read_planar: width -= i; } break; - case VIDBUF8: case MEMBUF: - address = src->Bitmap + src->VXsize * y + x; - bcopy(address, line, width); - break; + case VIDBUF8: case VIDBUF16: case VIDBUF24: case VIDBUF32: From owner-svn-src-head@freebsd.org Mon Apr 8 07:57:02 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53B2F15783D6 for ; Mon, 8 Apr 2019 07:57:02 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw1-xc31.google.com (mail-yw1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CEA6D8CEB2 for ; Mon, 8 Apr 2019 07:57:01 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw1-xc31.google.com with SMTP id u197so4604582ywf.3 for ; Mon, 08 Apr 2019 00:57:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=hnLKzkcVELDs/iDYXVSSD974j3hRta/POYXccSouawg=; b=P8mN9ujJQZeN2Rtv7BdlIk6kdE7gWA5jfm9NRq6NSaBAoGztNwi/4+Ylq5axxgO4Pu WkrWkr1Av/aTxQqZ+UAfUZHfQB6GUB0hHfCvvI7DoAfoYT5aL9nOrjMrP3xwh0FrQi8E RxnjsxlMNYyeiRxnf32Nu/2dhNtIx6oulAZhwgYgvAQ3ZkoY10vnZzsq4ignxREqJ4pK xixv7XD6GXeqQ1sqRw/XQUpEaMvsgCJo/cVJEYs9Cqnja/o8SeS8cuxPbkKoLrEtxzk0 X11693QtQVv/MUeh6NOSzCB85O7bE5W3+okq5iBbfGDcYyyTKY7yLyWSjE8cCSMPDkeS bVuQ== 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=hnLKzkcVELDs/iDYXVSSD974j3hRta/POYXccSouawg=; b=k2h5hjkyx3+b5Zu1Y/uocXIbZdLRvmZ7XuwcBWfZDQAi+l3oCNNn9iun5qwsFyh5JV sWLjs6L6aHq3SnrU2eWnzNcX6Fp7VYMZ/zoV0IHqGmS+oe9oFR1bH4Q1l2C8R2srTOzi XpNtPcmjt0qgYovyaQvmjqLWShwnkMITjnOC9LwGCHiITKooRBoI5RWLsrjAvcTwTDRc /5ijC7vqs3T0TB/ihwVZVgkZMqvcZ4UX0jkbUKGS7U00rjARAp0impe4ewzko4s24Fvp 8wuZKxjsr09TPn9jbUzZEcjLmKOvf7ePIQkweSnZIXk3MWd4EhQWzjAUkcZHJH/ZnBNA /x+A== X-Gm-Message-State: APjAAAXCFJZaDvGfs5ntiBqoRQy/SxEd2F/bWU+vHixEFuh+x1cYrct9 MMXSJRQUZSSWoWqcwaB5bxP8scAW8dOZTgNerSClQrjA X-Google-Smtp-Source: APXvYqyMEtHLSi+6N/7LXtmRKr9d6Bw0UJcZT6GkDLL7XkN4Oxu4RRcDGvTeO2DOaEHC9cToJydjnVqvC1dyVuIopj4= X-Received: by 2002:a81:1393:: with SMTP id 141mr21946237ywt.140.1554710221122; Mon, 08 Apr 2019 00:57:01 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:810e:0:0:0:0:0 with HTTP; Mon, 8 Apr 2019 00:57:00 -0700 (PDT) In-Reply-To: References: <201904071839.x37IduPO002007@repo.freebsd.org> From: Oliver Pinter Date: Mon, 8 Apr 2019 09:57:00 +0200 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Warner Losh Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Rspamd-Queue-Id: CEA6D8CEB2 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.984,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 07:57:02 -0000 On Monday, April 8, 2019, Warner Losh wrote: > > > On Sun, Apr 7, 2019, 3:16 PM Oliver Pinter > wrote: > >> Please revert this patch. If I'm not wrong, this will break the >> freebsd-version command's generation or output. >> > > You are going to need to be a lot more specific about this. It makes no > sense to me at all how any of this could break that. The code is identical > logically and produces the same result. > Now I double checked, it may work, but I remembered to this "black magic" : https://github.com/freebsd/freebsd/blob/master/bin/freebsd-version/Makefile > > Warner > > > On Sunday, April 7, 2019, Warner Losh wrote: >> >>> Author: imp >>> Date: Sun Apr 7 18:39:55 2019 >>> New Revision: 346018 >>> URL: https://svnweb.freebsd.org/changeset/base/346018 >>> >>> Log: >>> Use default shell assignment rather more complicated if then >>> construct. >>> >>> Discussed with: emaste@, allanjude@ (changes (or not) based on their >>> feedback) >>> Differential Revision: https://reviews.freebsd.org/D19797 >>> >>> Modified: >>> head/sys/conf/newvers.sh >>> >>> Modified: head/sys/conf/newvers.sh >>> ============================================================ >>> ================== >>> --- head/sys/conf/newvers.sh Sun Apr 7 18:31:45 2019 (r346017) >>> +++ head/sys/conf/newvers.sh Sun Apr 7 18:39:55 2019 (r346018) >>> @@ -46,10 +46,7 @@ >>> >>> TYPE="FreeBSD" >>> REVISION="13.0" >>> -BRANCH="CURRENT" >>> -if [ -n "${BRANCH_OVERRIDE}" ]; then >>> - BRANCH=${BRANCH_OVERRIDE} >>> -fi >>> +BRANCH=${BRANCH_OVERRIDE:-CURRENT} >>> RELEASE="${REVISION}-${BRANCH}" >>> VERSION="${TYPE} ${RELEASE}" >>> >>> @@ -108,21 +105,16 @@ if [ -z "${SYSDIR}" ]; then >>> SYSDIR=$(dirname $0)/.. >>> fi >>> >>> -if [ -n "${PARAMFILE}" ]; then >>> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ >>> {print $3}' \ >>> - ${PARAMFILE}) >>> -else >>> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ >>> {print $3}' \ >>> - ${SYSDIR}/sys/param.h) >>> -fi >>> +RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ >>> + ${PARAMFILE:-${SYSDIR}/sys/param.h}) >>> >>> -b=share/examples/etc/bsd-style-copyright >>> if [ -r "${SYSDIR}/../COPYRIGHT" ]; then >>> year=$(sed -Ee '/^Copyright .* The FreeBSD >>> Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) >>> else >>> year=$(date +%Y) >>> fi >>> # look for copyright template >>> +b=share/examples/etc/bsd-style-copyright >>> for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b >>> do >>> if [ -r "$bsd_copyright" ]; then >>> @@ -150,9 +142,7 @@ COPYRIGHT="$COPYRIGHT >>> >>> # VARS_ONLY means no files should be generated, this is just being >>> # included. >>> -if [ -n "$VARS_ONLY" ]; then >>> - return 0 >>> -fi >>> +[ -n "$VARS_ONLY" ] && return 0 >>> >>> LC_ALL=C; export LC_ALL >>> if [ ! -r version ] >>> _______________________________________________ >>> 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" >>> >> From owner-svn-src-head@freebsd.org Mon Apr 8 08:35:49 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA2FD15794BA; Mon, 8 Apr 2019 08:35:48 +0000 (UTC) (envelope-from crees@freebsd.org) Received: from mail37c50.megamailservers.eu (mail161c50.megamailservers.eu [91.136.10.171]) (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 D19258E6A0; Mon, 8 Apr 2019 08:35:47 +0000 (UTC) (envelope-from crees@freebsd.org) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554712539; bh=WXF6OKlWITD5nuKjiFt640aGyRQ/M/QSxizizgrzNvM=; h=Date:From:To:CC:Subject:In-Reply-To:References:From; b=Fb0r+sB8QuGK7p81blFRcyrWZnT8tWTpb7QsejK6eTLPlxtYT15YhGnmeG39v3Fy6 DD8sGMpFVRXnHOjUfU7936DTwE0Pw/A0pe5Uuv16GVBn5Cq4Yj/mq7hkOoRey3aVb1 s9Scgmreo6hz/tLlXtk0dXzDlJk5jYF8SAMjuJTk= Feedback-ID: crees@freebsd.o Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail37c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x388ZbxH026876; Mon, 8 Apr 2019 08:35:39 +0000 Received: from www.bayofrum.net (unknown [192.168.1.70]) by pegasus.bayofrum.net (Postfix) with ESMTPA id B5360144D7; Mon, 8 Apr 2019 09:28:45 +0100 (BST) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 08 Apr 2019 09:28:45 +0100 From: Chris Rees To: Oliver Pinter CC: Warner Losh , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Warner Losh , owner-svn-src-all@freebsd.org Subject: Re: svn commit: r346018 - head/sys/conf In-Reply-To: References: <201904071839.x37IduPO002007@repo.freebsd.org> Message-ID: <839b79cfabfc63d0077895575f317570@FreeBSD.org> X-Sender: crees@FreeBSD.org User-Agent: Roundcube Webmail/1.3.7 X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: B5360144D7.A8AA5 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@freebsd.org X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B0210.5CAB07DB.007C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=P4AUeBIu c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=oexKYjalfGEA:10 a=7Qk2ozbKAAAA:8 a=ypVJL4-jAAAA:8 a=s1G7sxBSAAAA:20 a=wW0svjmTV1EgS_fDcN4A:9 a=CjuIK1q_8ugA:10 a=1lyxoWkJIXJV6VJUPhuM:22 a=khIbc0fXALFIcTpOSxgJ:22 X-Rspamd-Queue-Id: D19258E6A0 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.979,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 08:35:49 -0000 On 2019-04-08 08:57, Oliver Pinter wrote: > On Monday, April 8, 2019, Warner Losh wrote: > >> >> >> On Sun, Apr 7, 2019, 3:16 PM Oliver Pinter >> >> wrote: >> >>> Please revert this patch. If I'm not wrong, this will break the >>> freebsd-version command's generation or output. >>> >> >> You are going to need to be a lot more specific about this. It makes >> no >> sense to me at all how any of this could break that. The code is >> identical >> logically and produces the same result. >> > > Now I double checked, it may work, but I remembered to this "black > magic" : > https://github.com/freebsd/freebsd/blob/master/bin/freebsd-version/Makefile > Given it will evaluate to BRANCH=${BRANCH_OVERRIDE:-CURRENT} which unless you set BRANCH_OVERRIDE, then it will still work no problem. Chris -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Mon Apr 8 13:40:03 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FA4815805A0 for ; Mon, 8 Apr 2019 13:40:03 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3ADD771F96 for ; Mon, 8 Apr 2019 13:40:03 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x829.google.com with SMTP id p20so15363816qtc.9 for ; Mon, 08 Apr 2019 06:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=8xWAZcpRacTQHGma9t9hBVMRLslMs1aI2E9U6RNnLXg=; b=WwY3PrzUZO82mIbxF7M6CAhP97QV4oCmYTsZZa+Db9YPw6JQA7P5ozERYdQF7oTzZj fU6CtmQ+gVjJ5Y40J++5KT0tjMeCeDJ34BeJ6Fe/mBbxp5f56smipxG1NYxKv/2ZJx9B z2lkS52XmK3tOVCZPTLcQsOALvMEXxvbbqbnQPHhonpY6G/QbfshPklXA1TTY1GOCXHi +NfaB590vLjx2QboG+ZdIbiapKkvhZJ2RfxL/5QXxyivjkIjtwXIblj2WtsmhfP3QAzU 3aPZ6Ha4NCjDEn4k8Y63wx4Rl5HlZkqUPu6Z15kUZGMfu9ZyG9jicN4DjT7ioRIyQ3NN YXQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=8xWAZcpRacTQHGma9t9hBVMRLslMs1aI2E9U6RNnLXg=; b=l8XjHQPxJHKtFHlGSQ5gud4p/0qe5Xbqw6na75QPQ341oagzzlylJhtkL2XdQFiLI0 XsWNjpGidRr4jQaaDonIDpo7X+CIC7CQ7N9jZotktvXig15v6UwDQirdLyzk8ApwUVQv UBFVSikKmWytjNipo2a/+3938JqLL/dar8QhNTZYnjlZb07lpeJsdFwkERPi5741Afdl fRG50TpPMNqTQ9IWzNtaYoA1O6Mopoi3ocCGDqVqYgInrkBwtIUw9VGX2xQunFPGo5nS FRfVRzFxUf34I6MQ9VUPd4u+ryC2KM4MJLhG964SULOQMwRwY+/HU1P+dq6FtdjCrGT/ moiQ== X-Gm-Message-State: APjAAAV0krZbYrb0aaSvifjdIPAu/dgIIkVT7iL3FO6bl59uG6PoP9/j xcwidO3HWn3E6buev2J68QsgCA== X-Google-Smtp-Source: APXvYqzCGZ7EhTrx1WW/ppak5Zyjt3MafbkazWfsqLYF9g1s+hsPe8zQVhvFoqOOtfLk0Lkj4ns3ug== X-Received: by 2002:ac8:2aa7:: with SMTP id b36mr24484882qta.187.1554730802436; Mon, 08 Apr 2019 06:40:02 -0700 (PDT) Received: from mutt-hbsd ([63.88.83.108]) by smtp.gmail.com with ESMTPSA id o64sm11631748qkd.12.2019.04.08.06.40.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2019 06:40:01 -0700 (PDT) Date: Mon, 8 Apr 2019 09:39:09 -0400 From: Shawn Webb To: Mariusz Zaborski Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346023 - head/usr.bin/strings Message-ID: <20190408133909.3fu7aknjoospyqfz@mutt-hbsd> References: <201904080335.x383ZmuS086093@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7477msuys5evyyx2" Content-Disposition: inline In-Reply-To: <201904080335.x383ZmuS086093@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD r345948+db88569731b7(hardened/current/master) HARDENEDBSD-13-CURRENT amd64 X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: 3ADD771F96 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 13:40:03 -0000 --7477msuys5evyyx2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 08, 2019 at 03:35:48AM +0000, Mariusz Zaborski wrote: > Author: oshogbo > Date: Mon Apr 8 03:35:47 2019 > New Revision: 346023 > URL: https://svnweb.freebsd.org/changeset/base/346023 >=20 > Log: > strings: disable Casper support while building native-xtools Why? --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 443-546-8752 Tor+XMPP+OTR: lattera@is.a.hacker.sx GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 --7477msuys5evyyx2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAlyrTvcACgkQ/y5nonf4 4fpKqQ/+Mbn+h29IMEXXMMU3lmnmnaSLx8WeKK30Y9UcTPlQu5kn3al7LKup4EB8 +VG1z+4ksmB8iMc1P9leLGwvUOdHdfHis0t1tHSQt9j7cGEnP+FigAQd+ELj7Xsy dxftMrDcHMi+vF2KNfOjK+8TRIsHav5OLVA/X/3dQDQdn2tuFyKvzSWIlVeKlsN8 PRT+9H2+y8IGDHxVJYWWPZd1IKqEQeAHWj5G/cLwgsKooZQtbdDCjItNGUJOu0Ln ywgQvmS9IxYD5yB/LkQVa575VF7uLBTmrsVE/8Eulma3ooOaPF2rzMuWr31uDzlw s8U/ZbxntZqMZLbTdO6okPszQ31pAPQNhDWcdB0taS4w/wID0EWVedZCJYA8Q7zA MML4Rou5xWTPwPs15Vt07qaTxCtMY/QQShXKBjLPlWLVT699zzqiR/rZi4N6pZmH Gp+U+GULyJnLlaEEozTCmjqyfjoa7hGqw2n6621yjUV9FUIqkNPTvS6/dy2rWiX7 nLBrS1FalwPE908vIBXgadXNTNT0zJGEgIlZtMddUVay4CT8dSkG5KHtoQu7qoLF lvhtcCuRmPvxBvurhUIZlPTM8pfHLpnPSIsXhQxWY9dsVI36wWJ+7VbYDS3Ci/di ZfTFDSGhqhfbUHfUEiU7GvxZ4laTLaziTZv9OjniikfnqXqd5dY= =NHDw -----END PGP SIGNATURE----- --7477msuys5evyyx2-- From owner-svn-src-head@freebsd.org Mon Apr 8 13:40:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C092158060A; Mon, 8 Apr 2019 13:40:47 +0000 (UTC) (envelope-from ganbold@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D3E2972108; Mon, 8 Apr 2019 13:40:46 +0000 (UTC) (envelope-from ganbold@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF71024136; Mon, 8 Apr 2019 13:40:46 +0000 (UTC) (envelope-from ganbold@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x38DekcB000711; Mon, 8 Apr 2019 13:40:46 GMT (envelope-from ganbold@FreeBSD.org) Received: (from ganbold@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38Dek7M000710; Mon, 8 Apr 2019 13:40:46 GMT (envelope-from ganbold@FreeBSD.org) Message-Id: <201904081340.x38Dek7M000710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ganbold set sender to ganbold@FreeBSD.org using -f From: Ganbold Tsagaankhuu Date: Mon, 8 Apr 2019 13:40:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346028 - head/sys/dev/usb/net X-SVN-Group: head X-SVN-Commit-Author: ganbold X-SVN-Commit-Paths: head/sys/dev/usb/net X-SVN-Commit-Revision: 346028 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D3E2972108 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.946,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 13:40:47 -0000 Author: ganbold Date: Mon Apr 8 13:40:46 2019 New Revision: 346028 URL: https://svnweb.freebsd.org/changeset/base/346028 Log: Fix URE_WDT6_SET_MODE value in the register definition. Both linux and u-boot sources for RTL8152 driver has this value. RTL8152 USB ethernet is used in NanoPI R1 board as second ethernet. This fixes for me RTL8152 USB ethernet not detected problem after reboot on NanoPI R1 board. Both NetBSD and OpenBSD have a wrong value so far. Modified: head/sys/dev/usb/net/if_urereg.h Modified: head/sys/dev/usb/net/if_urereg.h ============================================================================== --- head/sys/dev/usb/net/if_urereg.h Mon Apr 8 11:54:45 2019 (r346027) +++ head/sys/dev/usb/net/if_urereg.h Mon Apr 8 13:40:46 2019 (r346028) @@ -176,7 +176,7 @@ #define URE_EEEP_CR_EEEP_TX 0x0002 /* PLA_WDT6_CTRL */ -#define URE_WDT6_SET_MODE 0x001 +#define URE_WDT6_SET_MODE 0x0010 /* PLA_TCR0 */ #define URE_TCR0_TX_EMPTY 0x0800 From owner-svn-src-head@freebsd.org Mon Apr 8 14:23:53 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C42AE1580F56; Mon, 8 Apr 2019 14:23:53 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 669AE732DB; Mon, 8 Apr 2019 14:23:53 +0000 (UTC) (envelope-from oshogbo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AC3624978; Mon, 8 Apr 2019 14:23:53 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x38ENrEo026140; Mon, 8 Apr 2019 14:23:53 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38ENrhe026139; Mon, 8 Apr 2019 14:23:53 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904081423.x38ENrhe026139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Mon, 8 Apr 2019 14:23:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346029 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 346029 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 669AE732DB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.946,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 14:23:53 -0000 Author: oshogbo Date: Mon Apr 8 14:23:52 2019 New Revision: 346029 URL: https://svnweb.freebsd.org/changeset/base/346029 Log: In the unlinkat syscall, the operation is performed on the directory descriptor, not the file descriptor. The file descriptor is used only for verification so do not expect any additional capabilities on it. Reported by: antoine Tested by: antoine Discussed with: kib, emaste, bapt Sponsored by: Fudo Security Modified: head/sys/kern/vfs_syscalls.c Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Mon Apr 8 13:40:46 2019 (r346028) +++ head/sys/kern/vfs_syscalls.c Mon Apr 8 14:23:52 2019 (r346029) @@ -1809,13 +1809,11 @@ kern_funlinkat(struct thread *td, int dfd, const char struct vnode *vp; struct nameidata nd; struct stat sb; - cap_rights_t rights; int error; fp = NULL; if (fd != FD_NONE) { - error = getvnode(td, fd, cap_rights_init(&rights, CAP_LOOKUP), - &fp); + error = getvnode(td, fd, &cap_no_rights, &fp); if (error != 0) return (error); } From owner-svn-src-head@freebsd.org Mon Apr 8 14:27:23 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDFA21581053 for ; Mon, 8 Apr 2019 14:27:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 78540734BC for ; Mon, 8 Apr 2019 14:27:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82d.google.com with SMTP id w30so15598606qta.8 for ; Mon, 08 Apr 2019 07:27:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iY2Dw+Hy7+xwMmaZWbydHw/SSV7seMW+eXIRCOkx+WY=; b=jOlAD3Ltruf+PVzRFkmj25E4cnJ2GSQ7hnRiZmKk3DYM2ibD87XWam0EcQqi0Garmg Ohnrnu9kpJ3rQkO2jk9LiJT8pPL2Otkpq1PPnaNXrE0KHrADrFMYZq5Rr+ZA6E2TpeUh CjrRzeTB/6BjM64BM5yTKx9ZZcwBfXN6RYCcUblMsRhDiCMCM/WhntdiYrwhdgaypLdV REvPyzAwalnBafsfmvXJQ9Iw6KBusI8QAFlvl/zQPijt8QVDGFhCfbm4QPgEsHbsMyXC hduIAeS2zv4SgyGqw9nXEHopZu41wurqFzE/2NOdQDeGMXMhyc3Et2CqCvvbtZBT5d1y tpOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iY2Dw+Hy7+xwMmaZWbydHw/SSV7seMW+eXIRCOkx+WY=; b=TOYqtGQGJKsjg+fikXHrMSbezUrRYjIUGFShInkdGmLH0SYVOGIOR5e7ND14VkUvl2 C5G5WjWq/WPDbKGtDiBcTAXS96oABwFYZS8rs5EzU948sh0m9iZeFhkkurtOZkhcZ9Wa GETK8b5kj0uL368TiY2hPaxLIzajlUh42M04f3Q5aEXp7xMUXcb6CdmvOaRyLGX5Tt1Q OWyBpg8e9QjMUM84EtjhYEQhAcYDpkwszNLgxOfxeNNEbYdeBPR9ql3fjdXzbHyo5ZN1 lZkbUCQDDsKCEYDy+6gnr2b0i24DF+2yGebZ3TEXIyXh6ivD7kE3wPPb39ulNdZIkK7g J8Iw== X-Gm-Message-State: APjAAAXtNIC31iwBSs34uPmb0mY32M95wBBTiyGqrvU9RQLDUvQ1omNG iCO5wLjNKXNWGAvhhwMW6B9Ndq7nXSnW1vG+Zqjkfw== X-Google-Smtp-Source: APXvYqzfuMa5wYTYvZLY2e56xINxp8Svcd6WUo5l/HKWeAABFT9m5dZCt6C+lYqjqzNczlAIFqVrf62/t5dqX/gWrOI= X-Received: by 2002:a0c:9922:: with SMTP id h31mr23257917qvd.137.1554733641731; Mon, 08 Apr 2019 07:27:21 -0700 (PDT) MIME-Version: 1.0 References: <201904071839.x37IduPO002007@repo.freebsd.org> <839b79cfabfc63d0077895575f317570@FreeBSD.org> In-Reply-To: <839b79cfabfc63d0077895575f317570@FreeBSD.org> From: Warner Losh Date: Mon, 8 Apr 2019 08:27:09 -0600 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Chris Rees Cc: Oliver Pinter , svn-src-head , svn-src-all@freebsd.org, src-committers , Warner Losh , owner-svn-src-all@freebsd.org X-Rspamd-Queue-Id: 78540734BC X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.92 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.92)[-0.919,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 14:27:23 -0000 On Mon, Apr 8, 2019, 2:35 AM Chris Rees wrote: > On 2019-04-08 08:57, Oliver Pinter wrote: > > On Monday, April 8, 2019, Warner Losh wrote: > > > >> > >> > >> On Sun, Apr 7, 2019, 3:16 PM Oliver Pinter > >> > >> wrote: > >> > >>> Please revert this patch. If I'm not wrong, this will break the > >>> freebsd-version command's generation or output. > >>> > >> > >> You are going to need to be a lot more specific about this. It makes > >> no > >> sense to me at all how any of this could break that. The code is > >> identical > >> logically and produces the same result. > >> > > > > Now I double checked, it may work, but I remembered to this "black > > magic" : > > > https://github.com/freebsd/freebsd/blob/master/bin/freebsd-version/Makefile > > > > Given it will evaluate to > > BRANCH=${BRANCH_OVERRIDE:-CURRENT} > > which unless you set BRANCH_OVERRIDE, then it will still work no > problem. > And if you set that, it will still work. :) However, this should be converted to VARS_ONLY. I'll do that. I've already done and, so will now grep the whole tree for similar constructs. Warner Chris > > -- > This message has been scanned for viruses and > dangerous content by MailScanner, and is > believed to be clean. > > From owner-svn-src-head@freebsd.org Mon Apr 8 14:31:09 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6F5B1581198; Mon, 8 Apr 2019 14:31:08 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5873F73713; Mon, 8 Apr 2019 14:31:08 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3365C249AA; Mon, 8 Apr 2019 14:31:08 +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 x38EV8sZ027222; Mon, 8 Apr 2019 14:31:08 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38EV8Mj027221; Mon, 8 Apr 2019 14:31:08 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904081431.x38EV8Mj027221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 8 Apr 2019 14:31:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346030 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 346030 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5873F73713 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 14:31:09 -0000 Author: trasz Date: Mon Apr 8 14:31:07 2019 New Revision: 346030 URL: https://svnweb.freebsd.org/changeset/base/346030 Log: Refactor ELF interpreter loading into a separate function. Reviewed by: kib MFC after: 2 weeks Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D19741 Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Mon Apr 8 14:23:52 2019 (r346029) +++ head/sys/kern/imgact_elf.c Mon Apr 8 14:31:07 2019 (r346030) @@ -945,6 +945,41 @@ __elfN(get_interp)(struct image_params *imgp, const El return (0); } +static int +__elfN(load_interp)(struct image_params *imgp, const Elf_Brandinfo *brand_info, + const char *interp, u_long *addr, u_long *entry) +{ + char *path; + int error; + + if (brand_info->emul_path != NULL && + brand_info->emul_path[0] != '\0') { + path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + snprintf(path, MAXPATHLEN, "%s%s", + brand_info->emul_path, interp); + error = __elfN(load_file)(imgp->proc, path, addr, entry); + free(path, M_TEMP); + if (error == 0) + return (0); + } + + if (brand_info->interp_newpath != NULL && + (brand_info->interp_path == NULL || + strcmp(interp, brand_info->interp_path) == 0)) { + error = __elfN(load_file)(imgp->proc, + brand_info->interp_newpath, addr, entry); + if (error == 0) + return (0); + } + + error = __elfN(load_file)(imgp->proc, interp, addr, entry); + if (error == 0) + return (0); + + uprintf("ELF interpreter %s not found, error %d\n", interp, error); + return (error); +} + /* * Impossible et_dyn_addr initial value indicating that the real base * must be calculated later with some randomization applied. @@ -960,8 +995,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i Elf_Auxargs *elf_auxargs; struct vmspace *vmspace; vm_map_t map; - const char *newinterp; - char *interp, *path; + char *interp; Elf_Brandinfo *brand_info; struct sysentvec *sv; vm_prot_t prot; @@ -970,7 +1004,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i uint32_t fctl0; int32_t osrel; bool free_interp; - int error, i, n, have_interp; + int error, i, n; hdr = (const Elf_Ehdr *)imgp->image_header; @@ -1006,7 +1040,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i osrel = 0; fctl0 = 0; entry = proghdr = 0; - newinterp = interp = NULL; + interp = NULL; free_interp = false; td = curthread; maxalign = PAGE_SIZE; @@ -1074,8 +1108,6 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i et_dyn_addr = ET_DYN_LOAD_ADDR; } } - if (interp != NULL && brand_info->interp_newpath != NULL) - newinterp = brand_info->interp_newpath; /* * Avoid a possible deadlock if the current address space is destroyed @@ -1200,7 +1232,6 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i imgp->entry_addr = entry; if (interp != NULL) { - have_interp = FALSE; VOP_UNLOCK(imgp->vp, 0); if ((map->flags & MAP_ASLR) != 0) { /* Assume that interpeter fits into 1/4 of AS */ @@ -1209,35 +1240,11 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i addr = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1, PAGE_SIZE); } - if (brand_info->emul_path != NULL && - brand_info->emul_path[0] != '\0') { - path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - snprintf(path, MAXPATHLEN, "%s%s", - brand_info->emul_path, interp); - error = __elfN(load_file)(imgp->proc, path, &addr, - &imgp->entry_addr); - free(path, M_TEMP); - if (error == 0) - have_interp = TRUE; - } - if (!have_interp && newinterp != NULL && - (brand_info->interp_path == NULL || - strcmp(interp, brand_info->interp_path) == 0)) { - error = __elfN(load_file)(imgp->proc, newinterp, &addr, - &imgp->entry_addr); - if (error == 0) - have_interp = TRUE; - } - if (!have_interp) { - error = __elfN(load_file)(imgp->proc, interp, &addr, - &imgp->entry_addr); - } + error = __elfN(load_interp)(imgp, brand_info, interp, &addr, + &imgp->entry_addr); vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); - if (error != 0) { - uprintf("ELF interpreter %s not found, error %d\n", - interp, error); + if (error != 0) goto ret; - } } else addr = et_dyn_addr; From owner-svn-src-head@freebsd.org Mon Apr 8 15:20:07 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB0911531810; Mon, 8 Apr 2019 15:20:06 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61DBE75947; Mon, 8 Apr 2019 15:20:06 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FA4A251FD; Mon, 8 Apr 2019 15:20:06 +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 x38FK6aY052743; Mon, 8 Apr 2019 15:20:06 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38FK6UA052742; Mon, 8 Apr 2019 15:20:06 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904081520.x38FK6UA052742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 8 Apr 2019 15:20:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346031 - head/sys/ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/ufs/ffs X-SVN-Commit-Revision: 346031 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 61DBE75947 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 15:20:07 -0000 Author: kib Date: Mon Apr 8 15:20:05 2019 New Revision: 346031 URL: https://svnweb.freebsd.org/changeset/base/346031 Log: Handle races when remounting UFS volume from ro to rw. In particular, ensure that writers are not unleashed before SU structures are initialized. Also, correctly handle MNT_ASYNC before this. Reported and tested by: pho Reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/ufs/ffs/ffs_vfsops.c Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Mon Apr 8 14:31:07 2019 (r346030) +++ head/sys/ufs/ffs/ffs_vfsops.c Mon Apr 8 15:20:05 2019 (r346031) @@ -154,7 +154,7 @@ ffs_mount(struct mount *mp) struct fs *fs; pid_t fsckpid = 0; int error, error1, flags; - uint64_t mntorflags; + uint64_t mntorflags, saved_mnt_flag; accmode_t accmode; struct nameidata ndp; char *fspec; @@ -371,25 +371,40 @@ ffs_mount(struct mount *mp) return (error); if ((error = vn_start_write(NULL, &mp, V_WAIT)) != 0) return (error); + error = vfs_write_suspend_umnt(mp); + if (error != 0) + return (error); fs->fs_ronly = 0; MNT_ILOCK(mp); - mp->mnt_flag &= ~MNT_RDONLY; + saved_mnt_flag = MNT_RDONLY; + if (MOUNTEDSOFTDEP(mp) && (mp->mnt_flag & + MNT_ASYNC) != 0) + saved_mnt_flag |= MNT_ASYNC; + mp->mnt_flag &= ~saved_mnt_flag; MNT_IUNLOCK(mp); fs->fs_mtime = time_second; /* check to see if we need to start softdep */ if ((fs->fs_flags & FS_DOSOFTDEP) && (error = softdep_mount(devvp, mp, fs, td->td_ucred))){ - vn_finished_write(mp); + fs->fs_ronly = 1; + MNT_ILOCK(mp); + mp->mnt_flag |= saved_mnt_flag; + MNT_IUNLOCK(mp); + vfs_write_resume(mp, 0); return (error); } fs->fs_clean = 0; if ((error = ffs_sbupdate(ump, MNT_WAIT, 0)) != 0) { - vn_finished_write(mp); + fs->fs_ronly = 1; + MNT_ILOCK(mp); + mp->mnt_flag |= saved_mnt_flag; + MNT_IUNLOCK(mp); + vfs_write_resume(mp, 0); return (error); } if (fs->fs_snapinum[0] != 0) ffs_snapshot_mount(mp); - vn_finished_write(mp); + vfs_write_resume(mp, 0); } /* * Soft updates is incompatible with "async", From owner-svn-src-head@freebsd.org Mon Apr 8 15:54:16 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25E871551DB3 for ; Mon, 8 Apr 2019 15:54:16 +0000 (UTC) (envelope-from jiashiun@gmail.com) Received: from mail-vk1-xa2d.google.com (mail-vk1-xa2d.google.com [IPv6:2607:f8b0:4864:20::a2d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B650E77174; Mon, 8 Apr 2019 15:54:15 +0000 (UTC) (envelope-from jiashiun@gmail.com) Received: by mail-vk1-xa2d.google.com with SMTP id h127so3128624vkd.12; Mon, 08 Apr 2019 08:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yqKG41x2Csh51cFLyW1db6PfJxMebd4YTd2IfwfGCSo=; b=fDxv+UNRPeKG9bMoVaXMzjKiWjk9If9uqIboGpbgkuCiAqIgft36KkNHtZ52607/p8 ahGls19mnTZEWKi9ZvmaMjiaEDYaJ2RmOgGCKZwKPm7rq0zihKW8fSInnTs0vWfzu164 zGFQzrlVZajplK7ovA8mCZoETiOLkb7/ON41sM6mgPIm81RCMViEixiPXt7zaHg2KaBy v5E7HO7au37qOiGdhH+Bxq5g+ofQ/qHia3m0c5EzPW3+tz+WGzW23Pb3l6oHil3ws/lC Q+la8WplCPwiEvclA6KVvXMiANYgEcEuKS5zDqqsJzf4ypQTEh9xWY3gutUC+LqlNLm0 5cRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yqKG41x2Csh51cFLyW1db6PfJxMebd4YTd2IfwfGCSo=; b=tEnT7O64oM71jl0v5U4Qz7QdUEjgycCqucm644jAMXrH0SOk8+YcYUnlWhloOwUUTz HEaP6hUYETVCvIShv3P048X+ptv1cg7Keo3+vt21NPupkg1kwGdSqde3ELcKoHQabr5Q mXDHvOTO87W5XqUD6Se2C+XqzoR/xaUUCCvlRaBsB1V69oBlRVGYGDWDiJCfIFdcUyEh 6N5gj9GTzkG4aH2CJ+Rbb6167gDoATUqcyMOD1hhoDzHiDf8ZGBaa+3zbHhfwZO9xfAv tqKkpFzBQ5v6oSzoidgRzbhSSMnBiJNVDCYXXU5xYxQmOIIP63nIcqo4RA3dWwrpA2B3 fyGg== X-Gm-Message-State: APjAAAWwH0CRSj41f3VufmSm0LOF0wDcwG15OsO7ERkfsz+XTN4Te+Mk HfqVes85SYYRxVd8zWql4VKIHejdwZYUAGEGZ5FJ+3Em X-Google-Smtp-Source: APXvYqxY5t2I2/YuCUCVKiT2Pz5tyWv/eucDjCTsvB5thCNg79Vg7mCDZKSQ5qngHGu4Maib+FXX9+iCnriQsXDNBpA= X-Received: by 2002:a1f:bcf:: with SMTP id 198mr6211879vkl.35.1554738854530; Mon, 08 Apr 2019 08:54:14 -0700 (PDT) MIME-Version: 1.0 References: <201903241911.x2OJBj6x024102@repo.freebsd.org> <832a6f77ed5e48687ba2b265c1cbb37f7d624ead.camel@freebsd.org> In-Reply-To: <832a6f77ed5e48687ba2b265c1cbb37f7d624ead.camel@freebsd.org> From: Jia-Shiun Li Date: Mon, 8 Apr 2019 23:53:49 +0800 Message-ID: Subject: Re: svn commit: r345480 - in head/sys: conf geom geom/label To: Ian Lepore Cc: svn-src-head@freebsd.org X-Rspamd-Queue-Id: B650E77174 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 15:54:16 -0000 On Mon, Apr 8, 2019 at 12:34 AM Ian Lepore wrote: > Oops, sorry abou that, I forgot to add the new source file to the > module makefile. Should be fixed with r346013. > > Tested on r346022 and it is back to normal. Thanks, Jia-Shiun. From owner-svn-src-head@freebsd.org Mon Apr 8 18:00:17 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 826D315636A7; Mon, 8 Apr 2019 18:00:17 +0000 (UTC) (envelope-from ml+freebsd@vishwin.info) Received: from varun.vishwin.info (varun.vishwin.info [46.101.93.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "varun.vishwin.info", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B278184057; Mon, 8 Apr 2019 18:00:16 +0000 (UTC) (envelope-from ml+freebsd@vishwin.info) Received: from varun.vishwin.info (fd35:9eae:7575::2 [IPv6:fd35:9eae:7575::2]) by varun.vishwin.info (OpenSMTPD) with ESMTP id 2b8d673f; Mon, 8 Apr 2019 14:00:11 -0400 (EDT) Received: from [IPv6:2001:470:8:6ca:cad7:19ff:fec0:a06d] (2001:470:8:6ca:cad7:19ff:fec0:a06d [IPv6:2001:470:8:6ca:cad7:19ff:fec0:a06d]) by varun.vishwin.info (OpenSMTPD) with ESMTPSA id 831f6795 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO; Mon, 8 Apr 2019 14:00:11 -0400 (EDT) Subject: Re: svn commit: r346023 - head/usr.bin/strings To: Shawn Webb Cc: Mariusz Zaborski , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org References: <201904080335.x383ZmuS086093@repo.freebsd.org> <20190408133909.3fu7aknjoospyqfz@mutt-hbsd> From: Charlie Li Openpgp: preference=signencrypt Autocrypt: addr=ml+freebsd@vishwin.info; keydata= mQINBFt7iHUBEADCorTixbMGuHd9WYSKCELlv/TFcRtvpHUw/n9LtXzKixUUwl7iuMFMYTz3 QXePX0Twq4jCQYySfcxWbPkLsSYlPOkaGQ+XytfmIHoqG5ba4i1fp+F41is0oCtLt1+oL84j NKUd13em/JWd+PJeQbSTVnHbT2yaAi7vqWw5WKVaMExjfPGU5TArV46wSRU6Zuy1ZX66q0q5 dPzeBdeKYWJE8aGtyi3pYUpKUOX4gxiNetf6leDFZ4OsexWaRdU0n8fId5d1qwjAE3lOwV5z 0Ilt8t4iXtX3JL3DAQyLZIeXHIg9O3rrpPMXQWSp2/5g39PohNk7farbhcpIKxuDN+L5N6U9 OxNHBSCv9FGDO4R/mw3YwJCovDzsF7RSyXQDIY36yjdh2uTLZ0uD5Ci/DPmJUySFLRvpqWnQ M7V5cYhdqDfcElGpRbi8JZQVYRJjvI5Jj0byG98KeaD0YFxKqmmm+Oh+xWXE7xt/DsBoZeZJ BFP84LvFbwQqprvI+sg+1z2+JIgNbYwl8VaYzfyGnqTEXTOsQYEKTdKA9MODSAsN31MlQICe CIHZV+OwOqH1KQ/mZp59AnpXAmj4T94bnahE9yJtVW/qglX/nTeFNUdu5MyEgkeB0x7mx+t0 3hE20yp/NbyvG1T/o53NHwHiURC/8Fxd1NWPZ6n4X8npQn6iyQARAQABtC5DaGFybGllIExp IChGcmVlQlNEKSA8bWwrZnJlZWJzZEB2aXNod2luLmluZm8+iQJOBBMBCAA4FiEE/3/Cqr5a +41PbEb+jnB43vIDq2wFAlt7iwoCGyMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQjnB4 3vIDq2zlBQ/7Boe3K9i4pxvIlBWlFDmDuclLiju/LTsc81mO607TIwUMx5p3BfnhqTwqpcuT Gilj2JKSlIw0NioJ3HnPiPyIpMmOmdeLBwvBn8iBmjs14DdDMgKusE8gKc0KRFbTM397rB7K oXj2/R8VF3Uuo8i3vlWyah6p+Osz1dAad/7COqPeM9OBMKaYAOrdKvxMC96l5k+Wc1JKOLeA BP7BtgmQB7HydHUm+dzqUB1rgMP2djIXd5Ngc749kzNQIFvC9ZXbaABw5M4JqKRbVFm08Wgw IUyhkNEtMpkBxMPwqXsk3t1KVptYQSAfW/+8mWDP2sgUOyz9O2IBfb1acCPk04/jf8SsXRaT HzJr64NseWlZUHAMYl9EC09gdE6UDCIHR68+IzutMtgT17Djuu1HRYly+RWAGkyTOeR7Sv/V 2B89Nsq5OfHYs3F2vD57/aRj5TmZJDQWxH/rDYbj8Pk6UjXcaY6QWUtNFidvCMFlBpXuncXU ZWgTsJEyZLHP5SJ7S9sRSHU5+CVUkjsbEFNuHkkGHAkSnpP+HosnH8/q9Rykn9FTamLbiQRQ UxJ6+IlqvOUtRRrMGMBF7ZIFGHcl8tcKynsPTeaHjpqPhCrZx8PmCKKoJHwW4Ua7+cdZkBJq R20qvXuLIrInjkIpA1CbacMckS5a7el6pi/nU0NG1S1K4Zu5Ag0EW3uIdQEQANdl7YHG8JOy HbEYv+7ExSrO96qBRavg1FsDG0riDmlsOSfZ2fqL6/YJF5WsfsX99+YSdIiLQfC4QOw/cA+M I65pgY4cCu42L7YIW/AR+jB1hFg+Q/cbeOwjuKPFYtZvxeDpSsaA6iIR+p+t4DXkjWl86g6W aFLC+til/rCilFHY/1/6M918F1gm/6xCIADDFu0BXLkASc5B4LuvaFEiJIuI9ZoQDIgWxnsX 0tXXE36SwK/XrowzRzsOa+2iOHAPKu7rPGHwy28vO4T5Uq7UynMZG2sK3RTbOijaxL4IJF4W MRqpuGdBSJ4sWmr5aIpgX9au5L1TNAAILJpHXnkv+k825+9VgbhFtFYBHEkgUtXb+w34JnkH okpr9A78dpWb+T+jOEP6ZUgM+4VVy+hCCpbcCVI2PEXu8w2z3+4yZWxIFmy8UYZRoeTMKzV2 zLeisoA0XA8jj548YNPiAl20Mjyoqu42WNv0P8fD9PMTcfLFCj2PlxOhuUFaIUH3ty0/bNeS jPtVK+L9x4W37R7U1tYk+tB5MlPakQiSQtdToB+8K34rnBt/3kCoAYL7Hygw9+qyZrEKZDtP 5JKekfgsy28t1z66xWCUwq9PHuUFiij3cjbwIbskI9uy2+xITcXt4ZqVfpZcdGmjfbdTPkGf PH2pjDoCJaezYdbha/3OVhmVABEBAAGJAjYEGAEIACAWIQT/f8Kqvlr7jU9sRv6OcHje8gOr bAUCW3uIdQIbDAAKCRCOcHje8gOrbExnD/9qwSL4HiorJmUEJ+5CTh8IJql4PzeQK8Dx93gi Zs5jWVlCJTmcpQNirWIZM2eRt67C/wTJjLmEVGzySVLpGiUqhXqdROgFmDwvEnmpIbtWWyvG sgSOCmZj/tz0GEtLSsjJcV/kLffkv7XEKkt9ZjIJnFYVYSovDK1o2PoO6Rfi5AWHHB7jYhjS HJvJjDx0yClO9gEYhtw7R60YOLH+cKoDou9tu+4wR3QwRsNGO6wrzLGhptxuBrDMI+HuOx+j wBTliuzuvZrry6OdKDDdq5D4vvQCj4vFnK4p7LZXhBshCMoLkWoA0I2T+YF/V5Ob5EuvsTIC re/pO/g941ipVkehvVNAsiplSaHjasB1HS6BQ95csI8E/b6PnKm+IECp2bANbLP1jrxKeBGj UkeyRxTmOV/ADUIIj8S4a2yOxTxlysN2O5wqXCJcxaYelC/Y4TUcL6ENxn2dLBdCYKQEna0u DdxZp7fS+pXN6qyK8Qz6Q42MHAxFAZdLKf6a44d4HQt6rPcWdETVlnVKnJr0b9kg5K1Q8N4k PVoTGVrkGAZhmjFYsqWulq445VU46mX7WcqsrZx8LqNTwP6i3Bf71FJ9EBxTyA8fP8k0qosP 8U8D7jhcc5x4yVW8RBBtB+a5q3odWdFnjMLEm4wtxBH/mSN/UKRcFSBvKQ8FxTgpX4Yxcw== Organization: FreeBSD Message-ID: <216f4d89-8af8-cfee-207c-afd526ca70b3@vishwin.info> Date: Mon, 8 Apr 2019 14:00:04 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190408133909.3fu7aknjoospyqfz@mutt-hbsd> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="e9Zgbp4O9wN5wNIhfl86O9RSNIvKI0qkG" X-Rspamd-Queue-Id: B278184057 X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[freebsd]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 18:00:17 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --e9Zgbp4O9wN5wNIhfl86O9RSNIvKI0qkG Content-Type: multipart/mixed; boundary="k6YiD4SNVQ7TFfkS3ic9FhzSysBIvfa9X"; protected-headers="v1" From: Charlie Li To: Shawn Webb Cc: Mariusz Zaborski , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Message-ID: <216f4d89-8af8-cfee-207c-afd526ca70b3@vishwin.info> Subject: Re: svn commit: r346023 - head/usr.bin/strings References: <201904080335.x383ZmuS086093@repo.freebsd.org> <20190408133909.3fu7aknjoospyqfz@mutt-hbsd> In-Reply-To: <20190408133909.3fu7aknjoospyqfz@mutt-hbsd> --k6YiD4SNVQ7TFfkS3ic9FhzSysBIvfa9X Content-Type: text/plain; charset=utf-8 Content-Language: en-GB-large Content-Transfer-Encoding: quoted-printable Shawn Webb wrote: > On Mon, Apr 08, 2019 at 03:35:48AM +0000, Mariusz Zaborski wrote: >> Author: oshogbo >> Date: Mon Apr 8 03:35:47 2019 >> New Revision: 346023 >> URL: https://svnweb.freebsd.org/changeset/base/346023 >> >> Log: >> strings: disable Casper support while building native-xtools >=20 > Why? >=20 Discussed in previous thread. Capsicum is not part of the native-xtools build, so linking fails. This is regardless of both the host and target architectures. Example: --- all_subdir_usr.bin/strings --- Building /usr/obj/usr/local/poudriere/jails/aarch64-current/usr/src/amd64.amd64/nx= b/arm64.aarch64/usr.bin/strings/strings --- strings --- ld: error: unable to find library -lcasper ld: error: unable to find library -lcap_fileargs cc: error: linker command failed with exit code 1 (use -v to see invocati= on) *** [strings] Error code 1 make[4]: stopped in /usr/local/poudriere/jails/aarch64-current/usr/src/usr.bin/strings --=20 Charlie Li =E2=80=A6nope, still don't have an exit line. (This email address is for mailing list use; replace local-part with vishwin for off-list communication if possible) --k6YiD4SNVQ7TFfkS3ic9FhzSysBIvfa9X-- --e9Zgbp4O9wN5wNIhfl86O9RSNIvKI0qkG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE/3/Cqr5a+41PbEb+jnB43vIDq2wFAlyrjCQACgkQjnB43vID q2yPCRAAghOYFQCEgB8w68T2Mt0ulJ2fSOSsIe+RQ1gSA0dG+omAVwPneTNKb5i+ +N4p4P3LzTrT+noNlOFAsZybAGP5rfyp00fRU/n4NHhV5lf2KVbAfYAlzqPAsHvv Q+gW6DPcllc8C/jCZr+nq9c0cXUdMA6U3m4bYck9MBaKT8sr0kVPx7KnkiRkEGIY a7aITfuSBZf92uXW55/ze+CltdCSJmgQG1CvaF1aT2aq0jC4Vm9hAi6XYlsKP4gf FKavTD49Em95hcRf/R3mvhHIVb38XCB7TgFJmn0ZlOn6O1rUg1J6+OAWim+RnhIa mCjnwcgxbH1LJ7KEv9UpTmiBorKOB0y3kKVxPXsrhwmCEDWDeZDBEXyPHEe3to2/ 7xHrJsU95Go3FPglxbYAUFTk7HYC1WYAhAqEzNUNxgb2V5mN6/N7gCpmvqhbgvF0 o0v+8u4fddHBywMibtUqif5KbDZ4eS/aVg0be2jIaPAeGnzM0blE/NK8E4kW9/g/ SbjNpXiw1oY14PJIIYdKVGmhGOeBZg55CsADrom29pOtpQ4R7EsGEd0TVyRIQrJX L+fIURMbSMAej7KZ+esbSE1KbMlGzdNrxoLmjWvjS1475mE88210j91NasXlQbDD 0byubi03PwXyh+LZ2SPIbQEUSrnjw7oO0Zto6+ldxQjTEn8px00= =yIKd -----END PGP SIGNATURE----- --e9Zgbp4O9wN5wNIhfl86O9RSNIvKI0qkG-- From owner-svn-src-head@freebsd.org Mon Apr 8 18:16:50 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C728515642CE; Mon, 8 Apr 2019 18:16:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6984C85161; Mon, 8 Apr 2019 18:16:50 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42BA927101; Mon, 8 Apr 2019 18:16:50 +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 x38IGoc0049302; Mon, 8 Apr 2019 18:16:50 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38IGopn049301; Mon, 8 Apr 2019 18:16:50 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904081816.x38IGopn049301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 8 Apr 2019 18:16:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346038 - head/sbin/mount X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sbin/mount X-SVN-Commit-Revision: 346038 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6984C85161 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 18:16:51 -0000 Author: kib Date: Mon Apr 8 18:16:49 2019 New Revision: 346038 URL: https://svnweb.freebsd.org/changeset/base/346038 Log: Exercise some care before sending SIGHUP to mountd. Reviewed by: antoine, emaste, oshogbo Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D19847 Modified: head/sbin/mount/mount.c Modified: head/sbin/mount/mount.c ============================================================================== --- head/sbin/mount/mount.c Mon Apr 8 18:15:10 2019 (r346037) +++ head/sbin/mount/mount.c Mon Apr 8 18:16:49 2019 (r346038) @@ -227,6 +227,7 @@ restart_mountd(void) struct pidfh *pfh; pid_t mountdpid; + mountdpid = 0; pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &mountdpid); if (pfh != NULL) { /* Mountd is not running. */ @@ -237,6 +238,16 @@ restart_mountd(void) /* Cannot open pidfile for some reason. */ return; } + + /* + * Refuse to send broadcast or group signals, this has + * happened due to the bugs in pidfile(3). + */ + if (mountdpid <= 0) { + warnx("mountd pid %d, refusing to send SIGHUP", mountdpid); + return; + } + /* We have mountd(8) PID in mountdpid varible, let's signal it. */ if (kill(mountdpid, SIGHUP) == -1) err(1, "signal mountd"); From owner-svn-src-head@freebsd.org Mon Apr 8 18:25:15 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BA9015645B1; Mon, 8 Apr 2019 18:25:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2E50C85625; Mon, 8 Apr 2019 18:25:15 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 133A0272B0; Mon, 8 Apr 2019 18:25:15 +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 x38IPEBe054312; Mon, 8 Apr 2019 18:25:14 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38IPEpV054311; Mon, 8 Apr 2019 18:25:14 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201904081825.x38IPEpV054311@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 8 Apr 2019 18:25:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346039 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 346039 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2E50C85625 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 18:25:15 -0000 Author: imp Date: Mon Apr 8 18:25:14 2019 New Revision: 346039 URL: https://svnweb.freebsd.org/changeset/base/346039 Log: Style only change: Prefer $() to `` $() is more modern and also nests. Convert the mix of styles to using only the former (although the latter was more common). It's the more dominant style in other shell scripts these days as well. Differential Revision: https://reviews.freebsd.org/D19840 Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Mon Apr 8 18:16:49 2019 (r346038) +++ head/sys/conf/newvers.sh Mon Apr 8 18:25:14 2019 (r346039) @@ -120,12 +120,12 @@ b=share/examples/etc/bsd-style-copyright for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b do if [ -r "$bsd_copyright" ]; then - COPYRIGHT=`sed \ + COPYRIGHT=$(sed \ -e "s/\[year\]/1992-$year/" \ -e 's/\[your name here\]\.* /The FreeBSD Project./' \ -e 's/\[your name\]\.*/The FreeBSD Project./' \ -e '/\[id for your version control system, if any\]/d' \ - $bsd_copyright` + $bsd_copyright) break fi done @@ -153,19 +153,19 @@ then fi touch version -v=`cat version` +v=$(cat version) u=${USER:-root} -d=`pwd` -h=${HOSTNAME:-`hostname`} +d=$(pwd) +h=${HOSTNAME:-$(hostname)} if [ -n "$SOURCE_DATE_EPOCH" ]; then - if ! t=`date -r $SOURCE_DATE_EPOCH 2>/dev/null`; then + if ! t=$(date -r $SOURCE_DATE_EPOCH 2>/dev/null); then echo "Invalid SOURCE_DATE_EPOCH" >&2 exit 1 fi else - t=`date` + t=$(date) fi -i=`${MAKE:-make} -V KERN_IDENT` +i=$(${MAKE:-make} -V KERN_IDENT) compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep -w 'version') for dir in /usr/bin /usr/local/bin; do @@ -212,7 +212,7 @@ if findvcs .hg; then fi if [ -n "$svnversion" ] ; then - svn=`cd ${SYSDIR} && $svnversion 2>/dev/null` + svn=$(cd ${SYSDIR} && $svnversion 2>/dev/null) case "$svn" in [0-9]*[MSP]|*:*) svn=" r${svn}" @@ -228,8 +228,8 @@ if [ -n "$svnversion" ] ; then fi if [ -n "$git_cmd" ] ; then - git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null` - gitsvn=`$git_cmd svn find-rev $git 2>/dev/null` + git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null) + gitsvn=$($git_cmd svn find-rev $git 2>/dev/null) if [ -n "$gitsvn" ] ; then svn=" r${gitsvn}" git="=${git}" @@ -238,13 +238,13 @@ if [ -n "$git_cmd" ] ; then # We assume that if a tree is more than 10k commits out-of-sync # with FreeBSD, it has forked the the OS and the SVN rev no # longer matters. - gitsvn=`$git_cmd log -n 10000 | + gitsvn=$($git_cmd log -n 10000 | grep '^ git-svn-id:' | head -1 | \ - sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'` + sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p') if [ -z "$gitsvn" ] ; then - gitsvn=`$git_cmd log -n 10000 --format='format:%N' | \ + gitsvn=$($git_cmd log -n 10000 --format='format:%N' | \ grep '^svn ' | head -1 | \ - sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p'` + sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p') fi if [ -n "$gitsvn" ] ; then svn=" r${gitsvn}" @@ -253,7 +253,7 @@ if [ -n "$git_cmd" ] ; then git=" ${git}" fi fi - git_b=`$git_cmd rev-parse --abbrev-ref HEAD` + git_b=$($git_cmd rev-parse --abbrev-ref HEAD) if [ -n "$git_b" ] ; then git="${git}(${git_b})" fi @@ -264,9 +264,9 @@ if [ -n "$git_cmd" ] ; then fi if [ -n "$hg_cmd" ] ; then - hg=`$hg_cmd id 2>/dev/null` - hgsvn=`$hg_cmd svn info 2>/dev/null | \ - awk -F': ' '/Revision/ { print $2 }'` + hg=$($hg_cmd id 2>/dev/null) + hgsvn=$($hg_cmd svn info 2>/dev/null | \ + awk -F': ' '/Revision/ { print $2 }') if [ -n "$hgsvn" ] ; then svn=" r${hgsvn}" fi From owner-svn-src-head@freebsd.org Mon Apr 8 21:55:53 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7366A156A650; Mon, 8 Apr 2019 21:55:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D1A968DE7D; Mon, 8 Apr 2019 21:55:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id C84416B6C; Mon, 8 Apr 2019 21:55:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r345970 - head/libexec/rc To: rgrimes@freebsd.org, Eugene Grosbein Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904052316.x35NGOSc041939@gndrsh.dnsmgr.net> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <37993f01-f14f-9d31-2c3e-f7b96473c39e@FreeBSD.org> Date: Mon, 8 Apr 2019 14:55:49 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904052316.x35NGOSc041939@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D1A968DE7D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 21:55:53 -0000 On 4/5/19 4:16 PM, Rodney W. Grimes wrote: >> Author: eugen >> Date: Fri Apr 5 22:45:08 2019 >> New Revision: 345970 >> URL: https://svnweb.freebsd.org/changeset/base/345970 >> >> Log: >> network.subr: improve configuration of cloned gif(4) interfaces >> >> ifconfig(8) syntax allows to specify only single address_family, >> so we need additional invocation of ifconfig to support configuration >> of cloned gif interface that may use different address families >> for its internal and external addresses. >> >> Also, ifconfig(8) does not allow to omit "inet6" keyword for address family >> specifying IPv6 addresses as outer addresses of the interface. >> >> Also, address_family is not "parameter" and it has to go before parameters >> including "tunnel" keyword, so "ifconfig gif0 tunnel inet6 $oip1 $oip2" would be >> wrong syntax and only "ifconfig gif0 inet6 tunnel $oip1 $oip2" is right. >> >> With this change, the following works: >> >> gifconfig_gif0="inet6 2a00::1 2a01::1" >> ifconfig_gif0="inet 10.0.0.1 10.0.0.2 netmask 255.255.255.252" > > If you want another fun one to wrestle with see if you can > make this work: > > cloned_interfaces="vlan32" > ifconfig_em0="up" > ifconfig_vlan32="vlan 32 vlandev em0 SYNCDHCP" > > I have worked around it, but it would be nice if this "just worked". Why not use the vlans thing btw? ifconfig_em0="up" vlans_em0="32" ifconfig_em0_32="SYNCDHCP" I think you probably still need the ifconfig_em0 as I don't think up'ing a vlan implicitly up's the trunk. You need similar "up" entries when using lagg. -- John Baldwin From owner-svn-src-head@freebsd.org Tue Apr 9 08:09:22 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 359961578AC5; Tue, 9 Apr 2019 08:09:22 +0000 (UTC) (envelope-from eugen@eg.sd.rdtc.ru) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:d12:604::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 8085A81917; Tue, 9 Apr 2019 08:09:21 +0000 (UTC) (envelope-from eugen@eg.sd.rdtc.ru) X-Envelope-To: svn-src-head@freebsd.org Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id x3988xT0041097 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Apr 2019 10:09:00 +0200 (CEST) (envelope-from eugen@eg.sd.rdtc.ru) X-Envelope-From: eugen@eg.sd.rdtc.ru Received: from eg.sd.rdtc.ru (eugen@localhost [127.0.0.1]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id x3988wD3055835 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Apr 2019 15:08:58 +0700 (+07) (envelope-from eugen@eg.sd.rdtc.ru) Received: (from eugen@localhost) by eg.sd.rdtc.ru (8.15.2/8.15.2/Submit) id x3988we8055834; Tue, 9 Apr 2019 15:08:58 +0700 (+07) (envelope-from eugen) Date: Tue, 9 Apr 2019 15:08:58 +0700 From: Eugene Grosbein To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345970 - head/libexec/rc Message-ID: <20190409080858.GA55811@rdtc.ru> References: <201904052245.x35Mj9Rd097169@repo.freebsd.org> <201904052316.x35NGOSc041939@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201904052316.x35NGOSc041939@gndrsh.dnsmgr.net> User-Agent: Mutt/1.7.2 (2016-11-26) X-Spam-Status: No, score=0.3 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,LOCAL_FROM autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level * mail domains are different * 2.6 LOCAL_FROM From my domains X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 8085A81917 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-1.80 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.90)[-0.899,0]; MX_INVALID(0.50)[cached]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[grosbein.net]; AUTH_NA(1.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_SHORT(-0.48)[-0.480,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[eugen@grosbein.net,eugen@eg.sd.rdtc.ru]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; FROM_NEQ_ENVFROM(0.00)[eugen@grosbein.net,eugen@eg.sd.rdtc.ru]; IP_SCORE(-1.13)[ip: (-1.45), ipnet: 2a01:4f8::/29(-2.16), asn: 24940(-2.02), country: DE(-0.01)] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 08:09:22 -0000 On Fri, Apr 05, 2019 at 04:16:24PM -0700, Rodney W. Grimes wrote: > If you want another fun one to wrestle with see if you can > make this work: > > cloned_interfaces="vlan32" > ifconfig_em0="up" > ifconfig_vlan32="vlan 32 vlandev em0 SYNCDHCP" > > I have worked around it, but it would be nice if this "just worked". Sorry for late reply, I somehow missed this. I've just checked and this "just works" for me already. For which version this does not work, exactly? When did you verify this last time? Eugene Grosbein From owner-svn-src-head@freebsd.org Tue Apr 9 08:38:39 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93FBA1579B02; Tue, 9 Apr 2019 08:38:39 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 1EBF982E08; Tue, 9 Apr 2019 08:38:38 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x398cT73059114; Tue, 9 Apr 2019 01:38:29 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x398cTvr059113; Tue, 9 Apr 2019 01:38:29 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904090838.x398cTvr059113@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345970 - head/libexec/rc In-Reply-To: <20190409080858.GA55811@rdtc.ru> To: Eugene Grosbein Date: Tue, 9 Apr 2019 01:38:29 -0700 (PDT) CC: rgrimes@freebsd.org, 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-Rspamd-Queue-Id: 1EBF982E08 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.973,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 08:38:39 -0000 > On Fri, Apr 05, 2019 at 04:16:24PM -0700, Rodney W. Grimes wrote: > > > If you want another fun one to wrestle with see if you can > > make this work: > > > > cloned_interfaces="vlan32" > > ifconfig_em0="up" > > ifconfig_vlan32="vlan 32 vlandev em0 SYNCDHCP" > > > > I have worked around it, but it would be nice if this "just worked". > > Sorry for late reply, I somehow missed this. It is of low importance, I have worked around it, and I suspect it is a fairly rare thing for someone to do. > I've just checked and this "just works" for me already. > For which version this does not work, exactly? > When did you verify this last time? I believe the last time I tried this was early, in 11.1 iirc. Are you sure it worked? I'll retest on release 12.0. I can not remeber if the failure was no dhcpclient, or if they do not get the vlan 32 vlandev em0 settings, it was one or the other that did not occur. You do get the vlan32 device, but it does not work. > Eugene Grosbein -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 09:08:11 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C055B157AD75; Tue, 9 Apr 2019 09:08:11 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:d12:604::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 420F98419D; Tue, 9 Apr 2019 09:08:11 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id x3997wOt041499 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Apr 2019 11:08:02 +0200 (CEST) (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: rgrimes@freebsd.org Received: from [10.58.0.4] ([10.58.0.4]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id x3997wiG056468 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Tue, 9 Apr 2019 16:07:58 +0700 (+07) (envelope-from eugen@grosbein.net) Subject: Re: svn commit: r345970 - head/libexec/rc To: rgrimes@freebsd.org References: <201904090838.x398cTvr059113@gndrsh.dnsmgr.net> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Eugene Grosbein Message-ID: Date: Tue, 9 Apr 2019 16:07:50 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <201904090838.x398cTvr059113@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.3 required=5.0 tests=BAYES_00,LOCAL_FROM,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.0 SPF_PASS SPF: sender matches SPF record * 2.6 LOCAL_FROM From my domains X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 420F98419D X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 09:08:11 -0000 09.04.2019 15:38, Rodney W. Grimes wrote: >> I've just checked and this "just works" for me already. >> For which version this does not work, exactly? >> When did you verify this last time? > > I believe the last time I tried this was early, in 11.1 iirc. > Are you sure it worked? > I'll retest on release 12.0. > > I can not remeber if the failure was no dhcpclient, or > if they do not get the vlan 32 vlandev em0 settings, > it was one or the other that did not occur. You > do get the vlan32 device, but it does not work. Works as expected (as it should work) for both 11.2 and 12.0 From owner-svn-src-head@freebsd.org Tue Apr 9 09:20:42 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCE39157B0A8; Tue, 9 Apr 2019 09:20:42 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 60270846E7; Tue, 9 Apr 2019 09:20:42 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x399KeMv059256; Tue, 9 Apr 2019 02:20:40 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x399KdF4059255; Tue, 9 Apr 2019 02:20:39 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904090920.x399KdF4059255@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345970 - head/libexec/rc In-Reply-To: To: Eugene Grosbein Date: Tue, 9 Apr 2019 02:20:39 -0700 (PDT) CC: rgrimes@freebsd.org, 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-Rspamd-Queue-Id: 60270846E7 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 09:20:43 -0000 > 09.04.2019 15:38, Rodney W. Grimes wrote: > > >> I've just checked and this "just works" for me already. > >> For which version this does not work, exactly? > >> When did you verify this last time? > > > > I believe the last time I tried this was early, in 11.1 iirc. > > Are you sure it worked? > > I'll retest on release 12.0. > > > > I can not remeber if the failure was no dhcpclient, or > > if they do not get the vlan 32 vlandev em0 settings, > > it was one or the other that did not occur. You > > do get the vlan32 device, but it does not work. > > Works as expected (as it should work) for both 11.2 and 12.0 It works much better than it did just doing testing in 12.0, the interface is infact properly configured, the DHCP client tries to do the right thing, but fails to get a lease on reboot, including attempt to renew the prior lease. This is not a config startup issue any more, but still an issue of some sort. If after booting I down/up the em0 interface I get a lease almost immediatly. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 09:22:43 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6F74157B290; Tue, 9 Apr 2019 09:22:43 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 3D13284B1A; Tue, 9 Apr 2019 09:22:43 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x399MfpU059288; Tue, 9 Apr 2019 02:22:41 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x399MfxS059287; Tue, 9 Apr 2019 02:22:41 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904090922.x399MfxS059287@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345970 - head/libexec/rc In-Reply-To: To: Eugene Grosbein Date: Tue, 9 Apr 2019 02:22:41 -0700 (PDT) CC: rgrimes@freebsd.org, 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-Rspamd-Queue-Id: 3D13284B1A X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 09:22:44 -0000 > 09.04.2019 15:38, Rodney W. Grimes wrote: > > >> I've just checked and this "just works" for me already. > >> For which version this does not work, exactly? > >> When did you verify this last time? > > > > I believe the last time I tried this was early, in 11.1 iirc. > > Are you sure it worked? > > I'll retest on release 12.0. > > > > I can not remeber if the failure was no dhcpclient, or > > if they do not get the vlan 32 vlandev em0 settings, > > it was one or the other that did not occur. You > > do get the vlan32 device, but it does not work. > > Works as expected (as it should work) for both 11.2 and 12.0 ^^ for you, not for me Are you using a em0 type device, or something else? I can retest on an alc0 device easily. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 09:31:14 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C916157B527; Tue, 9 Apr 2019 09:31:14 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 EF29A85124; Tue, 9 Apr 2019 09:31:13 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x399VCtE059329; Tue, 9 Apr 2019 02:31:12 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x399VBo3059328; Tue, 9 Apr 2019 02:31:11 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904090931.x399VBo3059328@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345970 - head/libexec/rc In-Reply-To: <201904090922.x399MfxS059287@gndrsh.dnsmgr.net> To: rgrimes@freebsd.org Date: Tue, 9 Apr 2019 02:31:11 -0700 (PDT) CC: Eugene Grosbein , 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-Rspamd-Queue-Id: EF29A85124 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 09:31:14 -0000 > > 09.04.2019 15:38, Rodney W. Grimes wrote: > > > > >> I've just checked and this "just works" for me already. > > >> For which version this does not work, exactly? > > >> When did you verify this last time? > > > > > > I believe the last time I tried this was early, in 11.1 iirc. > > > Are you sure it worked? > > > I'll retest on release 12.0. > > > > > > I can not remeber if the failure was no dhcpclient, or > > > if they do not get the vlan 32 vlandev em0 settings, > > > it was one or the other that did not occur. You > > > do get the vlan32 device, but it does not work. > > > > Works as expected (as it should work) for both 11.2 and 12.0 > ^^ for you, not for me > > Are you using a em0 type device, or something else? > I can retest on an alc0 device easily. Rested on alc0, this works perfectly fine. So this appears to be em0/vlan interaction problems. Very odd that a flick of the parent down and up makes it work though. > -- > Rod Grimes rgrimes@freebsd.org -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 10:10:00 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8DEBF157C28B; Tue, 9 Apr 2019 10:10:00 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 32156866C7; Tue, 9 Apr 2019 10:10:00 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A89C9769; Tue, 9 Apr 2019 10:10:00 +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 x39A9xTe051612; Tue, 9 Apr 2019 10:09:59 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39A9xDt051611; Tue, 9 Apr 2019 10:09:59 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904091009.x39A9xDt051611@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 9 Apr 2019 10:09:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346048 - head/lib/libc/sys X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/lib/libc/sys X-SVN-Commit-Revision: 346048 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 32156866C7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 10:10:00 -0000 Author: trasz Date: Tue Apr 9 10:09:59 2019 New Revision: 346048 URL: https://svnweb.freebsd.org/changeset/base/346048 Log: .Xr protect(1) and proccontrol(1) from procctl(2). MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/lib/libc/sys/procctl.2 Modified: head/lib/libc/sys/procctl.2 ============================================================================== --- head/lib/libc/sys/procctl.2 Tue Apr 9 07:36:40 2019 (r346047) +++ head/lib/libc/sys/procctl.2 Tue Apr 9 10:09:59 2019 (r346048) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 23, 2019 +.Dd April 9, 2019 .Dt PROCCTL 2 .Os .Sh NAME @@ -570,6 +570,8 @@ or invalid signal number. .El .Sh SEE ALSO .Xr dtrace 1 , +.Xr proccontrol 1 , +.Xr protect 1 , .Xr cap_enter 2, .Xr kill 2 , .Xr ktrace 2 , From owner-svn-src-head@freebsd.org Tue Apr 9 10:13:08 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B4F5157C602; Tue, 9 Apr 2019 10:13:08 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:d12:604::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E17C86C76; Tue, 9 Apr 2019 10:13:07 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id x39ACxmY041973 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Apr 2019 12:13:00 +0200 (CEST) (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: rgrimes@freebsd.org Received: from [10.58.0.4] ([10.58.0.4]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id x39ACtLN057419 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Tue, 9 Apr 2019 17:12:55 +0700 (+07) (envelope-from eugen@grosbein.net) Subject: Re: svn commit: r345970 - head/libexec/rc To: rgrimes@freebsd.org References: <201904090922.x399MfxS059287@gndrsh.dnsmgr.net> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Eugene Grosbein Message-ID: <97afca1e-5801-d9ec-dfe7-5ceabf9ab05d@grosbein.net> Date: Tue, 9 Apr 2019 17:12:47 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <201904090922.x399MfxS059287@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.3 required=5.0 tests=BAYES_00,LOCAL_FROM,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.0 SPF_PASS SPF: sender matches SPF record * 2.6 LOCAL_FROM From my domains X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 1E17C86C76 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.988,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 10:13:08 -0000 09.04.2019 16:22, Rodney W. Grimes wrote: >> Works as expected (as it should work) for both 11.2 and 12.0 > ^^ for you, not for me > > Are you using a em0 type device, or something else? em0 for FreeBSD as guest inside VirtualBox. Well, I have no vlans here really outside of VBox so dhclient does not obtain a lease for vlan32 but it tries very hard. So this is not configuration problem. From owner-svn-src-head@freebsd.org Tue Apr 9 10:17:25 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E262157C6C8; Tue, 9 Apr 2019 10:17:25 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E68B986E28; Tue, 9 Apr 2019 10:17: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BCEED990C; Tue, 9 Apr 2019 10:17: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 x39AHOoQ056927; Tue, 9 Apr 2019 10:17:24 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39AHORT056926; Tue, 9 Apr 2019 10:17:24 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904091017.x39AHORT056926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 9 Apr 2019 10:17:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346049 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 346049 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E68B986E28 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 10:17:25 -0000 Author: trasz Date: Tue Apr 9 10:17:24 2019 New Revision: 346049 URL: https://svnweb.freebsd.org/changeset/base/346049 Log: Remove spurious comma. MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/share/man/man7/hostname.7 Modified: head/share/man/man7/hostname.7 ============================================================================== --- head/share/man/man7/hostname.7 Tue Apr 9 10:09:59 2019 (r346048) +++ head/share/man/man7/hostname.7 Tue Apr 9 10:17:24 2019 (r346049) @@ -81,7 +81,7 @@ by a system-wide configuration file (see .Xr resolver 5 ) . .Sh SEE ALSO .Xr gethostbyname 3 , -.Xr resolver 5 , +.Xr resolver 5 .Sh HISTORY .Nm Hostname appeared in From owner-svn-src-head@freebsd.org Tue Apr 9 10:33:19 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 068C0157CD19; Tue, 9 Apr 2019 10:33:19 +0000 (UTC) (envelope-from tychon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9CE4987734; Tue, 9 Apr 2019 10:33:18 +0000 (UTC) (envelope-from tychon@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E6CA9C78; Tue, 9 Apr 2019 10:33:18 +0000 (UTC) (envelope-from tychon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x39AXIti067264; Tue, 9 Apr 2019 10:33:18 GMT (envelope-from tychon@FreeBSD.org) Received: (from tychon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39AXIDJ067263; Tue, 9 Apr 2019 10:33:18 GMT (envelope-from tychon@FreeBSD.org) Message-Id: <201904091033.x39AXIDJ067263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tychon set sender to tychon@FreeBSD.org using -f From: Tycho Nightingale Date: Tue, 9 Apr 2019 10:33:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346050 - head/tools/tools/ioat X-SVN-Group: head X-SVN-Commit-Author: tychon X-SVN-Commit-Paths: head/tools/tools/ioat X-SVN-Commit-Revision: 346050 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9CE4987734 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 10:33:19 -0000 Author: tychon Date: Tue Apr 9 10:33:18 2019 New Revision: 346050 URL: https://svnweb.freebsd.org/changeset/base/346050 Log: ioatcontrol(8) crc-copy flag bug and misc usage tweak Reviewed by: cem Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D19855 Modified: head/tools/tools/ioat/ioatcontrol.c Modified: head/tools/tools/ioat/ioatcontrol.c ============================================================================== --- head/tools/tools/ioat/ioatcontrol.c Tue Apr 9 10:17:24 2019 (r346049) +++ head/tools/tools/ioat/ioatcontrol.c Tue Apr 9 10:33:18 2019 (r346050) @@ -49,7 +49,7 @@ static void usage(void) { - printf("Usage: %s [-c period] [-EfmVz] channel-number num-txns [ " + printf("Usage: %s [-c period] [-EefmVxXz] channel-number num-txns [ " "[ [duration]]]\n", getprogname()); printf(" %s -r [-c period] [-vVwz] channel-number address []\n\n", getprogname()); @@ -154,9 +154,11 @@ main(int argc, char **argv) break; case 'x': xflag = true; + modeflags++; break; case 'X': Xflag = true; + modeflags++; break; case 'z': t.zero_stats = true; @@ -172,7 +174,7 @@ main(int argc, char **argv) usage(); if (modeflags > 1) { - printf("Invalid: Cannot use >1 mode flag (-E, -f, -m, or -r)\n"); + printf("Invalid: Cannot use >1 mode flag (-E, -e, -f, -m, -r, -x or -X)\n"); usage(); } @@ -191,7 +193,7 @@ main(int argc, char **argv) t.testkind = IOAT_TEST_MEMCPY; else if (xflag) t.testkind = IOAT_TEST_DMA_CRC; - else if (xflag) + else if (Xflag) t.testkind = IOAT_TEST_DMA_CRC_COPY; t.channel_index = atoi(argv[0]); From owner-svn-src-head@freebsd.org Tue Apr 9 10:35:05 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8EE0157CE54; Tue, 9 Apr 2019 10:35:05 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 2C3BC8790C; Tue, 9 Apr 2019 10:35:04 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39AZ0VH059856; Tue, 9 Apr 2019 03:35:00 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39AZ0Kr059855; Tue, 9 Apr 2019 03:35:00 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904091035.x39AZ0Kr059855@gndrsh.dnsmgr.net> Subject: Re: svn commit: r345970 - head/libexec/rc In-Reply-To: <97afca1e-5801-d9ec-dfe7-5ceabf9ab05d@grosbein.net> To: Eugene Grosbein Date: Tue, 9 Apr 2019 03:35:00 -0700 (PDT) CC: rgrimes@freebsd.org, 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-Rspamd-Queue-Id: 2C3BC8790C X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.986,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 10:35:05 -0000 > 09.04.2019 16:22, Rodney W. Grimes wrote: > > >> Works as expected (as it should work) for both 11.2 and 12.0 > > ^^ for you, not for me If you did not actually get a lease I do not see that your test is complete, so though it worked to a point, it did not work as expected until you actually obtain a lease. > > Are you using a em0 type device, or something else? > > em0 for FreeBSD as guest inside VirtualBox. Real hardware here. > Well, I have no vlans here really outside of VBox so dhclient does not obtain a lease for vlan32 > but it tries very hard. So this is not configuration problem. It tries very hard here too, and it is not succesful until I do an: ifconfig em0 down; ifconfig em0 up; then it immediatly gets a lease. Something is happening on re-init of em0 that is not happening in the normal situation. Could this be one of the iflib bugs, that is fixed in head or stable/12 but not in releng/12? -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 13:14:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B49971580D2E; Tue, 9 Apr 2019 13:14:12 +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 8836D8CE6B; Tue, 9 Apr 2019 13:14:11 +0000 (UTC) (envelope-from ohartmann@walstatt.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1554815641; bh=jNeMGRpvcIraIT/VzE+EREQ/B7UHExJSDwQKlCRiZ/4=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=VafBi4PyRZf7TfoLRlVMYdrmA1lO+oJ1qxXsp7m7f3hobJljV5bXYQWbmvyeTwp03 KH18i8xz5OdSDhhOmTOtUu+qFW2GSNRKik4y4lh4Cj3vdI097XPJZZuHujMs2qCjQ6 BBrlFjtch1m2bn5bVD72YOlNdRW3wz0OPn1b54bM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from freyja ([46.88.91.252]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lm6IP-1gems42tyj-00Zd1M; Tue, 09 Apr 2019 15:14:01 +0200 Date: Tue, 9 Apr 2019 15:13:54 +0200 From: "O. Hartmann" To: Chris Rees Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 Message-ID: <20190409151340.6f33b077@freyja> In-Reply-To: <201904071831.x37IVj4r096803@repo.freebsd.org> References: <201904071831.x37IVj4r096803@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:qf+0c8Mnsv0OMc6eMNHMwTOov35lvDyRKxfSwGrrHxT8xrzZuRQ esrwYUu766ASSbSaQRCDCeJXBFdgwkXMLI6F/ckuCxj34qw/AyzNstLTL3BHCfLhFGs0aLY 9eZ9rjTJAh85zK63YDyv3w1moVk6WSOG0a4sGgQfega6YLtc/GvIkcvLhlAUfYW92eJXu93 Zn7+goKOKOPxDkV3eswlg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:GbimZ4IjO1w=:+8c1MwlmDUIOkAoOnFt53u Hv2aRo6jkgxPUPvv6h3zY9eAVn9T4z76pFhnc8nfMZBId933jyR25vrpx7WJk749FdXNQWFhn 3D//LUVftfFfmEOOuCGF14zcyB7mPysY5HHpiiTzvwKRWsRj5FmudYCzDJDpF2wu9TUWX/tMX 2lZQ54/Uo2r7gRpunuzioJxZouNxMiHE91uD+2ep88tkRR4aR7ldynfGLX6UerEYRjYBhfvG1 gctBE2iLWKKW3uwA3F/QFKpbPpatGtnhjol+GTEjU5FTj7hZPev1+jOYw7JfTdcinSAiExIwB R53MvvPucCMonQPboROttUQzp6GwkFJQb80vZAqYynEkAHcxUWteuvotcPLeW5bOC+npPVP56 5+kZYU2wfIErDFZUDKTFwGN6CTCm7b6xIymbX9xobxW9mIcBS1VxYmgD7tvaMOubSYs2Aj9sS 0dd4W5hkc8X+IUW88gAxd/vmrPOevgLo391EqRU7jwABZ4hizp7Kt94jcetSotS+Eiub1YVFr OgIGMZuL0DPox03jbPIEwx3uC+KnUVSm1G9bu2VXoFaWVT5YVG3wplNx/K19y2Cc8O1oDMkOo xCKppOyNm6oLH9cHuNENTS3MEwOaa+QzyYnkZUsEJ9z9wGlwpyngyzhq1/SM7RGA+E/Atk/nQ P71xYxY34VfrMntVoyt8GobGC631Y6VYng8cJ9fdV4lNEZmNxxdjzgzI8y7hx6hiRp1vrCK2z TLx7Z7QgoOQzOblxEfFSWokG2nBd7r9jwD6fPYmbSepvemhFMmUsnuE+UHG0/23p9dbDJT2jM 6i19iH86x3m+d/OhxVPkTAbaM6Sr9OIKB8si/jCnAXNt7/2DP+ZipdDGWc4Btfs+e4UPeHZaI 1nWOWgBeTPkRPtFKFeGzU2DH7TcFx6Wht5hIPRzkQgMIGI8r9CUn8G9zI21dhzovd3pdIYwo1 kvdJzwhHQkw== X-Rspamd-Queue-Id: 8836D8CE6B X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.net header.s=badeba3b8450 header.b=VafBi4Py X-Spamd-Result: default: False [-3.74 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; NEURAL_HAM_MEDIUM(-0.97)[-0.968,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[walstatt.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; IP_SCORE(-1.13)[ip: (-5.79), ipnet: 212.227.0.0/16(-1.38), asn: 8560(1.54), country: DE(-0.01)]; DKIM_TRACE(0.00)[gmx.net:+]; MX_GOOD(-0.01)[cached: mx00.gmx.net]; NEURAL_HAM_SHORT(-0.73)[-0.732,0]; R_SPF_NA(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[21.17.227.212.list.dnswl.org : 127.0.3.1]; RECEIVED_SPAMHAUS_PBL(0.00)[252.91.88.46.zen.spamhaus.org : 127.0.0.10]; MID_RHS_NOT_FQDN(0.50)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 13:14:13 -0000 On Sun, 7 Apr 2019 18:31:45 +0000 (UTC) Chris Rees wrote: > Author: crees (doc,ports committer) > Date: Sun Apr 7 18:31:45 2019 > New Revision: 346017 > URL: https://svnweb.freebsd.org/changeset/base/346017 > > Log: > Remove now unnecessary kldstat check before attempting to load modules= . > > Since r233109, kldload has the -n option, which silently ignores optio= ns > that are already loaded. > > https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.ht= ml > > Note that this script no longer reports if the module is already loade= d, > but it could be argued this wasn't particularly useful information. > > PR: docs/234248 > Reviewed by: bcr (docs), kib, rgrimes (visual) > Approved by: jilles > Differential Revision: https://reviews.freebsd.org/D18670 > > Modified: > head/libexec/rc/rc.d/abi > head/libexec/rc/rc.d/bthidd > head/libexec/rc/rc.d/cfumass > head/libexec/rc/rc.d/kld > head/libexec/rc/rc.d/mdconfig > head/libexec/rc/rc.d/mdconfig2 > head/libexec/rc/rc.d/mountcritremote > head/libexec/rc/rc.d/syscons > head/libexec/rc/rc.subr > head/share/man/man5/rc.conf.5 > > Modified: head/libexec/rc/rc.d/abi > =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/libexec/rc/rc.d/abi Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.d/abi Sun Apr 7 18:31:45 2019 (r346017) > @@ -27,10 +27,10 @@ linux_start() > local _tmpdir > > echo -n ' linux' > - load_kld -e 'linux(aout|elf)' linux > + load_kld linux > case `sysctl -n hw.machine_arch` in > amd64) > - load_kld -e 'linux64elf' linux64 > + load_kld linux64 > ;; > esac > if [ -x /compat/linux/sbin/ldconfigDisabled ]; then > > Modified: head/libexec/rc/rc.d/bthidd > =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/libexec/rc/rc.d/bthidd Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/bthidd Sun Apr 7 18:31:45 > 2019 (r346017) @@ -34,11 +34,11 @@ evdev_enabled() > bthidd_prestart() > { > if evdev_enabled; then > - load_kld -m uinput uinput > + load_kld uinput > fi > - load_kld -m kbdmux kbdmux > - load_kld -m vkbd vkbd > - load_kld -m ng_btsocket ng_btsocket > + load_kld kbdmux > + load_kld vkbd > + load_kld ng_btsocket > return 0 > } > > > Modified: head/libexec/rc/rc.d/cfumass > =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/libexec/rc/rc.d/cfumass Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/cfumass Sun Apr 7 18:31:45 > 2019 (r346017) @@ -75,7 +75,7 @@ cfumass_start() > return "${err}" > fi > > - load_kld -e cfumass cfumass > + load_kld cfumass > > # If the template is already switched to Mass Storage, then reset > # it to -1 to force the host to reenumerate it; otherwise it might > > Modified: head/libexec/rc/rc.d/kld > =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/libexec/rc/rc.d/kld Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.d/kld Sun Apr 7 18:31:45 2019 (r346017) > @@ -46,7 +46,7 @@ kld_start() > > echo 'Loading kernel modules:' > for _kld in $kld_list ; do > - load_kld -e ${_kld}.ko $_kld > + load_kld $_kld > done > } > > > Modified: head/libexec/rc/rc.d/mdconfig > =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/libexec/rc/rc.d/mdconfig Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/mdconfig Sun Apr 7 18:31:45 > 2019 (r346017) @@ -114,7 +114,7 @@ mdconfig_start() > continue > fi > if [ "${_file}" !=3D "${_file%.uzip}" ]; then > - load_kld -m g_uzip geom_uzip || > return 3 > + load_kld geom_uzip || return 3 > # sleep a bit to allow creation > of /dev/mdX.uzip sleep 2 > fi > > Modified: head/libexec/rc/rc.d/mdconfig2 > =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/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/mdconfig2 Sun Apr 7 18:31:45 > 2019 (r346017) @@ -123,7 +123,7 @@ mdconfig2_start() > # been created. > if [ "${_type}" =3D "vnode" -a "${_fs}" !=3D "/" ]; then > if [ "${_file}" !=3D "${_file%.uzip}" ]; then > - load_kld -m g_uzip geom_uzip || return 3 > + load_kld geom_uzip || return 3 > fi > if is_readonly ${_fs}; then > warn "${_fs} is mounted read-only, skipping > ${_md}." > > Modified: head/libexec/rc/rc.d/mountcritremote > =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/libexec/rc/rc.d/mountcritremote Sun Apr 7 18:24:26 > 2019 (r346016) +++ head/libexec/rc/rc.d/mountcritremote Sun > Apr 7 18:31:45 2019 (r346017) @@ -27,7 +27,7 @@ > mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in > *mount_nfs*) > # Handle absent nfs client support > - load_kld -m nfs nfscl || return 1 > + load_kld nfscl || return 1 > ;; > esac > return 0 > > Modified: head/libexec/rc/rc.d/syscons > =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/libexec/rc/rc.d/syscons Sun Apr 7 18:24:26 2019 > (r346016) +++ head/libexec/rc/rc.d/syscons Sun Apr 7 18:31:45 > 2019 (r346017) @@ -346,7 +346,7 @@ syscons_start() > for i in `kldstat | awk '$5 ~ "_saver\.ko$" { print $5 }'`; > do kldunload ${i} > done > - load_kld -e _saver ${saver}_saver > + load_kld ${saver}_saver > ;; > esac > > > Modified: head/libexec/rc/rc.subr > =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/libexec/rc/rc.subr Sun Apr 7 18:24:26 2019 (r346016) > +++ head/libexec/rc/rc.subr Sun Apr 7 18:31:45 2019 (r346017) > @@ -1853,48 +1853,29 @@ mount_md() > } > > # Code common to scripts that need to load a kernel module > -# if it isn't in the kernel yet. Syntax: > -# load_kld [-e regex] [-m module] file > -# where -e or -m chooses the way to check if the module > -# is already loaded: > -# regex is egrep'd in the output from `kldstat -v', > -# module is passed to `kldstat -m'. > -# The default way is as though `-m file' were specified. > +# if it isn't in the kernel yet. Syntax: > +# load_kld file > load_kld() > { > - local _loaded _mod _opt _re > + local _opt > > + # Silently ignore legacy options; they are unnecessary > while getopts "e:m:" _opt; do > case "$_opt" in > - e) _re=3D"$OPTARG" ;; > - m) _mod=3D"$OPTARG" ;; > - *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; > + e) ;; > + m) ;; > + *) err 3 'USAGE: load_kld file' ;; > esac > done > shift $(($OPTIND - 1)) > if [ $# -ne 1 ]; then > - err 3 'USAGE: load_kld [-e regex] [-m module] file' > + err 3 'USAGE: load_kld file' > fi > - _mod=3D${_mod:-$1} > - _loaded=3Dfalse > - if [ -n "$_re" ]; then > - if kldstat -v | egrep -q -e "$_re"; then > - _loaded=3Dtrue > - fi > + if ! kldload -n "$1"; then > + warn "Unable to load kernel module $1" > + return 1 > else > - if kldstat -q -m "$_mod"; then > - _loaded=3Dtrue > - fi > - fi > - if ! $_loaded; then > - if ! kldload "$1"; then > - warn "Unable to load kernel module $1" > - return 1 > - else > - info "$1 kernel module loaded." > - fi > - else > - debug "load_kld: $1 kernel module already loaded." > + info "$1 kernel module loaded." > fi > return 0 > } > > Modified: head/share/man/man5/rc.conf.5 > =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/share/man/man5/rc.conf.5 Sun Apr 7 18:24:26 2019 > (r346016) +++ head/share/man/man5/rc.conf.5 Sun Apr 7 18:31:45 > 2019 (r346017) @@ -24,7 +24,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd March 21, 2019 > +.Dd April 7, 2019 > .Dt RC.CONF 5 > .Os > .Sh NAME > @@ -249,9 +249,7 @@ Default > .It Va kld_list > .Pq Vt str > A whitespace-separated list of kernel modules to load right after > -the local disks are mounted, without any > -.Pa .ko > -extension or path. > +the local disks are mounted, with optional path. > Loading modules at this point in the boot process is > much faster than doing it via > .Pa /boot/loader.conf > _______________________________________________ > 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" It seems this patch breaks ZFS if ZFS is built-in kernel! Having ZFS as kernel built-in leaves the system not mounting ANY(!) ZFS vo= lume at boot time, rendering servers unusable. Mounting ZFS filesystems with "zfs mount -a" bring back the ZFS filesystem= s as expected. Regards, oh From owner-svn-src-head@freebsd.org Tue Apr 9 13:54:09 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAE661581C1F; Tue, 9 Apr 2019 13:54:09 +0000 (UTC) (envelope-from ganbold@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5ED4D8E54E; Tue, 9 Apr 2019 13:54:09 +0000 (UTC) (envelope-from ganbold@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3807AC022; Tue, 9 Apr 2019 13:54:09 +0000 (UTC) (envelope-from ganbold@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x39Ds9tZ070859; Tue, 9 Apr 2019 13:54:09 GMT (envelope-from ganbold@FreeBSD.org) Received: (from ganbold@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39Ds9e6070857; Tue, 9 Apr 2019 13:54:09 GMT (envelope-from ganbold@FreeBSD.org) Message-Id: <201904091354.x39Ds9e6070857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ganbold set sender to ganbold@FreeBSD.org using -f From: Ganbold Tsagaankhuu Date: Tue, 9 Apr 2019 13:54:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346052 - head/sys/dev/usb/net X-SVN-Group: head X-SVN-Commit-Author: ganbold X-SVN-Commit-Paths: head/sys/dev/usb/net X-SVN-Commit-Revision: 346052 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5ED4D8E54E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 13:54:10 -0000 Author: ganbold Date: Tue Apr 9 13:54:08 2019 New Revision: 346052 URL: https://svnweb.freebsd.org/changeset/base/346052 Log: In some cases like NanoPI R1, its second USB ethernet RTL8152 (chip version URE_CHIP_VER_4C10) doesn't have hardwired MAC address, in other words, it is all zeros. This commit fixes it by setting random MAC address when MAC address is all zeros. Reviewed by: kevlo Differential Revision: https://reviews.freebsd.org/D19856 Modified: head/sys/dev/usb/net/if_ure.c Modified: head/sys/dev/usb/net/if_ure.c ============================================================================== --- head/sys/dev/usb/net/if_ure.c Tue Apr 9 12:28:12 2019 (r346051) +++ head/sys/dev/usb/net/if_ure.c Tue Apr 9 13:54:08 2019 (r346052) @@ -62,6 +62,9 @@ SYSCTL_INT(_hw_usb_ure, OID_AUTO, debug, CTLFLAG_RWTUN "Debug level"); #endif +#define ETHER_IS_ZERO(addr) \ + (!(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5])) + /* * Various supported device vendors/products. */ @@ -673,12 +676,20 @@ ure_attach_post(struct usb_ether *ue) else ure_rtl8153_init(sc); - if (sc->sc_chip & URE_CHIP_VER_4C00) + if ((sc->sc_chip & URE_CHIP_VER_4C00) || + (sc->sc_chip & URE_CHIP_VER_4C10)) ure_read_mem(sc, URE_PLA_IDR, URE_MCU_TYPE_PLA, ue->ue_eaddr, 8); else ure_read_mem(sc, URE_PLA_BACKUP, URE_MCU_TYPE_PLA, ue->ue_eaddr, 8); + + if (ETHER_IS_ZERO(sc->sc_ue.ue_eaddr)) { + device_printf(sc->sc_ue.ue_dev, "MAC assigned randomly\n"); + arc4rand(sc->sc_ue.ue_eaddr, ETHER_ADDR_LEN, 0); + sc->sc_ue.ue_eaddr[0] &= ~0x01; /* unicast */ + sc->sc_ue.ue_eaddr[0] |= 0x02; /* locally administered */ + } } static int @@ -724,8 +735,10 @@ ure_init(struct usb_ether *ue) ure_reset(sc); /* Set MAC address. */ + ure_write_1(sc, URE_PLA_CRWECR, URE_MCU_TYPE_PLA, URE_CRWECR_CONFIG); ure_write_mem(sc, URE_PLA_IDR, URE_MCU_TYPE_PLA | URE_BYTE_EN_SIX_BYTES, IF_LLADDR(ifp), 8); + ure_write_1(sc, URE_PLA_CRWECR, URE_MCU_TYPE_PLA, URE_CRWECR_NORAML); /* Reset the packet filter. */ ure_write_2(sc, URE_PLA_FMC, URE_MCU_TYPE_PLA, From owner-svn-src-head@freebsd.org Tue Apr 9 14:29:35 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B03715825C7; Tue, 9 Apr 2019 14:29:35 +0000 (UTC) (envelope-from bu7cher@yandex.ru) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:107]) (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 160EA8F5CC; Tue, 9 Apr 2019 14:29:34 +0000 (UTC) (envelope-from bu7cher@yandex.ru) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward104p.mail.yandex.net (Yandex) with ESMTP id EDAF84B00ED0; Tue, 9 Apr 2019 17:29:30 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id cCXQSLdB5G-TUmWLPRr; Tue, 09 Apr 2019 17:29:30 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1554820170; bh=VkSPis6YyAFevls/NAAS9v8JsCoRYrcSPSBrko44Hxs=; h=In-Reply-To:From:Date:References:To:Subject:Message-ID; b=amKpDgM/2g8A10yvZkXXxpvW3ZRxQam5wAbpYnUQfw9IEuN8fMq10nd/fIXy/gioQ ZghTApGVOxNBlSds58dHRsCCX6sI/hFQiYGvXZV7h2h+jDrPvAs9bKBs1ASrtn/dBt YGJKgioRuQngchKbQH4jhTMgfJTUOAOGZGHT6aZA= Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id kF7TwJKW3K-TUNS4NtQ; Tue, 09 Apr 2019 17:29:30 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) Subject: Re: svn commit: r346052 - head/sys/dev/usb/net To: Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091354.x39Ds9e6070857@repo.freebsd.org> From: "Andrey V. Elsukov" Openpgp: id=E6591E1B41DA1516F0C9BC0001C5EA0410C8A17A Autocrypt: addr=bu7cher@yandex.ru; prefer-encrypt=mutual; keydata= mQENBEwBF1kBCADB9sXFhBEUy8qQ4X63Y8eBatYMHGEFWN9ypS5lI3RE6qQW2EYbxNk7qUC5 21YIIS1mMFVBEfvR7J9uc7yaYgFCEb6Sce1RSO4ULN2mRKGHP3/Sl0ijZEjWHV91hY1YTHEF ZW/0GYinDf56sYpDDehaBF5wkWIo1+QK5nmj3vl0DIDCMNd7QEiWpyLVwECgLX2eOAXByT8B bCqVhJGcG6iFP7/B9Ll6uX5gb8thM9LM+ibwErDBVDGiOgvfxqidab7fdkh893IBCXa82H9N CNwnEtcgzh+BSKK5BgvPohFMgRwjti37TSxwLu63QejRGbZWSz3OK3jMOoF63tCgn7FvABEB AAG0JUFuZHJleSBWLiBFbHN1a292IDxidTdjaGVyQHlhbmRleC5ydT6JATgEEwECACIFAkwB F1kCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEAHF6gQQyKF6qmYIAI6ekfm1VA4T vqankI1ISE6ku4jV7UlpIQlEbE7/8n3Zd6teJ+pGOQhN5qk8QE7utdPdbktAzi+x7LIJVzUw 4TywZLXGrkP7VKYkfg6oyCGyzITghefQeJtr2TN4hYCkzPWpylkue8MtmqfZv/6royqwTbN+ +E09FQNvTgRUYJYTeQ1qOsxNRycwvw3dr2rOfuxShbzaHBB1pBIjGrMg8fC5pd65ACH5zuFV A0CoTNGMDrEZSfBkTW604UUHFFXeCoC3dwDZRKOWJ3GmMXns65Ai5YkA63BSHEE1Qle3VBhd cG1w0CB5FBV3pB27UVnf0jEbysrDqW4qN7XMRFSWNAy5AQ0ETAEXWQEIAJ2p6l9LBoqdH/0J PEFDY2t2gTvAuzz+8zs3R03dFuHcNbOwjvWCG0aOmVpAzkRa8egn5JB4sZaFUtKPYJEQ1Iu+ LUBwgvtXf4vWpzC67zs2dDuiW4LamH5p6xkTD61aHR7mCB3bg2TUjrDWn2Jt44cvoYxj3dz4 S49U1rc9ZPgD5axCNv45j72tggWlZvpefThP7xT1OlNTUqye2gAwQravXpZkl5JG4eOqJVIU X316iE3qso0iXRUtO7OseBf0PiVmk+wCahdreHOeOxK5jMhYkPKVn7z1sZiB7W2H2TojbmcK HZC22sz7Z/H36Lhg1+/RCnGzdEcjGc8oFHXHCxUAEQEAAYkBHwQYAQIACQUCTAEXWQIbDAAK CRABxeoEEMihegkYCAC3ivGYNe2taNm/4Nx5GPdzuaAJGKWksV+w9mo7dQvU+NmI2az5w8vw 98OmX7G0OV9snxMW+6cyNqBrVFTu33VVNzz9pnqNCHxGvj5dL5ltP160JV2zw2bUwJBYsgYQ WfyJJIM7l3gv5ZS3DGqaGIm9gOK1ANxfrR5PgPzvI9VxDhlr2juEVMZYAqPLEJe+SSxbwLoz BcFCNdDAyXcaAzXsx/E02YWm1hIWNRxanAe7Vlg7OL+gvLpdtrYCMg28PNqKNyrQ87LQ49O9 50IIZDOtNFeR0FGucjcLPdS9PiEqCoH7/waJxWp6ydJ+g4OYRBYNM0EmMgy1N85JJrV1mi5i Message-ID: <7e6208ff-9c9e-9a08-1f67-15e3506758aa@yandex.ru> Date: Tue, 9 Apr 2019 17:26:53 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <201904091354.x39Ds9e6070857@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zlwWwCAqsNAa7i8b9cDATykK3gTzVffv8" X-Rspamd-Queue-Id: 160EA8F5CC X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 14:29:35 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --zlwWwCAqsNAa7i8b9cDATykK3gTzVffv8 Content-Type: multipart/mixed; boundary="W7PYkrAMnbxKAvbPNjDV1e9OvSuqOtvnk"; protected-headers="v1" From: "Andrey V. Elsukov" To: Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <7e6208ff-9c9e-9a08-1f67-15e3506758aa@yandex.ru> Subject: Re: svn commit: r346052 - head/sys/dev/usb/net References: <201904091354.x39Ds9e6070857@repo.freebsd.org> In-Reply-To: <201904091354.x39Ds9e6070857@repo.freebsd.org> --W7PYkrAMnbxKAvbPNjDV1e9OvSuqOtvnk Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 09.04.2019 16:54, Ganbold Tsagaankhuu wrote: > Author: ganbold > Date: Tue Apr 9 13:54:08 2019 > New Revision: 346052 > URL: https://svnweb.freebsd.org/changeset/base/346052 >=20 > Log: > In some cases like NanoPI R1, its second USB ethernet > RTL8152 (chip version URE_CHIP_VER_4C10) doesn't > have hardwired MAC address, in other words, it is all zeros. > This commit fixes it by setting random MAC address > when MAC address is all zeros. > =20 > - if (sc->sc_chip & URE_CHIP_VER_4C00) > + if ((sc->sc_chip & URE_CHIP_VER_4C00) || > + (sc->sc_chip & URE_CHIP_VER_4C10)) > ure_read_mem(sc, URE_PLA_IDR, URE_MCU_TYPE_PLA, > ue->ue_eaddr, 8); > else > ure_read_mem(sc, URE_PLA_BACKUP, URE_MCU_TYPE_PLA, > ue->ue_eaddr, 8); > + > + if (ETHER_IS_ZERO(sc->sc_ue.ue_eaddr)) { > + device_printf(sc->sc_ue.ue_dev, "MAC assigned randomly\n"); > + arc4rand(sc->sc_ue.ue_eaddr, ETHER_ADDR_LEN, 0); > + sc->sc_ue.ue_eaddr[0] &=3D ~0x01; /* unicast */ > + sc->sc_ue.ue_eaddr[0] |=3D 0x02; /* locally administered */ > + } > } Hi, there is ether_fakeaddr() function that is used for such purpose. Maybe is it better to use it? Look at this commit: https://svnweb.freebsd.org/base?view=3Drevision&revision=3D345139 --=20 WBR, Andrey V. Elsukov --W7PYkrAMnbxKAvbPNjDV1e9OvSuqOtvnk-- --zlwWwCAqsNAa7i8b9cDATykK3gTzVffv8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQEzBAEBCAAdFiEE5lkeG0HaFRbwybwAAcXqBBDIoXoFAlysq60ACgkQAcXqBBDI oXrjJQgAsMs+O0i+GpxyN0Su5I3NnYvIrqKB2qStO3hXVUiDDqu56oVCCR4b1Vlh VrVyEG6VxUi2zN4nwlALNLJHvp3ujTML7ZYJmKXVrf7OiZewiDczOpBQkU1ZVpEP NSHCWxjBAaIK42Kv48sYqfNOc5+6QA7g87Hs8vHJASDEl/6bHi9rT+eUC2F9jnkk WXwzgLHDA3sX7nuJfRD/LhPvfw2m2LAPuqYxHRKGwTKBGi0IsvM0zXyN4DzHPtgf T+yZlEBm9PYuyRUxZAavVreinlKUL6rvzW7C7C/pKnnuabZ3rE13F1U2WHmYsDgW 0fn72S1ei+qusXAyDy0RK/WNPHZAcA== =8ZiJ -----END PGP SIGNATURE----- --zlwWwCAqsNAa7i8b9cDATykK3gTzVffv8-- From owner-svn-src-head@freebsd.org Tue Apr 9 15:06:53 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2F5515316C2; Tue, 9 Apr 2019 15:06:53 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mail33c50.megamailservers.eu (mail163c50.megamailservers.eu [91.136.10.173]) (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 D856A69F09; Tue, 9 Apr 2019 15:06:52 +0000 (UTC) (envelope-from crees@bayofrum.net) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554822405; bh=sNdJEqjTbSQXXXAvjxpR8ODK0MNhi3sJD53N8p4uVRE=; h=Date:In-Reply-To:References:Subject:To:CC:From:From; b=YjxgEuMCX9fc0eAZSV7TcglY6xDaZVyRMzCvoGTpzuZGia+26jP14OSZk5qIm0iEL JPZj/ED1Hj9nubEQ6Tbw103o+Jp7mCw5+HF/rk9aCMqnb23zVD2A+jY+XGKOFEtGpG YxhDNdOFW3cdXUeIZk6++wkrbXBRLYNNVpJ7eqgo= Feedback-ID: crees@bayofrum. Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail33c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x39F6hie009789; Tue, 9 Apr 2019 15:06:44 +0000 Received: from [100.105.118.115] (unknown [213.205.242.83]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 895331832E; Tue, 9 Apr 2019 16:06:38 +0100 (BST) Date: Tue, 09 Apr 2019 16:06:36 +0100 User-Agent: K-9 Mail for Android In-Reply-To: <20190409151340.6f33b077@freyja> References: <201904071831.x37IVj4r096803@repo.freebsd.org> <20190409151340.6f33b077@freyja> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: "O. Hartmann" , Chris Rees CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Chris Rees Message-ID: <749EBFB4-94B8-4FD9-8774-FE6FB18FFA07@bayofrum.net> X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 895331832E.A5DCC X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@bayofrum.net X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B0205.5CACB505.002A, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=eOw9ckh1 c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=oexKYjalfGEA:10 a=iaTFZB6CAAAA:8 a=6I5d2MoRAAAA:8 a=NV2mcPfE25mr8LH4jqIA:9 a=QEXdDO2ut3YA:10 a=HOOHyrUpFT4A:10 a=QWXrQ9iV8q7LKaLQ9lfw:22 a=IjZwj45LgO3ly-622nXo:22 X-Rspamd-Queue-Id: D856A69F09 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.971,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 15:06:54 -0000 Hey, On 9 April 2019 14:13:54 BST, "O. Hartmann" wrote: >On Sun, 7 Apr 2019 18:31:45 +0000 (UTC) >Chris Rees wrote: > >> Author: crees (doc,ports committer) >> Date: Sun Apr 7 18:31:45 2019 >> New Revision: 346017 >> URL: https://svnweb.freebsd.org/changeset/base/346017 >> >> Log: >> Remove now unnecessary kldstat check before attempting to load >modules. >> >> Since r233109, kldload has the -n option, which silently ignores >options >> that are already loaded. >> >>=20=20 >https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.html >> >> Note that this script no longer reports if the module is already >loaded, >> but it could be argued this wasn't particularly useful information. >> >> PR: docs/234248 >> Reviewed by: bcr (docs), kib, rgrimes (visual) >> Approved by: jilles >> Differential Revision: https://reviews.freebsd.org/D18670 >> >> Modified: >> head/libexec/rc/rc.d/abi >> head/libexec/rc/rc.d/bthidd >> head/libexec/rc/rc.d/cfumass >> head/libexec/rc/rc.d/kld >> head/libexec/rc/rc.d/mdconfig >> head/libexec/rc/rc.d/mdconfig2 >> head/libexec/rc/rc.d/mountcritremote >> head/libexec/rc/rc.d/syscons >> head/libexec/rc/rc.subr >> head/share/man/man5/rc.conf.5 >> >> Modified: head/libexec/rc/rc.d/abi >> >=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 {Snip} >It seems this patch breaks ZFS if ZFS is built-in kernel! > >Having ZFS as kernel built-in leaves the system not mounting ANY(!) ZFS >volume >at boot time, rendering servers unusable. >Mounting ZFS filesystems with "zfs mount -a" bring back the ZFS >filesystems as >expected. > Are you sure it's this causing that? Please try reverting it. Chris=20 --=20 Sent from my Android device with K-9 Mail. Please excuse my brevity. --=20 This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Tue Apr 9 15:24:40 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F411D1531E01; Tue, 9 Apr 2019 15:24:39 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 96D506A9DC; Tue, 9 Apr 2019 15:24:39 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 536D6CF75; Tue, 9 Apr 2019 15:24:39 +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 x39FOdlx023300; Tue, 9 Apr 2019 15:24:39 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39FOdPv023299; Tue, 9 Apr 2019 15:24:39 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904091524.x39FOdPv023299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 9 Apr 2019 15:24:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346053 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 346053 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 96D506A9DC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 15:24:40 -0000 Author: trasz Date: Tue Apr 9 15:24:38 2019 New Revision: 346053 URL: https://svnweb.freebsd.org/changeset/base/346053 Log: Factor out section loading into a separate function. Reviewed by: kib MFC after: 2 weeks Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D19846 Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Tue Apr 9 13:54:08 2019 (r346052) +++ head/sys/kern/imgact_elf.c Tue Apr 9 15:24:38 2019 (r346053) @@ -649,6 +649,45 @@ __elfN(load_section)(struct image_params *imgp, vm_oof return (0); } +static int +__elfN(load_sections)(struct image_params *imgp, const Elf_Ehdr *hdr, + const Elf_Phdr *phdr, u_long rbase, u_long *base_addrp) +{ + vm_prot_t prot; + u_long base_addr; + bool first; + int error, i; + + base_addr = 0; + first = true; + + for (i = 0; i < hdr->e_phnum; i++) { + if (phdr[i].p_type != PT_LOAD || phdr[i].p_memsz == 0) + continue; + + /* Loadable segment */ + prot = __elfN(trans_prot)(phdr[i].p_flags); + error = __elfN(load_section)(imgp, phdr[i].p_offset, + (caddr_t)(uintptr_t)phdr[i].p_vaddr + rbase, + phdr[i].p_memsz, phdr[i].p_filesz, prot); + if (error != 0) + return (error); + + /* + * Establish the base address if this is the first segment. + */ + if (first) { + base_addr = trunc_page(phdr[i].p_vaddr + rbase); + first = false; + } + } + + if (base_addrp != NULL) + *base_addrp = base_addr; + + return (0); +} + /* * Load the file "file" into memory. It may be either a shared object * or an executable. @@ -675,10 +714,9 @@ __elfN(load_file)(struct proc *p, const char *file, u_ struct nameidata *nd; struct vattr *attr; struct image_params *imgp; - vm_prot_t prot; u_long rbase; u_long base_addr = 0; - int error, i, numsegs; + int error; #ifdef CAPABILITY_MODE /* @@ -756,25 +794,10 @@ __elfN(load_file)(struct proc *p, const char *file, u_ goto fail; } - for (i = 0, numsegs = 0; i < hdr->e_phnum; i++) { - if (phdr[i].p_type == PT_LOAD && phdr[i].p_memsz != 0) { - /* Loadable segment */ - prot = __elfN(trans_prot)(phdr[i].p_flags); - error = __elfN(load_section)(imgp, phdr[i].p_offset, - (caddr_t)(uintptr_t)phdr[i].p_vaddr + rbase, - phdr[i].p_memsz, phdr[i].p_filesz, prot); - if (error != 0) - goto fail; - /* - * Establish the base address if this is the - * first segment. - */ - if (numsegs == 0) - base_addr = trunc_page(phdr[i].p_vaddr + - rbase); - numsegs++; - } - } + error = __elfN(load_sections)(imgp, hdr, phdr, rbase, &base_addr); + if (error != 0) + goto fail; + *addr = base_addr; *entry = (unsigned long)hdr->e_entry + rbase; @@ -998,7 +1021,6 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i char *interp; Elf_Brandinfo *brand_info; struct sysentvec *sv; - vm_prot_t prot; u_long addr, baddr, et_dyn_addr, entry, proghdr; u_long maxalign, mapsz, maxv, maxv1; uint32_t fctl0; @@ -1055,6 +1077,17 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i maxalign = phdr[i].p_align; mapsz += phdr[i].p_memsz; n++; + + /* + * If this segment contains the program headers, + * remember their virtual address for the AT_PHDR + * aux entry. Static binaries don't usually include + * a PT_PHDR entry. + */ + if (phdr[i].p_offset == 0 && + hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize + <= phdr[i].p_filesz) + proghdr = phdr[i].p_vaddr + hdr->e_phoff; break; case PT_INTERP: /* Path to interpreter */ @@ -1074,6 +1107,9 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i __elfN(trans_prot)(phdr[i].p_flags); imgp->stack_sz = phdr[i].p_memsz; break; + case PT_PHDR: /* Program header table info */ + proghdr = phdr[i].p_vaddr; + break; } } @@ -1174,38 +1210,10 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i if (error != 0) goto ret; - for (i = 0; i < hdr->e_phnum; i++) { - switch (phdr[i].p_type) { - case PT_LOAD: /* Loadable segment */ - if (phdr[i].p_memsz == 0) - break; - prot = __elfN(trans_prot)(phdr[i].p_flags); - error = __elfN(load_section)(imgp, phdr[i].p_offset, - (caddr_t)(uintptr_t)phdr[i].p_vaddr + et_dyn_addr, - phdr[i].p_memsz, phdr[i].p_filesz, prot); - if (error != 0) - goto ret; + error = __elfN(load_sections)(imgp, hdr, phdr, et_dyn_addr, NULL); + if (error != 0) + goto ret; - /* - * If this segment contains the program headers, - * remember their virtual address for the AT_PHDR - * aux entry. Static binaries don't usually include - * a PT_PHDR entry. - */ - if (phdr[i].p_offset == 0 && - hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize - <= phdr[i].p_filesz) - proghdr = phdr[i].p_vaddr + hdr->e_phoff + - et_dyn_addr; - break; - case PT_PHDR: /* Program header table info */ - proghdr = phdr[i].p_vaddr + et_dyn_addr; - break; - default: - break; - } - } - error = __elfN(enforce_limits)(imgp, hdr, phdr, et_dyn_addr); if (error != 0) goto ret; @@ -1253,7 +1261,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *i */ elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK); elf_auxargs->execfd = -1; - elf_auxargs->phdr = proghdr; + elf_auxargs->phdr = proghdr + et_dyn_addr; elf_auxargs->phent = hdr->e_phentsize; elf_auxargs->phnum = hdr->e_phnum; elf_auxargs->pagesz = PAGE_SIZE; From owner-svn-src-head@freebsd.org Tue Apr 9 15:52:19 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B658153FAE3; Tue, 9 Apr 2019 15:52:19 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F3CA6B8DF; Tue, 9 Apr 2019 15:52:19 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 091EBD49B; Tue, 9 Apr 2019 15:52:19 +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 x39FqIQG038926; Tue, 9 Apr 2019 15:52:18 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39FqImw038925; Tue, 9 Apr 2019 15:52:18 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201904091552.x39FqImw038925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 9 Apr 2019 15:52:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346054 - head/lib/libc/string X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/lib/libc/string X-SVN-Commit-Revision: 346054 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2F3CA6B8DF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 15:52:19 -0000 Author: emaste Date: Tue Apr 9 15:52:18 2019 New Revision: 346054 URL: https://svnweb.freebsd.org/changeset/base/346054 Log: libc: update strstr implementation to match musl musl commits: 122d67f846cb0be2c9e1c3880db9eb9545bbe38c 0239cd0681e889a269fb7691f60e81ef8d081e6b 8f5a820d147da36bcdbddd201b35d293699dacd8 Submitted by: David CARLIER Obtained from: musl MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D19834 Modified: head/lib/libc/string/strstr.c Modified: head/lib/libc/string/strstr.c ============================================================================== --- head/lib/libc/string/strstr.c Tue Apr 9 15:24:38 2019 (r346053) +++ head/lib/libc/string/strstr.c Tue Apr 9 15:52:18 2019 (r346054) @@ -143,9 +143,8 @@ static char *twoway_strstr(const unsigned char *h, con /* Check last byte first; advance by shift on mismatch */ if (BITOP(byteset, h[l-1], &)) { k = l-shift[h[l-1]]; - //printf("adv by %zu (on %c) at [%s] (%zu;l=%zu)\n", k, h[l-1], h, shift[h[l-1]], l); if (k) { - if (mem0 && mem && k < p) k = l-p; + if (k < mem) k = mem; h += k; mem = 0; continue; From owner-svn-src-head@freebsd.org Tue Apr 9 16:11:57 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 742111563592; Tue, 9 Apr 2019 16:11:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1710D6C3E2; Tue, 9 Apr 2019 16:11:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 83353E577; Tue, 9 Apr 2019 16:11:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346052 - head/sys/dev/usb/net To: Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091354.x39Ds9e6070857@repo.freebsd.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: Date: Tue, 9 Apr 2019 09:11:53 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904091354.x39Ds9e6070857@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1710D6C3E2 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 16:11:57 -0000 On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: > Author: ganbold > Date: Tue Apr 9 13:54:08 2019 > New Revision: 346052 > URL: https://svnweb.freebsd.org/changeset/base/346052 > > Log: > In some cases like NanoPI R1, its second USB ethernet > RTL8152 (chip version URE_CHIP_VER_4C10) doesn't > have hardwired MAC address, in other words, it is all zeros. > This commit fixes it by setting random MAC address > when MAC address is all zeros. > > Reviewed by: kevlo > Differential Revision: https://reviews.freebsd.org/D19856 It would be best to not use a purely random mac address and to use the function kevans@ added recently. That function generates a MAC address from the FreeBSD OUI using a cryptographic hash so you get a stable address across boots on a given host. -- John Baldwin From owner-svn-src-head@freebsd.org Tue Apr 9 16:17:32 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34BF815637B7; Tue, 9 Apr 2019 16:17:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CCA1E6C869; Tue, 9 Apr 2019 16:17:31 +0000 (UTC) (envelope-from ngie@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6254D857; Tue, 9 Apr 2019 16:17:31 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x39GHVbv049672; Tue, 9 Apr 2019 16:17:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39GHVnY049671; Tue, 9 Apr 2019 16:17:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904091617.x39GHVnY049671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 9 Apr 2019 16:17:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346056 - head X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 346056 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CCA1E6C869 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 16:17:32 -0000 Author: ngie Date: Tue Apr 9 16:17:31 2019 New Revision: 346056 URL: https://svnweb.freebsd.org/changeset/base/346056 Log: Fix a typo when sanity checking in the bootstrap-tools target The path is incorrect for the linker in the error message. It should have been /usr/bin/ld, not /usr/bin/cc . Reviewed by: emaste Approved by: emaste (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D19852 Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue Apr 9 16:16:10 2019 (r346055) +++ head/Makefile Tue Apr 9 16:17:31 2019 (r346056) @@ -570,7 +570,7 @@ universe-toolchain: .PHONY universe_prologue false; \ fi @if [ ! -e "${HOST_OBJTOP}/tmp/usr/bin/ld" ]; then \ - echo "Missing host linker at ${HOST_OBJTOP}/tmp/usr/bin/cc?" >&2; \ + echo "Missing host linker at ${HOST_OBJTOP}/tmp/usr/bin/ld?" >&2; \ false; \ fi @echo "--------------------------------------------------------------" From owner-svn-src-head@freebsd.org Tue Apr 9 16:18:13 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7F091563835 for ; Tue, 9 Apr 2019 16:18:12 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1.eu.mailhop.org (outbound1.eu.mailhop.org [52.28.251.132]) (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 5B8796C999 for ; Tue, 9 Apr 2019 16:18:12 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1554826682; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=WM/s8V/RhfS0KLs18IxNxmzF73uL26rHjUVHj5Oe0ttMPAKDpsos6MzTkZiRSFy3/qLwH3vXdLSi3 nHXmA/VuUNEDgZ3iSlAmtL7Q4WDQoIN2FyUDObN5N7mSoSyBRwEMS4/ngbaa/qL/4Pb58FoeDtOE9J oIO8Q4ycYNX1WixGqKb6xaQfffU/WuHTNzdsiDv4X7qZRo8C/hHFUxzbm9ewCRUJmErtS+1vYFoUHM 68RG7xp7FOmg+mAzeH9IR16zum9EkYNOWWkD6uAOpNlExYhh855q57oOzqACj4HSuTgGOKAnJHaVDy HsAtyOvgxyM8meMtoedFf5QBPS/1E1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:dkim-signature:from; bh=WzuN1Wvec35b2nuIbtCHqGdP5K2KjeoRb+NXPR3L4NA=; b=Z1wu4n0KFnA+qRIHTXU2X1R9MjusWe32BMO/jV68L6RKKfkTsdXlBOl6N2+A2LGzeCDIA0jyO6uZ5 I8jl8m+YictPzpaQfWkUqPFpDg45x/SNkuzdKg4V73HfppIvSfDjIlBFJsJ2770ocee7aCwuU/CKUD Ud2/r3v+QaEQMdbS9aYhfKhalXprwEiojEXPDIUADugKJaQep7jS3weB0mm2WUbgJInGkZfX+sC4Fw h5SM+2lpxZOJ4TUDXifoz8ZrS1PSXMZ6PtXlZgxheRF3nkMyfBJ7rTkxpYZ7orO8k0Nu2n5T8Lkb1Y 6pzKjY/qKvvGPKc/l3Cw39mvKXQaa6w== ARC-Authentication-Results: i=1; outbound3.eu.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:from; bh=WzuN1Wvec35b2nuIbtCHqGdP5K2KjeoRb+NXPR3L4NA=; b=ovRsmhwV5IZTHP9LJ21ihx64Pj4KpanmkcEztUKgt7VvCCX8G2/5rVTW6KjzJY44/RQmLDtoR/Foi X80Gj9DqYO/WSDQVG73tLEa0CRyF+JtMgQEuOnz4VWNZbJo11IFjJqmgFQW1GjXAWXIJ21+aAm49wC IZexIFV9RWJLXKbZzpOEgR9S5xPYXw1wkp6Da1uSsPDpJVpG43jZ2qXuu9GtckD1R7r5MrY4cGxMgC Fn0ekcqM0lNHVjSA2Ld9Vbz1B9Cc7nEE7ESBroH+7jXCYuDxFxoUFt3jfqceHM6pS5eQFewc8Ecky0 vZWGb3GyJDlZ0AK3gSa6F/MM5EqS23A== X-MHO-RoutePath: aGlwcGll X-MHO-User: 0a87784c-5ae3-11e9-908b-352056dbf2de X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound3.eu.mailhop.org (Halon) with ESMTPSA id 0a87784c-5ae3-11e9-908b-352056dbf2de; Tue, 09 Apr 2019 16:18:00 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id x39GHw56017970; Tue, 9 Apr 2019 10:17:58 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: Subject: Re: svn commit: r346052 - head/sys/dev/usb/net From: Ian Lepore To: John Baldwin , Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Tue, 09 Apr 2019 10:17:58 -0600 In-Reply-To: References: <201904091354.x39Ds9e6070857@repo.freebsd.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 5B8796C999 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 16:18:13 -0000 On Tue, 2019-04-09 at 09:11 -0700, John Baldwin wrote: > On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: > > Author: ganbold > > Date: Tue Apr 9 13:54:08 2019 > > New Revision: 346052 > > URL: https://svnweb.freebsd.org/changeset/base/346052 > > > > Log: > > In some cases like NanoPI R1, its second USB ethernet > > RTL8152 (chip version URE_CHIP_VER_4C10) doesn't > > have hardwired MAC address, in other words, it is all zeros. > > This commit fixes it by setting random MAC address > > when MAC address is all zeros. > > > > Reviewed by: kevlo > > Differential Revision: https://reviews.freebsd.org/D19856 > > It would be best to not use a purely random mac address and to use > the > function kevans@ added recently. That function generates a MAC > address > from the FreeBSD OUI using a cryptographic hash so you get a > stable address across boots on a given host. > How could that possibly work? If it's not random, you can't have two such devices on the same network. If it is random, it's not stable from one boot to the next. -- Ian From owner-svn-src-head@freebsd.org Tue Apr 9 16:20:37 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C7891563998; Tue, 9 Apr 2019 16:20:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D91A46CBE4; Tue, 9 Apr 2019 16:20:36 +0000 (UTC) (envelope-from ngie@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B25ACD86A; Tue, 9 Apr 2019 16:20:36 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x39GKaVd049856; Tue, 9 Apr 2019 16:20:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39GKamM049855; Tue, 9 Apr 2019 16:20:36 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904091620.x39GKamM049855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 9 Apr 2019 16:20:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346057 - head/tests/sys/geom/class/eli X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/tests/sys/geom/class/eli X-SVN-Commit-Revision: 346057 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D91A46CBE4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 16:20:37 -0000 Author: ngie Date: Tue Apr 9 16:20:36 2019 New Revision: 346057 URL: https://svnweb.freebsd.org/changeset/base/346057 Log: Fix geli device cleanup Final cleanup routines shouldn't be called from testcases; it should be called from the testcase cleanup routine. Furthermore, `geli_test_cleanup` should take care of cleaning up geli providers and the memory disks used for the geli providers. `geli_test_cleanup` will always be executed whereas the equivalent logic in `geli_test_body`, may not have been executed if the test failed prior to the logic being run. Prior to this change, the test case was trying to clean up `$md` twice: once in at the end of the test case body function, and the other in the cleanup function. The cleanup function logic was failing because there wasn't anything to clean up in the cleanup function and the errors weren't being ignored. This fixes FreeBSD test suite runs after r345864. PR: 237128 Reviewed by: asomers, pjd Approved by: emaste (mentor) MFC with: r345864 Differential Revision: https://reviews.freebsd.org/D19854 Modified: head/tests/sys/geom/class/eli/online_resize_test.sh Modified: head/tests/sys/geom/class/eli/online_resize_test.sh ============================================================================== --- head/tests/sys/geom/class/eli/online_resize_test.sh Tue Apr 9 16:17:31 2019 (r346056) +++ head/tests/sys/geom/class/eli/online_resize_test.sh Tue Apr 9 16:20:36 2019 (r346057) @@ -172,22 +172,18 @@ online_resize_body() atf_check -s exit:0 -o match:'^Flags: .*AUTORESIZE' geli list ${md}p1.eli atf_check -s exit:0 -o match:resized gpart resize -i 1 -s 30${prefix} ${md} atf_check -s exit:0 -o match:"^[[:space:]]${osize30}[[:space:]]+# mediasize in bytes" diskinfo -v ${md}p1.eli - atf_check geli detach ${md}p1.eli - - # Cleanup. - atf_check -s exit:0 -o match:deleted gpart delete -i 1 ${md} - atf_check -s exit:0 -o match:destroyed gpart destroy ${md} - atf_check -s exit:0 -o ignore mdconfig -d -u ${md} done } online_resize_cleanup() { if [ -f "$TEST_MDS_FILE" ]; then while read md; do - [ -c /dev/${md}p1.eli ] && geli detach ${md}p1.eli - mdconfig -d -u ${md} 2>/dev/null + atf_check -s ignore -e ignore -o ignore geli detach ${md}p1.eli + atf_check -s ignore -e ignore -o ignore gpart delete -i 1 ${md} + atf_check -s ignore -e ignore -o ignore gpart destroy ${md} done < $TEST_MDS_FILE fi + geli_test_cleanup } atf_init_test_cases() From owner-svn-src-head@freebsd.org Tue Apr 9 16:33:40 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C53971563F39; Tue, 9 Apr 2019 16:33:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 63EDD6D553; Tue, 9 Apr 2019 16:33:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id B5221E7A1; Tue, 9 Apr 2019 16:33:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346052 - head/sys/dev/usb/net To: Ian Lepore , Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091354.x39Ds9e6070857@repo.freebsd.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <33d96fdb-0218-6555-6f03-3105649a1904@FreeBSD.org> Date: Tue, 9 Apr 2019 09:33:37 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 63EDD6D553 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.966,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 16:33:41 -0000 On 4/9/19 9:17 AM, Ian Lepore wrote: > On Tue, 2019-04-09 at 09:11 -0700, John Baldwin wrote: >> On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: >>> Author: ganbold >>> Date: Tue Apr 9 13:54:08 2019 >>> New Revision: 346052 >>> URL: https://svnweb.freebsd.org/changeset/base/346052 >>> >>> Log: >>> In some cases like NanoPI R1, its second USB ethernet >>> RTL8152 (chip version URE_CHIP_VER_4C10) doesn't >>> have hardwired MAC address, in other words, it is all zeros. >>> This commit fixes it by setting random MAC address >>> when MAC address is all zeros. >>> >>> Reviewed by: kevlo >>> Differential Revision: https://reviews.freebsd.org/D19856 >> >> It would be best to not use a purely random mac address and to use >> the >> function kevans@ added recently. That function generates a MAC >> address >> from the FreeBSD OUI using a cryptographic hash so you get a >> stable address across boots on a given host. >> > > How could that possibly work? If it's not random, you can't have two > such devices on the same network. If it is random, it's not stable > from one boot to the next. It uses the UUID and interface name as input into the hash. The UUID is per-host. In this particular use case, the first USB device will have a varying MAC address which is an input into the UUID. Though, the other option this driver could use for this specific case would be to just take the first MAC address and +1 to get the second one. -- John Baldwin From owner-svn-src-head@freebsd.org Tue Apr 9 17:15:41 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DF4C156622F for ; Tue, 9 Apr 2019 17:15:41 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (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 8C9C66EE2C for ; Tue, 9 Apr 2019 17:15:40 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1554829167; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=fCEq4/JVosL9DZe3h6R5wlX5RzNQSlssLlw2I9iV1Sdl+LXYwev1lchhwXPUUW8tLxv/UdsSZ6CRT lx950V25ipYVHgUiUTXDwyMVs8SDWGjFLA8kxpYBSq+ZUhIun3LddQAO7ONszNRb6Hs7KuThVBJXEG je8eMZYnrFP0MPjP9YxTalKEYneGwtxFwKQ3ciuO0ExW9XQB5udgPvucMGngHfuq1GfEDQVUT8/sS2 J229RNKxfNvww57SmzXX4zR8GxHwS1SemagFZ1R1hJ8CF4XkBGGFTfD7HubAEo663ELYyTXaE3+0GS bh6iaeMGMkR/PSukLEsi8XjiPkCFZog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:dkim-signature:from; bh=rY5+W3s15imTg3YRXTL9Y+RET+LF1m22d3E0TSMLMcI=; b=l10ttMr0NkmsMJqNa5ssT5jZqEZxu4kkffmor5bWF/JuQnrrhKjivCpO0PUz30kb37QKvU0k1hWzi QYqklDEqgqtypagwnzFWxgNUVfot9xBl09DAcjj9bzoFRcYo7zUIstEqS2sPPosufhpzYzj2QlQd+J Yhuzcj3jyQn9+b0luIZEx2GANzwIsFaUD0LrCjyehAuknlDajq55VeRZgBIewa3KhGfaJzFeXHHZV0 Qedn+arQE/ip+ze6at44AAT01EWEMfCESnY9gRCwYg1iLvlAn+QBk9r98bxwbKbXVZSHCqpyhl5WBv C7StoX91RbBBVaBGzuGO65Wa9+5jpfg== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:from; bh=rY5+W3s15imTg3YRXTL9Y+RET+LF1m22d3E0TSMLMcI=; b=DT9h7IFbPj/aSDPwTCE15qIL3r0F4SzQctadc4VpZWcnuR0pjKiaFyjg01w77c7BrxlJ39KEJa9RN cBRf80SCWWQYNC3R1TrgZTzVQemxozFmiKCNBMxAH752Nypd+2OioDGG9n+R9At1Brnsg81RTCwzv0 GrO4ajfoh8bCpjsx8DSkOIdgkEXFGHNn28xQPL8pv/TowF8xrwJKmIlfH4guLH0+0qr151JsDPipqM VIrA0qjYI92OUK8ccq6BeX/8+c5nhRcgvAnIWAR+Ik9SdUCH3cgKALkBO27WBgi2vBWcc5zo8l4b8Y G+i3D2UMZRuW5Uk+YTJO1cyVAdZkNQw== X-MHO-RoutePath: aGlwcGll X-MHO-User: d3b0f649-5ae8-11e9-803b-31925da7267c X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id d3b0f649-5ae8-11e9-803b-31925da7267c; Tue, 09 Apr 2019 16:59:25 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id x39GxNuO018070; Tue, 9 Apr 2019 10:59:23 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <969703ae8558b4b6f2930208e9c36927b546bb77.camel@freebsd.org> Subject: Re: svn commit: r346052 - head/sys/dev/usb/net From: Ian Lepore To: John Baldwin , Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Tue, 09 Apr 2019 10:59:23 -0600 In-Reply-To: <33d96fdb-0218-6555-6f03-3105649a1904@FreeBSD.org> References: <201904091354.x39Ds9e6070857@repo.freebsd.org> <33d96fdb-0218-6555-6f03-3105649a1904@FreeBSD.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 8C9C66EE2C X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.99)[-0.988,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 17:15:41 -0000 On Tue, 2019-04-09 at 09:33 -0700, John Baldwin wrote: > On 4/9/19 9:17 AM, Ian Lepore wrote: > > On Tue, 2019-04-09 at 09:11 -0700, John Baldwin wrote: > > > On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: > > > > Author: ganbold > > > > Date: Tue Apr 9 13:54:08 2019 > > > > New Revision: 346052 > > > > URL: https://svnweb.freebsd.org/changeset/base/346052 > > > > > > > > Log: > > > > In some cases like NanoPI R1, its second USB ethernet > > > > RTL8152 (chip version URE_CHIP_VER_4C10) doesn't > > > > have hardwired MAC address, in other words, it is all zeros. > > > > This commit fixes it by setting random MAC address > > > > when MAC address is all zeros. > > > > > > > > Reviewed by: kevlo > > > > Differential Revision: > > > > https://reviews.freebsd.org/D19856 > > > > > > It would be best to not use a purely random mac address and to > > > use > > > the > > > function kevans@ added recently. That function generates a MAC > > > address > > > from the FreeBSD OUI using a cryptographic hash so you get a > > > stable address across boots on a given host. > > > > > > > How could that possibly work? If it's not random, you can't have > > two > > such devices on the same network. If it is random, it's not stable > > from one boot to the next. > > It uses the UUID and interface name as input into the hash. > The UUID is per-host. Oh, so it only works on x86 (or I guess any system that has something like a bios that can provide you with a uuid that doesn't change from one boot to the next). -- Ian > In this particular use case, the first USB device will > have a varying MAC address which is an input into the UUID. Though, > the other option this driver could use for this specific case would > be > to just take the first MAC address and +1 to get the second one. > From owner-svn-src-head@freebsd.org Tue Apr 9 17:19:52 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65EB0156646F; Tue, 9 Apr 2019 17:19:52 +0000 (UTC) (envelope-from rebecca@bluestop.org) Received: from muon.bluestop.org (muon.bluestop.org [65.103.231.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A87F16F12F; Tue, 9 Apr 2019 17:19:51 +0000 (UTC) (envelope-from rebecca@bluestop.org) Received: from muon.bluestop.org (localhost [127.0.0.1]) by muon.bluestop.org (Postfix) with ESMTP id 51654658ED; Tue, 9 Apr 2019 11:21:52 -0600 (MDT) Received: from muon.bluestop.org ([127.0.0.1]) by muon.bluestop.org (muon.bluestop.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 4hJ0kTWwy040; Tue, 9 Apr 2019 11:21:52 -0600 (MDT) Received: from photon.int.bluestop.org (unknown [65.103.231.197]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by muon.bluestop.org (Postfix) with ESMTPSA; Tue, 9 Apr 2019 11:21:52 -0600 (MDT) Subject: Re: svn commit: r346039 - head/sys/conf To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904081825.x38IPEpV054311@repo.freebsd.org> From: Rebecca Cran Message-ID: Date: Tue, 9 Apr 2019 11:19:49 -0600 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904081825.x38IPEpV054311@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Rspamd-Queue-Id: A87F16F12F X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.967,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 17:19:52 -0000 On 2019-04-08 12:25, Warner Losh wrote: > Author: imp > Date: Mon Apr 8 18:25:14 2019 > New Revision: 346039 > URL: https://svnweb.freebsd.org/changeset/base/346039 > > Log: > Style only change: Prefer $() to `` > > $() is more modern and also nests. Convert the mix of styles to using > only the former (although the latter was more common). It's the more > dominant style in other shell scripts these days as well. > > Differential Revision: https://reviews.freebsd.org/D19840 > > Modified: > head/sys/conf/newvers.sh > > Modified: head/sys/conf/newvers.sh I thought I saw an email a few weeks ago that suggested that the list of people who reviewed the patch should be copied into a "Reviewed by:" line, to avoid only having that information in Phabricator. Am I remembering correctly, or is just mentioning the Phab review considered sufficient? -- Rebecca Cran From owner-svn-src-head@freebsd.org Tue Apr 9 17:37:25 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C603E1566B15 for ; Tue, 9 Apr 2019 17:37:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F6296FBE5 for ; Tue, 9 Apr 2019 17:37:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x734.google.com with SMTP id s81so10744924qke.13 for ; Tue, 09 Apr 2019 10:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=d82o4hPl2rrS2QtT2E3K50s/CbPBkgvsJM++mE8g3f0=; b=P7FHp/89tmBhLUWlo3F7Kf5KIDAsjxqRvgL7bW1hSruShPIjACkd+MnPeiReZFavmA nHQfMwHv46wW4tWAIhWP29sZpatFu5SV3J6ngCNA+yOgtlv7V0xaptVEM+X99P3sGB5h FTBJcWQNudjVDg0tEJVdmL5QmALNGzeCTtW5oVSeJ3LRr051PXNwoyBiPLXA45EQcju5 RaEyk40yQ+SXImIUqiRTSw81JC0b3eSee9cQPgEU+HVzaRYC/RM5oWAY+w/EsZbmmPqm LBds77L/Cm0mZ2+l5OH3t/lwYAuL3Bv1FCPW+8Cvup32t52QCCFJYErq5y0oRh1ihkdc o4Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=d82o4hPl2rrS2QtT2E3K50s/CbPBkgvsJM++mE8g3f0=; b=JSySlzsfdXOaBBR2+AdStGPlQRHiKZy6NTqdF/0c+aiLU3p5KsyILaoIJXz5XEyAX+ 5V5Icy7//PLUEjiH21H31dMJ8dnRY1jr8N8z9+oxbHiapNmKdAVuw6XJedml+n4w7jqo vbRbv9qomN49blm9HoII9hbfjvOjb9DXMLdM+LMm+8Y7XvI3n+GT6F2hm5kZt6N0nJoY 1UeiymjubxUVcxtAhRLDq6K09mp3cLdbzXF7mQaxYM26EfYULSOTi5Ux4NUNcOf9B4Rz rMapwuGe1bMmrVFxHu2+5yomilF52R7butBiJInj1usHj4emi5Yk8ttFA6po7S8eQZsv v8xQ== X-Gm-Message-State: APjAAAXA3ySSnlrKAZS4kXHjj98f68Ik2l3uNupmiwmBWzCE44RAM6vd AmCwwplNHxs359TXy0SIMjz4XqjCoEO9omz9r05sqg== X-Google-Smtp-Source: APXvYqxLBKrT0Gl6WsArDeH1i8G/E6vsHzHySFIPNs84BaSr+/4UxxowsT93FFacKFvO8dW7lUXTjImOt4++8OEwyk8= X-Received: by 2002:a05:620a:12d0:: with SMTP id e16mr19675318qkl.140.1554831444661; Tue, 09 Apr 2019 10:37:24 -0700 (PDT) MIME-Version: 1.0 References: <201904081825.x38IPEpV054311@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 9 Apr 2019 11:37:13 -0600 Message-ID: Subject: Re: svn commit: r346039 - head/sys/conf To: Rebecca Cran Cc: Warner Losh , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 5F6296FBE5 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.973,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 17:37:26 -0000 On Tue, Apr 9, 2019 at 11:19 AM Rebecca Cran wrote: > On 2019-04-08 12:25, Warner Losh wrote: > > Author: imp > > Date: Mon Apr 8 18:25:14 2019 > > New Revision: 346039 > > URL: https://svnweb.freebsd.org/changeset/base/346039 > > > > Log: > > Style only change: Prefer $() to `` > > > > $() is more modern and also nests. Convert the mix of styles to using > > only the former (although the latter was more common). It's the more > > dominant style in other shell scripts these days as well. > > > > Differential Revision: https://reviews.freebsd.org/D19840 > > > > Modified: > > head/sys/conf/newvers.sh > > > > Modified: head/sys/conf/newvers.sh > > > I thought I saw an email a few weeks ago that suggested that the list of > people who reviewed the patch should be copied into a "Reviewed by:" > line, to avoid only having that information in Phabricator. > > Am I remembering correctly, or is just mentioning the Phab review > considered sufficient? > You remember correctly. Sadly, there's no automation to make it happen, so it's easy to forget. I hate the notion that came out of the last discussion, but am trying to do it, but since there's no automation, I'll fail to do the right thing more often than not. Warner From owner-svn-src-head@freebsd.org Tue Apr 9 17:40:27 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BF3F1566D0D for ; Tue, 9 Apr 2019 17:40:27 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (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 8F9226FF84 for ; Tue, 9 Apr 2019 17:40:26 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1554831623; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=HVH34OHlAjlJntrs8LUWFo7ezxggD7cLiUXURcJ+moJKnJL/YLOBm1jFudq9F0EPmzgUTTabnIUiG GbDpiVsC9xTQS1o44unk3RVPDidvjICTFgHwPJqxh+AYmqT8o3+dld4A7JT5LvVJomPkxDCH8ORKG2 tO6aG1KK467KIhBHUp7jC0GgBeN16avYxp6fm0BjbaRM03CqjVpB8t6gjJzzb5a5Wo53AZtAZutiD1 ZFC7vSK6exsxAeLD1GII3ztKvl6sZThcx6EI74dxDj/kbVHBhtARMWLWqZh64Vne2275u6BSoSNQSi q6i9Pq4oZQlbTywzNd5rLp7rXyyqcRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:dkim-signature:from; bh=4tlSvX8BJlUuvPfP/Je8jbwoO19KLvks+2lUODxOA+E=; b=ksdT6s0MLxOEvynUW+Nr1owTYEPV1QAYV38wrlc7Di/Nf7g65qq2g+FBqjelzt5nRUunXWk7TGXp+ MJ8OBZRV+LHkN6xg/czLRrwZhkd/r3e6nHo/qV+B5gBXzKTUXdrdv24aRBOWXunHgV4aoygd4HQXgq 9Sx4exuvfT884B5ZTLLLtyJEvp51AqewKXgaN6B7h8XdL28mGdv6wON58t+AM/W7jveBUxpKqmJY5Y jgEBMJzV0ThCw/kEI+l1hXBpXe6S19VkWQfspCbEL0LxYNR44Zf6SWeVN8dc8pL9f0ETYevrQ/DVES fRxQR2JrfJz8hPmjasZlCmyjkMUvfPQ== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:from; bh=4tlSvX8BJlUuvPfP/Je8jbwoO19KLvks+2lUODxOA+E=; b=udTgtRaxhSDlCDHRpPsTS9kzodzGn+YdNklWQhFKBHdWQAfrPmxT7v/32P4ql8vKT5GWm2n5weDil 2z/UZgIILcmFte0SHEiM/S0agFurpkRLxQdJSkTSTGD5DSUkXA+XAoNoVWYUTmF+M6zgV8xd36/l/d Qk/Uv8KznqR76T7pYpRx2ouxUIF4owtI0GFOlQlRt2+eZn9khqrXfc8nNGAjAP9Re1QNFssDj88dCv hAnQD6y+bAEiOu6se6OFdS00Hvsc4wGufdof1hRUFSat0cBBUNIrmp84rOlevxifxpkQeYJSfB5/2z JFqqlZ1IOdONcXOas51qeybsMzMeCag== X-MHO-RoutePath: aGlwcGll X-MHO-User: 8b1ada05-5aee-11e9-803b-31925da7267c X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [67.177.211.60]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id 8b1ada05-5aee-11e9-803b-31925da7267c; Tue, 09 Apr 2019 17:40:20 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id x39HeJUe018180; Tue, 9 Apr 2019 11:40:19 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: Subject: Re: svn commit: r346039 - head/sys/conf From: Ian Lepore To: Rebecca Cran , Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Tue, 09 Apr 2019 11:40:19 -0600 In-Reply-To: References: <201904081825.x38IPEpV054311@repo.freebsd.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 8F9226FF84 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.990,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 17:40:27 -0000 On Tue, 2019-04-09 at 11:19 -0600, Rebecca Cran wrote: > On 2019-04-08 12:25, Warner Losh wrote: > > Author: imp > > Date: Mon Apr 8 18:25:14 2019 > > New Revision: 346039 > > URL: https://svnweb.freebsd.org/changeset/base/346039 > > > > Log: > > Style only change: Prefer $() to `` > > > > $() is more modern and also nests. Convert the mix of styles to > > using > > only the former (although the latter was more common). It's the > > more > > dominant style in other shell scripts these days as well. > > > > Differential Revision: https://reviews.freebsd.org/D19840 > > > > Modified: > > head/sys/conf/newvers.sh > > > > Modified: head/sys/conf/newvers.sh > > > I thought I saw an email a few weeks ago that suggested that the list > of > people who reviewed the patch should be copied into a "Reviewed by:" > line, to avoid only having that information in Phabricator. > > Am I remembering correctly, or is just mentioning the Phab review > considered sufficient? > > As far as I'm concerned, if I've gone to all the trouble to have something phab-reviewed, I'm not going to waste a bunch of time hand- copying metadata from the review to the commit message; citing the review is sufficient. -- Ian From owner-svn-src-head@freebsd.org Tue Apr 9 17:52:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77916156744D; Tue, 9 Apr 2019 17:52:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 171EB70B8C; Tue, 9 Apr 2019 17:52:12 +0000 (UTC) (envelope-from ngie@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 05AE5E9BA; Tue, 9 Apr 2019 17:52:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x39HqBsn001452; Tue, 9 Apr 2019 17:52:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39HqBwS001450; Tue, 9 Apr 2019 17:52:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904091752.x39HqBwS001450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 9 Apr 2019 17:52:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346061 - head/tests/sys/netmap X-SVN-Group: head X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: head/tests/sys/netmap X-SVN-Commit-Revision: 346061 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 171EB70B8C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 17:52:12 -0000 Author: ngie Date: Tue Apr 9 17:52:11 2019 New Revision: 346061 URL: https://svnweb.freebsd.org/changeset/base/346061 Log: Polish netmap(4) testcases a bit 1. Not all kernels have netmap(4) support. Check for netmap(4) support before attempting to run the tests via the `PLAIN_REQUIRE_KERNEL_MODULE(..)` macro. 2. Libraries shouldn't be added to LDFLAGS; they should be added to LIBADD instead. This allows the build system to evaluate dependencies for sanity. 3. Sort some of the Makefile variables per bsd.README. 1., in particular, will resolve failures when running this testcase on kernels lacking netmap(4) support, e.g., the i386 GENERIC kernels on ^/stable/11 and ^/stable/12. PR: 237129 Reviewed by: vmaffione Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D19864 Modified: head/tests/sys/netmap/Makefile head/tests/sys/netmap/ctrl-api-test.c Modified: head/tests/sys/netmap/Makefile ============================================================================== --- head/tests/sys/netmap/Makefile Tue Apr 9 17:23:34 2019 (r346060) +++ head/tests/sys/netmap/Makefile Tue Apr 9 17:52:11 2019 (r346061) @@ -6,9 +6,10 @@ TESTSDIR= ${TESTSBASE}/sys/netmap TEST_METADATA+= required_user="root" TEST_METADATA+= is_exclusive=true -LDFLAGS+= -lpthread -CFLAGS+= -I${SRCTOP}/tests PLAIN_TESTS_C+= ctrl-api-test + +CFLAGS+= -I${SRCTOP}/tests +LIBADD+= pthread WARNS?= 6 Modified: head/tests/sys/netmap/ctrl-api-test.c ============================================================================== --- head/tests/sys/netmap/ctrl-api-test.c Tue Apr 9 17:23:34 2019 (r346060) +++ head/tests/sys/netmap/ctrl-api-test.c Tue Apr 9 17:52:11 2019 (r346061) @@ -1839,6 +1839,7 @@ main(int argc, char **argv) #ifdef __FreeBSD__ PLAIN_REQUIRE_KERNEL_MODULE("if_tap", 0); + PLAIN_REQUIRE_KERNEL_MODULE("netmap", 0); #endif memset(&ctx_, 0, sizeof(ctx_)); From owner-svn-src-head@freebsd.org Tue Apr 9 18:07:19 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 543851567C93; Tue, 9 Apr 2019 18:07:19 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EA2E671516; Tue, 9 Apr 2019 18:07:18 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C56BDEB9C; Tue, 9 Apr 2019 18:07:18 +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 x39I7Iok008280; Tue, 9 Apr 2019 18:07:18 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39I7Haf008276; Tue, 9 Apr 2019 18:07:17 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904091807.x39I7Haf008276@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 9 Apr 2019 18:07:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346062 - in head/sys: amd64/pci i386/pci x86/include x86/x86 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys: amd64/pci i386/pci x86/include x86/x86 X-SVN-Commit-Revision: 346062 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EA2E671516 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 18:07:19 -0000 Author: kib Date: Tue Apr 9 18:07:17 2019 New Revision: 346062 URL: https://svnweb.freebsd.org/changeset/base/346062 Log: pci_cfgreg.c: Use io port config access for early boot time. Some early PCIe chipsets are explicitly listed in the white-list to enable use of the MMIO config space accesses, perhaps because ACPI tables were not reliable source of the base MCFG address at that time. For that chipsets, MCFG base was read from the known chipset MCFGbase config register. During very early stage of boot, when access to the PCI config space is performed (see e.g. pci_early_quirks.c), we cannot map 255MB of registers because the method used with pre-boot pmap overflows initial kernel page tables. Move fallback to read MCFGbase to the attachment method of the x86/legacy device, which removes code duplication, and results in the use of io accesses until MCFG is parsed or legacy attach called. For amd64, pre-initialize cfgmech with CFGMECH_1, right now we dynamically assign CFGMECH_1 to it anyway, and remove checks for CFGMECH_NONE. There is a mention in the Intel documentation for corresponding chipsets that OS must use either io port or MMIO access method, but we already break this rule by reading MCFGbase register, so one more access seems to be innocent. Reported by: longwitz@incore.de PR: 236838 Reviewed by: avg (other version), jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D19833 Modified: head/sys/amd64/pci/pci_cfgreg.c head/sys/i386/pci/pci_cfgreg.c head/sys/x86/include/pci_cfgreg.h head/sys/x86/x86/legacy.c Modified: head/sys/amd64/pci/pci_cfgreg.c ============================================================================== --- head/sys/amd64/pci/pci_cfgreg.c Tue Apr 9 17:52:11 2019 (r346061) +++ head/sys/amd64/pci/pci_cfgreg.c Tue Apr 9 18:07:17 2019 (r346062) @@ -44,12 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include -enum { - CFGMECH_NONE = 0, - CFGMECH_1, - CFGMECH_PCIE, -}; - static uint32_t pci_docfgregread(int bus, int slot, int func, int reg, int bytes); static int pciereg_cfgread(int bus, unsigned slot, unsigned func, @@ -61,7 +55,13 @@ static void pcireg_cfgwrite(int bus, int slot, int fun SYSCTL_DECL(_hw_pci); -static int cfgmech; +/* + * For amd64 we assume that type 1 I/O port-based access always works. + * If an ACPI MCFG table exists, pcie_cfgregopen() will be called to + * switch to memory-mapped access. + */ +int cfgmech = CFGMECH_1; + static vm_offset_t pcie_base; static int pcie_minbus, pcie_maxbus; static uint32_t pcie_badslots; @@ -71,47 +71,10 @@ static int mcfg_enable = 1; SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0, "Enable support for PCI-e memory mapped config access"); -/* - * Initialise access to PCI configuration space - */ int pci_cfgregopen(void) { - uint64_t pciebar; - uint16_t did, vid; - if (cfgmech != CFGMECH_NONE) - return (1); - cfgmech = CFGMECH_1; - - /* - * Grope around in the PCI config space to see if this is a - * chipset that is capable of doing memory-mapped config cycles. - * This also implies that it can do PCIe extended config cycles. - */ - - /* Check for supported chipsets */ - vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); - did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); - switch (vid) { - case 0x8086: - switch (did) { - case 0x3590: - case 0x3592: - /* Intel 7520 or 7320 */ - pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; - pcie_cfgregopen(pciebar, 0, 255); - break; - case 0x2580: - case 0x2584: - case 0x2590: - /* Intel 915, 925, or 915GM */ - pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); - pcie_cfgregopen(pciebar, 0, 255); - break; - } - } - return (1); } @@ -135,9 +98,6 @@ pci_cfgregread(int bus, int slot, int func, int reg, i { uint32_t line; - if (cfgmech == CFGMECH_NONE) - return (0xffffffff); - /* * Some BIOS writers seem to want to ignore the spec and put * 0 in the intline rather than 255 to indicate none. Some use @@ -161,9 +121,6 @@ pci_cfgregread(int bus, int slot, int func, int reg, i void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes) { - - if (cfgmech == CFGMECH_NONE) - return; if (cfgmech == CFGMECH_PCIE && (bus >= pcie_minbus && bus <= pcie_maxbus) && Modified: head/sys/i386/pci/pci_cfgreg.c ============================================================================== --- head/sys/i386/pci/pci_cfgreg.c Tue Apr 9 17:52:11 2019 (r346061) +++ head/sys/i386/pci/pci_cfgreg.c Tue Apr 9 18:07:17 2019 (r346062) @@ -64,20 +64,13 @@ struct pcie_cfg_elem { vm_paddr_t papage; }; -enum { - CFGMECH_NONE = 0, - CFGMECH_1, - CFGMECH_2, - CFGMECH_PCIE, -}; - SYSCTL_DECL(_hw_pci); static TAILQ_HEAD(pcie_cfg_list, pcie_cfg_elem) pcie_list[MAXCPU]; static uint64_t pcie_base; static int pcie_minbus, pcie_maxbus; static uint32_t pcie_badslots; -static int cfgmech; +int cfgmech; static int devmax; static struct mtx pcicfg_mtx; static int mcfg_enable = 1; @@ -136,10 +129,8 @@ pcibios_get_version(void) int pci_cfgregopen(void) { - static int opened = 0; - uint64_t pciebar; - u_int16_t vid, did; - u_int16_t v; + uint16_t v; + static int opened = 0; if (opened) return (1); @@ -158,38 +149,7 @@ pci_cfgregopen(void) if (v >= 0x0210) pci_pir_open(); - if (cfgmech == CFGMECH_PCIE) - return (1); - - /* - * Grope around in the PCI config space to see if this is a - * chipset that is capable of doing memory-mapped config cycles. - * This also implies that it can do PCIe extended config cycles. - */ - - /* Check for supported chipsets */ - vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); - did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); - switch (vid) { - case 0x8086: - switch (did) { - case 0x3590: - case 0x3592: - /* Intel 7520 or 7320 */ - pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; - pcie_cfgregopen(pciebar, 0, 255); - break; - case 0x2580: - case 0x2584: - case 0x2590: - /* Intel 915, 925, or 915GM */ - pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); - pcie_cfgregopen(pciebar, 0, 255); - break; - } - } - - return(1); + return (1); } static uint32_t Modified: head/sys/x86/include/pci_cfgreg.h ============================================================================== --- head/sys/x86/include/pci_cfgreg.h Tue Apr 9 17:52:11 2019 (r346061) +++ head/sys/x86/include/pci_cfgreg.h Tue Apr 9 18:07:17 2019 (r346062) @@ -48,6 +48,15 @@ #define CONF2_ENABLE_CHK 0x0e #define CONF2_ENABLE_RES 0x0e +enum { + CFGMECH_NONE = 0, + CFGMECH_1, + CFGMECH_2, + CFGMECH_PCIE, +}; + +extern int cfgmech; + rman_res_t hostb_alloc_start(int type, rman_res_t start, rman_res_t end, rman_res_t count); int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); Modified: head/sys/x86/x86/legacy.c ============================================================================== --- head/sys/x86/x86/legacy.c Tue Apr 9 17:52:11 2019 (r346061) +++ head/sys/x86/x86/legacy.c Tue Apr 9 18:07:17 2019 (r346062) @@ -46,8 +46,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include #include #include @@ -111,10 +113,52 @@ legacy_probe(device_t dev) return (0); } +/* + * Grope around in the PCI config space to see if this is a chipset + * that is capable of doing memory-mapped config cycles. This also + * implies that it can do PCIe extended config cycles. + */ +static void +legacy_pci_cfgregopen(device_t dev) +{ + uint64_t pciebar; + u_int16_t did, vid; + + if (cfgmech == CFGMECH_NONE || cfgmech == CFGMECH_PCIE) + return; + + /* Check for supported chipsets */ + vid = pci_cfgregread(0, 0, 0, PCIR_VENDOR, 2); + did = pci_cfgregread(0, 0, 0, PCIR_DEVICE, 2); + switch (vid) { + case 0x8086: + switch (did) { + case 0x3590: + case 0x3592: + /* Intel 7520 or 7320 */ + pciebar = pci_cfgregread(0, 0, 0, 0xce, 2) << 16; + pcie_cfgregopen(pciebar, 0, 255); + break; + case 0x2580: + case 0x2584: + case 0x2590: + /* Intel 915, 925, or 915GM */ + pciebar = pci_cfgregread(0, 0, 0, 0x48, 4); + pcie_cfgregopen(pciebar, 0, 255); + break; + } + } + + if (bootverbose && cfgmech == CFGMECH_PCIE) + device_printf(dev, "Enabled ECAM PCIe accesses\n"); +} + static int legacy_attach(device_t dev) { device_t child; + + legacy_pci_cfgregopen(dev); /* * Let our child drivers identify any child devices that they From owner-svn-src-head@freebsd.org Tue Apr 9 18:38:08 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C16681568E1E; Tue, 9 Apr 2019 18:38:08 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 F0E727261A; Tue, 9 Apr 2019 18:38:07 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39IX4JY061477; Tue, 9 Apr 2019 11:33:04 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39IX4pW061476; Tue, 9 Apr 2019 11:33:04 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904091833.x39IX4pW061476@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 In-Reply-To: <749EBFB4-94B8-4FD9-8774-FE6FB18FFA07@bayofrum.net> To: Chris Rees Date: Tue, 9 Apr 2019 11:33:04 -0700 (PDT) CC: "O. Hartmann" , Chris Rees , 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-Rspamd-Queue-Id: F0E727261A X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 18:38:08 -0000 > Hey, > > On 9 April 2019 14:13:54 BST, "O. Hartmann" wrote: > >On Sun, 7 Apr 2019 18:31:45 +0000 (UTC) > >Chris Rees wrote: > > > >> Author: crees (doc,ports committer) > >> Date: Sun Apr 7 18:31:45 2019 > >> New Revision: 346017 > >> URL: https://svnweb.freebsd.org/changeset/base/346017 > >> > >> Log: > >> Remove now unnecessary kldstat check before attempting to load > >modules. > >> > >> Since r233109, kldload has the -n option, which silently ignores > >options > >> that are already loaded. > >> > >> > >https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.html > >> > >> Note that this script no longer reports if the module is already > >loaded, > >> but it could be argued this wasn't particularly useful information. > >> > >> PR: docs/234248 > >> Reviewed by: bcr (docs), kib, rgrimes (visual) > >> Approved by: jilles > >> Differential Revision: https://reviews.freebsd.org/D18670 > >> > >> Modified: > >> head/libexec/rc/rc.d/abi > >> head/libexec/rc/rc.d/bthidd > >> head/libexec/rc/rc.d/cfumass > >> head/libexec/rc/rc.d/kld > >> head/libexec/rc/rc.d/mdconfig > >> head/libexec/rc/rc.d/mdconfig2 > >> head/libexec/rc/rc.d/mountcritremote > >> head/libexec/rc/rc.d/syscons > >> head/libexec/rc/rc.subr > >> head/share/man/man5/rc.conf.5 > >> > >> Modified: head/libexec/rc/rc.d/abi > >> > >============================================================================== > > > {Snip} > > > >It seems this patch breaks ZFS if ZFS is built-in kernel! > > > >Having ZFS as kernel built-in leaves the system not mounting ANY(!) ZFS > >volume > >at boot time, rendering servers unusable. > >Mounting ZFS filesystems with "zfs mount -a" bring back the ZFS > >filesystems as > >expected. > > > > Are you sure it's this causing that? Please try reverting it. I think the trigger issue is: grep zfs /etc/rc.d/zvol rcvar="zfs_enable" required_modules="zfs" that module requires may be going south with the new code when the module is built into the kernel. > Chris -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 19:22:09 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A68D2156A614; Tue, 9 Apr 2019 19:22:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4854C75237; Tue, 9 Apr 2019 19:22:09 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27809F96D; Tue, 9 Apr 2019 19:22:09 +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 x39JM83O048973; Tue, 9 Apr 2019 19:22:08 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39JM8K1048972; Tue, 9 Apr 2019 19:22:08 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201904091922.x39JM8K1048972@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 9 Apr 2019 19:22:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346063 - head/sys/dev/acpica X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/acpica X-SVN-Commit-Revision: 346063 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4854C75237 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:22:09 -0000 Author: jhb Date: Tue Apr 9 19:22:08 2019 New Revision: 346063 URL: https://svnweb.freebsd.org/changeset/base/346063 Log: Don't pre-reserve resources for CPU devices when they are set. CPUs can use shared (RF_SHAREABLE) resources for the I/O port used for entering and exiting C states. If this I/O port is included in an ACPI system resource device, then this happens to still work, but if the port wasn't part of a system resource device, only the first CPU could allocate the I/O port and use C states since resource_list_reserve() was always allocating the resource from nexus0 without RF_SHAREABLE. By avoiding the reservation, the flags from the bus_alloc_resource() in the CPU driver (which include RF_SHAREABLE) are honored. PR: 236513 Reported by: stockhausen@collogia.de Sleuthing by: avg Reviewed by: avg MFC after: 2 weeks Modified: head/sys/dev/acpica/acpi.c Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Tue Apr 9 18:07:17 2019 (r346062) +++ head/sys/dev/acpica/acpi.c Tue Apr 9 19:22:08 2019 (r346063) @@ -1353,6 +1353,14 @@ acpi_set_resource(device_t dev, device_t child, int ty return (0); /* + * Don't reserve resources for CPU devices. Some of these + * resources need to be allocated as shareable, but reservations + * are always non-shareable. + */ + if (device_get_devclass(child) == devclass_find("cpu")) + return (0); + + /* * Reserve the resource. * * XXX: Ignores failure for now. Failure here is probably a From owner-svn-src-head@freebsd.org Tue Apr 9 19:29:15 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFB1A156A912; Tue, 9 Apr 2019 19:29:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5217275674; Tue, 9 Apr 2019 19:29:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 90A86FA72; Tue, 9 Apr 2019 19:29:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346052 - head/sys/dev/usb/net To: Ian Lepore , Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091354.x39Ds9e6070857@repo.freebsd.org> <33d96fdb-0218-6555-6f03-3105649a1904@FreeBSD.org> <969703ae8558b4b6f2930208e9c36927b546bb77.camel@freebsd.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <47360aeb-c2d0-7fc9-1924-399c34766547@FreeBSD.org> Date: Tue, 9 Apr 2019 12:29:12 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <969703ae8558b4b6f2930208e9c36927b546bb77.camel@freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5217275674 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.989,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:29:15 -0000 On 4/9/19 9:59 AM, Ian Lepore wrote: > On Tue, 2019-04-09 at 09:33 -0700, John Baldwin wrote: >> On 4/9/19 9:17 AM, Ian Lepore wrote: >>> On Tue, 2019-04-09 at 09:11 -0700, John Baldwin wrote: >>>> On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: >>>>> Author: ganbold >>>>> Date: Tue Apr 9 13:54:08 2019 >>>>> New Revision: 346052 >>>>> URL: https://svnweb.freebsd.org/changeset/base/346052 >>>>> >>>>> Log: >>>>> In some cases like NanoPI R1, its second USB ethernet >>>>> RTL8152 (chip version URE_CHIP_VER_4C10) doesn't >>>>> have hardwired MAC address, in other words, it is all zeros. >>>>> This commit fixes it by setting random MAC address >>>>> when MAC address is all zeros. >>>>> >>>>> Reviewed by: kevlo >>>>> Differential Revision: >>>>> https://reviews.freebsd.org/D19856 >>>> >>>> It would be best to not use a purely random mac address and to >>>> use >>>> the >>>> function kevans@ added recently. That function generates a MAC >>>> address >>>> from the FreeBSD OUI using a cryptographic hash so you get a >>>> stable address across boots on a given host. >>>> >>> >>> How could that possibly work? If it's not random, you can't have >>> two >>> such devices on the same network. If it is random, it's not stable >>> from one boot to the next. >> >> It uses the UUID and interface name as input into the hash. > >> The UUID is per-host. > > Oh, so it only works on x86 (or I guess any system that has something > like a bios that can provide you with a uuid that doesn't change from > one boot to the next). The function is in one centralized place where you are free to add other data as input into the hash. We do always generate a uuid that we save on boot if we aren't seeded with one by firmware, though that is probably too late for this driver (so +1 may in fact be a better route). It should be fine for psuedo interfaces created post-boot though even on non-x86 due to /etc/rc.d/hostid. Pure random MAC's are not really great either. -- John Baldwin From owner-svn-src-head@freebsd.org Tue Apr 9 19:41:00 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D85A156B250; Tue, 9 Apr 2019 19:41:00 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 929C7762EE; Tue, 9 Apr 2019 19:40:59 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lj1-f169.google.com with SMTP id k8so15562002lja.8; Tue, 09 Apr 2019 12:40:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=och4NhkEw9oj78zlzVQElfkdPRmfbVXFrRbxAeya7r0=; b=p/g9pGv2h898mTlYhPSb0TGCusbuBer6FAna59kwh9l028VoJ8RhrZ4L9kuzhd8/eT 3oiSKyorUNFAIZ2/jOnACOeF2Ylfls0DZjTrg9dvARAkE7W2C6GAGlr8IFpmDWtgk97h gKaGhk5PivI1ijPgiARPnVeEVkY0OHJMPaNswMY1oQae9vJTUq+6J1g2qCZOU77YfBTM 4BeLvfR1zyCpFccS1rAobZCfkvSSSsuTCYfXP7Gk6zl/qh/ppZl9RU/1HVOFsdv/0jUI ajNbZfWHQ4gjp9ajLF4Knvq+rf8cToXboq+DSgCGw0CTSaAt9qe6kJKwO0grfkOysASm +Eew== X-Gm-Message-State: APjAAAXWsT/iBu/+IN4P6zuSyQPuf34uJfk7QbP7wwf6mmIxWJqPqPJ+ q8CRQ/5J/DNOvypR+5gvl0fdMi88 X-Google-Smtp-Source: APXvYqxhaziO/bbnTvAwT62w43J76XPbD7KtxT7d9uhtC2VS1XTCvaxWxdYsLqDCb9kXe3JuOnf8/w== X-Received: by 2002:a2e:42cf:: with SMTP id h76mr20012215ljf.95.1554838852247; Tue, 09 Apr 2019 12:40:52 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id g21sm249208lfj.79.2019.04.09.12.40.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 12:40:51 -0700 (PDT) Subject: Re: svn commit: r346063 - head/sys/dev/acpica To: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091922.x39JM8K1048972@repo.freebsd.org> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; prefer-encrypt=mutual; keydata= xsFNBFm4LIgBEADNB/3lT7f15UKeQ52xCFQx/GqHkSxEdVyLFZTmY3KyNPQGBtyvVyBfprJ7 mAeXZWfhat6cKNRAGZcL5EmewdQuUfQfBdYmKjbw3a9GFDsDNuhDA2QwFt8BmkiVMRYyvI7l N0eVzszWCUgdc3qqM6qqcgBaqsVmJluwpvwp4ZBXmch5BgDDDb1MPO8AZ2QZfIQmplkj8Y6Z AiNMknkmgaekIINSJX8IzRzKD5WwMsin70psE8dpL/iBsA2cpJGzWMObVTtCxeDKlBCNqM1i gTXta1ukdUT7JgLEFZk9ceYQQMJJtUwzWu1UHfZn0Fs29HTqawfWPSZVbulbrnu5q55R4PlQ /xURkWQUTyDpqUvb4JK371zhepXiXDwrrpnyyZABm3SFLkk2bHlheeKU6Yql4pcmSVym1AS4 dV8y0oHAfdlSCF6tpOPf2+K9nW1CFA8b/tw4oJBTtfZ1kxXOMdyZU5fiG7xb1qDgpQKgHUX8 7Rd2T1UVLVeuhYlXNw2F+a2ucY+cMoqz3LtpksUiBppJhw099gEXehcN2JbUZ2TueJdt1FdS ztnZmsHUXLxrRBtGwqnFL7GSd6snpGIKuuL305iaOGODbb9c7ne1JqBbkw1wh8ci6vvwGlzx rexzimRaBzJxlkjNfMx8WpCvYebGMydNoeEtkWldtjTNVsUAtQARAQABzR5BbmRyaXkgR2Fw b24gPGF2Z0BGcmVlQlNELm9yZz7CwZQEEwEIAD4WIQS+LEO7ngQnXA4Bjr538m7TUc1yjwUC WbgsiAIbIwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRB38m7TUc1yj+JAEACV l9AK/nOWAt/9cufV2fRj0hdOqB1aCshtSrwHk/exXsDa4/FkmegxXQGY+3GWX3deIyesbVRL rYdtdK0dqJyT1SBqXK1h3/at9rxr9GQA6KWOxTjUFURsU7ok/6SIlm8uLRPNKO+yq0GDjgaO LzN+xykuBA0FlhQAXJnpZLcVfPJdWv7sSHGedL5ln8P8rxR+XnmsA5TUaaPcbhTB+mG+iKFj GghASDSfGqLWFPBlX/fpXikBDZ1gvOr8nyMY9nXhgfXpq3B6QCRYKPy58ChrZ5weeJZ29b7/ QdEO8NFNWHjSD9meiLdWQaqo9Y7uUxN3wySc/YUZxtS0bhAd8zJdNPsJYG8sXgKjeBQMVGuT eCAJFEYJqbwWvIXMfVWop4+O4xB+z2YE3jAbG/9tB/GSnQdVSj3G8MS80iLS58frnt+RSEw/ psahrfh0dh6SFHttE049xYiC+cM8J27Aaf0i9RflyITq57NuJm+AHJoU9SQUkIF0nc6lfA+o JRiyRlHZHKoRQkIg4aiKaZSWjQYRl5Txl0IZUP1dSWMX4s3XTMurC/pnja45dge/4ESOtJ9R 8XuIWg45Oq6MeIWdjKddGhRj3OohsltKgkEU3eLKYtB6qRTQypHHUawCXz88uYt5e3w4V16H lCpSTZV/EVHnNe45FVBlvK7k7HFfDDkryM7BTQRZuCyIARAAlq0slcsVboY/+IUJdcbEiJRW be9HKVz4SUchq0z9MZPX/0dcnvz/gkyYA+OuM78dNS7Mbby5dTvOqfpLJfCuhaNYOhlE0wY+ 1T6Tf1f4c/uA3U/YiadukQ3+6TJuYGAdRZD5EqYFIkreARTVWg87N9g0fT9BEqLw9lJtEGDY EWUE7L++B8o4uu3LQFEYxcrb4K/WKmgtmFcm77s0IKDrfcX4doV92QTIpLiRxcOmCC/OCYuO jB1oaaqXQzZrCutXRK0L5XN1Y1PYjIrEzHMIXmCDlLYnpFkK+itlXwlE2ZQxkfMruCWdQXye syl2fynAe8hvp7Mms9qU2r2K9EcJiR5N1t1C2/kTKNUhcRv7Yd/vwusK7BqJbhlng5ZgRx0m WxdntU/JLEntz3QBsBsWM9Y9wf2V4tLv6/DuDBta781RsCB/UrU2zNuOEkSixlUiHxw1dccI 6CVlaWkkJBxmHX22GdDFrcjvwMNIbbyfQLuBq6IOh8nvu9vuItup7qemDG3Ms6TVwA7BD3j+ 3fGprtyW8Fd/RR2bW2+LWkMrqHffAr6Y6V3h5kd2G9Q8ZWpEJk+LG6Mk3fhZhmCnHhDu6CwN MeUvxXDVO+fqc3JjFm5OxhmfVeJKrbCEUJyM8ESWLoNHLqjywdZga4Q7P12g8DUQ1mRxYg/L HgZY3zfKOqcAEQEAAcLBfAQYAQgAJhYhBL4sQ7ueBCdcDgGOvnfybtNRzXKPBQJZuCyIAhsM BQkFo5qAAAoJEHfybtNRzXKPBVwQAKfFy9P7N3OsLDMB56A4Kf+ZT+d5cIx0Yiaf4n6w7m3i ImHHHk9FIetI4Xe54a2IXh4Bq5UkAGY0667eIs+Z1Ea6I2i27Sdo7DxGwq09Qnm/Y65ADvXs 3aBvokCcm7FsM1wky395m8xUos1681oV5oxgqeRI8/76qy0hD9WR65UW+HQgZRIcIjSel9vR XDaD2HLGPTTGr7u4v00UeTMs6qvPsa2PJagogrKY8RXdFtXvweQFz78NbXhluwix2Tb9ETPk LIpDrtzV73CaE2aqBG/KrboXT2C67BgFtnk7T7Y7iKq4/XvEdDWscz2wws91BOXuMMd4c/c4 OmGW9m3RBLufFrOag1q5yUS9QbFfyqL6dftJP3Zq/xe+mr7sbWbhPVCQFrH3r26mpmy841ym dwQnNcsbIGiBASBSKksOvIDYKa2Wy8htPmWFTEOPRpFXdGQ27awcjjnB42nngyCK5ukZDHi6 w0qK5DNQQCkiweevCIC6wc3p67jl1EMFY5+z+zdTPb3h7LeVnGqW0qBQl99vVFgzLxchKcl0 R/paSFgwqXCZhAKMuUHncJuynDOP7z5LirUeFI8qsBAJi1rXpQoLJTVcW72swZ42IdPiboqx NbTMiNOiE36GqMcTPfKylCbF45JNX4nF9ElM0E+Y8gi4cizJYBRr2FBJgay0b9Cp Message-ID: Date: Tue, 9 Apr 2019 22:40:50 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <201904091922.x39JM8K1048972@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 929C7762EE X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:41:00 -0000 On 09/04/2019 22:22, John Baldwin wrote: > Author: jhb > Date: Tue Apr 9 19:22:08 2019 > New Revision: 346063 > URL: https://svnweb.freebsd.org/changeset/base/346063 > > Log: > Don't pre-reserve resources for CPU devices when they are set. > > CPUs can use shared (RF_SHAREABLE) resources for the I/O port used for > entering and exiting C states. If this I/O port is included in an ACPI > system resource device, then this happens to still work, but if the port > wasn't part of a system resource device, only the first CPU could allocate > the I/O port and use C states since resource_list_reserve() was always > allocating the resource from nexus0 without RF_SHAREABLE. By avoiding > the reservation, the flags from the bus_alloc_resource() in the CPU driver > (which include RF_SHAREABLE) are honored. > > PR: 236513 > Reported by: stockhausen@collogia.de > Sleuthing by: avg Actually, 80-90% of it was done by the reporter. I just pieced it together :) > Reviewed by: avg > MFC after: 2 weeks -- Andriy Gapon From owner-svn-src-head@freebsd.org Tue Apr 9 19:44:34 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB133156B641; Tue, 9 Apr 2019 19:44:34 +0000 (UTC) (envelope-from chris@rees.space) Received: from mail56c50.megamailservers.eu (mail168c50.megamailservers.eu [91.136.10.178]) (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 CC39176736; Tue, 9 Apr 2019 19:44:32 +0000 (UTC) (envelope-from chris@rees.space) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554839064; bh=lL2SyZ4bKP4rDwFGUY+fNQjVuMtUDqmCCBGEmCMCMyI=; h=Subject:To:CC:References:From:Date:In-Reply-To:From; b=NAwbUG6MxcTBwR+r8kvxTfSD5V8jReGTv2HXE8hx/81FcGWLVE5q9qNSufpSUsP4x i8Uquhl1rNC0f5Kld9ji8EHnudNQ3MFAvNq058DXugrVegocczcbsuMPkWT4rTpX+l w1/nB5yH8SI63px9/rYAdFB7VfDiTqQ/8Qb1kxAw= Feedback-ID: chris@rees.spac Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail56c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x39JiMsh017486; Tue, 9 Apr 2019 19:44:24 +0000 Received: from [192.168.1.121] (POSEIDON.bayofrum.net [192.168.1.121]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 5C79F17BD; Tue, 9 Apr 2019 20:44:20 +0100 (BST) Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: rgrimes@freebsd.org, Chris Rees CC: "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091833.x39IX4pW061476@gndrsh.dnsmgr.net> From: Chris Rees Message-ID: <11ce03d7-8ebc-2b08-baa8-3fb31a29b3b2@rees.space> Date: Tue, 9 Apr 2019 20:43:27 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904091833.x39IX4pW061476@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 5C79F17BD.A289E X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: chris@rees.space X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B020F.5CACF618.0060, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=G6gy7es5 c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=oexKYjalfGEA:10 a=Y8a21bOVD5kA:10 a=ZZnuYtJkoWoA:10 a=iaTFZB6CAAAA:8 a=6I5d2MoRAAAA:8 a=FFKAGiKUUngNVcG6qM8A:9 a=QEXdDO2ut3YA:10 a=HOOHyrUpFT4A:10 a=QWXrQ9iV8q7LKaLQ9lfw:22 a=IjZwj45LgO3ly-622nXo:22 X-Rspamd-Queue-Id: CC39176736 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:44:35 -0000 Hi Rod, On 09/04/2019 19:33, Rodney W. Grimes wrote: >> Hey, >> >> On 9 April 2019 14:13:54 BST, "O. Hartmann" wrote: >>> On Sun, 7 Apr 2019 18:31:45 +0000 (UTC) >>> Chris Rees wrote: >>> >>>> Author: crees (doc,ports committer) >>>> Date: Sun Apr 7 18:31:45 2019 >>>> New Revision: 346017 >>>> URL: https://svnweb.freebsd.org/changeset/base/346017 >>>> >>>> Log: >>>> Remove now unnecessary kldstat check before attempting to load >>> modules. >>>> Since r233109, kldload has the -n option, which silently ignores >>> options >>>> that are already loaded. >>>> >>>> >>> https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.html >>>> Note that this script no longer reports if the module is already >>> loaded, >>>> but it could be argued this wasn't particularly useful information. >>>> >>>> PR: docs/234248 >>>> Reviewed by: bcr (docs), kib, rgrimes (visual) >>>> Approved by: jilles >>>> Differential Revision: https://reviews.freebsd.org/D18670 >>>> >>>> Modified: >>>> head/libexec/rc/rc.d/abi >>>> head/libexec/rc/rc.d/bthidd >>>> head/libexec/rc/rc.d/cfumass >>>> head/libexec/rc/rc.d/kld >>>> head/libexec/rc/rc.d/mdconfig >>>> head/libexec/rc/rc.d/mdconfig2 >>>> head/libexec/rc/rc.d/mountcritremote >>>> head/libexec/rc/rc.d/syscons >>>> head/libexec/rc/rc.subr >>>> head/share/man/man5/rc.conf.5 >>>> >>>> Modified: head/libexec/rc/rc.d/abi >>>> >>> ============================================================================== >> >> {Snip} >> >> >>> It seems this patch breaks ZFS if ZFS is built-in kernel! >>> >>> Having ZFS as kernel built-in leaves the system not mounting ANY(!) ZFS >>> volume >>> at boot time, rendering servers unusable. >>> Mounting ZFS filesystems with "zfs mount -a" bring back the ZFS >>> filesystems as >>> expected. >>> >> Are you sure it's this causing that? Please try reverting it. > I think the trigger issue is: > grep zfs /etc/rc.d/zvol > rcvar="zfs_enable" > required_modules="zfs" > > that module requires may be going south with the > new code when the module is built into the kernel. I wondered that, but I don't think so. [crees@pegasus]~% kldstat -v |head Id Refs Address            Size     Name  1   30 0xffffffff80200000 11df240  kernel (/boot/kernel.PEGASUS/kernel)         Contains modules:                 Id Name                 227 newreno                 215 if_lo                 229 ipsec                 228 mld                 226 igmp                 201 elf32 [crees@pegasus]~% sudo kldload ipsec kldload: can't load ipsec: module already loaded or in kernel [crees@pegasus]~% sudo kldload -n ipsec [crees@pegasus]~% echo $? 0 [crees@pegasus]~% The required_modules code calls load_kld, which uses kldload -n. This always returns true... unless Oliver has removed the zfs module from /boot/kernel perhaps? Chris -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Tue Apr 9 19:45:04 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9699A156B6A2; Tue, 9 Apr 2019 19:45:04 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EEE26768C0; Tue, 9 Apr 2019 19:45:03 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lj1-f195.google.com with SMTP id v22so15579341lje.9; Tue, 09 Apr 2019 12:45:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=0VVIkpw1lLnbh8je8g/i0Z+hARO5IB2gwXWEZm/ET9o=; b=uJbPxDg64ABSn/V15IIyZu32DXxWr+yR62dFojhIS+hqoyHqI8fzPtCzIth1fa4Q7J iq8OdCjgev80gLw+8JNQZAN5SqFBFqIR2PX8GDERjrQuLrByNKNc/iODUwQC8MLt0+MA TA3HrK+OQBbjVRC6z5iIuAsb9zlWBeIaIgoK877sw/9+kb3nbC16Lsr2yqX3inNL/EbZ tDPaoa+yfVd/GKFhZwW05ddYlrwuqZNL5l4OmJH5pM88xgIoG4FzgtDvb1TOR6eB2tNV vymRKCBVMCspft5j13nMj3FQTpcSDI6gnU13W3/xZNqz1P/Ph3qvANk9sxbKtNuwa726 nscg== X-Gm-Message-State: APjAAAUvOkKCWB+RdwcGGqpp3xSZ9pOli+6xKcaV/o3Q59/YoJ/iIZFJ gka18xMZ6/hvwI58XOUMzcp/pvgG X-Google-Smtp-Source: APXvYqwA6JyQYo1gPM872SrCrb53xKLRpARc4AFjuuy7BN3HlWvPkgxq6zGsabEUsQg0wzF/Dz0wGQ== X-Received: by 2002:a2e:9619:: with SMTP id v25mr20121397ljh.145.1554837732455; Tue, 09 Apr 2019 12:22:12 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id j10sm1821273lfc.56.2019.04.09.12.22.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 12:22:11 -0700 (PDT) Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: rgrimes@freebsd.org, Chris Rees Cc: "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091833.x39IX4pW061476@gndrsh.dnsmgr.net> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; prefer-encrypt=mutual; keydata= xsFNBFm4LIgBEADNB/3lT7f15UKeQ52xCFQx/GqHkSxEdVyLFZTmY3KyNPQGBtyvVyBfprJ7 mAeXZWfhat6cKNRAGZcL5EmewdQuUfQfBdYmKjbw3a9GFDsDNuhDA2QwFt8BmkiVMRYyvI7l N0eVzszWCUgdc3qqM6qqcgBaqsVmJluwpvwp4ZBXmch5BgDDDb1MPO8AZ2QZfIQmplkj8Y6Z AiNMknkmgaekIINSJX8IzRzKD5WwMsin70psE8dpL/iBsA2cpJGzWMObVTtCxeDKlBCNqM1i gTXta1ukdUT7JgLEFZk9ceYQQMJJtUwzWu1UHfZn0Fs29HTqawfWPSZVbulbrnu5q55R4PlQ /xURkWQUTyDpqUvb4JK371zhepXiXDwrrpnyyZABm3SFLkk2bHlheeKU6Yql4pcmSVym1AS4 dV8y0oHAfdlSCF6tpOPf2+K9nW1CFA8b/tw4oJBTtfZ1kxXOMdyZU5fiG7xb1qDgpQKgHUX8 7Rd2T1UVLVeuhYlXNw2F+a2ucY+cMoqz3LtpksUiBppJhw099gEXehcN2JbUZ2TueJdt1FdS ztnZmsHUXLxrRBtGwqnFL7GSd6snpGIKuuL305iaOGODbb9c7ne1JqBbkw1wh8ci6vvwGlzx rexzimRaBzJxlkjNfMx8WpCvYebGMydNoeEtkWldtjTNVsUAtQARAQABzR5BbmRyaXkgR2Fw b24gPGF2Z0BGcmVlQlNELm9yZz7CwZQEEwEIAD4WIQS+LEO7ngQnXA4Bjr538m7TUc1yjwUC WbgsiAIbIwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRB38m7TUc1yj+JAEACV l9AK/nOWAt/9cufV2fRj0hdOqB1aCshtSrwHk/exXsDa4/FkmegxXQGY+3GWX3deIyesbVRL rYdtdK0dqJyT1SBqXK1h3/at9rxr9GQA6KWOxTjUFURsU7ok/6SIlm8uLRPNKO+yq0GDjgaO LzN+xykuBA0FlhQAXJnpZLcVfPJdWv7sSHGedL5ln8P8rxR+XnmsA5TUaaPcbhTB+mG+iKFj GghASDSfGqLWFPBlX/fpXikBDZ1gvOr8nyMY9nXhgfXpq3B6QCRYKPy58ChrZ5weeJZ29b7/ QdEO8NFNWHjSD9meiLdWQaqo9Y7uUxN3wySc/YUZxtS0bhAd8zJdNPsJYG8sXgKjeBQMVGuT eCAJFEYJqbwWvIXMfVWop4+O4xB+z2YE3jAbG/9tB/GSnQdVSj3G8MS80iLS58frnt+RSEw/ psahrfh0dh6SFHttE049xYiC+cM8J27Aaf0i9RflyITq57NuJm+AHJoU9SQUkIF0nc6lfA+o JRiyRlHZHKoRQkIg4aiKaZSWjQYRl5Txl0IZUP1dSWMX4s3XTMurC/pnja45dge/4ESOtJ9R 8XuIWg45Oq6MeIWdjKddGhRj3OohsltKgkEU3eLKYtB6qRTQypHHUawCXz88uYt5e3w4V16H lCpSTZV/EVHnNe45FVBlvK7k7HFfDDkryM7BTQRZuCyIARAAlq0slcsVboY/+IUJdcbEiJRW be9HKVz4SUchq0z9MZPX/0dcnvz/gkyYA+OuM78dNS7Mbby5dTvOqfpLJfCuhaNYOhlE0wY+ 1T6Tf1f4c/uA3U/YiadukQ3+6TJuYGAdRZD5EqYFIkreARTVWg87N9g0fT9BEqLw9lJtEGDY EWUE7L++B8o4uu3LQFEYxcrb4K/WKmgtmFcm77s0IKDrfcX4doV92QTIpLiRxcOmCC/OCYuO jB1oaaqXQzZrCutXRK0L5XN1Y1PYjIrEzHMIXmCDlLYnpFkK+itlXwlE2ZQxkfMruCWdQXye syl2fynAe8hvp7Mms9qU2r2K9EcJiR5N1t1C2/kTKNUhcRv7Yd/vwusK7BqJbhlng5ZgRx0m WxdntU/JLEntz3QBsBsWM9Y9wf2V4tLv6/DuDBta781RsCB/UrU2zNuOEkSixlUiHxw1dccI 6CVlaWkkJBxmHX22GdDFrcjvwMNIbbyfQLuBq6IOh8nvu9vuItup7qemDG3Ms6TVwA7BD3j+ 3fGprtyW8Fd/RR2bW2+LWkMrqHffAr6Y6V3h5kd2G9Q8ZWpEJk+LG6Mk3fhZhmCnHhDu6CwN MeUvxXDVO+fqc3JjFm5OxhmfVeJKrbCEUJyM8ESWLoNHLqjywdZga4Q7P12g8DUQ1mRxYg/L HgZY3zfKOqcAEQEAAcLBfAQYAQgAJhYhBL4sQ7ueBCdcDgGOvnfybtNRzXKPBQJZuCyIAhsM BQkFo5qAAAoJEHfybtNRzXKPBVwQAKfFy9P7N3OsLDMB56A4Kf+ZT+d5cIx0Yiaf4n6w7m3i ImHHHk9FIetI4Xe54a2IXh4Bq5UkAGY0667eIs+Z1Ea6I2i27Sdo7DxGwq09Qnm/Y65ADvXs 3aBvokCcm7FsM1wky395m8xUos1681oV5oxgqeRI8/76qy0hD9WR65UW+HQgZRIcIjSel9vR XDaD2HLGPTTGr7u4v00UeTMs6qvPsa2PJagogrKY8RXdFtXvweQFz78NbXhluwix2Tb9ETPk LIpDrtzV73CaE2aqBG/KrboXT2C67BgFtnk7T7Y7iKq4/XvEdDWscz2wws91BOXuMMd4c/c4 OmGW9m3RBLufFrOag1q5yUS9QbFfyqL6dftJP3Zq/xe+mr7sbWbhPVCQFrH3r26mpmy841ym dwQnNcsbIGiBASBSKksOvIDYKa2Wy8htPmWFTEOPRpFXdGQ27awcjjnB42nngyCK5ukZDHi6 w0qK5DNQQCkiweevCIC6wc3p67jl1EMFY5+z+zdTPb3h7LeVnGqW0qBQl99vVFgzLxchKcl0 R/paSFgwqXCZhAKMuUHncJuynDOP7z5LirUeFI8qsBAJi1rXpQoLJTVcW72swZ42IdPiboqx NbTMiNOiE36GqMcTPfKylCbF45JNX4nF9ElM0E+Y8gi4cizJYBRr2FBJgay0b9Cp Message-ID: Date: Tue, 9 Apr 2019 22:22:09 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <201904091833.x39IX4pW061476@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: EEE26768C0 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:45:04 -0000 On 09/04/2019 21:33, Rodney W. Grimes wrote: > I think the trigger issue is: > grep zfs /etc/rc.d/zvol > rcvar="zfs_enable" > required_modules="zfs" > > that module requires may be going south with the > new code when the module is built into the kernel. Maybe it's because the module's name is zfsctrl (for whatever reason) while the module file is named zfs.ko. -- Andriy Gapon From owner-svn-src-head@freebsd.org Tue Apr 9 19:48:15 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCC78156B8D1; Tue, 9 Apr 2019 19:48:15 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 37C4F76C3C; Tue, 9 Apr 2019 19:48:15 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39JmBQ7061858; Tue, 9 Apr 2019 12:48:11 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39JmBZk061857; Tue, 9 Apr 2019 12:48:11 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904091948.x39JmBZk061857@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346052 - head/sys/dev/usb/net In-Reply-To: <47360aeb-c2d0-7fc9-1924-399c34766547@FreeBSD.org> To: John Baldwin Date: Tue, 9 Apr 2019 12:48:11 -0700 (PDT) CC: Ian Lepore , Ganbold Tsagaankhuu , 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-Rspamd-Queue-Id: 37C4F76C3C X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.95)[-0.947,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:48:16 -0000 > On 4/9/19 9:59 AM, Ian Lepore wrote: > > On Tue, 2019-04-09 at 09:33 -0700, John Baldwin wrote: > >> On 4/9/19 9:17 AM, Ian Lepore wrote: > >>> On Tue, 2019-04-09 at 09:11 -0700, John Baldwin wrote: > >>>> On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: > >>>>> Author: ganbold > >>>>> Date: Tue Apr 9 13:54:08 2019 > >>>>> New Revision: 346052 > >>>>> URL: https://svnweb.freebsd.org/changeset/base/346052 > >>>>> > >>>>> Log: > >>>>> In some cases like NanoPI R1, its second USB ethernet > >>>>> RTL8152 (chip version URE_CHIP_VER_4C10) doesn't > >>>>> have hardwired MAC address, in other words, it is all zeros. > >>>>> This commit fixes it by setting random MAC address > >>>>> when MAC address is all zeros. > >>>>> > >>>>> Reviewed by: kevlo > >>>>> Differential Revision: > >>>>> https://reviews.freebsd.org/D19856 > >>>> > >>>> It would be best to not use a purely random mac address and to > >>>> use > >>>> the > >>>> function kevans@ added recently. That function generates a MAC > >>>> address > >>>> from the FreeBSD OUI using a cryptographic hash so you get a > >>>> stable address across boots on a given host. > >>>> > >>> > >>> How could that possibly work? If it's not random, you can't have > >>> two > >>> such devices on the same network. If it is random, it's not stable > >>> from one boot to the next. > >> > >> It uses the UUID and interface name as input into the hash. > > > >> The UUID is per-host. > > > > Oh, so it only works on x86 (or I guess any system that has something > > like a bios that can provide you with a uuid that doesn't change from > > one boot to the next). > > The function is in one centralized place where you are free to add other > data as input into the hash. We do always generate a uuid that we save > on boot if we aren't seeded with one by firmware, though that is probably > too late for this driver (so +1 may in fact be a better route). It should > be fine for psuedo interfaces created post-boot though even on non-x86 due > to /etc/rc.d/hostid. Pure random MAC's are not really great either. Cant the loader load /etc/rc.d/hostid and put it in something that the kernel could get at, or a module written that handles this? > -- > John Baldwin -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 19:49:42 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E3AA156B9D3; Tue, 9 Apr 2019 19:49:42 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 0F47876DE3; Tue, 9 Apr 2019 19:49:41 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39JnaKr061871; Tue, 9 Apr 2019 12:49:36 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39Jnagv061870; Tue, 9 Apr 2019 12:49:36 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904091949.x39Jnagv061870@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 In-Reply-To: <11ce03d7-8ebc-2b08-baa8-3fb31a29b3b2@rees.space> To: Chris Rees Date: Tue, 9 Apr 2019 12:49:36 -0700 (PDT) CC: rgrimes@freebsd.org, Chris Rees , "O. Hartmann" , Chris Rees , 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-Rspamd-Queue-Id: 0F47876DE3 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:49:42 -0000 [ Charset UTF-8 unsupported, converting... ] > Hi Rod, > > On 09/04/2019 19:33, Rodney W. Grimes wrote: > >> Hey, > >> > >> On 9 April 2019 14:13:54 BST, "O. Hartmann" wrote: > >>> On Sun, 7 Apr 2019 18:31:45 +0000 (UTC) > >>> Chris Rees wrote: > >>> > >>>> Author: crees (doc,ports committer) > >>>> Date: Sun Apr 7 18:31:45 2019 > >>>> New Revision: 346017 > >>>> URL: https://svnweb.freebsd.org/changeset/base/346017 > >>>> > >>>> Log: > >>>> Remove now unnecessary kldstat check before attempting to load > >>> modules. > >>>> Since r233109, kldload has the -n option, which silently ignores > >>> options > >>>> that are already loaded. > >>>> > >>>> > >>> https://lists.freebsd.org/pipermail/freebsd-rc/2018-December/003899.html > >>>> Note that this script no longer reports if the module is already > >>> loaded, > >>>> but it could be argued this wasn't particularly useful information. > >>>> > >>>> PR: docs/234248 > >>>> Reviewed by: bcr (docs), kib, rgrimes (visual) > >>>> Approved by: jilles > >>>> Differential Revision: https://reviews.freebsd.org/D18670 > >>>> > >>>> Modified: > >>>> head/libexec/rc/rc.d/abi > >>>> head/libexec/rc/rc.d/bthidd > >>>> head/libexec/rc/rc.d/cfumass > >>>> head/libexec/rc/rc.d/kld > >>>> head/libexec/rc/rc.d/mdconfig > >>>> head/libexec/rc/rc.d/mdconfig2 > >>>> head/libexec/rc/rc.d/mountcritremote > >>>> head/libexec/rc/rc.d/syscons > >>>> head/libexec/rc/rc.subr > >>>> head/share/man/man5/rc.conf.5 > >>>> > >>>> Modified: head/libexec/rc/rc.d/abi > >>>> > >>> ============================================================================== > >> > >> {Snip} > >> > >> > >>> It seems this patch breaks ZFS if ZFS is built-in kernel! > >>> > >>> Having ZFS as kernel built-in leaves the system not mounting ANY(!) ZFS > >>> volume > >>> at boot time, rendering servers unusable. > >>> Mounting ZFS filesystems with "zfs mount -a" bring back the ZFS > >>> filesystems as > >>> expected. > >>> > >> Are you sure it's this causing that? Please try reverting it. > > I think the trigger issue is: > > grep zfs /etc/rc.d/zvol > > rcvar="zfs_enable" > > required_modules="zfs" > > > > that module requires may be going south with the > > new code when the module is built into the kernel. > > > I wondered that, but I don't think so. > > [crees@pegasus]~% kldstat -v |head > Id Refs Address??????????? Size???? Name > ?1?? 30 0xffffffff80200000 11df240? kernel (/boot/kernel.PEGASUS/kernel) > ??????? Contains modules: > ??????????????? Id Name > ??????????????? 227 newreno > ??????????????? 215 if_lo > ??????????????? 229 ipsec > ??????????????? 228 mld > ??????????????? 226 igmp > ??????????????? 201 elf32 > [crees@pegasus]~% sudo kldload ipsec > kldload: can't load ipsec: module already loaded or in kernel > [crees@pegasus]~% sudo kldload -n ipsec > [crees@pegasus]~% echo $? > 0 > [crees@pegasus]~% > > The required_modules code calls load_kld, which uses kldload -n. This > always returns true... unless Oliver has removed the zfs module from > /boot/kernel perhaps? He explicitly stated he is running with ZFS compiled into his kernel, in that situation there well be no /boot/kernel/zfs.ko file. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 19:55:03 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B77BD156BC9C; Tue, 9 Apr 2019 19:55:03 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5AA7F772D7; Tue, 9 Apr 2019 19:55:03 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 33400FE9F; Tue, 9 Apr 2019 19:55:03 +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 x39Jt3pS068855; Tue, 9 Apr 2019 19:55:03 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39Jt35P068854; Tue, 9 Apr 2019 19:55:03 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904091955.x39Jt35P068854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 9 Apr 2019 19:55:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346064 - head/sys/fs/msdosfs X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/fs/msdosfs X-SVN-Commit-Revision: 346064 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5AA7F772D7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:55:04 -0000 Author: kib Date: Tue Apr 9 19:55:02 2019 New Revision: 346064 URL: https://svnweb.freebsd.org/changeset/base/346064 Log: Fix dirty buf exhaustion easily triggered with msdosfs. If truncate(2) is performed on msdosfs file, which extends the file by system-depended large amount, fs creates corresponding amount of dirty delayed-write buffers, which can consume all buffers. Such buffers cannot be flushed by the bufdaemon because the ftruncate() thread owns the vnode lock. So the system runs out of free buffers, and even truncate() thread starves, which means deadlock because it owns the vnode lock. Fix this by doing vnode fsync in extendfile() when low memory or low buffers condition detected, which flushes all dirty buffers belonging to the file being extended. Note that the more usual fallback to bawrite() does not work acceptable in this situation, because it would only allow one buffer to be recycled. Other filesystems, most important UFS, do not allow userspace to create arbitrary amount of dirty delayed-write buffers without feedback, so bawrite() is good enough for them. Reported and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/fs/msdosfs/msdosfs_fat.c Modified: head/sys/fs/msdosfs/msdosfs_fat.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_fat.c Tue Apr 9 19:22:08 2019 (r346063) +++ head/sys/fs/msdosfs/msdosfs_fat.c Tue Apr 9 19:55:02 2019 (r346064) @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -979,6 +980,7 @@ extendfile(struct denode *dep, u_long count, struct bu u_long cn, got; struct msdosfsmount *pmp = dep->de_pmp; struct buf *bp; + struct vop_fsync_args fsync_ap; daddr_t blkno; /* @@ -1086,8 +1088,16 @@ extendfile(struct denode *dep, u_long count, struct bu if (bpp) { *bpp = bp; bpp = NULL; - } else + } else { bdwrite(bp); + } + if (vm_page_count_severe() || + buf_dirty_count_severe()) { + fsync_ap.a_vp = DETOV(dep); + fsync_ap.a_waitfor = MNT_WAIT; + fsync_ap.a_td = curthread; + vop_stdfsync(&fsync_ap); + } } } } From owner-svn-src-head@freebsd.org Tue Apr 9 19:55:15 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72FF2156BCC0; Tue, 9 Apr 2019 19:55:15 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 CE70F773A0; Tue, 9 Apr 2019 19:55:14 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39Jt7AO061908; Tue, 9 Apr 2019 12:55:07 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39Jt7PU061907; Tue, 9 Apr 2019 12:55:07 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904091955.x39Jt7PU061907@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 In-Reply-To: To: Andriy Gapon Date: Tue, 9 Apr 2019 12:55:07 -0700 (PDT) CC: rgrimes@freebsd.org, Chris Rees , "O. Hartmann" , Chris Rees , 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-Rspamd-Queue-Id: CE70F773A0 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:55:15 -0000 > On 09/04/2019 21:33, Rodney W. Grimes wrote: > > I think the trigger issue is: > > grep zfs /etc/rc.d/zvol > > rcvar="zfs_enable" > > required_modules="zfs" > > > > that module requires may be going south with the > > new code when the module is built into the kernel. > > Maybe it's because the module's name is zfsctrl (for whatever reason) while the > module file is named zfs.ko. I suspect that could also lead to issues with the new code. It seems to be failing to detect that zfs is infact functional in the kernel, and blindly, or not so blindly, trying to load zfs,ko, which when you build it into the kernel you usually do so without any modules built, so there is no /boot/kernel/zfs.ko, and even if you did build it any attempt to load it would return an error. > -- > Andriy Gapon -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 19:59:37 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8597F156BE4A; Tue, 9 Apr 2019 19:59:37 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mail33c50.megamailservers.eu (mail163c50.megamailservers.eu [91.136.10.173]) (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 56C917763D; Tue, 9 Apr 2019 19:59:36 +0000 (UTC) (envelope-from crees@bayofrum.net) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554839974; bh=0AVFxwxLjDgPCJcKGttwzvBhH76e6hWPEpScgkNN50k=; h=Date:In-Reply-To:References:Subject:To:CC:From:From; b=HHio+2PFKwm/8CBQ2uLnk3D7PFtbASzMxgNiPelToi9+DsUjH9+By2FMfCDx5Wkpv Ei34ajUmwBnTsRVqsJKquhnPPAwbstV2A/KnLyD8XDG/6EMH6dVw0ugmdCtOrcj4HM T/m0L+bh1Sq1Ywd1dFZKHkU0hukVsvXxDoyPAFMI= Feedback-ID: crees@bayofrum. Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail33c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x39JxVKr027967; Tue, 9 Apr 2019 19:59:33 +0000 Received: from R.bayofrum.net (R.bayofrum.net [192.168.1.129]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 9511F190E; Tue, 9 Apr 2019 20:59:27 +0100 (BST) Date: Tue, 09 Apr 2019 20:59:25 +0100 User-Agent: K-9 Mail for Android In-Reply-To: <201904091955.x39Jt7PU061907@gndrsh.dnsmgr.net> References: <201904091955.x39Jt7PU061907@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: rgrimes@freebsd.org, "Rodney W. Grimes" , Andriy Gapon CC: "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Chris Rees Message-ID: X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 9511F190E.A6AB4 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@bayofrum.net X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B020E.5CACF9A5.0059, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=eOw9ckh1 c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=oexKYjalfGEA:10 a=iKhvJSA4AAAA:8 a=9Z5MU9Rqn1pvM6OAhKIA:9 a=QEXdDO2ut3YA:10 a=odh9cflL3HIXMm4fY7Wr:22 X-Rspamd-Queue-Id: 56C917763D X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.957,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 19:59:37 -0000 On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" wrote: >> On 09/04/2019 21:33, Rodney W. Grimes wrote: >> > I think the trigger issue is: >> > grep zfs /etc/rc.d/zvol=20 >> > rcvar=3D"zfs_enable" >> > required_modules=3D"zfs" >> >=20 >> > that module requires may be going south with the >> > new code when the module is built into the kernel. >>=20 >> Maybe it's because the module's name is zfsctrl (for whatever reason) >while the >> module file is named zfs.ko. > >I suspect that could also lead to issues with the new code. >It seems to be failing to detect that zfs is infact functional in the >kernel, >and blindly, or not so blindly, trying to load zfs,ko, which when you >build >it into the kernel you usually do so without any modules built, so >there is >no /boot/kernel/zfs.ko, and even if you did build it any attempt to >load >it would return an error. Loading with it built in isn't a problem, as I showed earlier. Loading when it doesn't exist *is*. I'm torn. Either we could revert this, or add a check to the required_modu= les function instead, which I think is the better solution. Chris --=20 Sent from my Android device with K-9 Mail. Please excuse my brevity. --=20 This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Tue Apr 9 20:04:10 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5A06156C0AC; Tue, 9 Apr 2019 20:04:10 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 4389077B3A; Tue, 9 Apr 2019 20:04:10 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39K43FF061972; Tue, 9 Apr 2019 13:04:03 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39K43X2061971; Tue, 9 Apr 2019 13:04:03 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904092004.x39K43X2061971@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 In-Reply-To: To: Chris Rees Date: Tue, 9 Apr 2019 13:04:03 -0700 (PDT) CC: rgrimes@freebsd.org, "Rodney W. Grimes" , Andriy Gapon , "O. Hartmann" , Chris Rees , 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-Rspamd-Queue-Id: 4389077B3A X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.95)[-0.947,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 20:04:10 -0000 > On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" wrote: > >> On 09/04/2019 21:33, Rodney W. Grimes wrote: > >> > I think the trigger issue is: > >> > grep zfs /etc/rc.d/zvol > >> > rcvar="zfs_enable" > >> > required_modules="zfs" > >> > > >> > that module requires may be going south with the > >> > new code when the module is built into the kernel. > >> > >> Maybe it's because the module's name is zfsctrl (for whatever reason) > >while the > >> module file is named zfs.ko. > > > >I suspect that could also lead to issues with the new code. > >It seems to be failing to detect that zfs is infact functional in the > >kernel, > >and blindly, or not so blindly, trying to load zfs,ko, which when you > >build > >it into the kernel you usually do so without any modules built, so > >there is > >no /boot/kernel/zfs.ko, and even if you did build it any attempt to > >load > >it would return an error. > > Loading with it built in isn't a problem, as I showed earlier. > > Loading when it doesn't exist *is*. > > I'm torn. Either we could revert this, or add a check to the required_modules function instead, which I think is the better solution. Ultimately at this time it is your decision, my personal mode of operation is when an unforseen bug comes up in something I did it is to revert, work on the issue until I am confident it is addressed, and addressed without adding any addition issue, then revert the revert and apply the fix. > Chris -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 20:19:27 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06936156C577; Tue, 9 Apr 2019 20:19:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8AE9E8025D; Tue, 9 Apr 2019 20:19:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id B9CE4FFF1; Tue, 9 Apr 2019 20:19:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346052 - head/sys/dev/usb/net To: rgrimes@freebsd.org Cc: Ian Lepore , Ganbold Tsagaankhuu , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091948.x39JmBZk061857@gndrsh.dnsmgr.net> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <8c5292c0-5464-8995-4518-181886201692@FreeBSD.org> Date: Tue, 9 Apr 2019 13:19:24 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904091948.x39JmBZk061857@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 8AE9E8025D X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.93)[-0.934,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 20:19:27 -0000 On 4/9/19 12:48 PM, Rodney W. Grimes wrote: >> On 4/9/19 9:59 AM, Ian Lepore wrote: >>> On Tue, 2019-04-09 at 09:33 -0700, John Baldwin wrote: >>>> On 4/9/19 9:17 AM, Ian Lepore wrote: >>>>> On Tue, 2019-04-09 at 09:11 -0700, John Baldwin wrote: >>>>>> On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: >>>>>>> Author: ganbold >>>>>>> Date: Tue Apr 9 13:54:08 2019 >>>>>>> New Revision: 346052 >>>>>>> URL: https://svnweb.freebsd.org/changeset/base/346052 >>>>>>> >>>>>>> Log: >>>>>>> In some cases like NanoPI R1, its second USB ethernet >>>>>>> RTL8152 (chip version URE_CHIP_VER_4C10) doesn't >>>>>>> have hardwired MAC address, in other words, it is all zeros. >>>>>>> This commit fixes it by setting random MAC address >>>>>>> when MAC address is all zeros. >>>>>>> >>>>>>> Reviewed by: kevlo >>>>>>> Differential Revision: >>>>>>> https://reviews.freebsd.org/D19856 >>>>>> >>>>>> It would be best to not use a purely random mac address and to >>>>>> use >>>>>> the >>>>>> function kevans@ added recently. That function generates a MAC >>>>>> address >>>>>> from the FreeBSD OUI using a cryptographic hash so you get a >>>>>> stable address across boots on a given host. >>>>>> >>>>> >>>>> How could that possibly work? If it's not random, you can't have >>>>> two >>>>> such devices on the same network. If it is random, it's not stable >>>>> from one boot to the next. >>>> >>>> It uses the UUID and interface name as input into the hash. >>> >>>> The UUID is per-host. >>> >>> Oh, so it only works on x86 (or I guess any system that has something >>> like a bios that can provide you with a uuid that doesn't change from >>> one boot to the next). >> >> The function is in one centralized place where you are free to add other >> data as input into the hash. We do always generate a uuid that we save >> on boot if we aren't seeded with one by firmware, though that is probably >> too late for this driver (so +1 may in fact be a better route). It should >> be fine for psuedo interfaces created post-boot though even on non-x86 due >> to /etc/rc.d/hostid. Pure random MAC's are not really great either. > > Cant the loader load /etc/rc.d/hostid and put it in something that > the kernel could get at, or a module written that handles this? It's a different file, and yes in theory the loader could look at the file and set UUID and hostid env vars. However, that's a no-op for most use cases. If other platforms have some kind of firmware-provided thing that isn't a UUID, it would be good to teach the centralized function about those as an input to the hash, but at least that can be done in place rather than having open-coded MAC generators in various drivers. -- John Baldwin From owner-svn-src-head@freebsd.org Tue Apr 9 20:20:06 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E8D1156C5D6; Tue, 9 Apr 2019 20:20:06 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 00CAA8039E; Tue, 9 Apr 2019 20:20:06 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEA8B18210; Tue, 9 Apr 2019 20:20:05 +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 x39KK5ui079833; Tue, 9 Apr 2019 20:20:05 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39KK452079826; Tue, 9 Apr 2019 20:20:04 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904092020.x39KK452079826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 9 Apr 2019 20:20:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346065 - in head/sys: fs/fuse fs/msdosfs kern sys X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys: fs/fuse fs/msdosfs kern sys X-SVN-Commit-Revision: 346065 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 00CAA8039E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 20:20:06 -0000 Author: kib Date: Tue Apr 9 20:20:04 2019 New Revision: 346065 URL: https://svnweb.freebsd.org/changeset/base/346065 Log: Add vn_fsync_buf(). Provide a convenience function to avoid the hack with filling fake struct vop_fsync_args and then calling vop_stdfsync(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/fs/fuse/fuse_io.c head/sys/fs/msdosfs/msdosfs_fat.c head/sys/kern/vfs_default.c head/sys/kern/vfs_vnops.c head/sys/sys/vnode.h Modified: head/sys/fs/fuse/fuse_io.c ============================================================================== --- head/sys/fs/fuse/fuse_io.c Tue Apr 9 19:55:02 2019 (r346064) +++ head/sys/fs/fuse/fuse_io.c Tue Apr 9 20:20:04 2019 (r346065) @@ -771,13 +771,8 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp) int fuse_io_flushbuf(struct vnode *vp, int waitfor, struct thread *td) { - struct vop_fsync_args a = { - .a_vp = vp, - .a_waitfor = waitfor, - .a_td = td, - }; - return (vop_stdfsync(&a)); + return (vn_fsync_buf(vp, waitfor)); } /* Modified: head/sys/fs/msdosfs/msdosfs_fat.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_fat.c Tue Apr 9 19:55:02 2019 (r346064) +++ head/sys/fs/msdosfs/msdosfs_fat.c Tue Apr 9 20:20:04 2019 (r346065) @@ -980,7 +980,6 @@ extendfile(struct denode *dep, u_long count, struct bu u_long cn, got; struct msdosfsmount *pmp = dep->de_pmp; struct buf *bp; - struct vop_fsync_args fsync_ap; daddr_t blkno; /* @@ -1092,12 +1091,8 @@ extendfile(struct denode *dep, u_long count, struct bu bdwrite(bp); } if (vm_page_count_severe() || - buf_dirty_count_severe()) { - fsync_ap.a_vp = DETOV(dep); - fsync_ap.a_waitfor = MNT_WAIT; - fsync_ap.a_td = curthread; - vop_stdfsync(&fsync_ap); - } + buf_dirty_count_severe()) + vn_fsync_buf(DETOV(dep), MNT_WAIT); } } } Modified: head/sys/kern/vfs_default.c ============================================================================== --- head/sys/kern/vfs_default.c Tue Apr 9 19:55:02 2019 (r346064) +++ head/sys/kern/vfs_default.c Tue Apr 9 20:20:04 2019 (r346065) @@ -638,98 +638,8 @@ vop_stdfsync(ap) struct thread *a_td; } */ *ap; { - struct vnode *vp; - struct buf *bp, *nbp; - struct bufobj *bo; - struct mount *mp; - int error, maxretry; - error = 0; - maxretry = 10000; /* large, arbitrarily chosen */ - vp = ap->a_vp; - mp = NULL; - if (vp->v_type == VCHR) { - VI_LOCK(vp); - mp = vp->v_rdev->si_mountpt; - VI_UNLOCK(vp); - } - bo = &vp->v_bufobj; - BO_LOCK(bo); -loop1: - /* - * MARK/SCAN initialization to avoid infinite loops. - */ - TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs) { - bp->b_vflags &= ~BV_SCANNED; - bp->b_error = 0; - } - - /* - * Flush all dirty buffers associated with a vnode. - */ -loop2: - TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) { - if ((bp->b_vflags & BV_SCANNED) != 0) - continue; - bp->b_vflags |= BV_SCANNED; - if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { - if (ap->a_waitfor != MNT_WAIT) - continue; - if (BUF_LOCK(bp, - LK_EXCLUSIVE | LK_INTERLOCK | LK_SLEEPFAIL, - BO_LOCKPTR(bo)) != 0) { - BO_LOCK(bo); - goto loop1; - } - BO_LOCK(bo); - } - BO_UNLOCK(bo); - KASSERT(bp->b_bufobj == bo, - ("bp %p wrong b_bufobj %p should be %p", - bp, bp->b_bufobj, bo)); - if ((bp->b_flags & B_DELWRI) == 0) - panic("fsync: not dirty"); - if ((vp->v_object != NULL) && (bp->b_flags & B_CLUSTEROK)) { - vfs_bio_awrite(bp); - } else { - bremfree(bp); - bawrite(bp); - } - if (maxretry < 1000) - pause("dirty", hz < 1000 ? 1 : hz / 1000); - BO_LOCK(bo); - goto loop2; - } - - /* - * If synchronous the caller expects us to completely resolve all - * dirty buffers in the system. Wait for in-progress I/O to - * complete (which could include background bitmap writes), then - * retry if dirty blocks still exist. - */ - if (ap->a_waitfor == MNT_WAIT) { - bufobj_wwait(bo, 0, 0); - if (bo->bo_dirty.bv_cnt > 0) { - /* - * If we are unable to write any of these buffers - * then we fail now rather than trying endlessly - * to write them out. - */ - TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs) - if ((error = bp->b_error) != 0) - break; - if ((mp != NULL && mp->mnt_secondary_writes > 0) || - (error == 0 && --maxretry >= 0)) - goto loop1; - if (error == 0) - error = EAGAIN; - } - } - BO_UNLOCK(bo); - if (error != 0) - vn_printf(vp, "fsync: giving up on dirty (error = %d) ", error); - - return (error); + return (vn_fsync_buf(ap->a_vp, ap->a_waitfor)); } static int @@ -742,12 +652,8 @@ vop_stdfdatasync(struct vop_fdatasync_args *ap) int vop_stdfdatasync_buf(struct vop_fdatasync_args *ap) { - struct vop_fsync_args apf; - apf.a_vp = ap->a_vp; - apf.a_waitfor = MNT_WAIT; - apf.a_td = ap->a_td; - return (vop_stdfsync(&apf)); + return (vn_fsync_buf(ap->a_vp, MNT_WAIT)); } /* XXX Needs good comment and more info in the manpage (VOP_GETPAGES(9)). */ Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Tue Apr 9 19:55:02 2019 (r346064) +++ head/sys/kern/vfs_vnops.c Tue Apr 9 20:20:04 2019 (r346065) @@ -2494,3 +2494,98 @@ vn_fsid(struct vnode *vp, struct vattr *va) va->va_fsid <<= sizeof(f->val[1]) * NBBY; va->va_fsid += (uint32_t)f->val[0]; } + +int +vn_fsync_buf(struct vnode *vp, int waitfor) +{ + struct buf *bp, *nbp; + struct bufobj *bo; + struct mount *mp; + int error, maxretry; + + error = 0; + maxretry = 10000; /* large, arbitrarily chosen */ + mp = NULL; + if (vp->v_type == VCHR) { + VI_LOCK(vp); + mp = vp->v_rdev->si_mountpt; + VI_UNLOCK(vp); + } + bo = &vp->v_bufobj; + BO_LOCK(bo); +loop1: + /* + * MARK/SCAN initialization to avoid infinite loops. + */ + TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs) { + bp->b_vflags &= ~BV_SCANNED; + bp->b_error = 0; + } + + /* + * Flush all dirty buffers associated with a vnode. + */ +loop2: + TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) { + if ((bp->b_vflags & BV_SCANNED) != 0) + continue; + bp->b_vflags |= BV_SCANNED; + if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { + if (waitfor != MNT_WAIT) + continue; + if (BUF_LOCK(bp, + LK_EXCLUSIVE | LK_INTERLOCK | LK_SLEEPFAIL, + BO_LOCKPTR(bo)) != 0) { + BO_LOCK(bo); + goto loop1; + } + BO_LOCK(bo); + } + BO_UNLOCK(bo); + KASSERT(bp->b_bufobj == bo, + ("bp %p wrong b_bufobj %p should be %p", + bp, bp->b_bufobj, bo)); + if ((bp->b_flags & B_DELWRI) == 0) + panic("fsync: not dirty"); + if ((vp->v_object != NULL) && (bp->b_flags & B_CLUSTEROK)) { + vfs_bio_awrite(bp); + } else { + bremfree(bp); + bawrite(bp); + } + if (maxretry < 1000) + pause("dirty", hz < 1000 ? 1 : hz / 1000); + BO_LOCK(bo); + goto loop2; + } + + /* + * If synchronous the caller expects us to completely resolve all + * dirty buffers in the system. Wait for in-progress I/O to + * complete (which could include background bitmap writes), then + * retry if dirty blocks still exist. + */ + if (waitfor == MNT_WAIT) { + bufobj_wwait(bo, 0, 0); + if (bo->bo_dirty.bv_cnt > 0) { + /* + * If we are unable to write any of these buffers + * then we fail now rather than trying endlessly + * to write them out. + */ + TAILQ_FOREACH(bp, &bo->bo_dirty.bv_hd, b_bobufs) + if ((error = bp->b_error) != 0) + break; + if ((mp != NULL && mp->mnt_secondary_writes > 0) || + (error == 0 && --maxretry >= 0)) + goto loop1; + if (error == 0) + error = EAGAIN; + } + } + BO_UNLOCK(bo); + if (error != 0) + vn_printf(vp, "fsync: giving up on dirty (error = %d) ", error); + + return (error); +} Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Tue Apr 9 19:55:02 2019 (r346064) +++ head/sys/sys/vnode.h Tue Apr 9 20:20:04 2019 (r346065) @@ -670,6 +670,7 @@ int vn_close(struct vnode *vp, int flags, struct ucred *file_cred, struct thread *td); void vn_finished_write(struct mount *mp); void vn_finished_secondary_write(struct mount *mp); +int vn_fsync_buf(struct vnode *vp, int waitfor); int vn_isdisk(struct vnode *vp, int *errp); int _vn_lock(struct vnode *vp, int flags, char *file, int line); #define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__) From owner-svn-src-head@freebsd.org Tue Apr 9 20:40:27 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92935156CE59; Tue, 9 Apr 2019 20:40:27 +0000 (UTC) (envelope-from chris@rees.space) Received: from mail70c50.megamailservers.eu (mail169c50.megamailservers.eu [91.136.10.179]) (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 3779C80D75; Tue, 9 Apr 2019 20:40:25 +0000 (UTC) (envelope-from chris@rees.space) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554840594; bh=AgIPL71YtdLawN/iK/yjVVStgTCf+k1m4Dtp8wyS6o0=; h=Subject:To:CC:References:From:Date:In-Reply-To:From; b=KZIqa/tf4E0BS87bGY9ab6Hzmfyz2kg3tJvq0rmvfj+Vj4Dz4+ZEl10bh3Jmqx3TW etT2bdsQTLBZMT0s8AO+5pT486xWSk0ozFnxDDKlqvo2ZJ4eTp4zU6iLUWCYwv8LzU 7KEKzGdKeJ+CzD8Un8qbzYOtxNpRA7t9COCAeObk= Feedback-ID: chris@rees.spac Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail70c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x39K9qHP005953; Tue, 9 Apr 2019 20:09:54 +0000 Received: from [192.168.1.121] (POSEIDON.bayofrum.net [192.168.1.121]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 155651B7A; Tue, 9 Apr 2019 21:09:48 +0100 (BST) Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: Chris Rees , rgrimes@freebsd.org, "Rodney W. Grimes" , Andriy Gapon CC: "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091955.x39Jt7PU061907@gndrsh.dnsmgr.net> From: Chris Rees Message-ID: <56770290-a7f2-07dc-3f5a-f9d5721db724@rees.space> Date: Tue, 9 Apr 2019 21:08:53 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 155651B7A.A4F62 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: chris@rees.space X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B020E.5CACFC12.005F, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=ILcs9DnG c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=oexKYjalfGEA:10 a=Y8a21bOVD5kA:10 a=ZZnuYtJkoWoA:10 a=iKhvJSA4AAAA:8 a=GN3eLU9uyxQDXXIByxQA:9 a=QEXdDO2ut3YA:10 a=odh9cflL3HIXMm4fY7Wr:22 X-Rspamd-Queue-Id: 3779C80D75 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 20:40:27 -0000 On 09/04/2019 20:59, Chris Rees wrote: > On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" wrote: >>> On 09/04/2019 21:33, Rodney W. Grimes wrote: >>>> I think the trigger issue is: >>>> grep zfs /etc/rc.d/zvol >>>> rcvar="zfs_enable" >>>> required_modules="zfs" >>>> >>>> that module requires may be going south with the >>>> new code when the module is built into the kernel. >>> Maybe it's because the module's name is zfsctrl (for whatever reason) >> while the >>> module file is named zfs.ko. >> I suspect that could also lead to issues with the new code. >> It seems to be failing to detect that zfs is infact functional in the >> kernel, >> and blindly, or not so blindly, trying to load zfs,ko, which when you >> build >> it into the kernel you usually do so without any modules built, so >> there is >> no /boot/kernel/zfs.ko, and even if you did build it any attempt to >> load >> it would return an error. > Loading with it built in isn't a problem, as I showed earlier. > > Loading when it doesn't exist *is*. > > I'm torn. Either we could revert this, or add a check to the required_modules function instead, which I think is the better solution. Hang on, [crees@pegasus]~% sudo kldload -n zfsctrl && echo yes yes [crees@pegasus]~% find /boot -name zfsctrl\* [crees@pegasus]~% I think that, rather than speculating, we should wait for Oliver to confirm that this is actually the problem, because I still don't think it is. Chris -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Tue Apr 9 20:45:51 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34DE8156D4F4 for ; Tue, 9 Apr 2019 20:45:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 95B32813F6 for ; Tue, 9 Apr 2019 20:45:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72f.google.com with SMTP id w20so11174802qka.7 for ; Tue, 09 Apr 2019 13:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yc1SyWf147xsEfjWclAYUJ+fnNB0mlEmVrax27QVBcE=; b=XI2Ec6Un1hiFAhd01oE6hss8MTycXeunh63MKzWk4RqzupdUyjQuEFS9VoXyECUrfi UraMuWxuufxajpug4J3AzU2vxRnIo2YV49/hygvh8tiCGb4dYuYZEoDmlXce90MW2qRu ziIIpc4/RCoTv2sGVHSgsemBMaTQ/Y54jSpxmMhiIiacn3MwbyIK2JTD5Amvi1sLrd6E VJ9bd+zEdraM1VRHFDNYMyFwsIE6PFGISwrzX0bo8elJgAwSFtGazGJTDQUHwcBoAehB 8KFr5SRR+1F3w+QmOUExIEFR5oGkuMuxtpXuJ8yjH18tHuknptjVDzHJM0ZRmZ1Okt1l fNag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yc1SyWf147xsEfjWclAYUJ+fnNB0mlEmVrax27QVBcE=; b=AB0AZOShD/I4xq0sNJLn9KgbdEHjJitQ/2SKO17oc7oVUNpErMLAo69G/gp52S1Cz+ Z9XRZUDaO6QdtH/vNFDktl6ot77E3ayzrExmF5cFlDtCPHoWJ3y2Aa9h0F+ELYCMxpkV 4IOCUukwxL7t55jNvWXTlBU9tKpgJKjBoXCVucNGclvtnYcOxWuK/ib1bGti0jgxHG5D vnJVXg2QaZNCCYGCRxhYxQ1JO9gcCW3WZgCbNvLazonWlHHYCZxYe/H+uT+xCy0NVjQb eSq5im2Z6DRLr5cZz5yRbUOP4+ty7amXWyYkk6iGvvlNflv99n+EXnCvYmeCgj1WbMnD lT3g== X-Gm-Message-State: APjAAAXC55xwiWLHgG9/Cm9eehPp1dyPIuLQ2rN+1JIvBpEAIkpVX6E6 ZTE/fnXaVFEWtPn1twbjd13ZmV81d0I7mhw6VQRSFVGS X-Google-Smtp-Source: APXvYqyDoGhAxnZVTmczI5/NUnO2G6NucL4TmVA+OEJAjoKjVBkdLdpZtO5YwU4jBtoNHAj9azOlNRsVmgoh9W3l1+E= X-Received: by 2002:a37:9e0d:: with SMTP id h13mr30375964qke.135.1554842749960; Tue, 09 Apr 2019 13:45:49 -0700 (PDT) MIME-Version: 1.0 References: <201904081825.x38IPEpV054311@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 9 Apr 2019 14:45:38 -0600 Message-ID: Subject: Re: svn commit: r346039 - head/sys/conf To: Ian Lepore Cc: Rebecca Cran , Warner Losh , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 95B32813F6 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 20:45:51 -0000 On Tue, Apr 9, 2019 at 11:40 AM Ian Lepore wrote: > On Tue, 2019-04-09 at 11:19 -0600, Rebecca Cran wrote: > > On 2019-04-08 12:25, Warner Losh wrote: > > > Author: imp > > > Date: Mon Apr 8 18:25:14 2019 > > > New Revision: 346039 > > > URL: https://svnweb.freebsd.org/changeset/base/346039 > > > > > > Log: > > > Style only change: Prefer $() to `` > > > > > > $() is more modern and also nests. Convert the mix of styles to > > > using > > > only the former (although the latter was more common). It's the > > > more > > > dominant style in other shell scripts these days as well. > > > > > > Differential Revision: https://reviews.freebsd.org/D19840 > > > > > > Modified: > > > head/sys/conf/newvers.sh > > > > > > Modified: head/sys/conf/newvers.sh > > > > > > I thought I saw an email a few weeks ago that suggested that the list > > of > > people who reviewed the patch should be copied into a "Reviewed by:" > > line, to avoid only having that information in Phabricator. > > > > Am I remembering correctly, or is just mentioning the Phab review > > considered sufficient? > > > > > > As far as I'm concerned, if I've gone to all the trouble to have > something phab-reviewed, I'm not going to waste a bunch of time hand- > copying metadata from the review to the commit message; citing the > review is sufficient. > There's that too.... Project norms here have a gap between what people expect to happen, and what actually happens. This is orthogonal to the whole uselessly duplicated metadata issue causing friction. Warner From owner-svn-src-head@freebsd.org Tue Apr 9 21:11:49 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FAF4156DCEB; Tue, 9 Apr 2019 21:11:49 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 AC306822CA; Tue, 9 Apr 2019 21:11:48 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39LBkEB062292; Tue, 9 Apr 2019 14:11:46 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39LBkH4062291; Tue, 9 Apr 2019 14:11:46 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904092111.x39LBkH4062291@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346052 - head/sys/dev/usb/net In-Reply-To: <8c5292c0-5464-8995-4518-181886201692@FreeBSD.org> To: John Baldwin Date: Tue, 9 Apr 2019 14:11:46 -0700 (PDT) CC: rgrimes@freebsd.org, Ian Lepore , Ganbold Tsagaankhuu , 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-Rspamd-Queue-Id: AC306822CA X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 21:11:49 -0000 > On 4/9/19 12:48 PM, Rodney W. Grimes wrote: > >> On 4/9/19 9:59 AM, Ian Lepore wrote: > >>> On Tue, 2019-04-09 at 09:33 -0700, John Baldwin wrote: > >>>> On 4/9/19 9:17 AM, Ian Lepore wrote: > >>>>> On Tue, 2019-04-09 at 09:11 -0700, John Baldwin wrote: > >>>>>> On 4/9/19 6:54 AM, Ganbold Tsagaankhuu wrote: > >>>>>>> Author: ganbold > >>>>>>> Date: Tue Apr 9 13:54:08 2019 > >>>>>>> New Revision: 346052 > >>>>>>> URL: https://svnweb.freebsd.org/changeset/base/346052 > >>>>>>> > >>>>>>> Log: > >>>>>>> In some cases like NanoPI R1, its second USB ethernet > >>>>>>> RTL8152 (chip version URE_CHIP_VER_4C10) doesn't > >>>>>>> have hardwired MAC address, in other words, it is all zeros. > >>>>>>> This commit fixes it by setting random MAC address > >>>>>>> when MAC address is all zeros. > >>>>>>> > >>>>>>> Reviewed by: kevlo > >>>>>>> Differential Revision: > >>>>>>> https://reviews.freebsd.org/D19856 > >>>>>> > >>>>>> It would be best to not use a purely random mac address and to > >>>>>> use > >>>>>> the > >>>>>> function kevans@ added recently. That function generates a MAC > >>>>>> address > >>>>>> from the FreeBSD OUI using a cryptographic hash so you get a > >>>>>> stable address across boots on a given host. > >>>>>> > >>>>> > >>>>> How could that possibly work? If it's not random, you can't have > >>>>> two > >>>>> such devices on the same network. If it is random, it's not stable > >>>>> from one boot to the next. > >>>> > >>>> It uses the UUID and interface name as input into the hash. > >>> > >>>> The UUID is per-host. > >>> > >>> Oh, so it only works on x86 (or I guess any system that has something > >>> like a bios that can provide you with a uuid that doesn't change from > >>> one boot to the next). > >> > >> The function is in one centralized place where you are free to add other > >> data as input into the hash. We do always generate a uuid that we save > >> on boot if we aren't seeded with one by firmware, though that is probably > >> too late for this driver (so +1 may in fact be a better route). It should > >> be fine for psuedo interfaces created post-boot though even on non-x86 due > >> to /etc/rc.d/hostid. Pure random MAC's are not really great either. > > > > Cant the loader load /etc/rc.d/hostid and put it in something that > > the kernel could get at, or a module written that handles this? > > It's a different file, and yes in theory the loader could look at the file > and set UUID and hostid env vars. However, that's a no-op for most use > cases. If other platforms have some kind of firmware-provided thing that > isn't a UUID, it would be good to teach the centralized function about > those as an input to the hash, but at least that can be done in place > rather than having open-coded MAC generators in various drivers. Simple enough, can one not just store /etc/rc.d/hostid into a env variable in /boot/loader.conf too on those platforms that do not have a uuid mechanism? -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 21:13:52 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68664156DE6D; Tue, 9 Apr 2019 21:13:52 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mail37c50.megamailservers.eu (mail161c50.megamailservers.eu [91.136.10.171]) (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 2631582504; Tue, 9 Apr 2019 21:13:49 +0000 (UTC) (envelope-from crees@bayofrum.net) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554844422; bh=xB+kUJohUV/vOe8kjn9BfM0LRU8JJS8f9huPhn84V3M=; h=Date:In-Reply-To:References:Subject:To:CC:From:From; b=PEK0yL5mMV+TyYQ5aC+DT5bILNog8uC0XLnz2j3JC/EKNG9mEigyiHMm4Ki4Hum65 9a5TKKbB88yoaz4b5wp1aHGEdebgF3ctCofWdFfZYnwy1uCJVx1RsLek5UAzixc4Op JpymyvSJqGfAnuo6bK3e2YyvfOPBx1jtWEaRijOA= Feedback-ID: crees@bayofrum. Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail37c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x39LDeAM011779; Tue, 9 Apr 2019 21:13:41 +0000 Received: from R.bayofrum.net (R.bayofrum.net [192.168.1.129]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 843C31E46; Tue, 9 Apr 2019 22:13:31 +0100 (BST) Date: Tue, 09 Apr 2019 22:13:29 +0100 User-Agent: K-9 Mail for Android In-Reply-To: <201904092108.x39L8ZCG062247@gndrsh.dnsmgr.net> References: <201904092108.x39L8ZCG062247@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: rgrimes@freebsd.org, "Rodney W. Grimes" , Chris Rees CC: Andriy Gapon , "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Chris Rees Message-ID: <2B336327-528C-4E16-AA5D-B3497B1941D0@bayofrum.net> X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 843C31E46.A4CB0 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@bayofrum.net X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B0210.5CAD0B06.002D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=P4AUeBIu c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=oexKYjalfGEA:10 a=iKhvJSA4AAAA:8 a=J93aaXUkh_By0JStf2IA:9 a=QEXdDO2ut3YA:10 a=odh9cflL3HIXMm4fY7Wr:22 X-Rspamd-Queue-Id: 2631582504 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=fail (rsa verify failed) header.d=megamailservers.eu header.s=maildub header.b=PEK0yL5m X-Spamd-Result: default: False [-2.44 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[70.238.178.81.zen.spamhaus.org : 127.0.0.11]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_DKIM_REJECT(1.00)[megamailservers.eu:s=maildub]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[bayofrum.net]; NEURAL_HAM_MEDIUM(-0.95)[-0.951,0]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[megamailservers.eu:-]; MX_GOOD(-0.01)[www.bayofrum.net]; RCPT_COUNT_SEVEN(0.00)[9]; NEURAL_HAM_SHORT(-0.82)[-0.822,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:9115, ipnet:91.136.0.0/17, country:GB]; MID_RHS_MATCH_FROM(0.00)[]; IP_SCORE(-0.46)[ipnet: 91.136.0.0/17(-1.23), asn: 9115(-0.98), country: GB(-0.09)]; RCVD_IN_DNSWL_LOW(-0.10)[171.10.136.91.list.dnswl.org : 127.0.5.1] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 21:13:52 -0000 On 9 April 2019 22:08:35 BST, "Rodney W. Grimes" wrote: >> On 09/04/2019 20:59, Chris Rees wrote: >> > On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" > wrote: >> >>> On 09/04/2019 21:33, Rodney W. Grimes wrote: >> >>>> I think the trigger issue is: >> >>>> grep zfs /etc/rc.d/zvol >> >>>> rcvar=3D"zfs_enable" >> >>>> required_modules=3D"zfs" >> >>>> >> >>>> that module requires may be going south with the >> >>>> new code when the module is built into the kernel. >> >>> Maybe it's because the module's name is zfsctrl (for whatever >reason) >> >> while the >> >>> module file is named zfs.ko. >> >> I suspect that could also lead to issues with the new code. >> >> It seems to be failing to detect that zfs is infact functional in >the >> >> kernel, >> >> and blindly, or not so blindly, trying to load zfs,ko, which when >you >> >> build >> >> it into the kernel you usually do so without any modules built, so >> >> there is >> >> no /boot/kernel/zfs.ko, and even if you did build it any attempt >to >> >> load >> >> it would return an error. >> > Loading with it built in isn't a problem, as I showed earlier. >> > >> > Loading when it doesn't exist *is*. >> > >> > I'm torn. Either we could revert this, or add a check to the >required_modules function instead, which I think is the better >solution. >>=20 >> Hang on, >>=20 >> [crees@pegasus]~% sudo kldload -n zfsctrl && echo yes >> yes > >I think your testing the return value of sudo here? Sudo returns the child's return value. Chris >> [crees@pegasus]~% find /boot -name zfsctrl\* >> [crees@pegasus]~% >>=20 >> I think that, rather than speculating, we should wait for Oliver to=20 >> confirm that this is actually the problem, because I still don't >think=20 >> it is. >>=20 >> Chris >>=20 >>=20 >> --=20 >> This message has been scanned for viruses and >> dangerous content by MailScanner, and is >> believed to be clean. >>=20 >>=20 --=20 Sent from my Android device with K-9 Mail. Please excuse my brevity. --=20 This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Tue Apr 9 21:18:04 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4F8B156E058; Tue, 9 Apr 2019 21:18:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 89FE68273E; Tue, 9 Apr 2019 21:18:03 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6489F18C05; Tue, 9 Apr 2019 21:18:03 +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 x39LI32c011410; Tue, 9 Apr 2019 21:18:03 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39LI3Xm011409; Tue, 9 Apr 2019 21:18:03 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201904092118.x39LI3Xm011409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 9 Apr 2019 21:18:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346066 - head/sys/dev/acpica X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/acpica X-SVN-Commit-Revision: 346066 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 89FE68273E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 21:18:04 -0000 Author: jhb Date: Tue Apr 9 21:18:02 2019 New Revision: 346066 URL: https://svnweb.freebsd.org/changeset/base/346066 Log: Refine r330113 to honor the ProducerConsumer flag most of the time. While it is true that the ACPI spec says that the flag is only valid on Extended Address Space Descriptors, examples of other descriptors in the spec use the ProducerConsumer flag explicitly, and real hardware uses it as well. In fact, even in the ASL of the Thunder X2 for which r330113 was a workaround, some devices use this flag on non-Extended Address Space Descriptors correctly. Instead, only ignore the flag for resources associated with the UART devices on the Thunder X2 using the "ARMH0011" HID to identify these devices. This should fix regressions from ignoring this flag in other contexts such as Hyper-V. PR: 235876 Reported by: Wei Hu Tested by: emaste (Thunder X2) MFC after: 2 weeks Modified: head/sys/dev/acpica/acpi_resource.c Modified: head/sys/dev/acpica/acpi_resource.c ============================================================================== --- head/sys/dev/acpica/acpi_resource.c Tue Apr 9 20:20:04 2019 (r346065) +++ head/sys/dev/acpica/acpi_resource.c Tue Apr 9 21:18:02 2019 (r346066) @@ -202,6 +202,7 @@ struct acpi_resource_context { struct acpi_parse_resource_set *set; device_t dev; void *context; + bool ignore_producer_flag; }; #ifdef ACPI_DEBUG_OUTPUT @@ -385,7 +386,7 @@ acpi_parse_resource(ACPI_RESOURCE *res, void *context) } if (length <= 0) break; - if (res->Type == ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 && + if (!arc->ignore_producer_flag && res->Data.Address.ProducerConsumer != ACPI_CONSUMER) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "ignored %s %s producer\n", name, @@ -474,6 +475,12 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle, set->set_init(dev, arg, &arc.context); arc.set = set; arc.dev = dev; + arc.ignore_producer_flag = false; + + /* UARTs on ThunderX2 set ResourceProducer on memory resources. */ + if (acpi_MatchHid(handle, "ARMH0011") != ACPI_MATCHHID_NOMATCH) + arc.ignore_producer_flag = true; + status = AcpiWalkResources(handle, "_CRS", acpi_parse_resource, &arc); if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { printf("can't fetch resources for %s - %s\n", From owner-svn-src-head@freebsd.org Tue Apr 9 21:08:48 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CE6A156DA3A; Tue, 9 Apr 2019 21:08:48 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 CE2AF81DA9; Tue, 9 Apr 2019 21:08:47 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39L8adJ062248; Tue, 9 Apr 2019 14:08:36 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39L8ZCG062247; Tue, 9 Apr 2019 14:08:35 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904092108.x39L8ZCG062247@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 In-Reply-To: <56770290-a7f2-07dc-3f5a-f9d5721db724@rees.space> To: Chris Rees Date: Tue, 9 Apr 2019 14:08:35 -0700 (PDT) CC: Chris Rees , rgrimes@freebsd.org, "Rodney W. Grimes" , Andriy Gapon , "O. Hartmann" , Chris Rees , 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-Rspamd-Queue-Id: CE2AF81DA9 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.987,0]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-Mailman-Approved-At: Tue, 09 Apr 2019 21:19:12 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 21:08:48 -0000 > On 09/04/2019 20:59, Chris Rees wrote: > > On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" wrote: > >>> On 09/04/2019 21:33, Rodney W. Grimes wrote: > >>>> I think the trigger issue is: > >>>> grep zfs /etc/rc.d/zvol > >>>> rcvar="zfs_enable" > >>>> required_modules="zfs" > >>>> > >>>> that module requires may be going south with the > >>>> new code when the module is built into the kernel. > >>> Maybe it's because the module's name is zfsctrl (for whatever reason) > >> while the > >>> module file is named zfs.ko. > >> I suspect that could also lead to issues with the new code. > >> It seems to be failing to detect that zfs is infact functional in the > >> kernel, > >> and blindly, or not so blindly, trying to load zfs,ko, which when you > >> build > >> it into the kernel you usually do so without any modules built, so > >> there is > >> no /boot/kernel/zfs.ko, and even if you did build it any attempt to > >> load > >> it would return an error. > > Loading with it built in isn't a problem, as I showed earlier. > > > > Loading when it doesn't exist *is*. > > > > I'm torn. Either we could revert this, or add a check to the required_modules function instead, which I think is the better solution. > > Hang on, > > [crees@pegasus]~% sudo kldload -n zfsctrl && echo yes > yes I think your testing the return value of sudo here? > [crees@pegasus]~% find /boot -name zfsctrl\* > [crees@pegasus]~% > > I think that, rather than speculating, we should wait for Oliver to > confirm that this is actually the problem, because I still don't think > it is. > > Chris > > > -- > This message has been scanned for viruses and > dangerous content by MailScanner, and is > believed to be clean. > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 21:19:54 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2460A156E1F1; Tue, 9 Apr 2019 21:19:54 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 8699682960; Tue, 9 Apr 2019 21:19:53 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x39LJjHu062338; Tue, 9 Apr 2019 14:19:45 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x39LJjFv062337; Tue, 9 Apr 2019 14:19:45 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904092119.x39LJjFv062337@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 In-Reply-To: <2B336327-528C-4E16-AA5D-B3497B1941D0@bayofrum.net> To: Chris Rees Date: Tue, 9 Apr 2019 14:19:45 -0700 (PDT) CC: rgrimes@freebsd.org, "Rodney W. Grimes" , Chris Rees , Andriy Gapon , "O. Hartmann" , Chris Rees , 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-Rspamd-Queue-Id: 8699682960 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-Mailman-Approved-At: Tue, 09 Apr 2019 21:40:57 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 21:19:54 -0000 > On 9 April 2019 22:08:35 BST, "Rodney W. Grimes" wrote: > >> On 09/04/2019 20:59, Chris Rees wrote: > >> > On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" > > wrote: > >> >>> On 09/04/2019 21:33, Rodney W. Grimes wrote: > >> >>>> I think the trigger issue is: > >> >>>> grep zfs /etc/rc.d/zvol > >> >>>> rcvar="zfs_enable" > >> >>>> required_modules="zfs" > >> >>>> > >> >>>> that module requires may be going south with the > >> >>>> new code when the module is built into the kernel. > >> >>> Maybe it's because the module's name is zfsctrl (for whatever > >reason) > >> >> while the > >> >>> module file is named zfs.ko. > >> >> I suspect that could also lead to issues with the new code. > >> >> It seems to be failing to detect that zfs is infact functional in > >the > >> >> kernel, > >> >> and blindly, or not so blindly, trying to load zfs,ko, which when > >you > >> >> build > >> >> it into the kernel you usually do so without any modules built, so > >> >> there is > >> >> no /boot/kernel/zfs.ko, and even if you did build it any attempt > >to > >> >> load > >> >> it would return an error. > >> > Loading with it built in isn't a problem, as I showed earlier. > >> > > >> > Loading when it doesn't exist *is*. > >> > > >> > I'm torn. Either we could revert this, or add a check to the > >required_modules function instead, which I think is the better > >solution. > >> > >> Hang on, > >> > >> [crees@pegasus]~% sudo kldload -n zfsctrl && echo yes > >> yes > > > >I think your testing the return value of sudo here? > > Sudo returns the child's return value. Do you have a static linked zfs in your kernel without a zfs.ko in /boot? kldstat | grep zfs > > Chris > > >> [crees@pegasus]~% find /boot -name zfsctrl\* find /boot -name zfs the module file is called zfs.ko > >> [crees@pegasus]~% > >> > >> I think that, rather than speculating, we should wait for Oliver to > >> confirm that this is actually the problem, because I still don't > >think > >> it is. > >> > >> Chris -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Apr 9 21:40:22 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B72D6156EDDA; Tue, 9 Apr 2019 21:40:21 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mail50c50.megamailservers.eu (mail166c50.megamailservers.eu [91.136.10.176]) (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 73037837D4; Tue, 9 Apr 2019 21:40:20 +0000 (UTC) (envelope-from crees@bayofrum.net) X-Authenticated-User: bayofrum@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1554845080; bh=ngxfX11Amnxd3zzYHDCk7WHM3PMv/MQ6wjQfrZPHg3Y=; h=Date:In-Reply-To:References:Subject:To:CC:From:From; b=QY9wt/fkgESjjw6r9jYEFS50Qo25uFs0nd8tAyMuzfRXaYUGyNb5ybJKSTgXRScQm 4jDfxmhvfs8bSKNYAgU0N0yuREE0R3hYCEahv0WP71iC7zBkyexnmoIrlkajH/KOEX I26gUeC9oyw7veE/eBB7cxZkRBrxq87iFDgZxtQ4= Feedback-ID: crees@bayofrum. Received: from pegasus.bayofrum.net (81-178-238-70.dsl.pipex.com [81.178.238.70]) (authenticated bits=0) by mail50c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id x39LOcbC012169; Tue, 9 Apr 2019 21:24:39 +0000 Received: from R.bayofrum.net (R.bayofrum.net [192.168.1.129]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 168171EE0; Tue, 9 Apr 2019 22:24:20 +0100 (BST) Date: Tue, 09 Apr 2019 22:24:16 +0100 User-Agent: K-9 Mail for Android In-Reply-To: <2B336327-528C-4E16-AA5D-B3497B1941D0@bayofrum.net> References: <201904092108.x39L8ZCG062247@gndrsh.dnsmgr.net> <2B336327-528C-4E16-AA5D-B3497B1941D0@bayofrum.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: rgrimes@freebsd.org, "Rodney W. Grimes" , Chris Rees , jilles@freebsd.org CC: Andriy Gapon , "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Chris Rees Message-ID: <95242E98-E578-476E-AFA6-099F00AF50BC@bayofrum.net> X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 168171EE0.A57F8 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@bayofrum.net X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B0203.5CAD0D98.0051, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=ILEs9DnG c=1 sm=1 tr=0 a=i0HMBnJGy7D3/NFKO8d8XA==:117 a=i0HMBnJGy7D3/NFKO8d8XA==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=IkcTkHD0fZMA:10 a=oexKYjalfGEA:10 a=ZB5LerlCAAAA:8 a=iKhvJSA4AAAA:8 a=6I5d2MoRAAAA:8 a=8Pez3pwjZUDalHbnbrYA:9 a=QEXdDO2ut3YA:10 a=phWSN7ZC0a8A:10 a=YKPTzOroS2oaEK2QgPcx:22 a=odh9cflL3HIXMm4fY7Wr:22 a=IjZwj45LgO3ly-622nXo:22 X-Rspamd-Queue-Id: 73037837D4 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.981,0] X-Mailman-Approved-At: Tue, 09 Apr 2019 22:10:29 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 21:40:22 -0000 Hi again, On 9 April 2019 22:13:29 BST, Chris Rees wrote: > > >On 9 April 2019 22:08:35 BST, "Rodney W. Grimes" > wrote: >>> On 09/04/2019 20:59, Chris Rees wrote: >>> > On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" >> wrote: >>> >>> On 09/04/2019 21:33, Rodney W. Grimes wrote: >>> >>>> I think the trigger issue is: >>> >>>> grep zfs /etc/rc.d/zvol >>> >>>> rcvar=3D"zfs_enable" >>> >>>> required_modules=3D"zfs" >>> >>>> >>> >>>> that module requires may be going south with the >>> >>>> new code when the module is built into the kernel. >>> >>> Maybe it's because the module's name is zfsctrl (for whatever >>reason) >>> >> while the >>> >>> module file is named zfs.ko. >>> >> I suspect that could also lead to issues with the new code. >>> >> It seems to be failing to detect that zfs is infact functional in >>the >>> >> kernel, >>> >> and blindly, or not so blindly, trying to load zfs,ko, which when >>you >>> >> build >>> >> it into the kernel you usually do so without any modules built, >so >>> >> there is >>> >> no /boot/kernel/zfs.ko, and even if you did build it any attempt >>to >>> >> load >>> >> it would return an error. >>> > Loading with it built in isn't a problem, as I showed earlier. >>> > >>> > Loading when it doesn't exist *is*. >>> > >>> > I'm torn. Either we could revert this, or add a check to the >>required_modules function instead, which I think is the better >>solution. >>>=20 >>> Hang on, >>>=20 >>> [crees@pegasus]~% sudo kldload -n zfsctrl && echo yes >>> yes >> >>I think your testing the return value of sudo here? > >Sudo returns the child's return value. > Turns out Oliver had also reported this to current@ with a log https://lists.freebsd.org/pipermail/freebsd-current/2019-April/073148.html Jilles@, mind if I revert this while I get some testing on this scenario do= ne? It seems to me that zfs may not be included in the kernel, just zfsctrl, or= something like that. Chris --=20 Sent from my Android device with K-9 Mail. Please excuse my brevity. --=20 This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From owner-svn-src-head@freebsd.org Tue Apr 9 22:15:40 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41631157020E; Tue, 9 Apr 2019 22:15:40 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D4A3384E0E; Tue, 9 Apr 2019 22:15:39 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B0B441964A; Tue, 9 Apr 2019 22:15:39 +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 x39MFdGE042752; Tue, 9 Apr 2019 22:15:39 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39MFdDx042751; Tue, 9 Apr 2019 22:15:39 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201904092215.x39MFdDx042751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 9 Apr 2019 22:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346069 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 346069 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D4A3384E0E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 22:15:40 -0000 Author: glebius Date: Tue Apr 9 22:15:39 2019 New Revision: 346069 URL: https://svnweb.freebsd.org/changeset/base/346069 Log: Obvious comment correction. Modified: head/sys/sys/sockbuf.h Modified: head/sys/sys/sockbuf.h ============================================================================== --- head/sys/sys/sockbuf.h Tue Apr 9 21:38:20 2019 (r346068) +++ head/sys/sys/sockbuf.h Tue Apr 9 22:15:39 2019 (r346069) @@ -98,7 +98,7 @@ struct sockbuf { u_int sb_ctl; /* (a) non-data chars in buffer */ int sb_lowat; /* (a) low water mark */ sbintime_t sb_timeo; /* (a) timeout for read/write */ - short sb_flags; /* (a) flags, see below */ + short sb_flags; /* (a) flags, see above */ int (*sb_upcall)(struct socket *, void *, int); /* (a) */ void *sb_upcallarg; /* (a) */ TAILQ_HEAD(, kaiocb) sb_aiojobq; /* (a) pending AIO ops */ From owner-svn-src-head@freebsd.org Tue Apr 9 22:20:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E98D157039C; Tue, 9 Apr 2019 22:20:12 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2E4384FA8; Tue, 9 Apr 2019 22:20:11 +0000 (UTC) (envelope-from sjg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC49B19654; Tue, 9 Apr 2019 22:20:11 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x39MKBL9043000; Tue, 9 Apr 2019 22:20:11 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x39MKBKe042999; Tue, 9 Apr 2019 22:20:11 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201904092220.x39MKBKe042999@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Tue, 9 Apr 2019 22:20:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346070 - head/lib/libsecureboot X-SVN-Group: head X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: head/lib/libsecureboot X-SVN-Commit-Revision: 346070 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F2E4384FA8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 22:20:12 -0000 Author: sjg Date: Tue Apr 9 22:20:11 2019 New Revision: 346070 URL: https://svnweb.freebsd.org/changeset/base/346070 Log: Always report file with incorrect hash. Modified: head/lib/libsecureboot/verify_file.c Modified: head/lib/libsecureboot/verify_file.c ============================================================================== --- head/lib/libsecureboot/verify_file.c Tue Apr 9 22:15:39 2019 (r346069) +++ head/lib/libsecureboot/verify_file.c Tue Apr 9 22:20:11 2019 (r346070) @@ -366,7 +366,7 @@ verify_file(int fd, const char *filename, off_t off, i return (rc); } - if (severity || verbose) + if (severity || verbose || rc == VE_FINGERPRINT_WRONG) printf("Unverified: %s\n", ve_error_get()); if (rc == VE_FINGERPRINT_UNKNOWN && severity < VE_MUST) rc = VE_UNVERIFIED_OK; From owner-svn-src-head@freebsd.org Tue Apr 9 21:47:59 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7536156F2DC; Tue, 9 Apr 2019 21:47:58 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from ecc05.stack.nl (ws0.zlo.nu [190.2.135.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.stack.nl", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6EBD683EE7; Tue, 9 Apr 2019 21:47:56 +0000 (UTC) (envelope-from jilles@stack.nl) Received: from mail02.stack.nl (blade.stack.nl [51.15.111.152]) by ecc05.stack.nl (Postfix) with ESMTPS id 2436F100F73; Tue, 9 Apr 2019 21:47:47 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail02.stack.nl (Postfix) with ESMTP id 024F0240FD7; Tue, 9 Apr 2019 21:47:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail02 Received: from mail02.stack.nl ([127.0.0.1]) by localhost (mail02.stack.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oGXvYWEm2_mo; Tue, 9 Apr 2019 21:47:44 +0000 (UTC) Received: from blade.stack.nl (blade.stack.nl [192.168.122.130]) by mail02.stack.nl (Postfix) with ESMTP id 3A6A2240FD4; Tue, 9 Apr 2019 21:47:44 +0000 (UTC) Received: by blade.stack.nl (Postfix, from userid 1677) id 12C08211C5; Tue, 9 Apr 2019 23:47:44 +0200 (CEST) Date: Tue, 9 Apr 2019 23:47:44 +0200 From: Jilles Tjoelker To: Chris Rees Cc: rgrimes@freebsd.org, "Rodney W. Grimes" , Chris Rees , Andriy Gapon , "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 Message-ID: <20190409214743.GA9621@stack.nl> References: <201904092108.x39L8ZCG062247@gndrsh.dnsmgr.net> <2B336327-528C-4E16-AA5D-B3497B1941D0@bayofrum.net> <95242E98-E578-476E-AFA6-099F00AF50BC@bayofrum.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <95242E98-E578-476E-AFA6-099F00AF50BC@bayofrum.net> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 6EBD683EE7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of jilles@stack.nl designates 190.2.135.243 as permitted sender) smtp.mailfrom=jilles@stack.nl X-Spamd-Result: default: False [-2.70 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.89)[-0.890,0]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:190.2.135.243]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[stack.nl]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[mail01.stack.nl]; NEURAL_HAM_SHORT(-0.51)[-0.506,0]; RCPT_COUNT_SEVEN(0.00)[10]; IP_SCORE(0.00)[country: NL(0.01)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:49981, ipnet:190.2.128.0/20, country:NL]; MID_RHS_MATCH_FROM(0.00)[] X-Mailman-Approved-At: Tue, 09 Apr 2019 22:25:23 +0000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 21:47:59 -0000 On Tue, Apr 09, 2019 at 10:24:16PM +0100, Chris Rees wrote: > On 9 April 2019 22:13:29 BST, Chris Rees wrote: > >On 9 April 2019 22:08:35 BST, "Rodney W. Grimes" > > wrote: > >>> On 09/04/2019 20:59, Chris Rees wrote: > >>> > On 9 April 2019 20:55:07 BST, "Rodney W. Grimes" > >> wrote: > >>> >>> On 09/04/2019 21:33, Rodney W. Grimes wrote: > >>> >>>> I think the trigger issue is: > >>> >>>> grep zfs /etc/rc.d/zvol > >>> >>>> rcvar="zfs_enable" > >>> >>>> required_modules="zfs" > >>> >>>> that module requires may be going south with the > >>> >>>> new code when the module is built into the kernel. > >>> >>> Maybe it's because the module's name is zfsctrl (for whatever > >>reason) > >>> >> while the > >>> >>> module file is named zfs.ko. > >>> >> I suspect that could also lead to issues with the new code. > >>> >> It seems to be failing to detect that zfs is infact functional in > >>the > >>> >> kernel, > >>> >> and blindly, or not so blindly, trying to load zfs,ko, which when > >>you > >>> >> build > >>> >> it into the kernel you usually do so without any modules built, > >so > >>> >> there is > >>> >> no /boot/kernel/zfs.ko, and even if you did build it any attempt > >>to > >>> >> load > >>> >> it would return an error. > >>> > Loading with it built in isn't a problem, as I showed earlier. > >>> > Loading when it doesn't exist *is*. > >>> > I'm torn. Either we could revert this, or add a check to the > >>required_modules function instead, which I think is the better solution. > >>> Hang on, > >>> [crees@pegasus]~% sudo kldload -n zfsctrl && echo yes > >>> yes > >>I think your testing the return value of sudo here? > >Sudo returns the child's return value. > Turns out Oliver had also reported this to current@ with a log > https://lists.freebsd.org/pipermail/freebsd-current/2019-April/073148.html > Jilles@, mind if I revert this while I get some testing on this > scenario done? > It seems to me that zfs may not be included in the kernel, just > zfsctrl, or something like that. It seems like kldload -n does not work as expected for zfs, so reverting seems the right approach. -- Jilles Tjoelker From owner-svn-src-head@freebsd.org Wed Apr 10 06:04:29 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2EC17157905C; Wed, 10 Apr 2019 06:04:29 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7AD6791187; Wed, 10 Apr 2019 06:04:28 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lj1-f195.google.com with SMTP id k8so924206lja.8; Tue, 09 Apr 2019 23:04:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=UJkSpSKyPe/WxbrOxHIaHCW+2xa5KX+luqhtzytV5Y8=; b=lRGuqTeK2XULLGjdsgCbTrP6R+Bv5lfeYMf025scZFynOmupf9YP8K6cNeU/mcA1Sj a/xM74rnmgRKzuPXppeCBSqrQf5Gu3kRERKjLdiNnliS42N2HR9ikssXzIH45yVbevjS 6mzpv1+SJl56TMALJ5yWr48LX6D0vYDuXfa0RwLgFtONbVzhmxJ6j7ekGRIpe5EQLGGR rAI8GWDE78SsHmqfu8Wvx8vPQkmlPPUaylAAQSU+zrCUPP83O5qKrEKhXHe45w/N9Ib2 AgXe+kwok3FQWU31gBa9JETXMzv0teDVjpKEUWnfugAf3+d/1aoim0iC+f2tnUjroFzB amNw== X-Gm-Message-State: APjAAAWjYoudIt1sqU6F+xH+QZiHwDnGbkEZJlD+7iRCmo9OBKt6vrPh 4ZucnLfbHir6H/ZPtLEmt0Vx4u5AiZ4= X-Google-Smtp-Source: APXvYqxV4Q3dZnyfJro1Y+fhQBq0ra3vnz1MT9HT0cXhGGBalK547mM8pI31zeIz6MtDrwODaL9k3g== X-Received: by 2002:a2e:968c:: with SMTP id q12mr21497156lji.36.1554874476905; Tue, 09 Apr 2019 22:34:36 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id x2sm6838012lfg.59.2019.04.09.22.34.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 22:34:35 -0700 (PDT) Subject: Re: svn commit: r346017 - in head: libexec/rc libexec/rc/rc.d share/man/man5 To: Chris Rees , Chris Rees , rgrimes@freebsd.org, "Rodney W. Grimes" Cc: "O. Hartmann" , Chris Rees , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201904091955.x39Jt7PU061907@gndrsh.dnsmgr.net> <56770290-a7f2-07dc-3f5a-f9d5721db724@rees.space> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; prefer-encrypt=mutual; keydata= xsFNBFm4LIgBEADNB/3lT7f15UKeQ52xCFQx/GqHkSxEdVyLFZTmY3KyNPQGBtyvVyBfprJ7 mAeXZWfhat6cKNRAGZcL5EmewdQuUfQfBdYmKjbw3a9GFDsDNuhDA2QwFt8BmkiVMRYyvI7l N0eVzszWCUgdc3qqM6qqcgBaqsVmJluwpvwp4ZBXmch5BgDDDb1MPO8AZ2QZfIQmplkj8Y6Z AiNMknkmgaekIINSJX8IzRzKD5WwMsin70psE8dpL/iBsA2cpJGzWMObVTtCxeDKlBCNqM1i gTXta1ukdUT7JgLEFZk9ceYQQMJJtUwzWu1UHfZn0Fs29HTqawfWPSZVbulbrnu5q55R4PlQ /xURkWQUTyDpqUvb4JK371zhepXiXDwrrpnyyZABm3SFLkk2bHlheeKU6Yql4pcmSVym1AS4 dV8y0oHAfdlSCF6tpOPf2+K9nW1CFA8b/tw4oJBTtfZ1kxXOMdyZU5fiG7xb1qDgpQKgHUX8 7Rd2T1UVLVeuhYlXNw2F+a2ucY+cMoqz3LtpksUiBppJhw099gEXehcN2JbUZ2TueJdt1FdS ztnZmsHUXLxrRBtGwqnFL7GSd6snpGIKuuL305iaOGODbb9c7ne1JqBbkw1wh8ci6vvwGlzx rexzimRaBzJxlkjNfMx8WpCvYebGMydNoeEtkWldtjTNVsUAtQARAQABzR5BbmRyaXkgR2Fw b24gPGF2Z0BGcmVlQlNELm9yZz7CwZQEEwEIAD4WIQS+LEO7ngQnXA4Bjr538m7TUc1yjwUC WbgsiAIbIwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRB38m7TUc1yj+JAEACV l9AK/nOWAt/9cufV2fRj0hdOqB1aCshtSrwHk/exXsDa4/FkmegxXQGY+3GWX3deIyesbVRL rYdtdK0dqJyT1SBqXK1h3/at9rxr9GQA6KWOxTjUFURsU7ok/6SIlm8uLRPNKO+yq0GDjgaO LzN+xykuBA0FlhQAXJnpZLcVfPJdWv7sSHGedL5ln8P8rxR+XnmsA5TUaaPcbhTB+mG+iKFj GghASDSfGqLWFPBlX/fpXikBDZ1gvOr8nyMY9nXhgfXpq3B6QCRYKPy58ChrZ5weeJZ29b7/ QdEO8NFNWHjSD9meiLdWQaqo9Y7uUxN3wySc/YUZxtS0bhAd8zJdNPsJYG8sXgKjeBQMVGuT eCAJFEYJqbwWvIXMfVWop4+O4xB+z2YE3jAbG/9tB/GSnQdVSj3G8MS80iLS58frnt+RSEw/ psahrfh0dh6SFHttE049xYiC+cM8J27Aaf0i9RflyITq57NuJm+AHJoU9SQUkIF0nc6lfA+o JRiyRlHZHKoRQkIg4aiKaZSWjQYRl5Txl0IZUP1dSWMX4s3XTMurC/pnja45dge/4ESOtJ9R 8XuIWg45Oq6MeIWdjKddGhRj3OohsltKgkEU3eLKYtB6qRTQypHHUawCXz88uYt5e3w4V16H lCpSTZV/EVHnNe45FVBlvK7k7HFfDDkryM7BTQRZuCyIARAAlq0slcsVboY/+IUJdcbEiJRW be9HKVz4SUchq0z9MZPX/0dcnvz/gkyYA+OuM78dNS7Mbby5dTvOqfpLJfCuhaNYOhlE0wY+ 1T6Tf1f4c/uA3U/YiadukQ3+6TJuYGAdRZD5EqYFIkreARTVWg87N9g0fT9BEqLw9lJtEGDY EWUE7L++B8o4uu3LQFEYxcrb4K/WKmgtmFcm77s0IKDrfcX4doV92QTIpLiRxcOmCC/OCYuO jB1oaaqXQzZrCutXRK0L5XN1Y1PYjIrEzHMIXmCDlLYnpFkK+itlXwlE2ZQxkfMruCWdQXye syl2fynAe8hvp7Mms9qU2r2K9EcJiR5N1t1C2/kTKNUhcRv7Yd/vwusK7BqJbhlng5ZgRx0m WxdntU/JLEntz3QBsBsWM9Y9wf2V4tLv6/DuDBta781RsCB/UrU2zNuOEkSixlUiHxw1dccI 6CVlaWkkJBxmHX22GdDFrcjvwMNIbbyfQLuBq6IOh8nvu9vuItup7qemDG3Ms6TVwA7BD3j+ 3fGprtyW8Fd/RR2bW2+LWkMrqHffAr6Y6V3h5kd2G9Q8ZWpEJk+LG6Mk3fhZhmCnHhDu6CwN MeUvxXDVO+fqc3JjFm5OxhmfVeJKrbCEUJyM8ESWLoNHLqjywdZga4Q7P12g8DUQ1mRxYg/L HgZY3zfKOqcAEQEAAcLBfAQYAQgAJhYhBL4sQ7ueBCdcDgGOvnfybtNRzXKPBQJZuCyIAhsM BQkFo5qAAAoJEHfybtNRzXKPBVwQAKfFy9P7N3OsLDMB56A4Kf+ZT+d5cIx0Yiaf4n6w7m3i ImHHHk9FIetI4Xe54a2IXh4Bq5UkAGY0667eIs+Z1Ea6I2i27Sdo7DxGwq09Qnm/Y65ADvXs 3aBvokCcm7FsM1wky395m8xUos1681oV5oxgqeRI8/76qy0hD9WR65UW+HQgZRIcIjSel9vR XDaD2HLGPTTGr7u4v00UeTMs6qvPsa2PJagogrKY8RXdFtXvweQFz78NbXhluwix2Tb9ETPk LIpDrtzV73CaE2aqBG/KrboXT2C67BgFtnk7T7Y7iKq4/XvEdDWscz2wws91BOXuMMd4c/c4 OmGW9m3RBLufFrOag1q5yUS9QbFfyqL6dftJP3Zq/xe+mr7sbWbhPVCQFrH3r26mpmy841ym dwQnNcsbIGiBASBSKksOvIDYKa2Wy8htPmWFTEOPRpFXdGQ27awcjjnB42nngyCK5ukZDHi6 w0qK5DNQQCkiweevCIC6wc3p67jl1EMFY5+z+zdTPb3h7LeVnGqW0qBQl99vVFgzLxchKcl0 R/paSFgwqXCZhAKMuUHncJuynDOP7z5LirUeFI8qsBAJi1rXpQoLJTVcW72swZ42IdPiboqx NbTMiNOiE36GqMcTPfKylCbF45JNX4nF9ElM0E+Y8gi4cizJYBRr2FBJgay0b9Cp Message-ID: Date: Wed, 10 Apr 2019 08:34:34 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <56770290-a7f2-07dc-3f5a-f9d5721db724@rees.space> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 7AD6791187 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.94)[-0.935,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 06:04:29 -0000 On 09/04/2019 23:08, Chris Rees wrote: > [crees@pegasus]~% sudo kldload -n zfsctrl && echo yes > yes > > [crees@pegasus]~% find /boot -name zfsctrl\* > [crees@pegasus]~% I am not sure what was your point, but here are some thoughts (or food for thought). 1. As I mentioned earlier, ZFS has this duality where a loadable file is called zfs.ko, but the actual module is called zfsctrl 2. 'kldload -n zfsctrl' should work if ZFS is already present (either in the kernel or because zfs.ko is loaded) because zfsctlr is the module name 3. I don't know if 'kldload -n zfsctrl' would work if ZFS is not loaded, because I am not sure if kldload is able to figure out that zfsctlrl can be found in zfs.ko. 4. In any case, /etc/rc.d/zfs has required_modules="zfs". So, the above is moot unless you replace "zfs" with "zfsctrl". And then, it may or may not work depending on #3. -- Andriy Gapon From owner-svn-src-head@freebsd.org Wed Apr 10 07:51:16 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D76EA157B884; Wed, 10 Apr 2019 07:51:15 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7AC36944FF; Wed, 10 Apr 2019 07:51:15 +0000 (UTC) (envelope-from crees@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53A281F8CB; Wed, 10 Apr 2019 07:51:15 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3A7pFdo045002; Wed, 10 Apr 2019 07:51:15 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3A7pDo8044989; Wed, 10 Apr 2019 07:51:13 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201904100751.x3A7pDo8044989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Wed, 10 Apr 2019 07:51:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346072 - in head: libexec/rc libexec/rc/rc.d share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head: libexec/rc libexec/rc/rc.d share/man/man5 X-SVN-Commit-Revision: 346072 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7AC36944FF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 07:51:16 -0000 Author: crees (doc,ports committer) Date: Wed Apr 10 07:51:13 2019 New Revision: 346072 URL: https://svnweb.freebsd.org/changeset/base/346072 Log: Revert r346017 pending compiled-in zfs fix PR: 237172 Approved by: jilles Differential Revision: https://reviews.freebsd.org/D18670 Modified: head/libexec/rc/rc.d/abi head/libexec/rc/rc.d/bthidd head/libexec/rc/rc.d/cfumass head/libexec/rc/rc.d/kld head/libexec/rc/rc.d/mdconfig head/libexec/rc/rc.d/mdconfig2 head/libexec/rc/rc.d/mountcritremote head/libexec/rc/rc.d/syscons head/libexec/rc/rc.subr head/share/man/man5/rc.conf.5 Modified: head/libexec/rc/rc.d/abi ============================================================================== --- head/libexec/rc/rc.d/abi Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/abi Wed Apr 10 07:51:13 2019 (r346072) @@ -27,10 +27,10 @@ linux_start() local _tmpdir echo -n ' linux' - load_kld linux + load_kld -e 'linux(aout|elf)' linux case `sysctl -n hw.machine_arch` in amd64) - load_kld linux64 + load_kld -e 'linux64elf' linux64 ;; esac if [ -x /compat/linux/sbin/ldconfigDisabled ]; then Modified: head/libexec/rc/rc.d/bthidd ============================================================================== --- head/libexec/rc/rc.d/bthidd Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/bthidd Wed Apr 10 07:51:13 2019 (r346072) @@ -34,11 +34,11 @@ evdev_enabled() bthidd_prestart() { if evdev_enabled; then - load_kld uinput + load_kld -m uinput uinput fi - load_kld kbdmux - load_kld vkbd - load_kld ng_btsocket + load_kld -m kbdmux kbdmux + load_kld -m vkbd vkbd + load_kld -m ng_btsocket ng_btsocket return 0 } Modified: head/libexec/rc/rc.d/cfumass ============================================================================== --- head/libexec/rc/rc.d/cfumass Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/cfumass Wed Apr 10 07:51:13 2019 (r346072) @@ -75,7 +75,7 @@ cfumass_start() return "${err}" fi - load_kld cfumass + load_kld -e cfumass cfumass # If the template is already switched to Mass Storage, then reset # it to -1 to force the host to reenumerate it; otherwise it might Modified: head/libexec/rc/rc.d/kld ============================================================================== --- head/libexec/rc/rc.d/kld Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/kld Wed Apr 10 07:51:13 2019 (r346072) @@ -46,7 +46,7 @@ kld_start() echo 'Loading kernel modules:' for _kld in $kld_list ; do - load_kld $_kld + load_kld -e ${_kld}.ko $_kld done } Modified: head/libexec/rc/rc.d/mdconfig ============================================================================== --- head/libexec/rc/rc.d/mdconfig Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/mdconfig Wed Apr 10 07:51:13 2019 (r346072) @@ -114,7 +114,7 @@ mdconfig_start() continue fi if [ "${_file}" != "${_file%.uzip}" ]; then - load_kld geom_uzip || return 3 + load_kld -m g_uzip geom_uzip || return 3 # sleep a bit to allow creation of /dev/mdX.uzip sleep 2 fi Modified: head/libexec/rc/rc.d/mdconfig2 ============================================================================== --- head/libexec/rc/rc.d/mdconfig2 Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/mdconfig2 Wed Apr 10 07:51:13 2019 (r346072) @@ -123,7 +123,7 @@ mdconfig2_start() # been created. if [ "${_type}" = "vnode" -a "${_fs}" != "/" ]; then if [ "${_file}" != "${_file%.uzip}" ]; then - load_kld geom_uzip || return 3 + load_kld -m g_uzip geom_uzip || return 3 fi if is_readonly ${_fs}; then warn "${_fs} is mounted read-only, skipping ${_md}." Modified: head/libexec/rc/rc.d/mountcritremote ============================================================================== --- head/libexec/rc/rc.d/mountcritremote Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/mountcritremote Wed Apr 10 07:51:13 2019 (r346072) @@ -27,7 +27,7 @@ mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in *mount_nfs*) # Handle absent nfs client support - load_kld nfscl || return 1 + load_kld -m nfs nfscl || return 1 ;; esac return 0 Modified: head/libexec/rc/rc.d/syscons ============================================================================== --- head/libexec/rc/rc.d/syscons Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.d/syscons Wed Apr 10 07:51:13 2019 (r346072) @@ -346,7 +346,7 @@ syscons_start() for i in `kldstat | awk '$5 ~ "_saver\.ko$" { print $5 }'`; do kldunload ${i} done - load_kld ${saver}_saver + load_kld -e _saver ${saver}_saver ;; esac Modified: head/libexec/rc/rc.subr ============================================================================== --- head/libexec/rc/rc.subr Wed Apr 10 06:23:15 2019 (r346071) +++ head/libexec/rc/rc.subr Wed Apr 10 07:51:13 2019 (r346072) @@ -1853,29 +1853,48 @@ mount_md() } # Code common to scripts that need to load a kernel module -# if it isn't in the kernel yet. Syntax: -# load_kld file +# if it isn't in the kernel yet. Syntax: +# load_kld [-e regex] [-m module] file +# where -e or -m chooses the way to check if the module +# is already loaded: +# regex is egrep'd in the output from `kldstat -v', +# module is passed to `kldstat -m'. +# The default way is as though `-m file' were specified. load_kld() { - local _opt + local _loaded _mod _opt _re - # Silently ignore legacy options; they are unnecessary while getopts "e:m:" _opt; do case "$_opt" in - e) ;; - m) ;; - *) err 3 'USAGE: load_kld file' ;; + e) _re="$OPTARG" ;; + m) _mod="$OPTARG" ;; + *) err 3 'USAGE: load_kld [-e regex] [-m module] file' ;; esac done shift $(($OPTIND - 1)) if [ $# -ne 1 ]; then - err 3 'USAGE: load_kld file' + err 3 'USAGE: load_kld [-e regex] [-m module] file' fi - if ! kldload -n "$1"; then - warn "Unable to load kernel module $1" - return 1 + _mod=${_mod:-$1} + _loaded=false + if [ -n "$_re" ]; then + if kldstat -v | egrep -q -e "$_re"; then + _loaded=true + fi else - info "$1 kernel module loaded." + if kldstat -q -m "$_mod"; then + _loaded=true + fi + fi + if ! $_loaded; then + if ! kldload "$1"; then + warn "Unable to load kernel module $1" + return 1 + else + info "$1 kernel module loaded." + fi + else + debug "load_kld: $1 kernel module already loaded." fi return 0 } Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Wed Apr 10 06:23:15 2019 (r346071) +++ head/share/man/man5/rc.conf.5 Wed Apr 10 07:51:13 2019 (r346072) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 7, 2019 +.Dd March 21, 2019 .Dt RC.CONF 5 .Os .Sh NAME @@ -249,7 +249,9 @@ Default .It Va kld_list .Pq Vt str A whitespace-separated list of kernel modules to load right after -the local disks are mounted, with optional path. +the local disks are mounted, without any +.Pa .ko +extension or path. Loading modules at this point in the boot process is much faster than doing it via .Pa /boot/loader.conf From owner-svn-src-head@freebsd.org Wed Apr 10 08:17:57 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2878157C10D; Wed, 10 Apr 2019 08:17:57 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 56845954C6; Wed, 10 Apr 2019 08:17:57 +0000 (UTC) (envelope-from avos@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F5F41FC9A; Wed, 10 Apr 2019 08:17:57 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3A8HuAU060452; Wed, 10 Apr 2019 08:17:56 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3A8HuQL060450; Wed, 10 Apr 2019 08:17:56 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201904100817.x3A8HuQL060450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Wed, 10 Apr 2019 08:17:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346073 - in head/sys/dev: iwi otus usb/wlan X-SVN-Group: head X-SVN-Commit-Author: avos X-SVN-Commit-Paths: in head/sys/dev: iwi otus usb/wlan X-SVN-Commit-Revision: 346073 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 56845954C6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 08:17:57 -0000 Author: avos Date: Wed Apr 10 08:17:56 2019 New Revision: 346073 URL: https://svnweb.freebsd.org/changeset/base/346073 Log: urtw(4), otus(4), iwi(4): allow to set non-default MAC address via ifconfig(8) Tested with Netgear WG111 v3 (RTL8187B, urtw(4)), STA mode. MFC after: 1 week Modified: head/sys/dev/iwi/if_iwi.c head/sys/dev/otus/if_otus.c head/sys/dev/usb/wlan/if_urtw.c Modified: head/sys/dev/iwi/if_iwi.c ============================================================================== --- head/sys/dev/iwi/if_iwi.c Wed Apr 10 07:51:13 2019 (r346072) +++ head/sys/dev/iwi/if_iwi.c Wed Apr 10 08:17:56 2019 (r346073) @@ -2576,15 +2576,18 @@ static int iwi_config(struct iwi_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct iwi_configuration config; struct iwi_txpower power; + uint8_t *macaddr; uint32_t data; int error, i; IWI_LOCK_ASSERT(sc); - DPRINTF(("Setting MAC address to %6D\n", ic->ic_macaddr, ":")); - error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, ic->ic_macaddr, + macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr; + DPRINTF(("Setting MAC address to %6D\n", macaddr, ":")); + error = iwi_cmd(sc, IWI_CMD_SET_MAC_ADDRESS, macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; Modified: head/sys/dev/otus/if_otus.c ============================================================================== --- head/sys/dev/otus/if_otus.c Wed Apr 10 07:51:13 2019 (r346072) +++ head/sys/dev/otus/if_otus.c Wed Apr 10 08:17:56 2019 (r346073) @@ -3108,7 +3108,7 @@ otus_set_operating_mode(struct otus_softc *sc) */ IEEE80211_ADDR_COPY(bssid, zero_macaddr); vap = TAILQ_FIRST(&ic->ic_vaps); - macaddr = ic->ic_macaddr; + macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr; switch (ic->ic_opmode) { case IEEE80211_M_STA: Modified: head/sys/dev/usb/wlan/if_urtw.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtw.c Wed Apr 10 07:51:13 2019 (r346072) +++ head/sys/dev/usb/wlan/if_urtw.c Wed Apr 10 08:17:56 2019 (r346073) @@ -752,6 +752,7 @@ static void urtw_free_tx_data_list(struct urtw_softc static void urtw_free_rx_data_list(struct urtw_softc *); static void urtw_free_data_list(struct urtw_softc *, struct urtw_data data[], int, int); +static usb_error_t urtw_set_macaddr(struct urtw_softc *, const uint8_t *); static usb_error_t urtw_adapter_start(struct urtw_softc *); static usb_error_t urtw_adapter_start_b(struct urtw_softc *); static usb_error_t urtw_set_mode(struct urtw_softc *, uint32_t); @@ -1187,9 +1188,23 @@ fail: } static usb_error_t +urtw_set_macaddr(struct urtw_softc *sc, const uint8_t *macaddr) +{ + usb_error_t error; + + urtw_write32_m(sc, URTW_MAC0, ((const uint32_t *)macaddr)[0]); + urtw_write16_m(sc, URTW_MAC4, ((const uint32_t *)macaddr)[1] & 0xffff); + +fail: + return (error); +} + +static usb_error_t urtw_adapter_start(struct urtw_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + const uint8_t *macaddr; usb_error_t error; error = urtw_reset(sc); @@ -1209,8 +1224,11 @@ urtw_adapter_start(struct urtw_softc *sc) if (error) goto fail; /* applying MAC address again. */ - urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]); - urtw_write16_m(sc, URTW_MAC4, ((uint32_t *)ic->ic_macaddr)[1] & 0xffff); + macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr; + urtw_set_macaddr(sc, macaddr); + if (error) + goto fail; + error = urtw_set_mode(sc, URTW_EPROM_CMD_NORMAL); if (error) goto fail; @@ -3180,6 +3198,8 @@ static usb_error_t urtw_8225v2b_rf_init(struct urtw_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + const uint8_t *macaddr; unsigned int i; uint8_t data8; usb_error_t error; @@ -3227,8 +3247,10 @@ urtw_8225v2b_rf_init(struct urtw_softc *sc) urtw_write8_m(sc, URTW_CONFIG1, data8); /* applying MAC address again. */ - urtw_write32_m(sc, URTW_MAC0, ((uint32_t *)ic->ic_macaddr)[0]); - urtw_write16_m(sc, URTW_MAC4, ((uint32_t *)ic->ic_macaddr)[1] & 0xffff); + macaddr = vap ? vap->iv_myaddr : ic->ic_macaddr; + error = urtw_set_macaddr(sc, macaddr); + if (error) + goto fail; error = urtw_set_mode(sc, URTW_EPROM_CMD_NORMAL); if (error) From owner-svn-src-head@freebsd.org Wed Apr 10 10:21:15 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C43E157E48D; Wed, 10 Apr 2019 10:21:15 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C395C6A38E; Wed, 10 Apr 2019 10:21:14 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D26921151; Wed, 10 Apr 2019 10:21:14 +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 x3AALEP2025375; Wed, 10 Apr 2019 10:21:14 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AALErR025374; Wed, 10 Apr 2019 10:21:14 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904101021.x3AALErR025374@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 10 Apr 2019 10:21:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346076 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 346076 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C395C6A38E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.94)[-0.938,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 10:21:15 -0000 Author: trasz Date: Wed Apr 10 10:21:14 2019 New Revision: 346076 URL: https://svnweb.freebsd.org/changeset/base/346076 Log: Improve vnode lock assertions. MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Wed Apr 10 09:19:26 2019 (r346075) +++ head/sys/kern/imgact_elf.c Wed Apr 10 10:21:14 2019 (r346076) @@ -658,6 +658,8 @@ __elfN(load_sections)(struct image_params *imgp, const bool first; int error, i; + ASSERT_VOP_LOCKED(imgp->vp, __func__); + base_addr = 0; first = true; @@ -924,8 +926,7 @@ __elfN(get_interp)(struct image_params *imgp, const El KASSERT(phdr->p_type == PT_INTERP, ("%s: p_type %u != PT_INTERP", __func__, phdr->p_type)); - KASSERT(VOP_ISLOCKED(imgp->vp), - ("%s: vp %p is not locked", __func__, imgp->vp)); + ASSERT_VOP_LOCKED(imgp->vp, __func__); td = curthread; From owner-svn-src-head@freebsd.org Wed Apr 10 11:04:08 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFA37157F222; Wed, 10 Apr 2019 11:04:07 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8FB026BE7E; Wed, 10 Apr 2019 11:04:07 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 5FED1CB7D; Wed, 10 Apr 2019 11:04:07 +0000 (UTC) From: Jan Beich To: Enji Cooper Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345708 - in head: lib/clang lib/libc++ lib/libc++experimental lib/libc++fs lib/libclang_rt lib/libcxxrt lib/libgcc_eh lib/libomp lib/ofed/libibnetdisc share/mk usr.bin/dtc usr.sbin/pmc References: <201903291845.x2TIjRMb087865@repo.freebsd.org> Date: Wed, 10 Apr 2019 13:04:03 +0200 In-Reply-To: <201903291845.x2TIjRMb087865@repo.freebsd.org> (Enji Cooper's message of "Fri, 29 Mar 2019 18:45:27 +0000 (UTC)") Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 8FB026BE7E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_MEDIUM(-0.99)[-0.990,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 11:04:08 -0000 Enji Cooper writes: > +.if ${COMPILER_FEATURES:Mc++11} > +CXXSTD?= c++11 POLA violation. Clang 6.0 or later defaults to gnu++14, not c++11. > +.elif ${COMPILER_TYPE} == "gcc" > +# Prior versions of g++ support C++98 with GNU extensions by default. > +CXXSTD?= gnu++98 POLA violation. GCC 6.0 or later defaults to gnu++14, not gnu++98. > +CXXFLAGS+= -std=${CXXSTD} POLA violation. Breaks consumers that pass different -std= e.g., http://www.ipv6proxy.net/go.php?u=http://beefy12.nyi.freebsd.org/data/head-amd64-default/p498440_s346039/logs/errors/android-tools-adb-9.0.0.r3_2.log Index: share/mk/bsd.sys.mk =================================================================== --- share/mk/bsd.sys.mk (revision 346076) +++ share/mk/bsd.sys.mk (working copy) @@ -25,16 +25,19 @@ CFLAGS+= -std=iso9899:1999 CFLAGS+= -std=${CSTD} .endif # CSTD -.if ${COMPILER_FEATURES:Mc++11} -CXXSTD?= c++11 -.elif ${COMPILER_TYPE} == "gcc" -# Prior versions of g++ support C++98 with GNU extensions by default. +.if (${COMPILER_TYPE} == "clang" || ${COMPILER_TYPE} == "gcc") && ${COMPILER_VERSION} >= 60000 +CXXSTD?= gnu++14 +.elif ${COMPILER_TYPE} == "clang" || ${COMPILER_TYPE} == "gcc" +# Prior versions of clang++ and g++ support C++98 with GNU extensions by default. CXXSTD?= gnu++98 .else # Assume that the compiler supports at least C++98. CXXSTD?= c++98 .endif +# Only pass -std= if missing to facilitate compatibility with previous FreeBSD versions +.if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=${CXXSTD} +.endif # CXXSTD # -pedantic is problematic because it also imposes namespace restrictions From owner-svn-src-head@freebsd.org Wed Apr 10 13:02:34 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F27E71582257; Wed, 10 Apr 2019 13:02:33 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 974DC6FB71; Wed, 10 Apr 2019 13:02:33 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F76A22DF0; Wed, 10 Apr 2019 13:02:33 +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 x3AD2XJ1012360; Wed, 10 Apr 2019 13:02:33 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AD2XKg012359; Wed, 10 Apr 2019 13:02:33 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201904101302.x3AD2XKg012359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 10 Apr 2019 13:02:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346078 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 346078 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 974DC6FB71 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 13:02:34 -0000 Author: asomers Date: Wed Apr 10 13:02:33 2019 New Revision: 346078 URL: https://svnweb.freebsd.org/changeset/base/346078 Log: fix cache_lookup's documentation cache_lookup's documentation got dislocated by r324378. Relocate and expand it. Reviewed by: jhb, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Wed Apr 10 10:50:48 2019 (r346077) +++ head/sys/kern/vfs_cache.c Wed Apr 10 13:02:33 2019 (r346078) @@ -150,7 +150,7 @@ struct namecache_ts { * Names found by directory scans are retained in a cache * for future reference. It is managed LRU, so frequently * used names will hang around. Cache is indexed by hash value - * obtained from (vp, name) where vp refers to the directory + * obtained from (dvp, name) where dvp refers to the directory * containing name. * * If it is a "negative" entry, (i.e. for a name that is known NOT to @@ -1129,23 +1129,6 @@ cache_lookup_dot(struct vnode *dvp, struct vnode **vpp return (-1); } -/* - * Lookup an entry in the cache - * - * Lookup is called with dvp pointing to the directory to search, - * cnp pointing to the name of the entry being sought. If the lookup - * succeeds, the vnode is returned in *vpp, and a status of -1 is - * returned. If the lookup determines that the name does not exist - * (negative caching), a status of ENOENT is returned. If the lookup - * fails, a status of zero is returned. If the directory vnode is - * recycled out from under us due to a forced unmount, a status of - * ENOENT is returned. - * - * vpp is locked and ref'd on return. If we're looking up DOTDOT, dvp is - * unlocked. If we're looking up . an extra ref is taken, but the lock is - * not recursively acquired. - */ - static __noinline int cache_lookup_nomakeentry(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, struct timespec *tsp, int *ticksp) @@ -1229,6 +1212,42 @@ out_no_entry: return (0); } +/** + * Lookup a name in the name cache + * + * # Arguments + * + * - dvp: Parent directory in which to search. + * - vpp: Return argument. Will contain desired vnode on cache hit. + * - cnp: Parameters of the name search. The most interesting bits of + * the cn_flags field have the following meanings: + * - MAKEENTRY: If clear, free an entry from the cache rather than look + * it up. + * - ISDOTDOT: Must be set if and only if cn_nameptr == ".." + * - tsp: Return storage for cache timestamp. On a successful (positive + * or negative) lookup, tsp will be filled with any timespec that + * was stored when this cache entry was created. However, it will + * be clear for "." entries. + * - ticks: Return storage for alternate cache timestamp. On a successful + * (positive or negative) lookup, it will contain the ticks value + * that was current when the cache entry was created, unless cnp + * was ".". + * + * # Returns + * + * - -1: A positive cache hit. vpp will contain the desired vnode. + * - ENOENT: A negative cache hit, or dvp was recycled out from under us due + * to a forced unmount. vpp will not be modified. If the entry + * is a whiteout, then the ISWHITEOUT flag will be set in + * cnp->cn_flags. + * - 0: A cache miss. vpp will not be modified. + * + * # Locking + * + * On a cache hit, vpp will be returned locked and ref'd. If we're looking up + * .., dvp is unlocked. If we're looking up . an extra ref is taken, but the + * lock is not recursively acquired. + */ int cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, struct timespec *tsp, int *ticksp) From owner-svn-src-head@freebsd.org Wed Apr 10 13:13:36 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BB8015825B6; Wed, 10 Apr 2019 13:13:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7AF7A70225; Wed, 10 Apr 2019 13:13:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BC3722FB5; Wed, 10 Apr 2019 13:13:35 +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 x3ADDZ34017536; Wed, 10 Apr 2019 13:13:35 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3ADDYgM017533; Wed, 10 Apr 2019 13:13:34 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201904101313.x3ADDYgM017533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 10 Apr 2019 13:13:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346079 - head/usr.bin/ar X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/usr.bin/ar X-SVN-Commit-Revision: 346079 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7AF7A70225 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 13:13:36 -0000 Author: emaste Date: Wed Apr 10 13:13:34 2019 New Revision: 346079 URL: https://svnweb.freebsd.org/changeset/base/346079 Log: ar: implement support for /SYM64/ 64-bit archives PR: 234454 Submitted by: Gerald Aryeetey Reviewed by: imp (earlier) MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D18793 Modified: head/usr.bin/ar/ar.h head/usr.bin/ar/read.c head/usr.bin/ar/write.c Modified: head/usr.bin/ar/ar.h ============================================================================== --- head/usr.bin/ar/ar.h Wed Apr 10 13:02:33 2019 (r346078) +++ head/usr.bin/ar/ar.h Wed Apr 10 13:13:34 2019 (r346079) @@ -100,9 +100,11 @@ struct bsdar { /* * Fields for the archive symbol table. */ - uint32_t s_cnt; /* current number of symbols. */ - uint32_t *s_so; /* symbol offset table. */ + uint64_t s_cnt; /* current number of symbols. */ + uint64_t *s_so; /* symbol offset table. */ + uint64_t s_so_max; /* maximum symbol offset. */ size_t s_so_cap; /* capacity of so table buffer. */ + char *s_sn; /* symbol name table */ size_t s_sn_cap; /* capacity of sn table buffer. */ size_t s_sn_sz; /* current size of sn table. */ Modified: head/usr.bin/ar/read.c ============================================================================== --- head/usr.bin/ar/read.c Wed Apr 10 13:02:33 2019 (r346078) +++ head/usr.bin/ar/read.c Wed Apr 10 13:13:34 2019 (r346079) @@ -109,7 +109,8 @@ read_archive(struct bsdar *bsdar, char mode) break; /* Skip pseudo members. */ - if (strcmp(name, "/") == 0 || strcmp(name, "//") == 0) + if (strcmp(name, "/") == 0 || strcmp(name, "//") == 0 || + strcmp(name, "/SYM64/") == 0) continue; if (bsdar->argc > 0) { Modified: head/usr.bin/ar/write.c ============================================================================== --- head/usr.bin/ar/write.c Wed Apr 10 13:02:33 2019 (r346078) +++ head/usr.bin/ar/write.c Wed Apr 10 13:13:34 2019 (r346079) @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #define _ARMAG_LEN 8 /* length of ar magic string */ #define _ARHDR_LEN 60 /* length of ar header */ #define _INIT_AS_CAP 128 /* initial archive string table size */ -#define _INIT_SYMOFF_CAP (256*(sizeof(uint32_t))) /* initial so table size */ +#define _INIT_SYMOFF_CAP (256*(sizeof(uint64_t))) /* initial so table size */ #define _INIT_SYMNAME_CAP 1024 /* initial sn table size */ #define _MAXNAMELEN_SVR4 15 /* max member name length in svr4 variant */ #define _TRUNCATE_LEN 15 /* number of bytes to keep for member name */ @@ -557,6 +557,7 @@ write_cleanup(struct bsdar *bsdar) free(bsdar->s_sn); bsdar->as = NULL; bsdar->s_so = NULL; + bsdar->s_so_max = 0; bsdar->s_sn = NULL; } @@ -613,7 +614,9 @@ write_objs(struct bsdar *bsdar) struct archive_entry *entry; size_t s_sz; /* size of archive symbol table. */ size_t pm_sz; /* size of pseudo members */ - int i, nr; + size_t w_sz; /* size of words in symbol table */ + uint64_t nr; + int i; if (elf_version(EV_CURRENT) == EV_NONE) bsdar_errc(bsdar, EX_SOFTWARE, 0, @@ -628,9 +631,6 @@ write_objs(struct bsdar *bsdar) if (strlen(obj->name) > _MAXNAMELEN_SVR4) add_to_ar_str_table(bsdar, obj->name); bsdar->rela_off += _ARHDR_LEN + obj->size + obj->size % 2; - if (bsdar->rela_off > UINT32_MAX) - bsdar_errc(bsdar, EX_SOFTWARE, 0, - "Symbol table offset overflow"); } /* @@ -657,17 +657,30 @@ write_objs(struct bsdar *bsdar) * absolute_offset = htobe32(relative_offset + size_of_pseudo_members) */ + w_sz = sizeof(uint32_t); + if (bsdar->s_so_max > UINT32_MAX) + w_sz = sizeof(uint64_t); if (bsdar->s_cnt != 0) { s_sz = (bsdar->s_cnt + 1) * sizeof(uint32_t) + bsdar->s_sn_sz; pm_sz = _ARMAG_LEN + (_ARHDR_LEN + s_sz); if (bsdar->as != NULL) pm_sz += _ARHDR_LEN + bsdar->as_sz; + /* Use the 64-bit word size format if necessary. */ + if (bsdar->s_so_max > UINT32_MAX - pm_sz) { + w_sz = sizeof(uint64_t); + pm_sz -= s_sz; + s_sz = (bsdar->s_cnt + 1) * sizeof(uint64_t) + + bsdar->s_sn_sz; + pm_sz += s_sz; + } + for (i = 0; (size_t)i < bsdar->s_cnt; i++) { - if (*(bsdar->s_so + i) > UINT32_MAX - pm_sz) - bsdar_errc(bsdar, EX_SOFTWARE, 0, - "Symbol table offset overflow"); - *(bsdar->s_so + i) = htobe32(*(bsdar->s_so + i) + - pm_sz); + if (w_sz == sizeof(uint32_t)) + *(bsdar->s_so + i) = + htobe32((uint32_t)(*(bsdar->s_so + i)) + pm_sz); + else + *(bsdar->s_so + i) = + htobe64(*(bsdar->s_so + i) + pm_sz); } } @@ -689,16 +702,28 @@ write_objs(struct bsdar *bsdar) if (entry == NULL) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_entry_new failed"); - archive_entry_copy_pathname(entry, "/"); + if (w_sz == sizeof(uint64_t)) + archive_entry_copy_pathname(entry, "/SYM64/"); + else + archive_entry_copy_pathname(entry, "/"); if ((bsdar->options & AR_D) == 0) archive_entry_set_mtime(entry, time(NULL), 0); - archive_entry_set_size(entry, (bsdar->s_cnt + 1) * - sizeof(uint32_t) + bsdar->s_sn_sz); + archive_entry_set_size(entry, (bsdar->s_cnt + 1) * w_sz + + bsdar->s_sn_sz); AC(archive_write_header(a, entry)); - nr = htobe32(bsdar->s_cnt); - write_data(bsdar, a, &nr, sizeof(uint32_t)); - write_data(bsdar, a, bsdar->s_so, sizeof(uint32_t) * - bsdar->s_cnt); + if (w_sz == sizeof(uint32_t)) + nr = (uint64_t)htobe32((uint32_t)bsdar->s_cnt); + else + nr = htobe64(bsdar->s_cnt); + write_data(bsdar, a, &nr, w_sz); + if (w_sz == sizeof(uint64_t)) + write_data(bsdar, a, bsdar->s_so, sizeof(uint64_t) * + bsdar->s_cnt); + else + for (i = 0; (size_t)i < bsdar->s_cnt; i++) + write_data(bsdar, a, + (uint32_t *)&bsdar->s_so[i], + sizeof(uint32_t)); write_data(bsdar, a, bsdar->s_sn, bsdar->s_sn_sz); archive_entry_free(entry); } @@ -904,13 +929,15 @@ add_to_ar_sym_table(struct bsdar *bsdar, const char *n bsdar->s_sn_sz = 0; } - if (bsdar->s_cnt * sizeof(uint32_t) >= bsdar->s_so_cap) { + if (bsdar->s_cnt * sizeof(uint64_t) >= bsdar->s_so_cap) { bsdar->s_so_cap *= 2; bsdar->s_so = realloc(bsdar->s_so, bsdar->s_so_cap); if (bsdar->s_so == NULL) bsdar_errc(bsdar, EX_SOFTWARE, errno, "realloc failed"); } bsdar->s_so[bsdar->s_cnt] = bsdar->rela_off; + if ((uint64_t)bsdar->rela_off > bsdar->s_so_max) + bsdar->s_so_max = (uint64_t)bsdar->rela_off; bsdar->s_cnt++; /* From owner-svn-src-head@freebsd.org Wed Apr 10 13:41:35 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C35E81583295; Wed, 10 Apr 2019 13:41:35 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3CC712E3; Wed, 10 Apr 2019 13:41:35 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 250ED234C4; Wed, 10 Apr 2019 13:41:35 +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 x3ADfZdM030122; Wed, 10 Apr 2019 13:41:35 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3ADfZBm030108; Wed, 10 Apr 2019 13:41:35 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201904101341.x3ADfZBm030108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 10 Apr 2019 13:41:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346080 - head/tools/boot X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/tools/boot X-SVN-Commit-Revision: 346080 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C3CC712E3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 13:41:36 -0000 Author: emaste Date: Wed Apr 10 13:41:34 2019 New Revision: 346080 URL: https://svnweb.freebsd.org/changeset/base/346080 Log: Add a smoke test QEMU boot script for CI Reviewed by: imp, lwhsu (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19661 Added: head/tools/boot/ci-qemu-test.sh (contents, props changed) Added: head/tools/boot/ci-qemu-test.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/boot/ci-qemu-test.sh Wed Apr 10 13:41:34 2019 (r346080) @@ -0,0 +1,63 @@ +#!/bin/sh + +# Install loader, kernel, and enough of userland to boot in QEMU and echo +# "Hello world." from init, as a very quick smoke test for CI. Uses QEMU's +# virtual FAT filesystem to avoid the need to create a disk image. +# +# $FreeBSD$ + +set -e + +# Root directory for minimal FreeBSD installation. +ROOTDIR=$(pwd)/fat-root + +# Create minimal directory structure. +rm -f $ROOTDIR/efi/boot/BOOTx64.EFI +for dir in dev bin efi/boot etc lib libexec sbin usr/libexec; do + mkdir -p $ROOTDIR/$dir +done + +# Install kernel, loader and minimal userland. +make -DNO_ROOT DESTDIR=$ROOTDIR \ + MODULES_OVERRIDE= \ + WITHOUT_DEBUG_FILES=yes \ + WITHOUT_KERNEL_SYMBOLS=yes \ + installkernel +for dir in stand \ + lib/libc lib/libedit lib/ncurses \ + libexec/rtld-elf \ + bin/sh sbin/init sbin/shutdown; do + make -DNO_ROOT DESTDIR=$ROOTDIR INSTALL="install -U" \ + WITHOUT_MAN= \ + WITHOUT_PROFILE= \ + WITHOUT_TESTS= \ + WITHOUT_TOOLCHAIN= \ + -C $dir install +done + +# Put loader in standard EFI location. +mv $ROOTDIR/boot/loader.efi $ROOTDIR/efi/boot/BOOTx64.EFI + +# Configuration files. +cat > $ROOTDIR/boot/loader.conf < $ROOTDIR/etc/rc <&1 | tee boot.log +grep -q 'Hello world.' boot.log +echo OK From owner-svn-src-head@freebsd.org Wed Apr 10 13:42:38 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6ACA61583365; Wed, 10 Apr 2019 13:42:38 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0EBF17152D; Wed, 10 Apr 2019 13:42:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB20223510; Wed, 10 Apr 2019 13:42:37 +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 x3ADgb8u033390; Wed, 10 Apr 2019 13:42:37 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3ADgbXM033389; Wed, 10 Apr 2019 13:42:37 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904101342.x3ADgbXM033389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 10 Apr 2019 13:42:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346081 - head/cddl/usr.sbin/zfsd X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/cddl/usr.sbin/zfsd X-SVN-Commit-Revision: 346081 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0EBF17152D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 13:42:38 -0000 Author: trasz Date: Wed Apr 10 13:42:37 2019 New Revision: 346081 URL: https://svnweb.freebsd.org/changeset/base/346081 Log: Make zfsd(8) build obey CFLAGS. Reviewed by: imp Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D19865 Modified: head/cddl/usr.sbin/zfsd/Makefile.common Modified: head/cddl/usr.sbin/zfsd/Makefile.common ============================================================================== --- head/cddl/usr.sbin/zfsd/Makefile.common Wed Apr 10 13:41:34 2019 (r346080) +++ head/cddl/usr.sbin/zfsd/Makefile.common Wed Apr 10 13:42:37 2019 (r346081) @@ -30,7 +30,7 @@ INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/ut INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs INCFLAGS+= -I${SRCTOP}/cddl/usr.sbin -CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} +CFLAGS+= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} LIBADD+= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil From owner-svn-src-head@freebsd.org Wed Apr 10 14:00:04 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D1CD15839DF; Wed, 10 Apr 2019 14:00:04 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DD9FC71F95; Wed, 10 Apr 2019 14:00:03 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B83E5236E1; Wed, 10 Apr 2019 14:00:03 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AE03P0038966; Wed, 10 Apr 2019 14:00:03 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AE03kM038965; Wed, 10 Apr 2019 14:00:03 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201904101400.x3AE03kM038965@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 10 Apr 2019 14:00:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346082 - head/lib/libbe X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/lib/libbe X-SVN-Commit-Revision: 346082 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DD9FC71F95 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 14:00:04 -0000 Author: kevans Date: Wed Apr 10 14:00:03 2019 New Revision: 346082 URL: https://svnweb.freebsd.org/changeset/base/346082 Log: libbe(3): use libzfs name validation for datasets/snapshot names Our home-rolled solution didn't quite capture all of the details, and we didn't actually validate snapshot names at all. zfs_name_valid captures the important details, but it doesn't necessarily expose the errors that we're wanting to see in the be_validate_* functions. Validating lengths independently, then the names, should make this a non-issue. Modified: head/lib/libbe/be.c Modified: head/lib/libbe/be.c ============================================================================== --- head/lib/libbe/be.c Wed Apr 10 13:42:37 2019 (r346081) +++ head/lib/libbe/be.c Wed Apr 10 14:00:03 2019 (r346082) @@ -593,6 +593,9 @@ be_validate_snap(libbe_handle_t *lbh, const char *snap if (strlen(snap_name) >= BE_MAXPATHLEN) return (BE_ERR_PATHLEN); + if (!zfs_name_valid(snap_name, ZFS_TYPE_SNAPSHOT)) + return (BE_ERR_INVALIDNAME); + if (!zfs_dataset_exists(lbh->lzh, snap_name, ZFS_TYPE_SNAPSHOT)) return (BE_ERR_NOENT); @@ -646,12 +649,6 @@ be_root_concat(libbe_handle_t *lbh, const char *name, int be_validate_name(libbe_handle_t *lbh, const char *name) { - for (int i = 0; *name; i++) { - char c = *(name++); - if (isalnum(c) || (c == '-') || (c == '_') || (c == '.')) - continue; - return (BE_ERR_INVALIDNAME); - } /* * Impose the additional restriction that the entire dataset name must @@ -659,6 +656,10 @@ be_validate_name(libbe_handle_t *lbh, const char *name */ if (strlen(lbh->root) + 1 + strlen(name) > MAXNAMELEN) return (BE_ERR_PATHLEN); + + if (!zfs_name_valid(name, ZFS_TYPE_DATASET)) + return (BE_ERR_INVALIDNAME); + return (BE_ERR_SUCCESS); } From owner-svn-src-head@freebsd.org Wed Apr 10 14:24:24 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB89815841EC; Wed, 10 Apr 2019 14:24:23 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E23572F19; Wed, 10 Apr 2019 14:24:23 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pl1-x62a.google.com with SMTP id t16so1549521plo.0; Wed, 10 Apr 2019 07:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=27yP2u+dkKIdLhpBBEiK1ST/z8TU4N8eVmWDtmbWrOo=; b=gAaTxf6S97atQecCcxLG4I0u5UBakj80wcg4fMwSUHLGHQ1pFqYHpweUCksilEOnP3 D5VIfkznvFhfdvgONHmZ7d+InunuofYyuPBJagSks/nt4UiZ78CgNEWx7B8knAb456Wn 8U4CEeHec3Vg5k2eOAgbJDJh5gDN8qvAo1vnr1PsXMbxJrfT1tclYFfTXU0mC/WXpKQo X1kLpD4S0rhGb5yZvhQAm/iKBrMEKtWfzp4E8Qrst46HxwkRk+0hfs9twYBK/6ETjDxH BUCUukk3/88WTOnzz1WZGsBMWMDfHQZOv+TsTxfIMy6AFzCB3o1aVxLREP6x0iWrlLJB PiQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=27yP2u+dkKIdLhpBBEiK1ST/z8TU4N8eVmWDtmbWrOo=; b=mYn1Qmdv3cOB7HvSOMJ0xWXtGhHW6vBp1WEyTAO2sCGAJFdICXKpPqp+Qa+iowQMye Y1Oim4wo4Q0DixwwFVh5loAJNlV7w+wBTORp5iS6yRrBgetBJ9lX7L45efHwaUN7G5dh JfjsYhAXLxz/0pqhZ5x3QKyrU8Pc+DcRlKsh+fMyL9iPEXQtE9RJ5zigSwNFRi1wykjL r+/ndIEHaOpvSut7Ah71b6hBhpgaDMwN/vZS14/irxKdHVpyueuFMX6+w7IShodfbXCM ktantAB+9VSVCP6orMbtTulNz69z3+NdWdMmaqsXvoAcC1pIl5fghVv78TZkqnESwJFO pl5w== X-Gm-Message-State: APjAAAVFRYqXzV77mJGdIlYosCyqnzDn2pPYDFz2eB/OtpW4ObfrNREY IJdd+RiLaGkm1qjVgTRqnFjdPGVo X-Google-Smtp-Source: APXvYqyKAGdOg11Sksu3IWcz3BAUkHL7qRxGF0wGRPpdeB7epPyE5kSgYLgiVMBqQndfU1mGSzGe3g== X-Received: by 2002:a17:902:be09:: with SMTP id r9mr42612355pls.215.1554906261835; Wed, 10 Apr 2019 07:24:21 -0700 (PDT) Received: from ?IPv6:2607:fb90:822a:6269:7883:c4a8:e284:632e? ([2607:fb90:822a:6269:7883:c4a8:e284:632e]) by smtp.gmail.com with ESMTPSA id z13sm51254044pgc.25.2019.04.10.07.24.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 07:24:21 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r345708 - in head: lib/clang lib/libc++ lib/libc++experimental lib/libc++fs lib/libclang_rt lib/libcxxrt lib/libgcc_eh lib/libomp lib/ofed/libibnetdisc share/mk usr.bin/dtc usr.sbin/pmc From: Enji Cooper X-Mailer: iPhone Mail (16E227) In-Reply-To: Date: Wed, 10 Apr 2019 07:24:19 -0700 Cc: Enji Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <01C2E5E5-379D-4F06-87CB-2FB9E50C13EE@gmail.com> References: <201903291845.x2TIjRMb087865@repo.freebsd.org> To: Jan Beich X-Rspamd-Queue-Id: 6E23572F19 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.969,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 14:24:24 -0000 Hi Jan, Your approach is much more refined than my approach in this commit (I wa= s being myopic, focusing on src). Thank you! I=E2=80=99ll need to unwind my r= emoval of -std=3Dc++11 from several Makefiles in base and I want to doublech= eck some things. I=E2=80=99ll get back to you later on today about your patc= h, in its entirety. Could you please post a review on phabricator? Thanks! -Enji= From owner-svn-src-head@freebsd.org Wed Apr 10 15:38:57 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 746741585997; Wed, 10 Apr 2019 15:38:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0559E7642F; Wed, 10 Apr 2019 15:38:57 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08A3F24892; Wed, 10 Apr 2019 15:38:54 +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 x3AFcrLb092366; Wed, 10 Apr 2019 15:38:53 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AFcrQj092365; Wed, 10 Apr 2019 15:38:53 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201904101538.x3AFcrQj092365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 10 Apr 2019 15:38:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346085 - head X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 346085 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0559E7642F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 15:38:57 -0000 Author: emaste Date: Wed Apr 10 15:38:53 2019 New Revision: 346085 URL: https://svnweb.freebsd.org/changeset/base/346085 Log: Add Cirrus CI config file to support CI builds (in downstream projects) Make use of the CI smoke test script added in r346080. Reviewed by: imp, lwhsu Sponsored by: The FreeBSD Foundation Added: head/.cirrus.yml (contents, props changed) Added: head/.cirrus.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/.cirrus.yml Wed Apr 10 15:38:53 2019 (r346085) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +freebsd_instance: + image: freebsd-12-0-release-amd64 + cpu: 8 + memory: 24G + +env: + CIRRUS_CLONE_DEPTH: 1 + +task: + timeout_in: 90m + install_script: + - pkg install -y qemu-devel + - fetch https://people.freebsd.org/~emaste/OVMF.fd + script: + - make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel + test_script: + - sh tools/boot/ci-qemu-test.sh From owner-svn-src-head@freebsd.org Wed Apr 10 15:55:18 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1BA601586296; Wed, 10 Apr 2019 15:55:18 +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 28D1A7772D; Wed, 10 Apr 2019 15:55:17 +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 x3AFt9DZ080091 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 10 Apr 2019 18:55:12 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua x3AFt9DZ080091 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id x3AFt99B080090; Wed, 10 Apr 2019 18:55:09 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 10 Apr 2019 18:55:09 +0300 From: Konstantin Belousov To: Edward Tomasz Napierala Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346081 - head/cddl/usr.sbin/zfsd Message-ID: <20190410155509.GU1923@kib.kiev.ua> References: <201904101342.x3ADgbXM033389@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201904101342.x3ADgbXM033389@repo.freebsd.org> User-Agent: Mutt/1.11.4 (2019-03-13) X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 15:55:18 -0000 On Wed, Apr 10, 2019 at 01:42:37PM +0000, Edward Tomasz Napierala wrote: > Author: trasz > Date: Wed Apr 10 13:42:37 2019 > New Revision: 346081 > URL: https://svnweb.freebsd.org/changeset/base/346081 > > Log: > Make zfsd(8) build obey CFLAGS. > > Reviewed by: imp > Obtained from: CheriBSD > MFC after: 2 weeks > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D19865 > > Modified: > head/cddl/usr.sbin/zfsd/Makefile.common > > Modified: head/cddl/usr.sbin/zfsd/Makefile.common > ============================================================================== > --- head/cddl/usr.sbin/zfsd/Makefile.common Wed Apr 10 13:41:34 2019 (r346080) > +++ head/cddl/usr.sbin/zfsd/Makefile.common Wed Apr 10 13:42:37 2019 (r346081) > @@ -30,7 +30,7 @@ INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/ut > INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > INCFLAGS+= -I${SRCTOP}/cddl/usr.sbin > > -CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} > +CFLAGS+= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} Why the flags unconditionally set -g ? > > LIBADD+= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil > From owner-svn-src-head@freebsd.org Wed Apr 10 16:09:07 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B305B1586847; Wed, 10 Apr 2019 16:09:07 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 55A028024D; Wed, 10 Apr 2019 16:09:07 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 26D0C24DCF; Wed, 10 Apr 2019 16:09:07 +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 x3AG96gI009095; Wed, 10 Apr 2019 16:09:06 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AG96FI009094; Wed, 10 Apr 2019 16:09:06 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904101609.x3AG96FI009094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 10 Apr 2019 16:09:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346086 - head/usr.sbin/autofs X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/usr.sbin/autofs X-SVN-Commit-Revision: 346086 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 55A028024D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 16:09:07 -0000 Author: trasz Date: Wed Apr 10 16:09:06 2019 New Revision: 346086 URL: https://svnweb.freebsd.org/changeset/base/346086 Log: Fix segfault that could occur on "automount -LL". MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/usr.sbin/autofs/common.c Modified: head/usr.sbin/autofs/common.c ============================================================================== --- head/usr.sbin/autofs/common.c Wed Apr 10 15:38:53 2019 (r346085) +++ head/usr.sbin/autofs/common.c Wed Apr 10 16:09:06 2019 (r346086) @@ -365,7 +365,7 @@ expand_ampersand(char *string, const char *key) * of characters before the '&'. */ before_len = i; - //assert(i + 1 < (int)strlen(string)); + //assert(i < (int)strlen(string)); ret = asprintf(&expanded, "%.*s%s%s", before_len, string, key, string + before_len + 1); @@ -380,6 +380,8 @@ expand_ampersand(char *string, const char *key) */ string = expanded; i = before_len + strlen(key); + if (i == (int)strlen(string)) + break; backslashed = false; //assert(i < (int)strlen(string)); } From owner-svn-src-head@freebsd.org Wed Apr 10 16:48:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EED011565116; Wed, 10 Apr 2019 16:48:46 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86B0481271; Wed, 10 Apr 2019 16:48:46 +0000 (UTC) (envelope-from lwhsu@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F69A254A5; Wed, 10 Apr 2019 16:48:46 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AGmkeo030220; Wed, 10 Apr 2019 16:48:46 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AGmkkI030219; Wed, 10 Apr 2019 16:48:46 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201904101648.x3AGmkkI030219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Wed, 10 Apr 2019 16:48:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346087 - head/sys/modules/nfscommon X-SVN-Group: head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/sys/modules/nfscommon X-SVN-Commit-Revision: 346087 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 86B0481271 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 16:48:47 -0000 Author: lwhsu Date: Wed Apr 10 16:48:45 2019 New Revision: 346087 URL: https://svnweb.freebsd.org/changeset/base/346087 Log: Fix build in sys/modules/nfscommon Sponsored by: The FreeBSD Foundation Modified: head/sys/modules/nfscommon/Makefile Modified: head/sys/modules/nfscommon/Makefile ============================================================================== --- head/sys/modules/nfscommon/Makefile Wed Apr 10 16:09:06 2019 (r346086) +++ head/sys/modules/nfscommon/Makefile Wed Apr 10 16:48:45 2019 (r346087) @@ -7,6 +7,7 @@ SRCS= vnode_if.h \ nfs_commonkrpc.c \ nfs_commonport.c \ nfs_commonsubs.c \ + opt_inet.h \ opt_inet6.h \ opt_kgssapi.h \ opt_nfs.h \ From owner-svn-src-head@freebsd.org Wed Apr 10 18:02:13 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 061771566E44; Wed, 10 Apr 2019 18:02:13 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 79BD0838D1; Wed, 10 Apr 2019 18:02:12 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg1-x52e.google.com with SMTP id y3so1991461pgk.12; Wed, 10 Apr 2019 11:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=LOcvp28Qn6g0Nrsg/mUOyBeHFwWVUiw9OxHNLzy2xH0=; b=Zd6+fCiEyYv77Do99sDXPqQMnuR/pOK1ipKDvy2ccnmDkrONHZmrEAsjLGfYSmqhQm Bj6ulj1CIjRCm9MupIgYq8zYuujTDH02p5pA51ARHIUtXqmBvxhfFiXpkSFq//Fqb84f vWvFgHIB9BjBg747ywvTZKtADWS72SvI3UsnXv5dIpClEehg2o7f0icBbuZbHFbLkCc0 MIUdKrfNC7w2jRwLRY27wjNJlAOJa6QSXKsTDkVIbTC/Bg4BRB1dPQUTNkizoBlCoyzb xQHRNYotHIGpDjXMA8n84Eo7vMox++bTXzpzrFdrUiLUIQiUKW3EL3fzrJwXlSIjOmcW WgQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=LOcvp28Qn6g0Nrsg/mUOyBeHFwWVUiw9OxHNLzy2xH0=; b=OK5CAFiUw8gIV5o6kQUGkCV6zy4st9w/v/BE/rLIGAm3EKxxqH9lZORmN8+5c7mtpR ddvhfmhXTQ58MnSB95TIGb6BvJty+Nu7wDbTO9IJ8ggWaWDu3gFQ0c8aMQrAObh8HWjn Tvr+DBHr9jDSCqlE9yWRBpFC4MKTtRB0KLLHABWefK3rQV3krWYTRA2ywCVJlBwnbHpv wAUPASt0gaE1UiACKtqFKSSUe4ekVZMEXrDt4aJJ3/SfRf/+wq/cL0ggbX7Octj7kX2G ALscwh67AWP7bjWQS499eayUf+OIKtJ7HyB5QQON2O/H42nAMbNS6Nhy64C9CowxwwtC wPaQ== X-Gm-Message-State: APjAAAXl/NjexvKO0m/OXpzmVrtF82FgZkrJ14CDZ46lAQcxcSGFxXpv k6i0Ywthxdy29YJJUk9eu9U= X-Google-Smtp-Source: APXvYqwL/aRdpTMOkm0R/ue8mcZNdYhUKvYyDnPSPW/mI4Gn5XZWBA4fkZmIWg3EkHFS0A4ER9EBAg== X-Received: by 2002:a62:4351:: with SMTP id q78mr45850173pfa.86.1554919330280; Wed, 10 Apr 2019 11:02:10 -0700 (PDT) Received: from ?IPv6:2607:fb90:822a:6269:7883:c4a8:e284:632e? ([2607:fb90:822a:6269:7883:c4a8:e284:632e]) by smtp.gmail.com with ESMTPSA id s5sm41665005pgv.8.2019.04.10.11.02.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 11:02:09 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r346081 - head/cddl/usr.sbin/zfsd From: Enji Cooper X-Mailer: iPhone Mail (16E227) In-Reply-To: <20190410155509.GU1923@kib.kiev.ua> Date: Wed, 10 Apr 2019 11:02:08 -0700 Cc: Edward Tomasz Napierala , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <4BDE4771-EA33-4746-851E-674EF31D0174@gmail.com> References: <201904101342.x3ADgbXM033389@repo.freebsd.org> <20190410155509.GU1923@kib.kiev.ua> To: Konstantin Belousov X-Rspamd-Queue-Id: 79BD0838D1 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 18:02:13 -0000 > On Apr 10, 2019, at 08:55, Konstantin Belousov wrote= : >=20 >> On Wed, Apr 10, 2019 at 01:42:37PM +0000, Edward Tomasz Napierala wrote: >> Author: trasz >> Date: Wed Apr 10 13:42:37 2019 >> New Revision: 346081 >> URL: https://svnweb.freebsd.org/changeset/base/346081 >>=20 >> Log: >> Make zfsd(8) build obey CFLAGS. >>=20 >> Reviewed by: imp >> Obtained from: CheriBSD >> MFC after: 2 weeks >> Sponsored by: DARPA, AFRL >> Differential Revision: https://reviews.freebsd.org/D19865 >>=20 >> Modified: >> head/cddl/usr.sbin/zfsd/Makefile.common >>=20 >> Modified: head/cddl/usr.sbin/zfsd/Makefile.common >> =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/cddl/usr.sbin/zfsd/Makefile.common Wed Apr 10 13:41:34 2019 = (r346080) >> +++ head/cddl/usr.sbin/zfsd/Makefile.common Wed Apr 10 13:42:37 2019 = (r346081) >> @@ -30,7 +30,7 @@ INCFLAGS+=3D -I${SRCTOP}/sys/cddl/contrib/opensolaris/u= t >> INCFLAGS+=3D -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs >> INCFLAGS+=3D -I${SRCTOP}/cddl/usr.sbin >>=20 >> -CFLAGS=3D -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} >> +CFLAGS+=3D -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} > Why the flags unconditionally set -g ? It shouldn=E2=80=99t be explicitly set. That=E2=80=99s what DEBUG_FLAGS is f= or. -Enji= From owner-svn-src-head@freebsd.org Wed Apr 10 18:15:40 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA0C215682D5; Wed, 10 Apr 2019 18:15:39 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3534E8420A; Wed, 10 Apr 2019 18:15:39 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E14E82640E; Wed, 10 Apr 2019 18:15:38 +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 x3AIFcsO076546; Wed, 10 Apr 2019 18:15:38 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AIFafG076535; Wed, 10 Apr 2019 18:15:36 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201904101815.x3AIFafG076535@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 10 Apr 2019 18:15:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346092 - in head/sys/gnu/dts: arm arm64/allwinner arm64/altera arm64/amlogic arm64/arm arm64/exynos arm64/freescale arm64/hisilicon arm64/marvell arm64/mediatek arm64/nvidia arm64/qcom... X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/sys/gnu/dts: arm arm64/allwinner arm64/altera arm64/amlogic arm64/arm arm64/exynos arm64/freescale arm64/hisilicon arm64/marvell arm64/mediatek arm64/nvidia arm64/qcom arm64/renesas arm64/rock... X-SVN-Commit-Revision: 346092 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3534E8420A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 18:15:40 -0000 Author: manu Date: Wed Apr 10 18:15:36 2019 New Revision: 346092 URL: https://svnweb.freebsd.org/changeset/base/346092 Log: Import DTS files from Linux 5.0 MFC after: 2 months Added: - copied unchanged from r346089, vendor/device-tree/dist/src/arm/am33xx-l4.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/am437x-l4.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/aspeed-bmc-facebook-cmm.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/bcm2836-rpi.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/bcm4708-linksys-ea6500-v2.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/dra7-l4.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/facebook-bmc-flash-layout.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx6dl-emcon-avari.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx6q-emcon-avari.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx6qdl-emcon-avari.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx6qdl-emcon.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx6ul-pico-pi.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx6ul-pico.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx7d-pico-hobbit.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx7d-sdb-reva.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx7ulp-evk.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/imx7ulp.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/omap5-l4.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-common.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-connector.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-controller.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-speaker-l.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-speaker-m.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-speaker-one.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-speaker-s.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/pxa300-raumfeld-tuneable-clock.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/r8a7744-iwg20d-q7-dbcm-ca.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/r8a7744-iwg20d-q7.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/r8a7744-iwg20m.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/r8a7744.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/rda8810pl-orangepi-2g-iot.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/rda8810pl-orangepi-i96.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/rda8810pl.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/rk3188-bqedison2qc.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/sun8i-h3-mapleboard-mp130.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/sun8i-t3-cqa3t-bv3.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/suniv-f1c100s-licheepi-nano.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/suniv-f1c100s.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm/vf610-bk4.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm/vf610-zii-scu4-aib.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/allwinner/sun50i-h5-emlid-neutis-n5.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/allwinner/sun50i-h6-orangepi-lite2.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/allwinner/sun50i-h6-orangepi.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/amlogic/meson-gxl-s805x-libretech-ac.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/amlogic/meson-gxl-s905d-phicomm-n1.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1012a-frwy.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a-qds.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a-rdb.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/fsl-ls1028a.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/fsl-lx2160a-qds.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/fsl-lx2160a-rdb.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/fsl-lx2160a.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/imx8mq-evk.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/imx8mq-pinfunc.h - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/freescale/imx8mq.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/hisilicon/hikey970-pinctrl.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/marvell/armada-8040-mcbin-singleshot.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/marvell/armada-8040-mcbin.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/qcom/msm8998-pins.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/qcom/pms405.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/qcom/qcs404-evb-1000.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/qcom/qcs404-evb-4000.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/qcom/qcs404-evb.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/qcom/qcs404.dtsi - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/rockchip/rk3399-gru-scarlet-inx.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/rockchip/rk3399-gru-scarlet-kd.dts - copied unchanged from r346089, vendor/device-tree/dist/src/arm64/rockchip/rk3399-gru-scarlet.dtsi - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/clock/imx7ulp-clock.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/clock/imx8-clock.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/clock/imx8mq-clock.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/clock/mt7629-clk.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/clock/qcom,gpucc-sdm845.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/clock/qcom,lpass-sdm845.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/clock/suniv-ccu-f1c100s.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/dma/dw-dmac.h - copied from r346089, vendor/device-tree/dist/include/dt-bindings/firmware/ - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/pinctrl/k3.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/pinctrl/mt6797-pinfunc.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/pinctrl/pads-imx8qm.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/pinctrl/pads-imx8qxp.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/pinctrl/r7s9210-pinctrl.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/power/imx8mq-power.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/power/rk3066-power.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/power/rk3188-power.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/regulator/active-semi,8945a-regulator.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/reset/suniv-ccu-f1c100s.h - copied unchanged from r346089, vendor/device-tree/dist/include/dt-bindings/thermal/tegra194-bpmp-thermal.h Directory Properties: head/sys/gnu/dts/arm/am33xx-l4.dtsi (props changed) head/sys/gnu/dts/arm/am437x-l4.dtsi (props changed) head/sys/gnu/dts/arm/aspeed-bmc-facebook-cmm.dts (props changed) head/sys/gnu/dts/arm/bcm2836-rpi.dtsi (props changed) head/sys/gnu/dts/arm/bcm4708-linksys-ea6500-v2.dts (props changed) head/sys/gnu/dts/arm/dra7-l4.dtsi (props changed) head/sys/gnu/dts/arm/facebook-bmc-flash-layout.dtsi (props changed) head/sys/gnu/dts/arm/imx6dl-emcon-avari.dts (props changed) head/sys/gnu/dts/arm/imx6q-emcon-avari.dts (props changed) head/sys/gnu/dts/arm/imx6qdl-emcon-avari.dtsi (props changed) head/sys/gnu/dts/arm/imx6qdl-emcon.dtsi (props changed) head/sys/gnu/dts/arm/imx6ul-pico-pi.dts (props changed) head/sys/gnu/dts/arm/imx6ul-pico.dtsi (props changed) head/sys/gnu/dts/arm/imx7d-pico-hobbit.dts (props changed) head/sys/gnu/dts/arm/imx7d-sdb-reva.dts (props changed) head/sys/gnu/dts/arm/imx7ulp-evk.dts (props changed) head/sys/gnu/dts/arm/imx7ulp.dtsi (props changed) head/sys/gnu/dts/arm/omap5-l4.dtsi (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-common.dtsi (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-connector.dts (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-controller.dts (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-speaker-l.dts (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-speaker-m.dts (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-speaker-one.dts (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-speaker-s.dts (props changed) head/sys/gnu/dts/arm/pxa300-raumfeld-tuneable-clock.dtsi (props changed) head/sys/gnu/dts/arm/r8a7744-iwg20d-q7-dbcm-ca.dts (props changed) head/sys/gnu/dts/arm/r8a7744-iwg20d-q7.dts (props changed) head/sys/gnu/dts/arm/r8a7744-iwg20m.dtsi (props changed) head/sys/gnu/dts/arm/r8a7744.dtsi (props changed) head/sys/gnu/dts/arm/rda8810pl-orangepi-2g-iot.dts (props changed) head/sys/gnu/dts/arm/rda8810pl-orangepi-i96.dts (props changed) head/sys/gnu/dts/arm/rda8810pl.dtsi (props changed) head/sys/gnu/dts/arm/rk3188-bqedison2qc.dts (props changed) head/sys/gnu/dts/arm/sun8i-h3-mapleboard-mp130.dts (props changed) head/sys/gnu/dts/arm/sun8i-t3-cqa3t-bv3.dts (props changed) head/sys/gnu/dts/arm/suniv-f1c100s-licheepi-nano.dts (props changed) head/sys/gnu/dts/arm/suniv-f1c100s.dtsi (props changed) head/sys/gnu/dts/arm/vf610-bk4.dts (props changed) head/sys/gnu/dts/arm/vf610-zii-scu4-aib.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-h5-emlid-neutis-n5.dtsi (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi-lite2.dts (props changed) head/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi.dtsi (props changed) head/sys/gnu/dts/arm64/amlogic/meson-gxl-s805x-libretech-ac.dts (props changed) head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-phicomm-n1.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1012a-frwy.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-qds.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a-rdb.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-ls1028a.dtsi (props changed) head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-qds.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-lx2160a-rdb.dts (props changed) head/sys/gnu/dts/arm64/freescale/fsl-lx2160a.dtsi (props changed) head/sys/gnu/dts/arm64/freescale/imx8mq-evk.dts (props changed) head/sys/gnu/dts/arm64/freescale/imx8mq-pinfunc.h (props changed) head/sys/gnu/dts/arm64/freescale/imx8mq.dtsi (props changed) head/sys/gnu/dts/arm64/hisilicon/hikey970-pinctrl.dtsi (props changed) head/sys/gnu/dts/arm64/marvell/armada-8040-mcbin-singleshot.dts (props changed) head/sys/gnu/dts/arm64/marvell/armada-8040-mcbin.dtsi (props changed) head/sys/gnu/dts/arm64/qcom/msm8998-pins.dtsi (props changed) head/sys/gnu/dts/arm64/qcom/pms405.dtsi (props changed) head/sys/gnu/dts/arm64/qcom/qcs404-evb-1000.dts (props changed) head/sys/gnu/dts/arm64/qcom/qcs404-evb-4000.dts (props changed) head/sys/gnu/dts/arm64/qcom/qcs404-evb.dtsi (props changed) head/sys/gnu/dts/arm64/qcom/qcs404.dtsi (props changed) head/sys/gnu/dts/arm64/rockchip/rk3399-gru-scarlet-inx.dts (props changed) head/sys/gnu/dts/arm64/rockchip/rk3399-gru-scarlet-kd.dts (props changed) head/sys/gnu/dts/arm64/rockchip/rk3399-gru-scarlet.dtsi (props changed) head/sys/gnu/dts/include/dt-bindings/clock/imx7ulp-clock.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/imx8-clock.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/imx8mq-clock.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/mt7629-clk.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,gpucc-sdm845.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/qcom,lpass-sdm845.h (props changed) head/sys/gnu/dts/include/dt-bindings/clock/suniv-ccu-f1c100s.h (props changed) head/sys/gnu/dts/include/dt-bindings/dma/dw-dmac.h (props changed) head/sys/gnu/dts/include/dt-bindings/firmware/ (props changed) head/sys/gnu/dts/include/dt-bindings/pinctrl/k3.h (props changed) head/sys/gnu/dts/include/dt-bindings/pinctrl/mt6797-pinfunc.h (props changed) head/sys/gnu/dts/include/dt-bindings/pinctrl/pads-imx8qm.h (props changed) head/sys/gnu/dts/include/dt-bindings/pinctrl/pads-imx8qxp.h (props changed) head/sys/gnu/dts/include/dt-bindings/pinctrl/r7s9210-pinctrl.h (props changed) head/sys/gnu/dts/include/dt-bindings/power/imx8mq-power.h (props changed) head/sys/gnu/dts/include/dt-bindings/power/rk3066-power.h (props changed) head/sys/gnu/dts/include/dt-bindings/power/rk3188-power.h (props changed) head/sys/gnu/dts/include/dt-bindings/regulator/active-semi,8945a-regulator.h (props changed) head/sys/gnu/dts/include/dt-bindings/reset/suniv-ccu-f1c100s.h (props changed) head/sys/gnu/dts/include/dt-bindings/thermal/tegra194-bpmp-thermal.h (props changed) Deleted: head/sys/gnu/dts/arm/qcom-apq8064-arrow-sd-600eval-pins.dtsi head/sys/gnu/dts/arm/qcom-apq8064-arrow-sd-600eval.dts Modified: head/sys/gnu/dts/arm/am335x-bone-common.dtsi head/sys/gnu/dts/arm/am335x-boneblue.dts head/sys/gnu/dts/arm/am335x-cm-t335.dts head/sys/gnu/dts/arm/am335x-evm.dts head/sys/gnu/dts/arm/am335x-evmsk.dts head/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts head/sys/gnu/dts/arm/am335x-pdu001.dts head/sys/gnu/dts/arm/am335x-shc.dts head/sys/gnu/dts/arm/am33xx-clocks.dtsi head/sys/gnu/dts/arm/am33xx.dtsi head/sys/gnu/dts/arm/am3517-evm.dts head/sys/gnu/dts/arm/am4372.dtsi head/sys/gnu/dts/arm/am437x-gp-evm.dts head/sys/gnu/dts/arm/am43xx-clocks.dtsi head/sys/gnu/dts/arm/am57xx-beagle-x15-common.dtsi head/sys/gnu/dts/arm/arm-realview-pbx.dtsi head/sys/gnu/dts/arm/armada-xp-db.dts head/sys/gnu/dts/arm/armada-xp-gp.dts head/sys/gnu/dts/arm/armada-xp-lenovo-ix4-300d.dts head/sys/gnu/dts/arm/aspeed-bmc-arm-centriq2400-rep.dts head/sys/gnu/dts/arm/aspeed-bmc-intel-s2600wf.dts head/sys/gnu/dts/arm/aspeed-bmc-opp-lanyang.dts head/sys/gnu/dts/arm/aspeed-bmc-opp-palmetto.dts head/sys/gnu/dts/arm/aspeed-bmc-opp-romulus.dts head/sys/gnu/dts/arm/aspeed-bmc-opp-witherspoon.dts head/sys/gnu/dts/arm/aspeed-bmc-portwell-neptune.dts head/sys/gnu/dts/arm/at91-nattis-2-natte-2.dts head/sys/gnu/dts/arm/at91-sama5d27_som1_ek.dts head/sys/gnu/dts/arm/at91-sama5d2_ptc_ek.dts head/sys/gnu/dts/arm/at91-sama5d2_xplained.dts head/sys/gnu/dts/arm/at91-sama5d4ek.dts head/sys/gnu/dts/arm/at91sam9260.dtsi head/sys/gnu/dts/arm/at91sam9261.dtsi head/sys/gnu/dts/arm/at91sam9263.dtsi head/sys/gnu/dts/arm/at91sam9g15.dtsi head/sys/gnu/dts/arm/at91sam9g20.dtsi head/sys/gnu/dts/arm/at91sam9g25.dtsi head/sys/gnu/dts/arm/at91sam9g25ek.dts head/sys/gnu/dts/arm/at91sam9g35.dtsi head/sys/gnu/dts/arm/at91sam9rl.dtsi head/sys/gnu/dts/arm/at91sam9x25.dtsi head/sys/gnu/dts/arm/at91sam9x35.dtsi head/sys/gnu/dts/arm/at91sam9x5.dtsi head/sys/gnu/dts/arm/at91sam9x5_can.dtsi head/sys/gnu/dts/arm/at91sam9x5_isi.dtsi head/sys/gnu/dts/arm/at91sam9x5_lcd.dtsi head/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi head/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi head/sys/gnu/dts/arm/at91sam9x5_usart3.dtsi head/sys/gnu/dts/arm/axp81x.dtsi head/sys/gnu/dts/arm/bcm-nsp.dtsi head/sys/gnu/dts/arm/bcm2835-rpi-zero-w.dts head/sys/gnu/dts/arm/bcm2835-rpi-zero.dts head/sys/gnu/dts/arm/bcm2835-rpi.dtsi head/sys/gnu/dts/arm/bcm2836-rpi-2-b.dts head/sys/gnu/dts/arm/bcm2837-rpi-3-b-plus.dts head/sys/gnu/dts/arm/bcm2837-rpi-3-b.dts head/sys/gnu/dts/arm/bcm2837-rpi-cm3.dtsi head/sys/gnu/dts/arm/bcm47081.dtsi head/sys/gnu/dts/arm/bcm4709.dtsi head/sys/gnu/dts/arm/bcm47094.dtsi head/sys/gnu/dts/arm/bcm47189-tenda-ac9.dts head/sys/gnu/dts/arm/bcm5301x.dtsi head/sys/gnu/dts/arm/bcm53573.dtsi head/sys/gnu/dts/arm/bcm63138.dtsi head/sys/gnu/dts/arm/bcm958522er.dts head/sys/gnu/dts/arm/bcm958525er.dts head/sys/gnu/dts/arm/bcm958525xmc.dts head/sys/gnu/dts/arm/bcm958622hr.dts head/sys/gnu/dts/arm/bcm958623hr.dts head/sys/gnu/dts/arm/bcm958625hr.dts head/sys/gnu/dts/arm/bcm958625k.dts head/sys/gnu/dts/arm/bcm963138dvt.dts head/sys/gnu/dts/arm/bcm988312hr.dts head/sys/gnu/dts/arm/da850-evm.dts head/sys/gnu/dts/arm/da850-lcdk.dts head/sys/gnu/dts/arm/da850.dtsi head/sys/gnu/dts/arm/dra7-evm-common.dtsi head/sys/gnu/dts/arm/dra7.dtsi head/sys/gnu/dts/arm/dra72-evm-common.dtsi head/sys/gnu/dts/arm/dra72x.dtsi head/sys/gnu/dts/arm/dra74x.dtsi head/sys/gnu/dts/arm/dra76x.dtsi head/sys/gnu/dts/arm/dra7xx-clocks.dtsi head/sys/gnu/dts/arm/emev2.dtsi head/sys/gnu/dts/arm/exynos3250-artik5.dtsi head/sys/gnu/dts/arm/exynos3250-monk.dts head/sys/gnu/dts/arm/exynos3250-rinato.dts head/sys/gnu/dts/arm/exynos3250.dtsi head/sys/gnu/dts/arm/exynos4210-trats.dts head/sys/gnu/dts/arm/exynos4210.dtsi head/sys/gnu/dts/arm/exynos4412-itop-scp-core.dtsi head/sys/gnu/dts/arm/exynos4412-midas.dtsi head/sys/gnu/dts/arm/exynos4412-odroid-common.dtsi head/sys/gnu/dts/arm/exynos4412-odroidu3.dts head/sys/gnu/dts/arm/exynos4412-prime.dtsi head/sys/gnu/dts/arm/exynos4412.dtsi head/sys/gnu/dts/arm/exynos5250-arndale.dts head/sys/gnu/dts/arm/exynos5250.dtsi head/sys/gnu/dts/arm/exynos5420-arndale-octa.dts head/sys/gnu/dts/arm/exynos5420-pinctrl.dtsi head/sys/gnu/dts/arm/exynos5420-smdk5420.dts head/sys/gnu/dts/arm/exynos5422-odroid-core.dtsi head/sys/gnu/dts/arm/exynos5422-odroidhc1.dts head/sys/gnu/dts/arm/exynos5422-odroidxu3-audio.dtsi head/sys/gnu/dts/arm/exynos5422-odroidxu3-common.dtsi head/sys/gnu/dts/arm/exynos5422-odroidxu4.dts head/sys/gnu/dts/arm/gemini-dlink-dir-685.dts head/sys/gnu/dts/arm/gemini-dlink-dns-313.dts head/sys/gnu/dts/arm/gemini-nas4220b.dts head/sys/gnu/dts/arm/gemini-rut1xx.dts head/sys/gnu/dts/arm/gemini-sl93512r.dts head/sys/gnu/dts/arm/gemini-sq201.dts head/sys/gnu/dts/arm/gemini-wbd111.dts head/sys/gnu/dts/arm/gemini-wbd222.dts head/sys/gnu/dts/arm/gemini.dtsi head/sys/gnu/dts/arm/imx1-ads.dts head/sys/gnu/dts/arm/imx1-apf9328.dts head/sys/gnu/dts/arm/imx1.dtsi head/sys/gnu/dts/arm/imx23-evk.dts head/sys/gnu/dts/arm/imx23-olinuxino.dts head/sys/gnu/dts/arm/imx23-sansa.dts head/sys/gnu/dts/arm/imx23-stmp378x_devb.dts head/sys/gnu/dts/arm/imx23-xfi3.dts head/sys/gnu/dts/arm/imx23.dtsi head/sys/gnu/dts/arm/imx25-eukrea-cpuimx25.dtsi head/sys/gnu/dts/arm/imx25-karo-tx25.dts head/sys/gnu/dts/arm/imx25-pdk.dts head/sys/gnu/dts/arm/imx25.dtsi head/sys/gnu/dts/arm/imx27-apf27.dts head/sys/gnu/dts/arm/imx27-eukrea-cpuimx27.dtsi head/sys/gnu/dts/arm/imx27-pdk.dts head/sys/gnu/dts/arm/imx27-phytec-phycard-s-som.dtsi head/sys/gnu/dts/arm/imx27-phytec-phycore-som.dtsi head/sys/gnu/dts/arm/imx27.dtsi head/sys/gnu/dts/arm/imx28-apf28.dts head/sys/gnu/dts/arm/imx28-apx4devkit.dts head/sys/gnu/dts/arm/imx28-cfa10036.dts head/sys/gnu/dts/arm/imx28-duckbill-2-485.dts head/sys/gnu/dts/arm/imx28-duckbill-2-enocean.dts head/sys/gnu/dts/arm/imx28-duckbill-2-spi.dts head/sys/gnu/dts/arm/imx28-duckbill-2.dts head/sys/gnu/dts/arm/imx28-duckbill.dts head/sys/gnu/dts/arm/imx28-eukrea-mbmx283lc.dts head/sys/gnu/dts/arm/imx28-eukrea-mbmx287lc.dts head/sys/gnu/dts/arm/imx28-evk.dts head/sys/gnu/dts/arm/imx28-m28.dtsi head/sys/gnu/dts/arm/imx28-m28cu3.dts head/sys/gnu/dts/arm/imx28-m28evk.dts head/sys/gnu/dts/arm/imx28-sps1.dts head/sys/gnu/dts/arm/imx28-ts4600.dts head/sys/gnu/dts/arm/imx28-tx28.dts head/sys/gnu/dts/arm/imx28.dtsi head/sys/gnu/dts/arm/imx31-bug.dts head/sys/gnu/dts/arm/imx31-lite.dts head/sys/gnu/dts/arm/imx31.dtsi head/sys/gnu/dts/arm/imx35-eukrea-cpuimx35.dtsi head/sys/gnu/dts/arm/imx35-pdk.dts head/sys/gnu/dts/arm/imx35.dtsi head/sys/gnu/dts/arm/imx50-evk.dts head/sys/gnu/dts/arm/imx50.dtsi head/sys/gnu/dts/arm/imx51-apf51.dts head/sys/gnu/dts/arm/imx51-babbage.dts head/sys/gnu/dts/arm/imx51-digi-connectcore-som.dtsi head/sys/gnu/dts/arm/imx51-eukrea-cpuimx51.dtsi head/sys/gnu/dts/arm/imx51-ts4800.dts head/sys/gnu/dts/arm/imx51-zii-rdu1.dts head/sys/gnu/dts/arm/imx51-zii-scu2-mezz.dts head/sys/gnu/dts/arm/imx51-zii-scu3-esb.dts head/sys/gnu/dts/arm/imx51.dtsi head/sys/gnu/dts/arm/imx53-ard.dts head/sys/gnu/dts/arm/imx53-cx9020.dts head/sys/gnu/dts/arm/imx53-m53.dtsi head/sys/gnu/dts/arm/imx53-qsb-common.dtsi head/sys/gnu/dts/arm/imx53-smd.dts head/sys/gnu/dts/arm/imx53-tqma53.dtsi head/sys/gnu/dts/arm/imx53-tx53.dtsi head/sys/gnu/dts/arm/imx53-usbarmory.dts head/sys/gnu/dts/arm/imx53-voipac-dmm-668.dtsi head/sys/gnu/dts/arm/imx53.dtsi head/sys/gnu/dts/arm/imx6dl-apf6dev.dts head/sys/gnu/dts/arm/imx6dl-aristainetos2_4.dts head/sys/gnu/dts/arm/imx6dl-aristainetos2_7.dts head/sys/gnu/dts/arm/imx6dl-aristainetos_4.dts head/sys/gnu/dts/arm/imx6dl-aristainetos_7.dts head/sys/gnu/dts/arm/imx6dl-colibri-eval-v3.dts head/sys/gnu/dts/arm/imx6dl-dfi-fs700-m60.dts head/sys/gnu/dts/arm/imx6dl-mamoj.dts head/sys/gnu/dts/arm/imx6dl-phytec-pfla02.dtsi head/sys/gnu/dts/arm/imx6dl-rex-basic.dts head/sys/gnu/dts/arm/imx6dl-riotboard.dts head/sys/gnu/dts/arm/imx6dl-ts4900.dts head/sys/gnu/dts/arm/imx6dl-ts7970.dts head/sys/gnu/dts/arm/imx6dl-wandboard-revb1.dts head/sys/gnu/dts/arm/imx6dl-wandboard-revd1.dts head/sys/gnu/dts/arm/imx6dl-wandboard.dts head/sys/gnu/dts/arm/imx6dl.dtsi head/sys/gnu/dts/arm/imx6q-apf6dev.dts head/sys/gnu/dts/arm/imx6q-arm2.dts head/sys/gnu/dts/arm/imx6q-b450v3.dts head/sys/gnu/dts/arm/imx6q-b650v3.dts head/sys/gnu/dts/arm/imx6q-b850v3.dts head/sys/gnu/dts/arm/imx6q-ba16.dtsi head/sys/gnu/dts/arm/imx6q-bx50v3.dtsi head/sys/gnu/dts/arm/imx6q-cm-fx6.dts head/sys/gnu/dts/arm/imx6q-dfi-fs700-m60.dts head/sys/gnu/dts/arm/imx6q-dhcom-som.dtsi head/sys/gnu/dts/arm/imx6q-display5.dtsi head/sys/gnu/dts/arm/imx6q-dmo-edmqmx6.dts head/sys/gnu/dts/arm/imx6q-evi.dts head/sys/gnu/dts/arm/imx6q-gk802.dts head/sys/gnu/dts/arm/imx6q-gw5400-a.dts head/sys/gnu/dts/arm/imx6q-h100.dts head/sys/gnu/dts/arm/imx6q-kp-tpc.dts head/sys/gnu/dts/arm/imx6q-marsboard.dts head/sys/gnu/dts/arm/imx6q-mccmon6.dts head/sys/gnu/dts/arm/imx6q-novena.dts head/sys/gnu/dts/arm/imx6q-phytec-pfla02.dtsi head/sys/gnu/dts/arm/imx6q-pistachio.dts head/sys/gnu/dts/arm/imx6q-rex-pro.dts head/sys/gnu/dts/arm/imx6q-sbc6x.dts head/sys/gnu/dts/arm/imx6q-tbs2910.dts head/sys/gnu/dts/arm/imx6q-ts4900.dts head/sys/gnu/dts/arm/imx6q-ts7970.dts head/sys/gnu/dts/arm/imx6q-wandboard-revb1.dts head/sys/gnu/dts/arm/imx6q-wandboard-revd1.dts head/sys/gnu/dts/arm/imx6q-wandboard.dts head/sys/gnu/dts/arm/imx6q-zii-rdu2.dts head/sys/gnu/dts/arm/imx6q.dtsi head/sys/gnu/dts/arm/imx6qdl-apalis.dtsi head/sys/gnu/dts/arm/imx6qdl-cubox-i.dtsi head/sys/gnu/dts/arm/imx6qdl-gw51xx.dtsi head/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi head/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi head/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi head/sys/gnu/dts/arm/imx6qdl-gw551x.dtsi head/sys/gnu/dts/arm/imx6qdl-gw552x.dtsi head/sys/gnu/dts/arm/imx6qdl-gw553x.dtsi head/sys/gnu/dts/arm/imx6qdl-gw560x.dtsi head/sys/gnu/dts/arm/imx6qdl-gw5903.dtsi head/sys/gnu/dts/arm/imx6qdl-gw5904.dtsi head/sys/gnu/dts/arm/imx6qdl-hummingboard.dtsi head/sys/gnu/dts/arm/imx6qdl-hummingboard2.dtsi head/sys/gnu/dts/arm/imx6qdl-icore-rqs.dtsi head/sys/gnu/dts/arm/imx6qdl-icore.dtsi head/sys/gnu/dts/arm/imx6qdl-nit6xlite.dtsi head/sys/gnu/dts/arm/imx6qdl-nitrogen6_max.dtsi head/sys/gnu/dts/arm/imx6qdl-nitrogen6_som2.dtsi head/sys/gnu/dts/arm/imx6qdl-nitrogen6x.dtsi head/sys/gnu/dts/arm/imx6qdl-phytec-pfla02.dtsi head/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi head/sys/gnu/dts/arm/imx6qdl-sabrelite.dtsi head/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi head/sys/gnu/dts/arm/imx6qdl-tx6.dtsi head/sys/gnu/dts/arm/imx6qdl-udoo.dtsi head/sys/gnu/dts/arm/imx6qdl-var-dart.dtsi head/sys/gnu/dts/arm/imx6qdl-wandboard-revb1.dtsi head/sys/gnu/dts/arm/imx6qdl-wandboard-revc1.dtsi head/sys/gnu/dts/arm/imx6qdl-wandboard-revd1.dtsi head/sys/gnu/dts/arm/imx6qdl-zii-rdu2.dtsi head/sys/gnu/dts/arm/imx6qdl.dtsi head/sys/gnu/dts/arm/imx6qp-wandboard-revd1.dts head/sys/gnu/dts/arm/imx6qp-zii-rdu2.dts head/sys/gnu/dts/arm/imx6sl-evk.dts head/sys/gnu/dts/arm/imx6sl-warp.dts head/sys/gnu/dts/arm/imx6sl.dtsi head/sys/gnu/dts/arm/imx6sll-evk.dts head/sys/gnu/dts/arm/imx6sll.dtsi head/sys/gnu/dts/arm/imx6sx-nitrogen6sx.dts head/sys/gnu/dts/arm/imx6sx-sabreauto.dts head/sys/gnu/dts/arm/imx6sx-sdb-reva.dts head/sys/gnu/dts/arm/imx6sx-sdb-sai.dts head/sys/gnu/dts/arm/imx6sx-sdb.dts head/sys/gnu/dts/arm/imx6sx-sdb.dtsi head/sys/gnu/dts/arm/imx6sx-softing-vining-2000.dts head/sys/gnu/dts/arm/imx6sx-udoo-neo-basic.dts head/sys/gnu/dts/arm/imx6sx-udoo-neo-extended.dts head/sys/gnu/dts/arm/imx6sx-udoo-neo-full.dts head/sys/gnu/dts/arm/imx6sx.dtsi head/sys/gnu/dts/arm/imx6ul-14x14-evk.dtsi head/sys/gnu/dts/arm/imx6ul-ccimx6ulsbcpro.dts head/sys/gnu/dts/arm/imx6ul-ccimx6ulsom.dtsi head/sys/gnu/dts/arm/imx6ul-geam.dts head/sys/gnu/dts/arm/imx6ul-isiot.dtsi head/sys/gnu/dts/arm/imx6ul-litesom.dtsi head/sys/gnu/dts/arm/imx6ul-opos6ul.dtsi head/sys/gnu/dts/arm/imx6ul-pico-hobbit.dts head/sys/gnu/dts/arm/imx6ul-tx6ul.dtsi head/sys/gnu/dts/arm/imx6ul.dtsi head/sys/gnu/dts/arm/imx6ull-14x14-evk.dts head/sys/gnu/dts/arm/imx6ull-colibri-nonwifi.dtsi head/sys/gnu/dts/arm/imx6ull-colibri-wifi.dtsi head/sys/gnu/dts/arm/imx6ull.dtsi head/sys/gnu/dts/arm/imx6ulz-14x14-evk.dts head/sys/gnu/dts/arm/imx6ulz.dtsi head/sys/gnu/dts/arm/imx7d-cl-som-imx7.dts head/sys/gnu/dts/arm/imx7d-colibri-emmc.dtsi head/sys/gnu/dts/arm/imx7d-colibri.dtsi head/sys/gnu/dts/arm/imx7d-nitrogen7.dts head/sys/gnu/dts/arm/imx7d-pico-pi.dts head/sys/gnu/dts/arm/imx7d-pico.dtsi head/sys/gnu/dts/arm/imx7d-sdb.dts head/sys/gnu/dts/arm/imx7d.dtsi head/sys/gnu/dts/arm/imx7s-colibri.dtsi head/sys/gnu/dts/arm/imx7s-warp.dts head/sys/gnu/dts/arm/imx7s.dtsi head/sys/gnu/dts/arm/iwg20d-q7-common.dtsi head/sys/gnu/dts/arm/kirkwood-dnskw.dtsi head/sys/gnu/dts/arm/ls1021a-moxa-uc-8410a.dts head/sys/gnu/dts/arm/ls1021a.dtsi head/sys/gnu/dts/arm/meson.dtsi head/sys/gnu/dts/arm/meson6-atv1200.dts head/sys/gnu/dts/arm/meson6.dtsi head/sys/gnu/dts/arm/meson8-minix-neo-x8.dts head/sys/gnu/dts/arm/meson8.dtsi head/sys/gnu/dts/arm/meson8b-ec100.dts head/sys/gnu/dts/arm/meson8b-mxq.dts head/sys/gnu/dts/arm/meson8b-odroidc1.dts head/sys/gnu/dts/arm/meson8b.dtsi head/sys/gnu/dts/arm/meson8m2-mxiii-plus.dts head/sys/gnu/dts/arm/meson8m2.dtsi head/sys/gnu/dts/arm/mmp2.dtsi head/sys/gnu/dts/arm/motorola-cpcap-mapphone.dtsi head/sys/gnu/dts/arm/mt7623.dtsi head/sys/gnu/dts/arm/omap3-gta04.dtsi head/sys/gnu/dts/arm/omap3-n900.dts head/sys/gnu/dts/arm/omap3-n950-n9.dtsi head/sys/gnu/dts/arm/omap4-droid4-xt894.dts head/sys/gnu/dts/arm/omap4-l4.dtsi head/sys/gnu/dts/arm/omap4-sdp.dts head/sys/gnu/dts/arm/omap5-board-common.dtsi head/sys/gnu/dts/arm/omap5-cm-t54.dts head/sys/gnu/dts/arm/omap5.dtsi head/sys/gnu/dts/arm/pxa27x.dtsi head/sys/gnu/dts/arm/pxa2xx.dtsi head/sys/gnu/dts/arm/pxa3xx.dtsi head/sys/gnu/dts/arm/qcom-apq8084.dtsi head/sys/gnu/dts/arm/qcom-msm8974-lge-nexus5-hammerhead.dts head/sys/gnu/dts/arm/qcom-msm8974.dtsi head/sys/gnu/dts/arm/r8a7740.dtsi head/sys/gnu/dts/arm/r8a7743-iwg20m.dtsi head/sys/gnu/dts/arm/r8a7743.dtsi head/sys/gnu/dts/arm/r8a77470-iwg23s-sbc.dts head/sys/gnu/dts/arm/r8a77470.dtsi head/sys/gnu/dts/arm/r8a7790-lager.dts head/sys/gnu/dts/arm/r8a7791-koelsch.dts head/sys/gnu/dts/arm/r8a7791-porter.dts head/sys/gnu/dts/arm/r9a06g032.dtsi head/sys/gnu/dts/arm/rk3066a.dtsi head/sys/gnu/dts/arm/rk3188-px3-evb.dts head/sys/gnu/dts/arm/rk3188-radxarock.dts head/sys/gnu/dts/arm/rk3188.dtsi head/sys/gnu/dts/arm/rk322x.dtsi head/sys/gnu/dts/arm/rk3288-rock2-som.dtsi head/sys/gnu/dts/arm/rk3288-veyron-mickey.dts head/sys/gnu/dts/arm/rk3288.dtsi head/sys/gnu/dts/arm/rk3xxx.dtsi head/sys/gnu/dts/arm/rv1108.dtsi head/sys/gnu/dts/arm/s5pv210.dtsi head/sys/gnu/dts/arm/sama5d2.dtsi head/sys/gnu/dts/arm/sama5d4.dtsi head/sys/gnu/dts/arm/sh73a0.dtsi head/sys/gnu/dts/arm/socfpga.dtsi head/sys/gnu/dts/arm/socfpga_arria10.dtsi head/sys/gnu/dts/arm/socfpga_arria10_socdk.dtsi head/sys/gnu/dts/arm/socfpga_arria10_socdk_nand.dts head/sys/gnu/dts/arm/socfpga_arria10_socdk_qspi.dts head/sys/gnu/dts/arm/socfpga_arria10_socdk_sdmmc.dts head/sys/gnu/dts/arm/socfpga_arria5.dtsi head/sys/gnu/dts/arm/socfpga_arria5_socdk.dts head/sys/gnu/dts/arm/socfpga_cyclone5.dtsi head/sys/gnu/dts/arm/socfpga_cyclone5_de0_nano_soc.dts head/sys/gnu/dts/arm/socfpga_cyclone5_mcv.dtsi head/sys/gnu/dts/arm/socfpga_cyclone5_mcvevk.dts head/sys/gnu/dts/arm/socfpga_cyclone5_socdk.dts head/sys/gnu/dts/arm/socfpga_cyclone5_sockit.dts head/sys/gnu/dts/arm/socfpga_cyclone5_socrates.dts head/sys/gnu/dts/arm/socfpga_cyclone5_sodia.dts head/sys/gnu/dts/arm/socfpga_cyclone5_vining_fpga.dts head/sys/gnu/dts/arm/socfpga_vt.dts head/sys/gnu/dts/arm/sun4i-a10-inet9f-rev03.dts head/sys/gnu/dts/arm/sun4i-a10-pcduino.dts head/sys/gnu/dts/arm/sun4i-a10.dtsi head/sys/gnu/dts/arm/sun5i-a10s-auxtek-t003.dts head/sys/gnu/dts/arm/sun5i-a10s-auxtek-t004.dts head/sys/gnu/dts/arm/sun5i-a10s-mk802.dts head/sys/gnu/dts/arm/sun5i-a10s-olinuxino-micro.dts head/sys/gnu/dts/arm/sun5i-a10s-r7-tv-dongle.dts head/sys/gnu/dts/arm/sun5i-a10s-wobo-i5.dts head/sys/gnu/dts/arm/sun5i-a10s.dtsi head/sys/gnu/dts/arm/sun5i-a13-empire-electronix-d709.dts head/sys/gnu/dts/arm/sun5i-a13-hsg-h702.dts head/sys/gnu/dts/arm/sun5i-a13-licheepi-one.dts head/sys/gnu/dts/arm/sun5i-a13-olinuxino-micro.dts head/sys/gnu/dts/arm/sun5i-a13-olinuxino.dts head/sys/gnu/dts/arm/sun5i-a13-utoo-p66.dts head/sys/gnu/dts/arm/sun5i-a13.dtsi head/sys/gnu/dts/arm/sun5i-gr8-chip-pro.dts head/sys/gnu/dts/arm/sun5i-gr8-evb.dts head/sys/gnu/dts/arm/sun5i-gr8.dtsi head/sys/gnu/dts/arm/sun5i-r8-chip.dts head/sys/gnu/dts/arm/sun5i-reference-design-tablet.dtsi head/sys/gnu/dts/arm/sun5i.dtsi head/sys/gnu/dts/arm/sun6i-a31-app4-evb1.dts head/sys/gnu/dts/arm/sun6i-a31-colombus.dts head/sys/gnu/dts/arm/sun6i-a31-hummingbird.dts head/sys/gnu/dts/arm/sun6i-a31-i7.dts head/sys/gnu/dts/arm/sun6i-a31-m9.dts head/sys/gnu/dts/arm/sun6i-a31-mele-a1000g-quad.dts head/sys/gnu/dts/arm/sun6i-a31.dtsi head/sys/gnu/dts/arm/sun6i-a31s-colorfly-e708-q1.dts head/sys/gnu/dts/arm/sun6i-a31s-cs908.dts head/sys/gnu/dts/arm/sun6i-a31s-inet-q972.dts head/sys/gnu/dts/arm/sun6i-a31s-primo81.dts head/sys/gnu/dts/arm/sun6i-a31s-sina31s-core.dtsi head/sys/gnu/dts/arm/sun6i-a31s-sina31s.dts head/sys/gnu/dts/arm/sun6i-a31s-sinovoip-bpi-m2.dts head/sys/gnu/dts/arm/sun6i-a31s-yones-toptech-bs1078-v2.dts head/sys/gnu/dts/arm/sun6i-reference-design-tablet.dtsi head/sys/gnu/dts/arm/sun7i-a20-bananapi-m1-plus.dts head/sys/gnu/dts/arm/sun7i-a20-bananapi.dts head/sys/gnu/dts/arm/sun7i-a20-bananapro.dts head/sys/gnu/dts/arm/sun7i-a20-cubieboard2.dts head/sys/gnu/dts/arm/sun7i-a20-cubietruck.dts head/sys/gnu/dts/arm/sun7i-a20-hummingbird.dts head/sys/gnu/dts/arm/sun7i-a20-i12-tvbox.dts head/sys/gnu/dts/arm/sun7i-a20-icnova-swac.dts head/sys/gnu/dts/arm/sun7i-a20-itead-ibox.dts head/sys/gnu/dts/arm/sun7i-a20-lamobo-r1.dts head/sys/gnu/dts/arm/sun7i-a20-m3.dts head/sys/gnu/dts/arm/sun7i-a20-mk808c.dts head/sys/gnu/dts/arm/sun7i-a20-olimex-som-evb-emmc.dts head/sys/gnu/dts/arm/sun7i-a20-olimex-som-evb.dts head/sys/gnu/dts/arm/sun7i-a20-olimex-som204-evb-emmc.dts head/sys/gnu/dts/arm/sun7i-a20-olimex-som204-evb.dts head/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime.dts head/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime2-emmc.dts head/sys/gnu/dts/arm/sun7i-a20-olinuxino-lime2.dts head/sys/gnu/dts/arm/sun7i-a20-olinuxino-micro-emmc.dts head/sys/gnu/dts/arm/sun7i-a20-olinuxino-micro.dts head/sys/gnu/dts/arm/sun7i-a20-orangepi-mini.dts head/sys/gnu/dts/arm/sun7i-a20-orangepi.dts head/sys/gnu/dts/arm/sun7i-a20-pcduino3-nano.dts head/sys/gnu/dts/arm/sun7i-a20-pcduino3.dts head/sys/gnu/dts/arm/sun7i-a20-wexler-tab7200.dts head/sys/gnu/dts/arm/sun7i-a20-wits-pro-a20-dkt.dts head/sys/gnu/dts/arm/sun7i-a20.dtsi head/sys/gnu/dts/arm/sun8i-a23-a33.dtsi head/sys/gnu/dts/arm/sun8i-a23-evb.dts head/sys/gnu/dts/arm/sun8i-a23-gt90h-v4.dts head/sys/gnu/dts/arm/sun8i-a23-polaroid-mid2407pxe03.dts head/sys/gnu/dts/arm/sun8i-a23-polaroid-mid2809pxe04.dts head/sys/gnu/dts/arm/sun8i-a23.dtsi head/sys/gnu/dts/arm/sun8i-a33-ga10h-v1.1.dts head/sys/gnu/dts/arm/sun8i-a33-inet-d978-rev2.dts head/sys/gnu/dts/arm/sun8i-a33-olinuxino.dts head/sys/gnu/dts/arm/sun8i-a33-sinlinx-sina33.dts head/sys/gnu/dts/arm/sun8i-a33.dtsi head/sys/gnu/dts/arm/sun8i-a83t-bananapi-m3.dts head/sys/gnu/dts/arm/sun8i-a83t-cubietruck-plus.dts head/sys/gnu/dts/arm/sun8i-a83t-tbs-a711.dts head/sys/gnu/dts/arm/sun8i-a83t.dtsi head/sys/gnu/dts/arm/sun8i-h3-beelink-x2.dts head/sys/gnu/dts/arm/sun8i-h3-orangepi-plus.dts head/sys/gnu/dts/arm/sun8i-h3.dtsi head/sys/gnu/dts/arm/sun8i-q8-common.dtsi head/sys/gnu/dts/arm/sun8i-r16-bananapi-m2m.dts head/sys/gnu/dts/arm/sun8i-r16-nintendo-nes-classic.dts head/sys/gnu/dts/arm/sun8i-r16-parrot.dts head/sys/gnu/dts/arm/sun8i-r40.dtsi head/sys/gnu/dts/arm/sun8i-reference-design-tablet.dtsi head/sys/gnu/dts/arm/sun8i-v3s-licheepi-zero-dock.dts head/sys/gnu/dts/arm/sun8i-v3s-licheepi-zero.dts head/sys/gnu/dts/arm/sun8i-v3s.dtsi head/sys/gnu/dts/arm/sunxi-h3-h5.dtsi head/sys/gnu/dts/arm/sunxi-itead-core-common.dtsi head/sys/gnu/dts/arm/sunxi-reference-design-tablet.dtsi head/sys/gnu/dts/arm/tegra124-nyan.dtsi head/sys/gnu/dts/arm/tegra124.dtsi head/sys/gnu/dts/arm/tegra20.dtsi head/sys/gnu/dts/arm/uniphier-ld4.dtsi head/sys/gnu/dts/arm/uniphier-pro4.dtsi head/sys/gnu/dts/arm/uniphier-pxs2.dtsi head/sys/gnu/dts/arm/uniphier-sld8.dtsi head/sys/gnu/dts/arm/vexpress-v2m-rs1.dtsi head/sys/gnu/dts/arm/vexpress-v2m.dtsi head/sys/gnu/dts/arm/vexpress-v2p-ca15-tc1.dts head/sys/gnu/dts/arm/vexpress-v2p-ca15_a7.dts head/sys/gnu/dts/arm/vexpress-v2p-ca5s.dts head/sys/gnu/dts/arm/vexpress-v2p-ca9.dts head/sys/gnu/dts/arm/vf500-colibri.dtsi head/sys/gnu/dts/arm/vf500.dtsi head/sys/gnu/dts/arm/vf610-colibri.dtsi head/sys/gnu/dts/arm/vf610-cosmic.dts head/sys/gnu/dts/arm/vf610-twr.dts head/sys/gnu/dts/arm/vf610-zii-cfu1.dts head/sys/gnu/dts/arm/vf610-zii-dev.dtsi head/sys/gnu/dts/arm/vf610-zii-ssmb-spu3.dts head/sys/gnu/dts/arm/vf610m4-colibri.dts head/sys/gnu/dts/arm/vf610m4.dtsi head/sys/gnu/dts/arm/zynq-7000.dtsi head/sys/gnu/dts/arm64/allwinner/axp803.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-a64-bananapi-m64.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-orangepi-win.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pine64.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinebook.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-sopine-baseboard.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-sopine.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-a64.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-h5.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-h6-orangepi-one-plus.dts head/sys/gnu/dts/arm64/allwinner/sun50i-h6-pine-h64.dts head/sys/gnu/dts/arm64/allwinner/sun50i-h6.dtsi head/sys/gnu/dts/arm64/altera/socfpga_stratix10.dtsi head/sys/gnu/dts/arm64/amlogic/meson-axg-s400.dts head/sys/gnu/dts/arm64/amlogic/meson-axg.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gx-p23x-q20x.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gx.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxbb-nanopi-k2.dts head/sys/gnu/dts/arm64/amlogic/meson-gxbb-nexbox-a95x.dts head/sys/gnu/dts/arm64/amlogic/meson-gxbb-odroidc2.dts head/sys/gnu/dts/arm64/amlogic/meson-gxbb-p20x.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxbb-vega-s95.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxbb-wetek.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxbb.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-p230.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-hwacom-amazetv.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-khadas-vim.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-libretech-cc.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-nexbox-a95x.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-p212.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905x-p212.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxl.dtsi head/sys/gnu/dts/arm64/amlogic/meson-gxm-khadas-vim2.dts head/sys/gnu/dts/arm64/amlogic/meson-gxm-nexbox-a1.dts head/sys/gnu/dts/arm64/amlogic/meson-gxm-rbox-pro.dts head/sys/gnu/dts/arm64/arm/rtsm_ve-aemv8a.dts head/sys/gnu/dts/arm64/arm/rtsm_ve-motherboard.dtsi head/sys/gnu/dts/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts head/sys/gnu/dts/arm64/arm/vexpress-v2m-rs1.dtsi head/sys/gnu/dts/arm64/exynos/exynos5433-tm2-common.dtsi head/sys/gnu/dts/arm64/exynos/exynos5433-tmu.dtsi head/sys/gnu/dts/arm64/exynos/exynos5433.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1012a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1043a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1043a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1046a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1046a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1046a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1088a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls2088a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls208xa-qds.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls208xa.dtsi head/sys/gnu/dts/arm64/hisilicon/hi3660-hikey960.dts head/sys/gnu/dts/arm64/hisilicon/hi3660.dtsi head/sys/gnu/dts/arm64/hisilicon/hi3670-hikey970.dts head/sys/gnu/dts/arm64/hisilicon/hi3670.dtsi head/sys/gnu/dts/arm64/hisilicon/hi3798cv200-poplar.dts head/sys/gnu/dts/arm64/hisilicon/hi6220-hikey.dts head/sys/gnu/dts/arm64/hisilicon/hi6220.dtsi head/sys/gnu/dts/arm64/marvell/armada-3720-espressobin.dts head/sys/gnu/dts/arm64/marvell/armada-37xx.dtsi head/sys/gnu/dts/arm64/marvell/armada-8040-clearfog-gt-8k.dts head/sys/gnu/dts/arm64/marvell/armada-8040-mcbin.dts head/sys/gnu/dts/arm64/marvell/armada-ap806.dtsi head/sys/gnu/dts/arm64/mediatek/mt7622.dtsi head/sys/gnu/dts/arm64/mediatek/mt8173.dtsi head/sys/gnu/dts/arm64/nvidia/tegra186-p2771-0000.dts head/sys/gnu/dts/arm64/nvidia/tegra186-p3310.dtsi head/sys/gnu/dts/arm64/nvidia/tegra186.dtsi head/sys/gnu/dts/arm64/nvidia/tegra194-p2888.dtsi head/sys/gnu/dts/arm64/nvidia/tegra194-p2972-0000.dts head/sys/gnu/dts/arm64/nvidia/tegra194.dtsi head/sys/gnu/dts/arm64/nvidia/tegra210-p2597.dtsi head/sys/gnu/dts/arm64/nvidia/tegra210.dtsi head/sys/gnu/dts/arm64/qcom/apq8096-db820c.dtsi head/sys/gnu/dts/arm64/qcom/msm8916-pins.dtsi head/sys/gnu/dts/arm64/qcom/msm8916.dtsi head/sys/gnu/dts/arm64/qcom/msm8996-pins.dtsi head/sys/gnu/dts/arm64/qcom/msm8996.dtsi head/sys/gnu/dts/arm64/qcom/msm8998-mtp.dtsi head/sys/gnu/dts/arm64/qcom/msm8998.dtsi head/sys/gnu/dts/arm64/qcom/pm8998.dtsi head/sys/gnu/dts/arm64/qcom/sdm845.dtsi head/sys/gnu/dts/arm64/renesas/r8a774a1.dtsi head/sys/gnu/dts/arm64/renesas/r8a7795-es1-salvator-x.dts head/sys/gnu/dts/arm64/renesas/r8a7795-es1.dtsi head/sys/gnu/dts/arm64/renesas/r8a7795-salvator-x.dts head/sys/gnu/dts/arm64/renesas/r8a7795-salvator-xs.dts head/sys/gnu/dts/arm64/renesas/r8a7795.dtsi head/sys/gnu/dts/arm64/renesas/r8a7796.dtsi head/sys/gnu/dts/arm64/renesas/r8a77965.dtsi head/sys/gnu/dts/arm64/renesas/r8a77970.dtsi head/sys/gnu/dts/arm64/renesas/r8a77980.dtsi head/sys/gnu/dts/arm64/renesas/r8a77990-ebisu.dts head/sys/gnu/dts/arm64/renesas/r8a77990.dtsi head/sys/gnu/dts/arm64/renesas/r8a77995-draak.dts head/sys/gnu/dts/arm64/renesas/r8a77995.dtsi head/sys/gnu/dts/arm64/renesas/salvator-common.dtsi head/sys/gnu/dts/arm64/renesas/ulcb.dtsi head/sys/gnu/dts/arm64/rockchip/rk3328-rock64.dts head/sys/gnu/dts/arm64/rockchip/rk3328.dtsi head/sys/gnu/dts/arm64/rockchip/rk3368.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-ficus.dts head/sys/gnu/dts/arm64/rockchip/rk3399-gru-bob.dts head/sys/gnu/dts/arm64/rockchip/rk3399-gru-chromebook.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-gru-kevin.dts head/sys/gnu/dts/arm64/rockchip/rk3399-gru.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-rock960.dts head/sys/gnu/dts/arm64/rockchip/rk3399-rockpro64.dts head/sys/gnu/dts/arm64/rockchip/rk3399-sapphire-excavator.dts head/sys/gnu/dts/arm64/rockchip/rk3399-sapphire.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399.dtsi head/sys/gnu/dts/arm64/socionext/uniphier-ld20.dtsi head/sys/gnu/dts/arm64/sprd/sc9836.dtsi head/sys/gnu/dts/arm64/sprd/sc9860.dtsi head/sys/gnu/dts/arm64/ti/k3-am65-main.dtsi head/sys/gnu/dts/arm64/ti/k3-am65-mcu.dtsi head/sys/gnu/dts/arm64/ti/k3-am65-wakeup.dtsi head/sys/gnu/dts/arm64/ti/k3-am65.dtsi head/sys/gnu/dts/arm64/ti/k3-am654-base-board.dts head/sys/gnu/dts/arm64/xilinx/zynqmp-clk.dtsi head/sys/gnu/dts/arm64/xilinx/zynqmp-zcu100-revC.dts head/sys/gnu/dts/arm64/xilinx/zynqmp-zcu102-revA.dts head/sys/gnu/dts/arm64/xilinx/zynqmp-zcu106-revA.dts head/sys/gnu/dts/arm64/xilinx/zynqmp-zcu111-revA.dts head/sys/gnu/dts/arm64/xilinx/zynqmp.dtsi head/sys/gnu/dts/include/dt-bindings/clock/bcm2835-aux.h head/sys/gnu/dts/include/dt-bindings/clock/bcm2835.h head/sys/gnu/dts/include/dt-bindings/clock/gxbb-clkc.h head/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h head/sys/gnu/dts/include/dt-bindings/clock/meson8b-clkc.h head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8998.h head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-sdm845.h head/sys/gnu/dts/include/dt-bindings/clock/qcom,rpmcc.h head/sys/gnu/dts/include/dt-bindings/clock/r8a7795-cpg-mssr.h head/sys/gnu/dts/include/dt-bindings/clock/r8a7796-cpg-mssr.h head/sys/gnu/dts/include/dt-bindings/clock/r8a77995-cpg-mssr.h head/sys/gnu/dts/include/dt-bindings/clock/rk3328-cru.h head/sys/gnu/dts/include/dt-bindings/clock/sun8i-de2.h head/sys/gnu/dts/include/dt-bindings/gpio/tegra186-gpio.h head/sys/gnu/dts/include/dt-bindings/input/linux-event-codes.h head/sys/gnu/dts/include/dt-bindings/mailbox/tegra186-hsp.h head/sys/gnu/dts/include/dt-bindings/media/xilinx-vip.h head/sys/gnu/dts/include/dt-bindings/pinctrl/bcm2835.h head/sys/gnu/dts/include/dt-bindings/power/r8a77970-sysc.h head/sys/gnu/dts/include/dt-bindings/power/r8a77980-sysc.h head/sys/gnu/dts/include/dt-bindings/power/raspberrypi-power.h head/sys/gnu/dts/include/dt-bindings/reset/amlogic,meson-axg-reset.h head/sys/gnu/dts/include/dt-bindings/reset/sun8i-de2.h head/sys/gnu/dts/include/dt-bindings/sound/qcom,q6afe.h Directory Properties: head/sys/gnu/dts/arm/ (props changed) head/sys/gnu/dts/arm64/ (props changed) head/sys/gnu/dts/include/ (props changed) Modified: head/sys/gnu/dts/arm/am335x-bone-common.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am335x-bone-common.dtsi Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-bone-common.dtsi Wed Apr 10 18:15:36 2019 (r346092) @@ -419,6 +419,6 @@ }; &rtc { - clocks = <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; clock-names = "ext-clk", "int-clk"; }; Modified: head/sys/gnu/dts/arm/am335x-boneblue.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-boneblue.dts Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-boneblue.dts Wed Apr 10 18:15:36 2019 (r346092) @@ -515,7 +515,7 @@ &rtc { system-power-controller; - clocks = <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; clock-names = "ext-clk", "int-clk"; }; Modified: head/sys/gnu/dts/arm/am335x-cm-t335.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-cm-t335.dts Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-cm-t335.dts Wed Apr 10 18:15:36 2019 (r346092) @@ -393,7 +393,7 @@ status = "okay"; &epwmss0 { status = "okay"; - ecap0: ecap@48300100 { + ecap0: ecap@100 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&ecap0_pins>; Modified: head/sys/gnu/dts/arm/am335x-evm.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-evm.dts Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-evm.dts Wed Apr 10 18:15:36 2019 (r346092) @@ -519,7 +519,7 @@ &epwmss0 { status = "okay"; - ecap0: ecap@48300100 { + ecap0: ecap@100 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&ecap0_pins>; @@ -729,7 +729,7 @@ &cpsw_emac0 { phy-handle = <ðphy0>; - phy-mode = "rgmii-txid"; + phy-mode = "rgmii-id"; }; &tscadc { @@ -797,6 +797,6 @@ }; &rtc { - clocks = <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; clock-names = "ext-clk", "int-clk"; }; Modified: head/sys/gnu/dts/arm/am335x-evmsk.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-evmsk.dts Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-evmsk.dts Wed Apr 10 18:15:36 2019 (r346092) @@ -540,7 +540,7 @@ &epwmss2 { status = "okay"; - ecap2: ecap@48304100 { + ecap2: ecap@100 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&ecap2_pins>; @@ -651,13 +651,13 @@ &cpsw_emac0 { phy-handle = <ðphy0>; - phy-mode = "rgmii-txid"; + phy-mode = "rgmii-id"; dual_emac_res_vlan = <1>; }; &cpsw_emac1 { phy-handle = <ðphy1>; - phy-mode = "rgmii-txid"; + phy-mode = "rgmii-id"; dual_emac_res_vlan = <2>; }; @@ -738,6 +738,6 @@ }; &rtc { - clocks = <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; clock-names = "ext-clk", "int-clk"; }; Modified: head/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts Wed Apr 10 18:15:36 2019 (r346092) @@ -456,6 +456,6 @@ }; &rtc { - clocks = <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; clock-names = "ext-clk", "int-clk"; }; Modified: head/sys/gnu/dts/arm/am335x-pdu001.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-pdu001.dts Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-pdu001.dts Wed Apr 10 18:15:36 2019 (r346092) @@ -585,7 +585,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; - cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; }; &sham { Modified: head/sys/gnu/dts/arm/am335x-shc.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-shc.dts Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am335x-shc.dts Wed Apr 10 18:15:36 2019 (r346092) @@ -138,7 +138,7 @@ &epwmss1 { status = "okay"; - ehrpwm1: pwm@48302200 { + ehrpwm1: pwm@200 { pinctrl-names = "default"; pinctrl-0 = <&ehrpwm1_pins>; status = "okay"; @@ -205,7 +205,7 @@ pinctrl-1 = <&cpsw_sleep>; status = "okay"; slaves = <1>; - cpsw_emac0: slave@4a100200 { + cpsw_emac0: slave@200 { phy-mode = "mii"; phy-handle = <ðernetphy0>; }; @@ -215,7 +215,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; bus-width = <0x4>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; cd-inverted; max-frequency = <26000000>; vmmc-supply = <&vmmcsd_fixed>; Modified: head/sys/gnu/dts/arm/am33xx-clocks.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am33xx-clocks.dtsi Wed Apr 10 18:12:31 2019 (r346091) +++ head/sys/gnu/dts/arm/am33xx-clocks.dtsi Wed Apr 10 18:15:36 2019 (r346092) @@ -334,49 +334,49 @@ timer1_fck: timer1_fck@528 { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>; + clocks = <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>; reg = <0x0528>; }; timer2_fck: timer2_fck@508 { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x0508>; }; timer3_fck: timer3_fck@50c { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x050c>; }; timer4_fck: timer4_fck@510 { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x0510>; }; timer5_fck: timer5_fck@518 { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x0518>; }; timer6_fck: timer6_fck@51c { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x051c>; }; timer7_fck: timer7_fck@504 { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x0504>; }; @@ -407,7 +407,7 @@ wdt1_fck: wdt1_fck@538 { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&clk_rc32k_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&clk_rc32k_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x0538>; }; @@ -477,7 +477,7 @@ gpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck@53c { #clock-cells = <0>; compatible = "ti,mux-clock"; - clocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>; reg = <0x053c>; }; @@ -539,86 +539,140 @@ }; &prcm { - l4_per_cm: l4_per_cm@0 { + per_cm: per-cm@0 { compatible = "ti,omap4-cm"; - reg = <0x0 0x200>; + reg = <0x0 0x400>; #address-cells = <1>; #size-cells = <1>; - ranges = <0 0x0 0x200>; + ranges = <0 0x0 0x400>; - l4_per_clkctrl: clk@14 { + l4ls_clkctrl: l4ls-clkctrl@38 { compatible = "ti,clkctrl"; - reg = <0x14 0x13c>; + reg = <0x38 0x2c>, <0x6c 0x28>, <0xac 0xc>, <0xc0 0x1c>, <0xec 0xc>, <0x10c 0x8>, <0x130 0x4>; #clock-cells = <2>; }; + + l3s_clkctrl: l3s-clkctrl@1c { + compatible = "ti,clkctrl"; + reg = <0x1c 0x4>, <0x30 0x8>, <0x68 0x4>, <0xf8 0x4>; + #clock-cells = <2>; + }; + + l3_clkctrl: l3-clkctrl@24 { + compatible = "ti,clkctrl"; + reg = <0x24 0xc>, <0x94 0x10>, <0xbc 0x4>, <0xdc 0x8>, <0xfc 0x8>; + #clock-cells = <2>; + }; + + l4hs_clkctrl: l4hs-clkctrl@120 { + compatible = "ti,clkctrl"; + reg = <0x120 0x4>; + #clock-cells = <2>; + }; + + pruss_ocp_clkctrl: pruss-ocp-clkctrl@e8 { + compatible = "ti,clkctrl"; + reg = <0xe8 0x4>; + #clock-cells = <2>; + }; + + cpsw_125mhz_clkctrl: cpsw-125mhz-clkctrl@0 { + compatible = "ti,clkctrl"; + reg = <0x0 0x18>; + #clock-cells = <2>; + }; + + lcdc_clkctrl: lcdc-clkctrl@18 { + compatible = "ti,clkctrl"; + reg = <0x18 0x4>; + #clock-cells = <2>; + }; + + clk_24mhz_clkctrl: clk-24mhz-clkctrl@14c { + compatible = "ti,clkctrl"; + reg = <0x14c 0x4>; + #clock-cells = <2>; + }; }; - l4_wkup_cm: l4_wkup_cm@400 { + wkup_cm: wkup-cm@400 { compatible = "ti,omap4-cm"; reg = <0x400 0x100>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x400 0x100>; - l4_wkup_clkctrl: clk@4 { + l4_wkup_clkctrl: l4-wkup-clkctrl@0 { compatible = "ti,clkctrl"; - reg = <0x4 0xd4>; + reg = <0x0 0x10>, <0xb4 0x24>; #clock-cells = <2>; }; + + l3_aon_clkctrl: l3-aon-clkctrl@14 { + compatible = "ti,clkctrl"; + reg = <0x14 0x4>; + #clock-cells = <2>; + }; + + l4_wkup_aon_clkctrl: l4-wkup-aon-clkctrl@b0 { + compatible = "ti,clkctrl"; + reg = <0xb0 0x4>; + #clock-cells = <2>; + }; }; - mpu_cm: mpu_cm@600 { + mpu_cm: mpu-cm@600 { compatible = "ti,omap4-cm"; reg = <0x600 0x100>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x600 0x100>; - mpu_clkctrl: clk@4 { + mpu_clkctrl: mpu-clkctrl@0 { compatible = "ti,clkctrl"; - reg = <0x4 0x4>; + reg = <0x0 0x8>; #clock-cells = <2>; }; }; - l4_rtc_cm: l4_rtc_cm@800 { + l4_rtc_cm: l4-rtc-cm@800 { compatible = "ti,omap4-cm"; reg = <0x800 0x100>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x800 0x100>; - l4_rtc_clkctrl: clk@0 { + l4_rtc_clkctrl: l4-rtc-clkctrl@0 { compatible = "ti,clkctrl"; reg = <0x0 0x4>; #clock-cells = <2>; }; }; - gfx_l3_cm: gfx_l3_cm@900 { + gfx_l3_cm: gfx-l3-cm@900 { compatible = "ti,omap4-cm"; reg = <0x900 0x100>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x900 0x100>; - gfx_l3_clkctrl: clk@4 { + gfx_l3_clkctrl: gfx-l3-clkctrl@0 { compatible = "ti,clkctrl"; - reg = <0x4 0x4>; + reg = <0x0 0x8>; #clock-cells = <2>; }; }; - l4_cefuse_cm: l4_cefuse_cm@a00 { + l4_cefuse_cm: l4-cefuse-cm@a00 { compatible = "ti,omap4-cm"; reg = <0xa00 0x100>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0xa00 0x100>; - l4_cefuse_clkctrl: clk@20 { + l4_cefuse_clkctrl: l4-cefuse-clkctrl@0 { compatible = "ti,clkctrl"; - reg = <0x20 0x4>; + reg = <0x0 0x24>; #clock-cells = <2>; }; }; Copied: head/sys/gnu/dts/arm/am33xx-l4.dtsi (from r346089, vendor/device-tree/dist/src/arm/am33xx-l4.dtsi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/gnu/dts/arm/am33xx-l4.dtsi Wed Apr 10 18:15:36 2019 (r346092, copy of r346089, vendor/device-tree/dist/src/arm/am33xx-l4.dtsi) @@ -0,0 +1,2132 @@ +&l4_wkup { /* 0x44c00000 */ + compatible = "ti,am33xx-l4-wkup", "simple-bus"; + reg = <0x44c00000 0x800>, + <0x44c00800 0x800>, + <0x44c01000 0x400>, + <0x44c01400 0x400>; + reg-names = "ap", "la", "ia0", "ia1"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x44c00000 0x100000>, /* segment 0 */ + <0x00100000 0x44d00000 0x100000>, /* segment 1 */ + <0x00200000 0x44e00000 0x100000>; /* segment 2 */ + + segment@0 { /* 0x44c00000 */ + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x00000000 0x000800>, /* ap 0 */ + <0x00000800 0x00000800 0x000800>, /* ap 1 */ + <0x00001000 0x00001000 0x000400>, /* ap 2 */ + <0x00001400 0x00001400 0x000400>; /* ap 3 */ + }; + + segment@100000 { /* 0x44d00000 */ + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x00100000 0x004000>, /* ap 4 */ + <0x00004000 0x00104000 0x001000>, /* ap 5 */ + <0x00080000 0x00180000 0x002000>, /* ap 6 */ + <0x00082000 0x00182000 0x001000>; /* ap 7 */ + + target-module@0 { /* 0x44d00000, ap 4 28.0 */ + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x0 0x4>; + reg-names = "rev"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x0 0x4000>; + status = "disabled"; + }; + + target-module@80000 { /* 0x44d80000, ap 6 10.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x80000 0x2000>; + }; + }; + + segment@200000 { /* 0x44e00000 */ + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x00200000 0x002000>, /* ap 8 */ + <0x00002000 0x00202000 0x001000>, /* ap 9 */ + <0x00003000 0x00203000 0x001000>, /* ap 10 */ + <0x00004000 0x00204000 0x001000>, /* ap 11 */ + <0x00005000 0x00205000 0x001000>, /* ap 12 */ + <0x00006000 0x00206000 0x001000>, /* ap 13 */ + <0x00007000 0x00207000 0x001000>, /* ap 14 */ + <0x00008000 0x00208000 0x001000>, /* ap 15 */ + <0x00009000 0x00209000 0x001000>, /* ap 16 */ + <0x0000a000 0x0020a000 0x001000>, /* ap 17 */ + <0x0000b000 0x0020b000 0x001000>, /* ap 18 */ + <0x0000c000 0x0020c000 0x001000>, /* ap 19 */ + <0x0000d000 0x0020d000 0x001000>, /* ap 20 */ + <0x0000f000 0x0020f000 0x001000>, /* ap 21 */ + <0x00010000 0x00210000 0x010000>, /* ap 22 */ + <0x00020000 0x00220000 0x010000>, /* ap 23 */ + <0x00030000 0x00230000 0x001000>, /* ap 24 */ + <0x00031000 0x00231000 0x001000>, /* ap 25 */ + <0x00032000 0x00232000 0x001000>, /* ap 26 */ + <0x00033000 0x00233000 0x001000>, /* ap 27 */ + <0x00034000 0x00234000 0x001000>, /* ap 28 */ + <0x00035000 0x00235000 0x001000>, /* ap 29 */ + <0x00036000 0x00236000 0x001000>, /* ap 30 */ + <0x00037000 0x00237000 0x001000>, /* ap 31 */ + <0x00038000 0x00238000 0x001000>, /* ap 32 */ + <0x00039000 0x00239000 0x001000>, /* ap 33 */ + <0x0003a000 0x0023a000 0x001000>, /* ap 34 */ + <0x0003e000 0x0023e000 0x001000>, /* ap 35 */ + <0x0003f000 0x0023f000 0x001000>, /* ap 36 */ + <0x0000e000 0x0020e000 0x001000>, /* ap 37 */ + <0x00040000 0x00240000 0x040000>, /* ap 38 */ + <0x00080000 0x00280000 0x001000>; /* ap 39 */ + + target-module@0 { /* 0x44e00000, ap 8 58.0 */ + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0 0x4>; + reg-names = "rev"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x0 0x2000>; + + prcm: prcm@0 { + compatible = "ti,am3-prcm", "simple-bus"; + reg = <0 0x2000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x2000>; + + prcm_clocks: clocks { + #address-cells = <1>; + #size-cells = <0>; + }; + + prcm_clockdomains: clockdomains { + }; + }; + }; + + target-module@3000 { /* 0x44e03000, ap 10 0a.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3000 0x1000>; + }; + + target-module@5000 { /* 0x44e05000, ap 12 30.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x5000 0x1000>; + }; + + target-module@7000 { /* 0x44e07000, ap 14 20.0 */ + compatible = "ti,sysc-omap2", "ti,sysc"; + ti,hwmods = "gpio1"; + reg = <0x7000 0x4>, + <0x7010 0x4>, + <0x7114 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + , + ; + ti,syss-mask = <1>; + /* Domains (P, C): wkup_pwrdm, l4_wkup_clkdm */ + clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_GPIO1_CLKCTRL 0>, + <&l4_wkup_clkctrl AM3_L4_WKUP_GPIO1_CLKCTRL 18>; + clock-names = "fck", "dbclk"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x7000 0x1000>; + + gpio0: gpio@0 { + compatible = "ti,omap4-gpio"; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x0 0x1000>; + interrupts = <96>; + }; + }; + + target-module@9000 { /* 0x44e09000, ap 16 04.0 */ + compatible = "ti,sysc-omap2", "ti,sysc"; + ti,hwmods = "uart1"; + reg = <0x9050 0x4>, + <0x9054 0x4>, + <0x9058 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + , + ; + /* Domains (P, C): wkup_pwrdm, l4_wkup_clkdm */ + clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_UART1_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x9000 0x1000>; + + uart0: serial@0 { + compatible = "ti,am3352-uart", "ti,omap3-uart"; + clock-frequency = <48000000>; + reg = <0x0 0x2000>; + interrupts = <72>; + status = "disabled"; + dmas = <&edma 26 0>, <&edma 27 0>; + dma-names = "tx", "rx"; + }; + }; + + target-module@b000 { /* 0x44e0b000, ap 18 48.0 */ + compatible = "ti,sysc-omap2", "ti,sysc"; + ti,hwmods = "i2c1"; + reg = <0xb000 0x8>, + <0xb010 0x8>, + <0xb090 0x8>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_ENAWAKEUP | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + , + ; + ti,syss-mask = <1>; + /* Domains (P, C): wkup_pwrdm, l4_wkup_clkdm */ + clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_I2C1_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0xb000 0x1000>; + + i2c0: i2c@0 { + compatible = "ti,omap4-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x1000>; + interrupts = <70>; + status = "disabled"; + }; + }; + + target-module@d000 { /* 0x44e0d000, ap 20 38.0 */ + compatible = "ti,sysc-omap4", "ti,sysc"; + ti,hwmods = "adc_tsc"; + reg = <0xd000 0x4>, + <0xd010 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-sidle = , + , + , + ; + /* Domains (P, C): wkup_pwrdm, l4_wkup_clkdm */ + clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_ADC_TSC_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x0000d000 0x00001000>, + <0x00001000 0x0000e000 0x00001000>; + + tscadc: tscadc@0 { + compatible = "ti,am3359-tscadc"; + reg = <0x0 0x1000>; + interrupts = <16>; + status = "disabled"; + dmas = <&edma 53 0>, <&edma 57 0>; + dma-names = "fifo0", "fifo1"; + + tsc { + compatible = "ti,am3359-tsc"; + }; + am335x_adc: adc { + #io-channel-cells = <1>; + compatible = "ti,am3359-adc"; + }; + }; + }; + + target-module@10000 { /* 0x44e10000, ap 22 0c.0 */ + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x10000 0x4>; + reg-names = "rev"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x00010000 0x00010000>, + <0x00010000 0x00020000 0x00010000>; + + scm: scm@0 { + compatible = "ti,am3-scm", "simple-bus"; + reg = <0x0 0x2000>; + #address-cells = <1>; + #size-cells = <1>; + #pinctrl-cells = <1>; + ranges = <0 0 0x2000>; + + phy_sel: cpsw-phy-sel@650 { + compatible = "ti,am3352-cpsw-phy-sel"; + reg= <0x650 0x4>; + reg-names = "gmii-sel"; + }; + + am33xx_pinmux: pinmux@800 { + compatible = "pinctrl-single"; + reg = <0x800 0x238>; + #address-cells = <1>; + #size-cells = <0>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0x7f>; + }; + + scm_conf: scm_conf@0 { + compatible = "syscon", "simple-bus"; + reg = <0x0 0x800>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x800>; + + scm_clocks: clocks { + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + wkup_m3_ipc: wkup_m3_ipc@1324 { + compatible = "ti,am3352-wkup-m3-ipc"; + reg = <0x1324 0x24>; + interrupts = <78>; + ti,rproc = <&wkup_m3>; + mboxes = <&mailbox &mbox_wkupm3>; + }; + + edma_xbar: dma-router@f90 { + compatible = "ti,am335x-edma-crossbar"; + reg = <0xf90 0x40>; + #dma-cells = <3>; + dma-requests = <32>; + dma-masters = <&edma>; + }; + + scm_clockdomains: clockdomains { + }; + }; + }; + + target-module@31000 { /* 0x44e31000, ap 25 40.0 */ + compatible = "ti,sysc-omap2-timer", "ti,sysc"; + ti,hwmods = "timer1"; + reg = <0x31000 0x4>, + <0x31010 0x4>, + <0x31014 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY | + SYSC_OMAP2_SOFTRESET | + SYSC_OMAP2_AUTOIDLE)>; + ti,sysc-sidle = , + , + ; + ti,syss-mask = <1>; + /* Domains (P, C): wkup_pwrdm, l4_wkup_clkdm */ + clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_TIMER1_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x31000 0x1000>; + + timer1: timer@0 { + compatible = "ti,am335x-timer-1ms"; + reg = <0x0 0x400>; + interrupts = <67>; + ti,timer-alwon; + clocks = <&timer1_fck>; + clock-names = "fck"; + }; + }; + + target-module@33000 { /* 0x44e33000, ap 27 18.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x33000 0x1000>; + }; + + target-module@35000 { /* 0x44e35000, ap 29 50.0 */ + compatible = "ti,sysc-omap2", "ti,sysc"; + ti,hwmods = "wd_timer2"; + reg = <0x35000 0x4>, + <0x35010 0x4>, + <0x35014 0x4>; + reg-names = "rev", "sysc", "syss"; + ti,sysc-mask = <(SYSC_OMAP2_EMUFREE | + SYSC_OMAP2_SOFTRESET)>; + ti,sysc-sidle = , + , + , + ; + ti,syss-mask = <1>; + /* Domains (P, C): wkup_pwrdm, l4_wkup_clkdm */ + clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_WD_TIMER2_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x35000 0x1000>; + + wdt2: wdt@0 { + compatible = "ti,omap3-wdt"; + reg = <0x0 0x1000>; + interrupts = <91>; + }; + }; + + target-module@37000 { /* 0x44e37000, ap 31 08.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x37000 0x1000>; + }; + + target-module@39000 { /* 0x44e39000, ap 33 02.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x39000 0x1000>; + }; + + target-module@3e000 { /* 0x44e3e000, ap 35 60.0 */ + compatible = "ti,sysc-omap4-simple", "ti,sysc"; + ti,hwmods = "rtc"; + reg = <0x3e074 0x4>, + <0x3e078 0x4>; + reg-names = "rev", "sysc"; + ti,sysc-sidle = , + , + , + ; + /* Domains (P, C): rtc_pwrdm, l4_rtc_clkdm */ + clocks = <&l4_rtc_clkctrl AM3_L4_RTC_RTC_CLKCTRL 0>; + clock-names = "fck"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3e000 0x1000>; + + rtc: rtc@0 { + compatible = "ti,am3352-rtc", "ti,da830-rtc"; + reg = <0x0 0x1000>; + interrupts = <75 + 76>; + }; + }; + + target-module@40000 { /* 0x44e40000, ap 38 68.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x40000 0x40000>; + }; + }; +}; + +&l4_fw { /* 0x47c00000 */ + compatible = "ti,am33xx-l4-fw", "simple-bus"; + reg = <0x47c00000 0x800>, + <0x47c00800 0x800>, + <0x47c01000 0x400>; + reg-names = "ap", "la", "ia0"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x47c00000 0x1000000>; /* segment 0 */ + + segment@0 { /* 0x47c00000 */ + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x00000000 0x00000000 0x000800>, /* ap 0 */ + <0x00000800 0x00000800 0x000800>, /* ap 1 */ + <0x00001000 0x00001000 0x000400>, /* ap 2 */ + <0x0000c000 0x0000c000 0x001000>, /* ap 3 */ + <0x0000d000 0x0000d000 0x001000>, /* ap 4 */ + <0x0000e000 0x0000e000 0x001000>, /* ap 5 */ + <0x0000f000 0x0000f000 0x001000>, /* ap 6 */ + <0x00010000 0x00010000 0x001000>, /* ap 7 */ + <0x00011000 0x00011000 0x001000>, /* ap 8 */ + <0x0001a000 0x0001a000 0x001000>, /* ap 9 */ + <0x0001b000 0x0001b000 0x001000>, /* ap 10 */ + <0x00024000 0x00024000 0x001000>, /* ap 11 */ + <0x00025000 0x00025000 0x001000>, /* ap 12 */ + <0x00026000 0x00026000 0x001000>, /* ap 13 */ + <0x00027000 0x00027000 0x001000>, /* ap 14 */ + <0x00030000 0x00030000 0x001000>, /* ap 15 */ + <0x00031000 0x00031000 0x001000>, /* ap 16 */ + <0x00038000 0x00038000 0x001000>, /* ap 17 */ + <0x00039000 0x00039000 0x001000>, /* ap 18 */ + <0x0003a000 0x0003a000 0x001000>, /* ap 19 */ + <0x0003b000 0x0003b000 0x001000>, /* ap 20 */ + <0x0003e000 0x0003e000 0x001000>, /* ap 21 */ + <0x0003f000 0x0003f000 0x001000>, /* ap 22 */ + <0x0003c000 0x0003c000 0x001000>, /* ap 23 */ + <0x00040000 0x00040000 0x001000>, /* ap 24 */ + <0x00046000 0x00046000 0x001000>, /* ap 25 */ + <0x00047000 0x00047000 0x001000>, /* ap 26 */ + <0x00044000 0x00044000 0x001000>, /* ap 27 */ + <0x00045000 0x00045000 0x001000>, /* ap 28 */ + <0x00028000 0x00028000 0x001000>, /* ap 29 */ + <0x00029000 0x00029000 0x001000>, /* ap 30 */ + <0x00032000 0x00032000 0x001000>, /* ap 31 */ + <0x00033000 0x00033000 0x001000>, /* ap 32 */ + <0x0003d000 0x0003d000 0x001000>, /* ap 33 */ + <0x00041000 0x00041000 0x001000>, /* ap 34 */ + <0x00042000 0x00042000 0x001000>, /* ap 35 */ + <0x00043000 0x00043000 0x001000>, /* ap 36 */ + <0x00014000 0x00014000 0x001000>, /* ap 37 */ + <0x00015000 0x00015000 0x001000>; /* ap 38 */ + + target-module@c000 { /* 0x47c0c000, ap 3 04.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0xc000 0x1000>; + }; + + target-module@e000 { /* 0x47c0e000, ap 5 0c.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0xe000 0x1000>; + }; + + target-module@10000 { /* 0x47c10000, ap 7 20.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x10000 0x1000>; + }; + + target-module@14000 { /* 0x47c14000, ap 37 3c.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x14000 0x1000>; + }; + + target-module@1a000 { /* 0x47c1a000, ap 9 08.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x1a000 0x1000>; + }; + + target-module@24000 { /* 0x47c24000, ap 11 28.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x24000 0x1000>; + }; + + target-module@26000 { /* 0x47c26000, ap 13 30.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x26000 0x1000>; + }; + + target-module@28000 { /* 0x47c28000, ap 29 40.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x28000 0x1000>; + }; + + target-module@30000 { /* 0x47c30000, ap 15 14.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x30000 0x1000>; + }; + + target-module@32000 { /* 0x47c32000, ap 31 06.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x32000 0x1000>; + }; + + target-module@38000 { /* 0x47c38000, ap 17 18.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x38000 0x1000>; + }; + + target-module@3a000 { /* 0x47c3a000, ap 19 1c.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3a000 0x1000>; + }; + + target-module@3c000 { /* 0x47c3c000, ap 23 38.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3c000 0x1000>; + }; + + target-module@3e000 { /* 0x47c3e000, ap 21 10.0 */ + compatible = "ti,sysc"; + status = "disabled"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x3e000 0x1000>; + }; + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Wed Apr 10 18:58:12 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B2A41569197; Wed, 10 Apr 2019 18:58:12 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D3ED5855E4; Wed, 10 Apr 2019 18:58:11 +0000 (UTC) (envelope-from rrs@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A158326B0F; Wed, 10 Apr 2019 18:58:11 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AIwBUk097264; Wed, 10 Apr 2019 18:58:11 GMT (envelope-from rrs@FreeBSD.org) Received: (from rrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AIwB9T097263; Wed, 10 Apr 2019 18:58:11 GMT (envelope-from rrs@FreeBSD.org) Message-Id: <201904101858.x3AIwB9T097263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rrs set sender to rrs@FreeBSD.org using -f From: Randall Stewart Date: Wed, 10 Apr 2019 18:58:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346094 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: rrs X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 346094 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D3ED5855E4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 18:58:12 -0000 Author: rrs Date: Wed Apr 10 18:58:11 2019 New Revision: 346094 URL: https://svnweb.freebsd.org/changeset/base/346094 Log: Fix a small bug in the tcp_log_id where the bucket was unlocked and yet the bucket-unlock flag was not changed to false. This can cause a panic if INVARIANTS is on and we go through the right path (though rare). This fixes the correct bug :) Reported by: syzbot+179a1ad49f3c4c215fa2@syzkaller.appspotmail.com Reviewed by: tuexen@ Modified: head/sys/netinet/tcp_log_buf.c Modified: head/sys/netinet/tcp_log_buf.c ============================================================================== --- head/sys/netinet/tcp_log_buf.c Wed Apr 10 18:17:27 2019 (r346093) +++ head/sys/netinet/tcp_log_buf.c Wed Apr 10 18:58:11 2019 (r346094) @@ -752,6 +752,7 @@ refind: RECHECK_INP(); if (tp->t_lib != NULL) { TCPID_BUCKET_UNLOCK(tlb); + bucket_locked = false; tlb = NULL; goto restart; } From owner-svn-src-head@freebsd.org Wed Apr 10 19:18:06 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7C1C1569791; Wed, 10 Apr 2019 19:18:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C74385F3D; Wed, 10 Apr 2019 19:18:06 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D52426E7E; Wed, 10 Apr 2019 19:18:06 +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 x3AJI6Lr008173; Wed, 10 Apr 2019 19:18:06 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AJI6TT008172; Wed, 10 Apr 2019 19:18:06 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201904101918.x3AJI6TT008172@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 10 Apr 2019 19:18:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346095 - head/sys/dts/arm X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/dts/arm X-SVN-Commit-Revision: 346095 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5C74385F3D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 19:18:06 -0000 Author: manu Date: Wed Apr 10 19:18:05 2019 New Revision: 346095 URL: https://svnweb.freebsd.org/changeset/base/346095 Log: arm: dts: Remove some old DTS RPI is using the firmware provided DTS since 12.0 Pandaboard works with the Linux DTS RK* Exynos* and Meson*/Odroid* don't even work with current source code, if someone wants to make them work again they better use the Linux DTS. Deleted: head/sys/dts/arm/bcm2835.dtsi head/sys/dts/arm/bcm2836.dtsi head/sys/dts/arm/exynos5.dtsi head/sys/dts/arm/exynos5250-arndale.dts head/sys/dts/arm/exynos5250-snow.dts head/sys/dts/arm/exynos5250-spring.dts head/sys/dts/arm/exynos5250.dtsi head/sys/dts/arm/exynos5420-arndale-octa.dts head/sys/dts/arm/exynos5420-peach-pit.dts head/sys/dts/arm/exynos5420.dtsi head/sys/dts/arm/meson3.dtsi head/sys/dts/arm/meson8b.dtsi head/sys/dts/arm/odroidc1.dts head/sys/dts/arm/pandaboard-common.dtsi head/sys/dts/arm/pandaboard-es.dts head/sys/dts/arm/pandaboard.dts head/sys/dts/arm/rk3188-radxa-lite.dts head/sys/dts/arm/rk3188-radxa.dts head/sys/dts/arm/rk3188.dtsi head/sys/dts/arm/rpi.dts head/sys/dts/arm/rpi2.dts From owner-svn-src-head@freebsd.org Wed Apr 10 19:27:15 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B5861569F1F; Wed, 10 Apr 2019 19:27:15 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E2F6865C9; Wed, 10 Apr 2019 19:27:15 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07A4B27038; Wed, 10 Apr 2019 19:27:15 +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 x3AJREBk013139; Wed, 10 Apr 2019 19:27:14 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AJREvt013138; Wed, 10 Apr 2019 19:27:14 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201904101927.x3AJREvt013138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 10 Apr 2019 19:27:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346096 - head/sys/arm/conf X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm/conf X-SVN-Commit-Revision: 346096 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1E2F6865C9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 19:27:15 -0000 Author: manu Date: Wed Apr 10 19:27:14 2019 New Revision: 346096 URL: https://svnweb.freebsd.org/changeset/base/346096 Log: arm: kernel: Remove old kernel configs Follow up to r346095 All those kernels are either not working or the release have switched to GENERIC Deleted: head/sys/arm/conf/AML8726 head/sys/arm/conf/BEAGLEBONE head/sys/arm/conf/CHROMEBOOK head/sys/arm/conf/CHROMEBOOK-PEACH-PIT head/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints head/sys/arm/conf/CHROMEBOOK-SNOW head/sys/arm/conf/CHROMEBOOK-SPRING head/sys/arm/conf/CHROMEBOOK.hints head/sys/arm/conf/EXYNOS5.common head/sys/arm/conf/EXYNOS5250 head/sys/arm/conf/EXYNOS5420 head/sys/arm/conf/ODROIDC1 head/sys/arm/conf/PANDABOARD head/sys/arm/conf/PANDABOARD.hints head/sys/arm/conf/RADXA head/sys/arm/conf/RADXA-LITE head/sys/arm/conf/RK3188 head/sys/arm/conf/RPI2 From owner-svn-src-head@freebsd.org Wed Apr 10 19:49:37 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D267D156A7F1; Wed, 10 Apr 2019 19:49:36 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6BBD5871E9; Wed, 10 Apr 2019 19:49:36 +0000 (UTC) (envelope-from kibab@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 400CA273DC; Wed, 10 Apr 2019 19:49:36 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AJnaP8024095; Wed, 10 Apr 2019 19:49:36 GMT (envelope-from kibab@FreeBSD.org) Received: (from kibab@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AJnZ1R024092; Wed, 10 Apr 2019 19:49:35 GMT (envelope-from kibab@FreeBSD.org) Message-Id: <201904101949.x3AJnZ1R024092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kibab set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin Date: Wed, 10 Apr 2019 19:49:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346097 - in head: sbin/camcontrol sys/cam/mmc sys/dev/mmc X-SVN-Group: head X-SVN-Commit-Author: kibab X-SVN-Commit-Paths: in head: sbin/camcontrol sys/cam/mmc sys/dev/mmc X-SVN-Commit-Revision: 346097 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6BBD5871E9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 19:49:37 -0000 Author: kibab Date: Wed Apr 10 19:49:35 2019 New Revision: 346097 URL: https://svnweb.freebsd.org/changeset/base/346097 Log: Add new fields to mmc_data in preparation to SDIO CMD53 block mode support SDIO command CMD53 (IO_RW_EXTENDED) allows data transfers using blocks of 1-2048 bytes, with a maximum of 511 blocks per request. Extend mmc_data structure to properly describe such requests, and initialize the new fields in kernel and userland consumers. No actual driver changes happen yet, these will follow in the separate changes. Reviewed by: bz Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D19779 Modified: head/sbin/camcontrol/camcontrol.c head/sys/cam/mmc/mmc_da.c head/sys/dev/mmc/mmcreg.h Modified: head/sbin/camcontrol/camcontrol.c ============================================================================== --- head/sbin/camcontrol/camcontrol.c Wed Apr 10 19:27:14 2019 (r346096) +++ head/sbin/camcontrol/camcontrol.c Wed Apr 10 19:49:35 2019 (r346097) @@ -7788,6 +7788,7 @@ mmcsdcmd(struct cam_device *device, int argc, char **a flags |= CAM_DIR_IN; mmc_data = malloc(mmc_data_len); memset(mmc_data, 0, mmc_data_len); + memset(&mmc_d, 0, sizeof(mmc_d)); mmc_d.len = mmc_data_len; mmc_d.data = mmc_data; mmc_d.flags = MMC_DATA_READ; Modified: head/sys/cam/mmc/mmc_da.c ============================================================================== --- head/sys/cam/mmc/mmc_da.c Wed Apr 10 19:27:14 2019 (r346096) +++ head/sys/cam/mmc/mmc_da.c Wed Apr 10 19:49:35 2019 (r346097) @@ -791,6 +791,11 @@ sddaregister(struct cam_periph *periph, void *arg) softc->state = SDDA_STATE_INIT; softc->mmcdata = (struct mmc_data *)malloc(sizeof(struct mmc_data), M_DEVBUF, M_NOWAIT|M_ZERO); + if (softc->mmcdata == NULL) { + printf("sddaregister: Unable to probe new device. " + "Unable to allocate mmcdata\n"); + return (CAM_REQ_CMP_ERR); + } periph->softc = softc; softc->periph = periph; @@ -889,6 +894,7 @@ mmc_send_ext_csd(struct cam_periph *periph, union ccb struct mmc_data d; KASSERT(buf_len == 512, ("Buffer for ext csd must be 512 bytes")); + memset(&d, 0, sizeof(d)); d.data = rawextcsd; d.len = buf_len; d.flags = MMC_DATA_READ; @@ -1013,6 +1019,7 @@ mmc_sd_switch(struct cam_periph *periph, union ccb *cc int err; memset(res, 0, 64); + memset(&mmc_d, 0, sizeof(mmc_d)); mmc_d.len = 64; mmc_d.data = res; mmc_d.flags = MMC_DATA_READ; @@ -1804,6 +1811,7 @@ sddastart(struct cam_periph *periph, union ccb *start_ mmcio->cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC; mmcio->cmd.data = softc->mmcdata; + memset(mmcio->cmd.data, 0, sizeof(struct mmc_data)); mmcio->cmd.data->data = bp->bio_data; mmcio->cmd.data->len = 512 * count; mmcio->cmd.data->flags = (bp->bio_cmd == BIO_READ ? MMC_DATA_READ : MMC_DATA_WRITE); Modified: head/sys/dev/mmc/mmcreg.h ============================================================================== --- head/sys/dev/mmc/mmcreg.h Wed Apr 10 19:27:14 2019 (r346096) +++ head/sys/dev/mmc/mmcreg.h Wed Apr 10 19:49:35 2019 (r346097) @@ -197,7 +197,10 @@ struct mmc_data { #define MMC_DATA_READ (1UL << 1) #define MMC_DATA_STREAM (1UL << 2) #define MMC_DATA_MULTI (1UL << 3) +#define MMC_DATA_BLOCK_SIZE (1UL << 4) struct mmc_request *mrq; + size_t block_size; /* block size for CMD53 */ + size_t block_count; /* block count for CMD53 */ }; struct mmc_request { From owner-svn-src-head@freebsd.org Wed Apr 10 19:53:37 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 546E8156AB73; Wed, 10 Apr 2019 19:53:37 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0F818775E; Wed, 10 Apr 2019 19:53:36 +0000 (UTC) (envelope-from kibab@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA18F27582; Wed, 10 Apr 2019 19:53:36 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AJra4p028819; Wed, 10 Apr 2019 19:53:36 GMT (envelope-from kibab@FreeBSD.org) Received: (from kibab@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AJra1Y028818; Wed, 10 Apr 2019 19:53:36 GMT (envelope-from kibab@FreeBSD.org) Message-Id: <201904101953.x3AJra1Y028818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kibab set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin Date: Wed, 10 Apr 2019 19:53:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346098 - in head/sys: arm/allwinner dev/sdhci X-SVN-Group: head X-SVN-Commit-Author: kibab X-SVN-Commit-Paths: in head/sys: arm/allwinner dev/sdhci X-SVN-Commit-Revision: 346098 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E0F818775E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 19:53:37 -0000 Author: kibab Date: Wed Apr 10 19:53:36 2019 New Revision: 346098 URL: https://svnweb.freebsd.org/changeset/base/346098 Log: Implement CMD53 block mode support for SDHCI and AllWinner-based boards If a custom block size requested, use it, otherwise revert to the previous logic of using just a data size if it's less than MMC_BLOCK_SIZE, and MMC_BLOCK_SIZE otherwise. Reviewed by: bz Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D19783 Modified: head/sys/arm/allwinner/aw_mmc.c head/sys/dev/sdhci/sdhci.c Modified: head/sys/arm/allwinner/aw_mmc.c ============================================================================== --- head/sys/arm/allwinner/aw_mmc.c Wed Apr 10 19:49:35 2019 (r346097) +++ head/sys/arm/allwinner/aw_mmc.c Wed Apr 10 19:53:36 2019 (r346098) @@ -1104,10 +1104,17 @@ aw_mmc_request(device_t bus, device_t child, struct mm } if (cmd->data->flags & MMC_DATA_WRITE) cmdreg |= AW_MMC_CMDR_DIR_WRITE; - blksz = min(cmd->data->len, MMC_SECTOR_SIZE); - AW_MMC_WRITE_4(sc, AW_MMC_BKSR, blksz); - AW_MMC_WRITE_4(sc, AW_MMC_BYCR, cmd->data->len); +#ifdef MMCCAM + if (cmd->data->flags & MMC_DATA_BLOCK_SIZE) { + AW_MMC_WRITE_4(sc, AW_MMC_BKSR, cmd->data->block_size); + AW_MMC_WRITE_4(sc, AW_MMC_BYCR, cmd->data->len); + } else +#endif + { + AW_MMC_WRITE_4(sc, AW_MMC_BKSR, blksz); + AW_MMC_WRITE_4(sc, AW_MMC_BYCR, cmd->data->len); + } } else { imask |= AW_MMC_INT_CMD_DONE; } Modified: head/sys/dev/sdhci/sdhci.c ============================================================================== --- head/sys/dev/sdhci/sdhci.c Wed Apr 10 19:49:35 2019 (r346097) +++ head/sys/dev/sdhci/sdhci.c Wed Apr 10 19:53:36 2019 (r346098) @@ -496,7 +496,13 @@ sdhci_read_block_pio(struct sdhci_slot *slot) buffer = slot->curcmd->data->data; buffer += slot->offset; /* Transfer one block at a time. */ - left = min(512, slot->curcmd->data->len - slot->offset); +#ifdef MMCCAM + if (slot->curcmd->data->flags & MMC_DATA_BLOCK_SIZE) + left = min(slot->curcmd->data->block_size, + slot->curcmd->data->len - slot->offset); + else +#endif + left = min(512, slot->curcmd->data->len - slot->offset); slot->offset += left; /* If we are too fast, broken controllers return zeroes. */ @@ -539,7 +545,13 @@ sdhci_write_block_pio(struct sdhci_slot *slot) buffer = slot->curcmd->data->data; buffer += slot->offset; /* Transfer one block at a time. */ - left = min(512, slot->curcmd->data->len - slot->offset); +#ifdef MMCCAM + if (slot->curcmd->data->flags & MMC_DATA_BLOCK_SIZE) { + left = min(slot->curcmd->data->block_size, + slot->curcmd->data->len - slot->offset); + } else +#endif + left = min(512, slot->curcmd->data->len - slot->offset); slot->offset += left; /* Handle unaligned and aligned buffer cases. */ @@ -1623,9 +1635,9 @@ sdhci_set_transfer_mode(struct sdhci_slot *slot, const return; mode = SDHCI_TRNS_BLK_CNT_EN; - if (data->len > 512) { + if (data->len > 512 || data->block_count > 1) { mode |= SDHCI_TRNS_MULTI; - if (__predict_true( + if (data->block_count == 0 && __predict_true( #ifdef MMCCAM slot->ccb->mmcio.stop.opcode == MMC_STOP_TRANSMISSION && #else @@ -1888,11 +1900,23 @@ sdhci_start_data(struct sdhci_slot *slot, const struct } /* Current data offset for both PIO and DMA. */ slot->offset = 0; - /* Set block size and request border interrupts on the SDMA boundary. */ - blksz = SDHCI_MAKE_BLKSZ(slot->sdma_boundary, ulmin(data->len, 512)); +#ifdef MMCCAM + if (data->flags & MMC_DATA_BLOCK_SIZE) { + /* Set block size and request border interrupts on the SDMA boundary. */ + blksz = SDHCI_MAKE_BLKSZ(slot->sdma_boundary, data->block_size); + blkcnt = data->block_count; + if (__predict_false(sdhci_debug > 0)) + slot_printf(slot, "SDIO Custom block params: blksz: " + "%#10x, blk cnt: %#10x\n", blksz, blkcnt); + } else +#endif + { + /* Set block size and request border interrupts on the SDMA boundary. */ + blksz = SDHCI_MAKE_BLKSZ(slot->sdma_boundary, ulmin(data->len, 512)); + blkcnt = howmany(data->len, 512); + } + WR2(slot, SDHCI_BLOCK_SIZE, blksz); - /* Set block count. */ - blkcnt = howmany(data->len, 512); WR2(slot, SDHCI_BLOCK_COUNT, blkcnt); if (__predict_false(sdhci_debug > 1)) slot_printf(slot, "Blk size: 0x%08x | Blk cnt: 0x%08x\n", @@ -2781,10 +2805,13 @@ sdhci_cam_request(struct sdhci_slot *slot, union ccb * } */ if (__predict_false(sdhci_debug > 1)) { - slot_printf(slot, "CMD%u arg %#x flags %#x dlen %u dflags %#x\n", - mmcio->cmd.opcode, mmcio->cmd.arg, mmcio->cmd.flags, - mmcio->cmd.data != NULL ? (unsigned int) mmcio->cmd.data->len : 0, - mmcio->cmd.data != NULL ? mmcio->cmd.data->flags: 0); + slot_printf(slot, "CMD%u arg %#x flags %#x dlen %u dflags %#x " + "blksz=%zu blkcnt=%zu\n", + mmcio->cmd.opcode, mmcio->cmd.arg, mmcio->cmd.flags, + mmcio->cmd.data != NULL ? (unsigned int) mmcio->cmd.data->len : 0, + mmcio->cmd.data != NULL ? mmcio->cmd.data->flags : 0, + mmcio->cmd.data != NULL ? mmcio->cmd.data->block_size : 0, + mmcio->cmd.data != NULL ? mmcio->cmd.data->block_count : 0); } if (mmcio->cmd.data != NULL) { if (mmcio->cmd.data->len == 0 || mmcio->cmd.data->flags == 0) From owner-svn-src-head@freebsd.org Wed Apr 10 20:11:29 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5369D156B48A; Wed, 10 Apr 2019 20:11:29 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E77C3884F6; Wed, 10 Apr 2019 20:11:28 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C18472789A; Wed, 10 Apr 2019 20:11:28 +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 x3AKBSMX036433; Wed, 10 Apr 2019 20:11:28 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AKBSob036432; Wed, 10 Apr 2019 20:11:28 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201904102011.x3AKBSob036432@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 10 Apr 2019 20:11:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346099 - head/sys/modules/dtb/omap4 X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/modules/dtb/omap4 X-SVN-Commit-Revision: 346099 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E77C3884F6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 20:11:29 -0000 Author: manu Date: Wed Apr 10 20:11:28 2019 New Revision: 346099 URL: https://svnweb.freebsd.org/changeset/base/346099 Log: arm: dtb: Compile the Linux DTS for pandaboards Reported by: ci.freebsd.org Modified: head/sys/modules/dtb/omap4/Makefile Modified: head/sys/modules/dtb/omap4/Makefile ============================================================================== --- head/sys/modules/dtb/omap4/Makefile Wed Apr 10 19:53:36 2019 (r346098) +++ head/sys/modules/dtb/omap4/Makefile Wed Apr 10 20:11:28 2019 (r346099) @@ -2,11 +2,7 @@ # All the dts files for omap4 systems we support. DTS= \ omap4-duovero-parlor.dts \ - pandaboard.dts \ - pandaboard-es.dts - -LINKS= \ - ${DTBDIR}/pandaboard.dtb ${DTBDIR}/omap4-panda.dtb \ - ${DTBDIR}/pandaboard-es.dtb ${DTBDIR}/omap4-panda-es.dtb + omap4-panda.dts \ + omap4-panda-es.dts .include From owner-svn-src-head@freebsd.org Wed Apr 10 20:44:55 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4AB84156C7E4; Wed, 10 Apr 2019 20:44:55 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF2BA8A13F; Wed, 10 Apr 2019 20:44:54 +0000 (UTC) (envelope-from kibab@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6AC827E1D; Wed, 10 Apr 2019 20:44:54 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AKisPI056129; Wed, 10 Apr 2019 20:44:54 GMT (envelope-from kibab@FreeBSD.org) Received: (from kibab@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AKisPa056128; Wed, 10 Apr 2019 20:44:54 GMT (envelope-from kibab@FreeBSD.org) Message-Id: <201904102044.x3AKisPa056128@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kibab set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin Date: Wed, 10 Apr 2019 20:44:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346100 - head/sys/dev/mmc X-SVN-Group: head X-SVN-Commit-Author: kibab X-SVN-Commit-Paths: head/sys/dev/mmc X-SVN-Commit-Revision: 346100 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DF2BA8A13F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2019 20:44:55 -0000 Author: kibab Date: Wed Apr 10 20:44:54 2019 New Revision: 346100 URL: https://svnweb.freebsd.org/changeset/base/346100 Log: Add some CMD53-related definitions In preparation to adding block mode functions, add necessary definitions. Reviewed by: bz Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D19832 Modified: head/sys/dev/mmc/mmcreg.h Modified: head/sys/dev/mmc/mmcreg.h ============================================================================== --- head/sys/dev/mmc/mmcreg.h Wed Apr 10 20:11:28 2019 (r346099) +++ head/sys/dev/mmc/mmcreg.h Wed Apr 10 20:44:54 2019 (r346100) @@ -549,30 +549,39 @@ struct mmc_request { #define SD_IO_RW_LEN(x) (((x) & 0xFF) << 0) #define SD_IOE_RW_LEN(x) (((x) & 0x1FF) << 0) +#define SD_IOE_RW_ADR(x) (((x) & 0x1FFFF) << 9) +#define SD_IOE_RW_INCR (1u << 26) #define SD_IOE_RW_BLK (1u << 27) +#define SD_IOE_RW_FUNC(x) (((x) & 0x7) << 28) +#define SD_IOE_RW_WR (1u << 31) /* Card Common Control Registers (CCCR) */ -#define SD_IO_CCCR_START 0x00000 -#define SD_IO_CCCR_SIZE 0x100 -#define SD_IO_CCCR_FN_ENABLE 0x02 -#define SD_IO_CCCR_FN_READY 0x03 -#define SD_IO_CCCR_INT_ENABLE 0x04 -#define SD_IO_CCCR_INT_PENDING 0x05 -#define SD_IO_CCCR_CTL 0x06 -#define CCCR_CTL_RES (1 << 3) -#define SD_IO_CCCR_BUS_WIDTH 0x07 +#define SD_IO_CCCR_START 0x00000 /* Offset in F0 address space */ +#define SD_IO_CCCR_SIZE 0x100 /* Total size of CCCR */ +#define SD_IO_CCCR_FN_ENABLE 0x02 /* Enabled functions */ +#define SD_IO_CCCR_FN_READY 0x03 /* Function ready status */ +#define SD_IO_CCCR_INT_ENABLE 0x04 /* Per-function interrupt enable */ +#define SD_IO_CCCR_INT_PENDING 0x05 /* Per-function interrupt pending */ +#define SD_IO_CCCR_CTL 0x06 /* I/O Abort register */ +#define CCCR_CTL_RES (1 << 3) /* Perform SDIO reset */ +#define SD_IO_CCCR_BUS_WIDTH 0x07 /* Bus Width register */ #define CCCR_BUS_WIDTH_4 (1 << 1) #define CCCR_BUS_WIDTH_1 (1 << 0) -#define SD_IO_CCCR_CARDCAP 0x08 -#define SD_IO_CCCR_CISPTR 0x09 /* XXX 9-10, 10-11, or 9-12 */ - +#define SD_IO_CCCR_CARDCAP 0x08 /* SDIO card capabilities */ +#define CCCR_CC_SMB (1 << 1) /* CMD53 block mode support */ +#define SD_IO_CCCR_CISPTR 0x09 /* 0x09 - 0x0B */ +#define SD_IO_CCCR_FN0_BLKSZ 0x10 /* 0x10 - 0x11 */ /* Function Basic Registers (FBR) */ -#define SD_IO_FBR_START 0x00100 -#define SD_IO_FBR_SIZE 0x00700 +#define SD_IO_FBR_START 0x00100 /* Offset in F0 address space */ +#define SD_IO_FBR_SIZE 0x00700 /* Total size of FBR */ +#define SD_IO_FBR_F_SIZE 0x00100 /* Size of each function */ +#define SD_IO_FBR_START_F(n) (SD_IO_FBR_START + (n-1) * SD_IO_FBR_F_SIZE) +#define SD_IO_FBR_CIS_OFFSET 0x9 /* Offset of this function's info block within CIS area */ +#define SD_IO_FBR_IOBLKSZ 0x10 /* Block size for CMD53 block mode operations */ /* Card Information Structure (CIS) */ -#define SD_IO_CIS_START 0x01000 -#define SD_IO_CIS_SIZE 0x17000 +#define SD_IO_CIS_START 0x01000 /* Offset in F0 address space */ +#define SD_IO_CIS_SIZE 0x17000 /* Total size of CIS */ /* CIS tuple codes (based on PC Card 16) */ #define SD_IO_CISTPL_VERS_1 0x15 From owner-svn-src-head@freebsd.org Thu Apr 11 00:39:08 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B9F91571E79; Thu, 11 Apr 2019 00:39:08 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A23926BDF4; Thu, 11 Apr 2019 00:39:07 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 439FE254E; Thu, 11 Apr 2019 00:39:07 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3B0d6hh079354; Thu, 11 Apr 2019 00:39:06 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3B0d6ES079353; Thu, 11 Apr 2019 00:39:06 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201904110039.x3B0d6ES079353@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Thu, 11 Apr 2019 00:39:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346110 - head/usr.bin/sort X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/usr.bin/sort X-SVN-Commit-Revision: 346110 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A23926BDF4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.93)[-0.934,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 00:39:08 -0000 Author: cem Date: Thu Apr 11 00:39:06 2019 New Revision: 346110 URL: https://svnweb.freebsd.org/changeset/base/346110 Log: sort(1): Whitespace and style cleanup No functional change. Sponsored by: Dell EMC Isilon Modified: head/usr.bin/sort/sort.c Modified: head/usr.bin/sort/sort.c ============================================================================== --- head/usr.bin/sort/sort.c Wed Apr 10 22:26:59 2019 (r346109) +++ head/usr.bin/sort/sort.c Thu Apr 11 00:39:06 2019 (r346110) @@ -566,55 +566,57 @@ static bool set_sort_modifier(struct sort_mods *sm, int c) { - if (sm) { - switch (c){ - case 'b': - sm->bflag = true; - break; - case 'd': - sm->dflag = true; - break; - case 'f': - sm->fflag = true; - break; - case 'g': - sm->gflag = true; - need_hint = true; - break; - case 'i': - sm->iflag = true; - break; - case 'R': - sm->Rflag = true; - need_random = true; - break; - case 'M': - initialise_months(); - sm->Mflag = true; - need_hint = true; - break; - case 'n': - sm->nflag = true; - need_hint = true; - print_symbols_on_debug = true; - break; - case 'r': - sm->rflag = true; - break; - case 'V': - sm->Vflag = true; - break; - case 'h': - sm->hflag = true; - need_hint = true; - print_symbols_on_debug = true; - break; - default: - return false; - } - sort_opts_vals.complex_sort = true; - sm->func = get_sort_func(sm); + if (sm == NULL) + return (true); + + switch (c){ + case 'b': + sm->bflag = true; + break; + case 'd': + sm->dflag = true; + break; + case 'f': + sm->fflag = true; + break; + case 'g': + sm->gflag = true; + need_hint = true; + break; + case 'i': + sm->iflag = true; + break; + case 'R': + sm->Rflag = true; + need_random = true; + break; + case 'M': + initialise_months(); + sm->Mflag = true; + need_hint = true; + break; + case 'n': + sm->nflag = true; + need_hint = true; + print_symbols_on_debug = true; + break; + case 'r': + sm->rflag = true; + break; + case 'V': + sm->Vflag = true; + break; + case 'h': + sm->hflag = true; + need_hint = true; + print_symbols_on_debug = true; + break; + default: + return (false); } + + sort_opts_vals.complex_sort = true; + sm->func = get_sort_func(sm); return (true); } @@ -910,54 +912,50 @@ fix_obsolete_keys(int *argc, char **argv) static void set_random_seed(void) { - if (need_random) { + if (strcmp(random_source, DEFAULT_RANDOM_SORT_SEED_FILE) == 0) { + FILE* fseed; + MD5_CTX ctx; + char rsd[MAX_DEFAULT_RANDOM_SEED_DATA_SIZE]; + size_t sz = 0; - if (strcmp(random_source, DEFAULT_RANDOM_SORT_SEED_FILE) == 0) { - FILE* fseed; - MD5_CTX ctx; - char rsd[MAX_DEFAULT_RANDOM_SEED_DATA_SIZE]; - size_t sz = 0; + fseed = openfile(random_source, "r"); + while (!feof(fseed)) { + int cr; - fseed = openfile(random_source, "r"); - while (!feof(fseed)) { - int cr; + cr = fgetc(fseed); + if (cr == EOF) + break; - cr = fgetc(fseed); - if (cr == EOF) - break; + rsd[sz++] = (char) cr; - rsd[sz++] = (char) cr; + if (sz >= MAX_DEFAULT_RANDOM_SEED_DATA_SIZE) + break; + } - if (sz >= MAX_DEFAULT_RANDOM_SEED_DATA_SIZE) - break; - } + closefile(fseed, random_source); - closefile(fseed, random_source); + MD5Init(&ctx); + MD5Update(&ctx, rsd, sz); - MD5Init(&ctx); - MD5Update(&ctx, rsd, sz); + random_seed = MD5End(&ctx, NULL); + random_seed_size = strlen(random_seed); - random_seed = MD5End(&ctx, NULL); - random_seed_size = strlen(random_seed); + } else { + MD5_CTX ctx; + char *b; - } else { - MD5_CTX ctx; - char *b; + MD5Init(&ctx); + b = MD5File(random_source, NULL); + if (b == NULL) + err(2, NULL); - MD5Init(&ctx); - b = MD5File(random_source, NULL); - if (b == NULL) - err(2, NULL); - - random_seed = b; - random_seed_size = strlen(b); - } - - MD5Init(&md5_ctx); - if(random_seed_size>0) { - MD5Update(&md5_ctx, random_seed, random_seed_size); - } + random_seed = b; + random_seed_size = strlen(b); } + MD5Init(&md5_ctx); + if(random_seed_size>0) { + MD5Update(&md5_ctx, random_seed, random_seed_size); + } } /* @@ -1226,7 +1224,8 @@ main(int argc, char **argv) } } - set_random_seed(); + if (need_random) + set_random_seed(); /* Case when the outfile equals one of the input files: */ if (strcmp(outfile, "-")) { From owner-svn-src-head@freebsd.org Thu Apr 11 03:47:54 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D261A1576F42; Thu, 11 Apr 2019 03:47:54 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 73A4072283; Thu, 11 Apr 2019 03:47:54 +0000 (UTC) (envelope-from oshogbo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BB7B494F; Thu, 11 Apr 2019 03:47:54 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3B3lsT2080895; Thu, 11 Apr 2019 03:47:54 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3B3lsnf080894; Thu, 11 Apr 2019 03:47:54 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904110347.x3B3lsnf080894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Thu, 11 Apr 2019 03:47:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346112 - head/sys/contrib/libnv X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/contrib/libnv X-SVN-Commit-Revision: 346112 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 73A4072283 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 03:47:55 -0000 Author: oshogbo Date: Thu Apr 11 03:47:53 2019 New Revision: 346112 URL: https://svnweb.freebsd.org/changeset/base/346112 Log: libnv: fix compilation warnings When building libnv without a debug those arguments are no longer used because assertions will be changed to NOP. Submitted by: Mindaugas Rasiukevicius MFC after: 2 weeks Modified: head/sys/contrib/libnv/nvlist.c Modified: head/sys/contrib/libnv/nvlist.c ============================================================================== --- head/sys/contrib/libnv/nvlist.c Thu Apr 11 00:41:07 2019 (r346111) +++ head/sys/contrib/libnv/nvlist.c Thu Apr 11 03:47:53 2019 (r346112) @@ -324,7 +324,7 @@ nvlist_set_flags(nvlist_t *nvl, int flags) nvl->nvl_flags = flags; } -void +static void nvlist_report_missing(int type, const char *name) { @@ -1374,7 +1374,7 @@ nvlist_first_nvpair(const nvlist_t *nvl) } nvpair_t * -nvlist_next_nvpair(const nvlist_t *nvl, const nvpair_t *nvp) +nvlist_next_nvpair(const nvlist_t *nvl __unused, const nvpair_t *nvp) { nvpair_t *retnvp; @@ -1390,7 +1390,7 @@ nvlist_next_nvpair(const nvlist_t *nvl, const nvpair_t } nvpair_t * -nvlist_prev_nvpair(const nvlist_t *nvl, const nvpair_t *nvp) +nvlist_prev_nvpair(const nvlist_t *nvl __unused, const nvpair_t *nvp) { nvpair_t *retnvp; From owner-svn-src-head@freebsd.org Thu Apr 11 04:21:59 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7F76157809E; Thu, 11 Apr 2019 04:21:59 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6DBD473752; Thu, 11 Apr 2019 04:21:59 +0000 (UTC) (envelope-from oshogbo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 464D55013; Thu, 11 Apr 2019 04:21:59 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3B4Lxn2001149; Thu, 11 Apr 2019 04:21:59 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3B4Lxpf001148; Thu, 11 Apr 2019 04:21:59 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904110421.x3B4Lxpf001148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Thu, 11 Apr 2019 04:21:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346113 - head/sys/contrib/libnv X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/contrib/libnv X-SVN-Commit-Revision: 346113 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6DBD473752 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 04:22:00 -0000 Author: oshogbo Date: Thu Apr 11 04:21:58 2019 New Revision: 346113 URL: https://svnweb.freebsd.org/changeset/base/346113 Log: libnv: fix compilation warnings When building libnv without a debug those arguments are no longer used because assertions will be changed to NOP. Submitted by: Mindaugas Rasiukevicius MFC after: 2 weeks Modified: head/sys/contrib/libnv/nvpair.c Modified: head/sys/contrib/libnv/nvpair.c ============================================================================== --- head/sys/contrib/libnv/nvpair.c Thu Apr 11 03:47:53 2019 (r346112) +++ head/sys/contrib/libnv/nvpair.c Thu Apr 11 04:21:58 2019 (r346113) @@ -108,7 +108,7 @@ struct nvpair_header { void -nvpair_assert(const nvpair_t *nvp) +nvpair_assert(const nvpair_t *nvp __unused) { NVPAIR_ASSERT(nvp); @@ -235,7 +235,8 @@ nvpair_remove_nvlist_array(nvpair_t *nvp) } void -nvpair_remove(struct nvl_head *head, nvpair_t *nvp, const nvlist_t *nvl) +nvpair_remove(struct nvl_head *head, nvpair_t *nvp, + const nvlist_t *nvl __unused) { NVPAIR_ASSERT(nvp); @@ -359,7 +360,7 @@ nvpair_pack_header(const nvpair_t *nvp, unsigned char } unsigned char * -nvpair_pack_null(const nvpair_t *nvp, unsigned char *ptr, +nvpair_pack_null(const nvpair_t *nvp __unused, unsigned char *ptr, size_t *leftp __unused) { From owner-svn-src-head@freebsd.org Thu Apr 11 04:22:17 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CF2015780BF; Thu, 11 Apr 2019 04:22:17 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2CAB737E2; Thu, 11 Apr 2019 04:22:08 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEF81501A; Thu, 11 Apr 2019 04:22:06 +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 x3B4M6n2001224; Thu, 11 Apr 2019 04:22:06 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3B4M6hB001223; Thu, 11 Apr 2019 04:22:06 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201904110422.x3B4M6hB001223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 11 Apr 2019 04:22:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346114 - head/sys/contrib/ipfilter/netinet X-SVN-Group: head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/sys/contrib/ipfilter/netinet X-SVN-Commit-Revision: 346114 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F2CAB737E2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 04:22:17 -0000 Author: cy Date: Thu Apr 11 04:22:06 2019 New Revision: 346114 URL: https://svnweb.freebsd.org/changeset/base/346114 Log: Catch up to r343631: Avoid "pfil: duplicate hook" due to ipf_check_wrapper and ipf_check_wrapper6 being registered under the same pa_rulename. MFC after: 3 days Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Apr 11 04:21:58 2019 (r346113) +++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Thu Apr 11 04:22:06 2019 (r346114) @@ -1344,13 +1344,14 @@ int ipf_pfil_hook(void) { pha.pa_version = PFIL_VERSION; pha.pa_flags = PFIL_IN | PFIL_OUT; pha.pa_modname = "ipfilter"; - pha.pa_rulname = "default"; + pha.pa_rulname = "default-ip4"; pha.pa_func = ipf_check_wrapper; pha.pa_ruleset = NULL; pha.pa_type = PFIL_TYPE_IP4; V_ipf_inet_hook = pfil_add_hook(&pha); #ifdef USE_INET6 + pha.pa_rulname = "default-ip6"; pha.pa_func = ipf_check_wrapper6; pha.pa_type = PFIL_TYPE_IP6; V_ipf_inet6_hook = pfil_add_hook(&pha); From owner-svn-src-head@freebsd.org Thu Apr 11 04:24:42 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6DA5B157819E; Thu, 11 Apr 2019 04:24:42 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1370773A8B; Thu, 11 Apr 2019 04:24:42 +0000 (UTC) (envelope-from oshogbo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DFC375047; Thu, 11 Apr 2019 04:24:41 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3B4Of9b002089; Thu, 11 Apr 2019 04:24:41 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3B4Ofnq002088; Thu, 11 Apr 2019 04:24:41 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904110424.x3B4Ofnq002088@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Thu, 11 Apr 2019 04:24:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346115 - head/sys/contrib/libnv X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/contrib/libnv X-SVN-Commit-Revision: 346115 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1370773A8B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 04:24:42 -0000 Author: oshogbo Date: Thu Apr 11 04:24:41 2019 New Revision: 346115 URL: https://svnweb.freebsd.org/changeset/base/346115 Log: The nvlist_report_missing is also used by the cnvlist. It can't be a static one. Reported by: jenkins MFC after: 2 weeks Modified: head/sys/contrib/libnv/nvlist.c Modified: head/sys/contrib/libnv/nvlist.c ============================================================================== --- head/sys/contrib/libnv/nvlist.c Thu Apr 11 04:22:06 2019 (r346114) +++ head/sys/contrib/libnv/nvlist.c Thu Apr 11 04:24:41 2019 (r346115) @@ -324,7 +324,7 @@ nvlist_set_flags(nvlist_t *nvl, int flags) nvl->nvl_flags = flags; } -static void +void nvlist_report_missing(int type, const char *name) { From owner-svn-src-head@freebsd.org Thu Apr 11 04:51:22 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28B5D1578F29; Thu, 11 Apr 2019 04:51:22 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (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 CDD91751FF; Thu, 11 Apr 2019 04:51:20 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id ERgChEVcTldkPERgDhlZuz; Wed, 10 Apr 2019 22:51:18 -0600 X-Authority-Analysis: v=2.3 cv=Ko4zJleN c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=oexKYjalfGEA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=V8c2EHtL5EFWLsulWI4A: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 9A26139F; Wed, 10 Apr 2019 21:51:15 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x3B4pFlq095014; Wed, 10 Apr 2019 21:51:15 -0700 (PDT) (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 x3B4pERf094471; Wed, 10 Apr 2019 21:51:14 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201904110451.x3B4pERf094471@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.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346114 - head/sys/contrib/ipfilter/netinet In-Reply-To: Message from Cy Schubert of "Thu, 11 Apr 2019 04:22:06 -0000." <201904110422.x3B4M6hB001223@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 10 Apr 2019 21:51:14 -0700 X-CMAE-Envelope: MS4wfF/xffuA8Aa5Kls5uG+t69bhbOxJWTlkl5aRSij03IIIbMuP8qvsSqHXqP6K5LBdjJTNTVWa50NbJ0SOUmxy+x+9XzW5y8Cbl0SRrTWtxKceGfFhJPFo Ck1gYsiafRAYj4ooqV4Ruf8zbJSoju2fdnQNhorJJRDhpEor17Imm4wNcrf3ss+BfuW3bb0AIiFghnooMnd0PyBbx8Z+3unjYdSu0oAvJdlTU8pc26mmVKad s2nU+Woq8iRJbFFftdtmLTyHYYRDfad7S0ZyzgvK1Qm2R0yKrC+hng2WdTG9c7+v X-Rspamd-Queue-Id: CDD91751FF X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-4.67 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.zen.spamhaus.org : 127.0.0.11]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; TO_DN_SOME(0.00)[]; REPLYTO_EQ_FROM(0.00)[]; IP_SCORE(-2.51)[ip: (-6.92), ipnet: 64.59.128.0/20(-3.11), asn: 6327(-2.41), country: CA(-0.09)]; MX_GOOD(-0.01)[cached: spqr.komquats.com]; NEURAL_HAM_SHORT(-0.45)[-0.450,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[13.134.59.64.list.dnswl.org : 127.0.5.1] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 04:51:22 -0000 In message <201904110422.x3B4M6hB001223@repo.freebsd.org>, Cy Schubert writes: > Author: cy > Date: Thu Apr 11 04:22:06 2019 > New Revision: 346114 > URL: https://svnweb.freebsd.org/changeset/base/346114 > > Log: > Catch up to r343631: Avoid "pfil: duplicate hook" due to > ipf_check_wrapper and ipf_check_wrapper6 being registered > under the same pa_rulename. > > MFC after: 3 days This doesn't need to be MFCed after all. It won't hurt if it is but it would be pointless as the r343631 itself hasn't been MFCed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-src-head@freebsd.org Thu Apr 11 05:08:50 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A949D15797F5; Thu, 11 Apr 2019 05:08:50 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 434DE75DBB; Thu, 11 Apr 2019 05:08:50 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 290985725; Thu, 11 Apr 2019 05:08:50 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3B58n2T023792; Thu, 11 Apr 2019 05:08:49 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3B58nFT023791; Thu, 11 Apr 2019 05:08:49 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201904110508.x3B58nFT023791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Thu, 11 Apr 2019 05:08:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346116 - head/usr.bin/sort X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/usr.bin/sort X-SVN-Commit-Revision: 346116 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 434DE75DBB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 05:08:51 -0000 Author: cem Date: Thu Apr 11 05:08:49 2019 New Revision: 346116 URL: https://svnweb.freebsd.org/changeset/base/346116 Log: sort(1): Simplify and bound random seeding Bound input file processing length to avoid the issue reported in [1]. For simplicity, only allow regular file and character device inputs. For character devices, only allow /dev/random (and /dev/urandom symblink). 32 bytes of random is perfectly sufficient to seed MD5; we don't need any more. Users that want to use large files as seeds are encouraged to truncate those files down to an appropriate input file via tools like sha256(1). (This does not change the sort algorithm of sort -R.) [1]: https://lists.freebsd.org/pipermail/freebsd-hackers/2018-August/053152.html PR: 230792 Reported by: Ali Abdallah Relnotes: yes Modified: head/usr.bin/sort/sort.c Modified: head/usr.bin/sort/sort.c ============================================================================== --- head/usr.bin/sort/sort.c Thu Apr 11 04:24:41 2019 (r346115) +++ head/usr.bin/sort/sort.c Thu Apr 11 05:08:49 2019 (r346116) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -61,13 +62,7 @@ nl_catd catalog; #define OPTIONS "bcCdfghik:Mmno:RrsS:t:T:uVz" -#define DEFAULT_RANDOM_SORT_SEED_FILE ("/dev/random") -#define MAX_DEFAULT_RANDOM_SEED_DATA_SIZE (1024) - static bool need_random; -static const char *random_source = DEFAULT_RANDOM_SORT_SEED_FILE; -static const void *random_seed; -static size_t random_seed_size; MD5_CTX md5_ctx; @@ -907,55 +902,76 @@ fix_obsolete_keys(int *argc, char **argv) } /* - * Set random seed + * Seed random sort */ static void -set_random_seed(void) +get_random_seed(const char *random_source) { - if (strcmp(random_source, DEFAULT_RANDOM_SORT_SEED_FILE) == 0) { - FILE* fseed; - MD5_CTX ctx; - char rsd[MAX_DEFAULT_RANDOM_SEED_DATA_SIZE]; - size_t sz = 0; + char randseed[32]; + struct stat fsb, rsb; + ssize_t rd; + int rsfd; - fseed = openfile(random_source, "r"); - while (!feof(fseed)) { - int cr; + rsfd = -1; + rd = sizeof(randseed); - cr = fgetc(fseed); - if (cr == EOF) - break; + if (random_source == NULL) { + if (getentropy(randseed, sizeof(randseed)) < 0) + err(EX_SOFTWARE, "getentropy"); + goto out; + } - rsd[sz++] = (char) cr; + rsfd = open(random_source, O_RDONLY | O_CLOEXEC); + if (rsfd < 0) + err(EX_NOINPUT, "open: %s", random_source); - if (sz >= MAX_DEFAULT_RANDOM_SEED_DATA_SIZE) - break; - } + if (fstat(rsfd, &fsb) != 0) + err(EX_SOFTWARE, "fstat"); - closefile(fseed, random_source); + if (!S_ISREG(fsb.st_mode) && !S_ISCHR(fsb.st_mode)) + err(EX_USAGE, + "random seed isn't a regular file or /dev/random"); - MD5Init(&ctx); - MD5Update(&ctx, rsd, sz); + /* + * Regular files: read up to maximum seed size and explicitly + * reject longer files. + */ + if (S_ISREG(fsb.st_mode)) { + if (fsb.st_size > (off_t)sizeof(randseed)) + errx(EX_USAGE, "random seed is too large (%jd >" + " %zu)!", (intmax_t)fsb.st_size, + sizeof(randseed)); + else if (fsb.st_size < 1) + errx(EX_USAGE, "random seed is too small (" + "0 bytes)"); - random_seed = MD5End(&ctx, NULL); - random_seed_size = strlen(random_seed); + memset(randseed, 0, sizeof(randseed)); - } else { - MD5_CTX ctx; - char *b; + rd = read(rsfd, randseed, fsb.st_size); + if (rd < 0) + err(EX_SOFTWARE, "reading random seed file %s", + random_source); + if (rd < (ssize_t)fsb.st_size) + errx(EX_SOFTWARE, "short read from %s", random_source); + } else if (S_ISCHR(fsb.st_mode)) { + if (stat("/dev/random", &rsb) < 0) + err(EX_SOFTWARE, "stat"); - MD5Init(&ctx); - b = MD5File(random_source, NULL); - if (b == NULL) - err(2, NULL); + if (fsb.st_dev != rsb.st_dev || + fsb.st_ino != rsb.st_ino) + errx(EX_USAGE, "random seed is a character " + "device other than /dev/random"); - random_seed = b; - random_seed_size = strlen(b); + if (getentropy(randseed, sizeof(randseed)) < 0) + err(EX_SOFTWARE, "getentropy"); } + +out: + if (rsfd >= 0) + close(rsfd); + MD5Init(&md5_ctx); - if(random_seed_size>0) { - MD5Update(&md5_ctx, random_seed, random_seed_size); - } + MD5Update(&md5_ctx, randseed, rd); } /* @@ -965,6 +981,7 @@ int main(int argc, char **argv) { char *outfile, *real_outfile; + char *random_source = NULL; int c, result; bool mef_flags[NUMBER_OF_MUTUALLY_EXCLUSIVE_FLAGS] = { false, false, false, false, false, false }; @@ -1225,7 +1242,7 @@ main(int argc, char **argv) } if (need_random) - set_random_seed(); + get_random_seed(random_source); /* Case when the outfile equals one of the input files: */ if (strcmp(outfile, "-")) { From owner-svn-src-head@freebsd.org Thu Apr 11 08:01:01 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F2BB157D22B; Thu, 11 Apr 2019 08:01:01 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C9FD083A5D; Thu, 11 Apr 2019 08:01:00 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8089D73F4; Thu, 11 Apr 2019 08:01:00 +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 x3B810tX013701; Thu, 11 Apr 2019 08:01:00 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3B810P1013695; Thu, 11 Apr 2019 08:01:00 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201904110801.x3B810P1013695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 11 Apr 2019 08:01:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346118 - in head/sys: netinet netinet6 X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys: netinet netinet6 X-SVN-Commit-Revision: 346118 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C9FD083A5D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 08:01:01 -0000 Author: markj Date: Thu Apr 11 08:00:59 2019 New Revision: 346118 URL: https://svnweb.freebsd.org/changeset/base/346118 Log: Reinitialize multicast source filter structures after invalidation. When leaving a multicast group, a hole may be created in the inpcb's source filter and group membership arrays. To remove the hole, the succeeding array elements are copied over by one entry. The multicast code expects that a newly allocated array element is initialized, but the code which shifts a tail of the array was leaving stale data in the final entry. Fix this by explicitly reinitializing the last entry following such a copy. Reported by: syzbot+f8c3c564ee21d650475e@syzkaller.appspotmail.com Reviewed by: ae MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19872 Modified: head/sys/netinet/in_mcast.c head/sys/netinet6/in6_mcast.c Modified: head/sys/netinet/in_mcast.c ============================================================================== --- head/sys/netinet/in_mcast.c Thu Apr 11 05:11:02 2019 (r346117) +++ head/sys/netinet/in_mcast.c Thu Apr 11 08:00:59 2019 (r346118) @@ -2556,10 +2556,14 @@ out_in_multi_locked: if (is_final) { /* Remove the gap in the membership and filter array. */ + KASSERT(RB_EMPTY(&imf->imf_sources), + ("%s: imf_sources not empty", __func__)); for (++idx; idx < imo->imo_num_memberships; ++idx) { - imo->imo_membership[idx-1] = imo->imo_membership[idx]; - imo->imo_mfilters[idx-1] = imo->imo_mfilters[idx]; + imo->imo_membership[idx - 1] = imo->imo_membership[idx]; + imo->imo_mfilters[idx - 1] = imo->imo_mfilters[idx]; } + imf_init(&imo->imo_mfilters[idx - 1], MCAST_UNDEFINED, + MCAST_EXCLUDE); imo->imo_num_memberships--; } Modified: head/sys/netinet6/in6_mcast.c ============================================================================== --- head/sys/netinet6/in6_mcast.c Thu Apr 11 05:11:02 2019 (r346117) +++ head/sys/netinet6/in6_mcast.c Thu Apr 11 08:00:59 2019 (r346118) @@ -2470,10 +2470,14 @@ in6p_leave_group(struct inpcb *inp, struct sockopt *so if (is_final) { /* Remove the gap in the membership array. */ + KASSERT(RB_EMPTY(&imf->im6f_sources), + ("%s: im6f_sources not empty", __func__)); for (++idx; idx < imo->im6o_num_memberships; ++idx) { - imo->im6o_membership[idx-1] = imo->im6o_membership[idx]; - imo->im6o_mfilters[idx-1] = imo->im6o_mfilters[idx]; + imo->im6o_membership[idx - 1] = imo->im6o_membership[idx]; + imo->im6o_mfilters[idx - 1] = imo->im6o_mfilters[idx]; } + im6f_init(&imo->im6o_mfilters[idx - 1], MCAST_UNDEFINED, + MCAST_EXCLUDE); imo->im6o_num_memberships--; } From owner-svn-src-head@freebsd.org Thu Apr 11 11:21:46 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EC50158133B; Thu, 11 Apr 2019 11:21:46 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 33DE7899E6; Thu, 11 Apr 2019 11:21:46 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F405B972A; Thu, 11 Apr 2019 11:21:45 +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 x3BBLjW0023088; Thu, 11 Apr 2019 11:21:45 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3BBLj2K023087; Thu, 11 Apr 2019 11:21:45 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904111121.x3BBLj2K023087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 11 Apr 2019 11:21:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346120 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 346120 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 33DE7899E6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 11:21:46 -0000 Author: trasz Date: Thu Apr 11 11:21:45 2019 New Revision: 346120 URL: https://svnweb.freebsd.org/changeset/base/346120 Log: Use shared vnode locks for the ELF interpreter. Reviewed by: kib MFC after: 2 weeks Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D19874 Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Thu Apr 11 08:06:45 2019 (r346119) +++ head/sys/kern/imgact_elf.c Thu Apr 11 11:21:45 2019 (r346120) @@ -716,7 +716,7 @@ __elfN(load_file)(struct proc *p, const char *file, u_ struct nameidata *nd; struct vattr *attr; struct image_params *imgp; - u_long rbase; + u_long flags, rbase; u_long base_addr = 0; int error; @@ -744,7 +744,10 @@ __elfN(load_file)(struct proc *p, const char *file, u_ imgp->object = NULL; imgp->execlabel = NULL; - NDINIT(nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_SYSSPACE, file, curthread); + flags = FOLLOW | LOCKSHARED | LOCKLEAF; + +again: + NDINIT(nd, LOOKUP, flags, UIO_SYSSPACE, file, curthread); if ((error = namei(nd)) != 0) { nd->ni_vp = NULL; goto fail; @@ -759,15 +762,30 @@ __elfN(load_file)(struct proc *p, const char *file, u_ if (error) goto fail; + /* + * Also make certain that the interpreter stays the same, + * so set its VV_TEXT flag, too. Since this function is only + * used to load the interpreter, the VV_TEXT is almost always + * already set. + */ + if (VOP_IS_TEXT(nd->ni_vp) == 0) { + if (VOP_ISLOCKED(nd->ni_vp) != LK_EXCLUSIVE) { + /* + * LK_UPGRADE could have resulted in dropping + * the lock. Just try again from the start, + * this time with exclusive vnode lock. + */ + vput(nd->ni_vp); + flags &= ~LOCKSHARED; + goto again; + } + + VOP_SET_TEXT(nd->ni_vp); + } + error = exec_map_first_page(imgp); if (error) goto fail; - - /* - * Also make certain that the interpreter stays the same, so set - * its VV_TEXT flag, too. - */ - VOP_SET_TEXT(nd->ni_vp); imgp->object = nd->ni_vp->v_object; From owner-svn-src-head@freebsd.org Thu Apr 11 13:01:27 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A14881583F52; Thu, 11 Apr 2019 13:01:27 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E47BD8D2DE; Thu, 11 Apr 2019 13:01:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE41BA7C1; Thu, 11 Apr 2019 13:01: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 x3BD1QZI073524; Thu, 11 Apr 2019 13:01:26 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3BD1QZr073523; Thu, 11 Apr 2019 13:01:26 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201904111301.x3BD1QZr073523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 11 Apr 2019 13:01:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346121 - head X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 346121 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E47BD8D2DE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 13:01:27 -0000 Author: emaste Date: Thu Apr 11 13:01:26 2019 New Revision: 346121 URL: https://svnweb.freebsd.org/changeset/base/346121 Log: Cirrus-CI: pass OVMF env var to test script for upcoming changes In review D19876 ian@ has some proposed improvements to the tools/boot/ci-qemu-test.sh script. Start specifying the location of OVMF.fd fetched by the Cirrus-CI build in advance of those changes. Modified: head/.cirrus.yml Modified: head/.cirrus.yml ============================================================================== --- head/.cirrus.yml Thu Apr 11 11:21:45 2019 (r346120) +++ head/.cirrus.yml Thu Apr 11 13:01:26 2019 (r346121) @@ -16,4 +16,4 @@ task: script: - make -j$(sysctl -n hw.ncpu) WITHOUT_TOOLCHAIN=yes buildworld buildkernel test_script: - - sh tools/boot/ci-qemu-test.sh + - OVMF=$(pwd)/OVMF.fd sh tools/boot/ci-qemu-test.sh From owner-svn-src-head@freebsd.org Thu Apr 11 13:26:30 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51DE41584D86; Thu, 11 Apr 2019 13:26:30 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E8C648EC81; Thu, 11 Apr 2019 13:26:29 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C02C4ABB6; Thu, 11 Apr 2019 13:26:29 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3BDQTAa086821; Thu, 11 Apr 2019 13:26:29 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3BDQSAA086815; Thu, 11 Apr 2019 13:26:28 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201904111326.x3BDQSAA086815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 11 Apr 2019 13:26:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346132 - in head/stand: efi/fdt fdt powerpc/kboot powerpc/ofw uboot/fdt X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/stand: efi/fdt fdt powerpc/kboot powerpc/ofw uboot/fdt X-SVN-Commit-Revision: 346132 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E8C648EC81 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 13:26:30 -0000 Author: kevans Date: Thu Apr 11 13:26:28 2019 New Revision: 346132 URL: https://svnweb.freebsd.org/changeset/base/346132 Log: stand: refactor overlay loading a little bit It was pointed out that manually loading a .dtb to be used rather than relying on platform-specific method for loading .dtb will result in overlays not being applied. This was true because overlay loading was hacked into fdt_platform_load_dtb, rather than done in a way more independent from how the .dtb is loaded. Instead, push overlay loading (for now) out into an fdt_platform_load_overlays. This method easily allows ubldr to pull in any fdt_overlays specified in the ub env, and omits overlay-checking on platforms where they're not tested and/or not desired (e.g. powerpc). If we eventually stop caring about fdt_overlays from ubenv (if we ever cared), this method should get chopped out in favor of just calling fdt_load_dtb_overlays() directly. Reported by: Manuel Stühn (freebsdnewbie freenet de) Modified: head/stand/efi/fdt/efi_fdt.c head/stand/fdt/fdt_loader_cmd.c head/stand/fdt/fdt_platform.h head/stand/powerpc/kboot/kbootfdt.c head/stand/powerpc/ofw/ofwfdt.c head/stand/uboot/fdt/uboot_fdt.c Modified: head/stand/efi/fdt/efi_fdt.c ============================================================================== --- head/stand/efi/fdt/efi_fdt.c Thu Apr 11 13:21:10 2019 (r346131) +++ head/stand/efi/fdt/efi_fdt.c Thu Apr 11 13:26:28 2019 (r346132) @@ -52,8 +52,14 @@ fdt_platform_load_dtb(void) return (1); printf("Using DTB provided by EFI at %p.\n", hdr); - fdt_load_dtb_overlays(NULL); return (0); +} + +void +fdt_platform_load_overlays(void) +{ + + fdt_load_dtb_overlays(NULL); } void Modified: head/stand/fdt/fdt_loader_cmd.c ============================================================================== --- head/stand/fdt/fdt_loader_cmd.c Thu Apr 11 13:21:10 2019 (r346131) +++ head/stand/fdt/fdt_loader_cmd.c Thu Apr 11 13:26:28 2019 (r346132) @@ -522,6 +522,7 @@ fdt_setup_fdtp() if (fdt_load_dtb(bfp->f_addr) == 0) { printf("Using DTB from loaded file '%s'.\n", bfp->f_name); + fdt_platform_load_overlays(); return (0); } } @@ -531,12 +532,15 @@ fdt_setup_fdtp() if (fdt_load_dtb_addr(fdt_to_load) == 0) { printf("Using DTB from memory address %p.\n", fdt_to_load); + fdt_platform_load_overlays(); return (0); } } - if (fdt_platform_load_dtb() == 0) + if (fdt_platform_load_dtb() == 0) { + fdt_platform_load_overlays(); return (0); + } /* If there is a dtb compiled into the kernel, use it. */ if ((va = fdt_find_static_dtb()) != 0) { Modified: head/stand/fdt/fdt_platform.h ============================================================================== --- head/stand/fdt/fdt_platform.h Thu Apr 11 13:21:10 2019 (r346131) +++ head/stand/fdt/fdt_platform.h Thu Apr 11 13:26:28 2019 (r346132) @@ -51,6 +51,7 @@ int fdt_setup_fdtp(void); /* The platform library needs to implement these functions */ int fdt_platform_load_dtb(void); +void fdt_platform_load_overlays(void); void fdt_platform_fixups(void); #endif /* FDT_PLATFORM_H */ Modified: head/stand/powerpc/kboot/kbootfdt.c ============================================================================== --- head/stand/powerpc/kboot/kbootfdt.c Thu Apr 11 13:21:10 2019 (r346131) +++ head/stand/powerpc/kboot/kbootfdt.c Thu Apr 11 13:26:28 2019 (r346132) @@ -177,6 +177,12 @@ fdt_platform_load_dtb(void) } void +fdt_platform_load_overlays(void) +{ + +} + +void fdt_platform_fixups(void) { Modified: head/stand/powerpc/ofw/ofwfdt.c ============================================================================== --- head/stand/powerpc/ofw/ofwfdt.c Thu Apr 11 13:21:10 2019 (r346131) +++ head/stand/powerpc/ofw/ofwfdt.c Thu Apr 11 13:26:28 2019 (r346132) @@ -198,6 +198,12 @@ fdt_platform_load_dtb(void) } void +fdt_platform_load_overlays(void) +{ + +} + +void fdt_platform_fixups(void) { Modified: head/stand/uboot/fdt/uboot_fdt.c ============================================================================== --- head/stand/uboot/fdt/uboot_fdt.c Thu Apr 11 13:21:10 2019 (r346131) +++ head/stand/uboot/fdt/uboot_fdt.c Thu Apr 11 13:26:28 2019 (r346132) @@ -103,9 +103,14 @@ fdt_platform_load_dtb(void) } exit: - if (rv == 0) - fdt_load_dtb_overlays(ub_env_get("fdt_overlays")); return (rv); +} + +void +fdt_platform_load_overlays(void) +{ + + fdt_load_dtb_overlays(ub_env_get("fdt_overlays")); } void From owner-svn-src-head@freebsd.org Thu Apr 11 16:26:28 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15C5215883DE; Thu, 11 Apr 2019 16:26:28 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-it1-f173.google.com (mail-it1-f173.google.com [209.85.166.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 993A46D9B7; Thu, 11 Apr 2019 16:26:27 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-it1-f173.google.com with SMTP id k64so10507354itb.5; Thu, 11 Apr 2019 09:26:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=FjZy8WxMn4IV88mdYknSv4QPvQ4miQE75i20Vq3xxJc=; b=Brs8STVo+5+iEWUhrvKP19psROkTEjs/Hy2h9nKAufATlje8aMcpp5n/vPj/U3BIjq c3zNyuIkhKnMYROX5UwYZh9IPTME7cH2Sn8sDMB2g3TnuL8hWV/aX4CbQKHAZMWLGyF0 TSJ2jp2rRlYokfINjuWIfZv8j0aU18JCYX/16qb7g4t/aVDzgQAEyN258mPt/aZm1j+w UpBHU09NS2mlAlR+0056dBlC/UONB6A7EqBTVluQA8SsdiAld6vi2qDpyJWK0H53w2zv 0NSyVcXSL7pewV1KrF3RZiqaLu17wJ7qYbUnW66F7CTUahNxdSTKqMuMgUZOtjJFa9EN 2AFg== X-Gm-Message-State: APjAAAUGkTm+9bbu1TyvP0g78jYUsqU1/ZVSzFeiu13wNhOnLQyNk6CS Oiohjhv6fzygdApiNSkLTpifGWDd X-Google-Smtp-Source: APXvYqxsCUEhpKK2GiPhHLW8YEO069iXKOEK3WWNrF2L9Dd0lp/m8A4TCd3eeyZCNQptkFFRTf+Lmg== X-Received: by 2002:a02:212c:: with SMTP id e44mr35917840jaa.5.1554998366890; Thu, 11 Apr 2019 08:59:26 -0700 (PDT) Received: from mail-it1-f178.google.com (mail-it1-f178.google.com. [209.85.166.178]) by smtp.gmail.com with ESMTPSA id e26sm14970318iom.56.2019.04.11.08.59.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Apr 2019 08:59:26 -0700 (PDT) Received: by mail-it1-f178.google.com with SMTP id k64so10349641itb.5; Thu, 11 Apr 2019 08:59:26 -0700 (PDT) X-Received: by 2002:a24:4584:: with SMTP id c4mr9118943itd.163.1554998365847; Thu, 11 Apr 2019 08:59:25 -0700 (PDT) MIME-Version: 1.0 References: <201904111121.x3BBLj2K023087@repo.freebsd.org> In-Reply-To: <201904111121.x3BBLj2K023087@repo.freebsd.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Thu, 11 Apr 2019 08:59:14 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r346120 - head/sys/kern To: Edward Tomasz Napierala Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 993A46D9B7 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 16:26:28 -0000 Hi Edward, I have a question about this change below. On Thu, Apr 11, 2019 at 4:22 AM Edward Tomasz Napierala wrote: > > Author: trasz > Date: Thu Apr 11 11:21:45 2019 > New Revision: 346120 > URL: https://svnweb.freebsd.org/changeset/base/346120 > > Log: > Use shared vnode locks for the ELF interpreter. > > ... > Differential Revision: https://reviews.freebsd.org/D19874 > ... > Modified: head/sys/kern/imgact_elf.c > ============================================================================== > --- head/sys/kern/imgact_elf.c Thu Apr 11 08:06:45 2019 (r346119) > +++ head/sys/kern/imgact_elf.c Thu Apr 11 11:21:45 2019 (r346120) > ... > - NDINIT(nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_SYSSPACE, file, curthread); > + flags = FOLLOW | LOCKSHARED | LOCKLEAF; > + > +again: > + NDINIT(nd, LOOKUP, flags, UIO_SYSSPACE, file, curthread); > if ((error = namei(nd)) != 0) { > ... > @@ -759,15 +762,30 @@ __elfN(load_file)(struct proc *p, const char *file, u_ > ... > + if (VOP_IS_TEXT(nd->ni_vp) == 0) { > + if (VOP_ISLOCKED(nd->ni_vp) != LK_EXCLUSIVE) { > + /* > + * LK_UPGRADE could have resulted in dropping > + * the lock. Just try again from the start, > + * this time with exclusive vnode lock. > + */ > + vput(nd->ni_vp); > + flags &= ~LOCKSHARED; > + goto again; It's unclear to me why we don't attempt LK_UPGRADE first. If upgrade succeeds, we avoid an extra filesystem traversal (namei/lookup). If it fails, of course we can 'goto again' the same as we do unconditionally here. There was some discussion about the topic in the linked phabricator PR with Konstantin, but I did not follow it fully. On the one hand, perhaps VOP_IS_TEXT() is rarely false for common interpreters anyway. On the other hand, there is sort of a renaissance of static linking happening. So maybe the thought is, !VOP_IS_TEXT is likely to be rare, and LK_UPGRADE success even more rare, so why bother writing additional code for it? Thanks, Conrad P.S., It is orthogonal to this discussion, but I don't see any reason for VOP_IS_TEXT to be a vnode_if operation. Neither it, nor VOP_UNSET_TEXT, is ever specialized. They simply check or clear the VV_TEXT flag on the vnode's vflags, respectively. It is common for the kernel to reach out and interact with other vnode vflags directly; e.g., pretty much all other VV_flags, like VV_ROOT. The only specialization of VOP_SET_TEXT is NFSclient, and it is unclear to me why the same requirements NFS client has for setting VV_TEXT do not apply universally. From owner-svn-src-head@freebsd.org Thu Apr 11 17:51:30 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2E441589E75; Thu, 11 Apr 2019 17:51:29 +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 061D470724; Thu, 11 Apr 2019 17:51:28 +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 x3BHpKF1092990 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 11 Apr 2019 20:51:23 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua x3BHpKF1092990 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id x3BHpKrt092989; Thu, 11 Apr 2019 20:51:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 11 Apr 2019 20:51:20 +0300 From: Konstantin Belousov To: Conrad Meyer Cc: Edward Tomasz Napierala , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r346120 - head/sys/kern Message-ID: <20190411175120.GX1923@kib.kiev.ua> References: <201904111121.x3BBLj2K023087@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 17:51:30 -0000 On Thu, Apr 11, 2019 at 08:59:14AM -0700, Conrad Meyer wrote: > Hi Edward, > > I have a question about this change below. > > On Thu, Apr 11, 2019 at 4:22 AM Edward Tomasz Napierala > wrote: > > > > Author: trasz > > Date: Thu Apr 11 11:21:45 2019 > > New Revision: 346120 > > URL: https://svnweb.freebsd.org/changeset/base/346120 > > > > Log: > > Use shared vnode locks for the ELF interpreter. > > > > ... > > Differential Revision: https://reviews.freebsd.org/D19874 > > ... > > Modified: head/sys/kern/imgact_elf.c > > ============================================================================== > > --- head/sys/kern/imgact_elf.c Thu Apr 11 08:06:45 2019 (r346119) > > +++ head/sys/kern/imgact_elf.c Thu Apr 11 11:21:45 2019 (r346120) > > ... > > - NDINIT(nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_SYSSPACE, file, curthread); > > + flags = FOLLOW | LOCKSHARED | LOCKLEAF; > > + > > +again: > > + NDINIT(nd, LOOKUP, flags, UIO_SYSSPACE, file, curthread); > > if ((error = namei(nd)) != 0) { > > ... > > @@ -759,15 +762,30 @@ __elfN(load_file)(struct proc *p, const char *file, u_ > > ... > > + if (VOP_IS_TEXT(nd->ni_vp) == 0) { > > + if (VOP_ISLOCKED(nd->ni_vp) != LK_EXCLUSIVE) { > > + /* > > + * LK_UPGRADE could have resulted in dropping > > + * the lock. Just try again from the start, > > + * this time with exclusive vnode lock. > > + */ > > + vput(nd->ni_vp); > > + flags &= ~LOCKSHARED; > > + goto again; > > It's unclear to me why we don't attempt LK_UPGRADE first. If upgrade > succeeds, we avoid an extra filesystem traversal (namei/lookup). If > it fails, of course we can 'goto again' the same as we do > unconditionally here. LK_UPGRADE drops the vnode lock, this was discussed in the phab review. Perhaps you can do LK_TRYUPGRADE first, by the cost of even more complicated code then was in the initial review, if fixed. > > There was some discussion about the topic in the linked phabricator PR > with Konstantin, but I did not follow it fully. > > On the one hand, perhaps VOP_IS_TEXT() is rarely false for common > interpreters anyway. On the other hand, there is sort of a > renaissance of static linking happening. Statically linked binaries do not need interpreter. > So maybe the thought is, > !VOP_IS_TEXT is likely to be rare, and LK_UPGRADE success even more > rare, so why bother writing additional code for it? I do not understand the question. > > Thanks, > Conrad > > P.S., It is orthogonal to this discussion, but I don't see any reason > for VOP_IS_TEXT to be a vnode_if operation. Neither it, nor > VOP_UNSET_TEXT, is ever specialized. They simply check or clear the > VV_TEXT flag on the vnode's vflags, respectively. It is common for > the kernel to reach out and interact with other vnode vflags directly; > e.g., pretty much all other VV_flags, like VV_ROOT. The only > specialization of VOP_SET_TEXT is NFSclient, and it is unclear to me > why the same requirements NFS client has for setting VV_TEXT do not > apply universally. VOP is bypassed, unlike direct vnode flags access. As result, when you execute file on nullfs, VV_TEXT is set on the lower vnode, instead of the upper nullfs vnode. If lower vnode is not marked by VV_TEXT, EBUSY does not work. This was described in the commit log where VOPs were introduced. From owner-svn-src-head@freebsd.org Thu Apr 11 19:23:43 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FDEB1568026; Thu, 11 Apr 2019 19:23:43 +0000 (UTC) (envelope-from onwahe@gmail.com) Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8728E72F8F; Thu, 11 Apr 2019 19:23:42 +0000 (UTC) (envelope-from onwahe@gmail.com) Received: by mail-io1-xd32.google.com with SMTP id f6so6372699iop.3; Thu, 11 Apr 2019 12:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=RBJ8iU7GhfjOS8M+xW+v8QeOwFowwTwAYUuM1LfQzNw=; b=T1wTSeI0ah1kqxR/pVIhdCbDcPKwd+5eN6/+OSFijTq51gmH8cK2z37I8X9yKkIr6E ydNiDMmjyv9qQp3u80/DiF7TC3FZ31u6DGwvTUWls7NqyPOZ/h50ul7QMCYdKYmtrLfM gNFwKymZ3g1GsfoNGZgaHDXB76aC+fVR7LbCBQWkXLzgDDahXHeUO0oJazxgIYgOUAn+ sQT5jsDkQ4qOxt08CaqpokPci5OLQuexk+HAK8jvcZWrm38sJBG2bzcTL9sJL6FVBhGL 0TwSSZejwIs1Nt/JCJw4cJoalFtpFeRJg8exZ6rxwTKiv314s76l1q1TBDCNi9Ii0o2s jGYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RBJ8iU7GhfjOS8M+xW+v8QeOwFowwTwAYUuM1LfQzNw=; b=JCnv0ySoH5hNm7HLUEjfymN0YV/XWyZE/L7YbuV21O3ghfbpWcGPpfWAY5dGCoo8pr uvtaHDiqrhFgAT6uMtt4cPbVdPHPM8JoCfsVVbTOm7Q041Lg5HhzBwHcqyHzLahqiNcB 5rZIqIqcRFzwehzCDIs8gDX0vE4rvFNVAMIye4YKx0WKCkkChxhtslXo45OwE3QSfjB5 9+5Wm01LP4yKDTWHHH2t6HiFP6ecMk3bzOtLTyjXMOmiN2bwcyIJ0ZGhKPeeRcAzWu5Z WPBv3ektPMQ9KCmsQvrxxApSpilGubeSw8L7JfNro8zM1juSTkYgB6XEeVjONXkCa9j7 Iwbw== X-Gm-Message-State: APjAAAWyqDOVd7JEGtGwsIn5NG8S9/GLd2+PAiGzo6s51M1LNzN/IZxA GGHuWtN0sF1ypcRpE5pB9a5UHuJMQahZU2Wey5xjng== X-Google-Smtp-Source: APXvYqyf98A20VaMho/1StvYnrPggw+Qzpzx01+Ro2F5w9Azpnn2fj1Mf7wu5cCLNSGaSXK7oou4ODedQK1m4aX1sDU= X-Received: by 2002:a5d:840d:: with SMTP id i13mr27332648ion.186.1555010621484; Thu, 11 Apr 2019 12:23:41 -0700 (PDT) MIME-Version: 1.0 References: <201904101927.x3AJREvt013138@repo.freebsd.org> In-Reply-To: <201904101927.x3AJREvt013138@repo.freebsd.org> From: Svatopluk Kraus Date: Thu, 11 Apr 2019 21:23:35 +0200 Message-ID: Subject: Re: svn commit: r346096 - head/sys/arm/conf To: Emmanuel Vadot Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 8728E72F8F X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 19:23:43 -0000 I understand the reason for GENERIC. But are we so blind that we will delete everything that is not GENERIC? In other words, why to delete nice specific KERNEL configurations for boards we support when only reason I see is that GENERIC is so cool for some people? Svatopluk Kraus On Wed, Apr 10, 2019 at 9:27 PM Emmanuel Vadot wrote: > > Author: manu > Date: Wed Apr 10 19:27:14 2019 > New Revision: 346096 > URL: https://svnweb.freebsd.org/changeset/base/346096 > > Log: > arm: kernel: Remove old kernel configs > > Follow up to r346095 > All those kernels are either not working or the release have switched > to GENERIC > > Deleted: > head/sys/arm/conf/AML8726 > head/sys/arm/conf/BEAGLEBONE > head/sys/arm/conf/CHROMEBOOK > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints > head/sys/arm/conf/CHROMEBOOK-SNOW > head/sys/arm/conf/CHROMEBOOK-SPRING > head/sys/arm/conf/CHROMEBOOK.hints > head/sys/arm/conf/EXYNOS5.common > head/sys/arm/conf/EXYNOS5250 > head/sys/arm/conf/EXYNOS5420 > head/sys/arm/conf/ODROIDC1 > head/sys/arm/conf/PANDABOARD > head/sys/arm/conf/PANDABOARD.hints > head/sys/arm/conf/RADXA > head/sys/arm/conf/RADXA-LITE > head/sys/arm/conf/RK3188 > head/sys/arm/conf/RPI2 > From owner-svn-src-head@freebsd.org Thu Apr 11 20:39:13 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 647E9156982D; Thu, 11 Apr 2019 20:39:13 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0AB5D7557A; Thu, 11 Apr 2019 20:39:13 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D59E6F668; Thu, 11 Apr 2019 20:39:12 +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 x3BKdCJM012936; Thu, 11 Apr 2019 20:39:12 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3BKdC7o012935; Thu, 11 Apr 2019 20:39:12 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201904112039.x3BKdC7o012935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Thu, 11 Apr 2019 20:39:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346134 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 346134 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0AB5D7557A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2019 20:39:13 -0000 Author: tuexen Date: Thu Apr 11 20:39:12 2019 New Revision: 346134 URL: https://svnweb.freebsd.org/changeset/base/346134 Log: Fix an SCTP related locking issue. Don't report that the TCB_SEND_LOCK is owned, when it is not. This issue was found by running syzkaller. MFC after: 1 week Modified: head/sys/netinet/sctputil.c Modified: head/sys/netinet/sctputil.c ============================================================================== --- head/sys/netinet/sctputil.c Thu Apr 11 17:20:15 2019 (r346133) +++ head/sys/netinet/sctputil.c Thu Apr 11 20:39:12 2019 (r346134) @@ -3995,7 +3995,7 @@ sctp_abort_notification(struct sctp_tcb *stcb, uint8_t return; } /* Tell them we lost the asoc */ - sctp_report_all_outbound(stcb, error, 1, so_locked); + sctp_report_all_outbound(stcb, error, 0, so_locked); if (from_peer) { sctp_ulp_notify(SCTP_NOTIFY_ASSOC_REM_ABORTED, stcb, error, abort, so_locked); } else { From owner-svn-src-head@freebsd.org Fri Apr 12 00:44:35 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1AB10156E479; Fri, 12 Apr 2019 00:44:35 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ACA5084CC2; Fri, 12 Apr 2019 00:44:34 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 84EE11A0A7; Fri, 12 Apr 2019 00:44:34 +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 x3C0iYZS043774; Fri, 12 Apr 2019 00:44:34 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3C0iY1k043773; Fri, 12 Apr 2019 00:44:34 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201904120044.x3C0iY1k043773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 12 Apr 2019 00:44:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346143 - in head/sys/powerpc: include powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys/powerpc: include powerpc X-SVN-Commit-Revision: 346143 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ACA5084CC2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.94)[-0.945,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 00:44:35 -0000 Author: jhibbits Date: Fri Apr 12 00:44:33 2019 New Revision: 346143 URL: https://svnweb.freebsd.org/changeset/base/346143 Log: powerpc64: Increase the nap level on power9 idling The POWER9 documentation specifies that levels 0-3 are the 'lightest' sleep level, meaning lowest latency and with no state loss. However, state 3 is not implemented, and is instead reserved for future chips. This now properly configures the PSSCR, specifying state 2 as the lowest level to enter, but request level 0 for quickest sleep level. If the OCC determines that the CPU can enter states 1 or 2 it will trigger the transition to those states on demand. MFC after: 1 week Modified: head/sys/powerpc/include/spr.h head/sys/powerpc/powerpc/cpu.c Modified: head/sys/powerpc/include/spr.h ============================================================================== --- head/sys/powerpc/include/spr.h Fri Apr 12 00:31:22 2019 (r346142) +++ head/sys/powerpc/include/spr.h Fri Apr 12 00:44:33 2019 (r346143) @@ -412,6 +412,19 @@ #define SPR_MD_RAM0 0x339 /* ..8 IMMU RAM entry read reg 0 */ #define SPR_MD_RAM1 0x33a /* ..8 IMMU RAM entry read reg 1 */ #define SPR_PSSCR 0x357 /* Processor Stop Status and Control Register (ISA 3.0) */ +#define PSSCR_PLS_S 60 +#define PSSCR_PLS_M (0xf << PSSCR_PLS_S) +#define PSSCR_SD (1 << 22) +#define PSSCR_ESL (1 << 21) +#define PSSCR_EC (1 << 20) +#define PSSCR_PSLL_S 16 +#define PSSCR_PSLL_M (0xf << PSSCR_PSLL_S) +#define PSSCR_TR_S 8 +#define PSSCR_TR_M (0x3 << PSSCR_TR_S) +#define PSSCR_MTL_S 4 +#define PSSCR_MTL_M (0xf << PSSCR_MTL_S) +#define PSSCR_RL_S 0 +#define PSSCR_RL_M (0xf << PSSCR_RL_S) #define SPR_PMCR 0x374 /* Processor Management Control Register */ #define SPR_UMMCR2 0x3a0 /* .6. User Monitor Mode Control Register 2 */ #define SPR_UMMCR0 0x3a8 /* .6. User Monitor Mode Control Register 0 */ Modified: head/sys/powerpc/powerpc/cpu.c ============================================================================== --- head/sys/powerpc/powerpc/cpu.c Fri Apr 12 00:31:22 2019 (r346142) +++ head/sys/powerpc/powerpc/cpu.c Fri Apr 12 00:44:33 2019 (r346143) @@ -787,7 +787,6 @@ cpu_idle_booke(sbintime_t sbt) static void cpu_idle_powerx(sbintime_t sbt) { - /* Sleeping when running on one cpu gives no advantages - avoid it */ if (smp_started == 0) return; @@ -816,7 +815,8 @@ cpu_idle_power9(sbintime_t sbt) /* Suspend external interrupts until stop instruction completes. */ mtmsr(msr & ~PSL_EE); /* Set the stop state to lowest latency, wake up to next instruction */ - mtspr(SPR_PSSCR, 0); + /* Set maximum transition level to 2, for deepest lossless sleep. */ + mtspr(SPR_PSSCR, (2 << PSSCR_MTL_S) | (0 << PSSCR_RL_S)); /* "stop" instruction (PowerISA 3.0) */ __asm __volatile (".long 0x4c0002e4"); /* From owner-svn-src-head@freebsd.org Fri Apr 12 00:53:32 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7408F156E6EB; Fri, 12 Apr 2019 00:53:32 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0AE05850F4; Fri, 12 Apr 2019 00:53:32 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D528A1A24C; Fri, 12 Apr 2019 00:53:31 +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 x3C0rVru048936; Fri, 12 Apr 2019 00:53:31 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3C0rVj7048933; Fri, 12 Apr 2019 00:53:31 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201904120053.x3C0rVj7048933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 12 Apr 2019 00:53:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346144 - in head/sys/powerpc: include powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys/powerpc: include powerpc X-SVN-Commit-Revision: 346144 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0AE05850F4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.94)[-0.945,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 00:53:32 -0000 Author: jhibbits Date: Fri Apr 12 00:53:30 2019 New Revision: 346144 URL: https://svnweb.freebsd.org/changeset/base/346144 Log: powerpc: Adjust priority NOPs, and make them functions PowerISA 2.07 and PowerISA 3.0 both specify special NOPs for priority adjustments, with "medium" priority being normal. We had been setting medium-low as our normal priority. Rather than guess each time as to what we want and the right NOP, wrap them in inline functions, and replace the occurrances of the NOPs with the functions. Also, make DELAY() drop to very low priority while waiting, so we don't burn CPU. Coupled with r346143, this shaves off a modest 5-8% on buildworld times with -j72. There may be more room for improvement with judicious use of these NOPs. MFC after: 2 weeks Modified: head/sys/powerpc/include/cpufunc.h head/sys/powerpc/powerpc/machdep.c head/sys/powerpc/powerpc/mp_machdep.c Modified: head/sys/powerpc/include/cpufunc.h ============================================================================== --- head/sys/powerpc/include/cpufunc.h Fri Apr 12 00:44:33 2019 (r346143) +++ head/sys/powerpc/include/cpufunc.h Fri Apr 12 00:53:30 2019 (r346144) @@ -212,6 +212,43 @@ get_pcpu(void) return (ret); } +/* "NOP" operations to signify priorities to the kernel. */ +static __inline void +nop_prio_vlow(void) +{ + __asm __volatile("or 31,31,31"); +} + +static __inline void +nop_prio_low(void) +{ + __asm __volatile("or 1,1,1"); +} + +static __inline void +nop_prio_mlow(void) +{ + __asm __volatile("or 6,6,6"); +} + +static __inline void +nop_prio_medium(void) +{ + __asm __volatile("or 2,2,2"); +} + +static __inline void +nop_prio_mhigh(void) +{ + __asm __volatile("or 5,5,5"); +} + +static __inline void +nop_prio_high(void) +{ + __asm __volatile("or 3,3,3"); +} + #endif /* _KERNEL */ #endif /* !_MACHINE_CPUFUNC_H_ */ Modified: head/sys/powerpc/powerpc/machdep.c ============================================================================== --- head/sys/powerpc/powerpc/machdep.c Fri Apr 12 00:44:33 2019 (r346143) +++ head/sys/powerpc/powerpc/machdep.c Fri Apr 12 00:53:30 2019 (r346144) @@ -494,7 +494,7 @@ spinlock_enter(void) td = curthread; if (td->td_md.md_spinlock_count == 0) { - __asm __volatile("or 2,2,2"); /* Set high thread priority */ + nop_prio_mhigh(); msr = intr_disable(); td->td_md.md_spinlock_count = 1; td->td_md.md_saved_msr = msr; @@ -515,7 +515,7 @@ spinlock_exit(void) td->td_md.md_spinlock_count--; if (td->td_md.md_spinlock_count == 0) { intr_restore(msr); - __asm __volatile("or 6,6,6"); /* Set normal thread priority */ + nop_prio_medium(); } } Modified: head/sys/powerpc/powerpc/mp_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/mp_machdep.c Fri Apr 12 00:44:33 2019 (r346143) +++ head/sys/powerpc/powerpc/mp_machdep.c Fri Apr 12 00:53:30 2019 (r346144) @@ -78,8 +78,8 @@ machdep_ap_bootstrap(void) __asm __volatile("msync; isync"); while (ap_letgo == 0) - __asm __volatile("or 31,31,31"); - __asm __volatile("or 6,6,6"); + nop_prio_vlow(); + nop_prio_medium(); /* * Set timebase as soon as possible to meet an implicit rendezvous From owner-svn-src-head@freebsd.org Fri Apr 12 10:10:00 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 948B7157845C; Fri, 12 Apr 2019 10:10:00 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B747D6D517; Fri, 12 Apr 2019 10:09:59 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id ff019eb2; Fri, 12 Apr 2019 12:09:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mail; bh=qhnFCFDNBiPJRegrSjiRKgO+Wd0=; b=DlBxiJPDV/uJmyR0SbnwTXdor+Us PY/pi8mqhUUk8S/WsT0KAMy7prkm1kMRdbHTTiIMYNlD2LLz2B9OndVdXGLkiI1X cpHCE8wvb4mXlZSRPKJa79xkebHJJcrZgeeJXsqV/CV75J+nFuYlkJmn8IRlo0vJ 2puieo34GRIW6qw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; q=dns; s= mail; b=FGolKfszleqnMMFbuJnLCuEst1JnymnfdspivC61np1VbCffG7pdfd11 RFH4F/72KYlDbjK66gD1Ohdpl9/43cTEVFCleytjs2M6DcV9Nqqi/6JO5d/CHduy 8JU2LlTrtD9Xg2sJ3bsY1KoMYMUsc3l+9pUcK1WS9F2pyqofzvA= Received: from knuckles.blih.net (ip-9.net-89-3-105.rev.numericable.fr [89.3.105.9]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 7b72fb0b TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Fri, 12 Apr 2019 12:09:51 +0200 (CEST) Date: Fri, 12 Apr 2019 12:09:50 +0200 From: Emmanuel Vadot To: Svatopluk Kraus Cc: Emmanuel Vadot , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346096 - head/sys/arm/conf Message-Id: <20190412120950.dd0aae47e93ba7b50aaa47c6@bidouilliste.com> In-Reply-To: References: <201904101927.x3AJREvt013138@repo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: B747D6D517 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.93)[-0.933,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 10:10:00 -0000 Hi Svatopluk, On Thu, 11 Apr 2019 21:23:35 +0200 Svatopluk Kraus wrote: > I understand the reason for GENERIC. But are we so blind that we will > delete everything that is not GENERIC? In other words, why to delete > nice specific KERNEL configurations for boards we support when only > reason I see is that GENERIC is so cool for some people? That's simple and maybe I should have explain more in the commit message. Those configs aren't tested. All the images that we provide are using GENERIC kernel so we know that GENERIC is tested (somewhat). Those config will also lack update if we need to add a new required pseudo device (like syscon) and maybe it's already the case on some. The only way (for now) that we could produce board specific kernel is to include GENERIC and add a bunch of nodevice "blah", which is not going to happen. We have plan for splitting the GENERIC kernel into soc familly file, then it would be easier for people to have a SoC kernel config. Finaly I guess that when you say "boards we support" you are talking about RPI2, BEAGLEBONE or maybe PANDABOARD. For me those aren't board that we support, those are survivors that had the chance to not die in the past years. No developer care about or work on those boards. > Svatopluk Kraus > > > > On Wed, Apr 10, 2019 at 9:27 PM Emmanuel Vadot wrote: > > > > Author: manu > > Date: Wed Apr 10 19:27:14 2019 > > New Revision: 346096 > > URL: https://svnweb.freebsd.org/changeset/base/346096 > > > > Log: > > arm: kernel: Remove old kernel configs > > > > Follow up to r346095 > > All those kernels are either not working or the release have switched > > to GENERIC > > > > Deleted: > > head/sys/arm/conf/AML8726 > > head/sys/arm/conf/BEAGLEBONE > > head/sys/arm/conf/CHROMEBOOK > > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT > > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints > > head/sys/arm/conf/CHROMEBOOK-SNOW > > head/sys/arm/conf/CHROMEBOOK-SPRING > > head/sys/arm/conf/CHROMEBOOK.hints > > head/sys/arm/conf/EXYNOS5.common > > head/sys/arm/conf/EXYNOS5250 > > head/sys/arm/conf/EXYNOS5420 > > head/sys/arm/conf/ODROIDC1 > > head/sys/arm/conf/PANDABOARD > > head/sys/arm/conf/PANDABOARD.hints > > head/sys/arm/conf/RADXA > > head/sys/arm/conf/RADXA-LITE > > head/sys/arm/conf/RK3188 > > head/sys/arm/conf/RPI2 > > -- Emmanuel Vadot From owner-svn-src-head@freebsd.org Fri Apr 12 10:13:20 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C9DE1578698; Fri, 12 Apr 2019 10:13:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 19A4F6D97C; Fri, 12 Apr 2019 10:13:20 +0000 (UTC) (envelope-from bapt@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E45B01FFBA; Fri, 12 Apr 2019 10:13:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3CADJ1r049701; Fri, 12 Apr 2019 10:13:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CADHOd049689; Fri, 12 Apr 2019 10:13:17 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201904121013.x3CADHOd049689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 12 Apr 2019 10:13:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346149 - in head: contrib/mandoc usr.bin/mandoc X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head: contrib/mandoc usr.bin/mandoc X-SVN-Commit-Revision: 346149 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 19A4F6D97C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 10:13:20 -0000 Author: bapt Date: Fri Apr 12 10:13:17 2019 New Revision: 346149 URL: https://svnweb.freebsd.org/changeset/base/346149 Log: Update mandoc to 1.14.5 MFC after: 2 weeks Added: head/contrib/mandoc/arch.c - copied unchanged from r346148, vendor/mandoc/dist/arch.c head/contrib/mandoc/eqn.h - copied unchanged from r346148, vendor/mandoc/dist/eqn.h head/contrib/mandoc/eqn_parse.h - copied unchanged from r346148, vendor/mandoc/dist/eqn_parse.h head/contrib/mandoc/mandoc_msg.c - copied unchanged from r346148, vendor/mandoc/dist/mandoc_msg.c head/contrib/mandoc/mandoc_parse.h - copied unchanged from r346148, vendor/mandoc/dist/mandoc_parse.h head/contrib/mandoc/tbl.h - copied unchanged from r346148, vendor/mandoc/dist/tbl.h head/contrib/mandoc/tbl_int.h - copied unchanged from r346148, vendor/mandoc/dist/tbl_int.h head/contrib/mandoc/tbl_parse.h - copied unchanged from r346148, vendor/mandoc/dist/tbl_parse.h Deleted: head/contrib/mandoc/st.in Modified: head/contrib/mandoc/INSTALL head/contrib/mandoc/LICENSE head/contrib/mandoc/Makefile head/contrib/mandoc/Makefile.depend head/contrib/mandoc/NEWS head/contrib/mandoc/TODO head/contrib/mandoc/apropos.1 head/contrib/mandoc/att.c head/contrib/mandoc/cgi.c head/contrib/mandoc/chars.c head/contrib/mandoc/config.h head/contrib/mandoc/configure head/contrib/mandoc/configure.local.example head/contrib/mandoc/dbm.c head/contrib/mandoc/demandoc.c head/contrib/mandoc/eqn.c head/contrib/mandoc/eqn_html.c head/contrib/mandoc/eqn_term.c head/contrib/mandoc/gmdiff head/contrib/mandoc/html.c head/contrib/mandoc/html.h head/contrib/mandoc/lib.c head/contrib/mandoc/lib.in head/contrib/mandoc/libman.h head/contrib/mandoc/libmandoc.h head/contrib/mandoc/libmdoc.h head/contrib/mandoc/main.c head/contrib/mandoc/main.h head/contrib/mandoc/man.1 head/contrib/mandoc/man.7 head/contrib/mandoc/man.c head/contrib/mandoc/man.conf.5 head/contrib/mandoc/man.h head/contrib/mandoc/man_html.c head/contrib/mandoc/man_macro.c head/contrib/mandoc/man_term.c head/contrib/mandoc/man_validate.c head/contrib/mandoc/manconf.h head/contrib/mandoc/mandoc.1 head/contrib/mandoc/mandoc.3 head/contrib/mandoc/mandoc.c head/contrib/mandoc/mandoc.css head/contrib/mandoc/mandoc.h head/contrib/mandoc/mandoc_char.7 head/contrib/mandoc/mandoc_headers.3 head/contrib/mandoc/mandoc_html.3 head/contrib/mandoc/mandocd.c head/contrib/mandoc/mandocdb.c head/contrib/mandoc/manpath.c head/contrib/mandoc/mansearch.c head/contrib/mandoc/mansearch.h head/contrib/mandoc/mdoc.7 head/contrib/mandoc/mdoc.c head/contrib/mandoc/mdoc.h head/contrib/mandoc/mdoc_argv.c head/contrib/mandoc/mdoc_html.c head/contrib/mandoc/mdoc_macro.c head/contrib/mandoc/mdoc_man.c head/contrib/mandoc/mdoc_markdown.c head/contrib/mandoc/mdoc_state.c head/contrib/mandoc/mdoc_term.c head/contrib/mandoc/mdoc_validate.c head/contrib/mandoc/msec.c head/contrib/mandoc/out.c head/contrib/mandoc/out.h head/contrib/mandoc/preconv.c head/contrib/mandoc/read.c head/contrib/mandoc/roff.7 head/contrib/mandoc/roff.c head/contrib/mandoc/roff.h head/contrib/mandoc/roff_html.c head/contrib/mandoc/roff_int.h head/contrib/mandoc/roff_term.c head/contrib/mandoc/roff_validate.c head/contrib/mandoc/st.c head/contrib/mandoc/tag.c head/contrib/mandoc/tag.h head/contrib/mandoc/tbl.3 head/contrib/mandoc/tbl.7 head/contrib/mandoc/tbl.c head/contrib/mandoc/tbl_data.c head/contrib/mandoc/tbl_html.c head/contrib/mandoc/tbl_layout.c head/contrib/mandoc/tbl_opts.c head/contrib/mandoc/tbl_term.c head/contrib/mandoc/term.c head/contrib/mandoc/term.h head/contrib/mandoc/term_ascii.c head/contrib/mandoc/term_tab.c head/contrib/mandoc/test-getsubopt.c head/contrib/mandoc/test-strcasestr.c head/contrib/mandoc/test-stringlist.c head/contrib/mandoc/test-strptime.c head/contrib/mandoc/test-vasprintf.c head/contrib/mandoc/test-wchar.c head/contrib/mandoc/tree.c head/usr.bin/mandoc/Makefile Directory Properties: head/contrib/mandoc/ (props changed) Modified: head/contrib/mandoc/INSTALL ============================================================================== --- head/contrib/mandoc/INSTALL Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/INSTALL Fri Apr 12 10:13:17 2019 (r346149) @@ -1,4 +1,4 @@ -$Id: INSTALL,v 1.22 2018/07/31 15:34:00 schwarze Exp $ +$Id: INSTALL,v 1.23 2019/03/06 15:58:10 schwarze Exp $ About the portable mandoc distribution -------------------------------------- @@ -18,7 +18,7 @@ tech@ mailing list, too. Enjoy using the mandoc toolset! -Ingo Schwarze, Karlsruhe, August 2018 +Ingo Schwarze, Karlsruhe, March 2019 Installation @@ -67,7 +67,8 @@ variables into "configure.local" and go back to step 4 7. Optionally run the regression suite. Basically, that amounts to "cd regress && ./regress.pl". But you should probably look at "./mandoc -l regress/regress.pl.1" -first. +first. In particular, regarding Solaris systems, look at the BUGS +section of that manual page. 8. Run "sudo make install". If you intend to build a binary package using some kind of fake root mechanism, you may need a Modified: head/contrib/mandoc/LICENSE ============================================================================== --- head/contrib/mandoc/LICENSE Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/LICENSE Fri Apr 12 10:13:17 2019 (r346149) @@ -1,8 +1,8 @@ -$Id: LICENSE,v 1.19 2018/07/31 10:18:15 schwarze Exp $ +$Id: LICENSE,v 1.21 2018/11/26 17:11:11 schwarze Exp $ -With the exceptions noted below, all code and documentation -contained in the mandoc toolkit is protected by the Copyright -of the following developers: +With the exceptions noted below, all non-trivial files contained +in the mandoc toolkit are protected by the Copyright of the following +developers: Copyright (c) 2008-2012, 2014 Kristaps Dzonsons Copyright (c) 2010-2018 Ingo Schwarze @@ -12,13 +12,14 @@ Copyright (c) 2013 Franco Fichtner Copyright (c) 2016 Ed Maste Copyright (c) 2017 Michael Stapelberg +Copyright (c) 2017 Anthony Bentley Copyright (c) 1998, 2004, 2010 Todd C. Miller Copyright (c) 2008, 2017 Otto Moerbeek Copyright (c) 2004 Ted Unangst Copyright (c) 1994 Christos Zoulas Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre -See the individual source files for information about who contributed +See the individual files for information about who contributed to which file during which years. Modified: head/contrib/mandoc/Makefile ============================================================================== --- head/contrib/mandoc/Makefile Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/Makefile Fri Apr 12 10:13:17 2019 (r346149) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.519 2018/07/31 15:34:00 schwarze Exp $ +# $Id: Makefile,v 1.530 2019/03/06 16:08:41 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons -# Copyright (c) 2011, 2013-2018 Ingo Schwarze +# Copyright (c) 2011, 2013-2019 Ingo Schwarze # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -VERSION = 1.14.4 +VERSION = 1.14.5 # === LIST OF FILES ==================================================== @@ -37,9 +37,9 @@ TESTSRCS = test-be32toh.c \ test-PATH_MAX.c \ test-pledge.c \ test-progname.c \ - test-recvmsg.c \ test-reallocarray.c \ test-recallocarray.c \ + test-recvmsg.c \ test-rewb-bsd.c \ test-rewb-sysv.c \ test-sandbox_init.c \ @@ -54,7 +54,8 @@ TESTSRCS = test-be32toh.c \ test-vasprintf.c \ test-wchar.c -SRCS = att.c \ +SRCS = arch.c \ + att.c \ catman.c \ cgi.c \ chars.c \ @@ -96,6 +97,7 @@ SRCS = att.c \ man_validate.c \ mandoc.c \ mandoc_aux.c \ + mandoc_msg.c \ mandoc_ohash.c \ mandoc_xr.c \ mandocd.c \ @@ -155,13 +157,14 @@ DISTFILES = INSTALL \ dbm_map.h \ demandoc.1 \ eqn.7 \ + eqn.h \ + eqn_parse.h \ gmdiff \ html.h \ lib.in \ libman.h \ libmandoc.h \ libmdoc.h \ - libroff.h \ main.h \ makewhatis.8 \ man.1 \ @@ -184,6 +187,7 @@ DISTFILES = INSTALL \ mandoc_html.3 \ mandoc_malloc.3 \ mandoc_ohash.h \ + mandoc_parse.h \ mandoc_xr.h \ mandocd.8 \ mansearch.3 \ @@ -198,10 +202,12 @@ DISTFILES = INSTALL \ roff.h \ roff_int.h \ soelim.1 \ - st.in \ tag.h \ tbl.3 \ tbl.7 \ + tbl.h \ + tbl_int.h \ + tbl_parse.h \ term.h \ $(SRCS) \ $(TESTSRCS) @@ -230,9 +236,11 @@ LIBROFF_OBJS = eqn.o \ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ $(LIBMDOC_OBJS) \ $(LIBROFF_OBJS) \ + arch.o \ chars.o \ mandoc.o \ mandoc_aux.o \ + mandoc_msg.o \ mandoc_ohash.o \ mandoc_xr.o \ msec.o \ @@ -320,6 +328,7 @@ SOELIM_OBJS = soelim.o \ WWW_MANS = apropos.1.html \ demandoc.1.html \ man.1.html \ + man.options.1.html \ mandoc.1.html \ soelim.1.html \ man.cgi.3.html \ @@ -336,20 +345,27 @@ WWW_MANS = apropos.1.html \ eqn.7.html \ man.7.html \ mandoc_char.7.html \ - mandocd.8.html \ mdoc.7.html \ roff.7.html \ tbl.7.html \ catman.8.html \ makewhatis.8.html \ man.cgi.8.html \ + mandocd.8.html + +WWW_INCS = eqn.h.html \ + html.h.html \ man.h.html \ manconf.h.html \ mandoc.h.html \ mandoc_aux.h.html \ + mandoc_parse.h.html \ mansearch.h.html \ mdoc.h.html \ - roff.h.html + roff.h.html \ + tbl.h.html \ + tbl_int.h.html \ + tbl_parse.h.html # === USER CONFIGURATION =============================================== @@ -361,9 +377,9 @@ all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile. install: base-install $(INSTALL_TARGETS) -www: $(WWW_MANS) +www: $(WWW_MANS) $(WWW_INCS) -$(WWW_MANS): mandoc +$(WWW_MANS) $(WWW_INCS): mandoc .PHONY: base-install cgi-install install www-install .PHONY: clean distclean depend @@ -382,7 +398,7 @@ clean: rm -f mandocd catman catman.o $(MANDOCD_OBJS) rm -f demandoc $(DEMANDOC_OBJS) rm -f soelim $(SOELIM_OBJS) - rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256 + rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256 rm -rf *.dSYM base-install: mandoc demandoc soelim @@ -420,8 +436,8 @@ lib-install: libmandoc.a mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(MANDIR)/man3 $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) - $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ - $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \ + mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 @@ -475,11 +491,14 @@ uninstall: rm -f $(DESTDIR)$(MANDIR)/man3/mansearch.3 rm -f $(DESTDIR)$(MANDIR)/man3/mchars_alloc.3 rm -f $(DESTDIR)$(MANDIR)/man3/tbl.3 + rm -f $(DESTDIR)$(INCLUDEDIR)/eqn.h rm -f $(DESTDIR)$(INCLUDEDIR)/man.h rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc.h rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h + rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_parse.h rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h + rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR) regress: all @@ -516,7 +535,9 @@ soelim: $(SOELIM_OBJS) # --- maintainer targets --- www-install: www - $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR) + $(INSTALL_DATA) mandoc.css $(HTDOCDIR) + $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man + $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes depend: config.h mkdep -f Makefile.depend $(CFLAGS) $(SRCS) @@ -564,6 +585,10 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES) ( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) ) rm -rf .dist/ +dist-install: dist + $(INSTALL_DATA) mandoc-$(VERSION).tar.gz mandoc-$(VERSION).sha256 \ + $(HTDOCDIR)/snapshots + # === SUFFIX RULES ===================================================== .SUFFIXES: .1 .3 .5 .7 .8 .h @@ -573,5 +598,6 @@ mandoc-$(VERSION).tar.gz: $(DISTFILES) highlight -I $< > $@ .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc - ./mandoc -Thtml -Wall,stop \ - -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@ + mandoc -Thtml -Wwarning,stop \ + -O 'style=/mandoc.css,man=/man/%N.%S.html;https://man.openbsd.org/%N.%S,includes=/includes/%I.html' \ + $< > $@ Modified: head/contrib/mandoc/Makefile.depend ============================================================================== --- head/contrib/mandoc/Makefile.depend Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/Makefile.depend Fri Apr 12 10:13:17 2019 (r346149) @@ -1,6 +1,7 @@ -att.o: att.c config.h mandoc.h roff.h mdoc.h libmdoc.h +arch.o: arch.c config.h roff.h +att.o: att.c config.h roff.h libmdoc.h catman.o: catman.c config.h compat_fts.h -cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h main.h manconf.h mansearch.h cgi.h +cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h mansearch.h cgi.h chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h libmandoc.h compat_err.o: compat_err.c config.h compat_fts.o: compat_fts.c config.h compat_fts.h @@ -26,54 +27,55 @@ dba_read.o: dba_read.c mandoc_aux.h mansearch.h dba_ar dba_write.o: dba_write.c config.h dba_write.h dbm.o: dbm.c config.h mansearch.h dbm_map.h dbm.h dbm_map.o: dbm_map.c config.h mansearch.h dbm_map.h dbm.h -demandoc.o: demandoc.c config.h mandoc.h roff.h man.h mdoc.h -eqn.o: eqn.c config.h mandoc_aux.h mandoc.h roff.h libmandoc.h libroff.h -eqn_html.o: eqn_html.c config.h mandoc.h out.h html.h -eqn_term.o: eqn_term.c config.h mandoc.h out.h term.h +demandoc.o: demandoc.c config.h mandoc.h roff.h man.h mdoc.h mandoc_parse.h +eqn.o: eqn.c config.h mandoc_aux.h mandoc.h roff.h eqn.h libmandoc.h eqn_parse.h +eqn_html.o: eqn_html.c config.h mandoc.h eqn.h out.h html.h +eqn_term.o: eqn_term.c config.h eqn.h out.h term.h html.o: html.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h out.h html.h manconf.h main.h -lib.o: lib.c config.h mandoc.h roff.h mdoc.h libmdoc.h lib.in -main.o: main.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h tag.h main.h manconf.h mansearch.h +lib.o: lib.c config.h roff.h libmdoc.h lib.in +main.o: main.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h mandoc_parse.h tag.h main.h manconf.h mansearch.h man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h man_html.o: man_html.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h html.h main.h man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h -man_term.o: man_term.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h term.h main.h +man_term.o: man_term.c config.h mandoc_aux.h roff.h man.h out.h term.h main.h man_validate.o: man_validate.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h -mandoc.o: mandoc.c config.h mandoc_aux.h mandoc.h roff.h libmandoc.h +mandoc.o: mandoc.c config.h mandoc_aux.h mandoc.h roff.h libmandoc.h roff_int.h mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h +mandoc_msg.o: mandoc_msg.c mandoc.h mandoc_ohash.o: mandoc_ohash.c mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc_xr.o: mandoc_xr.c mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc_xr.h -mandocd.o: mandocd.c config.h mandoc.h roff.h mdoc.h man.h main.h manconf.h -mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h manconf.h mansearch.h dba_array.h dba.h +mandocd.o: mandocd.c config.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h +mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h manconf.h mansearch.h dba_array.h dba.h manpath.o: manpath.c config.h mandoc_aux.h manconf.h -mansearch.o: mansearch.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h dbm.h +mansearch.o: mansearch.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h dbm.h mdoc.o: mdoc.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h html.h main.h mdoc_macro.o: mdoc_macro.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h out.h main.h mdoc_markdown.o: mdoc_markdown.c mandoc_aux.h mandoc.h roff.h mdoc.h main.h -mdoc_state.o: mdoc_state.c mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h -mdoc_term.o: mdoc_term.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h term.h tag.h main.h +mdoc_state.o: mdoc_state.c mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_term.o: mdoc_term.c config.h mandoc_aux.h roff.h mdoc.h out.h term.h tag.h main.h mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h msec.o: msec.c config.h mandoc.h libmandoc.h msec.in -out.o: out.c config.h mandoc_aux.h mandoc.h out.h -preconv.o: preconv.c config.h mandoc.h libmandoc.h -read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h libmandoc.h -roff.o: roff.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h roff.h libmandoc.h roff_int.h libroff.h predefs.in +out.o: out.c config.h mandoc_aux.h tbl.h out.h +preconv.o: preconv.c config.h mandoc.h roff.h mandoc_parse.h libmandoc.h +read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h libmandoc.h roff_int.h +roff.o: roff.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mandoc_parse.h libmandoc.h roff_int.h tbl_parse.h eqn_parse.h predefs.in roff_html.o: roff_html.c mandoc.h roff.h out.h html.h roff_term.o: roff_term.c mandoc.h roff.h out.h term.h roff_validate.o: roff_validate.c mandoc.h roff.h libmandoc.h roff_int.h soelim.o: soelim.c config.h compat_stringlist.h -st.o: st.c config.h mandoc.h roff.h mdoc.h libmdoc.h st.in +st.o: st.c config.h mandoc.h roff.h libmdoc.h tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h tag.h -tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h -tbl_data.o: tbl_data.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h -tbl_html.o: tbl_html.c config.h mandoc.h out.h html.h -tbl_layout.o: tbl_layout.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h -tbl_opts.o: tbl_opts.c config.h mandoc.h libmandoc.h libroff.h -tbl_term.o: tbl_term.c config.h mandoc.h out.h term.h +tbl.o: tbl.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_parse.h tbl_int.h +tbl_data.o: tbl_data.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_int.h +tbl_html.o: tbl_html.c config.h mandoc.h tbl.h out.h html.h +tbl_layout.o: tbl_layout.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_int.h +tbl_opts.o: tbl_opts.c config.h mandoc.h tbl.h libmandoc.h tbl_int.h +tbl_term.o: tbl_term.c config.h mandoc.h tbl.h out.h term.h term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h manconf.h main.h term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h manconf.h main.h term_tab.o: term_tab.c mandoc_aux.h out.h term.h -tree.o: tree.c config.h mandoc.h roff.h mdoc.h man.h main.h +tree.o: tree.c config.h mandoc.h roff.h mdoc.h man.h tbl.h eqn.h main.h Modified: head/contrib/mandoc/NEWS ============================================================================== --- head/contrib/mandoc/NEWS Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/NEWS Fri Apr 12 10:13:17 2019 (r346149) @@ -1,6 +1,80 @@ -$Id: NEWS,v 1.32 2018/08/08 14:47:38 schwarze Exp $ +$Id: NEWS,v 1.34 2019/03/10 09:32:00 schwarze Exp $ This file lists the most important changes in the mandoc.bsd.lv distribution. + +Changes in version 1.14.5, released on March 10, 2019 + + --- MAJOR NEW FEATURES --- + * apropos(1): improve POSIX compliance by accepting case-insensitive + extended regular expressions by default + * new -O tag[=term] output option (open a page at the definition of a term) + * tbl(7) -T html: spanning and horizontal and vertical alignment of cells + * tbl(7) -T html: draw lines on the edges of table cells + * tbl(7) -T utf8: render lines with the Unicode box drawing characters + * mandoc is now able to handle the manual pages of the groff package. + --- MINOR NEW FEATURES --- + * -T html: new option -O toc (table of contents) + * -T html: second argument to -O man to support local and remote links + * mdoc(7) .Bd -centered now fills the text contained in it + * man-ext .SY and .YS macros (synopsis block) + * man-ext .TQ macro (tagged paragraph without vertical space before it) + * tbl(7) \& explicit alignment indicator + * roff(7) .shift, .while, and .return requests + * roff(7) .char request (output glyph definition) + * roff(7) .nop request (no operation) + * roff(7) .ft request: handle the CB, CI, and CR fonts + * roff(7) .if c conditional (character available) + * roff(7) \\$@ escape sequence (insert all macro arguments, quoted) + * roff(7) \*(.T predefined string (interpolate output device name) + * roff(7) \[charNNN] escape sequence (for printable ASCII characters) + * roff(7) \# escape sequence (line continuation with comment) + --- HTML OUTPUT SYNTAX CORRECTIONS --- + * Render .br and \p as
, not as an empty
. + * Render .Pp and .PP as

and automatically close it when needed. + * Stop writing empty list elements for non-compact .Bl -tag lists. + * Do not put

inside if .UR or .MT contain .PP. + * Implement tooltips purely in CSS rather than abusing title= attributes. + --- MINOR FUNCTIONAL IMPROVEMENTS --- + * many improvements to the handling of fill and no-fill mode + * tbl(7): better column widths in the presence of horizontal spans + * several minor improvements to escape sequence handling + * several minor improvements to manual font handling + * portability: autodetect need for _GNU_SOURCE or _OPENBSD_SOURCE + * portability: autodetect whether less(1) supports the -T option + * large numbers of bugfixes of diverse kinds + --- STRUCTURAL IMPROVEMENTS --- + * Disentangle eqn(7) and tbl(7) from other parser header files, + and clean up some parser data structures. + * Substantially simplify error and warning message infrastructure. + --- THANKS TO --- + * John Gardner for crucial help implementing tooltips in CSS. + * Alexander Bluhm, Raphael Graf, Ted Unangst (OpenBSD) + and Daniel Sabogal (Alpine Linux) for patches. + * Anthony Bentley and Jason McIntyre (OpenBSD) for documentation patches, + suggesting new features, bug reports, and useful discussions. + * Kyle Evans and Baptiste Daroussin (FreeBSD) for minor patches. + * Pali Rohar for suggesting multiple new features and for reporting + several bugs and missing features. + * Klemens Nanni (OpenBSD) for suggesting multiple new features. + * Kristaps Dzonsons (bsd.lv), Marc Espie (OpenBSD), Adam Kalisz, + and Laura Morales for suggesting new features. + * Wolfram Schneider and Yuri Pankov (FreeBSD) for reporting missing features. + * Edward Tomasz Napierala (FreeBSD) for suggesting a feature improvement. + * Thomas Klausner (NetBSD) and Sevan Janiyan (SmartOS) + for bug reports and release testing. + * Bryan Steele, Janne Johansson, Kurt Mosiejczuk, Mike Belopuhov, Theo + Buehler, Todd Miller (OpenBSD), Andreas Gustafsson, Christos Zoulas, + Robert Elz (NetBSD), Kurt Jaeger (FreeBSD), Fabio Scotoni, Kelvin + Sherlock, Mark Harris, Orestis Ioannou, Raf Czlonka, and Sean Farrell + for bug reports. + * Ulrich Spoerlein (FreeBSD), Leah Neukirchen (Void Linux), + Matej Cepl (openSUSE), and Jan Stary (MacOS X) for release testing. + * Brian Callahan and Stuart Henderson (OpenBSD) for help + with the OpenBSD groff port. + * Bertrand Garrigues, Branden Robinson, Ralph Corderoy, and Werner + Lemberg (GNU troff) for checking groff patches. + * Scott Cheloha, Theo de Raadt (OpenBSD) + and Natanael Copa (Alpine Linux) for useful discussions. Changes in version 1.14.4, released on August 8, 2018 Modified: head/contrib/mandoc/TODO ============================================================================== --- head/contrib/mandoc/TODO Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/TODO Fri Apr 12 10:13:17 2019 (r346149) @@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.258 2018/08/06 14:16:30 schwarze Exp $ +* $Id: TODO,v 1.289 2019/03/04 13:01:57 schwarze Exp $ ************************************************************************ Many issues are annotated for difficulty as follows: @@ -38,18 +38,6 @@ are mere guesses, and some may be wrong. --- missing roff features ---------------------------------------------- -- .nop prints its arguments as text, - see groff(7) for an example - -- .ft CB selects constant-width bold font - see groff_out(7) for examples - -- \*(.T prints the device being used, - see groff_char(7) for an example - -- \[charNN], \[charNNN] prints a single-byte codepoint - see groff_char(7) for examples - - .ad (adjust margins) .ad l -- adjust left margin only (flush left) .ad r -- adjust right margin only (flush right) @@ -69,34 +57,11 @@ are mere guesses, and some may be wrong. reported by brad@ Sat, 15 Jan 2011 15:45:23 -0500 loc *** exist *** algo *** size ** imp * -- .while and .shift - found by jca@ in ratpoison(1) Sun, 30 Jun 2013 12:01:09 +0200 - loc * exist ** algo ** size ** imp ** - - \w'' improve width measurements would not be very useful without an expression parser, see below needed for Tcl_NewStringObj(3) via wiz@ Wed, 5 Mar 2014 22:27:43 +0100 loc ** exist *** algo *** size * imp *** -- \\ in high-level macro arguments - Currently, \\ is expanded in two situations: - 1) macro and string definition (roff.c setstrn()) - 2) macro argument parsing (mandoc.c mandoc_getarg()) - For user defined macros, the second happens in time because of ROFF_REPARSE. - But for standard high-level macros, it only happens after entering the - high level parsers, which is too late because the code doesn't get - back to roff.c roff_res() from that point. Because this requires - distinguishing requests, user-defined macros and standard macros - on the roff_res() level, it is hard to solve without the parser reorg. - Found by naddy@ in devel/cutils cobfusc(1) Mon, 16 Feb 2015 19:10:52 +0100 - loc *** exist *** algo *** size ** imp * - -- check for missing roff escape sequences, implement those that are - trivial even if not usually appearing in manual pages, gracefully - ignore the non-trivial ones, document what they are supposed to do - and what mandoc does instead - loc * exist ** algo * size * imp * - --- missing mdoc features ---------------------------------------------- - .Bl -column .Xo support is missing @@ -112,13 +77,6 @@ are mere guesses, and some may be wrong. from jmc@ Wed, 14 Jul 2010 18:10:32 +0100 loc * exist *** algo *** size ** imp ** -- .Bd -centered implies -filled, not -unfilled, which is not - easy to implement; it requires code similar to .ce, which - we don't have either. - Besides, groff has bug causing text right *before* .Bd -centered - to be centered as well. - loc *** exist *** algo ** size ** imp ** (parser reorg would help) - - .Bd -filled should not be the same as .Bd -ragged, but align both the left and right margin. In groff, it is implemented in terms of .ad b, which we don't have either. Found in cksum(1). @@ -174,15 +132,6 @@ are mere guesses, and some may be wrong. --- missing man features ----------------------------------------------- -- .SY and .YS, - used by many groff manual pages - -- preserve punctuation following .ME, - see ditroff(7) for an example - -- .TQ tagged paragraph continuation, - see groff_diff(7) for examples - - groff_www(7) .MTO and .URL These macros were used by the GNU grep(1) man page. The groff_www(7) manual page itself uses them, too. @@ -193,18 +142,10 @@ are mere guesses, and some may be wrong. --- missing tbl features ----------------------------------------------- -- the "s" layout column specifier is used for placement of data - into columns, but ignored during column width calculations - synaptics(4) found by tedu@ Mon, 17 Aug 2015 21:17:42 -0400 - loc * exist ** algo *** size * imp ** - - vertical centering in cells vertically spanned with ^ pali dot rohar at gmail dot com 16 Jul 2018 13:03:35 +0200 loc * exist *** algo *** size ** imp * -- support .ds requests inside tbl(7) code, - see tbl(1) for an example - - support mdoc(7) and man(7) macros inside tbl(7) code; probably requires the parser reorg and letting tbl(7) use roff_node such that macro sets can mix; @@ -212,35 +153,24 @@ are mere guesses, and some may be wrong. loc *** exist ** algo *** size ** imp *** - look at the POSIX manuals in the books/man-pages-posix port, - they use some unsupported tbl(7) features. + they use some unsupported tbl(7) features, mostly macros in tbl(7). loc * exist ** algo ** size ** imp *** - look what Joerg Schilling manual pages use Thu, 19 Mar 2015 18:31:48 +0100 -- use Unicode U+2500 to U+256C for table borders - in tbl(7) -Tutf-8 output - suggested by bentley@ Tue, 14 Oct 2014 04:10:55 -0600 - loc * exist ** algo * size * imp ** - -- implement horizontal and vertical alignment in HTML output - pali dot rohar at gmail dot com 16 Jul 2018 13:03:35 +0200 - loc * exist * algo * size * imp *** - -- implement cell spanning in HTML output - pali dot rohar at gmail dot com 16 Jul 2018 13:03:35 +0200 - loc * exist * algo ** size ** imp ** - -- implement table borders in HTML output - pali dot rohar at gmail dot com 16 Jul 2018 13:03:35 +0200 - loc * exist * algo ** size ** imp ** - --- missing eqn features ----------------------------------------------- - In a matrix, break the output line after each matrix line. - Found in the discussion at CDBUG 2015. - Suggested by Avi Weinstock. - loc * exist * algo * size * imp ** + Found in the discussion at CDBUG 2015. Suggested by Avi Weinstock. + This may not be the ideal solution after all: eqn(7) matrices + are lists of columns, so Avi's proposal would show each *column* + on its own *line*, which is likely to cause confusion. + A better solution, but much harder to implement, would be to + actually show the coordinates of column vectors on different + terminal output lines, using the clumnated output facilities + developed for .Bl -tag, .Bl -column, and also used for tbl(7). + loc * exist * algo ** size ** imp ** - The "size" keyword is parsed, but ignored by the formatter. loc * exist * algo * size * imp * @@ -341,9 +271,6 @@ are mere guesses, and some may be wrong. * formatting issues: ugly output ************************************************************************ -- .UR can nest inside .TP, - see roff(7) for examples - - revisit empty in-line macros look at the difference between "Em x Em ." and "Sq x Em ." Carsten Kunze Fri, 12 Dec 2014 00:15:41 +0100 @@ -400,6 +327,8 @@ are mere guesses, and some may be wrong. - a line starting with "\fB something" counts as starting with whitespace and triggers a line break; found in audio/normalize-mp3(1) + This will become easier once escape sequences are represented + by syntax tree nodes. loc ** exist * algo ** size * imp ** - formatting /usr/local/man/man1/latex2man.1 with groff and mandoc @@ -421,17 +350,6 @@ are mere guesses, and some may be wrong. --- HTML issues -------------------------------------------------------- -- wrap Sh and Ss content into

- Laura Morales 21 Apr 2018 18:10:48 +0200 - (Evaluate whether this is really useful and has no adverse - side effects before implementing; if it is possible, - it does seem cleaner.) - loc ** exist ** algo * size * imp *** - -- format ".IP *" etc. as
    rather than
    - https://github.com/Debian/debiman/issues/67 - loc ** exist ** algo ** size * imp *** - - .Bf at the beginning of a paragraph inserts a bogus 1ex horizontal space, see for example random(3). Introduced in http://mdocml.bsd.lv/cgi-bin/cvsweb/mdoc_html.c.diff?r1=1.91&r2=1.92 @@ -558,18 +476,11 @@ are mere guesses, and some may be wrong. all over mdoc_macro.c and all subtly different. loc ** exist ** algo ** size ** imp ** -- style message about suspicious uses of - vs. \- vs. \(mi - e.g. -1 is likely wrong (from the mdoclint TODO) - - warn about punctuation - e.g. ',' and ';' - at the beginning of a text line, if it is likely intended to follow the preceding output without intervening whitespace, in particular after a macro line (from the mdoclint TODO) -- mandoc_special does not really check the escape sequence, - but just the overall format - loc ** exist ** algo *** size ** imp ** - - makewhatis -p complains about language subdirectories: /usr/local/man//ru: Unknown directory part @@ -578,9 +489,6 @@ are mere guesses, and some may be wrong. * documentation issues ************************************************************************ -- dashes, hyphens, and minus signs in manual pages - jmc@ Fri, 28 Mar 2014 07:19:27 +0000 - - mark macros as: page structure domain, manual domain, general text domain is this useful? @@ -606,10 +514,6 @@ are mere guesses, and some may be wrong. Found by Aaron M. Ucko in the GNU Hurd via Bdale Garbee, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829624 -- We use the input line number at several places to distinguish - same-line from different-line input. That plainly doesn't work - with user-defined macros, leading to random breakage. - - Is it possible to further simplify ENDBODY_SPACE? - Find better ways to prevent endless loops @@ -629,8 +533,6 @@ are mere guesses, and some may be wrong. output through libz. - Privilege separation (see OpenSSH). - Enable caching support via HTTP 304 and If-Modified-Since. - - Have Mac OSX systems automatically disable -static compilation of the - CGI: -static isn't supported. ************************************************************************ * to improve in the groff_mdoc(7) macros Modified: head/contrib/mandoc/apropos.1 ============================================================================== --- head/contrib/mandoc/apropos.1 Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/apropos.1 Fri Apr 12 10:13:17 2019 (r346149) @@ -1,7 +1,7 @@ -.\" $Id: apropos.1,v 1.47 2018/02/23 18:54:02 schwarze Exp $ +.\" $Id: apropos.1,v 1.49 2018/11/22 12:33:52 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons -.\" Copyright (c) 2011, 2012, 2014, 2017 Ingo Schwarze +.\" Copyright (c) 2011,2012,2014,2017,2018 Ingo Schwarze .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: February 23 2018 $ +.Dd $Mdocdate: November 22 2018 $ .Dt APROPOS 1 .Os .Sh NAME @@ -51,8 +51,7 @@ searches for .Xr makewhatis 8 databases in the default paths stipulated by .Xr man 1 -and uses case-insensitive substring matching -.Pq the Cm = No operator +and uses case-insensitive extended regular expression matching over manual names and descriptions .Pq the Li \&Nm No and Li \&Nd No macro keys . Multiple terms imply pairwise @@ -93,7 +92,7 @@ format. Search for all words in .Ar expression in manual page names only. -The search is case insensitive and matches whole words only. +The search is case-insensitive and matches whole words only. In this mode, macro keys, comparison operators, and logical operators are not available. .It Fl k @@ -123,7 +122,7 @@ Restrict the search to pages for the specified .Xr machine 1 architecture. .Ar arch -is case insensitive. +is case-insensitive. By default, pages for all architectures are shown. .It Fl s Ar section Restrict the search to the specified section of the manual. @@ -199,7 +198,7 @@ Operator .Cm = evaluates a substring, while .Cm \(ti -evaluates a regular expression. +evaluates a case-sensitive extended regular expression. .It Fl i Ar term If .Ar term @@ -208,26 +207,10 @@ is evaluated case-insensitively. Has no effect on substring terms. .El .Pp -Results are sorted according to the following criteria: -.Bl -enum -.It -The manpath directory tree the page is found in, according to the -order specified with -.Fl M , -.Fl m , -the -.Ev MANPATH -environment variable, the -.Xr man.conf 5 -configuration file, or the default documented in -.Xr man.conf 5 . -.It -The section number in ascending numerical order. -.It -The page name in ascending +Results are sorted first according to the section number in ascending +numerical order, then by the page name in ascending .Xr ascii 7 alphabetical order, case-insensitive. -.El .Pp Each output line is formatted as .Pp @@ -339,7 +322,7 @@ function arguments appearing on .Ic \&Fn lines .It Li \&Fn -fuction names marked up with +function names marked up with .Ic \&Fo macros .It Li \&In @@ -407,7 +390,7 @@ Search for .Qq .cf as a substring of manual names and descriptions: .Pp -.Dl $ apropos .cf +.Dl $ apropos =.cf .Pp Include matches for .Qq .cnf @@ -415,9 +398,9 @@ and .Qq .conf as well: .Pp -.Dl $ apropos .cf .cnf .conf +.Dl $ apropos =.cf =.cnf =.conf .Pp -Search in names and descriptions using a regular expression: +Search in names and descriptions using a case-sensitive regular expression: .Pp .Dl $ apropos \(aq\(tiset.?[ug]id\(aq .Pp @@ -448,6 +431,24 @@ The following two invocations are equivalent: .Xr man 1 , .Xr re_format 7 , .Xr makewhatis 8 +.Sh STANDARDS +The +.Nm +utility is compliant with the +.St -p1003.1-2008 +specification of +.Xr man 1 +.Fl k . +.Pp +All options, the +.Nm whatis +command, support for logical operators, macro keys, +substring matching, sorting of results, the environment variables +.Ev MANPAGER +and +.Ev MANPATH , +the database format, and the configuration file +are extensions to that specification. .Sh HISTORY Part of the functionality of .Nm whatis Copied: head/contrib/mandoc/arch.c (from r346148, vendor/mandoc/dist/arch.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/mandoc/arch.c Fri Apr 12 10:13:17 2019 (r346149, copy of r346148, vendor/mandoc/dist/arch.c) @@ -0,0 +1,54 @@ +/* $Id: arch.c,v 1.14 2019/03/04 13:01:57 schwarze Exp $ */ +/* + * Copyright (c) 2017, 2019 Ingo Schwarze + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +#include "config.h" + +#include + +#include "roff.h" + +int +arch_valid(const char *arch, enum mandoc_os os) +{ + const char *openbsd_arch[] = { + "alpha", "amd64", "arm64", "armv7", "hppa", "i386", + "landisk", "loongson", "luna88k", "macppc", "mips64", + "octeon", "sgi", "socppc", "sparc64", NULL + }; + const char *netbsd_arch[] = { + "acorn26", "acorn32", "algor", "alpha", "amiga", + "arc", "atari", + "bebox", "cats", "cesfic", "cobalt", "dreamcast", + "emips", "evbarm", "evbmips", "evbppc", "evbsh3", "evbsh5", + "hp300", "hpcarm", "hpcmips", "hpcsh", "hppa", + "i386", "ibmnws", "luna68k", + "mac68k", "macppc", "mipsco", "mmeye", "mvme68k", "mvmeppc", + "netwinder", "news68k", "newsmips", "next68k", + "pc532", "playstation2", "pmax", "pmppc", "prep", + "sandpoint", "sbmips", "sgimips", "shark", + "sparc", "sparc64", "sun2", "sun3", + "vax", "walnut", "x68k", "x86", "x86_64", "xen", NULL + }; + const char **arches[] = { NULL, netbsd_arch, openbsd_arch }; + const char **arch_p; + + if ((arch_p = arches[os]) == NULL) + return 1; + for (; *arch_p != NULL; arch_p++) + if (strcmp(*arch_p, arch) == 0) + return 1; + return 0; +} Modified: head/contrib/mandoc/att.c ============================================================================== --- head/contrib/mandoc/att.c Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/att.c Fri Apr 12 10:13:17 2019 (r346149) @@ -1,4 +1,4 @@ -/* $Id: att.c,v 1.16 2017/06/24 14:38:32 schwarze Exp $ */ +/* $Id: att.c,v 1.18 2018/12/13 11:55:46 schwarze Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -19,9 +19,7 @@ #include #include -#include "mandoc.h" #include "roff.h" -#include "mdoc.h" #include "libmdoc.h" #define LINE(x, y) \ Modified: head/contrib/mandoc/cgi.c ============================================================================== --- head/contrib/mandoc/cgi.c Fri Apr 12 05:43:01 2019 (r346148) +++ head/contrib/mandoc/cgi.c Fri Apr 12 10:13:17 2019 (r346149) @@ -1,7 +1,7 @@ -/* $Id: cgi.c,v 1.158 2018/05/29 20:32:45 schwarze Exp $ */ +/* $Id: cgi.c,v 1.166 2019/03/06 12:32:41 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons - * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze + * Copyright (c) 2014, 2015, 2016, 2017, 2018 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -38,6 +38,7 @@ #include "roff.h" #include "mdoc.h" #include "man.h" +#include "mandoc_parse.h" #include "main.h" #include "manconf.h" #include "mansearch.h" @@ -69,6 +70,7 @@ enum focus { static void html_print(const char *); static void html_putchar(char); static int http_decode(char *); +static void http_encode(const char *p); static void parse_manpath_conf(struct req *); static void parse_path_info(struct req *req, const char *path); static void parse_query_string(struct req *, const char *); @@ -90,6 +92,7 @@ static void resp_format(const struct req *, const ch static void resp_searchform(const struct req *, enum focus); static void resp_show(const struct req *, const char *); static void set_query_attr(char **, char **); +static int validate_arch(const char *); static int validate_filename(const char *); static int validate_manpath(const struct req *, const char *); static int validate_urifrag(const char *); @@ -316,6 +319,18 @@ http_decode(char *p) } static void +http_encode(const char *p) +{ + for (; *p != '\0'; p++) { + if (isalnum((unsigned char)*p) == 0 && + strchr("-._~", *p) == NULL) + printf("%%%2.2X", (unsigned char)*p); + else + putchar(*p); + } +} + +static void resp_begin_http(int code, const char *msg) { @@ -490,6 +505,18 @@ validate_manpath(const struct req *req, const char* ma } static int +validate_arch(const char *arch) +{ + int i; + + for (i = 0; i < arch_MAX; i++) + if (strcmp(arch, arch_names[i]) == 0) + return 1; + + return 0; +} + +static int validate_filename(const char *file) { @@ -562,9 +589,11 @@ pg_redirect(const struct req *req, const char *name) printf("%s/", req->q.manpath); if (req->q.arch != NULL) printf("%s/", req->q.arch); - printf("%s", name); - if (req->q.sec != NULL) - printf(".%s", req->q.sec); + http_encode(name); + if (req->q.sec != NULL) { + putchar('.'); + http_encode(req->q.sec); + } printf("\r\nContent-Type: text/html; charset=utf-8\r\n\r\n"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Fri Apr 12 10:50:53 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13BBA1578DCD; Fri, 12 Apr 2019 10:50:53 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.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 7776F6E790; Fri, 12 Apr 2019 10:50:52 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x3CAojBw075999; Fri, 12 Apr 2019 03:50:45 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x3CAoj7i075998; Fri, 12 Apr 2019 03:50:45 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904121050.x3CAoj7i075998@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346096 - head/sys/arm/conf In-Reply-To: <20190412120950.dd0aae47e93ba7b50aaa47c6@bidouilliste.com> To: Emmanuel Vadot Date: Fri, 12 Apr 2019 03:50:45 -0700 (PDT) CC: Svatopluk Kraus , Emmanuel Vadot , 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-Rspamd-Queue-Id: 7776F6E790 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 10:50:53 -0000 > > Hi Svatopluk, > > On Thu, 11 Apr 2019 21:23:35 +0200 > Svatopluk Kraus wrote: > > > I understand the reason for GENERIC. But are we so blind that we will > > delete everything that is not GENERIC? In other words, why to delete > > nice specific KERNEL configurations for boards we support when only > > reason I see is that GENERIC is so cool for some people? > > That's simple and maybe I should have explain more in the commit > message. Those configs aren't tested. All the images that we provide > are using GENERIC kernel so we know that GENERIC is tested (somewhat). > Those config will also lack update if we need to add a new required > pseudo device (like syscon) and maybe it's already the case on some. > The only way (for now) that we could produce board specific kernel > is to include GENERIC and add a bunch of nodevice "blah", which is not > going to happen. We have plan for splitting the GENERIC kernel into soc > familly file, then it would be easier for people to have a SoC kernel > config. > Finaly I guess that when you say "boards we support" you are talking > about RPI2, BEAGLEBONE or maybe PANDABOARD. For me those aren't board > that we support, those are survivors that had the chance to not die in > the past years. No developer care about or work on those boards. I just recently asked about the issue I was having when I last tried to run head/sys/arm/conf/CHROMEBOOK-SNOW which iirc is a derived from head/sys/arm/conf/EXYNOS5420 which is documented in the Wiki as to how to build it, pointing to use the kernel config you just deleted. > > Svatopluk Kraus > > > > > > > > On Wed, Apr 10, 2019 at 9:27 PM Emmanuel Vadot wrote: > > > > > > Author: manu > > > Date: Wed Apr 10 19:27:14 2019 > > > New Revision: 346096 > > > URL: https://svnweb.freebsd.org/changeset/base/346096 > > > > > > Log: > > > arm: kernel: Remove old kernel configs > > > > > > Follow up to r346095 > > > All those kernels are either not working or the release have switched > > > to GENERIC > > > > > > Deleted: > > > head/sys/arm/conf/AML8726 > > > head/sys/arm/conf/BEAGLEBONE > > > head/sys/arm/conf/CHROMEBOOK > > > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT > > > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints > > > head/sys/arm/conf/CHROMEBOOK-SNOW > > > head/sys/arm/conf/CHROMEBOOK-SPRING > > > head/sys/arm/conf/CHROMEBOOK.hints > > > head/sys/arm/conf/EXYNOS5.common > > > head/sys/arm/conf/EXYNOS5250 > > > head/sys/arm/conf/EXYNOS5420 > > > head/sys/arm/conf/ODROIDC1 > > > head/sys/arm/conf/PANDABOARD > > > head/sys/arm/conf/PANDABOARD.hints > > > head/sys/arm/conf/RADXA > > > head/sys/arm/conf/RADXA-LITE > > > head/sys/arm/conf/RK3188 > > > head/sys/arm/conf/RPI2 > > > > > > -- > Emmanuel Vadot > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Fri Apr 12 11:00:09 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 023401579364; Fri, 12 Apr 2019 11:00:09 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 3E5F96EDC8; Fri, 12 Apr 2019 11:00:08 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id 4100f221; Fri, 12 Apr 2019 13:00:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mail; bh=w5qc5POkeeqtUNLJein0yRgcT6E=; b=nU3VWZspe/v5iLr1qTjv1qQjsG+O PK0qGh8FjkLnFL+ixciNtvBTlE+uRGd74x4k2fdKXhMdXYRBSnDp/CvQt137sAde ZqOE0hjUoUoG7nYdwa2wu9d1KDZEX2IfOYU/FsMv9zGt5m3oRjAVrYFyNeSCmobQ QOKix+bfhxRgFFI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; q=dns; s= mail; b=LBaQqZyc7kBimcYosYPnktyzkRnZ3mA5AGwqU4dq1B86lh+2tHevPF4U A5lCBrEpZpeJreIKR8j187HEowHTKt1Hxq5u64MGRsgXSrEbysk+hpSCc9dtQKnQ 1hKbf99xmLDh29ElXzt6pE/rGRW+RNJLH0bIV7QgkJFiaGTF82U= Received: from knuckles.blih.net (ip-9.net-89-3-105.rev.numericable.fr [89.3.105.9]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 90e48c09 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Fri, 12 Apr 2019 13:00:06 +0200 (CEST) Date: Fri, 12 Apr 2019 13:00:06 +0200 From: Emmanuel Vadot To: rgrimes@freebsd.org Cc: "Rodney W. Grimes" , Svatopluk Kraus , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346096 - head/sys/arm/conf Message-Id: <20190412130006.69c99fa562a4d9b6003856cb@bidouilliste.com> In-Reply-To: <201904121050.x3CAoj7i075998@gndrsh.dnsmgr.net> References: <20190412120950.dd0aae47e93ba7b50aaa47c6@bidouilliste.com> <201904121050.x3CAoj7i075998@gndrsh.dnsmgr.net> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 3E5F96EDC8 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 11:00:09 -0000 On Fri, 12 Apr 2019 03:50:45 -0700 (PDT) "Rodney W. Grimes" wrote: > > > > Hi Svatopluk, > > > > On Thu, 11 Apr 2019 21:23:35 +0200 > > Svatopluk Kraus wrote: > > > > > I understand the reason for GENERIC. But are we so blind that we will > > > delete everything that is not GENERIC? In other words, why to delete > > > nice specific KERNEL configurations for boards we support when only > > > reason I see is that GENERIC is so cool for some people? > > > > That's simple and maybe I should have explain more in the commit > > message. Those configs aren't tested. All the images that we provide > > are using GENERIC kernel so we know that GENERIC is tested (somewhat). > > Those config will also lack update if we need to add a new required > > pseudo device (like syscon) and maybe it's already the case on some. > > The only way (for now) that we could produce board specific kernel > > is to include GENERIC and add a bunch of nodevice "blah", which is not > > going to happen. We have plan for splitting the GENERIC kernel into soc > > familly file, then it would be easier for people to have a SoC kernel > > config. > > Finaly I guess that when you say "boards we support" you are talking > > about RPI2, BEAGLEBONE or maybe PANDABOARD. For me those aren't board > > that we support, those are survivors that had the chance to not die in > > the past years. No developer care about or work on those boards. > > I just recently asked about the issue I was having when I last > tried to run > head/sys/arm/conf/CHROMEBOOK-SNOW > which iirc is a derived from > head/sys/arm/conf/EXYNOS5420 > which is documented in the Wiki as to how to build it, > pointing to use the kernel config you just deleted. Is there a question ? Even if you managed to compile this kernel and maybe run it, what's next ? Nobody works on this SoC. I will send some reviews in the next weeks to remove some SoC support. > > > Svatopluk Kraus > > > > > > > > > > > > On Wed, Apr 10, 2019 at 9:27 PM Emmanuel Vadot wrote: > > > > > > > > Author: manu > > > > Date: Wed Apr 10 19:27:14 2019 > > > > New Revision: 346096 > > > > URL: https://svnweb.freebsd.org/changeset/base/346096 > > > > > > > > Log: > > > > arm: kernel: Remove old kernel configs > > > > > > > > Follow up to r346095 > > > > All those kernels are either not working or the release have switched > > > > to GENERIC > > > > > > > > Deleted: > > > > head/sys/arm/conf/AML8726 > > > > head/sys/arm/conf/BEAGLEBONE > > > > head/sys/arm/conf/CHROMEBOOK > > > > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT > > > > head/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints > > > > head/sys/arm/conf/CHROMEBOOK-SNOW > > > > head/sys/arm/conf/CHROMEBOOK-SPRING > > > > head/sys/arm/conf/CHROMEBOOK.hints > > > > head/sys/arm/conf/EXYNOS5.common > > > > head/sys/arm/conf/EXYNOS5250 > > > > head/sys/arm/conf/EXYNOS5420 > > > > head/sys/arm/conf/ODROIDC1 > > > > head/sys/arm/conf/PANDABOARD > > > > head/sys/arm/conf/PANDABOARD.hints > > > > head/sys/arm/conf/RADXA > > > > head/sys/arm/conf/RADXA-LITE > > > > head/sys/arm/conf/RK3188 > > > > head/sys/arm/conf/RPI2 > > > > > > > > > > -- > > Emmanuel Vadot > > > > > > -- > Rod Grimes rgrimes@freebsd.org -- Emmanuel Vadot From owner-svn-src-head@freebsd.org Fri Apr 12 12:46:26 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3A47157BF25; Fri, 12 Apr 2019 12:46:26 +0000 (UTC) (envelope-from tychon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6575772203; Fri, 12 Apr 2019 12:46:26 +0000 (UTC) (envelope-from tychon@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3603B21912; Fri, 12 Apr 2019 12:46:26 +0000 (UTC) (envelope-from tychon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3CCkPGv027681; Fri, 12 Apr 2019 12:46:25 GMT (envelope-from tychon@FreeBSD.org) Received: (from tychon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CCkP2m027680; Fri, 12 Apr 2019 12:46:25 GMT (envelope-from tychon@FreeBSD.org) Message-Id: <201904121246.x3CCkP2m027680@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tychon set sender to tychon@FreeBSD.org using -f From: Tycho Nightingale Date: Fri, 12 Apr 2019 12:46:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346150 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: tychon X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 346150 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6575772203 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 12:46:27 -0000 Author: tychon Date: Fri Apr 12 12:46:25 2019 New Revision: 346150 URL: https://svnweb.freebsd.org/changeset/base/346150 Log: for a cache-only zone the destructor tries to destroy a non-existent keg Reviewed by: markj Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D19835 Modified: head/sys/vm/uma_core.c Modified: head/sys/vm/uma_core.c ============================================================================== --- head/sys/vm/uma_core.c Fri Apr 12 10:13:17 2019 (r346149) +++ head/sys/vm/uma_core.c Fri Apr 12 12:46:25 2019 (r346150) @@ -1916,10 +1916,10 @@ zone_dtor(void *arg, int size, void *udata) */ zone_drain_wait(zone, M_WAITOK); /* - * We only destroy kegs from non secondary zones. + * We only destroy kegs from non secondary/non cache zones. */ - if ((keg = zone->uz_keg) != NULL && - (zone->uz_flags & UMA_ZONE_SECONDARY) == 0) { + if ((zone->uz_flags & (UMA_ZONE_SECONDARY | UMA_ZFLAG_CACHE)) == 0) { + keg = zone->uz_keg; rw_wlock(&uma_rwlock); LIST_REMOVE(keg, uk_link); rw_wunlock(&uma_rwlock); From owner-svn-src-head@freebsd.org Fri Apr 12 14:18:18 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E280E157DC1E; Fri, 12 Apr 2019 14:18:17 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 565067532A; Fri, 12 Apr 2019 14:18:17 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D01F22845; Fri, 12 Apr 2019 14:18:17 +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 x3CEIGJi075038; Fri, 12 Apr 2019 14:18:16 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CEIGRa075037; Fri, 12 Apr 2019 14:18:16 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201904121418.x3CEIGRa075037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Fri, 12 Apr 2019 14:18:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346151 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 346151 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 565067532A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 14:18:18 -0000 Author: trasz Date: Fri Apr 12 14:18:16 2019 New Revision: 346151 URL: https://svnweb.freebsd.org/changeset/base/346151 Log: Remove unneeded conditionals for sv_ functions - all the ABIs (apart from null_sysvec) define them, so the 'else' branch is never taken. Reviewed by: kib MFC after: 2 weeks Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D19889 Modified: head/sys/kern/kern_exec.c Modified: head/sys/kern/kern_exec.c ============================================================================== --- head/sys/kern/kern_exec.c Fri Apr 12 12:46:25 2019 (r346150) +++ head/sys/kern/kern_exec.c Fri Apr 12 14:18:16 2019 (r346151) @@ -679,23 +679,14 @@ interpret: sys_cap_enter(td, NULL); /* - * Copy out strings (args and env) and initialize stack base + * Copy out strings (args and env) and initialize stack base. */ - if (p->p_sysent->sv_copyout_strings) - stack_base = (*p->p_sysent->sv_copyout_strings)(imgp); - else - stack_base = exec_copyout_strings(imgp); + stack_base = (*p->p_sysent->sv_copyout_strings)(imgp); /* - * If custom stack fixup routine present for this process - * let it do the stack setup. - * Else stuff argument count as first item on stack + * Stack setup. */ - if (p->p_sysent->sv_fixup != NULL) - error = (*p->p_sysent->sv_fixup)(&stack_base, imgp); - else - error = suword(--stack_base, imgp->args->argc) == 0 ? - 0 : EFAULT; + error = (*p->p_sysent->sv_fixup)(&stack_base, imgp); if (error != 0) { vn_lock(imgp->vp, LK_SHARED | LK_RETRY); goto exec_fail_dealloc; @@ -880,11 +871,7 @@ interpret: #endif /* Set values passed into the program in registers. */ - if (p->p_sysent->sv_setregs) - (*p->p_sysent->sv_setregs)(td, imgp, - (u_long)(uintptr_t)stack_base); - else - exec_setregs(td, imgp, (u_long)(uintptr_t)stack_base); + (*p->p_sysent->sv_setregs)(td, imgp, (u_long)(uintptr_t)stack_base); vfs_mark_atime(imgp->vp, td->td_ucred); From owner-svn-src-head@freebsd.org Fri Apr 12 14:28:46 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06997157DEBA; Fri, 12 Apr 2019 14:28:46 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 91DC275834; Fri, 12 Apr 2019 14:28:45 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: by mail-oi1-f172.google.com with SMTP id n187so8099378oih.6; Fri, 12 Apr 2019 07:28:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Pk01HWqcJlSl+OHh3Stc+l28ZdzsxcxT1YJViwaW06E=; b=fHvstquL+EvIfMOd0xH9u9CTtr1QRUqBlvMaidlqOqD59sb8o/7BYfLEH5x1HaWAlO wyxzbdZ37PZolPuTwmuzo5e4kGvUFv9sUeU5rg0TrUVZAP5mlJkzqN3iro7McOOu21vJ rQqKS+Ppfg+IOTEZJs+nsIWvUoHYs/TgOeo3/l2W6zM+zTUEp+HdJb67gJMe0Nf88Po4 iV5h8oTnaKax+L90T6E8tkYNs7Gb1iyeFzQ4Ai454bKDQ4ozoPeCnJD5+/OeUysWgCWS sO89pRuol2ILBlt0ueLG6iaYxjcl6YiDYYiQLaMvWcuWlGci7TdmG2jzZDIU9MeMUmrb pD8g== X-Gm-Message-State: APjAAAUt8s5393k+DgiXjafUWBzWb/VEpbMpi5LcWrTLEfKSXdQQBclm nzNo/iMaBIjSW0fxn8FombLQdLyC3z6/QVLeCwsTKw== X-Google-Smtp-Source: APXvYqzRelHR2+08xftsVHssuJsNTVBirfYjdWAK+EbpQjm+WJGDRJ5WY4z56EJ039cXEWj9jk4L8FsCI0DYPS73ubQ= X-Received: by 2002:aca:d595:: with SMTP id m143mr10231633oig.31.1555079318540; Fri, 12 Apr 2019 07:28:38 -0700 (PDT) MIME-Version: 1.0 References: <201904111121.x3BBLj2K023087@repo.freebsd.org> In-Reply-To: From: Edward Napierala Date: Fri, 12 Apr 2019 15:28:26 +0100 Message-ID: Subject: Re: svn commit: r346120 - head/sys/kern To: Conrad Meyer Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 91DC275834 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.93)[-0.931,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 14:28:46 -0000 On Thu, 11 Apr 2019 at 17:26, Conrad Meyer wrote: > > Hi Edward, > > I have a question about this change below. > > On Thu, Apr 11, 2019 at 4:22 AM Edward Tomasz Napierala > wrote: > > > > Author: trasz > > Date: Thu Apr 11 11:21:45 2019 > > New Revision: 346120 > > URL: https://svnweb.freebsd.org/changeset/base/346120 > > > > Log: > > Use shared vnode locks for the ELF interpreter. [..] > On the one hand, perhaps VOP_IS_TEXT() is rarely false for common > interpreters anyway. On the other hand, there is sort of a > renaissance of static linking happening. So maybe the thought is, > !VOP_IS_TEXT is likely to be rare, and LK_UPGRADE success even more > rare, so why bother writing additional code for it? Konstantin already answered to most of the points, but regarding this one: that's exactly the case. In a typical case, the number of times this code path will be executed is zero. I'd expect one - when running dynamically linked ELF binary for the first time - but for some reason in that case lookup() returns with the exclusive vnode lock already held. From owner-svn-src-head@freebsd.org Fri Apr 12 15:20:11 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 993FA157F1B7; Fri, 12 Apr 2019 15:20:11 +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 D3814778D5; Fri, 12 Apr 2019 15:20:07 +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 x3CFJw8W052294 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 12 Apr 2019 18:20:01 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua x3CFJw8W052294 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id x3CFJwLA052293; Fri, 12 Apr 2019 18:19:58 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 12 Apr 2019 18:19:58 +0300 From: Konstantin Belousov To: Edward Napierala Cc: Conrad Meyer , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r346120 - head/sys/kern Message-ID: <20190412151958.GB1923@kib.kiev.ua> References: <201904111121.x3BBLj2K023087@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 15:20:11 -0000 On Fri, Apr 12, 2019 at 03:28:26PM +0100, Edward Napierala wrote: > On Thu, 11 Apr 2019 at 17:26, Conrad Meyer wrote: > > > > Hi Edward, > > > > I have a question about this change below. > > > > On Thu, Apr 11, 2019 at 4:22 AM Edward Tomasz Napierala > > wrote: > > > > > > Author: trasz > > > Date: Thu Apr 11 11:21:45 2019 > > > New Revision: 346120 > > > URL: https://svnweb.freebsd.org/changeset/base/346120 > > > > > > Log: > > > Use shared vnode locks for the ELF interpreter. > > [..] > > > On the one hand, perhaps VOP_IS_TEXT() is rarely false for common > > interpreters anyway. On the other hand, there is sort of a > > renaissance of static linking happening. So maybe the thought is, > > !VOP_IS_TEXT is likely to be rare, and LK_UPGRADE success even more > > rare, so why bother writing additional code for it? > > Konstantin already answered to most of the points, but regarding > this one: that's exactly the case. In a typical case, the number of times > this code path will be executed is zero. I'd expect one - when running > dynamically linked ELF binary for the first time - but for some reason in > that case lookup() returns with the exclusive vnode lock already held. This is strange. Which filesystem do you use ? From owner-svn-src-head@freebsd.org Fri Apr 12 15:30:17 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 854C1157F4B9; Fri, 12 Apr 2019 15:30:17 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2013577F1F; Fri, 12 Apr 2019 15:30:16 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: by mail-ot1-f47.google.com with SMTP id d24so8703016otl.11; Fri, 12 Apr 2019 08:30:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Bwp9OI+PryeC3EcGPyQ0PgZsrrXnl2dGeRy67DQHpic=; b=OwnB6xJmEfy+3wbJ15CI60j6TNBholbJllTrCqUdIdCCl9VulESgMo6sXBZ9gZTZEF uFLdHZ7xpQjx87QDVUN9EaGlpC/iK7e/4kQ/4WWW69lSrAfC68J0Bhcv0ybMBs8QAoGK w+euKDRGqakBK+87NHwVkK6sP4E9SeswERrFR1+5hWP9usUUWGYmWon/F7ot9xPu0P0+ 9rkRTLBRgUiZnESS0iEeXaTHNgHpJUoaFEupP+AUkOB8UejYaLZFy96Y6g5rfpVGaDFe X9/9il7ppYF97R9JhQ1waSYvNY0tNmgV8xUR4ylnpUu0mI19Ual//cbbOK8bWW163J/m ezOA== X-Gm-Message-State: APjAAAV6pswsykzKXTBXQBD/R9WcjeSdan5aNsV8glx0anbzzS5xXYpa b+O2aZqyenQmrBcpNwa+IscYZqBtjz73mPKrSRw= X-Google-Smtp-Source: APXvYqx0xzJWVnnam48qekdL5Qu6An59iXF166Zu8S2wh8CpVMlgoGQKU1jJp6qHfxU1tDGkVaJxwzbu22/ozuv8djs= X-Received: by 2002:a9d:27e9:: with SMTP id c96mr37823246otb.206.1555082626454; Fri, 12 Apr 2019 08:23:46 -0700 (PDT) MIME-Version: 1.0 References: <201904111121.x3BBLj2K023087@repo.freebsd.org> <20190412151958.GB1923@kib.kiev.ua> In-Reply-To: <20190412151958.GB1923@kib.kiev.ua> From: Edward Napierala Date: Fri, 12 Apr 2019 16:23:35 +0100 Message-ID: Subject: Re: svn commit: r346120 - head/sys/kern To: Konstantin Belousov Cc: Conrad Meyer , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 2013577F1F X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.945,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 15:30:17 -0000 On Fri, 12 Apr 2019 at 16:20, Konstantin Belousov wrote: > > On Fri, Apr 12, 2019 at 03:28:26PM +0100, Edward Napierala wrote: > > On Thu, 11 Apr 2019 at 17:26, Conrad Meyer wrote: > > > > > > Hi Edward, > > > > > > I have a question about this change below. > > > > > > On Thu, Apr 11, 2019 at 4:22 AM Edward Tomasz Napierala > > > wrote: > > > > > > > > Author: trasz > > > > Date: Thu Apr 11 11:21:45 2019 > > > > New Revision: 346120 > > > > URL: https://svnweb.freebsd.org/changeset/base/346120 > > > > > > > > Log: > > > > Use shared vnode locks for the ELF interpreter. > > > > [..] > > > > > On the one hand, perhaps VOP_IS_TEXT() is rarely false for common > > > interpreters anyway. On the other hand, there is sort of a > > > renaissance of static linking happening. So maybe the thought is, > > > !VOP_IS_TEXT is likely to be rare, and LK_UPGRADE success even more > > > rare, so why bother writing additional code for it? > > > > Konstantin already answered to most of the points, but regarding > > this one: that's exactly the case. In a typical case, the number of times > > this code path will be executed is zero. I'd expect one - when running > > dynamically linked ELF binary for the first time - but for some reason in > > that case lookup() returns with the exclusive vnode lock already held. > > This is strange. Which filesystem do you use ? UFS. From owner-svn-src-head@freebsd.org Fri Apr 12 16:43:45 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96D001581085; Fri, 12 Apr 2019 16:43:45 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 12DF182D76; Fri, 12 Apr 2019 16:43:45 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf1-x42b.google.com with SMTP id c207so5411364pfc.7; Fri, 12 Apr 2019 09:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=mU6fAFE3OvYtMtBNVmFfrWQvphk1gvSs1jnvE13qY/8=; b=Vikw/DozW8MPeKADRwdVEygurJCnSXSmpXz25m7ldefGlmsUZ0JDSO1VnscVW03ot9 2qBOMHmFKBCvoaPhPnX3SiU6R9Tx3ulYkcX4HqqLJayMaK6/2FDbeiHiNS7RCudNj7ns 1i2OZBFZhxKW2j+aBPDaWbEgbCEafhinRn2+/u9KSYS7KjKNuPwNDSGex6ybMVhxbin4 fMSI6okpBy4xmZVTrng51t3aUTG7NgD6a3mnvgW3rbgjd8B/ppunj/WqFPDpmnujX6VO 5K9h6REYpe0Om88ayihcjA2FvnCwacgDTFbwhFnb7vyFS4g/RB6D4+9/SxG6ASLx1/FQ W11A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=mU6fAFE3OvYtMtBNVmFfrWQvphk1gvSs1jnvE13qY/8=; b=a7Zc6/Yb6PVppp+Jm1UAFCFo0Aj8NNFOgXSfVqU+/MUqvMOFyywkTHpwMsZuvkcSCE 3+pblI5iPBOMzmZXsmIlYLXrOZVVApNcYrwY2iwLxf3jpne81Rg1FjlmcphayRyoXJDm 1/4rn4hpXvpWyZuqLdfZR/vSw6KWHYFlTKa6HrwwFjY/KL4kKFmcR6dt3Rd53WvWBy1k sf21ih6jo3Eh534F7fwIodCxLHjD7Ssh5tKNKeFS61vlTbJYU7HRhrVTsJkSbhgdrtxk FtDF7lgnLgizN7xZlUpiPsQPxc4jecoVPvYJ5DVzrZ/hyznq/28L5wKLjmMlJdZ6nkLb t2Vg== X-Gm-Message-State: APjAAAWDNOgGzyxAj6O5wJVTiTgUeppoHD39aN+8ZPRGddEJEFluqxim LebAMFvyCL+weFfA2XKI1AktXgfZMbg= X-Google-Smtp-Source: APXvYqyNaQXiWL6G6LGjgEMax3c0ROk2BC3zNH7UxxAgCQgQqcd7sT3JlCxz9zfyM2BSC9xCGWE6Qw== X-Received: by 2002:a63:61d7:: with SMTP id v206mr55397769pgb.349.1555087423453; Fri, 12 Apr 2019 09:43:43 -0700 (PDT) Received: from [192.168.20.7] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id h20sm60891004pfj.40.2019.04.12.09.43.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 09:43:42 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: svn commit: r346150 - head/sys/vm From: Enji Cooper In-Reply-To: <201904121246.x3CCkP2m027680@repo.freebsd.org> Date: Fri, 12 Apr 2019 09:43:41 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: <94A39E35-A8E0-42A4-8467-096D4AAD0F89@gmail.com> References: <201904121246.x3CCkP2m027680@repo.freebsd.org> To: Tycho Nightingale X-Mailer: Apple Mail (2.3445.102.3) X-Rspamd-Queue-Id: 12DF182D76 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 16:43:45 -0000 > On Apr 12, 2019, at 5:46 AM, Tycho Nightingale wrote: > > Author: tychon > Date: Fri Apr 12 12:46:25 2019 > New Revision: 346150 > URL: https://svnweb.freebsd.org/changeset/base/346150 > > Log: > for a cache-only zone the destructor tries to destroy a non-existent keg > > Reviewed by: markj > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D19835 Hi Tycho! Is the goal of this change to prevent a panic (with an INVARIANTS kernel)? Thank you! -Enji From owner-svn-src-head@freebsd.org Fri Apr 12 17:07:04 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19DFB1581945; Fri, 12 Apr 2019 17:07:04 +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 E392A83A3B; Fri, 12 Apr 2019 17:07:02 +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 x3CH6sp9077561 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 12 Apr 2019 20:06:58 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua x3CH6sp9077561 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id x3CH6sJu077560; Fri, 12 Apr 2019 20:06:54 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 12 Apr 2019 20:06:54 +0300 From: Konstantin Belousov To: Edward Napierala Cc: Conrad Meyer , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r346120 - head/sys/kern Message-ID: <20190412170654.GI1923@kib.kiev.ua> References: <201904111121.x3BBLj2K023087@repo.freebsd.org> <20190412151958.GB1923@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 17:07:04 -0000 On Fri, Apr 12, 2019 at 04:23:35PM +0100, Edward Napierala wrote: > On Fri, 12 Apr 2019 at 16:20, Konstantin Belousov wrote: > > > > On Fri, Apr 12, 2019 at 03:28:26PM +0100, Edward Napierala wrote: > > > On Thu, 11 Apr 2019 at 17:26, Conrad Meyer wrote: > > > > > > > > Hi Edward, > > > > > > > > I have a question about this change below. > > > > > > > > On Thu, Apr 11, 2019 at 4:22 AM Edward Tomasz Napierala > > > > wrote: > > > > > > > > > > Author: trasz > > > > > Date: Thu Apr 11 11:21:45 2019 > > > > > New Revision: 346120 > > > > > URL: https://svnweb.freebsd.org/changeset/base/346120 > > > > > > > > > > Log: > > > > > Use shared vnode locks for the ELF interpreter. > > > > > > [..] > > > > > > > On the one hand, perhaps VOP_IS_TEXT() is rarely false for common > > > > interpreters anyway. On the other hand, there is sort of a > > > > renaissance of static linking happening. So maybe the thought is, > > > > !VOP_IS_TEXT is likely to be rare, and LK_UPGRADE success even more > > > > rare, so why bother writing additional code for it? > > > > > > Konstantin already answered to most of the points, but regarding > > > this one: that's exactly the case. In a typical case, the number of times > > > this code path will be executed is zero. I'd expect one - when running > > > dynamically linked ELF binary for the first time - but for some reason in > > > that case lookup() returns with the exclusive vnode lock already held. > > > > This is strange. Which filesystem do you use ? > > UFS. I see. UFS has to use exclusive locking in ffs_vget() when the vnode is created, i.e. de-facto when inode is read from the volume. See the manipulations of flags in ffs_vgetf() right after vfs_hash_get() was unable to find a cached vnode. But if you just installed new /libexec/ld-elf.so.1, or the binary uses some other interpreter which was written right before the execve(2) call, then vnode most likely is still cached and is returned shared-locked. Use this scenario to actually test the code. From owner-svn-src-head@freebsd.org Fri Apr 12 17:11:51 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C4DB1581B9E; Fri, 12 Apr 2019 17:11:51 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3D9F183E9E; Fri, 12 Apr 2019 17:11:51 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E06AD246BC; Fri, 12 Apr 2019 17:11:50 +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 x3CHBoHH075069; Fri, 12 Apr 2019 17:11:50 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CHBoeu075068; Fri, 12 Apr 2019 17:11:50 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904121711.x3CHBoeu075068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 12 Apr 2019 17:11:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346157 - head/sys/fs/tmpfs X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/fs/tmpfs X-SVN-Commit-Revision: 346157 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3D9F183E9E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 17:11:51 -0000 Author: kib Date: Fri Apr 12 17:11:50 2019 New Revision: 346157 URL: https://svnweb.freebsd.org/changeset/base/346157 Log: Ignore doomed vnodes in tmpfs_update_mtime(). Otherwise we might dereference NULL vp->v_data after VP_TO_TMPFS_NODE(). Reported and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vfsops.c Fri Apr 12 15:15:27 2019 (r346156) +++ head/sys/fs/tmpfs/tmpfs_vfsops.c Fri Apr 12 17:11:50 2019 (r346157) @@ -173,7 +173,7 @@ tmpfs_update_mtime(struct mount *mp, bool lazy) * metadata changes now. */ if (!lazy || (obj->flags & OBJ_TMPFS_DIRTY) != 0) { - if (vget(vp, LK_EXCLUSIVE | LK_RETRY | LK_INTERLOCK, + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, curthread) != 0) continue; tmpfs_check_mtime(vp); From owner-svn-src-head@freebsd.org Fri Apr 12 17:27:20 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2AFEC1581EEE; Fri, 12 Apr 2019 17:27:20 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BB88C84A2F; Fri, 12 Apr 2019 17:27:19 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92B9D2489B; Fri, 12 Apr 2019 17:27:19 +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 x3CHRJaQ080840; Fri, 12 Apr 2019 17:27:19 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CHRJnh080839; Fri, 12 Apr 2019 17:27:19 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904121727.x3CHRJnh080839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 12 Apr 2019 17:27:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346158 - head/lib/libthr/thread X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/lib/libthr/thread X-SVN-Commit-Revision: 346158 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BB88C84A2F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 17:27:20 -0000 Author: kib Date: Fri Apr 12 17:27:19 2019 New Revision: 346158 URL: https://svnweb.freebsd.org/changeset/base/346158 Log: Do not access mutex memory after unlock. PR: 237195 Reported by: freebsd@hurrikhan.eu Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/lib/libthr/thread/thr_mutex.c Modified: head/lib/libthr/thread/thr_mutex.c ============================================================================== --- head/lib/libthr/thread/thr_mutex.c Fri Apr 12 17:11:50 2019 (r346157) +++ head/lib/libthr/thread/thr_mutex.c Fri Apr 12 17:27:19 2019 (r346158) @@ -949,7 +949,7 @@ mutex_unlock_common(struct pthread_mutex *m, bool cv, { struct pthread *curthread; uint32_t id; - int deferred, error, robust; + int deferred, error, private, robust; if (__predict_false(m <= THR_MUTEX_DESTROYED)) { if (m == THR_MUTEX_DESTROYED) @@ -967,6 +967,7 @@ mutex_unlock_common(struct pthread_mutex *m, bool cv, return (EPERM); error = 0; + private = (m->m_flags & PMUTEX_FLAG_PRIVATE) != 0; if (__predict_false(PMUTEX_TYPE(m->m_flags) == PTHREAD_MUTEX_RECURSIVE && m->m_count > 0)) { m->m_count--; @@ -991,7 +992,7 @@ mutex_unlock_common(struct pthread_mutex *m, bool cv, if (robust) _mutex_leave_robust(curthread, m); } - if (!cv && m->m_flags & PMUTEX_FLAG_PRIVATE) + if (!cv && private) THR_CRITICAL_LEAVE(curthread); return (error); } From owner-svn-src-head@freebsd.org Fri Apr 12 18:13:58 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF33A1582BAF; Fri, 12 Apr 2019 18:13:58 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 82CED86589; Fri, 12 Apr 2019 18:13:58 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D27A25112; Fri, 12 Apr 2019 18:13:58 +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 x3CIDw5l006815; Fri, 12 Apr 2019 18:13:58 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CIDwow006814; Fri, 12 Apr 2019 18:13:58 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201904121813.x3CIDwow006814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 12 Apr 2019 18:13:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346159 - head/usr.sbin/bhyve X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/usr.sbin/bhyve X-SVN-Commit-Revision: 346159 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 82CED86589 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 18:13:59 -0000 Author: mav Date: Fri Apr 12 18:13:57 2019 New Revision: 346159 URL: https://svnweb.freebsd.org/changeset/base/346159 Log: Fix thread name buffer overflow. MFC after: 1 week Modified: head/usr.sbin/bhyve/pci_virtio_scsi.c Modified: head/usr.sbin/bhyve/pci_virtio_scsi.c ============================================================================== --- head/usr.sbin/bhyve/pci_virtio_scsi.c Fri Apr 12 17:27:19 2019 (r346158) +++ head/usr.sbin/bhyve/pci_virtio_scsi.c Fri Apr 12 18:13:57 2019 (r346159) @@ -634,7 +634,7 @@ pci_vtscsi_init_queue(struct pci_vtscsi_softc *sc, struct pci_vtscsi_queue *queue, int num) { struct pci_vtscsi_worker *worker; - char threadname[16]; + char tname[MAXCOMLEN + 1]; int i; queue->vsq_sc = sc; @@ -653,8 +653,8 @@ pci_vtscsi_init_queue(struct pci_vtscsi_softc *sc, pthread_create(&worker->vsw_thread, NULL, &pci_vtscsi_proc, (void *)worker); - sprintf(threadname, "virtio-scsi:%d-%d", num, i); - pthread_set_name_np(worker->vsw_thread, threadname); + snprintf(tname, sizeof(tname), "vtscsi:%d-%d", num, i); + pthread_set_name_np(worker->vsw_thread, tname); LIST_INSERT_HEAD(&queue->vsq_workers, worker, vsw_link); } From owner-svn-src-head@freebsd.org Fri Apr 12 18:35:15 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A15315830D0; Fri, 12 Apr 2019 18:35:15 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DD97986E93; Fri, 12 Apr 2019 18:35:14 +0000 (UTC) (envelope-from lwhsu@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9D0D2545E; Fri, 12 Apr 2019 18:35:14 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3CIZE4g017601; Fri, 12 Apr 2019 18:35:14 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CIZETP017600; Fri, 12 Apr 2019 18:35:14 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201904121835.x3CIZETP017600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 12 Apr 2019 18:35:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346160 - head/usr.bin/mandoc X-SVN-Group: head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/usr.bin/mandoc X-SVN-Commit-Revision: 346160 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DD97986E93 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 18:35:15 -0000 Author: lwhsu Date: Fri Apr 12 18:35:14 2019 New Revision: 346160 URL: https://svnweb.freebsd.org/changeset/base/346160 Log: Suppress old gcc warning about null format string This is workaround to make head build on gcc using architectures Sponsored by: The FreeBSD Foundation MFC-with: r346149 Modified: head/usr.bin/mandoc/Makefile Modified: head/usr.bin/mandoc/Makefile ============================================================================== --- head/usr.bin/mandoc/Makefile Fri Apr 12 18:13:57 2019 (r346159) +++ head/usr.bin/mandoc/Makefile Fri Apr 12 18:35:14 2019 (r346160) @@ -97,6 +97,8 @@ SRCS= ${LIB_SRCS} \ WARNS?= 3 CFLAGS+= -DHAVE_CONFIG_H \ -I${SRCTOP}/lib/libopenbsd/ +# This can be removed after swtiching to newer gcc +CFLAGS.gcc+= -Wno-format LIBADD= openbsd z .include From owner-svn-src-head@freebsd.org Fri Apr 12 18:53:50 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 429C915836E9; Fri, 12 Apr 2019 18:53:50 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9EA7387D22; Fri, 12 Apr 2019 18:53:49 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pl1-x641.google.com with SMTP id ck15so5556803plb.3; Fri, 12 Apr 2019 11:53:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=uk0OB20tesp9reowQTeBm/DB1OIyuoe42IoOngOM568=; b=kGJhUZ6BR+oZacs0WTiau7gMsjvfh0S+xrHz7MCH+qquew9wFmyc+YEggtLgT4N7oq 5T/MNI84QZNj5Z9nHB3fsttqpjlF7QVgzHq1Gz4ZTE+JBqksFek66fbbX9PcpfmDSoYt 8JrwzQjqCGYzhw+pghqxVKcIQYPUPbV9XJR27fS6mMd5qAMF0Mq+DANIkomosz1+7j32 mfmQg6hGMN2lTWWCBK1ORJbHEHrT6UoG/eRxQZt/n0SVpqP8xG/7TOSHSPJn+PJFOS58 5kKFlGzutppsqQw36N4K5XoImlCkaaoyUV89+rLLhyv+xAeLp5xM7enIXunZfOickbDP fdeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=uk0OB20tesp9reowQTeBm/DB1OIyuoe42IoOngOM568=; b=GlBmkh47NFvCre0M4CSGrM0iXwnXYAIrbeS0b/QmeM6xW5XqHITtSKexThREo9d26y nblMPl2vpQV3bHxawLHFsPMGu1Z5cwmRhL9kIpuvPXaW3FJ4GVzq/tXGT5hn/3GCVInl uEpyGwE1teo2IliNgkg/9iwr6nqUP/AqKSUcqMLJ/Jxlu7Xk73C2dqd8GIzKcAMUylQa TC/Om5LIhb5mCsfso0YS8w4LW8dYjAhTraudWnPrG5Xx6L4ZdCpoIy2JcFlZzGu7tlLO tmF++N5E7Bw8mTYpi2ZZmU/XtZgoVBmlvhW4aUNQ9J8rjRTvSGcdL4pzPlVJQrfNunv6 BT0Q== X-Gm-Message-State: APjAAAWxP53OiPNq1gnykXAPX+qWleAWPUrQwuysDPWskt+yrB3dShyF FaywA2xI2H/xNA0TonRWxIbirlWVPIg= X-Google-Smtp-Source: APXvYqyd8YzXJuHw+TRo2T5bOqRGm4OraEXVb/luyvUeXpqFpSI5IUx7ize06YNr2PLZ/TZL/SsSGg== X-Received: by 2002:a17:902:b489:: with SMTP id y9mr50623702plr.17.1555095228001; Fri, 12 Apr 2019 11:53:48 -0700 (PDT) Received: from [192.168.20.7] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id s9sm30096542pfe.183.2019.04.12.11.53.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 11:53:47 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: svn commit: r346160 - head/usr.bin/mandoc From: Enji Cooper In-Reply-To: <201904121835.x3CIZETP017600@repo.freebsd.org> Date: Fri, 12 Apr 2019 11:53:45 -0700 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <5DF1F115-692D-48B7-A52C-AD1BF5E738E5@gmail.com> References: <201904121835.x3CIZETP017600@repo.freebsd.org> To: Li-Wen Hsu X-Mailer: Apple Mail (2.3445.102.3) X-Rspamd-Queue-Id: 9EA7387D22 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.985,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 18:53:50 -0000 > On Apr 12, 2019, at 11:35 AM, Li-Wen Hsu wrote: >=20 > Author: lwhsu > Date: Fri Apr 12 18:35:14 2019 > New Revision: 346160 > URL: https://svnweb.freebsd.org/changeset/base/346160 >=20 > Log: > Suppress old gcc warning about null format string >=20 > This is workaround to make head build on gcc using architectures >=20 > Sponsored by: The FreeBSD Foundation > MFC-with: r346149 >=20 > Modified: > head/usr.bin/mandoc/Makefile >=20 > Modified: head/usr.bin/mandoc/Makefile > = =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/usr.bin/mandoc/Makefile Fri Apr 12 18:13:57 2019 = (r346159) > +++ head/usr.bin/mandoc/Makefile Fri Apr 12 18:35:14 2019 = (r346160) > @@ -97,6 +97,8 @@ SRCS=3D ${LIB_SRCS} \ > WARNS?=3D 3 > CFLAGS+=3D -DHAVE_CONFIG_H \ > -I${SRCTOP}/lib/libopenbsd/ > +# This can be removed after swtiching to newer gcc > +CFLAGS.gcc+=3D -Wno-format > LIBADD=3D openbsd z >=20 > .include Couldn=E2=80=99t this be fixed upstream and pulled back in, = instead of ignoring the warning? Cheers, -Enji= From owner-svn-src-head@freebsd.org Fri Apr 12 18:54:10 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 582571583708; Fri, 12 Apr 2019 18:54:10 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB4D187E13; Fri, 12 Apr 2019 18:54:09 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5558257EA; Fri, 12 Apr 2019 18:54:09 +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 x3CIs9Wv028294; Fri, 12 Apr 2019 18:54:09 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CIs96c028293; Fri, 12 Apr 2019 18:54:09 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201904121854.x3CIs96c028293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 12 Apr 2019 18:54:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346161 - head/sys/dev/virtio/scsi X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/dev/virtio/scsi X-SVN-Commit-Revision: 346161 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EB4D187E13 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 18:54:10 -0000 Author: mav Date: Fri Apr 12 18:54:09 2019 New Revision: 346161 URL: https://svnweb.freebsd.org/changeset/base/346161 Log: Fix SCSI sense data pass through. MFC after: 1 week Sponsored by: iXsystems, Inc. Modified: head/sys/dev/virtio/scsi/virtio_scsi.c Modified: head/sys/dev/virtio/scsi/virtio_scsi.c ============================================================================== --- head/sys/dev/virtio/scsi/virtio_scsi.c Fri Apr 12 18:35:14 2019 (r346160) +++ head/sys/dev/virtio/scsi/virtio_scsi.c Fri Apr 12 18:54:09 2019 (r346161) @@ -1310,8 +1310,7 @@ vtscsi_complete_scsi_cmd_response(struct vtscsi_softc else csio->sense_resid = 0; - bzero(&csio->sense_data, sizeof(csio->sense_data)); - memcpy(cmd_resp->sense, &csio->sense_data, + memcpy(&csio->sense_data, cmd_resp->sense, csio->sense_len - csio->sense_resid); } From owner-svn-src-head@freebsd.org Fri Apr 12 20:03:39 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 419F21584E7C; Fri, 12 Apr 2019 20:03:39 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: from mail-yw1-f66.google.com (mail-yw1-f66.google.com [209.85.161.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C657D8A5BA; Fri, 12 Apr 2019 20:03:38 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: by mail-yw1-f66.google.com with SMTP id z9so3822394ywd.6; Fri, 12 Apr 2019 13:03:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=X6NDRV5pJO06b5BWHorTbbR2N6Hw/fi29QZrMYBgIjc=; b=ahMxWbfL0h3oOiwjaGQdPSt/OZEG24XsNFuew4QGhW5OSt5/wJs7GJL1D5RefhkpYN 24DSv0aU+5ESYeHhDwxrWt9kAvCFW8f8Nn0iT6LFJpVbg5NjD9IcN0ZH2sRBAxkPsSOk 5/B6o6JVHEEkLj5Bl16fHZSc3Rkq+3dgzLVqSvJS31ByqXV8jFtkFm/4KSe2Vk9Mmf/h q+V9nPFWlkCeNmNvJ1ooSH1ehI4+/pdVnhq7hhhyJ3Em5ras4dp0A9I3E+eVv2YYd8PM ugRl2knVvTIT4XIWiDrvu85O9Vg06f1wBD4MYEfaKUEStXXh/5qPi3V2nuFahREbStiw tpig== X-Gm-Message-State: APjAAAUNzmnLTqXrLQ6alwiKG2/5is8gfFucFCdpsJldDcxQaihxw+Ho 1YDNx4UgLk6pgcafH27QyY7B1lw3IrA2U6rl7BQ= X-Google-Smtp-Source: APXvYqzd39/FjJWwmTYqxqlg9Q2TiWaQ1HVn2u3yBhbSZ7H1uUxxMQotrrvhDuVf12UhnUuvHWphLiVMArFlHB2bpNU= X-Received: by 2002:a81:4f10:: with SMTP id d16mr46525924ywb.184.1555098942697; Fri, 12 Apr 2019 12:55:42 -0700 (PDT) MIME-Version: 1.0 References: <201904121835.x3CIZETP017600@repo.freebsd.org> <5DF1F115-692D-48B7-A52C-AD1BF5E738E5@gmail.com> In-Reply-To: <5DF1F115-692D-48B7-A52C-AD1BF5E738E5@gmail.com> From: Li-Wen Hsu Date: Sat, 13 Apr 2019 04:55:30 +0900 Message-ID: Subject: Re: svn commit: r346160 - head/usr.bin/mandoc To: Enji Cooper Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: C657D8A5BA X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 20:03:39 -0000 On Sat, Apr 13, 2019 at 3:53 AM Enji Cooper wrote: > > > > On Apr 12, 2019, at 11:35 AM, Li-Wen Hsu wrote: > > > > Author: lwhsu > > Date: Fri Apr 12 18:35:14 2019 > > New Revision: 346160 > > URL: https://svnweb.freebsd.org/changeset/base/346160 > > > > Log: > > Suppress old gcc warning about null format string > > > > This is workaround to make head build on gcc using architectures > > > > Sponsored by: The FreeBSD Foundation > > MFC-with: r346149 > > > > Modified: > > head/usr.bin/mandoc/Makefile > > > > Modified: head/usr.bin/mandoc/Makefile > > =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/usr.bin/mandoc/Makefile Fri Apr 12 18:13:57 2019 (= r346159) > > +++ head/usr.bin/mandoc/Makefile Fri Apr 12 18:35:14 2019 (= r346160) > > @@ -97,6 +97,8 @@ SRCS=3D ${LIB_SRCS} \ > > WARNS?=3D 3 > > CFLAGS+=3D -DHAVE_CONFIG_H \ > > -I${SRCTOP}/lib/libopenbsd/ > > +# This can be removed after swtiching to newer gcc > > +CFLAGS.gcc+=3D -Wno-format > > LIBADD=3D openbsd z > > > > .include > > Couldn=E2=80=99t this be fixed upstream and pulled back in, inste= ad of ignoring the warning? That's possible, but I don't know how much of the possibility that upstream is willing to fix a warning that only occurs in old versions of gcc, and it looks a false positive to me. I am here to put a band-aid first. Best, Li-Wen From owner-svn-src-head@freebsd.org Fri Apr 12 20:11:09 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1AF61584FF6; Fri, 12 Apr 2019 20:11:08 +0000 (UTC) (envelope-from tychon@freebsd.org) Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) (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 95FDE8AB84; Fri, 12 Apr 2019 20:11:08 +0000 (UTC) (envelope-from tychon@freebsd.org) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id D5B7A133881; Fri, 12 Apr 2019 16:11:01 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=content-type :mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=sasl; bh= F378u8Cgqa5KYo5W60fhER7FXQw=; b=lZTjewozXKWLSquspR47B1gCVJWJLeHC z9slRTENZfIVM6iU5laCsxRFdK7Be/ltVcHkPHBJVORzrb4bf9xZWJb3+2aJtpnm zboEy2AWKVBZEldcGl6iwMy9oxsy940g/lJosbCb5kgZbdNpmsNAKmS76LDT9e48 g2nbGrU5ykA= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id C9AF9133880; Fri, 12 Apr 2019 16:11:01 -0400 (EDT) Received: from [10.0.1.195] (unknown [146.115.68.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id DF13613387D; Fri, 12 Apr 2019 16:11:00 -0400 (EDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r346150 - head/sys/vm From: Tycho Nightingale In-Reply-To: <94A39E35-A8E0-42A4-8467-096D4AAD0F89@gmail.com> Date: Fri, 12 Apr 2019 16:10:59 -0400 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <4DA68C34-12A0-4E62-B868-F7BE10CB06BD@freebsd.org> References: <201904121246.x3CCkP2m027680@repo.freebsd.org> <94A39E35-A8E0-42A4-8467-096D4AAD0F89@gmail.com> To: Enji Cooper X-Mailer: Apple Mail (2.3445.9.1) X-Pobox-Relay-ID: 178FEA8A-5D5F-11E9-9CC3-1646B3964D18-09779102!pb-smtp1.pobox.com X-Rspamd-Queue-Id: 95FDE8AB84 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 20:11:09 -0000 > On Apr 12, 2019, at 12:43 PM, Enji Cooper = wrote: >=20 >=20 >> On Apr 12, 2019, at 5:46 AM, Tycho Nightingale = wrote: >>=20 >> Author: tychon >> Date: Fri Apr 12 12:46:25 2019 >> New Revision: 346150 >> URL: https://svnweb.freebsd.org/changeset/base/346150 >>=20 >> Log: >> for a cache-only zone the destructor tries to destroy a non-existent = keg >>=20 >> Reviewed by: markj >> Sponsored by: Dell EMC Isilon >> Differential Revision: https://reviews.freebsd.org/D19835 >=20 >=20 > Hi Tycho! > Is the goal of this change to prevent a panic (with an = INVARIANTS kernel)? > Thank you! > -Enji Hi, The goal of this change is to fix a regression introduced in r343026. = It does cause a panic independent of INVARIANTS. Fortunately there = isn=E2=80=99t currently any in-tree code which triggers the panic. It = does however show up when running with the patch under review in D19845. Tycho From owner-svn-src-head@freebsd.org Sat Apr 13 00:55:34 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B9E9154EB12 for ; Sat, 13 Apr 2019 00:55:34 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 831ED946DB for ; Sat, 13 Apr 2019 00:55:33 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-lj1-f175.google.com with SMTP id f23so10465540ljc.0 for ; Fri, 12 Apr 2019 17:55:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:cc; bh=Ctjy8hVxT7Pc4xHKXafFu9vZ6TE5VHOE/5n/YkJBylM=; b=hgnajHuBLJKrmotK8Hweo3WEctFs7K2z+wi6ZcVUZfscktltzoTsOAhu95+DGgkQLX DkBRw/nSyaT226rKSTGB+Ma/GXMUar+5MqYSK+V+nvV6Yv6Itkg0DbSW20wrZSjl0DqQ 7H/zKAbccQsUBTLEQlvgCSK7SfNAK8NbZi+dM5JW354RJxd/egoVmh5kKM4uZKidYaEv iQzioQ67krq4yY1tGMYZmaWSB6eXK6sN6piSIWIfIz+oXHKHToXIVdgFeZWiedherXss FTOMvkGjHbLhxLza5f3aT9KHvSPn1I6UiJFKsmSZy2krnkZYAmLZu2Sbp0zfJEAqhnyF inpQ== X-Gm-Message-State: APjAAAU+iefr1Qi02KDFiEsVLQRGIIclZbHfg6WbUJRLY1UabGpE4osB fs5RsRj2788E+YX3mwPUAdgDSde2+FZAv7T8tg8= X-Received: by 2002:a2e:8550:: with SMTP id u16mt8417947ljj.11.1555116925638; Fri, 12 Apr 2019 17:55:25 -0700 (PDT) MIME-Version: 1.0 References: <201904101302.x3AD2XKg012359@repo.freebsd.org> In-Reply-To: <201904101302.x3AD2XKg012359@repo.freebsd.org> From: Alan Somers Date: Fri, 12 Apr 2019 18:55:13 -0600 Message-ID: Subject: Re: svn commit: r346078 - head/sys/kern Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 831ED946DB X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.208.175 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [-1.75 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.986,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_SHORT(-0.41)[-0.414,0]; MIME_TRACE(0.00)[0:+]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[175.208.85.209.list.dnswl.org : 127.0.5.0]; MISSING_TO(2.00)[]; RCVD_TLS_LAST(0.00)[]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; IP_SCORE(-1.34)[ip: (-0.60), ipnet: 209.85.128.0/17(-3.87), asn: 15169(-2.19), country: US(-0.06)]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 00:55:34 -0000 On Wed, Apr 10, 2019 at 7:02 AM Alan Somers wrote: > > Author: asomers > Date: Wed Apr 10 13:02:33 2019 > New Revision: 346078 > URL: https://svnweb.freebsd.org/changeset/base/346078 > > Log: > fix cache_lookup's documentation > > cache_lookup's documentation got dislocated by r324378. Relocate and expand > it. > > Reviewed by: jhb, kib > MFC after: 2 weeks > Sponsored by: The FreeBSD Foundation > > Modified: > head/sys/kern/vfs_cache.c Should've added a Differential Revision: https://reviews.freebsd.org/D19868 to the commit message, sorry! -Alan From owner-svn-src-head@freebsd.org Sat Apr 13 01:16:36 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BDD21565617; Sat, 13 Apr 2019 01:16:36 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7C3DD95A27; Sat, 13 Apr 2019 01:16:35 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg1-x544.google.com with SMTP id z9so5954258pgu.10; Fri, 12 Apr 2019 18:16:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=XRSes/iCU5+saotM9wxglHk9v7qStNtJVfwMjuzfO64=; b=noFl8RsIl5+LvND48aBYe2NOrdbunKV2u5dCvq9wRUHLfnqlcWpneHZ3QMTpSRZXo+ otJxK7ZfSW4Y3XGzObZ3hmVIxl67u9j+XMCvFe3wJ521gmNDvcdkW9VX79ijNdH5Xxdn SBrbfRyK46e/ChK6wu7F4XVyu97WrOtXgq+2/stNyjvLA1UopgVA67BUYrl0xsdAMIha men7foqJ11Kys/TsER/roQWeUWkKp2ynz6dd5pqsiEAXDUSMugGfF+UTL6tZPBQVFDfh nNcy13wG1HueS1RdE7adIEuNaO/UuHLbgQHabLqd2AOd+872+DNTQqR8MHpsfCco5sTD TTag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=XRSes/iCU5+saotM9wxglHk9v7qStNtJVfwMjuzfO64=; b=XsY4TQEdyptaUZGdCIlT3+G9OQt/bxYD0Ja/O5320tA0WFsIhLXdlXv77u9w6txlsM sjM2EwKl42XQNty7e3mhU2kIYIThWAlFfjmMk2Lkq7YF4/2EeMDy1c1WRixT+b4qSNEw 8zLKgQmbfbDDGAP6Fl1febzhftjC+UmirFu1NmDpoj/BzRqcE5Xx6qZ1I/EXtE/fToFP 7phc8Hh88RpZAAZMc7sq+Gaut1mgr5G9IFC6fHbv8o3m0M4LMUsdA3cv5vrK5MjzTEmg Mhz/P7hrHph5JHK6SKSQtpWFvhawVmBqr4weV/mC/wnH/9dJVWeukNr+Bu3yuAx0qP9C TS9Q== X-Gm-Message-State: APjAAAW98PVE+xEiApO7TIswDp9gK1I58A5ov7BlDndE9csYjxW0CP09 1QVWCblJapIOHp803NpGnmxg4ueFz14= X-Google-Smtp-Source: APXvYqzXgFLx36R9d03X9k3tkPY9gTDH8z6YM+4qMM1qC9WI1XX8MJ275ytVkZbWmONEZ6LKAi77zQ== X-Received: by 2002:a62:ac02:: with SMTP id v2mr61029615pfe.163.1555118193640; Fri, 12 Apr 2019 18:16:33 -0700 (PDT) Received: from [192.168.20.21] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id o68sm105736075pfi.140.2019.04.12.18.16.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 18:16:33 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.8\)) Subject: Re: svn commit: r346150 - head/sys/vm From: "Enji Cooper (yaneurabeya)" In-Reply-To: <4DA68C34-12A0-4E62-B868-F7BE10CB06BD@freebsd.org> Date: Fri, 12 Apr 2019 18:16:32 -0700 Cc: src-committers , svn-src-all , svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201904121246.x3CCkP2m027680@repo.freebsd.org> <94A39E35-A8E0-42A4-8467-096D4AAD0F89@gmail.com> <4DA68C34-12A0-4E62-B868-F7BE10CB06BD@freebsd.org> To: Tycho Nightingale X-Mailer: Apple Mail (2.3445.104.8) X-Rspamd-Queue-Id: 7C3DD95A27 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 01:16:36 -0000 > On Apr 12, 2019, at 13:10, Tycho Nightingale = wrote: >=20 >> On Apr 12, 2019, at 12:43 PM, Enji Cooper = wrote: >>=20 >>=20 >>> On Apr 12, 2019, at 5:46 AM, Tycho Nightingale = wrote: >>>=20 >>> Author: tychon >>> Date: Fri Apr 12 12:46:25 2019 >>> New Revision: 346150 >>> URL: https://svnweb.freebsd.org/changeset/base/346150 >>>=20 >>> Log: >>> for a cache-only zone the destructor tries to destroy a non-existent = keg >>>=20 >>> Reviewed by: markj >>> Sponsored by: Dell EMC Isilon >>> Differential Revision: https://reviews.freebsd.org/D19835 >>=20 >>=20 >> Hi Tycho! >> Is the goal of this change to prevent a panic (with an = INVARIANTS kernel)? >> Thank you! >> -Enji >=20 > Hi, >=20 > The goal of this change is to fix a regression introduced in r343026. = It does cause a panic independent of INVARIANTS. Fortunately there = isn=E2=80=99t currently any in-tree code which triggers the panic. It = does however show up when running with the patch under review in D19845. Hi again! Thank you for the explanation! This part was missing from the = commit message, hence my question. I wanted to make sure I understood = the change in this commit properly. Cheers! -Enji= From owner-svn-src-head@freebsd.org Sat Apr 13 02:29:32 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E535C1569694; Sat, 13 Apr 2019 02:29:31 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A45E97ACD; Sat, 13 Apr 2019 02:29:31 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60D43249A; Sat, 13 Apr 2019 02:29:31 +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 x3D2TV9N068968; Sat, 13 Apr 2019 02:29:31 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D2TVGN068967; Sat, 13 Apr 2019 02:29:31 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201904130229.x3D2TVGN068967@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 13 Apr 2019 02:29:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346172 - head/sys/powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/powerpc X-SVN-Commit-Revision: 346172 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8A45E97ACD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 02:29:32 -0000 Author: jhibbits Date: Sat Apr 13 02:29:30 2019 New Revision: 346172 URL: https://svnweb.freebsd.org/changeset/base/346172 Log: powerpc: Add file forgotten in r346144 Forgot to add the changes for DELAY(), which lowers priority during the delay period. Also, mark the timebase read as volatile so newer GCC does not optimize it away, as it reportedly does currently. MFC after: 2 weeks MFC with: r346144 Modified: head/sys/powerpc/powerpc/clock.c Modified: head/sys/powerpc/powerpc/clock.c ============================================================================== --- head/sys/powerpc/powerpc/clock.c Sat Apr 13 00:54:56 2019 (r346171) +++ head/sys/powerpc/powerpc/clock.c Sat Apr 13 02:29:30 2019 (r346172) @@ -303,13 +303,16 @@ decr_get_timecount(struct timecounter *tc) void DELAY(int n) { - u_quad_t tb, ttb; + volatile u_quad_t tb; + u_quad_t ttb; TSENTER(); tb = mftb(); ttb = tb + howmany((uint64_t)n * 1000000, ps_per_tick); + nop_prio_vlow(); while (tb < ttb) tb = mftb(); + nop_prio_medium(); TSEXIT(); } From owner-svn-src-head@freebsd.org Sat Apr 13 03:32:22 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 977D8156ABD3; Sat, 13 Apr 2019 03:32:22 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3532C6AD81; Sat, 13 Apr 2019 03:32:22 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04CE030E7; Sat, 13 Apr 2019 03:32:22 +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 x3D3WL6d005784; Sat, 13 Apr 2019 03:32:21 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D3WLgC005780; Sat, 13 Apr 2019 03:32:21 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201904130332.x3D3WLgC005780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 13 Apr 2019 03:32:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346173 - head/sys/cddl/dev/dtrace/powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/cddl/dev/dtrace/powerpc X-SVN-Commit-Revision: 346173 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3532C6AD81 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 03:32:22 -0000 Author: jhibbits Date: Sat Apr 13 03:32:21 2019 New Revision: 346173 URL: https://svnweb.freebsd.org/changeset/base/346173 Log: powerpc/dtrace: Fix dtrace powerpc asm, and simplify stack walking Fix some execution bugs in the dtrace powerpc asm. addme pulls in the carry flag which we don't want, and the result wasn't recorded anyways, so the following beq to check for exit condition wasn't checking the right condition. Simplify the stack walking in dtrace_isa.c, so there's only a single walker that handles both pc and sp. This should make it easier to follow, and any bugfix that may be needed for walking only needs to be made in one place instead of two now. MFC after: 2 weeks Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S ============================================================================== --- head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Sat Apr 13 02:29:30 2019 (r346172) +++ head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Sat Apr 13 03:32:21 2019 (r346173) @@ -148,14 +148,19 @@ dtrace_copystr(uintptr_t uaddr, uintptr_t kaddr, size_ volatile uint16_t *flags) */ ASENTRY_NOPROF(dtrace_copystr) - addme %r7,%r3 - addme %r8,%r4 + subi %r7,%r3,1 + subi %r8,%r4,1 1: lbzu %r3,1(%r7) stbu %r3,1(%r8) - addme %r5,%r5 + subi %r5,%r5,1 +#ifdef __powerpc64__ + cmpldi %r5,0 +#else + cmplwi %r5,0 +#endif beq 2f - or %r3,%r3,%r3 + cmplwi %r3,0 beq 2f andi. %r0,%r5,0x0fff beq 2f Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c ============================================================================== --- head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c Sat Apr 13 02:29:30 2019 (r346172) +++ head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c Sat Apr 13 03:32:21 2019 (r346173) @@ -94,11 +94,10 @@ dtrace_sp_inkernel(uintptr_t sp) return (1); } -static __inline uintptr_t -dtrace_next_sp(uintptr_t sp) +static __inline void +dtrace_next_sp_pc(uintptr_t sp, uintptr_t *nsp, uintptr_t *pc) { vm_offset_t callpc; - uintptr_t *r1; struct trapframe *frame; #ifdef __powerpc64__ @@ -115,39 +114,17 @@ dtrace_next_sp(uintptr_t sp) callpc + OFFSET == (vm_offset_t) &asttrapexit)) { /* Access the trap frame */ frame = (struct trapframe *)(sp + FRAME_OFFSET); - r1 = (uintptr_t *)frame->fixreg[1]; - if (r1 == NULL) - return (0); - return (*r1); - } - return (*(uintptr_t*)sp); -} - -static __inline uintptr_t -dtrace_get_pc(uintptr_t sp) -{ - struct trapframe *frame; - vm_offset_t callpc; - -#ifdef __powerpc64__ - callpc = *(vm_offset_t *)(sp + RETURN_OFFSET64); -#else - callpc = *(vm_offset_t *)(sp + RETURN_OFFSET); -#endif - - /* - * trapexit() and asttrapexit() are sentinels - * for kernel stack tracing. - */ - if ((callpc + OFFSET == (vm_offset_t) &trapexit || - callpc + OFFSET == (vm_offset_t) &asttrapexit)) { - /* Access the trap frame */ - frame = (struct trapframe *)(sp + FRAME_OFFSET); - return (frame->srr0); + if (nsp != NULL) + *nsp = frame->fixreg[1]; + if (pc != NULL) + *pc = frame->srr0; } - return (callpc); + if (nsp != NULL) + *nsp = *(uintptr_t *)sp; + if (pc != NULL) + *pc = callpc; } greg_t @@ -179,7 +156,8 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in if (!dtrace_sp_inkernel(sp)) break; - callpc = dtrace_get_pc(sp); + osp = sp; + dtrace_next_sp_pc(osp, &sp, &callpc); if (aframes > 0) { aframes--; @@ -190,9 +168,6 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in else { pcstack[depth++] = callpc; } - - osp = sp; - sp = dtrace_next_sp(sp); } for (; depth < pcstack_limit; depth++) { @@ -546,7 +521,7 @@ dtrace_getstackdepth(int aframes) else aframes--; osp = sp; - sp = dtrace_next_sp(sp); + dtrace_next_sp_pc(sp, &sp, NULL); } if (depth < aframes) return (0); From owner-svn-src-head@freebsd.org Sat Apr 13 04:03:23 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF127156B584; Sat, 13 Apr 2019 04:03:22 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6EAB56B943; Sat, 13 Apr 2019 04:03:22 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E0D737B4; Sat, 13 Apr 2019 04:03:22 +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 x3D43M96021240; Sat, 13 Apr 2019 04:03:22 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D43IDd021224; Sat, 13 Apr 2019 04:03:18 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201904130403.x3D43IDd021224@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 13 Apr 2019 04:03:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346174 - in head/sys/powerpc: aim conf include ofw powernv powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: in head/sys/powerpc: aim conf include ofw powernv powerpc X-SVN-Commit-Revision: 346174 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6EAB56B943 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 04:03:23 -0000 Author: jhibbits Date: Sat Apr 13 04:03:18 2019 New Revision: 346174 URL: https://svnweb.freebsd.org/changeset/base/346174 Log: Add NUMA support to powerpc Summary: Initial NUMA support: - associate CPU with domain - associate memory ranges with domain - identify domain for devices - limit device interrupt binding to appropriate domain - Additionally fixes a bug in the setting of Maxmem which led to only memory attached to the first socket being enabled for DMA A pmap variant can opt in to numa support by by calling `numa_mem_regions` at the end of pmap_bootstrap - registering the corresponding ranges with the VM. This yields a ~20% improvement in build times of llvm on dual socket POWER9 over non-NUMA. Original patch by mmacy. Differential Revision: https://reviews.freebsd.org/D17933 Modified: head/sys/powerpc/aim/mmu_oea64.c head/sys/powerpc/conf/GENERIC64 head/sys/powerpc/include/intr_machdep.h head/sys/powerpc/include/ofw_machdep.h head/sys/powerpc/include/param.h head/sys/powerpc/include/platform.h head/sys/powerpc/include/smp.h head/sys/powerpc/ofw/ofw_machdep.c head/sys/powerpc/ofw/ofw_pcibus.c head/sys/powerpc/powernv/opal_pci.c head/sys/powerpc/powernv/platform_powernv.c head/sys/powerpc/powerpc/intr_machdep.c head/sys/powerpc/powerpc/mp_machdep.c head/sys/powerpc/powerpc/nexus.c head/sys/powerpc/powerpc/platform.c head/sys/powerpc/powerpc/platform_if.m Modified: head/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/aim/mmu_oea64.c Sat Apr 13 04:03:18 2019 (r346174) @@ -146,8 +146,9 @@ extern void *slbtrap, *slbtrapend; */ static struct mem_region *regions; static struct mem_region *pregions; +static struct numa_mem_region *numa_pregions; static u_int phys_avail_count; -static int regions_sz, pregions_sz; +static int regions_sz, pregions_sz, numapregions_sz; extern void bs_remap_earlyboot(void); @@ -1048,6 +1049,8 @@ moea64_late_bootstrap(mmu_t mmup, vm_offset_t kernelst PMAP_UNLOCK(kernel_pmap); } } + + numa_mem_regions(&numa_pregions, &numapregions_sz); } static void Modified: head/sys/powerpc/conf/GENERIC64 ============================================================================== --- head/sys/powerpc/conf/GENERIC64 Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/conf/GENERIC64 Sat Apr 13 04:03:18 2019 (r346174) @@ -35,6 +35,7 @@ options POWERNV #Non-virtualized OpenPOWER systems options FDT #Flattened Device Tree options SCHED_ULE #ULE scheduler +options NUMA #Non-Uniform Memory Architecture support options PREEMPTION #Enable kernel thread preemption options VIMAGE # Subsystem virtualization, e.g. VNET options INET #InterNETworking Modified: head/sys/powerpc/include/intr_machdep.h ============================================================================== --- head/sys/powerpc/include/intr_machdep.h Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/include/intr_machdep.h Sat Apr 13 04:03:18 2019 (r346174) @@ -54,7 +54,7 @@ u_int powerpc_get_irq(uint32_t, u_int); void powerpc_dispatch_intr(u_int, struct trapframe *); int powerpc_enable_intr(void); int powerpc_setup_intr(const char *, u_int, driver_filter_t, driver_intr_t, - void *, enum intr_type, void **); + void *, enum intr_type, void **, int); int powerpc_teardown_intr(void *); int powerpc_bind_intr(u_int irq, u_char cpu); int powerpc_config_intr(int, enum intr_trigger, enum intr_polarity); Modified: head/sys/powerpc/include/ofw_machdep.h ============================================================================== --- head/sys/powerpc/include/ofw_machdep.h Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/include/ofw_machdep.h Sat Apr 13 04:03:18 2019 (r346174) @@ -47,7 +47,11 @@ boolean_t OF_bootstrap(void); void OF_reboot(void); void ofw_mem_regions(struct mem_region *, int *, struct mem_region *, int *); +void ofw_numa_mem_regions(struct numa_mem_region *, int *); void ofw_quiesce(void); /* Must be called before VM is up! */ void ofw_save_trap_vec(char *); +int ofw_pcibus_get_domain(device_t dev, device_t child, int *domain); +int ofw_pcibus_get_cpus(device_t dev, device_t child, enum cpu_sets op, + size_t setsize, cpuset_t *cpuset); #endif /* _MACHINE_OFW_MACHDEP_H_ */ Modified: head/sys/powerpc/include/param.h ============================================================================== --- head/sys/powerpc/include/param.h Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/include/param.h Sat Apr 13 04:03:18 2019 (r346174) @@ -82,7 +82,7 @@ #endif /* SMP || KLD_MODULE */ #ifndef MAXMEMDOM -#define MAXMEMDOM 1 +#define MAXMEMDOM 8 #endif #define ALIGNBYTES _ALIGNBYTES Modified: head/sys/powerpc/include/platform.h ============================================================================== --- head/sys/powerpc/include/platform.h Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/include/platform.h Sat Apr 13 04:03:18 2019 (r346174) @@ -45,9 +45,16 @@ struct mem_region { uint64_t mr_size; }; +struct numa_mem_region { + uint64_t mr_start; + uint64_t mr_size; + uint64_t mr_domain; +}; + /* Documentation for these functions is in platform_if.m */ void mem_regions(struct mem_region **, int *, struct mem_region **, int *); +void numa_mem_regions(struct numa_mem_region **, int *); vm_offset_t platform_real_maxaddr(void); u_long platform_timebase_freq(struct cpuref *); Modified: head/sys/powerpc/include/smp.h ============================================================================== --- head/sys/powerpc/include/smp.h Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/include/smp.h Sat Apr 13 04:03:18 2019 (r346174) @@ -52,6 +52,7 @@ void ipi_selected(cpuset_t cpus, int ipi); struct cpuref { uintptr_t cr_hwref; u_int cr_cpuid; + u_int cr_domain; }; void pmap_cpu_bootstrap(int); Modified: head/sys/powerpc/ofw/ofw_machdep.c ============================================================================== --- head/sys/powerpc/ofw/ofw_machdep.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/ofw/ofw_machdep.c Sat Apr 13 04:03:18 2019 (r346174) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -222,11 +223,59 @@ parse_ofw_memory(phandle_t node, const char *prop, str j++; } - sz = j*sizeof(output[0]); - return (sz); + return (j); } +static int +parse_numa_ofw_memory(phandle_t node, const char *prop, + struct numa_mem_region *output) +{ + cell_t address_cells, size_cells; + cell_t OFmem[4 * PHYS_AVAIL_SZ]; + int sz, i, j; + phandle_t phandle; + + sz = 0; + + /* + * Get #address-cells from root node, defaulting to 1 if it cannot + * be found. + */ + phandle = OF_finddevice("/"); + if (OF_getencprop(phandle, "#address-cells", &address_cells, + sizeof(address_cells)) < (ssize_t)sizeof(address_cells)) + address_cells = 1; + if (OF_getencprop(phandle, "#size-cells", &size_cells, + sizeof(size_cells)) < (ssize_t)sizeof(size_cells)) + size_cells = 1; + + /* + * Get memory. + */ + if (node == -1 || (sz = OF_getencprop(node, prop, + OFmem, sizeof(OFmem))) <= 0) + panic("Physical memory map not found"); + + i = 0; + j = 0; + while (i < sz/sizeof(cell_t)) { + output[j].mr_start = OFmem[i++]; + if (address_cells == 2) { + output[j].mr_start <<= 32; + output[j].mr_start += OFmem[i++]; + } + output[j].mr_size = OFmem[i++]; + if (size_cells == 2) { + output[j].mr_size <<= 32; + output[j].mr_size += OFmem[i++]; + } + j++; + } + + return (j); +} + #ifdef FDT static int excise_reserved_regions(struct mem_region *avail, int asz, @@ -408,6 +457,51 @@ excise_fdt_reserved(struct mem_region *avail, int asz) * The available regions need not take the kernel into account. */ void +ofw_numa_mem_regions(struct numa_mem_region *memp, int *memsz) +{ + phandle_t phandle; + int res, count, msz; + char name[31]; + cell_t associativity[5]; + struct numa_mem_region *curmemp; + + msz = 0; + /* + * Get memory from all the /memory nodes. + */ + for (phandle = OF_child(OF_peer(0)); phandle != 0; + phandle = OF_peer(phandle)) { + if (OF_getprop(phandle, "name", name, sizeof(name)) <= 0) + continue; + if (strncmp(name, "memory@", strlen("memory@")) != 0) + continue; + + count = parse_numa_ofw_memory(phandle, "reg", &memp[msz]); + if (count == 0) + continue; + curmemp = &memp[msz]; + res = OF_getproplen(phandle, "ibm,associativity"); + if (res <= 0) + continue; + MPASS(count == 1); + OF_getencprop(phandle, "ibm,associativity", + associativity, res); + curmemp->mr_domain = associativity[3] - 1; + if (bootverbose) + printf("%s %#jx-%#jx domain(%ju)\n", + name, (uintmax_t)curmemp->mr_start, + (uintmax_t)curmemp->mr_start + curmemp->mr_size, + (uintmax_t)curmemp->mr_domain); + msz += count; + } + *memsz = msz; +} +/* + * This is called during powerpc_init, before the system is really initialized. + * It shall provide the total and the available regions of RAM. + * The available regions need not take the kernel into account. + */ +void ofw_mem_regions(struct mem_region *memp, int *memsz, struct mem_region *availp, int *availsz) { @@ -430,7 +524,7 @@ ofw_mem_regions(struct mem_region *memp, int *memsz, continue; res = parse_ofw_memory(phandle, "reg", &memp[msz]); - msz += res/sizeof(struct mem_region); + msz += res; /* * On POWER9 Systems we might have both linux,usable-memory and @@ -446,7 +540,7 @@ ofw_mem_regions(struct mem_region *memp, int *memsz, &availp[asz]); else res = parse_ofw_memory(phandle, "reg", &availp[asz]); - asz += res/sizeof(struct mem_region); + asz += res; } #ifdef FDT Modified: head/sys/powerpc/ofw/ofw_pcibus.c ============================================================================== --- head/sys/powerpc/ofw/ofw_pcibus.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/ofw/ofw_pcibus.c Sat Apr 13 04:03:18 2019 (r346174) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -80,6 +81,8 @@ static device_method_t ofw_pcibus_methods[] = { DEVMETHOD(bus_child_deleted, ofw_pcibus_child_deleted), DEVMETHOD(bus_child_pnpinfo_str, ofw_pcibus_child_pnpinfo_str_method), DEVMETHOD(bus_rescan, bus_null_rescan), + DEVMETHOD(bus_get_cpus, ofw_pcibus_get_cpus), + DEVMETHOD(bus_get_domain, ofw_pcibus_get_domain), /* PCI interface */ DEVMETHOD(pci_alloc_devinfo, ofw_pcibus_alloc_devinfo), @@ -382,3 +385,76 @@ ofw_pcibus_get_devinfo(device_t bus, device_t dev) return (&dinfo->opd_obdinfo); } +static int +ofw_pcibus_parse_associativity(device_t dev, int *domain) +{ + phandle_t node; + cell_t associativity[5]; + int res; + + if ((node = ofw_bus_get_node(dev)) == -1) { + device_printf(dev, "no ofw node found\n"); + return (ENXIO); + } + res = OF_getproplen(node, "ibm,associativity"); + if (res <= 0) + return (ENXIO); + OF_getencprop(node, "ibm,associativity", + associativity, res); + + *domain = associativity[3] - 1; + if (bootverbose) + device_printf(dev, "domain(%d)\n", *domain); + return (0); +} + +int +ofw_pcibus_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize, + cpuset_t *cpuset) +{ + int d, error; + + error = ofw_pcibus_parse_associativity(child, &d); + if (error) + return (bus_generic_get_cpus(dev, child, op, setsize, cpuset)); + + switch (op) { + case LOCAL_CPUS: + if (setsize != sizeof(cpuset_t)) + return (EINVAL); + *cpuset = cpuset_domain[d]; + return (0); + case INTR_CPUS: + error = bus_generic_get_cpus(dev, child, op, setsize, cpuset); + if (error != 0) + return (error); + if (setsize != sizeof(cpuset_t)) + return (EINVAL); + CPU_AND(cpuset, &cpuset_domain[d]); + return (0); + default: + return (bus_generic_get_cpus(dev, child, op, setsize, cpuset)); + } + return (0); +} + +/* + * Fetch the NUMA domain for the given device 'dev'. + * + * If a device has a _PXM method, map that to a NUMA domain. + * Otherwise, pass the request up to the parent. + * If there's no matching domain or the domain cannot be + * determined, return ENOENT. + */ +int +ofw_pcibus_get_domain(device_t dev, device_t child, int *domain) +{ + int d, error; + + error = ofw_pcibus_parse_associativity(child, &d); + /* No ofw node; go up a level */ + if (error) + return (bus_generic_get_domain(dev, child, domain)); + *domain = d; + return (0); +} Modified: head/sys/powerpc/powernv/opal_pci.c ============================================================================== --- head/sys/powerpc/powernv/opal_pci.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/powernv/opal_pci.c Sat Apr 13 04:03:18 2019 (r346174) @@ -149,6 +149,8 @@ static device_method_t opalpci_methods[] = { /* Bus interface */ DEVMETHOD(bus_get_dma_tag, opalpci_get_dma_tag), + DEVMETHOD(bus_get_cpus, ofw_pcibus_get_cpus), + DEVMETHOD(bus_get_domain, ofw_pcibus_get_domain), DEVMETHOD_END }; @@ -367,7 +369,7 @@ opalpci_attach(device_t dev) tce_size = max_tce_size(dev); maxmem = roundup2(powerpc_ptob(Maxmem), tce_size); entries = round_pow2(maxmem / tce_size); - tce_tbl_size = max(entries * sizeof(uint64_t), 4096); + tce_tbl_size = MAX(entries * sizeof(uint64_t), 4096); if (entries > OPAL_PCI_TCE_MAX_ENTRIES) panic("POWERNV supports only %jdGB of memory space\n", (uintmax_t)((OPAL_PCI_TCE_MAX_ENTRIES * tce_size) >> 30)); Modified: head/sys/powerpc/powernv/platform_powernv.c ============================================================================== --- head/sys/powerpc/powernv/platform_powernv.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/powernv/platform_powernv.c Sat Apr 13 04:03:18 2019 (r346174) @@ -65,6 +65,7 @@ static int powernv_probe(platform_t); static int powernv_attach(platform_t); void powernv_mem_regions(platform_t, struct mem_region *phys, int *physsz, struct mem_region *avail, int *availsz); +static void powernv_numa_mem_regions(platform_t plat, struct numa_mem_region *phys, int *physsz); static u_long powernv_timebase_freq(platform_t, struct cpuref *cpuref); static int powernv_smp_first_cpu(platform_t, struct cpuref *cpuref); static int powernv_smp_next_cpu(platform_t, struct cpuref *cpuref); @@ -83,6 +84,7 @@ static platform_method_t powernv_methods[] = { PLATFORMMETHOD(platform_probe, powernv_probe), PLATFORMMETHOD(platform_attach, powernv_attach), PLATFORMMETHOD(platform_mem_regions, powernv_mem_regions), + PLATFORMMETHOD(platform_numa_mem_regions, powernv_numa_mem_regions), PLATFORMMETHOD(platform_timebase_freq, powernv_timebase_freq), PLATFORMMETHOD(platform_smp_ap_init, powernv_smp_ap_init), @@ -250,6 +252,13 @@ powernv_mem_regions(platform_t plat, struct mem_region ofw_mem_regions(phys, physsz, avail, availsz); } +static void +powernv_numa_mem_regions(platform_t plat, struct numa_mem_region *phys, int *physsz) +{ + + ofw_numa_mem_regions(phys, physsz); +} + static u_long powernv_timebase_freq(platform_t plat, struct cpuref *cpuref) { @@ -313,15 +322,13 @@ powernv_cpuref_init(void) if (res > 0 && strcmp(buf, "cpu") == 0) { res = OF_getproplen(cpu, "ibm,ppc-interrupt-server#s"); if (res > 0) { - - OF_getencprop(cpu, "ibm,ppc-interrupt-server#s", interrupt_servers, res); for (a = 0; a < res/sizeof(cell_t); a++) { tmp_cpuref[tmp_cpuref_cnt].cr_hwref = interrupt_servers[a]; tmp_cpuref[tmp_cpuref_cnt].cr_cpuid = tmp_cpuref_cnt; - + tmp_cpuref[tmp_cpuref_cnt].cr_domain = interrupt_servers[a] >> 11; if (interrupt_servers[a] == (uint32_t)powernv_boot_pir) bsp = tmp_cpuref_cnt; @@ -335,11 +342,13 @@ powernv_cpuref_init(void) for (a = bsp; a < tmp_cpuref_cnt; a++) { platform_cpuref[platform_cpuref_cnt].cr_hwref = tmp_cpuref[a].cr_hwref; platform_cpuref[platform_cpuref_cnt].cr_cpuid = platform_cpuref_cnt; + platform_cpuref[platform_cpuref_cnt].cr_domain = tmp_cpuref[a].cr_domain; platform_cpuref_cnt++; } for (a = 0; a < bsp; a++) { platform_cpuref[platform_cpuref_cnt].cr_hwref = tmp_cpuref[a].cr_hwref; platform_cpuref[platform_cpuref_cnt].cr_cpuid = platform_cpuref_cnt; + platform_cpuref[platform_cpuref_cnt].cr_domain = tmp_cpuref[a].cr_domain; platform_cpuref_cnt++; } @@ -356,6 +365,7 @@ powernv_smp_first_cpu(platform_t plat, struct cpuref * cpuref->cr_cpuid = 0; cpuref->cr_hwref = platform_cpuref[0].cr_hwref; + cpuref->cr_domain = platform_cpuref[0].cr_domain; return (0); } @@ -374,6 +384,7 @@ powernv_smp_next_cpu(platform_t plat, struct cpuref *c cpuref->cr_cpuid = platform_cpuref[id].cr_cpuid; cpuref->cr_hwref = platform_cpuref[id].cr_hwref; + cpuref->cr_domain = platform_cpuref[id].cr_domain; return (0); } @@ -384,6 +395,7 @@ powernv_smp_get_bsp(platform_t plat, struct cpuref *cp cpuref->cr_cpuid = platform_cpuref[0].cr_cpuid; cpuref->cr_hwref = platform_cpuref[0].cr_hwref; + cpuref->cr_domain = platform_cpuref[0].cr_domain; return (0); } Modified: head/sys/powerpc/powerpc/intr_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/intr_machdep.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/powerpc/intr_machdep.c Sat Apr 13 04:03:18 2019 (r346174) @@ -97,16 +97,17 @@ struct powerpc_intr { struct intr_event *event; long *cntp; void *priv; /* PIC-private data */ - u_int irq; device_t pic; + u_int irq; u_int intline; u_int vector; u_int cntindex; - cpuset_t cpu; - enum intr_trigger trig; - enum intr_polarity pol; int fwcode; int ipi; + int pi_domain; + enum intr_trigger trig; + enum intr_polarity pol; + cpuset_t pi_cpuset; }; struct pic { @@ -203,7 +204,7 @@ smp_intr_init(void *dummy __unused) for (vector = 0; vector < nvectors; vector++) { i = powerpc_intrs[vector]; if (i != NULL && i->event != NULL && i->pic == root_pic) - PIC_BIND(i->pic, i->intline, i->cpu, &i->priv); + PIC_BIND(i->pic, i->intline, i->pi_cpuset, &i->priv); } } SYSINIT(smp_intr_init, SI_SUB_SMP, SI_ORDER_ANY, smp_intr_init, NULL); @@ -256,9 +257,9 @@ intr_lookup(u_int irq) i->ipi = 0; #ifdef SMP - i->cpu = all_cpus; + i->pi_cpuset = all_cpus; #else - CPU_SETOF(0, &i->cpu); + CPU_SETOF(0, &i->pi_cpuset); #endif for (vector = 0; vector < num_io_irqs && vector <= nvectors; @@ -347,12 +348,12 @@ powerpc_assign_intr_cpu(void *arg, int cpu) struct powerpc_intr *i = arg; if (cpu == NOCPU) - i->cpu = all_cpus; + i->pi_cpuset = all_cpus; else - CPU_SETOF(cpu, &i->cpu); + CPU_SETOF(cpu, &i->pi_cpuset); if (!cold && i->pic != NULL && i->pic == root_pic) - PIC_BIND(i->pic, i->intline, i->cpu, &i->priv); + PIC_BIND(i->pic, i->intline, i->pi_cpuset, &i->priv); return (0); #else @@ -469,7 +470,8 @@ powerpc_enable_intr(void) error = powerpc_setup_intr("IPI", MAP_IRQ(piclist[n].node, piclist[n].irqs), powerpc_ipi_handler, NULL, NULL, - INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie); + INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie, + 0 /* domain XXX */); if (error) { printf("unable to setup IPI handler\n"); return (error); @@ -512,7 +514,8 @@ powerpc_enable_intr(void) int powerpc_setup_intr(const char *name, u_int irq, driver_filter_t filter, - driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, + int domain) { struct powerpc_intr *i; int error, enable = 0; @@ -533,7 +536,13 @@ powerpc_setup_intr(const char *name, u_int irq, driver error = intr_event_add_handler(i->event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); - + if (error) + return (error); + i->pi_domain = domain; + if (strcmp(name, "IPI") != 0) { + CPU_ZERO(&i->pi_cpuset); + CPU_COPY(&cpuset_domain[domain], &i->pi_cpuset); + } mtx_lock(&intr_table_lock); intrcnt_setname(i->event->ie_fullname, i->cntindex); mtx_unlock(&intr_table_lock); @@ -551,7 +560,7 @@ powerpc_setup_intr(const char *name, u_int irq, driver PIC_CONFIG(i->pic, i->intline, i->trig, i->pol); if (i->pic == root_pic) - PIC_BIND(i->pic, i->intline, i->cpu, &i->priv); + PIC_BIND(i->pic, i->intline, i->pi_cpuset, &i->priv); if (enable) PIC_ENABLE(i->pic, i->intline, i->vector, Modified: head/sys/powerpc/powerpc/mp_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/mp_machdep.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/powerpc/mp_machdep.c Sat Apr 13 04:03:18 2019 (r346174) @@ -182,6 +182,15 @@ cpu_mp_start(void) pc->pc_bsp = 1; } pc->pc_hwref = cpu.cr_hwref; + + if (vm_ndomains > 1) + pc->pc_domain = cpu.cr_domain; + else + pc->pc_domain = 0; + + CPU_SET(pc->pc_cpuid, &cpuset_domain[pc->pc_domain]); + KASSERT(pc->pc_domain < MAXMEMDOM, ("bad domain value %d\n", + pc->pc_domain)); CPU_SET(pc->pc_cpuid, &all_cpus); next: error = platform_smp_next_cpu(&cpu); @@ -205,7 +214,7 @@ cpu_mp_announce(void) pc = pcpu_find(i); if (pc == NULL) continue; - printf("cpu%d: dev=%x", i, (int)pc->pc_hwref); + printf("cpu%d: dev=%x domain=%d ", i, (int)pc->pc_hwref, pc->pc_domain); if (pc->pc_bsp) printf(" (BSP)"); printf("\n"); Modified: head/sys/powerpc/powerpc/nexus.c ============================================================================== --- head/sys/powerpc/powerpc/nexus.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/powerpc/nexus.c Sat Apr 13 04:03:18 2019 (r346174) @@ -38,11 +38,13 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include #include +#include #include #include @@ -67,6 +69,8 @@ static bus_teardown_intr_t nexus_teardown_intr; static bus_activate_resource_t nexus_activate_resource; static bus_deactivate_resource_t nexus_deactivate_resource; static bus_space_tag_t nexus_get_bus_tag(device_t, device_t); +static int nexus_get_cpus(device_t, device_t, enum cpu_sets, size_t, + cpuset_t *); #ifdef SMP static bus_bind_intr_t nexus_bind_intr; #endif @@ -89,6 +93,7 @@ static device_method_t nexus_methods[] = { #endif DEVMETHOD(bus_config_intr, nexus_config_intr), DEVMETHOD(bus_get_bus_tag, nexus_get_bus_tag), + DEVMETHOD(bus_get_cpus, nexus_get_cpus), /* ofw_bus interface */ DEVMETHOD(ofw_bus_map_intr, nexus_ofw_map_intr), @@ -127,11 +132,13 @@ nexus_setup_intr(device_t bus __unused, device_t child int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { - int error; + int error, domain; if (r == NULL) panic("%s: NULL interrupt resource!", __func__); + if (cookiep != NULL) + *cookiep = NULL; if ((rman_get_flags(r) & RF_SHAREABLE) == 0) flags |= INTR_EXCL; @@ -140,8 +147,13 @@ nexus_setup_intr(device_t bus __unused, device_t child if (error) return (error); + if (bus_get_domain(child, &domain) != 0) { + if(bootverbose) + device_printf(child, "no domain found\n"); + domain = 0; + } error = powerpc_setup_intr(device_get_nameunit(child), - rman_get_start(r), filt, intr, arg, flags, cookiep); + rman_get_start(r), filt, intr, arg, flags, cookiep, domain); return (error); } @@ -162,6 +174,24 @@ nexus_get_bus_tag(device_t bus __unused, device_t chil { return(&bs_be_tag); +} + +static int +nexus_get_cpus(device_t dev, device_t child, enum cpu_sets op, size_t setsize, + cpuset_t *cpuset) +{ + + switch (op) { +#ifdef SMP + case INTR_CPUS: + if (setsize != sizeof(cpuset_t)) + return (EINVAL); + *cpuset = all_cpus; + return (0); +#endif + default: + return (bus_generic_get_cpus(dev, child, op, setsize, cpuset)); + } } #ifdef SMP Modified: head/sys/powerpc/powerpc/platform.c ============================================================================== --- head/sys/powerpc/powerpc/platform.c Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/powerpc/platform.c Sat Apr 13 04:03:18 2019 (r346174) @@ -48,13 +48,16 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include #include #include #include #include #include +#include #include "platform_if.h" @@ -67,9 +70,12 @@ static char plat_name[64] = ""; SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN, plat_name, 0, "Platform currently in use"); +static struct mem_affinity mem_info[VM_PHYSSEG_MAX + 1]; +static int vm_locality_table[MAXMEMDOM * MAXMEMDOM]; static struct mem_region pregions[PHYS_AVAIL_SZ]; +static struct numa_mem_region numa_pregions[PHYS_AVAIL_SZ]; static struct mem_region aregions[PHYS_AVAIL_SZ]; -static int npregions, naregions; +static int nnumapregions, npregions, naregions; /* * Memory region utilities: determine if two regions overlap, @@ -113,6 +119,54 @@ mr_cmp(const void *a, const void *b) } void +numa_mem_regions(struct numa_mem_region **phys, int *physsz) +{ + struct mem_affinity *mi; + int i, j, maxdom, ndomain, offset; + + nnumapregions = 0; + PLATFORM_NUMA_MEM_REGIONS(plat_obj, numa_pregions, &nnumapregions); + + if (physsz != NULL) + *physsz = nnumapregions; + if (phys != NULL) + *phys = numa_pregions; + if (physsz == NULL || phys == NULL) { + printf("unset value\n"); + return; + } + maxdom = 0; + for (i = 0; i < nnumapregions; i++) + if (numa_pregions[i].mr_domain > maxdom) + maxdom = numa_pregions[i].mr_domain; + + mi = mem_info; + for (i = 0; i < nnumapregions; i++, mi++) { + mi->start = numa_pregions[i].mr_start; + mi->end = numa_pregions[i].mr_start + numa_pregions[i].mr_size; + mi->domain = numa_pregions[i].mr_domain; + } + offset = 0; + vm_locality_table[offset] = 10; + ndomain = maxdom + 1; + if (ndomain > 1) { + for (i = 0; i < ndomain; i++) { + for (j = 0; j < ndomain; j++) { + /* + * Not sure what these values should actually be + */ + if (i == j) + vm_locality_table[offset] = 10; + else + vm_locality_table[offset] = 21; + offset++; + } + } + } + vm_phys_register_domains(ndomain, mem_info, vm_locality_table); +} + +void mem_regions(struct mem_region **phys, int *physsz, struct mem_region **avail, int *availsz) { @@ -252,7 +306,7 @@ platform_smp_probe_threads(void) struct cpu_group * cpu_topo(void) { - return (PLATFORM_SMP_TOPO(plat_obj)); + return (PLATFORM_SMP_TOPO(plat_obj)); } #endif Modified: head/sys/powerpc/powerpc/platform_if.m ============================================================================== --- head/sys/powerpc/powerpc/platform_if.m Sat Apr 13 03:32:21 2019 (r346173) +++ head/sys/powerpc/powerpc/platform_if.m Sat Apr 13 04:03:18 2019 (r346174) @@ -130,6 +130,22 @@ METHOD void mem_regions { int *_availsz; }; + +/** + * @brief Return the system's physical memory map. + * + * It shall provide the total RAM with the corresponding domains. + * + * @param _memp Array of physical memory chunks + * @param _memsz Number of physical memory chunks + */ + +METHOD void numa_mem_regions { + platform_t _plat; + struct numa_mem_region *_memp; + int *_memsz; +}; + /** * @brief Return the maximum address accessible in real mode * (for use with hypervisors) From owner-svn-src-head@freebsd.org Sat Apr 13 04:42:19 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03D6D156BEBF; Sat, 13 Apr 2019 04:42:19 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 95D5B6CCEE; Sat, 13 Apr 2019 04:42:18 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58CBE3FF4; Sat, 13 Apr 2019 04:42:18 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3D4gIXF042376; Sat, 13 Apr 2019 04:42:18 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D4gHCf042373; Sat, 13 Apr 2019 04:42:17 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201904130442.x3D4gHCf042373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 13 Apr 2019 04:42:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346175 - head/usr.bin/sort X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/usr.bin/sort X-SVN-Commit-Revision: 346175 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 95D5B6CCEE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 04:42:19 -0000 Author: cem Date: Sat Apr 13 04:42:17 2019 New Revision: 346175 URL: https://svnweb.freebsd.org/changeset/base/346175 Log: sort(1): Memoize MD5 computation to reduce repeated computation Experimentally, reduces sort -R time of a 148160 line corpus from about 3.15s to about 0.93s on this particular system. There's probably room for improvement using some digest other than md5, but I don't want to look at sort(1) anymore. Some discussion of other possible improvements in the Test Plan section of the Differential. PR: 230792 Reviewed by: jhb (earlier version) Differential Revision: https://reviews.freebsd.org/D19885 Modified: head/usr.bin/sort/coll.c head/usr.bin/sort/coll.h head/usr.bin/sort/sort.c Modified: head/usr.bin/sort/coll.c ============================================================================== --- head/usr.bin/sort/coll.c Sat Apr 13 04:03:18 2019 (r346174) +++ head/usr.bin/sort/coll.c Sat Apr 13 04:42:17 2019 (r346175) @@ -981,6 +981,15 @@ hnumcoll(struct key_value *kv1, struct key_value *kv2, return (numcoll_impl(kv1, kv2, offset, true)); } +/* Use hint space to memoize md5 computations, at least. */ +static void +randomcoll_init_hint(struct key_value *kv, void *hash) +{ + + memcpy(kv->hint->v.Rh.cached, hash, sizeof(kv->hint->v.Rh.cached)); + kv->hint->status = HS_INITIALIZED; +} + /* * Implements random sort (-R). */ @@ -991,6 +1000,7 @@ randomcoll(struct key_value *kv1, struct key_value *kv struct bwstring *s1, *s2; MD5_CTX ctx1, ctx2; unsigned char hash1[MD5_DIGEST_LENGTH], hash2[MD5_DIGEST_LENGTH]; + int cmp; s1 = kv1->k; s2 = kv2->k; @@ -1003,6 +1013,14 @@ randomcoll(struct key_value *kv1, struct key_value *kv if (s1 == s2) return (0); + if (kv1->hint->status == HS_INITIALIZED && + kv2->hint->status == HS_INITIALIZED) { + cmp = memcmp(kv1->hint->v.Rh.cached, + kv2->hint->v.Rh.cached, sizeof(kv1->hint->v.Rh.cached)); + if (cmp != 0) + return (cmp); + } + memcpy(&ctx1, &md5_ctx, sizeof(MD5_CTX)); memcpy(&ctx2, &md5_ctx, sizeof(MD5_CTX)); @@ -1011,6 +1029,11 @@ randomcoll(struct key_value *kv1, struct key_value *kv MD5Final(hash1, &ctx1); MD5Final(hash2, &ctx2); + + if (kv1->hint->status == HS_UNINITIALIZED) + randomcoll_init_hint(kv1, hash1); + if (kv2->hint->status == HS_UNINITIALIZED) + randomcoll_init_hint(kv2, hash2); return (memcmp(hash1, hash2, sizeof(hash1))); } Modified: head/usr.bin/sort/coll.h ============================================================================== --- head/usr.bin/sort/coll.h Sat Apr 13 04:03:18 2019 (r346174) +++ head/usr.bin/sort/coll.h Sat Apr 13 04:42:17 2019 (r346175) @@ -65,6 +65,17 @@ struct M_hint }; /* + * Sort hint data for -R + * + * This stores the first 12 bytes of the digest rather than the full output to + * avoid increasing the size of the 'key_hint' object via the 'v' union. + */ +struct R_hint +{ + unsigned char cached[12]; +}; + +/* * Status of a sort hint object */ typedef enum @@ -83,6 +94,7 @@ struct key_hint struct n_hint nh; struct g_hint gh; struct M_hint Mh; + struct R_hint Rh; } v; }; Modified: head/usr.bin/sort/sort.c ============================================================================== --- head/usr.bin/sort/sort.c Sat Apr 13 04:03:18 2019 (r346174) +++ head/usr.bin/sort/sort.c Sat Apr 13 04:42:17 2019 (r346175) @@ -583,6 +583,7 @@ set_sort_modifier(struct sort_mods *sm, int c) break; case 'R': sm->Rflag = true; + need_hint = true; need_random = true; break; case 'M': From owner-svn-src-head@freebsd.org Sat Apr 13 04:46:36 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE3FB156C1C4; Sat, 13 Apr 2019 04:46:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 522536D00C; Sat, 13 Apr 2019 04:46:36 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F20B4018; Sat, 13 Apr 2019 04:46:36 +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 x3D4kakS042627; Sat, 13 Apr 2019 04:46:36 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D4kabU042626; Sat, 13 Apr 2019 04:46:36 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201904130446.x3D4kabU042626@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 13 Apr 2019 04:46:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346176 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 346176 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 522536D00C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.944,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 04:46:36 -0000 Author: imp Date: Sat Apr 13 04:46:35 2019 New Revision: 346176 URL: https://svnweb.freebsd.org/changeset/base/346176 Log: Fix sbttons for values > 2s Add test against negative times. Add code to cope with larger values properly. Discussed with: bde@ (quite some time ago, for an earlier version) Modified: head/sys/sys/time.h Modified: head/sys/sys/time.h ============================================================================== --- head/sys/sys/time.h Sat Apr 13 04:42:17 2019 (r346175) +++ head/sys/sys/time.h Sat Apr 13 04:46:35 2019 (r346176) @@ -184,8 +184,18 @@ sbttobt(sbintime_t _sbt) static __inline int64_t sbttons(sbintime_t _sbt) { + uint64_t ns; - return ((1000000000 * _sbt) >> 32); +#ifdef KASSERT + KASSERT(_sbt >= 0, ("Negative values illegal for sbttons: %jx", _sbt)); +#endif + ns = _sbt; + if (ns >= SBT_1S) + ns = (ns >> 32) * 1000000000; + else + ns = 0; + + return (ns + (1000000000 * (_sbt & 0xffffffffu) >> 32)); } static __inline sbintime_t From owner-svn-src-head@freebsd.org Sat Apr 13 06:30:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30CCB156E4BE; Sat, 13 Apr 2019 06:30:47 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CC6FB6FB40; Sat, 13 Apr 2019 06:30:46 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 641CE5122; Sat, 13 Apr 2019 06:30: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 x3D6Uk8S095354; Sat, 13 Apr 2019 06:30:46 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3D6UjBi095349; Sat, 13 Apr 2019 06:30:45 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201904130630.x3D6UjBi095349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 13 Apr 2019 06:30:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346177 - in head/sys: amd64/conf arm/conf conf i386/conf powerpc/conf sparc64/conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: amd64/conf arm/conf conf i386/conf powerpc/conf sparc64/conf X-SVN-Commit-Revision: 346177 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CC6FB6FB40 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 06:30:47 -0000 Author: imp Date: Sat Apr 13 06:30:45 2019 New Revision: 346177 URL: https://svnweb.freebsd.org/changeset/base/346177 Log: Move mpr/mps drivers from per-arch NOTES files into the MI notes file. They are in more arches they they aren't. Add appropriate nodevice directives in powerpc and arm. Modified: head/sys/amd64/conf/NOTES head/sys/arm/conf/NOTES head/sys/conf/NOTES head/sys/i386/conf/NOTES head/sys/powerpc/conf/NOTES head/sys/sparc64/conf/NOTES Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/amd64/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -459,11 +459,6 @@ device imcsmb device isci options ISCI_LOGGING # enable debugging in isci HAL -# LSI-Logic MPT-Fusion drivers -device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 -device mpr # LSI-Logic MPT-Fusion 3 - # # NVM Express (NVMe) support device nvme # base NVMe driver Modified: head/sys/arm/conf/NOTES ============================================================================== --- head/sys/arm/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/arm/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -79,3 +79,7 @@ options KDTRACE_HOOKS # Alternatively include all the DTrace modules #device dtraceall + +# These aren't known to work on arm and/or don't compile +nodevice mpr +nodevice mps Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -1565,6 +1565,8 @@ options TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK) # Qlogic ISP 2300 and ISP 2312 2Gb Fibre Channel host adapters. # Qlogic ISP 2322 and ISP 6322 2Gb Fibre Channel host adapters. # ispfw: Firmware module for Qlogic host adapters +# mpr: LSI-Logic MPT/Fusion Gen 3 +# mps: LSI-Logic MPT/Fusion Gen 2 # mpt: LSI-Logic MPT/Fusion 53c1020 or 53c1030 Ultra4 # or FC9x9 Fibre Channel host adapters. # sym: Symbios/Logic 53C8XX family of PCI-SCSI I/O processors: @@ -1594,7 +1596,9 @@ hint.isp.0.topology="nport-only" hint.isp.0.portwnn="w50000000aaaa0000" hint.isp.0.nodewnn="w50000000aaaa0001" device ispfw -device mpt +device mpr # LSI-Logic MPT-Fusion 3 +device mps # LSI-Logic MPT-Fusion 2 +device mpt # LSI-Logic MPT-Fusion device sym device trm Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/i386/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -690,11 +690,6 @@ device ips device isci options ISCI_LOGGING # enable debugging in isci HAL -# LSI-Logic MPT-Fusion drivers -device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 -device mpr # LSI-Logic MPT-Fusion 3 - # # NVM Express (NVMe) support device nvme # base NVMe driver Modified: head/sys/powerpc/conf/NOTES ============================================================================== --- head/sys/powerpc/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/powerpc/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -80,6 +80,8 @@ nodevice ccr nodevice cxgbe # XXX: builds on powerpc64 only. nodevice cxgbev nodevice fdc +nodevice mpr # no 64-bit atomics +nodevice mps # no 64-bit atomics nodevice ppc nodevice splash # when splash works enable *_saver Modified: head/sys/sparc64/conf/NOTES ============================================================================== --- head/sys/sparc64/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/sparc64/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -85,11 +85,6 @@ options SUNKBD_EMULATE_ATKBD # allows to use the AT k options SUNKBD_DFLT_KEYMAP # specify the built-in keymap makeoptions SUNKBD_DFLT_KEYMAP=fr.dvorak -# LSI-Logic MPT-Fusion drivers -device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 -device mpr # LSI-Logic MPT-Fusion 3 - ##################################################################### # Devices we don't want to deal with From owner-svn-src-head@freebsd.org Sat Apr 13 06:40:32 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58341156EA4B; Sat, 13 Apr 2019 06:40:32 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail104.syd.optusnet.com.au (mail104.syd.optusnet.com.au [211.29.132.246]) by mx1.freebsd.org (Postfix) with ESMTP id 982E36FF65; Sat, 13 Apr 2019 06:40:31 +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 mail104.syd.optusnet.com.au (Postfix) with ESMTPS id E3CD243AB88; Sat, 13 Apr 2019 16:40:20 +1000 (AEST) Date: Sat, 13 Apr 2019 16:40:19 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Warner Losh cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346176 - head/sys/sys In-Reply-To: <201904130446.x3D4kabU042626@repo.freebsd.org> Message-ID: <20190413150641.N10265@besplex.bde.org> References: <201904130446.x3D4kabU042626@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=UJetJGXy c=1 sm=1 tr=0 cx=a_idp_d a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=yN3NuX8VpI7eo1ogYXkA:9 a=qm3kaefaaKCe6iHx:21 a=q1I3VDI0TebsFKds:21 a=CjuIK1q_8ugA:10 X-Rspamd-Queue-Id: 982E36FF65 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 06:40:32 -0000 On Sat, 13 Apr 2019, Warner Losh wrote: > Fix sbttons for values > 2s > > Add test against negative times. Add code to cope with larger values > properly. > > Discussed with: bde@ (quite some time ago, for an earlier version) I am unhappy with previous attempted fixes in this area, and still have large local patches. Old versions supported negative times. This was broken in 2 stages: - use a buggy inline conversion function instead of a working macro - break negative times further when fixing overflow bugs in the inline function - attempt to panic for negative times, but actually do nothing since this is in unreachable code. > Modified: head/sys/sys/time.h > ============================================================================== > --- head/sys/sys/time.h Sat Apr 13 04:42:17 2019 (r346175) > +++ head/sys/sys/time.h Sat Apr 13 04:46:35 2019 (r346176) > @@ -184,8 +184,18 @@ sbttobt(sbintime_t _sbt) > static __inline int64_t > sbttons(sbintime_t _sbt) > { > + uint64_t ns; > > - return ((1000000000 * _sbt) >> 32); sbintime_t is a signed type so as to support negative times. This function returns a signed type so as to support negative times. The original sloppy and fast version with a macro worked for all negative times, modulo the assumption that right shifts propagate the sign bit. It just did _sbt >> 32. The above slower and more accurate version might have worked for negative times similarly, but this is less clear. E.g., if _sbt is -1 second, that is 0xffffffff (-1) in the high 32 bits and 0 in the low 32 bits. Multiplying this by 10**9 doesn't overflow since both terms are signed, and gives a result near -1 in the high bits and the shift works before. I think similarly for all negative values down to the overflow threshold of about -2 seconds. Similarly for the other functions -- the simple shifts just worked (unportably), while all later versions have overflow and/or sign extension bugs. > +#ifdef KASSERT > + KASSERT(_sbt >= 0, ("Negative values illegal for sbttons: %jx", _sbt)); > +#endif KASSERT is never defined here except in code with style bugs. In the kernel, sys/time.h is never included directly except in code with style bugs. It is normally included as part of standard namespace pollution in sys/param.h. Namespace pollution defeats ifdefs like this. KASSERT is only defined in sys/systm.h (except...), so it is never defined when sys/param.h includes sys/time.h (except in code with even worse style bugs, such as including sys/systm.h unsorted before sys/systm.h...). In userland, KASSERT is never defined here except in code with style bugs (such as being chummy with the implementation and defining KASSERT to use here) and in code to demonstrate the brokenness of this header (KASSERT is in the application namespace, so the demonstration can define it as 'syntax error'. > + ns = _sbt; This corrupts the type from signed to unsigned. This has no effect except to ensure breaking negative times. E.g., if the time is not negative, then the conversion doesn't change its value. Ottherwise, the conversion prevents propagation of the sign bit. E.g, if the time is -1 then shifting right the signed value by 32 keeps it as -1, but shifting right the unsigned value gives UINT32_MAX seconds = UINT32_MAX * 10**9 nsec = about 1/4 of UINT64_MAX seconds. Since this and all other possible values in ns are less than 1/4 UINT64_MAX, then are also less than INT64_MAX, so conversion back to a signed type doesn't overflow them back to a negative value. > + if (ns >= SBT_1S) > + ns = (ns >> 32) * 1000000000; > + else > + ns = 0; > + Style bug (extra blank line). In KNF, statements are separated by a semilcolon and a single newline. An extra newline is especially bad when it is used to separate closely related statements like here. > + return (ns + (1000000000 * (_sbt & 0xffffffffu) >> 32)); This seems to be correct, except for its style bugs of spelling the U suffix in lower case. I don't like using the suffix, but the value of plain 0xffffffff after promotion to the type of _sbt is unclear. > } > > static __inline sbintime_t Conversion in the opposite direction is more difficult and buggier. I currently use the following cut down version with only the most important function fixed: XX Index: time.h XX =================================================================== XX --- time.h (revision 346046) XX +++ time.h (working copy) XX @@ -200,8 +200,20 @@ XX sb = (_ns / 1000000000) * SBT_1S; XX _ns = _ns % 1000000000; These divisons are very slow on i386, and not very fast on amd64. They defeat the manual reductions to shifts and multiplications in the rest of the code. This case starts unnecessarily early (at 1 second instead of at the overflow threshold of 4+ seconds). XX } XX +#if 0 XX /* 9223372037 = ceil(2^63 / 1000000000) */ XX sb += ((_ns * 9223372037ull) + 0x7fffffff) >> 31; Current version that I don't like, due to its magic 922* and use of the long long abomination, and wrong magic bias 0x7fffffff (this almost works. IIRC, it gives errors of 1-3 sbintime_t values (fractional nsec) and it is hard to see why the errors are so small since its value makes no sense). XX +#elif 0 XX + sb += (_ns * (((uint64_t)1 << 63) / 500000000 + 1) + 0xffffffff) >> 32; Similar version without the abomination and without the magic numbers divided by 2. The 922* number is bogus for another reason. It is reduced from an 1844* number (== UINT64_MAX divided by some power of 10) so as to avoid overflow for signed values. But the code is supposed to eliminate signed values. It can use the more natural number 1844* or the better expression for it above together with not dividing everything by 2. I now remember one source of the off by 1-3 error. Dividing everything by 2 loses 1 bit, so gives off by 1 errors. Maybe the 0x7fffffff magic number is correct after all. XX +#elif 1 XX + sb += (_ns << 32) / 1000000000 + (_ns == 0 ? 0 : 1); Not the best version, but it is what I have been using. It depends on division being fast or the compiler reducing division to multiplication, and to do this, first notice that _ns has been reduced to 32 bits so the division is not a full 64-bit one. Then always round up except for _ns = 0, and add 1 even if the result is already correctly rounded. This rounding is sloppy and not quite right, but so is the rounding resulting from adding the bias before the shift. XX +#else XX + uint64_t factor, frac; XX + XX + factor = ((uint64_t)1 << 63) / 500000000; XX + frac = ((0 - factor * 1000000000) << 32) / 1000000000; XX + sb += (_ns * factor + ((_ns * frac) >> 32) + 0xffffffff) >> 32; XX +#endif This version is supposed to do correct rounding. It is significantly slower, but not nearly as slow as the mul/div by 10**9 above the threshold. The compiler is supposed to turn the division by 10**9 here into a multiplication, but it looks like I was not careful enough to reduce so that this is possible, so this is very slow on i386 where I didn't test it and not fast on amd64 where I did test it. XX return (sb); XX } XX See also my fixes in calcru1(). These do the scaling more carefully than the above, but the final conversion of the result in usec to a timeval is very slow on i386, etc., as usual because mul/div of 64-bit usec by 10**6 is very slow. More precisely, it is very slow only in the kernel since libkern still uses a very slow method written in C, and merely slow in userland where libgcc uses a method half as good as possible. The old macro versions are also much better in the usual case where the caller doesn't care about accuracy. Bruce From owner-svn-src-head@freebsd.org Sat Apr 13 08:14:10 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6987115714BC; Sat, 13 Apr 2019 08:14:10 +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 9B63972A8E; Sat, 13 Apr 2019 08:14:09 +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 91D783D7AF0; Sat, 13 Apr 2019 18:14:00 +1000 (AEST) Date: Sat, 13 Apr 2019 18:13:59 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org cc: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r346176 - head/sys/sys In-Reply-To: <20190413150641.N10265@besplex.bde.org> Message-ID: <20190413170441.N10576@besplex.bde.org> References: <201904130446.x3D4kabU042626@repo.freebsd.org> <20190413150641.N10265@besplex.bde.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=FNpr/6gs c=1 sm=1 tr=0 cx=a_idp_d a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=9cW_t1CCXrUA:10 a=kj9zAlcOel0A:10 a=EbWMYzAKIVLIQpZ_2q8A:9 a=CjuIK1q_8ugA:10 X-Rspamd-Queue-Id: 9B63972A8E X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.980,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 08:14:10 -0000 On Sat, 13 Apr 2019, Bruce Evans wrote: > On Sat, 13 Apr 2019, Warner Losh wrote: > >> Fix sbttons for values > 2s >> >> Add test against negative times. Add code to cope with larger values >> properly. >> >> Discussed with: bde@ (quite some time ago, for an earlier version) > > I am unhappy with previous attempted fixes in this area, and still have large > local patches. > ... >> Modified: head/sys/sys/time.h >> ============================================================================== >> --- head/sys/sys/time.h Sat Apr 13 04:42:17 2019 (r346175) >> +++ head/sys/sys/time.h Sat Apr 13 04:46:35 2019 (r346176) >> @@ -184,8 +184,18 @@ sbttobt(sbintime_t _sbt) >> static __inline int64_t >> sbttons(sbintime_t _sbt) >> { >> + uint64_t ns; >> >> - return ((1000000000 * _sbt) >> 32); >* ... >> + ns = _sbt; >> + if (ns >= SBT_1S) >> + ns = (ns >> 32) * 1000000000; >> + else >> + ns = 0; >> + >... >> + return (ns + (1000000000 * (_sbt & 0xffffffffu) >> 32)); Another style bug: extra parentheses moved from a useful place to a non- useful place. '*' has precedence over '>>', but this combination is unusual so the old code emphasized it using parentheses. '*' has precedence over '+', and this combination is usual so it shouldn't be emphasized using parentheses, but the new code does that and removes the more useful parentheses. >> } sbttous() and sbttoms() are still broken. sbtots() might be pessimized since it calls sbttons with a 32-bit arg that doesn't need the above complications (the compiler would be doing well to see that and replace ns by 0 in the above calculations. Another bug in the above and previous changes: ns is in the application namespace. Adding it defeats the care taken with naming the arg with an underscore. All inline functions in standard and sys headers have this problem. These are under __BSD_VISIBLE, but of course there is no documentation that this reserves the names ns, etc. Better fix based on looking at sbtots(): split _sbt into seconds and nanoseconds unconditially and reassemble using simple expressions. This is almost as efficient on 32-bit arches, since the seconds and nanoseconds fit in 32 bits so reassembly uses 2 32x32 -> 64-bit multiplications instead of 1 64x32 -> 64-bit multiplication. static __inline int64_t sbttons(sbintime_t _sbt) { #ifdef __tooslow if (__predict_false(_sbt == INT64_MIN) return (-1); /* round towards +-Inf to keep non-0 */ #endif #ifdef __maybenottooslow if (__predict_false(_sbt < 0)) return sbttons(-sbt); #endif return (1000000000 * (_sbt >> 32) + (1000000000 * (_sbt & 0xffffffffU)) >> 32); /* XXX rounding? */ } Handling negative values makes it about as messy and slow as the committed version :-(. Rounding is also a problem. It is normal to round times down, but that turns nonzero into zero which is bad for timeouts. The version in my previous reply always adds 1 mainly to avoid this. Conversion to a different representation and back gives double rounding down if rounding is always done, so rarely gives the original value. The file still has phk's comment about rounding down being required, and the changes to the sbintime conversion functions still ignore this. Bruce From owner-svn-src-head@freebsd.org Sat Apr 13 10:47:49 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A5C81574DE9; Sat, 13 Apr 2019 10:47:49 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 93DFD77459; Sat, 13 Apr 2019 10:47:48 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 698E27D79; Sat, 13 Apr 2019 10:47:48 +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 x3DAlmcN030642; Sat, 13 Apr 2019 10:47:48 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DAlmGP030641; Sat, 13 Apr 2019 10:47:48 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201904131047.x3DAlmGP030641@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sat, 13 Apr 2019 10:47:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346182 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 346182 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 93DFD77459 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 10:47:49 -0000 Author: tuexen Date: Sat Apr 13 10:47:47 2019 New Revision: 346182 URL: https://svnweb.freebsd.org/changeset/base/346182 Log: When sending IPv4 packets on a SOCK_RAW socket using the IP_HDRINCL option, ensure that the ip_hl field is valid. Furthermore, ensure that the complete IPv4 header is contained in the first mbuf. Finally, move the length checks before relying on them when accessing fields of the IPv4 header. Reported by: jtl@ Reviewed by: jtl@ MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D19181 Modified: head/sys/netinet/raw_ip.c Modified: head/sys/netinet/raw_ip.c ============================================================================== --- head/sys/netinet/raw_ip.c Sat Apr 13 09:06:36 2019 (r346181) +++ head/sys/netinet/raw_ip.c Sat Apr 13 10:47:47 2019 (r346182) @@ -453,7 +453,7 @@ rip_output(struct mbuf *m, struct socket *so, ...) u_long dst; int flags = ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0) | IP_ALLOWBROADCAST; - int cnt; + int cnt, hlen; u_char opttype, optlen, *cp; va_start(ap, so); @@ -509,33 +509,40 @@ rip_output(struct mbuf *m, struct socket *so, ...) m_freem(m); return(EMSGSIZE); } - INP_RLOCK(inp); ip = mtod(m, struct ip *); - error = prison_check_ip4(inp->inp_cred, &ip->ip_src); - if (error != 0) { - INP_RUNLOCK(inp); - m_freem(m); - return (error); + hlen = ip->ip_hl << 2; + if (m->m_len < hlen) { + m = m_pullup(m, hlen); + if (m == NULL) + return (EINVAL); + ip = mtod(m, struct ip *); } + INP_RLOCK(inp); /* * Don't allow both user specified and setsockopt options, * and don't allow packet length sizes that will crash. */ - if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) - || (ntohs(ip->ip_len) != m->m_pkthdr.len) - || (ntohs(ip->ip_len) < (ip->ip_hl << 2))) { + if ((hlen < sizeof (*ip)) + || ((hlen > sizeof (*ip)) && inp->inp_options) + || (ntohs(ip->ip_len) != m->m_pkthdr.len)) { INP_RUNLOCK(inp); m_freem(m); return (EINVAL); } + error = prison_check_ip4(inp->inp_cred, &ip->ip_src); + if (error != 0) { + INP_RUNLOCK(inp); + m_freem(m); + return (error); + } /* * Don't allow IP options which do not have the required * structure as specified in section 3.1 of RFC 791 on * pages 15-23. */ cp = (u_char *)(ip + 1); - cnt = (ip->ip_hl << 2) - sizeof (struct ip); + cnt = hlen - sizeof (struct ip); for (; cnt > 0; cnt -= optlen, cp += optlen) { opttype = cp[IPOPT_OPTVAL]; if (opttype == IPOPT_EOL) From owner-svn-src-head@freebsd.org Sat Apr 13 12:50:48 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F0101577F74; Sat, 13 Apr 2019 12:50:48 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E810B82EEF; Sat, 13 Apr 2019 12:50:47 +0000 (UTC) (envelope-from vmaffione@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C235E92E8; Sat, 13 Apr 2019 12:50:47 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3DColO7095826; Sat, 13 Apr 2019 12:50:47 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DColUk095825; Sat, 13 Apr 2019 12:50:47 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <201904131250.x3DColUk095825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Sat, 13 Apr 2019 12:50:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346184 - head/tests/sys/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/tests/sys/netmap X-SVN-Commit-Revision: 346184 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E810B82EEF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 12:50:48 -0000 Author: vmaffione Date: Sat Apr 13 12:50:47 2019 New Revision: 346184 URL: https://svnweb.freebsd.org/changeset/base/346184 Log: netmap: add test cases for multiple host rings Extend the netmap unit tests with new test cases for the multiple-host-rings feature introduced by r345269. MFC after: 1 week Modified: head/tests/sys/netmap/ctrl-api-test.c Modified: head/tests/sys/netmap/ctrl-api-test.c ============================================================================== --- head/tests/sys/netmap/ctrl-api-test.c Sat Apr 13 11:09:42 2019 (r346183) +++ head/tests/sys/netmap/ctrl-api-test.c Sat Apr 13 12:50:47 2019 (r346184) @@ -50,20 +50,16 @@ #ifdef __FreeBSD__ #include "freebsd_test_suite/macros.h" -#endif - -#ifdef __linux__ -#include -#else - static int eventfd(int x __unused, int y __unused) { errno = ENODEV; return -1; } -#endif /* __linux__ */ +#else /* __linux__ */ +#include +#endif static int exec_command(int argc, const char *const argv[]) @@ -144,6 +140,8 @@ struct TestContext { uint32_t nr_rx_slots; /* slots in rx rings */ uint16_t nr_tx_rings; /* number of tx rings */ uint16_t nr_rx_rings; /* number of rx rings */ + uint16_t nr_host_tx_rings; /* number of host tx rings */ + uint16_t nr_host_rx_rings; /* number of host rx rings */ uint16_t nr_mem_id; /* id of the memory allocator */ uint16_t nr_ringid; /* ring(s) we care about */ uint32_t nr_mode; /* specify NR_REG_* modes */ @@ -242,6 +240,8 @@ port_register(struct TestContext *ctx) req.nr_tx_slots = ctx->nr_tx_slots; req.nr_rx_slots = ctx->nr_rx_slots; req.nr_tx_rings = ctx->nr_tx_rings; + req.nr_host_tx_rings = ctx->nr_host_tx_rings; + req.nr_host_rx_rings = ctx->nr_host_rx_rings; req.nr_rx_rings = ctx->nr_rx_rings; req.nr_extra_bufs = ctx->nr_extra_bufs; ret = ioctl(ctx->fd, NIOCCTRL, &hdr); @@ -255,23 +255,29 @@ port_register(struct TestContext *ctx) printf("nr_rx_slots %u\n", req.nr_rx_slots); printf("nr_tx_rings %u\n", req.nr_tx_rings); printf("nr_rx_rings %u\n", req.nr_rx_rings); + printf("nr_host_tx_rings %u\n", req.nr_host_tx_rings); + printf("nr_host_rx_rings %u\n", req.nr_host_rx_rings); printf("nr_mem_id %u\n", req.nr_mem_id); printf("nr_extra_bufs %u\n", req.nr_extra_bufs); success = req.nr_memsize && (ctx->nr_mode == req.nr_mode) && - (ctx->nr_ringid == req.nr_ringid) && - (ctx->nr_flags == req.nr_flags) && - ((!ctx->nr_tx_slots && req.nr_tx_slots) || - (ctx->nr_tx_slots == req.nr_tx_slots)) && - ((!ctx->nr_rx_slots && req.nr_rx_slots) || - (ctx->nr_rx_slots == req.nr_rx_slots)) && - ((!ctx->nr_tx_rings && req.nr_tx_rings) || - (ctx->nr_tx_rings == req.nr_tx_rings)) && - ((!ctx->nr_rx_rings && req.nr_rx_rings) || - (ctx->nr_rx_rings == req.nr_rx_rings)) && - ((!ctx->nr_mem_id && req.nr_mem_id) || - (ctx->nr_mem_id == req.nr_mem_id)) && - (ctx->nr_extra_bufs == req.nr_extra_bufs); + (ctx->nr_ringid == req.nr_ringid) && + (ctx->nr_flags == req.nr_flags) && + ((!ctx->nr_tx_slots && req.nr_tx_slots) || + (ctx->nr_tx_slots == req.nr_tx_slots)) && + ((!ctx->nr_rx_slots && req.nr_rx_slots) || + (ctx->nr_rx_slots == req.nr_rx_slots)) && + ((!ctx->nr_tx_rings && req.nr_tx_rings) || + (ctx->nr_tx_rings == req.nr_tx_rings)) && + ((!ctx->nr_rx_rings && req.nr_rx_rings) || + (ctx->nr_rx_rings == req.nr_rx_rings)) && + ((!ctx->nr_host_tx_rings && req.nr_host_tx_rings) || + (ctx->nr_host_tx_rings == req.nr_host_tx_rings)) && + ((!ctx->nr_host_rx_rings && req.nr_host_rx_rings) || + (ctx->nr_host_rx_rings == req.nr_host_rx_rings)) && + ((!ctx->nr_mem_id && req.nr_mem_id) || + (ctx->nr_mem_id == req.nr_mem_id)) && + (ctx->nr_extra_bufs == req.nr_extra_bufs); if (!success) { return -1; } @@ -281,6 +287,8 @@ port_register(struct TestContext *ctx) ctx->nr_rx_slots = req.nr_rx_slots; ctx->nr_tx_rings = req.nr_tx_rings; ctx->nr_rx_rings = req.nr_rx_rings; + ctx->nr_host_tx_rings = req.nr_host_tx_rings; + ctx->nr_host_rx_rings = req.nr_host_rx_rings; ctx->nr_mem_id = req.nr_mem_id; ctx->nr_extra_bufs = req.nr_extra_bufs; @@ -448,7 +456,7 @@ port_register_hwall_host(struct TestContext *ctx) } static int -port_register_host(struct TestContext *ctx) +port_register_hostall(struct TestContext *ctx) { ctx->nr_mode = NR_REG_SW; return port_register(ctx); @@ -462,7 +470,7 @@ port_register_hwall(struct TestContext *ctx) } static int -port_register_single_ring_couple(struct TestContext *ctx) +port_register_single_hw_pair(struct TestContext *ctx) { ctx->nr_mode = NR_REG_ONE_NIC; ctx->nr_ringid = 0; @@ -470,6 +478,25 @@ port_register_single_ring_couple(struct TestContext *c } static int +port_register_single_host_pair(struct TestContext *ctx) +{ + ctx->nr_mode = NR_REG_ONE_SW; + ctx->nr_host_tx_rings = 2; + ctx->nr_host_rx_rings = 2; + ctx->nr_ringid = 1; + return port_register(ctx); +} + +static int +port_register_hostall_many(struct TestContext *ctx) +{ + ctx->nr_mode = NR_REG_SW; + ctx->nr_host_tx_rings = 5; + ctx->nr_host_rx_rings = 4; + return port_register(ctx); +} + +static int port_register_hwall_tx(struct TestContext *ctx) { ctx->nr_mode = NR_REG_ALL_NIC; @@ -1701,8 +1728,10 @@ static struct mytest tests[] = { decltest(port_info_get), decltest(port_register_hwall_host), decltest(port_register_hwall), - decltest(port_register_host), - decltest(port_register_single_ring_couple), + decltest(port_register_hostall), + decltest(port_register_single_hw_pair), + decltest(port_register_single_host_pair), + decltest(port_register_hostall_many), decltest(vale_attach_detach), decltest(vale_attach_detach_host_rings), decltest(vale_ephemeral_port_hdr_manipulation), From owner-svn-src-head@freebsd.org Sat Apr 13 13:31:08 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FC4C1578945; Sat, 13 Apr 2019 13:31:08 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0DB583FD8; Sat, 13 Apr 2019 13:31:07 +0000 (UTC) (envelope-from mckusick@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDE0098A2; Sat, 13 Apr 2019 13:31:07 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3DDV7nE014478; Sat, 13 Apr 2019 13:31:07 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DDV7w1014475; Sat, 13 Apr 2019 13:31:07 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <201904131331.x3DDV7w1014475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Sat, 13 Apr 2019 13:31:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346185 - head/sbin/fsck_ffs X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: head/sbin/fsck_ffs X-SVN-Commit-Revision: 346185 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E0DB583FD8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.943,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 13:31:08 -0000 Author: mckusick Date: Sat Apr 13 13:31:06 2019 New Revision: 346185 URL: https://svnweb.freebsd.org/changeset/base/346185 Log: Followup to -r344552 in which fsck_ffs checks for a size past the last allocated block of the file and if that is found, shortens the file to reference the last allocated block thus avoiding having it reference a hole at its end. This update corrects an error where fsck_ffs miscalculated the last logical block of the file when the file contained a large hole. Reported by: Jamie Landeg-Jones Tested by: Peter Holm MFC after: 2 weeks Sponsored by: Netflix Modified: head/sbin/fsck_ffs/fsck.h head/sbin/fsck_ffs/inode.c head/sbin/fsck_ffs/pass1.c Modified: head/sbin/fsck_ffs/fsck.h ============================================================================== --- head/sbin/fsck_ffs/fsck.h Sat Apr 13 12:50:47 2019 (r346184) +++ head/sbin/fsck_ffs/fsck.h Sat Apr 13 13:31:06 2019 (r346185) @@ -231,6 +231,7 @@ struct inodesc { ino_t id_parent; /* for DATA nodes, their parent */ ufs_lbn_t id_lbn; /* logical block number of current block */ ufs2_daddr_t id_blkno; /* current block number being examined */ + int id_level; /* level of indirection of this block */ int id_numfrags; /* number of frags contained in block */ ufs_lbn_t id_lballoc; /* pass1: last LBN that is allocated */ off_t id_filesize; /* for DATA nodes, the size of the directory */ Modified: head/sbin/fsck_ffs/inode.c ============================================================================== --- head/sbin/fsck_ffs/inode.c Sat Apr 13 12:50:47 2019 (r346184) +++ head/sbin/fsck_ffs/inode.c Sat Apr 13 13:31:06 2019 (r346185) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); static ino_t startinum; -static int iblock(struct inodesc *, long ilevel, off_t isize, int type); +static int iblock(struct inodesc *, off_t isize, int type); int ckinode(union dinode *dp, struct inodesc *idesc) @@ -70,6 +70,8 @@ ckinode(union dinode *dp, struct inodesc *idesc) if (idesc->id_fix != IGNORE) idesc->id_fix = DONTKNOW; idesc->id_lbn = -1; + idesc->id_lballoc = -1; + idesc->id_level = 0; idesc->id_entryno = 0; idesc->id_filesize = DIP(dp, di_size); mode = DIP(dp, di_mode) & IFMT; @@ -122,9 +124,10 @@ ckinode(union dinode *dp, struct inodesc *idesc) sizepb = sblock.fs_bsize; for (i = 0; i < UFS_NIADDR; i++) { sizepb *= NINDIR(&sblock); + idesc->id_level = i + 1; if (DIP(&dino, di_ib[i])) { idesc->id_blkno = DIP(&dino, di_ib[i]); - ret = iblock(idesc, i + 1, remsize, BT_LEVEL1 + i); + ret = iblock(idesc, remsize, BT_LEVEL1 + i); if (ret & STOP) return (ret); } else if (remsize > 0) { @@ -154,7 +157,7 @@ ckinode(union dinode *dp, struct inodesc *idesc) } static int -iblock(struct inodesc *idesc, long ilevel, off_t isize, int type) +iblock(struct inodesc *idesc, off_t isize, int type) { struct bufarea *bp; int i, n, (*func)(struct inodesc *), nif; @@ -172,8 +175,8 @@ iblock(struct inodesc *idesc, long ilevel, off_t isize if (chkrange(idesc->id_blkno, idesc->id_numfrags)) return (SKIP); bp = getdatablk(idesc->id_blkno, sblock.fs_bsize, type); - ilevel--; - for (sizepb = sblock.fs_bsize, i = 0; i < ilevel; i++) + idesc->id_level--; + for (sizepb = sblock.fs_bsize, i = 0; i < idesc->id_level; i++) sizepb *= NINDIR(&sblock); if (howmany(isize, sizepb) > NINDIR(&sblock)) nif = NINDIR(&sblock); @@ -195,19 +198,21 @@ iblock(struct inodesc *idesc, long ilevel, off_t isize flush(fswritefd, bp); } for (i = 0; i < nif; i++) { - if (ilevel == 0) - idesc->id_lbn++; if (IBLK(bp, i)) { idesc->id_blkno = IBLK(bp, i); - if (ilevel == 0) + if (idesc->id_level == 0) { + idesc->id_lbn++; n = (*func)(idesc); - else - n = iblock(idesc, ilevel, isize, type); + } else { + n = iblock(idesc, isize, type); + idesc->id_level++; + } if (n & STOP) { bp->b_flags &= ~B_INUSE; return (n); } } else { + idesc->id_lbn += sizepb / sblock.fs_bsize; if (idesc->id_type == DATA && isize > 0) { /* An empty block in a directory XXX */ getpathname(pathbuf, idesc->id_number, Modified: head/sbin/fsck_ffs/pass1.c ============================================================================== --- head/sbin/fsck_ffs/pass1.c Sat Apr 13 12:50:47 2019 (r346184) +++ head/sbin/fsck_ffs/pass1.c Sat Apr 13 13:31:06 2019 (r346185) @@ -378,7 +378,6 @@ checkinode(ino_t inumber, struct inodesc *idesc, int r idesc->id_type = SNAP; else idesc->id_type = ADDR; - idesc->id_lballoc = -1; (void)ckinode(dp, idesc); if (sblock.fs_magic == FS_UFS2_MAGIC && dp->dp2.di_extsize > 0) { idesc->id_type = ADDR; @@ -565,7 +564,7 @@ pass1check(struct inodesc *idesc) */ idesc->id_entryno++; } - if (idesc->id_lballoc == -1 || idesc->id_lballoc < idesc->id_lbn) + if (idesc->id_level == 0 && idesc->id_lballoc < idesc->id_lbn) idesc->id_lballoc = idesc->id_lbn; return (res); } From owner-svn-src-head@freebsd.org Sat Apr 13 13:59:02 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2D301579695; Sat, 13 Apr 2019 13:59:02 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3E1A484DCE; Sat, 13 Apr 2019 13:59:02 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 089949D8F; Sat, 13 Apr 2019 13:59:02 +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 x3DDx1Z6030175; Sat, 13 Apr 2019 13:59:01 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DDx1dR030173; Sat, 13 Apr 2019 13:59:01 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201904131359.x3DDx1dR030173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sat, 13 Apr 2019 13:59:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346186 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 346186 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3E1A484DCE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.943,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 13:59:02 -0000 Author: asomers Date: Sat Apr 13 13:59:01 2019 New Revision: 346186 URL: https://svnweb.freebsd.org/changeset/base/346186 Log: fusefs: add a fusefs(5) man page PR: 233393 Reported by: tech-lists@zyxst.net Reviewed by: cem MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D19651 Added: head/share/man/man5/fusefs.5 (contents, props changed) Modified: head/share/man/man5/Makefile Modified: head/share/man/man5/Makefile ============================================================================== --- head/share/man/man5/Makefile Sat Apr 13 13:31:06 2019 (r346185) +++ head/share/man/man5/Makefile Sat Apr 13 13:59:01 2019 (r346186) @@ -27,6 +27,7 @@ MAN= acct.5 \ forward.5 \ fs.5 \ fstab.5 \ + fusefs.5 \ group.5 \ hosts.5 \ hosts.equiv.5 \ Added: head/share/man/man5/fusefs.5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man5/fusefs.5 Sat Apr 13 13:59:01 2019 (r346186) @@ -0,0 +1,147 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" +.\" Copyright (c) 2019 The FreeBSD Foundation +.\" +.\" This software was developed by BFF Storage Systems, LLC 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 April 13, 2019 +.Dt FUSEFS 5 +.Os +.Sh NAME +.Nm fusefs +.Nd "File system in USErspace" +.Sh SYNOPSIS +To link into the kernel: +.Bd -ragged -offset indent +.Cd "options FUSEFS" +.Ed +.Pp +To load as a loadable kernel module: +.Pp +.Dl "kldload fusefs" +.Sh DESCRIPTION +The +.Nm +driver implements a file system that is serviced by a userspace program. +.Pp +There are many uses for +.Nm . +Userspace daemons can access libraries or programming languages that cannot run +in kernel-mode, for example. +.Nm +is also useful for developing and debugging file systems, because a crash of +the daemon will not take down the entire operating system. +Finally, the +.Nm +API is portable. +Many daemons can run on multiple operating systems with minimal modifications. +.Sh SYSCTL VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width indent +.It Va vfs.fusefs.kernelabi_major +Major version of the FUSE kernel ABI supported by this driver. +.It Va vfs.fusefs.kernelabi_minor +Minor version of the FUSE kernel ABI supported by this driver. +.It Va vfs.fusefs.data_cache_mode +Controls how +.Nm +will cache file data. +A value of 0 will disable caching entirely. +Every data access will be forwarded to the daemon. +A value of 1 will select write-through caching. +Reads will be cached in the VFS layer as usual. +Writes will be immediately forwarded to the daemon, and also added to the cache. +A value of 2 will select write-back caching. +Reads and writes will both be cached, and writes will occasionally be flushed +to the daemon by the page daemon. +Write-back caching is usually unsafe, especially for FUSE file systems that +require network access. +.It Va vfs.fusefs.lookup_cache_enable +Controls whether +.Nm +will cache lookup responses from the file system. +FUSE file systems indicate whether lookup responses should be cacheable, but +it may be useful to globally disable caching them if a file system is +misbehaving. +.\" Undocumented sysctls +.\" ==================== +.\" Counters: I intend to rename to vfs.fusefs.stats.* for clarity +.\" vfs.fusefs.lookup_cache_{hits, misses} +.\" vfs.fusefs.filehandle_count +.\" vfs.fusefs.ticker_count +.\" vfs.fusefs.node_count +.\" +.\" vfs.fusefs.version - useless since the driver moved in-tree +.\" vfs.fusefs.reclaim_revoked: I don't understand it well-enough +.\" vfs.fusefs.sync_unmount: dead code +.\" vfs.fusefs.enforce_dev_perms: I don't understand it well enough. +.\" vfs.fusefs.init_backgrounded: dead code +.\" vfs.fusefs.iov_credit: I don't understand it well enough +.\" vfs.fusefs.iov_permanent_bufsize: I don't understand it well enough +.\" vfs.fusefs.fix_broken_io: I don't understand it well enough +.\" vfs.fusefs.sync_resize: useless and should be removed +.\" vfs.fusefs.refresh_size: probably useless? +.\" vfs.fusefs.mmap_enable: why is this optional? +.\" vfs.fusefs.data_cache_invalidate: what is this needed for? +.Sh SEE ALSO +.Xr mount_fusefs 8 +.Sh HISTORY +The +.Nm fuse +driver was written as the part of the +.Fx +implementation of the FUSE userspace file system framework (see +.Xr https://github.com/libfuse/libfuse ) +and first appeared in the +.Pa sysutils/fusefs-kmod +port, supporting +.Fx 6.0 . +It was added to the base system in +.Fx 10.0 , +and renamed to +.Nm +for +.Fx 12.1 . +.Sh AUTHORS +.An -nosplit +The +.Nm fuse +driver was originally written by +.An Csaba Henk +as a Google Summer of Code project in 2005. +It was further developed by +.An Ilya Putsikau +during Google Summer of Code 2011, and that version was integrated into the +base system by +.An Attilio Rao Aq Mt attilio@FreeBSD.org . +.Pp +This manual page was written by +.An Alan Somers Aq Mt asomers@FreeBSD.org . From owner-svn-src-head@freebsd.org Sat Apr 13 16:51:49 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEBD3157D669; Sat, 13 Apr 2019 16:51:49 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C9FB89F56; Sat, 13 Apr 2019 16:51:49 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27B15BE01; Sat, 13 Apr 2019 16:51:49 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3DGpnEa021815; Sat, 13 Apr 2019 16:51:49 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DGpmhM021813; Sat, 13 Apr 2019 16:51:48 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201904131651.x3DGpmhM021813@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sat, 13 Apr 2019 16:51:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346187 - in head/usr.bin/hexdump: . tests X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/usr.bin/hexdump: . tests X-SVN-Commit-Revision: 346187 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C9FB89F56 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 16:51:49 -0000 Author: cem Date: Sat Apr 13 16:51:48 2019 New Revision: 346187 URL: https://svnweb.freebsd.org/changeset/base/346187 Log: hexdump(1): Exit gracefully on format strings missing conversion PR: 237263 Submitted by: Bojan Petrovic Modified: head/usr.bin/hexdump/hexdump.h head/usr.bin/hexdump/parse.c head/usr.bin/hexdump/tests/hexdump_test.sh Modified: head/usr.bin/hexdump/hexdump.h ============================================================================== --- head/usr.bin/hexdump/hexdump.h Sat Apr 13 13:59:01 2019 (r346186) +++ head/usr.bin/hexdump/hexdump.h Sat Apr 13 16:51:48 2019 (r346187) @@ -88,6 +88,7 @@ void addfile(const char *); void badcnt(const char *); void badconv(const char *); void badfmt(const char *); +void badnoconv(void); void badsfmt(void); void bpad(PR *); void conv_c(PR *, u_char *, size_t); Modified: head/usr.bin/hexdump/parse.c ============================================================================== --- head/usr.bin/hexdump/parse.c Sat Apr 13 13:59:01 2019 (r346186) +++ head/usr.bin/hexdump/parse.c Sat Apr 13 16:51:48 2019 (r346187) @@ -169,7 +169,10 @@ size(FS *fs) * skip any special chars -- save precision in * case it's a %s format. */ - while (strchr(spec + 1, *++fmt)); + while (*++fmt != 0 && strchr(spec + 1, *fmt) != NULL) + ; + if (*fmt == 0) + badnoconv(); if (*fmt == '.' && isdigit(*++fmt)) { prec = atoi(fmt); while (isdigit(*++fmt)); @@ -241,10 +244,16 @@ rewrite(FS *fs) if (fu->bcnt) { sokay = USEBCNT; /* Skip to conversion character. */ - for (++p1; strchr(spec, *p1); ++p1); + while (*++p1 != 0 && strchr(spec, *p1) != NULL) + ; + if (*p1 == 0) + badnoconv(); } else { /* Skip any special chars, field width. */ - while (strchr(spec + 1, *++p1)); + while (*++p1 != 0 && strchr(spec + 1, *p1) != NULL) + ; + if (*p1 == 0) + badnoconv(); if (*p1 == '.' && isdigit(*++p1)) { sokay = USEPREC; prec = atoi(p1); @@ -511,4 +520,10 @@ void badconv(const char *ch) { errx(1, "%%%s: bad conversion character", ch); +} + +void +badnoconv(void) +{ + errx(1, "missing conversion character"); } Modified: head/usr.bin/hexdump/tests/hexdump_test.sh ============================================================================== --- head/usr.bin/hexdump/tests/hexdump_test.sh Sat Apr 13 13:59:01 2019 (r346186) +++ head/usr.bin/hexdump/tests/hexdump_test.sh Sat Apr 13 16:51:48 2019 (r346187) @@ -176,6 +176,19 @@ x_flag_body() hexdump -x "$(atf_get_srcdir)/d_hexdump_c.in" } +atf_test_case no_conv_err +no_conv_err() +{ + atf_set "descr" "Verify missing conversion char error handling" +} +no_conv_err_body() +{ + atf_check -s exit:1 -e ignore \ + hexdump -e '"%"' + atf_check -s exit:1 -e ignore \ + hexdump -e '4/2 "%"' +} + atf_init_test_cases() { atf_add_test_case b_flag @@ -188,4 +201,5 @@ atf_init_test_cases() atf_add_test_case s_flag atf_add_test_case v_flag atf_add_test_case x_flag + atf_add_test_case no_conv_err } From owner-svn-src-head@freebsd.org Sat Apr 13 20:43:19 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7A1F1582DFC; Sat, 13 Apr 2019 20:43:19 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 686BD6B1B6; Sat, 13 Apr 2019 20:43:19 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 56AC9B174; Sat, 13 Apr 2019 20:43:19 +0000 (UTC) Date: Sat, 13 Apr 2019 20:43:19 +0000 From: Alexey Dokuchaev To: Mateusz Guzik Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r344648 - in head: . sys/kern sys/sys Message-ID: <20190413204319.GA92594@FreeBSD.org> References: <201902272256.x1RMutdK085216@repo.freebsd.org> <20190228074750.GA35369@FreeBSD.org> <20190310151140.GB97029@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190310151140.GB97029@FreeBSD.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: 686BD6B1B6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.89 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.990,0]; NEURAL_HAM_SHORT(-0.90)[-0.900,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 20:43:20 -0000 On Sun, Mar 10, 2019 at 03:11:40PM +0000, Alexey Dokuchaev wrote: > On Thu, Feb 28, 2019 at 07:47:51AM +0000, Alexey Dokuchaev wrote: > > On Wed, Feb 27, 2019 at 10:56:55PM +0000, Mateusz Guzik wrote: > > > New Revision: 344648 > > > URL: https://svnweb.freebsd.org/changeset/base/344648 > > > > > > Log: > > > Rename seq to seqc to avoid namespace clashes with Linux > > > > > > ... > > > Added: > > > head/sys/sys/seqc.h (contents, props changed) > > > Deleted: > > > head/sys/sys/seq.h > > > > Why it was deleted and added as new file instead of being repocopied? > > Retransmit. Retransmit. ./danfe From owner-svn-src-head@freebsd.org Sat Apr 13 21:45:46 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F0871584164; Sat, 13 Apr 2019 21:45:46 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 00D3E6CC68; Sat, 13 Apr 2019 21:45:46 +0000 (UTC) (envelope-from rmacklem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B59B5F065; Sat, 13 Apr 2019 21:45:45 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3DLjjIF079392; Sat, 13 Apr 2019 21:45:45 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DLjjAp079390; Sat, 13 Apr 2019 21:45:45 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201904132145.x3DLjjAp079390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 13 Apr 2019 21:45:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346190 - head/usr.sbin/nfsdumpstate X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.sbin/nfsdumpstate X-SVN-Commit-Revision: 346190 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 00D3E6CC68 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 21:45:46 -0000 Author: rmacklem Date: Sat Apr 13 21:45:45 2019 New Revision: 346190 URL: https://svnweb.freebsd.org/changeset/base/346190 Log: Fix nfsdumpstate(8) so that it can print out INET6 callback addresses. The patch adds support for printing of INET6 callback addresses. It also adds the #ifdef INET, INET6 as requested by bz@. PR: 223036 Reviewed by: bz, rgrimes MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D19839 Modified: head/usr.sbin/nfsdumpstate/Makefile head/usr.sbin/nfsdumpstate/nfsdumpstate.c Modified: head/usr.sbin/nfsdumpstate/Makefile ============================================================================== --- head/usr.sbin/nfsdumpstate/Makefile Sat Apr 13 20:49:16 2019 (r346189) +++ head/usr.sbin/nfsdumpstate/Makefile Sat Apr 13 21:45:45 2019 (r346190) @@ -1,6 +1,15 @@ # $FreeBSD$ +.include + PROG= nfsdumpstate MAN= nfsdumpstate.8 + +.if ${MK_INET_SUPPORT} != "no" +CFLAGS+= -DINET +.endif +.if ${MK_INET6_SUPPORT} != "no" +CFLAGS+= -DINET6 +.endif .include Modified: head/usr.sbin/nfsdumpstate/nfsdumpstate.c ============================================================================== --- head/usr.sbin/nfsdumpstate/nfsdumpstate.c Sat Apr 13 20:49:16 2019 (r346189) +++ head/usr.sbin/nfsdumpstate/nfsdumpstate.c Sat Apr 13 21:45:45 2019 (r346190) @@ -121,13 +121,14 @@ dump_openstate(void) { struct nfsd_dumplist dumplist; int cnt, i; + char nbuf[INET6_ADDRSTRLEN]; dumplist.ndl_size = DUMPSIZE; dumplist.ndl_list = (void *)dp; if (nfssvc(NFSSVC_DUMPCLIENTS, &dumplist) < 0) errx(1, "Can't perform dump clients syscall"); - printf("%-13s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %-15s %s\n", + printf("%-13s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %-45s %s\n", "Flags", "OpenOwner", "Open", "LockOwner", "Lock", "Deleg", "OldDeleg", "Clientaddr", "ClientID"); /* @@ -143,9 +144,23 @@ dump_openstate(void) dp[cnt].ndcl_nlocks, dp[cnt].ndcl_ndelegs, dp[cnt].ndcl_nolddelegs); - if (dp[cnt].ndcl_addrfam == AF_INET) - printf("%-15s ", + switch (dp[cnt].ndcl_addrfam) { +#ifdef INET + case AF_INET: + printf("%-45s ", inet_ntoa(dp[cnt].ndcl_cbaddr.sin_addr)); + break; +#endif +#ifdef INET6 + case AF_INET6: + if (inet_ntop(AF_INET6, &dp[cnt].ndcl_cbaddr.sin6_addr, + nbuf, sizeof(nbuf)) != NULL) + printf("%-45s ", nbuf); + else + printf("%-45s ", " "); + break; +#endif + } for (i = 0; i < dp[cnt].ndcl_clid.nclid_idlen; i++) printf("%02x", dp[cnt].ndcl_clid.nclid_id[i]); printf("\n"); From owner-svn-src-head@freebsd.org Sat Apr 13 22:00:10 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 659A915846AB; Sat, 13 Apr 2019 22:00:10 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 157D86D3BA; Sat, 13 Apr 2019 22:00:10 +0000 (UTC) (envelope-from rmacklem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C8F42F239; Sat, 13 Apr 2019 22:00:09 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3DM09Qu085071; Sat, 13 Apr 2019 22:00:09 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DM09dG085066; Sat, 13 Apr 2019 22:00:09 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201904132200.x3DM09dG085066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 13 Apr 2019 22:00:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346191 - in head/sys: fs/nfsserver modules/nfsd X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in head/sys: fs/nfsserver modules/nfsd X-SVN-Commit-Revision: 346191 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 157D86D3BA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 22:00:10 -0000 Author: rmacklem Date: Sat Apr 13 22:00:09 2019 New Revision: 346191 URL: https://svnweb.freebsd.org/changeset/base/346191 Log: Add support for INET6 addresses to the kernel code that dumps open/lock state. PR#223036 reported that INET6 callback addresses were not printed by nfsdumpstate(8). This kernel patch adds INET6 addresses to the dump structure, so that nfsdumpstate(8) can print them out, post-r346190. The patch also includes the addition of #ifdef INET, INET6 as requested by bz@. PR: 223036 Reviewed by: bz, rgrimes MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D19839 Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c head/sys/fs/nfsserver/nfs_nfsdstate.c head/sys/modules/nfsd/Makefile Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdserv.c Sat Apr 13 21:45:45 2019 (r346190) +++ head/sys/fs/nfsserver/nfs_nfsdserv.c Sat Apr 13 22:00:09 2019 (r346191) @@ -36,6 +36,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_inet.h" +#include "opt_inet6.h" /* * nfs version 2, 3 and 4 server calls to vnode ops * - these routines generally have 3 phases @@ -3677,8 +3679,16 @@ nfsrvd_setclientid(struct nfsrv_descript *nd, __unused int i; int error = 0, idlen; struct nfsclient *clp = NULL; - struct sockaddr_in *rad; - u_char *verf, *ucp, *ucp2, addrbuf[24]; +#ifdef INET + struct sockaddr_in *rin; +#endif +#ifdef INET6 + struct sockaddr_in6 *rin6; +#endif +#if defined(INET) || defined(INET6) + u_char *ucp, *ucp2; +#endif + u_char *verf, *addrbuf; nfsquad_t clientid, confirm; struct thread *p = curthread; @@ -3706,9 +3716,9 @@ nfsrvd_setclientid(struct nfsrv_descript *nd, __unused clp->lc_stateid = malloc(sizeof(struct nfsstatehead) * nfsrv_statehashsize, M_NFSDCLIENT, M_WAITOK); NFSINITSOCKMUTEX(&clp->lc_req.nr_mtx); - clp->lc_req.nr_nam = malloc(sizeof(*clp->lc_req.nr_nam), M_SONAME, + /* Allocated large enough for an AF_INET or AF_INET6 socket. */ + clp->lc_req.nr_nam = malloc(sizeof(struct sockaddr_in6), M_SONAME, M_WAITOK | M_ZERO); - NFSSOCKADDRSIZE(clp->lc_req.nr_nam, sizeof (struct sockaddr_in)); clp->lc_req.nr_cred = NULL; NFSBCOPY(verf, clp->lc_verf, NFSX_VERF); clp->lc_idlen = idlen; @@ -3750,17 +3760,46 @@ nfsrvd_setclientid(struct nfsrv_descript *nd, __unused */ nd->nd_repstat = nfsrv_setclient(nd, &clp, &clientid, &confirm, p); if (nd->nd_repstat == NFSERR_CLIDINUSE) { - if (clp->lc_flags & LCL_TCPCALLBACK) - (void) nfsm_strtom(nd, "tcp", 3); - else - (void) nfsm_strtom(nd, "udp", 3); - rad = NFSSOCKADDR(clp->lc_req.nr_nam, struct sockaddr_in *); - ucp = (u_char *)&rad->sin_addr.s_addr; - ucp2 = (u_char *)&rad->sin_port; - sprintf(addrbuf, "%d.%d.%d.%d.%d.%d", ucp[0] & 0xff, - ucp[1] & 0xff, ucp[2] & 0xff, ucp[3] & 0xff, - ucp2[0] & 0xff, ucp2[1] & 0xff); + /* + * 8 is the maximum length of the port# string. + */ + addrbuf = malloc(INET6_ADDRSTRLEN + 8, M_TEMP, M_WAITOK); + switch (clp->lc_req.nr_nam->sa_family) { +#ifdef INET + case AF_INET: + if (clp->lc_flags & LCL_TCPCALLBACK) + (void) nfsm_strtom(nd, "tcp", 3); + else + (void) nfsm_strtom(nd, "udp", 3); + rin = (struct sockaddr_in *)clp->lc_req.nr_nam; + ucp = (u_char *)&rin->sin_addr.s_addr; + ucp2 = (u_char *)&rin->sin_port; + sprintf(addrbuf, "%d.%d.%d.%d.%d.%d", ucp[0] & 0xff, + ucp[1] & 0xff, ucp[2] & 0xff, ucp[3] & 0xff, + ucp2[0] & 0xff, ucp2[1] & 0xff); + break; +#endif +#ifdef INET6 + case AF_INET6: + if (clp->lc_flags & LCL_TCPCALLBACK) + (void) nfsm_strtom(nd, "tcp6", 4); + else + (void) nfsm_strtom(nd, "udp6", 4); + rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; + ucp = inet_ntop(AF_INET6, &rin6->sin6_addr, addrbuf, + INET6_ADDRSTRLEN); + if (ucp != NULL) + i = strlen(ucp); + else + i = 0; + ucp2 = (u_char *)&rin6->sin6_port; + sprintf(&addrbuf[i], ".%d.%d", ucp2[0] & 0xff, + ucp2[1] & 0xff); + break; +#endif + } (void) nfsm_strtom(nd, addrbuf, strlen(addrbuf)); + free(addrbuf, M_TEMP); } if (clp) { free(clp->lc_req.nr_nam, M_SONAME); @@ -3964,7 +4003,12 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused uint32_t sp4type, v41flags; uint64_t owner_minor; struct timespec verstime; - struct sockaddr_in *sad, *rad; +#ifdef INET + struct sockaddr_in *sin, *rin; +#endif +#ifdef INET6 + struct sockaddr_in6 *sin6, *rin6; +#endif struct thread *p = curthread; if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) { @@ -3987,16 +4031,31 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused clp->lc_stateid = malloc(sizeof(struct nfsstatehead) * nfsrv_statehashsize, M_NFSDCLIENT, M_WAITOK); NFSINITSOCKMUTEX(&clp->lc_req.nr_mtx); - clp->lc_req.nr_nam = malloc(sizeof(*clp->lc_req.nr_nam), M_SONAME, + /* Allocated large enough for an AF_INET or AF_INET6 socket. */ + clp->lc_req.nr_nam = malloc(sizeof(struct sockaddr_in6), M_SONAME, M_WAITOK | M_ZERO); - NFSSOCKADDRSIZE(clp->lc_req.nr_nam, sizeof (struct sockaddr_in)); - sad = NFSSOCKADDR(nd->nd_nam, struct sockaddr_in *); - rad = NFSSOCKADDR(clp->lc_req.nr_nam, struct sockaddr_in *); - rad->sin_family = AF_INET; - rad->sin_addr.s_addr = 0; - rad->sin_port = 0; - if (sad->sin_family == AF_INET) - rad->sin_addr.s_addr = sad->sin_addr.s_addr; + switch (nd->nd_nam->sa_family) { +#ifdef INET + case AF_INET: + rin = (struct sockaddr_in *)clp->lc_req.nr_nam; + sin = (struct sockaddr_in *)nd->nd_nam; + rin->sin_family = AF_INET; + rin->sin_len = sizeof(struct sockaddr_in); + rin->sin_port = 0; + rin->sin_addr.s_addr = sin->sin_addr.s_addr; + break; +#endif +#ifdef INET6 + case AF_INET6: + rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; + sin6 = (struct sockaddr_in6 *)nd->nd_nam; + rin6->sin6_family = AF_INET6; + rin6->sin6_len = sizeof(struct sockaddr_in6); + rin6->sin6_port = 0; + rin6->sin6_addr = sin6->sin6_addr; + break; +#endif + } clp->lc_req.nr_cred = NULL; NFSBCOPY(verf, clp->lc_verf, NFSX_VERF); clp->lc_idlen = idlen; Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdstate.c Sat Apr 13 21:45:45 2019 (r346190) +++ head/sys/fs/nfsserver/nfs_nfsdstate.c Sat Apr 13 22:00:09 2019 (r346191) @@ -30,6 +30,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_inet.h" +#include "opt_inet6.h" #ifndef APPLEKEXT #include #include @@ -248,7 +250,12 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsc struct nfsclient *clp = NULL, *new_clp = *new_clpp; int i, error = 0, ret; struct nfsstate *stp, *tstp; - struct sockaddr_in *sad, *rad; +#ifdef INET + struct sockaddr_in *sin, *rin; +#endif +#ifdef INET6 + struct sockaddr_in6 *sin6, *rin6; +#endif struct nfsdsession *sep, *nsep; int zapit = 0, gotit, hasstate = 0, igotlock; static u_int64_t confirm_index = 0; @@ -400,10 +407,24 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsc * If the uid doesn't match, return NFSERR_CLIDINUSE after * filling out the correct ipaddr and portnum. */ - sad = NFSSOCKADDR(new_clp->lc_req.nr_nam, struct sockaddr_in *); - rad = NFSSOCKADDR(clp->lc_req.nr_nam, struct sockaddr_in *); - sad->sin_addr.s_addr = rad->sin_addr.s_addr; - sad->sin_port = rad->sin_port; + switch (clp->lc_req.nr_nam->sa_family) { +#ifdef INET + case AF_INET: + sin = (struct sockaddr_in *)new_clp->lc_req.nr_nam; + rin = (struct sockaddr_in *)clp->lc_req.nr_nam; + sin->sin_addr.s_addr = rin->sin_addr.s_addr; + sin->sin_port = rin->sin_port; + break; +#endif +#ifdef INET6 + case AF_INET6: + sin6 = (struct sockaddr_in6 *)new_clp->lc_req.nr_nam; + rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; + sin6->sin6_addr = rin6->sin6_addr; + sin6->sin6_port = rin6->sin6_port; + break; +#endif + } NFSLOCKV4ROOTMUTEX(); nfsv4_unlock(&nfsv4rootfs_lock, 1); NFSUNLOCKV4ROOTMUTEX(); @@ -956,9 +977,13 @@ nfsrv_dumpaclient(struct nfsclient *clp, struct nfsd_d { struct nfsstate *stp, *openstp, *lckownstp; struct nfslock *lop; - struct sockaddr *sad; - struct sockaddr_in *rad; - struct sockaddr_in6 *rad6; + sa_family_t af; +#ifdef INET + struct sockaddr_in *rin; +#endif +#ifdef INET6 + struct sockaddr_in6 *rin6; +#endif dumpp->ndcl_nopenowners = dumpp->ndcl_nlockowners = 0; dumpp->ndcl_nopens = dumpp->ndcl_nlocks = 0; @@ -966,14 +991,21 @@ nfsrv_dumpaclient(struct nfsclient *clp, struct nfsd_d dumpp->ndcl_flags = clp->lc_flags; dumpp->ndcl_clid.nclid_idlen = clp->lc_idlen; NFSBCOPY(clp->lc_id, dumpp->ndcl_clid.nclid_id, clp->lc_idlen); - sad = NFSSOCKADDR(clp->lc_req.nr_nam, struct sockaddr *); - dumpp->ndcl_addrfam = sad->sa_family; - if (sad->sa_family == AF_INET) { - rad = (struct sockaddr_in *)sad; - dumpp->ndcl_cbaddr.sin_addr = rad->sin_addr; - } else { - rad6 = (struct sockaddr_in6 *)sad; - dumpp->ndcl_cbaddr.sin6_addr = rad6->sin6_addr; + af = clp->lc_req.nr_nam->sa_family; + dumpp->ndcl_addrfam = af; + switch (af) { +#ifdef INET + case AF_INET: + rin = (struct sockaddr_in *)clp->lc_req.nr_nam; + dumpp->ndcl_cbaddr.sin_addr = rin->sin_addr; + break; +#endif +#ifdef INET6 + case AF_INET6: + rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; + dumpp->ndcl_cbaddr.sin6_addr = rin6->sin6_addr; + break; +#endif } /* @@ -1014,9 +1046,13 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_dumplocks *ldu struct nfslock *lop; int cnt = 0; struct nfslockfile *lfp; - struct sockaddr *sad; - struct sockaddr_in *rad; - struct sockaddr_in6 *rad6; + sa_family_t af; +#ifdef INET + struct sockaddr_in *rin; +#endif +#ifdef INET6 + struct sockaddr_in6 *rin6; +#endif int ret; fhandle_t nfh; @@ -1058,14 +1094,22 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_dumplocks *ldu ldumpp[cnt].ndlck_clid.nclid_idlen = stp->ls_clp->lc_idlen; NFSBCOPY(stp->ls_clp->lc_id, ldumpp[cnt].ndlck_clid.nclid_id, stp->ls_clp->lc_idlen); - sad=NFSSOCKADDR(stp->ls_clp->lc_req.nr_nam, struct sockaddr *); - ldumpp[cnt].ndlck_addrfam = sad->sa_family; - if (sad->sa_family == AF_INET) { - rad = (struct sockaddr_in *)sad; - ldumpp[cnt].ndlck_cbaddr.sin_addr = rad->sin_addr; - } else { - rad6 = (struct sockaddr_in6 *)sad; - ldumpp[cnt].ndlck_cbaddr.sin6_addr = rad6->sin6_addr; + af = stp->ls_clp->lc_req.nr_nam->sa_family; + ldumpp[cnt].ndlck_addrfam = af; + switch (af) { +#ifdef INET + case AF_INET: + rin = (struct sockaddr_in *)stp->ls_clp->lc_req.nr_nam; + ldumpp[cnt].ndlck_cbaddr.sin_addr = rin->sin_addr; + break; +#endif +#ifdef INET6 + case AF_INET6: + rin6 = (struct sockaddr_in6 *) + stp->ls_clp->lc_req.nr_nam; + ldumpp[cnt].ndlck_cbaddr.sin6_addr = rin6->sin6_addr; + break; +#endif } stp = LIST_NEXT(stp, ls_file); cnt++; @@ -1090,14 +1134,22 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_dumplocks *ldu ldumpp[cnt].ndlck_clid.nclid_idlen = stp->ls_clp->lc_idlen; NFSBCOPY(stp->ls_clp->lc_id, ldumpp[cnt].ndlck_clid.nclid_id, stp->ls_clp->lc_idlen); - sad=NFSSOCKADDR(stp->ls_clp->lc_req.nr_nam, struct sockaddr *); - ldumpp[cnt].ndlck_addrfam = sad->sa_family; - if (sad->sa_family == AF_INET) { - rad = (struct sockaddr_in *)sad; - ldumpp[cnt].ndlck_cbaddr.sin_addr = rad->sin_addr; - } else { - rad6 = (struct sockaddr_in6 *)sad; - ldumpp[cnt].ndlck_cbaddr.sin6_addr = rad6->sin6_addr; + af = stp->ls_clp->lc_req.nr_nam->sa_family; + ldumpp[cnt].ndlck_addrfam = af; + switch (af) { +#ifdef INET + case AF_INET: + rin = (struct sockaddr_in *)stp->ls_clp->lc_req.nr_nam; + ldumpp[cnt].ndlck_cbaddr.sin_addr = rin->sin_addr; + break; +#endif +#ifdef INET6 + case AF_INET6: + rin6 = (struct sockaddr_in6 *) + stp->ls_clp->lc_req.nr_nam; + ldumpp[cnt].ndlck_cbaddr.sin6_addr = rin6->sin6_addr; + break; +#endif } lop = LIST_NEXT(lop, lo_lckfile); cnt++; @@ -1117,14 +1169,22 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_dumplocks *ldu ldumpp[cnt].ndlck_clid.nclid_idlen = stp->ls_clp->lc_idlen; NFSBCOPY(stp->ls_clp->lc_id, ldumpp[cnt].ndlck_clid.nclid_id, stp->ls_clp->lc_idlen); - sad=NFSSOCKADDR(stp->ls_clp->lc_req.nr_nam, struct sockaddr *); - ldumpp[cnt].ndlck_addrfam = sad->sa_family; - if (sad->sa_family == AF_INET) { - rad = (struct sockaddr_in *)sad; - ldumpp[cnt].ndlck_cbaddr.sin_addr = rad->sin_addr; - } else { - rad6 = (struct sockaddr_in6 *)sad; - ldumpp[cnt].ndlck_cbaddr.sin6_addr = rad6->sin6_addr; + af = stp->ls_clp->lc_req.nr_nam->sa_family; + ldumpp[cnt].ndlck_addrfam = af; + switch (af) { +#ifdef INET + case AF_INET: + rin = (struct sockaddr_in *)stp->ls_clp->lc_req.nr_nam; + ldumpp[cnt].ndlck_cbaddr.sin_addr = rin->sin_addr; + break; +#endif +#ifdef INET6 + case AF_INET6: + rin6 = (struct sockaddr_in6 *) + stp->ls_clp->lc_req.nr_nam; + ldumpp[cnt].ndlck_cbaddr.sin6_addr = rin6->sin6_addr; + break; +#endif } stp = LIST_NEXT(stp, ls_file); cnt++; @@ -3994,9 +4054,15 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc { u_int32_t *tl; u_char *cp, *cp2; - int i, j; - struct sockaddr_in *rad, *sad; - u_char protocol[5], addr[24]; + int i, j, maxalen = 0, minalen = 0; + sa_family_t af; +#ifdef INET + struct sockaddr_in *rin, *sin; +#endif +#ifdef INET6 + struct sockaddr_in6 *rin6, *sin6; +#endif + u_char *addr; int error = 0, cantparse = 0; union { in_addr_t ival; @@ -4007,27 +4073,44 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc u_char cval[2]; } port; - rad = NFSSOCKADDR(clp->lc_req.nr_nam, struct sockaddr_in *); - rad->sin_family = AF_INET; - rad->sin_len = sizeof (struct sockaddr_in); - rad->sin_addr.s_addr = 0; - rad->sin_port = 0; + /* 8 is the maximum length of the port# string. */ + addr = malloc(INET6_ADDRSTRLEN + 8, M_TEMP, M_WAITOK); clp->lc_req.nr_client = NULL; clp->lc_req.nr_lock = 0; + af = AF_UNSPEC; NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); i = fxdr_unsigned(int, *tl); if (i >= 3 && i <= 4) { - error = nfsrv_mtostr(nd, protocol, i); + error = nfsrv_mtostr(nd, addr, i); if (error) goto nfsmout; - if (!strcmp(protocol, "tcp")) { +#ifdef INET + if (!strcmp(addr, "tcp")) { clp->lc_flags |= LCL_TCPCALLBACK; clp->lc_req.nr_sotype = SOCK_STREAM; clp->lc_req.nr_soproto = IPPROTO_TCP; - } else if (!strcmp(protocol, "udp")) { + af = AF_INET; + } else if (!strcmp(addr, "udp")) { clp->lc_req.nr_sotype = SOCK_DGRAM; clp->lc_req.nr_soproto = IPPROTO_UDP; - } else { + af = AF_INET; + } +#endif +#ifdef INET6 + if (af == AF_UNSPEC) { + if (!strcmp(addr, "tcp6")) { + clp->lc_flags |= LCL_TCPCALLBACK; + clp->lc_req.nr_sotype = SOCK_STREAM; + clp->lc_req.nr_soproto = IPPROTO_TCP; + af = AF_INET6; + } else if (!strcmp(addr, "udp6")) { + clp->lc_req.nr_sotype = SOCK_DGRAM; + clp->lc_req.nr_soproto = IPPROTO_UDP; + af = AF_INET6; + } + } +#endif + if (af == AF_UNSPEC) { cantparse = 1; } } else { @@ -4038,6 +4121,36 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc goto nfsmout; } } + /* + * The caller has allocated clp->lc_req.nr_nam to be large enough + * for either AF_INET or AF_INET6 and zeroed out the contents. + * maxalen is set to the maximum length of the host IP address string + * plus 8 for the maximum length of the port#. + * minalen is set to the minimum length of the host IP address string + * plus 4 for the minimum length of the port#. + * These lengths do not include NULL termination, + * so INET[6]_ADDRSTRLEN - 1 is used in the calculations. + */ + switch (af) { +#ifdef INET + case AF_INET: + rin = (struct sockaddr_in *)clp->lc_req.nr_nam; + rin->sin_family = AF_INET; + rin->sin_len = sizeof(struct sockaddr_in); + maxalen = INET_ADDRSTRLEN - 1 + 8; + minalen = 7 + 4; + break; +#endif +#ifdef INET6 + case AF_INET6: + rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; + rin6->sin6_family = AF_INET6; + rin6->sin6_len = sizeof(struct sockaddr_in6); + maxalen = INET6_ADDRSTRLEN - 1 + 8; + minalen = 3 + 4; + break; +#endif + } NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); i = fxdr_unsigned(int, *tl); if (i < 0) { @@ -4045,18 +4158,43 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc goto nfsmout; } else if (i == 0) { cantparse = 1; - } else if (!cantparse && i <= 23 && i >= 11) { + } else if (!cantparse && i <= maxalen && i >= minalen) { error = nfsrv_mtostr(nd, addr, i); if (error) goto nfsmout; /* * Parse out the address fields. We expect 6 decimal numbers - * separated by '.'s. + * separated by '.'s for AF_INET and two decimal numbers + * preceeded by '.'s for AF_INET6. */ - cp = addr; - i = 0; - while (*cp && i < 6) { + cp = NULL; + switch (af) { +#ifdef INET6 + /* + * For AF_INET6, first parse the host address. + */ + case AF_INET6: + cp = strchr(addr, '.'); + if (cp != NULL) { + *cp++ = '\0'; + if (inet_pton(af, addr, &rin6->sin6_addr) == 1) + i = 4; + else { + cp = NULL; + cantparse = 1; + } + } + break; +#endif +#ifdef INET + case AF_INET: + cp = addr; + i = 0; + break; +#endif + } + while (cp != NULL && *cp && i < 6) { cp2 = cp; while (*cp2 && *cp2 != '.') cp2++; @@ -4080,11 +4218,30 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc i++; } if (!cantparse) { - if (ip.ival != 0x0) { - rad->sin_addr.s_addr = htonl(ip.ival); - rad->sin_port = htons(port.sval); - } else { - cantparse = 1; + /* + * The host address INADDR_ANY is (mis)used to indicate + * "there is no valid callback address". + */ + switch (af) { +#ifdef INET6 + case AF_INET6: + if (!IN6_ARE_ADDR_EQUAL(&rin6->sin6_addr, + &in6addr_any)) + rin6->sin6_port = htons(port.sval); + else + cantparse = 1; + break; +#endif +#ifdef INET + case AF_INET: + if (ip.ival != INADDR_ANY) { + rin->sin_addr.s_addr = htonl(ip.ival); + rin->sin_port = htons(port.sval); + } else { + cantparse = 1; + } + break; +#endif } } } else { @@ -4096,14 +4253,32 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struc } } if (cantparse) { - sad = NFSSOCKADDR(nd->nd_nam, struct sockaddr_in *); - if (sad->sin_family == AF_INET) { - rad->sin_addr.s_addr = sad->sin_addr.s_addr; - rad->sin_port = 0x0; + switch (nd->nd_nam->sa_family) { +#ifdef INET + case AF_INET: + sin = (struct sockaddr_in *)nd->nd_nam; + rin = (struct sockaddr_in *)clp->lc_req.nr_nam; + rin->sin_family = AF_INET; + rin->sin_len = sizeof(struct sockaddr_in); + rin->sin_addr.s_addr = sin->sin_addr.s_addr; + rin->sin_port = 0x0; + break; +#endif +#ifdef INET6 + case AF_INET6: + sin6 = (struct sockaddr_in6 *)nd->nd_nam; + rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; + rin6->sin6_family = AF_INET6; + rin6->sin6_len = sizeof(struct sockaddr_in6); + rin6->sin6_addr = sin6->sin6_addr; + rin6->sin6_port = 0x0; + break; +#endif } clp->lc_program = 0; } nfsmout: + free(addr, M_TEMP); NFSEXITCODE2(error, nd); return (error); } Modified: head/sys/modules/nfsd/Makefile ============================================================================== --- head/sys/modules/nfsd/Makefile Sat Apr 13 21:45:45 2019 (r346190) +++ head/sys/modules/nfsd/Makefile Sat Apr 13 22:00:09 2019 (r346191) @@ -14,6 +14,7 @@ SRCS= vnode_if.h \ nfs_nfsdport.c \ opt_ufs.h \ opt_nfs.h \ + opt_inet.h \ opt_inet6.h \ opt_kgssapi.h From owner-svn-src-head@freebsd.org Sat Apr 13 23:26:03 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D5C01585DB7; Sat, 13 Apr 2019 23:26:03 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D24476F8EA; Sat, 13 Apr 2019 23:26:02 +0000 (UTC) (envelope-from rmacklem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB44F1818A; Sat, 13 Apr 2019 23:26:02 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3DNQ2Z7032538; Sat, 13 Apr 2019 23:26:02 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DNQ2Fv032537; Sat, 13 Apr 2019 23:26:02 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201904132326.x3DNQ2Fv032537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 13 Apr 2019 23:26:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346192 - head/usr.bin/nfsstat X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.bin/nfsstat X-SVN-Commit-Revision: 346192 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D24476F8EA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 23:26:03 -0000 Author: rmacklem Date: Sat Apr 13 23:26:02 2019 New Revision: 346192 URL: https://svnweb.freebsd.org/changeset/base/346192 Log: Fix printing of the line that starts with "LocalOpen...". When "nfsstat -E -c" was done, the title line starting with "LocalOpen..." was not being displayed. This was introduced by r328588. MFC after: 2 weeks Modified: head/usr.bin/nfsstat/nfsstat.c Modified: head/usr.bin/nfsstat/nfsstat.c ============================================================================== --- head/usr.bin/nfsstat/nfsstat.c Sat Apr 13 22:00:09 2019 (r346191) +++ head/usr.bin/nfsstat/nfsstat.c Sat Apr 13 23:26:02 2019 (r346192) @@ -790,7 +790,7 @@ exp_intpr(int clientOnly, int serverOnly, int nfs41) (uintmax_t)ext_nfsstats.cllocalopenowners); xo_emit("{T:LocalOpen/%13.13s}{T:LocalLown/%13.13s}" - "{T:LocalLock\n"); + "{T:LocalLock/%13.13s}\n"); xo_emit("{:localopen/%13ju}{:locallown/%13ju}" "{:locallock/%13ju}\n", (uintmax_t)ext_nfsstats.cllocalopens, From owner-svn-src-head@freebsd.org Sat Apr 13 23:37:29 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0241E1586183; Sat, 13 Apr 2019 23:37:29 +0000 (UTC) (envelope-from chuck@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E93A70228; Sat, 13 Apr 2019 23:37:28 +0000 (UTC) (envelope-from chuck@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B85618335; Sat, 13 Apr 2019 23:37:28 +0000 (UTC) (envelope-from chuck@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3DNbSEP038622; Sat, 13 Apr 2019 23:37:28 GMT (envelope-from chuck@FreeBSD.org) Received: (from chuck@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3DNbSHA038621; Sat, 13 Apr 2019 23:37:28 GMT (envelope-from chuck@FreeBSD.org) Message-Id: <201904132337.x3DNbSHA038621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: chuck set sender to chuck@FreeBSD.org using -f From: Chuck Tuffli Date: Sat, 13 Apr 2019 23:37:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346194 - head/usr.sbin/bhyve X-SVN-Group: head X-SVN-Commit-Author: chuck X-SVN-Commit-Paths: head/usr.sbin/bhyve X-SVN-Commit-Revision: 346194 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6E93A70228 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Apr 2019 23:37:29 -0000 Author: chuck Date: Sat Apr 13 23:37:27 2019 New Revision: 346194 URL: https://svnweb.freebsd.org/changeset/base/346194 Log: Revert r345171 pending review Backing out commit pending further discussion on the PCIe version supported by pseudo (i.e. emulated) devices. See Differential for details. Reviewed by: imp Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D19580 Modified: head/usr.sbin/bhyve/pci_emul.c Modified: head/usr.sbin/bhyve/pci_emul.c ============================================================================== --- head/usr.sbin/bhyve/pci_emul.c Sat Apr 13 23:32:28 2019 (r346193) +++ head/usr.sbin/bhyve/pci_emul.c Sat Apr 13 23:37:27 2019 (r346194) @@ -953,10 +953,7 @@ pci_emul_add_pciecap(struct pci_devinst *pi, int type) bzero(&pciecap, sizeof(pciecap)); pciecap.capid = PCIY_EXPRESS; - pciecap.pcie_capabilities = PCIECAP_VERSION | type; - /* Devices starting with version 1.1 must set the RBER bit */ - if (PCIECAP_VERSION >= 1) - pciecap.dev_capabilities = PCIEM_CAP_ROLE_ERR_RPT; + pciecap.pcie_capabilities = PCIECAP_VERSION | PCIEM_TYPE_ROOT_PORT; pciecap.link_capabilities = 0x411; /* gen1, x1 */ pciecap.link_status = 0x11; /* gen1, x1 */